mbauskar ea832b8157 resolved merge conflicts

2017-09-14 15:32:10 +05:30

..

campaign

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

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

customer

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +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

Update test_quotation.js

2017-09-14 11:55:31 +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

[UI Test] Modified Sales Order UI Test (#10770)

2017-09-14 12:51:22 +05:30

sales_order_item

merged hotfix branch into staging (#10191)

2017-08-01 11:06:41 +05:30

sales_team

[fix] make grids editable

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

selling_settings

[fix] unset default customer group (#10689)

2017-09-14 15:03:45 +05:30

sms_center

Removal of SMS Settings and SMS Parameters from ERPNext (#10033)

2017-08-08 14:55:30 +05:30

__init__.py

moved modules inside erpnext folder

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