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

Make proposed corrections

Browse Source
This commit is contained in:
Ishan Loya 2017-04-21 18:18:39 +05:30 committed by Nabin Hait
parent b12e15dcc4
commit 56c1b2a625
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -145,7 +145,7 @@ erpnext.production_order = {
btn.addClass('btn-primary'); btn.addClass('btn-primary');
} }
} }
} else if(frm.doc.skip_transfer){ } else {
if ((flt(doc.produced_qty) < flt(doc.qty)) && frm.doc.status != 'Stopped') { if ((flt(doc.produced_qty) < flt(doc.qty)) && frm.doc.status != 'Stopped') {
frm.has_finish_btn = true; frm.has_finish_btn = true;
var btn = frm.add_custom_button(__('Finish'), var btn = frm.add_custom_button(__('Finish'),
@ -252,10 +252,8 @@ $.extend(cur_frm.cscript, {
var max = (purpose === "Manufacture") ? var max = (purpose === "Manufacture") ?
flt(this.frm.doc.material_transferred_for_manufacturing) - flt(this.frm.doc.produced_qty) : flt(this.frm.doc.material_transferred_for_manufacturing) - flt(this.frm.doc.produced_qty) :
flt(this.frm.doc.qty) - flt(this.frm.doc.material_transferred_for_manufacturing); flt(this.frm.doc.qty) - flt(this.frm.doc.material_transferred_for_manufacturing);
} else if(this.frm.doc.skip_transfer){ } else {
var max = (purpose === "Manufacture") ? var max = flt(this.frm.doc.qty) - flt(this.frm.doc.produced_qty);
flt(this.frm.doc.qty) - flt(this.frm.doc.produced_qty) :
flt(this.frm.doc.qty) - flt(this.frm.doc.produced_qty);
} }
frappe.prompt({fieldtype:"Float", label: __("Qty for {0}", [purpose]), fieldname:"qty", frappe.prompt({fieldtype:"Float", label: __("Qty for {0}", [purpose]), fieldname:"qty",
@ -334,4 +332,4 @@ cur_frm.fields_dict['project'].get_query = function(doc, dt, dn) {
['Project', 'status', 'not in', 'Completed, Cancelled'] ['Project', 'status', 'not in', 'Completed, Cancelled']
] ]
} }
} }