Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/manufacturing/doctype/bom/bom.py b/manufacturing/doctype/bom/bom.py
index 2611b7a..d874d3c 100644
--- a/manufacturing/doctype/bom/bom.py
+++ b/manufacturing/doctype/bom/bom.py
@@ -217,7 +217,7 @@
elif m.bom_no:
msgprint("""As Item %s is not a manufactured / sub-contracted item, \
- you can enter BOM against it (Row No: %s).""" %
+ you can not enter BOM against it (Row No: %s).""" %
(m.item_code, m.idx), raise_exception = 1)
if flt(m.qty) <= 0:
diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js
index e4362f8..724b215 100644
--- a/stock/doctype/stock_entry/stock_entry.js
+++ b/stock/doctype/stock_entry/stock_entry.js
@@ -44,8 +44,10 @@
clean_up: function() {
// Clear Production Order record from locals, because it is updated via Stock Entry
- if(this.frm.doc.production_order && this.frm.doc.purpose == "Manufacture/Repack") {
- wn.model.clear_doclist("Production Order", this.frm.doc.production_order);
+ if(this.frm.doc.production_order &&
+ this.frm.doc.purpose == "Manufacture/Repack") {
+ wn.model.remove_from_locals("Production Order",
+ this.frm.doc.production_order);
}
},