Saurabh 2ca83d61ea Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +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

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

buying_controller.py

Code cleanup

2018-05-14 19:09:44 +05:30

item_variant.py

do not copy template description to variant if not in allow fields (#13726)

2018-04-24 12:10:45 +05:30

print_settings.py

[fix] compact print format not longer ignores format builder

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

queries.py

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

sales_and_purchase_return.py

[fix] Current stock qty calculation in case of different UOM

2018-04-30 15:44:49 +05:30

selling_controller.py

travis fix

2018-03-19 17:31:19 +05:30

status_updater.py

[Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392)

2018-03-27 11:31:44 +05:30

stock_controller.py

Fixed merge conflict

2018-03-23 16:20:27 +05:30

taxes_and_totals.py

Merge branch 'master' into develop

2018-05-02 14:48:10 +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