tree 26766b93afeeb81ad8d1880c4be4f51c0ba79e3d
parent 74a337009511d88da5c1d1b9a6238759380e4e16
parent 41b3756df5eac4fa9a46e2448a17db13f718dc85
author Saif Ur Rehman <saifi0102@gmail.com> 1548355216 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1548355216 +0500

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

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json