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

fix: validation check when no conversion_factor (#26527)

Browse Source
This commit is contained in:
Noah Jacob 2021-07-16 15:00:08 +05:30 committed by GitHub
parent 627a8a8cfd
commit 3362c080b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/utils.py
View File

@ -314,13 +314,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)