nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48876 from frappe/mergify/bp/version-15-hotfix/pr-48873

Browse Source 
fix: return conversion factor of variant and not template (backport #48873)
This commit is contained in:
mergify[bot]
2025-07-31 07:03:15 +00:00
committed by GitHub
parent 87de70f4fd
commit 7bb127de63
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/get_item_details.py
View File

@@ -1287,12 +1287,12 @@ def get_conversion_factor(item_code, uom):
if variant_of: if variant_of:
filters["parent"] = ("in", (item_code, variant_of)) filters["parent"] = ("in", (item_code, variant_of))
conversion_factor = frappe.db.get_value("UOM Conversion Detail", filters, "conversion_factor") conversion_factor = frappe.get_all("UOM Conversion Detail", filters, pluck="conversion_factor")
if not conversion_factor: if not conversion_factor:
stock_uom = frappe.db.get_value("Item", item_code, "stock_uom") stock_uom = frappe.db.get_value("Item", item_code, "stock_uom")
conversion_factor = get_uom_conv_factor(uom, stock_uom) conversion_factor = [get_uom_conv_factor(uom, stock_uom) or 1]
return {"conversion_factor": conversion_factor or 1.0} return {"conversion_factor": conversion_factor[-1]}
@frappe.whitelist() @frappe.whitelist()