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

fix(asset): expected value after useful life validation (#27539)

Browse Source
This commit is contained in:
Saqib 2021-10-05 11:14:16 +05:30 committed by GitHub
parent 9d9c97ff41
commit 065a2ce983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,11 +140,6 @@ class Asset(AccountsController):
if self.is_existing_asset: if self.is_existing_asset:
return return
docname = self.purchase_receipt or self.purchase_invoice
if docname:
doctype = 'Purchase Receipt' if self.purchase_receipt else 'Purchase Invoice'
date = frappe.db.get_value(doctype, docname, 'posting_date')
if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(self.purchase_date): if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(self.purchase_date):
frappe.throw(_("Available-for-use Date should be after purchase date")) frappe.throw(_("Available-for-use Date should be after purchase date"))
@ -440,9 +435,10 @@ class Asset(AccountsController):
if accumulated_depreciation_after_full_schedule: if accumulated_depreciation_after_full_schedule:
accumulated_depreciation_after_full_schedule = max(accumulated_depreciation_after_full_schedule) accumulated_depreciation_after_full_schedule = max(accumulated_depreciation_after_full_schedule)
asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) - asset_value_after_full_schedule = flt(
flt(accumulated_depreciation_after_full_schedule), flt(self.gross_purchase_amount) -
self.precision('gross_purchase_amount')) flt(self.opening_accumulated_depreciation) -
flt(accumulated_depreciation_after_full_schedule), self.precision('gross_purchase_amount'))
if (row.expected_value_after_useful_life and if (row.expected_value_after_useful_life and
row.expected_value_after_useful_life < asset_value_after_full_schedule): row.expected_value_after_useful_life < asset_value_after_full_schedule):