CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-30 01:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: get assets received but not billed account only if any asset item is received (backport #41734) (#41735)

Browse Source 
fix: get assets received but not billed account only if any asset item is received (#41734)

fix: get assets received but not billed account only if any asset item received
(cherry picked from commit 39885b2b01)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
mergify[bot]
2024-06-03 16:18:29 +05:30
committed by GitHub
parent 8ff5a67b99
commit 638c94451e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -448,7 +448,7 @@ class PurchaseInvoice(BuyingController):
stock_not_billed_account = self.get_company_default("stock_received_but_not_billed") stock_not_billed_account = self.get_company_default("stock_received_but_not_billed")
stock_items = self.get_stock_items() stock_items = self.get_stock_items()
asset_received_but_not_billed = self.get_company_default("asset_received_but_not_billed") self.asset_received_but_not_billed = None
if self.update_stock: if self.update_stock:
self.validate_item_code() self.validate_item_code()
@@ -534,18 +534,23 @@ class PurchaseInvoice(BuyingController):
elif item.is_fixed_asset: elif item.is_fixed_asset:
account = None account = None
if item.pr_detail: if item.pr_detail:
if not self.asset_received_but_not_billed:
self.asset_received_but_not_billed = self.get_company_default(
"asset_received_but_not_billed"
)
# check if 'Asset Received But Not Billed' account is credited in Purchase receipt or not # check if 'Asset Received But Not Billed' account is credited in Purchase receipt or not
arbnb_booked_in_pr = frappe.db.get_value( arbnb_booked_in_pr = frappe.db.get_value(
"GL Entry", "GL Entry",
{ {
"voucher_type": "Purchase Receipt", "voucher_type": "Purchase Receipt",
"voucher_no": item.purchase_receipt, "voucher_no": item.purchase_receipt,
"account": asset_received_but_not_billed, "account": self.asset_received_but_not_billed,
}, },
"name", "name",
) )
if arbnb_booked_in_pr: if arbnb_booked_in_pr:
account = asset_received_but_not_billed account = self.asset_received_but_not_billed
if not account: if not account:
account_type = ( account_type = (