fix: Travis(develop)
diff --git a/erpnext/accounts/dashboard_fixtures.py b/erpnext/accounts/dashboard_fixtures.py
index 421c86d..f90ac26 100644
--- a/erpnext/accounts/dashboard_fixtures.py
+++ b/erpnext/accounts/dashboard_fixtures.py
@@ -5,7 +5,18 @@
import json
from frappe.utils import nowdate, add_months, get_date_str
from frappe import _
-from erpnext.accounts.utils import get_fiscal_year, get_account_name
+from erpnext.accounts.utils import get_fiscal_year, get_account_name, FiscalYearError
+
+def _get_fiscal_year(date=None):
+ try:
+ fiscal_year = get_fiscal_year(date=nowdate())
+ except FiscalYearError:
+ #if no fiscal year for current date then get default fiscal year
+ try:
+ fiscal_year = get_fiscal_year()
+ except FiscalYearError:
+ #if still no fiscal year found then no accounting data created, return
+ return None
def get_company_for_dashboards():
company = frappe.defaults.get_defaults().company
@@ -18,10 +29,16 @@
return None
def get_data():
+
+ fiscal_year = _get_fiscal_year(nowdate())
+
+ if not fiscal_year:
+ return frappe._dict()
+
return frappe._dict({
"dashboards": get_dashboards(),
- "charts": get_charts(),
- "number_cards": get_number_cards()
+ "charts": get_charts(fiscal_year),
+ "number_cards": get_number_cards(fiscal_year)
})
def get_dashboards():
@@ -46,10 +63,9 @@
]
}]
-def get_charts():
+def get_charts(fiscal_year):
company = frappe.get_doc("Company", get_company_for_dashboards())
bank_account = company.default_bank_account or get_account_name("Bank", company=company.name)
- fiscal_year = get_fiscal_year(date=nowdate())
default_cost_center = company.cost_center
return [
@@ -190,8 +206,8 @@
},
]
-def get_number_cards():
- fiscal_year = get_fiscal_year(date=nowdate())
+def get_number_cards(fiscal_year):
+
year_start_date = get_date_str(fiscal_year[1])
year_end_date = get_date_str(fiscal_year[2])
return [