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

production order - fixes cost not considering qty issue

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-05-06 15:43:35 +05:30
parent 08c0c04ef2
commit e63146408d
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,13 @@ $.extend(cur_frm.cscript, {
method: "set_production_order_operations" method: "set_production_order_operations"
}); });
}, },
qty: function() {
return this.frm.call({
doc: this.frm.doc,
method: "set_production_order_operations"
});
},
show_time_logs: function(doc, cdt, cdn) { show_time_logs: function(doc, cdt, cdn) {
var child = locals[cdt][cdn] var child = locals[cdt][cdn]

15
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -35,7 +35,7 @@ class ProductionOrder(Document):
self.validate_sales_order() self.validate_sales_order()
self.validate_warehouse() self.validate_warehouse()
self.calculate_operating_cost() self.calculate_time()
self.validate_delivery_date() self.validate_delivery_date()
from erpnext.utilities.transaction_base import validate_uom_is_integer from erpnext.utilities.transaction_base import validate_uom_is_integer
@ -63,6 +63,7 @@ class ProductionOrder(Document):
def calculate_operating_cost(self): def calculate_operating_cost(self):
self.planned_operating_cost, self.actual_operating_cost = 0.0, 0.0 self.planned_operating_cost, self.actual_operating_cost = 0.0, 0.0
for d in self.get("operations"): for d in self.get("operations"):
d.planned_operating_cost = flt(d.hour_rate) * (flt(d.time_in_mins) / 60.0)
d.actual_operating_cost = flt(d.hour_rate) * (flt(d.actual_operation_time) / 60.0) d.actual_operating_cost = flt(d.hour_rate) * (flt(d.actual_operation_time) / 60.0)
self.planned_operating_cost += flt(d.planned_operating_cost) self.planned_operating_cost += flt(d.planned_operating_cost)
@ -175,14 +176,20 @@ class ProductionOrder(Document):
self.set('operations', []) self.set('operations', [])
operations = frappe.db.sql("""select operation, description, workstation, idx, operations = frappe.db.sql("""select operation, description, workstation, idx,
hour_rate, time_in_mins, operating_cost as "planned_operating_cost", "Pending" as status hour_rate, time_in_mins, 0 as "planned_operating_cost", "Pending" as status
from `tabBOM Operation` where parent = %s order by idx""", self.bom_no, as_dict=1) from `tabBOM Operation` where parent = %s order by idx""", self.bom_no, as_dict=1)
self.set('operations', operations) self.set('operations', operations)
self.calculate_time()
def calculate_time(self):
bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
for d in self.get("operations"):
d.time_in_mins = d.time_in_mins / bom_qty * flt(self.qty)
self.calculate_operating_cost() self.calculate_operating_cost()
def get_holidays(self, workstation): def get_holidays(self, workstation):
holiday_list = frappe.db.get_value("Workstation", workstation, "holiday_list") holiday_list = frappe.db.get_value("Workstation", workstation, "holiday_list")