Merge branch 'pr-dn-return' of https://github.com/marination/erpnext into pr-dn-return
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 858dec0..4201e0b 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1084,7 +1084,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2020-07-31 14:39:44.599294",
+ "modified": "2020-07-31 14:13:44.610190",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 8fa56ac..a68b738 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1,7 +1,6 @@
{
"actions": [],
"allow_import": 1,
- "allow_workflow": 1,
"autoname": "naming_series:",
"creation": "2013-06-18 12:39:59",
"doctype": "DocType",
@@ -1461,7 +1460,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2020-07-18 05:13:06.680696",
+ "modified": "2020-07-31 14:13:17.962015",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -1535,7 +1534,7 @@
"sort_field": "modified",
"sort_order": "DESC",
"timeline_field": "customer",
- "title_field": "title",
+ "title_field": "customer",
"track_changes": 1,
"track_seen": 1
}
\ No newline at end of file