Saurabh d7897f1c53 Resolved merge conflicts

2018-07-18 17:08:16 +05:30

..

tests

[Enhance] Quality Inspection Template (#12988)

2018-02-22 11:03:48 +05:30

__init__.py

moved modules inside erpnext folder

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

accounts_controller.py

Resolved merge conflicts

2018-07-18 17:08:16 +05:30

buying_controller.py

Defaults in Item Group (#14874)

2018-07-17 18:01:44 +05:30

item_variant.py

Resolved merge conflicts

2018-07-06 13:18:44 +05:30

print_settings.py

[fix] compact print format not longer ignores format builder

2017-01-25 08:20:43 +08:00

queries.py

Merge branch 'master' into develop

2018-05-22 09:18:38 +00:00

sales_and_purchase_return.py

[Enhance] Standalone debit/credit note (#14269)

2018-06-11 12:02:14 +05:30

selling_controller.py

Resolved merge conflicts

2018-07-18 17:08:16 +05:30

status_updater.py

[Enhance] Standalone debit/credit note (#14269)

2018-06-11 12:02:14 +05:30

stock_controller.py

minor fix

2018-06-14 17:09:55 +05:30

taxes_and_totals.py

Loyalty Program (#12631)

2018-07-06 12:36:57 +05:30

trends.py

controller and other changes

2018-05-14 11:45:38 +05:30

website_list_for_contact.py

[hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725)

2017-09-10 12:04:28 +05:30