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

fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport #35714) (#35716)

Browse Source 
* fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714)

fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2cac7)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
This commit is contained in:
mergify[bot]
2023-06-15 17:40:42 +05:30
committed by GitHub
parent c2bf8e3502
commit 0e11317303
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -466,6 +466,10 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None,
"cost_center": depreciation_cost_center, "cost_center": depreciation_cost_center,
"posting_date": date, "posting_date": date,
}, },
]
if accumulated_depr_amount:
gl_entries.append(
{ {
"account": accumulated_depr_account, "account": accumulated_depr_account,
"debit_in_account_currency": accumulated_depr_amount, "debit_in_account_currency": accumulated_depr_amount,
@@ -473,7 +477,7 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None,
"cost_center": depreciation_cost_center, "cost_center": depreciation_cost_center,
"posting_date": date, "posting_date": date,
}, },
] )
profit_amount = flt(selling_amount) - flt(value_after_depreciation) profit_amount = flt(selling_amount) - flt(value_after_depreciation)
if profit_amount: if profit_amount: