nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: removed code duplicacies

Browse Source 
(cherry picked from commit 6b24143f72)
This commit is contained in:
Khushi Rawat
2024-05-10 15:21:34 +05:30
committed by Mergify
parent 3eff9c9779
commit 0b21026eef
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -637,18 +637,14 @@ def get_straight_line_or_manual_depr_amount(
elif asset.flags.decrease_in_asset_value_due_to_value_adjustment: elif asset.flags.decrease_in_asset_value_due_to_value_adjustment:
if row.daily_prorata_based: if row.daily_prorata_based:
amount = flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life) amount = flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life)
total_years = flt(number_of_pending_depreciations * row.frequency_of_depreciation) / 12
every_year_depr = amount / total_years
year_start_date = add_years( return get_daily_prorata_based_straight_line_depr(
row.depreciation_start_date, (row.frequency_of_depreciation * schedule_idx) // 12 asset,
row,
schedule_idx,
number_of_pending_depreciations,
amount,
) )
year_end_date = add_days(add_years(year_start_date, 1), -1)
daily_depr_amount = every_year_depr / (date_diff(year_end_date, year_start_date) + 1)
total_depreciable_days = _get_total_days(
row.depreciation_start_date, schedule_idx, row.frequency_of_depreciation
)
return daily_depr_amount * total_depreciable_days
else: else:
return ( return (
flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life) flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life)
@@ -661,24 +657,9 @@ def get_straight_line_or_manual_depr_amount(
- flt(asset.opening_accumulated_depreciation) - flt(asset.opening_accumulated_depreciation)
- flt(row.expected_value_after_useful_life) - flt(row.expected_value_after_useful_life)
) )
total_years = ( return get_daily_prorata_based_straight_line_depr(
flt( asset, row, schedule_idx, number_of_pending_depreciations, amount
(row.total_number_of_depreciations - asset.number_of_depreciations_booked)
* row.frequency_of_depreciation
)
/ 12
) )
every_year_depr = amount / total_years
year_start_date = add_years(
row.depreciation_start_date, (row.frequency_of_depreciation * schedule_idx) // 12
)
year_end_date = add_days(add_years(year_start_date, 1), -1)
daily_depr_amount = every_year_depr / (date_diff(year_end_date, year_start_date) + 1)
total_depreciable_days = _get_total_days(
row.depreciation_start_date, schedule_idx, row.frequency_of_depreciation
)
return daily_depr_amount * total_depreciable_days
else: else:
return ( return (
flt(asset.gross_purchase_amount) flt(asset.gross_purchase_amount)
@@ -687,6 +668,23 @@ def get_straight_line_or_manual_depr_amount(
) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked) ) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked)
def get_daily_prorata_based_straight_line_depr(
asset, row, schedule_idx, number_of_pending_depreciations, amount, total_years
):
total_years = flt(number_of_pending_depreciations * row.frequency_of_depreciation) / 12
every_year_depr = amount / total_years
year_start_date = add_years(
row.depreciation_start_date, (row.frequency_of_depreciation * schedule_idx) // 12
)
year_end_date = add_days(add_years(year_start_date, 1), -1)
daily_depr_amount = every_year_depr / (date_diff(year_end_date, year_start_date) + 1)
total_depreciable_days = _get_total_days(
row.depreciation_start_date, schedule_idx, row.frequency_of_depreciation
)
return daily_depr_amount * total_depreciable_days
def _get_total_days(depreciation_start_date, schedule_idx, frequency_of_depreciation): def _get_total_days(depreciation_start_date, schedule_idx, frequency_of_depreciation):
from_date = add_months(depreciation_start_date, (schedule_idx - 1) * frequency_of_depreciation) from_date = add_months(depreciation_start_date, (schedule_idx - 1) * frequency_of_depreciation)
to_date = add_months(from_date, frequency_of_depreciation) to_date = add_months(from_date, frequency_of_depreciation)