Nabin Hait 4d22b6db30 Fixed Merge Conflict

2017-10-25 14:09:46 +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

…

installation_note

Controller init args fix (#11015)

2017-10-02 15:59:27 +05:30

installation_note_item

Added fields in global search

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

lead_source

…

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

Controller init args fix (#11015)

2017-10-02 15:59:27 +05:30

quotation_item

[minor] removed the default precision for the margin_rate_or_amount field (#10923)

2017-09-27 12:49:16 +05:30

sales_order

Fixed Merge Conflict

2017-10-25 14:09:46 +05:30

sales_order_item

[minor] removed the default precision for the margin_rate_or_amount field (#10923)

2017-09-27 12:49:16 +05:30

sales_team

…

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

…