nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-30 20:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49050 from mihir-kandoi/48873

Browse Source 
fix: ensure variant conversion factor is returned before the template's
This commit is contained in:
Mihir Kandoi
2025-08-22 00:23:52 +05:30
committed by GitHub
parent 916ed3d6aa d61977d002
commit e909fd352a
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/stock/get_item_details.py
View File

@@ -1328,21 +1328,32 @@ def get_pos_profile(company, pos_profile=None, user=None):
@frappe.whitelist()
def get_conversion_factor(item_code, uom):
item = frappe.get_cached_value("Item", item_code, ["variant_of", "stock_uom"], as_dict=True)
if not item_code or not item:
if not item_code or not item or uom == item.stock_uom:
return {"conversion_factor": 1.0}
if uom == item.stock_uom:
return {"conversion_factor": 1.0}
filters = {"parent": item_code, "uom": uom}
item_codes = [item_code]
if item.variant_of:
filters["parent"] = ("in", (item_code, item.variant_of))
conversion_factor = frappe.get_all("UOM Conversion Detail", filters, pluck="conversion_factor")
if not conversion_factor:
conversion_factor = [get_uom_conv_factor(uom, item.stock_uom) or 1]
item_codes.append(item.variant_of)
return {"conversion_factor": conversion_factor[-1]}
parent = frappe.qb.DocType("Item")
child = frappe.qb.DocType("UOM Conversion Detail")
query = (
frappe.qb.from_(parent)
.join(child)
.on(parent.name == child.parent)
.select(child.conversion_factor)
.where((parent.name.isin(item_codes)) & (child.uom == uom))
.orderby(parent.has_variants)
.limit(1)
)
conversion_factor = query.run(pluck="conversion_factor")
if not conversion_factor:
conversion_factor = get_uom_conv_factor(uom, item.stock_uom)
else:
conversion_factor = conversion_factor[0]
return {"conversion_factor": conversion_factor or 1.0}
@frappe.whitelist()