tree 63c719c47bc47e6a550b244bc33ecc2b4e9d24d6
parent eb7277d2d43dfa24ae0fab3fd1d350bd002c64b4
parent f74e28bc648d2e68d194f29e545d7f6471f21c41
author Saif Ur Rehman <saifi0102@gmail.com> 1548354856 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1548354856 +0500

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

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