tree 13b7ab5eec16fece5b50f131470ea70f56742a29
parent 398f593e5f876de40aaa1cf769c20b2068bdf721
parent 4d1a9b10ed24cd4c62d3311908a2c44bef9012e2
author Saif Ur Rehman <saifi0102@gmail.com> 1548156040 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1548156040 +0500

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

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json