Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: simplify UOM conversion logic

Browse Source 
- Remove unnecessary sql query
- Remove convoluted matching logic and be explcitiy while querying.
- better variable names for understanding matching cases
This commit is contained in:
Ankush Menat 2021-05-23 00:30:27 +05:30
parent 297dc5e345
commit 0d7f54c6c2
No known key found for this signature in database
GPG Key ID: 8EA82E09BBD13AAF
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/stock/doctype/item/item.py
View File

@ -1247,27 +1247,22 @@ def get_uom_conv_factor(uom, stock_uom):
if uom == stock_uom: if uom == stock_uom:
return 1.0 return 1.0
uoms = [uom, stock_uom] exact_match = frappe.db.get_value("UOM Conversion Factor", {"to_uom": stock_uom, "from_uom": uom}, ["value"], as_dict=1)
value = "" if exact_match:
uom_details = frappe.db.sql("""select to_uom, from_uom, value from `tabUOM Conversion Factor`\ return exact_match.value
where to_uom in ({0})
""".format(', '.join([frappe.db.escape(i, percent=False) for i in uoms])), as_dict=True)
for d in uom_details: inverse_match = frappe.db.get_value("UOM Conversion Factor", {"to_uom": uom, "from_uom": stock_uom}, ["value"], as_dict=1)
if d.from_uom == stock_uom and d.to_uom == uom: if inverse_match:
value = 1/flt(d.value) return 1 / inverse_match.value
elif d.from_uom == uom and d.to_uom == stock_uom:
value = d.value
if not value: # This attempts to try and get conversion from intermediate UOM. E.g. mg <=> g <=> kg
uom_stock = frappe.db.get_value("UOM Conversion Factor", {"to_uom": stock_uom}, ["from_uom", "value"], as_dict=1) uom_stock = frappe.db.get_value("UOM Conversion Factor", {"to_uom": stock_uom}, ["from_uom", "value"], as_dict=1)
uom_row = frappe.db.get_value("UOM Conversion Factor", {"to_uom": uom}, ["from_uom", "value"], as_dict=1) uom_row = frappe.db.get_value("UOM Conversion Factor", {"to_uom": uom}, ["from_uom", "value"], as_dict=1)
if uom_stock and uom_row: if uom_stock and uom_row:
if uom_stock.from_uom == uom_row.from_uom: if uom_stock.from_uom == uom_row.from_uom:
value = flt(uom_stock.value) * 1/flt(uom_row.value) return flt(uom_stock.value) * 1/flt(uom_row.value)
return value
@frappe.whitelist() @frappe.whitelist()
def get_item_attribute(parent, attribute_value=''): def get_item_attribute(parent, attribute_value=''):