Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Asset module tests

Browse Source
This commit is contained in:
Nabin Hait 2024-01-17 14:20:43 +05:30
parent 1148ed1566
commit 97f69986ff
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py
View File

@ -39,7 +39,7 @@ def test_record_generator():
] ]
start = 2012 start = 2012
end = now_datetime().year + 5 end = now_datetime().year + 25
for year in range(start, end): for year in range(start, end):
test_records.append( test_records.append(
{ {

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

@ -900,7 +900,7 @@ class TestDepreciationMethods(AssetSetup):
["2030-12-31", 28630.14, 28630.14], ["2030-12-31", 28630.14, 28630.14],
["2031-12-31", 35684.93, 64315.07], ["2031-12-31", 35684.93, 64315.07],
["2032-12-31", 17842.46, 82157.53], ["2032-12-31", 17842.46, 82157.53],
["2033-06-06", 5342.47, 87500.0], ["2033-06-06", 5342.46, 87499.99],
] ]
schedules = [ schedules = [
@ -1012,7 +1012,7 @@ class TestDepreciationBasics(AssetSetup):
asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active") asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active")
depreciation_amount = get_depreciation_amount( depreciation_amount = get_depreciation_amount(
asset_depr_schedule_doc, asset, 100000, asset.finance_books[0] asset_depr_schedule_doc, asset, 100000, 100000, asset.finance_books[0]
) )
self.assertEqual(depreciation_amount, 30000) self.assertEqual(depreciation_amount, 30000)

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

@ -764,17 +764,14 @@ def get_wdv_or_dd_depr_amount(
has_wdv_or_dd_non_yearly_pro_rata, has_wdv_or_dd_non_yearly_pro_rata,
asset_depr_schedule, asset_depr_schedule,
): ):
return ( return get_default_wdv_or_dd_depr_amount(
get_default_wdv_or_dd_depr_amount( asset,
asset, fb_row,
fb_row, depreciable_value,
depreciable_value, schedule_idx,
schedule_idx, prev_depreciation_amount,
prev_depreciation_amount, has_wdv_or_dd_non_yearly_pro_rata,
has_wdv_or_dd_non_yearly_pro_rata, asset_depr_schedule,
asset_depr_schedule,
),
None,
) )