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
..
authorization_control	resolved merge conflict	2018-06-20 15:23:25 +05:30
authorization_rule	Refactor Naming Series (#15070)	2018-08-28 13:44:48 +05:30
brand	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)	2019-01-07 18:19:30 +05:30
company	[setup][fix] company fixtures	2018-12-12 21:29:55 +05:30
currency_exchange	Fix currency exchange tests (#14356)	2018-06-05 14:16:10 +05:30
customer_group	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
email_digest	fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320)	2018-09-05 17:18:59 +05:30
global_defaults	[Feature] Route optimization for Delivery Trip stops (#15566)	2018-11-08 11:57:05 +05:30
item_group	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
naming_series	Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered (#15514)	2018-09-27 15:48:04 +05:30
party_type	Refactor party type (#13831)	2018-05-16 11:02:26 +05:30
print_heading	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
quotation_lost_reason	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
sales_partner	Defaults in Item Group (#14874)	2018-07-17 18:01:44 +05:30
sales_person	Sales person Commission Report and more (#15431)	2018-09-25 19:08:16 +05:30
setup_progress	[progress] R/W permission for all roles (#10866)	2017-09-21 12:02:18 +05:30
setup_progress_action	Progress fixes (#10710)	2017-09-13 18:41:01 +05:30
supplier_group	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
target_detail	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)	2019-01-07 18:19:30 +05:30
terms_and_conditions	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
territory	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
uom	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
uom_conversion_factor	Refactor Naming Series (#15070)	2018-08-28 13:44:48 +05:30
website_item_group	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30