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

fix: error message displays asset category as None (#19873)

Browse Source 
* fix: error message displays asset category as None

* fix: asset gl_entries doesn't considers asset category's cwip account
This commit is contained in:
Saqib 2019-12-09 19:07:05 +05:30 committed by Nabin Hait
parent ae02b4119d
commit 5998034b02
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -611,12 +611,18 @@ def get_asset_account(account_name, asset=None, asset_category=None, company=Non
account = get_asset_category_account(account_name, asset=asset, account = get_asset_category_account(account_name, asset=asset,
asset_category = asset_category, company = company) asset_category = asset_category, company = company)
if not asset and not account:
account = get_asset_category_account(account_name, asset_category = asset_category, company = company)
if not account: if not account:
account = frappe.get_cached_value('Company', company, account_name) account = frappe.get_cached_value('Company', company, account_name)
if not account: if not account:
frappe.throw(_("Set {0} in asset category {1} or company {2}") if not asset_category:
.format(account_name.replace('_', ' ').title(), asset_category, company)) frappe.throw(_("Set {0} in company {2}").format(account_name.replace('_', ' ').title(), company))
else:
frappe.throw(_("Set {0} in asset category {1} or company {2}")
.format(account_name.replace('_', ' ').title(), asset_category, company))
return account return account

8
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -95,7 +95,8 @@ class PurchaseReceipt(BuyingController):
# check cwip accounts before making auto assets # check cwip accounts before making auto assets
# Improves UX by not giving messages of "Assets Created" before throwing error of not finding arbnb account # Improves UX by not giving messages of "Assets Created" before throwing error of not finding arbnb account
arbnb_account = self.get_company_default("asset_received_but_not_billed") arbnb_account = self.get_company_default("asset_received_but_not_billed")
cwip_account = get_asset_account("capital_work_in_progress_account", company = self.company) cwip_account = get_asset_account("capital_work_in_progress_account", asset_category = item.asset_category, \
company = self.company)
break break
def validate_with_previous_doc(self): def validate_with_previous_doc(self):
@ -364,8 +365,9 @@ class PurchaseReceipt(BuyingController):
def add_asset_gl_entries(self, item, gl_entries): def add_asset_gl_entries(self, item, gl_entries):
arbnb_account = self.get_company_default("asset_received_but_not_billed") arbnb_account = self.get_company_default("asset_received_but_not_billed")
# This returns company's default cwip account # This returns category's cwip account if not then fallback to company's default cwip account
cwip_account = get_asset_account("capital_work_in_progress_account", company = self.company) cwip_account = get_asset_account("capital_work_in_progress_account", asset_category = item.asset_category, \
company = self.company)
asset_amount = flt(item.net_amount) + flt(item.item_tax_amount/self.conversion_rate) asset_amount = flt(item.net_amount) + flt(item.item_tax_amount/self.conversion_rate)
base_asset_amount = flt(item.base_net_amount + item.item_tax_amount) base_asset_amount = flt(item.base_net_amount + item.item_tax_amount)