From c311b8ea4f5c51c18462f671d26ede1c18f7f5b6 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Thu, 16 Sep 2021 23:23:22 +0500 Subject: [PATCH] fix(Asset Capitalization): validation edge cases --- .../doctype/asset_capitalization/asset_capitalization.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 129b1aa4e1..5a2398650b 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -189,7 +189,7 @@ class AssetCapitalization(StockController): if flt(d.qty) <= 0: frappe.throw(_("Row #{0}: Qty must be a positive number").format(d.idx)) - if flt(d.amount) <= 0: + if flt(d.rate) <= 0: frappe.throw(_("Row #{0}: Amount must be a positive number").format(d.idx)) self.validate_item(item) @@ -221,11 +221,11 @@ class AssetCapitalization(StockController): frappe.throw(_("Asset {0} is cancelled").format(asset.name)) if asset.company != self.company: - frappe.throw(_("Asset {0} does not belong to company {1}").format(self.target_asset, self.company)) + frappe.throw(_("Asset {0} does not belong to company {1}").format(asset.name, self.company)) @frappe.whitelist() def set_warehouse_details(self): - for d in self.stock_items: + for d in self.get('stock_items'): if d.item_code and d.warehouse: args = self.get_args_for_incoming_rate(d) warehouse_details = get_warehouse_details(args) @@ -233,7 +233,7 @@ class AssetCapitalization(StockController): @frappe.whitelist() def set_asset_values(self): - for d in self.asset_items: + for d in self.get('asset_items'): if d.asset: finance_book = d.get('finance_book') or self.get('finance_book') d.current_asset_value = flt(get_current_asset_value(d.asset, finance_book=finance_book))