schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: incorrect acc depr amount if multiple FBs with straight line or manual method

Browse Source 
(cherry picked from commit dda6baea3e)
This commit is contained in:
anandbaburajan
2023-02-25 14:43:24 +05:30
committed by Mergify
parent 4a557b47d7
commit 304e6bb996
1 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,12 +84,7 @@ class Asset(AccountsController):
if self.calculate_depreciation: if self.calculate_depreciation:
self.value_after_depreciation = 0 self.value_after_depreciation = 0
self.set_depreciation_rate() self.set_depreciation_rate()
if not ( if self.should_prepare_depreciation_schedule():
self.get("schedules")
and "Manual" in [d.depreciation_method for d in self.finance_books]
and self.get_doc_before_save().opening_accumulated_depreciation
== self.opening_accumulated_depreciation
):
self.make_depreciation_schedule(date_of_disposal) self.make_depreciation_schedule(date_of_disposal)
self.set_accumulated_depreciation(date_of_disposal, date_of_return) self.set_accumulated_depreciation(date_of_disposal, date_of_return)
else: else:
@@ -98,6 +93,39 @@ class Asset(AccountsController):
self.opening_accumulated_depreciation self.opening_accumulated_depreciation
) )
def should_prepare_depreciation_schedule(self):
if not self.get("schedules"):
return True
old_asset_doc = self.get_doc_before_save()
if (
old_asset_doc.gross_purchase_amount != self.gross_purchase_amount
or old_asset_doc.opening_accumulated_depreciation != self.opening_accumulated_depreciation
or old_asset_doc.number_of_depreciations_booked != self.number_of_depreciations_booked
):
return True
manual_fb_idx = -1
for d in self.finance_books:
if d.depreciation_method == "Manual":
manual_fb_idx = d.idx
if (
manual_fb_idx == -1
or old_asset_doc.finance_books[manual_fb_idx - 1].total_number_of_depreciations
!= self.finance_books[manual_fb_idx - 1].total_number_of_depreciations
or old_asset_doc.finance_books[manual_fb_idx - 1].frequency_of_depreciation
!= self.finance_books[manual_fb_idx - 1].frequency_of_depreciation
or old_asset_doc.finance_books[manual_fb_idx - 1].depreciation_start_date
!= getdate(self.finance_books[manual_fb_idx - 1].depreciation_start_date)
or old_asset_doc.finance_books[manual_fb_idx - 1].expected_value_after_useful_life
!= self.finance_books[manual_fb_idx - 1].expected_value_after_useful_life
):
return True
return False
def validate_item(self): def validate_item(self):
item = frappe.get_cached_value( item = frappe.get_cached_value(
"Item", self.item_code, ["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1 "Item", self.item_code, ["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1
@@ -549,11 +577,7 @@ class Asset(AccountsController):
def set_accumulated_depreciation( def set_accumulated_depreciation(
self, date_of_disposal=None, date_of_return=None, ignore_booked_entry=False self, date_of_disposal=None, date_of_return=None, ignore_booked_entry=False
): ):
straight_line_idx = [ straight_line_idx = []
d.idx
for d in self.get("schedules")
if d.depreciation_method == "Straight Line" or d.depreciation_method == "Manual"
]
finance_books = [] finance_books = []
for i, d in enumerate(self.get("schedules")): for i, d in enumerate(self.get("schedules")):
@@ -561,6 +585,12 @@ class Asset(AccountsController):
continue continue
if int(d.finance_book_id) not in finance_books: if int(d.finance_book_id) not in finance_books:
straight_line_idx = [
s.idx
for s in self.get("schedules")
if s.finance_book_id == d.finance_book_id
and (s.depreciation_method == "Straight Line" or s.depreciation_method == "Manual")
]
accumulated_depreciation = flt(self.opening_accumulated_depreciation) accumulated_depreciation = flt(self.opening_accumulated_depreciation)
value_after_depreciation = flt( value_after_depreciation = flt(
self.get("finance_books")[cint(d.finance_book_id) - 1].value_after_depreciation self.get("finance_books")[cint(d.finance_book_id) - 1].value_after_depreciation