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

fix: validation check when no conversion_factor (#26528)

Browse Source
This commit is contained in:
Noah Jacob
2021-07-16 15:01:14 +05:30
committed by GitHub
parent f4a9e52cbe
commit b22cbb3122
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/utils.py
View File

@@ -316,13 +316,16 @@ def update_included_uom_in_report(columns, result, include_uom, conversion_facto
for row_idx, row in enumerate(result): for row_idx, row in enumerate(result):
data = row.items() if is_dict_obj else enumerate(row) data = row.items() if is_dict_obj else enumerate(row)
for key, value in data: for key, value in data:
if key not in convertible_columns or not conversion_factors[row_idx-1]: if key not in convertible_columns:
continue continue
# If no conversion factor for the UOM, defaults to 1
if not conversion_factors[row_idx]:
conversion_factors[row_idx] = 1
if convertible_columns.get(key) == 'rate': if convertible_columns.get(key) == 'rate':
new_value = flt(value) * conversion_factors[row_idx-1] new_value = flt(value) * conversion_factors[row_idx]
else: else:
new_value = flt(value) / conversion_factors[row_idx-1] new_value = flt(value) / conversion_factors[row_idx]
if not is_dict_obj: if not is_dict_obj:
row.insert(key+1, new_value) row.insert(key+1, new_value)
@@ -370,4 +373,4 @@ def add_additional_uom_columns(columns, result, include_uom, conversion_factors)
else: else:
row[data.converted_col] = flt(value_before_conversion) / conversion_factor row[data.converted_col] = flt(value_before_conversion) / conversion_factor
result[row_idx] = row result[row_idx] = row