* fix: fetch new fields in bom from routing (cherry picked from commit18e2a33a9b) * fix: dont hardcode hour rate precision (cherry picked from commit362102e802) # Conflicts: # erpnext/manufacturing/doctype/bom_operation/bom_operation.json * fix: resolve conflict Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
@@ -192,12 +192,13 @@ class BOM(WebsiteGenerator):
|
||||
if self.routing:
|
||||
self.set("operations", [])
|
||||
fields = ["sequence_id", "operation", "workstation", "description",
|
||||
"time_in_mins", "batch_size", "operating_cost", "idx", "hour_rate"]
|
||||
"time_in_mins", "batch_size", "operating_cost", "idx", "hour_rate",
|
||||
"set_cost_based_on_bom_qty"]
|
||||
|
||||
for row in frappe.get_all("BOM Operation", fields = fields,
|
||||
filters = {'parenttype': 'Routing', 'parent': self.routing}, order_by="sequence_id, idx"):
|
||||
child = self.append('operations', row)
|
||||
child.hour_rate = flt(row.hour_rate / self.conversion_rate, 2)
|
||||
child.hour_rate = flt(row.hour_rate / self.conversion_rate, child.precision("hour_rate"))
|
||||
|
||||
def set_bom_material_details(self):
|
||||
for item in self.get("items"):
|
||||
|
||||
@@ -65,7 +65,8 @@
|
||||
"label": "Hour Rate",
|
||||
"oldfieldname": "hour_rate",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "currency"
|
||||
"options": "currency",
|
||||
"precision": "2"
|
||||
},
|
||||
{
|
||||
"description": "In minutes",
|
||||
@@ -177,7 +178,7 @@
|
||||
"index_web_pages_for_search": 1,
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-09-13 16:45:01.092868",
|
||||
"modified": "2022-03-10 06:19:08.462027",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Manufacturing",
|
||||
"name": "BOM Operation",
|
||||
|
||||
Reference in New Issue
Block a user