nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-24 17:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nabin Hait
2024-03-02 19:06:48 +05:30
parent ffd04b3960
commit 5fcf8c588a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/doctype/asset/asset.py
View File

@@ -351,7 +351,7 @@ class Asset(AccountsController):
if len(self.get("finance_books")) > 1 and any(start): if len(self.get("finance_books")) > 1 and any(start):
self.sort_depreciation_schedule() self.sort_depreciation_schedule()
def _make_depreciation_schedule( def _make_depreciation_schedule(
self, finance_book, start, date_of_disposal, value_after_depreciation=None self, finance_book, start, date_of_disposal, value_after_depreciation=None
): ):
@@ -428,7 +428,7 @@ class Asset(AccountsController):
schedule_date = get_last_day(schedule_date) schedule_date = get_last_day(schedule_date)
# if asset is being sold # if asset is being sold
if date_of_disposal: if date_of_disposal and getdate(schedule_date) >= getdate(date_of_disposal):
from_date = self.get_from_date_for_disposal(finance_book) from_date = self.get_from_date_for_disposal(finance_book)
depreciation_amount, days, months = self.get_pro_rata_amt( depreciation_amount, days, months = self.get_pro_rata_amt(
finance_book, finance_book,

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

@@ -157,7 +157,6 @@ def get_depreciation_cost_center_and_depreciation_series_for_company():
return res return res
@frappe.whitelist() @frappe.whitelist()
def make_depreciation_entry( def make_depreciation_entry(
asset_name, asset_name,
@@ -210,9 +209,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()
@@ -467,13 +464,14 @@ def restore_asset(asset_name):
def depreciate_asset(asset, date): def depreciate_asset(asset, date):
if not asset.calculate_depreciation: if not asset.calculate_depreciation:
return return
asset.flags.ignore_validate_update_after_submit = True asset.flags.ignore_validate_update_after_submit = True
asset.prepare_depreciation_data(date_of_disposal=date) asset.prepare_depreciation_data(date_of_disposal=date)
asset.save() asset.save()
make_depreciation_entry(asset.name, date) make_depreciation_entry(asset.name, date)
asset.reload()
cancel_depreciation_entries(asset, date) cancel_depreciation_entries(asset, date)