nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 02:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58984 from Shllokkk/bom-cost-allocation-per-type-v16

Browse Source 
fix: coerce cost_allocation_per to float in BOM cost allocation
This commit is contained in:
Shllokkk
2026-09-11 14:17:07 +05:30
committed by GitHub
parent a9f3d69fbe 1918ed6a3c
commit ee2474aa9c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -471,7 +471,7 @@ class BOM(WebsiteGenerator):
if item.valuation_type in ("Valuation Rate", "Manual"): if item.valuation_type in ("Valuation Rate", "Manual"):
item.cost_allocation_per = 0 item.cost_allocation_per = 0
own_cost += flt(item.cost) own_cost += flt(item.cost)
total_secondary_items_per += item.cost_allocation_per total_secondary_items_per += flt(item.cost_allocation_per)
if self.cost_allocation_per == 100 and total_secondary_items_per: if self.cost_allocation_per == 100 and total_secondary_items_per:
self.cost_allocation_per -= total_secondary_items_per self.cost_allocation_per -= total_secondary_items_per
@@ -487,9 +487,9 @@ class BOM(WebsiteGenerator):
) )
def validate_total_cost_allocation(self): def validate_total_cost_allocation(self):
total_cost_allocation_per = self.cost_allocation_per total_cost_allocation_per = flt(self.cost_allocation_per)
for item in self.secondary_items: for item in self.secondary_items:
total_cost_allocation_per += item.cost_allocation_per total_cost_allocation_per += flt(item.cost_allocation_per)
if total_cost_allocation_per != 100: if total_cost_allocation_per != 100:
frappe.throw(_("Cost allocation between finished goods and secondary items should equal 100%")) frappe.throw(_("Cost allocation between finished goods and secondary items should equal 100%"))
@@ -1100,7 +1100,7 @@ class BOM(WebsiteGenerator):
for d in self.get("secondary_items"): for d in self.get("secondary_items"):
if d.valuation_type not in ("Valuation Rate", "Manual"): if d.valuation_type not in ("Valuation Rate", "Manual"):
d.cost = flt(allocation_basis * (d.cost_allocation_per / 100), precision) d.cost = flt(allocation_basis * (flt(d.cost_allocation_per) / 100), precision)
d.base_cost = flt(d.cost * self.conversion_rate, precision) d.base_cost = flt(d.cost * self.conversion_rate, precision)
if save: if save:
d.db_update() d.db_update()