nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tests

Browse Source
This commit is contained in:
Saqib Ansari
2020-04-02 22:17:41 +05:30
parent 0c8a0c9c3a
commit 474222074b
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/account/test_account.py
View File

@@ -69,6 +69,7 @@ class TestAccount(unittest.TestCase):
acc.account_name = "Accumulated Depreciation" acc.account_name = "Accumulated Depreciation"
acc.parent_account = "Fixed Assets - _TC" acc.parent_account = "Fixed Assets - _TC"
acc.company = "_Test Company" acc.company = "_Test Company"
acc.account_type = "Accumulated Depreciation"
acc.insert() acc.insert()
doc = frappe.get_doc("Account", "Securities and Deposits - _TC") doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
@@ -149,8 +150,8 @@ def _make_test_records(verbose):
# fixed asset depreciation # fixed asset depreciation
["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None], ["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
["_Test Accumulated Depreciations", "Current Assets", 0, None, None], ["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
["_Test Depreciations", "Expenses", 0, None, None], ["_Test Depreciations", "Expenses", 0, "Expense", None],
["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None], ["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
# Receivable / Payable Account # Receivable / Payable Account

19
erpnext/assets/doctype/asset_category/asset_category.py
View File

@@ -23,16 +23,21 @@ class AssetCategory(Document):
account_type_map = { account_type_map = {
'fixed_asset_account': { 'account_type': 'Fixed Asset' }, 'fixed_asset_account': { 'account_type': 'Fixed Asset' },
'accumulated_depreciation_account': { 'account_type': 'Accumulated Depreciation' }, 'accumulated_depreciation_account': { 'account_type': 'Accumulated Depreciation' },
'depreciation_expense_account': { 'account_type': 'Expense' }, 'depreciation_expense_account': { 'root_type': 'Expense' },
'capital_work_in_progress_account': { 'account_type': 'Capital Work in Progress' } 'capital_work_in_progress_account': { 'account_type': 'Capital Work in Progress' }
} }
for d in self.accounts: for d in self.accounts:
for account in account_type_map.keys(): for fieldname in account_type_map.keys():
if d.get(account): if d.get(fieldname):
account_type = frappe.db.get_value('Account', d.get(account), 'account_type') selected_account = d.get(fieldname)
if account_type != account_type_map[account]['account_type']: key_to_match = account_type_map[fieldname].keys()[0]
frappe.throw(_("Row {}: Account Type of {} should be {} account".format(d.idx, frappe.bold(frappe.unscrub(account)), selected_key_type = frappe.db.get_value('Account', selected_account, key_to_match)
frappe.bold(account_type_map[account]['account_type']))), title=_("Invalid Account")) expected_key_type = account_type_map[fieldname][key_to_match]
if selected_key_type != expected_key_type:
frappe.throw(_("Row #{}: {} of {} should be {}. Please modify the account or select a different account."
.format(d.idx, frappe.unscrub(key_to_match), frappe.bold(selected_account), frappe.bold(expected_key_type))),
title=_("Invalid Account"))
@frappe.whitelist() @frappe.whitelist()

4
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@@ -356,8 +356,8 @@ class TestPurchaseReceipt(unittest.TestCase):
'accounts': [{ 'accounts': [{
'company_name': '_Test Company', 'company_name': '_Test Company',
'fixed_asset_account': '_Test Fixed Asset - _TC', 'fixed_asset_account': '_Test Fixed Asset - _TC',
'accumulated_depreciation_account': 'Depreciation - _TC', 'accumulated_depreciation_account': '_Test Accumulated Depreciations - _TC',
'depreciation_expense_account': 'Depreciation - _TC' 'depreciation_expense_account': '_Test Depreciation - _TC'
}] }]
}).insert() }).insert()