Saif Ur Rehman d5c7410ad1 Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ...

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
#	erpnext/selling/doctype/sales_order/sales_order.json

2019-01-24 23:34:16 +05:00

..

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

Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template

2019-01-24 23:34:16 +05:00

buying_controller.py

BIS issue fixes

2019-01-16 15:59:39 +05:30

item_variant.py

style: Remove unused imports

2019-01-23 00:28:37 +05:30

print_settings.py

optimize(various)

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

queries.py

Fixed merge conflict

2018-08-29 13:34:58 +05:30

sales_and_purchase_return.py

Merge branch 'master' into staging-fixes

2018-10-04 09:25:07 +00:00

selling_controller.py

style: Remove unused imports

2019-01-23 00:28:37 +05:30

status_updater.py

[Fix] 'To Bill' status even if the amount is zero (#14784)

2018-09-06 18:27:06 +05:30

stock_controller.py

style: Remove unused imports

2019-01-23 00:28:37 +05:30

taxes_and_totals.py

Merge branch 'master' into staging-fixes

2018-12-06 09:26:42 +00:00

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