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

fix: TypeError in PR for non-stock item (backport #37819) (#37842)

Browse Source 
* fix: `TypeError` in PR for non-stock item

(cherry picked from commit 028b3e2fbf52cdb7561e8d63b54d5918b5bc8af4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
This commit is contained in:
mergify[bot] 2023-11-03 11:56:12 +05:30 committed by GitHub
parent b1982a6961
commit 847dd9e671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -562,11 +562,10 @@ class PurchaseReceipt(BuyingController):
item=d, item=d,
) )
elif ( elif (d.warehouse and d.warehouse not in warehouse_with_no_account) or (
d.warehouse not in warehouse_with_no_account d.rejected_warehouse and d.rejected_warehouse not in warehouse_with_no_account
or d.rejected_warehouse not in warehouse_with_no_account
): ):
warehouse_with_no_account.append(d.warehouse) warehouse_with_no_account.append(d.warehouse or d.rejected_warehouse)
elif ( elif (
d.item_code not in stock_items d.item_code not in stock_items
and not d.is_fixed_asset and not d.is_fixed_asset