nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 15:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fetch months last date to avoid miscalculation

Browse Source 
(cherry picked from commit 70ff4e7644)
This commit is contained in:
Khushi Rawat
2024-08-09 03:21:09 +05:30
committed by Mergify
parent 6eaad90535
commit 765c1104c4
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -234,7 +234,7 @@ class TestAsset(AssetSetup):
pro_rata_amount, _, _ = _get_pro_rata_amt( pro_rata_amount, _, _ = _get_pro_rata_amt(
asset.finance_books[0], asset.finance_books[0],
9000, 9000,
get_last_day(add_months(purchase_date, 1)), add_days(get_last_day(add_months(purchase_date, 1)), 1),
date, date,
original_schedule_date=get_last_day(nowdate()), original_schedule_date=get_last_day(nowdate()),
) )
@@ -320,7 +320,7 @@ class TestAsset(AssetSetup):
pro_rata_amount, _, _ = _get_pro_rata_amt( pro_rata_amount, _, _ = _get_pro_rata_amt(
asset.finance_books[0], asset.finance_books[0],
9000, 9000,
get_last_day(add_months(purchase_date, 1)), add_days(get_last_day(add_months(purchase_date, 1)), 1),
date, date,
original_schedule_date=get_last_day(nowdate()), original_schedule_date=get_last_day(nowdate()),
) )

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

@@ -291,7 +291,9 @@ class AssetDepreciationSchedule(Document):
if skip_row: if skip_row:
continue continue
schedule_date = add_months(row.depreciation_start_date, n * cint(row.frequency_of_depreciation)) schedule_date = get_last_day(
add_months(row.depreciation_start_date, n * cint(row.frequency_of_depreciation))
)
if not current_fiscal_year_end_date: if not current_fiscal_year_end_date:
current_fiscal_year_end_date = get_fiscal_year(row.depreciation_start_date)[2] current_fiscal_year_end_date = get_fiscal_year(row.depreciation_start_date)[2]
elif getdate(schedule_date) > getdate(current_fiscal_year_end_date): elif getdate(schedule_date) > getdate(current_fiscal_year_end_date):
@@ -330,8 +332,10 @@ class AssetDepreciationSchedule(Document):
getdate(asset_doc.available_for_use_date), getdate(asset_doc.available_for_use_date),
(asset_doc.opening_number_of_booked_depreciations * row.frequency_of_depreciation), (asset_doc.opening_number_of_booked_depreciations * row.frequency_of_depreciation),
) )
if is_last_day_of_the_month(getdate(asset_doc.available_for_use_date)):
from_date = get_last_day(from_date)
if self.depreciation_schedule: if self.depreciation_schedule:
from_date = self.depreciation_schedule[-1].schedule_date from_date = add_days(self.depreciation_schedule[-1].schedule_date, 1)
depreciation_amount, days, months = _get_pro_rata_amt( depreciation_amount, days, months = _get_pro_rata_amt(
row, row,
@@ -353,9 +357,8 @@ class AssetDepreciationSchedule(Document):
and not self.opening_accumulated_depreciation and not self.opening_accumulated_depreciation
and not self.flags.wdv_it_act_applied and not self.flags.wdv_it_act_applied
): ):
from_date = add_days( from_date = asset_doc.available_for_use_date
asset_doc.available_for_use_date, -1 # needed to calc depr amount for available_for_use_date too
) # needed to calc depr amount for available_for_use_date too
depreciation_amount, days, months = _get_pro_rata_amt( depreciation_amount, days, months = _get_pro_rata_amt(
row, row,
depreciation_amount, depreciation_amount,
@@ -406,6 +409,8 @@ class AssetDepreciationSchedule(Document):
(n + self.opening_number_of_booked_depreciations) (n + self.opening_number_of_booked_depreciations)
* cint(row.frequency_of_depreciation), * cint(row.frequency_of_depreciation),
) )
if is_last_day_of_the_month(getdate(asset_doc.available_for_use_date)):
asset_doc.to_date = get_last_day(asset_doc.to_date)
depreciation_amount_without_pro_rata = depreciation_amount depreciation_amount_without_pro_rata = depreciation_amount
@@ -421,7 +426,7 @@ class AssetDepreciationSchedule(Document):
depreciation_amount_without_pro_rata, depreciation_amount depreciation_amount_without_pro_rata, depreciation_amount
) )
schedule_date = add_days(schedule_date, days) schedule_date = add_days(schedule_date, days - 1)
if not depreciation_amount: if not depreciation_amount:
continue continue
@@ -553,9 +558,11 @@ def _check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=False):
# otherwise, if opening_number_of_booked_depreciations = 2, available_for_use_date = 01/01/2020 and frequency_of_depreciation = 12 # otherwise, if opening_number_of_booked_depreciations = 2, available_for_use_date = 01/01/2020 and frequency_of_depreciation = 12
# from_date = 01/01/2022 # from_date = 01/01/2022
if row.depreciation_method in ("Straight Line", "Manual"): if row.depreciation_method in ("Straight Line", "Manual"):
prev_depreciation_start_date = add_months( prev_depreciation_start_date = get_last_day(
row.depreciation_start_date, add_months(
(row.frequency_of_depreciation * -1) * asset_doc.opening_number_of_booked_depreciations, row.depreciation_start_date,
(row.frequency_of_depreciation * -1) * asset_doc.opening_number_of_booked_depreciations,
)
) )
from_date = asset_doc.available_for_use_date from_date = asset_doc.available_for_use_date
days = date_diff(prev_depreciation_start_date, from_date) + 1 days = date_diff(prev_depreciation_start_date, from_date) + 1
@@ -610,7 +617,7 @@ def _get_pro_rata_amt(
has_wdv_or_dd_non_yearly_pro_rata=False, has_wdv_or_dd_non_yearly_pro_rata=False,
original_schedule_date=None, original_schedule_date=None,
): ):
days = date_diff(to_date, from_date) days = date_diff(to_date, from_date) + 1
months = month_diff(to_date, from_date) months = month_diff(to_date, from_date)
if has_wdv_or_dd_non_yearly_pro_rata: if has_wdv_or_dd_non_yearly_pro_rata:
total_days = get_total_days(original_schedule_date or to_date, 12) total_days = get_total_days(original_schedule_date or to_date, 12)