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

fix(Asset Capitalization): validation edge cases

Browse Source
This commit is contained in:
Saif Ur Rehman 2021-09-16 23:23:22 +05:00
parent e832944dfe
commit c311b8ea4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
View File

@ -189,7 +189,7 @@ class AssetCapitalization(StockController):
if flt(d.qty) <= 0: if flt(d.qty) <= 0:
frappe.throw(_("Row #{0}: Qty must be a positive number").format(d.idx)) 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)) frappe.throw(_("Row #{0}: Amount must be a positive number").format(d.idx))
self.validate_item(item) self.validate_item(item)
@ -221,11 +221,11 @@ class AssetCapitalization(StockController):
frappe.throw(_("Asset {0} is cancelled").format(asset.name)) frappe.throw(_("Asset {0} is cancelled").format(asset.name))
if asset.company != self.company: 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() @frappe.whitelist()
def set_warehouse_details(self): 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: if d.item_code and d.warehouse:
args = self.get_args_for_incoming_rate(d) args = self.get_args_for_incoming_rate(d)
warehouse_details = get_warehouse_details(args) warehouse_details = get_warehouse_details(args)
@ -233,7 +233,7 @@ class AssetCapitalization(StockController):
@frappe.whitelist() @frappe.whitelist()
def set_asset_values(self): def set_asset_values(self):
for d in self.asset_items: for d in self.get('asset_items'):
if d.asset: if d.asset:
finance_book = d.get('finance_book') or self.get('finance_book') 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)) d.current_asset_value = flt(get_current_asset_value(d.asset, finance_book=finance_book))