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

fix: "update cost" should ignore overridden routing times #29154

Browse Source 
fix: "update cost" should ignore overridden routing times
This commit is contained in:
Ankush Menat 2022-01-11 14:20:44 +05:30 committed by GitHub
parent 75c8b2556e
commit 754596dfc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -530,16 +530,6 @@ class BOM(WebsiteGenerator):
row.hour_rate = (hour_rate / flt(self.conversion_rate) row.hour_rate = (hour_rate / flt(self.conversion_rate)
if self.conversion_rate and hour_rate else hour_rate) if self.conversion_rate and hour_rate else hour_rate)
if self.routing:
time_in_mins = flt(frappe.db.get_value("BOM Operation", {
"workstation": row.workstation,
"operation": row.operation,
"parent": self.routing
}, ["time_in_mins"]))
if time_in_mins:
row.time_in_mins = time_in_mins
if row.hour_rate and row.time_in_mins: if row.hour_rate and row.time_in_mins:
row.base_hour_rate = flt(row.hour_rate) * flt(self.conversion_rate) row.base_hour_rate = flt(row.hour_rate) * flt(self.conversion_rate)
row.operating_cost = flt(row.hour_rate) * flt(row.time_in_mins) / 60.0 row.operating_cost = flt(row.hour_rate) * flt(row.time_in_mins) / 60.0

5
erpnext/manufacturing/doctype/routing/test_routing.py
View File

@ -46,6 +46,7 @@ class TestRouting(ERPNextTestCase):
wo_doc.delete() wo_doc.delete()
def test_update_bom_operation_time(self): def test_update_bom_operation_time(self):
"""Update cost shouldn't update routing times."""
operations = [ operations = [
{ {
"operation": "Test Operation A", "operation": "Test Operation A",
@ -85,8 +86,8 @@ class TestRouting(ERPNextTestCase):
routing_doc.save() routing_doc.save()
bom_doc.update_cost() bom_doc.update_cost()
bom_doc.reload() bom_doc.reload()
self.assertEqual(bom_doc.operations[0].time_in_mins, 90) self.assertEqual(bom_doc.operations[0].time_in_mins, 30)
self.assertEqual(bom_doc.operations[1].time_in_mins, 42.2) self.assertEqual(bom_doc.operations[1].time_in_mins, 20)
def setup_operations(rows): def setup_operations(rows):