Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-21 18:28:10 +05:30
commit db94cf16b2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manufacturing/doctype/bom/bom.py
View File

@ -217,7 +217,7 @@ class DocType:
elif m.bom_no: elif m.bom_no:
msgprint("""As Item %s is not a manufactured / sub-contracted item, \ 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) (m.item_code, m.idx), raise_exception = 1)
if flt(m.qty) <= 0: if flt(m.qty) <= 0:

6
stock/doctype/stock_entry/stock_entry.js
View File

@ -44,8 +44,10 @@ erpnext.stock.StockEntry = erpnext.utils.Controller.extend({
clean_up: function() { clean_up: function() {
// Clear Production Order record from locals, because it is updated via Stock Entry // 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") { if(this.frm.doc.production_order &&
wn.model.clear_doclist("Production Order", this.frm.doc.production_order); this.frm.doc.purpose == "Manufacture/Repack") {
wn.model.remove_from_locals("Production Order",
this.frm.doc.production_order);
} }
}, },