Nabin Hait 7b684a01d3 fix: merge conflict

2019-07-04 12:06:50 +05:30

..

tests

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

__init__.py

moved modules inside erpnext folder

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

accounts_controller.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

buying_controller.py

fix: precision for certain calculations in buying controller (#18008)

2019-06-26 11:10:17 +05:30

item_variant.py

refactor: better error message when changing variant value (#18144)

2019-07-03 17:29:29 +05:30

print_settings.py

optimize(various)

2018-08-08 16:37:31 +05:30

queries.py

fix: Fiter passing fix in get batch query (#18131)

2019-07-02 10:10:55 +05:30

sales_and_purchase_return.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

selling_controller.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

status_updater.py

fix: merge conflict

2019-07-04 12:06:50 +05:30

stock_controller.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

taxes_and_totals.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +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