Saif Ur Rehman 1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt		2019-02-01 19:17:04 +05:00
..
tests	test: fix for Item Tax Template v12	2019-01-11 03:53:43 +05:00
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
accounts_controller.py	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12	2019-02-01 19:17:04 +05:00
buying_controller.py	Fix: merge conflict	2019-01-18 10:15:47 +05:30
item_variant.py	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
print_settings.py	optimize(various)	2018-08-08 16:37:31 +05:30
queries.py	Avoid multiple escapes (#15509)	2018-09-27 15:39:34 +05:30
sales_and_purchase_return.py	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
selling_controller.py	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
status_updater.py	Changes to support refactor in frappe pg-poc branch (#15287)	2018-09-21 10:20:52 +05:30
stock_controller.py	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
taxes_and_totals.py	Merge branch 'staging' into develop	2018-12-06 09:50:25 +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