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

fix: do not mandate depreciation accounts for non depreciable asset category

Browse Source 
(cherry picked from commit 32cb7d6388)
This commit is contained in:
Khushi Rawat
2025-05-13 16:43:03 +05:30
committed by Mergify
parent 96d3bfd2d9
commit a75931c90f
1 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
erpnext/assets/doctype/asset/depreciation.py
View File

@@ -330,45 +330,6 @@ def _make_journal_entry_for_depreciation(
row.db_update() row.db_update()
def get_depreciation_accounts(asset_category, company):
fixed_asset_account = accumulated_depreciation_account = depreciation_expense_account = None
accounts = frappe.db.get_value(
"Asset Category Account",
filters={"parent": asset_category, "company_name": company},
fieldname=[
"fixed_asset_account",
"accumulated_depreciation_account",
"depreciation_expense_account",
],
as_dict=1,
)
if accounts:
fixed_asset_account = accounts.fixed_asset_account
accumulated_depreciation_account = accounts.accumulated_depreciation_account
depreciation_expense_account = accounts.depreciation_expense_account
if not accumulated_depreciation_account or not depreciation_expense_account:
accounts = frappe.get_cached_value(
"Company", company, ["accumulated_depreciation_account", "depreciation_expense_account"]
)
if not accumulated_depreciation_account:
accumulated_depreciation_account = accounts[0]
if not depreciation_expense_account:
depreciation_expense_account = accounts[1]
if not fixed_asset_account or not accumulated_depreciation_account or not depreciation_expense_account:
frappe.throw(
_("Please set Depreciation related Accounts in Asset Category {0} or Company {1}").format(
asset_category, company
)
)
return fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account
def get_credit_and_debit_accounts(accumulated_depreciation_account, depreciation_expense_account): def get_credit_and_debit_accounts(accumulated_depreciation_account, depreciation_expense_account):
root_type = frappe.get_value("Account", depreciation_expense_account, "root_type") root_type = frappe.get_value("Account", depreciation_expense_account, "root_type")
@@ -721,8 +682,8 @@ def get_asset_details(asset, finance_book=None):
value_after_depreciation = asset.get_value_after_depreciation(finance_book) value_after_depreciation = asset.get_value_after_depreciation(finance_book)
accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation) accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
fixed_asset_account, accumulated_depr_account, _ = get_asset_accounts( fixed_asset_account, accumulated_depr_account, _ = get_depreciation_accounts(
asset.asset_category, asset.company, accumulated_depr_amount asset.asset_category, asset.company
) )
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company) disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
depreciation_cost_center = asset.cost_center or depreciation_cost_center depreciation_cost_center = asset.cost_center or depreciation_cost_center
@@ -738,9 +699,13 @@ def get_asset_details(asset, finance_book=None):
) )
def get_asset_accounts(asset_category, company, accumulated_depr_amount): def get_depreciation_accounts(asset_category, company):
fixed_asset_account = accumulated_depreciation_account = depreciation_expense_account = None fixed_asset_account = accumulated_depreciation_account = depreciation_expense_account = None
non_depreciable_category = frappe.db.get_value(
"Asset Category", asset_category, "non_depreciable_category"
)
accounts = frappe.db.get_value( accounts = frappe.db.get_value(
"Asset Category Account", "Asset Category Account",
filters={"parent": asset_category, "company_name": company}, filters={"parent": asset_category, "company_name": company},
@@ -760,7 +725,7 @@ def get_asset_accounts(asset_category, company, accumulated_depr_amount):
if not fixed_asset_account: if not fixed_asset_account:
frappe.throw(_("Please set Fixed Asset Account in Asset Category {0}").format(asset_category)) frappe.throw(_("Please set Fixed Asset Account in Asset Category {0}").format(asset_category))
if accumulated_depr_amount: if not non_depreciable_category:
accounts = frappe.get_cached_value( accounts = frappe.get_cached_value(
"Company", company, ["accumulated_depreciation_account", "depreciation_expense_account"] "Company", company, ["accumulated_depreciation_account", "depreciation_expense_account"]
) )