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

fix: Check root_type of Depreciation Expense Account

Browse Source
This commit is contained in:
GangaManoj 2021-11-23 20:21:24 +05:30
parent 6ada1ac887
commit d406775d1a
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/assets/doctype/asset/depreciation.py
View File

@ -135,27 +135,19 @@ def get_depreciation_accounts(asset):
return fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account return fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account
def get_credit_and_debit_accounts(accumulated_depreciation_account, depreciation_expense_account): def get_credit_and_debit_accounts(accumulated_depreciation_account, depreciation_expense_account):
if is_income_or_expense_account(depreciation_expense_account) == "Expense": root_type = frappe.get_value("Account", depreciation_expense_account, "root_type")
if root_type == "Expense":
credit_account = accumulated_depreciation_account credit_account = accumulated_depreciation_account
debit_account = depreciation_expense_account debit_account = depreciation_expense_account
else: elif root_type == "Income":
credit_account = depreciation_expense_account credit_account = depreciation_expense_account
debit_account = accumulated_depreciation_account debit_account = accumulated_depreciation_account
else:
frappe.throw(_("Depreciation Expense Account should be an Income or Expense Account."))
return credit_account, debit_account return credit_account, debit_account
def is_income_or_expense_account(account):
from frappe.utils.nestedset import get_ancestors_of
ancestors = [ancestor.split(' - ')[0] for ancestor in get_ancestors_of("Account", account)]
if ancestors:
if "Expenses" in ancestors:
return "Expense"
elif "Income" in ancestors:
return "Income"
frappe.throw(_("Depreciation Expense Account should be an Income or Expense Account."))
@frappe.whitelist() @frappe.whitelist()
def scrap_asset(asset_name): def scrap_asset(asset_name):
asset = frappe.get_doc("Asset", asset_name) asset = frappe.get_doc("Asset", asset_name)