CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 00:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37812 from frappe/mergify/bp/version-14-hotfix/pr-37737

Browse Source 
fix: fetch asset received but not billed account only when needed (backport #37737)
This commit is contained in:
Deepesh Garg
2023-11-01 12:10:04 +05:30
committed by GitHub
parent 08a9a9d188 7df4009dd3
commit 555cc62e50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,7 +592,6 @@ class PurchaseInvoice(BuyingController):
def get_gl_entries(self, warehouse_account=None):
self.auto_accounting_for_stock = erpnext.is_perpetual_inventory_enabled(self.company)
self.asset_received_but_not_billed = self.get_company_default("asset_received_but_not_billed")
if self.auto_accounting_for_stock:
self.stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
@@ -946,10 +945,11 @@ class PurchaseInvoice(BuyingController):
)
stock_rbnb = (
self.asset_received_but_not_billed
self.get_company_default("asset_received_but_not_billed")
if item.is_fixed_asset
else self.stock_received_but_not_billed
)
if not negative_expense_booked_in_pr:
gl_entries.append(
self.get_gl_dict(