Saif Ur Rehman 380b4b0926 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json		2019-01-08 13:41:46 +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-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
buying_controller.py	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
item_variant.py	Small python 3 compatibility correction (#15151)	2018-08-16 10:32:49 +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	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
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	feat(quality): Check quality status before receipt/delivery (#16169)	2018-12-24 14:54:42 +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