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

fix: fixed depreciation calculation as per income tax act

Browse Source
This commit is contained in:
Khushi Rawat
2024-08-05 16:57:10 +05:30
parent 38739bec45
commit 8df1079618
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/assets/doctype/asset/asset.py
View File

@@ -362,11 +362,16 @@ class Asset(AccountsController):
final_number_of_depreciations = cint(finance_book.total_number_of_depreciations) - cint( final_number_of_depreciations = cint(finance_book.total_number_of_depreciations) - cint(
self.number_of_depreciations_booked self.number_of_depreciations_booked
) )
has_pro_rata = self.check_is_pro_rata(finance_book) for_income_tax = 0
if frappe.db.has_column("Finance Book", "for_income_tax"):
for_income_tax = frappe.db.get_value("Finance Book", finance_book.finance_book, "for_income_tax")
has_pro_rata = False
if not for_income_tax:
has_pro_rata = self.check_is_pro_rata(finance_book)
depr_already_booked = any( depr_already_booked = any(
[d.journal_entry for d in self.get("schedules") if d.finance_book == finance_book.finance_book] [d.journal_entry for d in self.get("schedules") if d.finance_book == finance_book.finance_book]
) )
if has_pro_rata and not depr_already_booked: if has_pro_rata and not depr_already_booked and not for_income_tax:
final_number_of_depreciations += 1 final_number_of_depreciations += 1
has_wdv_or_dd_non_yearly_pro_rata = False has_wdv_or_dd_non_yearly_pro_rata = False
@@ -517,10 +522,13 @@ class Asset(AccountsController):
) )
# Adjust depreciation amount in the last period based on the expected value after useful life # Adjust depreciation amount in the last period based on the expected value after useful life
if ( if not for_income_tax and (
n == cint(final_number_of_depreciations) - 1 (
and flt(value_after_depreciation) != flt(finance_book.expected_value_after_useful_life) n == cint(final_number_of_depreciations) - 1
) or flt(value_after_depreciation) < flt(finance_book.expected_value_after_useful_life): and flt(value_after_depreciation) != flt(finance_book.expected_value_after_useful_life)
)
or flt(value_after_depreciation) < flt(finance_book.expected_value_after_useful_life)
):
depreciation_amount += flt(value_after_depreciation) - flt( depreciation_amount += flt(value_after_depreciation) - flt(
finance_book.expected_value_after_useful_life finance_book.expected_value_after_useful_life
) )