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

Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-39429

Browse Source
This commit is contained in:
mergify[bot] 2024-01-17 16:26:04 +00:00 committed by GitHub
commit c8b3478fe1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,
) )