commit 60b852bb12de8b6effc19a6dec20f119ea935515
author Rohan <Alchez@users.noreply.github.com> Mon Sep 30 13:08:12 2019 +0530
committer GitHub <noreply@github.com> Mon Sep 30 13:08:12 2019 +0530
tree 09919a6c9d8c4b958538216a98721901a2e588cb
parent a51a304cf0373c1921b5e45410a5fecdd2b6fa4a
parent 91aa671a233e3fed20b4ab5c4cdbdee5bb0ec632

Merge branch 'develop' into dev-work-order-bugs

erpnext/manufacturing/doctype/work_order/work_order.js

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index ce7b4f9..d82158a 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -385,6 +385,11 @@
 				}
 			});
 		}
+	},
+
+	additional_operating_cost: function(frm) {
+		erpnext.work_order.calculate_cost(frm.doc);
+		erpnext.work_order.calculate_total_cost(frm);
 	}
 });
 
@@ -524,9 +529,8 @@
 	},
 
 	calculate_total_cost: function(frm) {
-		var variable_cost = frm.doc.actual_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));
+		let variable_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))
 	},
 
 	set_default_warehouse: function(frm) {