tree fdb3035a14d50320a63bb25fb30b6c4cd048d3dc
parent 3d275af67b203c971754bb9c50a18d5af9cfffc7
parent d5c7410ad189125c956f49b1a9367faf6d0b6647
author Saif Ur Rehman <saifi0102@gmail.com> 1548355295 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1548355295 +0500

Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12

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