Merge pull request #9353 from mbauskar/develop
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 03e5390..83e0950 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -68,6 +68,10 @@
scrap_items = true;
}
+ if (child.bom_no) {
+ child.bom_no = '';
+ }
+
get_bom_material_detail(doc, cdt, cdn, scrap_items);
},
})
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 256f847..0e3a4f9 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -19,7 +19,7 @@
def validate_posting_time(self):
# set Edit Posting Date and Time to 1 while data import
- if frappe.flags.in_import:
+ if frappe.flags.in_import and self.posting_date:
self.set_posting_time = 1
if not getattr(self, 'set_posting_time', None):