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

fix: Book depreciation until the asset disposal date and removed unwanted commits

Browse Source 
(cherry picked from commit dedae4fecf)
This commit is contained in:
Nabin Hait
2024-03-12 12:32:57 +05:30
committed by Mergify
parent a5e6763be5
commit 2d7ff5d4cf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,9 +242,7 @@ def make_depreciation_entry(
debit_account, debit_account,
accounting_dimensions, accounting_dimensions,
) )
frappe.db.commit()
except Exception as e: except Exception as e:
frappe.db.rollback()
depreciation_posting_error = e depreciation_posting_error = e
asset.set_status() asset.set_status()
@@ -523,6 +521,7 @@ def depreciate_asset(asset_doc, date, notes):
make_depreciation_entry_for_all_asset_depr_schedules(asset_doc, date) make_depreciation_entry_for_all_asset_depr_schedules(asset_doc, date)
asset_doc.reload()
cancel_depreciation_entries(asset_doc, date) cancel_depreciation_entries(asset_doc, date)

2
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
View File

@@ -327,7 +327,7 @@ class AssetDepreciationSchedule(Document):
schedule_date = get_last_day(schedule_date) schedule_date = get_last_day(schedule_date)
# if asset is being sold or scrapped # if asset is being sold or scrapped
if date_of_disposal: if date_of_disposal and getdate(schedule_date) >= getdate(date_of_disposal):
from_date = add_months( from_date = add_months(
getdate(asset_doc.available_for_use_date), getdate(asset_doc.available_for_use_date),
(asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation), (asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation),