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

fix: operating cost calculation in JS

Browse Source
This commit is contained in:
Rohan 2019-09-12 16:00:25 +05:30
parent 504e52ff46
commit a656151ee9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,6 +385,11 @@ frappe.ui.form.on("Work Order", {
} }
}); });
} }
},
additional_operating_cost: function(frm) {
erpnext.work_order.calculate_cost(frm.doc);
erpnext.work_order.calculate_total_cost(frm);
} }
}); });
@ -524,9 +529,8 @@ erpnext.work_order = {
}, },
calculate_total_cost: function(frm) { calculate_total_cost: function(frm) {
var variable_cost = frm.doc.actual_operating_cost ? let variable_cost = flt(frm.doc.actual_operating_cost) || flt(frm.doc.planned_operating_cost);
flt(frm.doc.actual_operating_cost) : flt(frm.doc.planned_operating_cost); frm.set_value("total_operating_cost", (flt(frm.doc.additional_operating_cost) + variable_cost))
frm.set_value("total_operating_cost", (flt(frm.doc.additional_operating_cost) + variable_cost));
}, },
set_default_warehouse: function(frm) { set_default_warehouse: function(frm) {