nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remaining days for last row

Browse Source
This commit is contained in:
Nabin Hait
2024-12-18 12:47:35 +05:30
committed by Khushi Rawat
parent 2a89bac11d
commit f99d02b71e
1 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
View File

@@ -218,42 +218,25 @@ class AssetDepreciationSchedule(Document):
update_asset_finance_book_row, update_asset_finance_book_row,
value_after_depreciation, value_after_depreciation,
): ):
# asset_doc.validate_asset_finance_books(row) row, value_after_depreciation = self.get_value_after_depreciation(
asset_doc, row, value_after_depreciation, update_asset_finance_book_row
if not value_after_depreciation: )
value_after_depreciation = _get_value_after_depreciation_for_making_schedule(asset_doc, row)
row.value_after_depreciation = value_after_depreciation
if update_asset_finance_book_row:
row.db_update()
final_number_of_depreciations, has_pro_rata = self.get_final_number_of_depreciations(asset_doc, row) final_number_of_depreciations, has_pro_rata = self.get_final_number_of_depreciations(asset_doc, row)
has_wdv_or_dd_non_yearly_pro_rata = self.is_wdv_or_dd_non_yearly_pro_rata(asset_doc, row)
has_wdv_or_dd_non_yearly_pro_rata = False
if (
row.depreciation_method in ("Written Down Value", "Double Declining Balance")
and cint(row.frequency_of_depreciation) != 12
):
has_wdv_or_dd_non_yearly_pro_rata = _check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=True)
skip_row = False
should_get_last_day = is_last_day_of_the_month(row.depreciation_start_date) should_get_last_day = is_last_day_of_the_month(row.depreciation_start_date)
skip_row = False
depreciation_amount = 0 depreciation_amount = 0
number_of_pending_depreciations = final_number_of_depreciations - start
yearly_opening_wdv = value_after_depreciation
self.current_fiscal_year_end_date = None
prev_per_day_depr = True prev_per_day_depr = True
self.current_fiscal_year_end_date = None
yearly_opening_wdv = value_after_depreciation
number_of_pending_depreciations = final_number_of_depreciations - start
for n in range(start, final_number_of_depreciations): for n in range(start, final_number_of_depreciations):
# If depreciation is already completed (for double declining balance) # If depreciation is already completed (for double declining balance)
if skip_row: if skip_row:
continue continue
schedule_date = get_last_day(
add_months(row.depreciation_start_date, n * cint(row.frequency_of_depreciation))
)
if self.has_fiscal_year_changed(row, n): if self.has_fiscal_year_changed(row, n):
yearly_opening_wdv = value_after_depreciation yearly_opening_wdv = value_after_depreciation
@@ -273,7 +256,7 @@ class AssetDepreciationSchedule(Document):
) )
schedule_date = self.get_next_schedule_date( schedule_date = self.get_next_schedule_date(
row, n, schedule_date, has_pro_rata, should_get_last_day, final_number_of_depreciations row, n, has_pro_rata, should_get_last_day, final_number_of_depreciations
) )
# if asset is being sold or scrapped # if asset is being sold or scrapped
@@ -310,6 +293,18 @@ class AssetDepreciationSchedule(Document):
if flt(depreciation_amount, asset_doc.precision("gross_purchase_amount")) > 0: if flt(depreciation_amount, asset_doc.precision("gross_purchase_amount")) > 0:
self.add_depr_schedule_row(schedule_date, depreciation_amount, n) self.add_depr_schedule_row(schedule_date, depreciation_amount, n)
def get_value_after_depreciation(
self, asset_doc, row, value_after_depreciation, update_asset_finance_book_row
):
if not value_after_depreciation:
value_after_depreciation = _get_value_after_depreciation_for_making_schedule(asset_doc, row)
row.value_after_depreciation = value_after_depreciation
if update_asset_finance_book_row:
row.db_update()
return row, value_after_depreciation
def get_final_number_of_depreciations(self, asset_doc, row): def get_final_number_of_depreciations(self, asset_doc, row):
final_number_of_depreciations = cint(row.total_number_of_depreciations) - cint( final_number_of_depreciations = cint(row.total_number_of_depreciations) - cint(
self.opening_number_of_booked_depreciations self.opening_number_of_booked_depreciations
@@ -321,6 +316,16 @@ class AssetDepreciationSchedule(Document):
return final_number_of_depreciations, has_pro_rata return final_number_of_depreciations, has_pro_rata
def is_wdv_or_dd_non_yearly_pro_rata(self, asset_doc, row):
has_wdv_or_dd_non_yearly_pro_rata = False
if (
row.depreciation_method in ("Written Down Value", "Double Declining Balance")
and cint(row.frequency_of_depreciation) != 12
):
has_wdv_or_dd_non_yearly_pro_rata = _check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=True)
return has_wdv_or_dd_non_yearly_pro_rata
def has_fiscal_year_changed(self, row, row_no): def has_fiscal_year_changed(self, row, row_no):
fiscal_year_changed = False fiscal_year_changed = False
@@ -345,7 +350,7 @@ class AssetDepreciationSchedule(Document):
return prev_depreciation_amount return prev_depreciation_amount
def get_next_schedule_date( def get_next_schedule_date(
self, row, n, schedule_date, has_pro_rata, should_get_last_day, final_number_of_depreciations=None self, row, n, has_pro_rata, should_get_last_day, final_number_of_depreciations=None
): ):
if not has_pro_rata or ( if not has_pro_rata or (
n < (cint(final_number_of_depreciations) - 1) or final_number_of_depreciations == 2 n < (cint(final_number_of_depreciations) - 1) or final_number_of_depreciations == 2
@@ -450,6 +455,7 @@ class AssetDepreciationSchedule(Document):
else: else:
# if not existing asset, remaining amount of first row is depreciated in the last row # if not existing asset, remaining amount of first row is depreciated in the last row
depreciation_amount -= self.get("depreciation_schedule")[0].depreciation_amount depreciation_amount -= self.get("depreciation_schedule")[0].depreciation_amount
days = date_diff(asset_doc.to_date, schedule_date) + 1
schedule_date = add_days(schedule_date, days - 1) schedule_date = add_days(schedule_date, days - 1)
return depreciation_amount, schedule_date return depreciation_amount, schedule_date