From 7bb127de6351dcac9082bcfdee7c7813b1a3df7a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 07:03:15 +0000 Subject: [PATCH] Merge pull request #48876 from frappe/mergify/bp/version-15-hotfix/pr-48873 fix: return conversion factor of variant and not template (backport #48873) --- erpnext/stock/get_item_details.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 879b4836ac9..8d04141d78c 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -1287,12 +1287,12 @@ def get_conversion_factor(item_code, uom): if 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: 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()