schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fetch new fields from routing to bom (backport #30169) (#30171)

Browse Source 
* fix: fetch new fields in bom from routing

(cherry picked from commit 18e2a33a9b)

* fix: dont hardcode hour rate precision

(cherry picked from commit 362102e802)

# 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:
mergify[bot]
2022-03-10 18:09:09 +05:30
committed by GitHub
parent 33ddbb4f3c
commit f06554236f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,12 +192,13 @@ class BOM(WebsiteGenerator):
if self.routing: if self.routing:
self.set("operations", []) self.set("operations", [])
fields = ["sequence_id", "operation", "workstation", "description", 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, for row in frappe.get_all("BOM Operation", fields = fields,
filters = {'parenttype': 'Routing', 'parent': self.routing}, order_by="sequence_id, idx"): filters = {'parenttype': 'Routing', 'parent': self.routing}, order_by="sequence_id, idx"):
child = self.append('operations', row) 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): def set_bom_material_details(self):
for item in self.get("items"): for item in self.get("items"):

5
erpnext/manufacturing/doctype/bom_operation/bom_operation.json
View File

@@ -65,7 +65,8 @@
"label": "Hour Rate", "label": "Hour Rate",
"oldfieldname": "hour_rate", "oldfieldname": "hour_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "currency" "options": "currency",
"precision": "2"
}, },
{ {
"description": "In minutes", "description": "In minutes",
@@ -177,7 +178,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-09-13 16:45:01.092868", "modified": "2022-03-10 06:19:08.462027",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Operation", "name": "BOM Operation",