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

fix: incorrect row order and accumulated_depreciation when schedule with multiple FBs is scrapped

Browse Source
This commit is contained in:
anandbaburajan
2023-01-21 18:40:57 +05:30
parent dffdc67455
commit 96f9b34b19
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,6 +237,9 @@ class Asset(AccountsController):
for finance_book in self.get("finance_books"): for finance_book in self.get("finance_books"):
self._make_depreciation_schedule(finance_book, start, date_of_disposal) self._make_depreciation_schedule(finance_book, start, date_of_disposal)
if len(self.get("finance_books")) > 1 and any(start):
self.sort_depreciation_schedule()
def _make_depreciation_schedule(self, finance_book, start, date_of_disposal): def _make_depreciation_schedule(self, finance_book, start, date_of_disposal):
self.validate_asset_finance_books(finance_book) self.validate_asset_finance_books(finance_book)
@@ -365,6 +368,14 @@ class Asset(AccountsController):
}, },
) )
def sort_depreciation_schedule(self):
self.schedules = sorted(
self.schedules, key=lambda s: (int(s.finance_book_id), getdate(s.schedule_date))
)
for idx, s in enumerate(self.schedules, 1):
s.idx = idx
def _get_value_after_depreciation(self, finance_book): def _get_value_after_depreciation(self, finance_book):
# value_after_depreciation - current Asset value # value_after_depreciation - current Asset value
if self.docstatus == 1 and finance_book.value_after_depreciation: if self.docstatus == 1 and finance_book.value_after_depreciation: