Makarand Bauskar 98b52a7245 resolved merge conflicts on develop (#10185) ...

* resolved merge conflicts on develop

* [minor] removed the validate_activity

2017-07-31 15:09:52 +05:30

..

campaign

Once primary key is generated, do not allow changing Series #8911 (#9265)

2017-06-14 16:10:09 +05:30

customer

hide salution and gender if company type is Company (#10040)

2017-07-24 11:32:26 +05:30

industry_type

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

installation_note

[hotfix] fixed the customer address set filter on Installation Note

2017-07-07 15:24:01 +05:30

installation_note_item

Added fields in global search

2017-02-20 13:38:31 +05:30

lead_source

[enhance] added Lead Source master, fixes #6231

2016-09-16 11:44:49 +05:30

product_bundle

[UI Test] Test for Product Bundle added (#10158)

2017-07-28 19:36:50 +05:30

product_bundle_item

Added fields in global search

2017-02-20 13:38:31 +05:30

quotation

resolved merge conflicts on develop (#10185)

2017-07-31 15:09:52 +05:30

quotation_item

[minor] renamed a Total Margin field to Rate With Margin (#8720)

2017-05-11 11:40:02 +05:30

sales_order

resolved merge conflicts

2017-07-31 12:30:53 +05:30

sales_order_item

Added delivery date in SO parent form. Fixes #10104 (#10155)

2017-07-31 11:25:51 +05:30

sales_team

[fix] make grids editable

2016-07-11 13:01:58 +05:30

selling_settings

Changed label of hide_tax_id field

2017-03-29 17:39:08 +05:30

sms_center

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30