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

Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12

Browse Source 
fix: 'NoneType' object is not iterable
This commit is contained in:
rohitwaghchaure
2019-10-29 11:30:22 +05:30
committed by GitHub
parent 9942fcc8cb 88d2c97391
commit 3270ba6d8c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
View File

@@ -3,6 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe, json import frappe, json
from frappe import _
from frappe.utils import add_to_date, date_diff, getdate, nowdate, get_last_day, formatdate 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 erpnext.accounts.report.general_ledger.general_ledger import execute
from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
@@ -24,6 +25,9 @@ def get(chart_name = None, chart = None, no_cache = None, from_date = None, to_d
account = filters.get("account") account = filters.get("account")
company = filters.get("company") 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: if not to_date:
to_date = nowdate() to_date = nowdate()
if not from_date: if not from_date:

8
erpnext/setup/doctype/company/company.py
View File

@@ -33,6 +33,10 @@ class Company(NestedSet):
return exists return exists
def validate(self): def validate(self):
self.update_default_account = False
if self.is_new():
self.update_default_account = True
self.validate_abbr() self.validate_abbr()
self.validate_default_accounts() self.validate_default_accounts()
self.validate_currency() self.validate_currency()
@@ -203,8 +207,8 @@ class Company(NestedSet):
"default_expense_account": "Cost of Goods Sold" "default_expense_account": "Cost of Goods Sold"
}) })
for default_account in default_accounts: if self.update_default_account or frappe.flags.in_test:
if self.is_new() or frappe.flags.in_test or frappe.flags.in_demo: for default_account in default_accounts:
self._set_default_account(default_account, default_accounts.get(default_account)) self._set_default_account(default_account, default_accounts.get(default_account))
if not self.default_income_account: if not self.default_income_account: