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

Merge pull request #39207 from nabinhait/get-fixed-asset-acc

Browse Source 
fix: Get fixed_asset_account from asset category
This commit is contained in:
Nabin Hait
2024-01-10 11:32:06 +05:30
committed by GitHub
parent 01f507ebcb 8548eae368
commit 8fdf0ca2d3
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ from pypika import functions as fn
import erpnext import erpnext
from erpnext.accounts.utils import get_account_currency from erpnext.accounts.utils import get_account_currency
from erpnext.assets.doctype.asset.asset import get_asset_account, is_cwip_accounting_enabled from erpnext.assets.doctype.asset.asset import get_asset_account, is_cwip_accounting_enabled
from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account
from erpnext.buying.utils import check_on_hold_or_closed_status from erpnext.buying.utils import check_on_hold_or_closed_status
from erpnext.controllers.buying_controller import BuyingController from erpnext.controllers.buying_controller import BuyingController
from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_transaction from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_transaction
@@ -674,15 +675,16 @@ class PurchaseReceipt(BuyingController):
landed_cost_entries = get_item_account_wise_additional_cost(self.name) landed_cost_entries = get_item_account_wise_additional_cost(self.name)
if d.is_fixed_asset: if d.is_fixed_asset:
account_type = ( if is_cwip_accounting_enabled(d.asset_category):
"capital_work_in_progress_account" stock_asset_account_name = get_asset_account(
if is_cwip_accounting_enabled(d.asset_category) "capital_work_in_progress_account",
else "fixed_asset_account" asset_category=d.asset_category,
) company=self.company,
)
stock_asset_account_name = get_asset_account( else:
account_type, asset_category=d.asset_category, company=self.company stock_asset_account_name = get_asset_category_account(
) "fixed_asset_account", asset_category=d.asset_category, company=self.company
)
stock_value_diff = ( stock_value_diff = (
flt(d.base_net_amount) flt(d.base_net_amount)