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

Cost of Production cycle

Browse Source
This commit is contained in:
Neil Trini Lasrado 2014-09-10 17:04:10 +05:30
parent e9882e12ba
commit 6a7f75c3e3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/manufacturing/doctype/bom/bom.js
View File

@ -155,8 +155,6 @@ erpnext.bom.calculate_fixed_cost = function(doc) {
total_fixed_cost += flt(op[i].fixed_cycle_cost); total_fixed_cost += flt(op[i].fixed_cycle_cost);
} }
cur_frm.set_value("total_fixed_cost", total_fixed_cost); cur_frm.set_value("total_fixed_cost", total_fixed_cost);
doc.total_cost = flt(total_fixed_cost) + flt(doc.total_variable_cost);
refresh_field('total_cost');
} }
erpnext.bom.calculate_rm_cost = function(doc) { erpnext.bom.calculate_rm_cost = function(doc) {
@ -169,8 +167,7 @@ erpnext.bom.calculate_rm_cost = function(doc) {
{'qty_consumed_per_unit': flt(rm[i].qty)/flt(doc.quantity)}, 'bom_materials'); {'qty_consumed_per_unit': flt(rm[i].qty)/flt(doc.quantity)}, 'bom_materials');
total_rm_cost += amt; total_rm_cost += amt;
} }
doc.raw_material_cost = total_rm_cost; cur_frm.set_value("raw_material_cost", total_rm_cost);
refresh_field('raw_material_cost');
} }

2
erpnext/manufacturing/doctype/workstation/workstation.py
View File

@ -20,4 +20,4 @@ class Workstation(Document):
frappe.db.set(self, 'overhead', flt(self.hour_rate_electricity) + frappe.db.set(self, 'overhead', flt(self.hour_rate_electricity) +
flt(self.hour_rate_consumable) + flt(self.hour_rate_rent)) flt(self.hour_rate_consumable) + flt(self.hour_rate_rent))
frappe.db.set(self, 'hour_rate', flt(self.hour_rate_labour) + flt(self.overhead)) frappe.db.set(self, 'hour_rate', flt(self.hour_rate_labour) + flt(self.overhead))
self.update_bom_operation() self.update_bom_operation()