Saif Ur Rehman 8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json		2019-01-10 04:23:40 +05:00
..
tests	Item qty based tax (CESS) calculation support (#15456)	2018-11-13 11:13:04 +05:30
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
accounts_controller.py	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12	2019-01-10 04:23:40 +05:00
buying_controller.py	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
item_variant.py	Changes to support refactor in frappe pg-poc branch (#15287)	2018-09-21 10:20:52 +05:30
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 'master' into staging-fixes	2018-11-28 08:12:48 +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	feat(quality): Check quality status before receipt/delivery (#16169)	2018-12-24 14:54:42 +05:30
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