From dedae4fecf1e445e82869207f08b3dd04b1d6e17 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 12 Mar 2024 12:32:57 +0530 Subject: [PATCH] fix: Book depreciation until the asset disposal date and removed unwanted commits --- erpnext/assets/doctype/asset/depreciation.py | 3 +-- .../asset_depreciation_schedule/asset_depreciation_schedule.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 191675c2ab4..205f4b90a3a 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -242,9 +242,7 @@ def make_depreciation_entry( debit_account, accounting_dimensions, ) - frappe.db.commit() except Exception as e: - frappe.db.rollback() depreciation_posting_error = e 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) + asset_doc.reload() cancel_depreciation_entries(asset_doc, date) diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index 77469df8955..6e165089334 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -327,7 +327,7 @@ class AssetDepreciationSchedule(Document): schedule_date = get_last_day(schedule_date) # 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( getdate(asset_doc.available_for_use_date), (asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation),