Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12
fix: 'NoneType' object is not iterable
diff --git a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
index bc07b6d..d098d84 100644
--- a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
+++ b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
@@ -3,6 +3,7 @@
from __future__ import unicode_literals
import frappe, json
+from frappe import _
from frappe.utils import add_to_date, date_diff, getdate, nowdate, get_last_day, formatdate
from erpnext.accounts.report.general_ledger.general_ledger import execute
from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
@@ -24,6 +25,9 @@
account = filters.get("account")
company = filters.get("company")
+ if not account and chart:
+ frappe.throw(_("Account is not set for the dashboard chart {0}").format(chart))
+
if not to_date:
to_date = nowdate()
if not from_date:
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index e69a6aad..8b42b19 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -33,6 +33,10 @@
return exists
def validate(self):
+ self.update_default_account = False
+ if self.is_new():
+ self.update_default_account = True
+
self.validate_abbr()
self.validate_default_accounts()
self.validate_currency()
@@ -203,8 +207,8 @@
"default_expense_account": "Cost of Goods Sold"
})
- for default_account in default_accounts:
- if self.is_new() or frappe.flags.in_test or frappe.flags.in_demo:
+ if self.update_default_account or frappe.flags.in_test:
+ for default_account in default_accounts:
self._set_default_account(default_account, default_accounts.get(default_account))
if not self.default_income_account: