nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): calculate total pending days of depreciation correctly

Browse Source
This commit is contained in:
Khushi Rawat
2025-03-07 17:05:38 +05:30
parent 2391c859b2
commit 229d3634b1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/assets/doctype/asset_depreciation_schedule/deppreciation_schedule_controller.py
View File

@@ -258,7 +258,11 @@ class DepreciationScheduleController(StraightLineMethod, WDVMethod):
def get_total_pending_days_or_years(self): def get_total_pending_days_or_years(self):
if cint(frappe.db.get_single_value("Accounts Settings", "calculate_depr_using_total_days")): if cint(frappe.db.get_single_value("Accounts Settings", "calculate_depr_using_total_days")):
last_depr_date = self.get_last_booked_depreciation_date() last_depr_date = self.get_last_booked_depreciation_date()
self.total_pending_days = date_diff(self.final_schedule_date, last_depr_date) + 1 if last_depr_date:
self.total_pending_days = date_diff(self.final_schedule_date, last_depr_date) + 1
self.total_pending_days = date_diff(
self.final_schedule_date, self.asset_doc.available_for_use_date
)
else: else:
self.total_pending_years = self.pending_months / 12 self.total_pending_years = self.pending_months / 12

1
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py
View File

@@ -41,6 +41,7 @@ class TestAssetDepreciationSchedule(IntegrationTestCase):
self.assertRaises(frappe.ValidationError, second_asset_depr_schedule.insert) self.assertRaises(frappe.ValidationError, second_asset_depr_schedule.insert)
def test_daily_prorata_based_depr_on_sl_method(self): def test_daily_prorata_based_depr_on_sl_method(self):
frappe.db.set_single_value("Accounts Settings", "calculate_depr_using_total_days", 0)
asset = create_asset( asset = create_asset(
calculate_depreciation=1, calculate_depreciation=1,
depreciation_method="Straight Line", depreciation_method="Straight Line",