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

fix: missing args

Browse Source
This commit is contained in:
Nabin Hait
2024-12-18 12:20:03 +05:30
committed by Khushi Rawat
parent 9f3a1faa5e
commit 2a89bac11d
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -402,24 +402,28 @@ class AssetDepreciationSchedule(Document):
""" """
For the first row, if available for use date is mid of the month, then pro rata amount is needed For the first row, if available for use date is mid of the month, then pro rata amount is needed
""" """
pro_rata_amount_applicable = False
if ( if (
(has_pro_rata or has_wdv_or_dd_non_yearly_pro_rata) (has_pro_rata or has_wdv_or_dd_non_yearly_pro_rata)
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
): # if not existing asset ): # if not existing asset
from_date = asset_doc.available_for_use_date from_date = asset_doc.available_for_use_date
pro_rata_amount_applicable = True
elif has_wdv_or_dd_non_yearly_pro_rata and self.opening_accumulated_depreciation: # if existing asset elif has_wdv_or_dd_non_yearly_pro_rata and self.opening_accumulated_depreciation: # if existing asset
from_date = _get_modified_available_for_use_date_for_existing_assets(asset_doc, row) from_date = _get_modified_available_for_use_date_for_existing_assets(asset_doc, row)
pro_rata_amount_applicable = True
depreciation_amount, days, months = _get_pro_rata_amt( if pro_rata_amount_applicable:
row, depreciation_amount, days, months = _get_pro_rata_amt(
depreciation_amount, row,
from_date, depreciation_amount,
row.depreciation_start_date, from_date,
has_wdv_or_dd_non_yearly_pro_rata, row.depreciation_start_date,
) has_wdv_or_dd_non_yearly_pro_rata,
)
self.validate_depreciation_amount_for_low_value_assets(asset_doc, row, depreciation_amount) self.validate_depreciation_amount_for_low_value_assets(asset_doc, row, depreciation_amount)
return depreciation_amount return depreciation_amount
@@ -451,7 +455,13 @@ class AssetDepreciationSchedule(Document):
return depreciation_amount, schedule_date return depreciation_amount, schedule_date
def adjust_depr_amount_for_salvage_value( def adjust_depr_amount_for_salvage_value(
row, depreciation_amount, value_after_depreciation, final_number_of_depreciations, row_no, skip_row self,
row,
depreciation_amount,
value_after_depreciation,
final_number_of_depreciations,
row_no,
skip_row,
): ):
if ( if (
row_no == cint(final_number_of_depreciations) - 1 row_no == cint(final_number_of_depreciations) - 1