Saurabh f16d45b0a0 Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos ...

Resolved Conflicts:erpnext/selling/doctype/customer/customer.json

2018-02-01 02:05:30 +05:30

..

campaign

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

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

customer

Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos

2018-02-01 02:05:30 +05:30

industry_type

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

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

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

[enhance] added Lead Source master, fixes #6231

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

product_bundle

Add Bundle Description Field To Product Bundle (#11122)

2017-10-25 12:22:08 +05:30

product_bundle_item

Added fields in global search

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

quotation

Fixed merge conflict

2018-01-17 18:56:02 +05:30

quotation_item

[fix] fix print hide weight details in quotation print format (#12412)

2018-01-10 16:30:09 +05:30

sales_order

Merge branch 'master' into develop

2018-01-31 15:39:16 +05:30

sales_order_item

Rearranged fields due to merge conflict messup

2017-11-30 14:29:10 +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

remove erroneous column breaks (#11522)

2017-11-10 18:54:03 +05:30

__init__.py

moved modules inside erpnext folder

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