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
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index c6c945b..737f12d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -4113,7 +4113,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-12-27 02:01:13.780828",
+ "modified": "2019-01-09 16:51:47.917330",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",