nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 08:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: travis

Browse Source
This commit is contained in:
Saqib Ansari
2020-04-09 12:41:24 +05:30
parent de9c73c5cd
commit 39b8e150bf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@ 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, "Accumulated Depreciation", None], ["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
["_Test Depreciations", "Expenses", 0, "Expense", None], ["_Test Depreciations", "Expenses", 0, None, 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

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

@@ -30,7 +30,7 @@ class AssetCategory(Document):
for fieldname in account_type_map.keys(): for fieldname in account_type_map.keys():
if d.get(fieldname): if d.get(fieldname):
selected_account = d.get(fieldname) selected_account = d.get(fieldname)
key_to_match = account_type_map[fieldname].keys()[0] key_to_match = account_type_map.get(fieldname).keys()[0] # acount_type or root_type
selected_key_type = frappe.db.get_value('Account', selected_account, key_to_match) selected_key_type = frappe.db.get_value('Account', selected_account, key_to_match)
expected_key_type = account_type_map[fieldname][key_to_match] expected_key_type = account_type_map[fieldname][key_to_match]