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

Merge pull request #33478 from frappe/mergify/bp/version-13-hotfix/pr-32714

Browse Source 
fix: Conversion factor error for invoices without item code (petty expenses) (backport #32714)
This commit is contained in:
Deepesh Garg
2022-12-31 13:06:11 +05:30
committed by GitHub
parent 8156cb4db0 3f9b8923a9
commit 6ab91348fd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@@ -843,7 +843,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2022-10-10 20:57:38.340026",
"modified": "2022-12-28 16:17:33.484531",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",

7
erpnext/controllers/accounts_controller.py
View File

@@ -573,7 +573,12 @@ class AccountsController(TransactionBase):
if bool(uom) != bool(stock_uom): # xor
item.stock_uom = item.uom = uom or stock_uom
item.conversion_factor = get_uom_conv_factor(item.get("uom"), item.get("stock_uom"))
# UOM cannot be zero so substitute as 1
item.conversion_factor = (
get_uom_conv_factor(item.get("uom"), item.get("stock_uom"))
or item.get("conversion_factor")
or 1
)
if self.doctype == "Purchase Invoice":
self.set_expense_account(for_validate)