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

Merge pull request #51282 from khushi8112/validate-finance-books-row-values

Browse Source 
fix: validate finance books row values
This commit is contained in:
Khushi Rawat
2025-12-24 14:52:15 +05:30
committed by GitHub
parent a04f560048 6ff002dbe3
commit 4e4d2cefda
1 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,6 +480,7 @@ class Asset(AccountsController):
def set_depreciation_rate(self): def set_depreciation_rate(self):
for d in self.get("finance_books"): for d in self.get("finance_books"):
self.validate_asset_finance_books(d)
d.rate_of_depreciation = flt( d.rate_of_depreciation = flt(
self.get_depreciation_rate(d, on_validate=True), d.precision("rate_of_depreciation") self.get_depreciation_rate(d, on_validate=True), d.precision("rate_of_depreciation")
) )
@@ -488,6 +489,10 @@ class Asset(AccountsController):
row.expected_value_after_useful_life = flt( row.expected_value_after_useful_life = flt(
row.expected_value_after_useful_life, self.precision("gross_purchase_amount") row.expected_value_after_useful_life, self.precision("gross_purchase_amount")
) )
if flt(row.expected_value_after_useful_life) < 0:
frappe.throw(_("Row {0}: Expected Value After Useful Life cannot be negative").format(row.idx))
if flt(row.expected_value_after_useful_life) >= flt(self.gross_purchase_amount): if flt(row.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
frappe.throw( frappe.throw(
_("Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount").format( _("Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount").format(
@@ -503,11 +508,48 @@ class Asset(AccountsController):
title=_("Invalid Schedule"), title=_("Invalid Schedule"),
) )
row.depreciation_start_date = get_last_day(self.available_for_use_date) row.depreciation_start_date = get_last_day(self.available_for_use_date)
self.validate_depreciation_start_date(row)
self.validate_total_number_of_depreciations_and_frequency(row)
if not self.is_existing_asset: if not self.is_existing_asset:
self.opening_accumulated_depreciation = 0 self.opening_accumulated_depreciation = 0
self.opening_number_of_booked_depreciations = 0 self.opening_number_of_booked_depreciations = 0
else: else:
self.validate_opening_depreciation_values(row)
def validate_depreciation_start_date(self, row):
if row.depreciation_start_date:
if getdate(row.depreciation_start_date) < getdate(self.purchase_date):
frappe.throw(
_("Row #{0}: Next Depreciation Date cannot be before Purchase Date").format(row.idx)
)
if getdate(row.depreciation_start_date) < getdate(self.available_for_use_date):
frappe.throw(
_("Row #{0}: Next Depreciation Date cannot be before Available-for-use Date").format(
row.idx
)
)
else:
frappe.throw(
_("Row #{0}: Depreciation Start Date is required").format(row.idx),
title=_("Invalid Schedule"),
)
def validate_total_number_of_depreciations_and_frequency(self, row):
if row.total_number_of_depreciations <= 0:
frappe.throw(
_("Row #{0}: Total Number of Depreciations must be greater than zero").format(row.idx)
)
if row.frequency_of_depreciation <= 0:
frappe.throw(_("Row #{0}: Frequency of Depreciation must be greater than zero").format(row.idx))
def validate_opening_depreciation_values(self, row):
row.expected_value_after_useful_life = flt(
row.expected_value_after_useful_life, self.precision("gross_purchase_amount")
)
depreciable_amount = flt( depreciable_amount = flt(
flt(self.gross_purchase_amount) - flt(row.expected_value_after_useful_life), flt(self.gross_purchase_amount) - flt(row.expected_value_after_useful_life),
self.precision("gross_purchase_amount"), self.precision("gross_purchase_amount"),
@@ -533,22 +575,6 @@ class Asset(AccountsController):
title=_("Invalid Schedule"), title=_("Invalid Schedule"),
) )
if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(self.purchase_date):
frappe.throw(
_("Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date").format(
row.idx
)
)
if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(
self.available_for_use_date
):
frappe.throw(
_(
"Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
).format(row.idx)
)
def set_total_booked_depreciations(self): def set_total_booked_depreciations(self):
# set value of total number of booked depreciations field # set value of total number of booked depreciations field
for fb_row in self.get("finance_books"): for fb_row in self.get("finance_books"):