schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Conversion factor error for invoices without item code (petty expenses) (#32714)

Browse Source 
* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 617518389a)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
This commit is contained in:
Deepesh Garg
2022-12-29 10:41:36 +05:30
committed by Mergify
parent 5ec11bad4f
commit acf8b464f3
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -843,7 +843,11 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-10-10 20:57:38.340026", "modified": "2022-10-10 20:57:38.340026",
=======
"modified": "2022-12-28 16:17:33.484531",
>>>>>>> 617518389a (fix: Conversion factor error for invoices without item code (petty expenses) (#32714))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "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 if bool(uom) != bool(stock_uom): # xor
item.stock_uom = item.uom = uom or stock_uom 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": if self.doctype == "Purchase Invoice":
self.set_expense_account(for_validate) self.set_expense_account(for_validate)