schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions 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:41:19 +05:30
parent ae031cea63
commit 7174a2cd93
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

@@ -364,6 +364,9 @@ class Asset(AccountsController):
}, },
) )
if len(self.get("finance_books")) > 1 and any(start):
self.sort_depreciation_schedule()
# depreciation schedules need to be cleared before modification due to increase in asset life/asset sales # depreciation schedules need to be cleared before modification due to increase in asset life/asset sales
# JE: Journal Entry, FB: Finance Book # JE: Journal Entry, FB: Finance Book
def clear_depreciation_schedule(self): def clear_depreciation_schedule(self):
@@ -399,6 +402,14 @@ class Asset(AccountsController):
return start return start
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_from_date(self, finance_book): def get_from_date(self, finance_book):
if not self.get("schedules"): if not self.get("schedules"):
return self.available_for_use_date return self.available_for_use_date