fix: Travis(develop)
diff --git a/erpnext/buying/dashboard_fixtures.py b/erpnext/buying/dashboard_fixtures.py
index 186bfb2..172c936 100644
--- a/erpnext/buying/dashboard_fixtures.py
+++ b/erpnext/buying/dashboard_fixtures.py
@@ -5,13 +5,24 @@
import json
from frappe import _
from frappe.utils import nowdate
-from erpnext.accounts.utils import get_fiscal_year
+from erpnext.accounts.dashboard_fixtures import _get_fiscal_year
def get_data():
+
+ fiscal_year = _get_fiscal_year(nowdate())
+
+ if not fiscal_year:
+ return frappe._dict()
+
+ company = frappe.get_doc("Company", get_company_for_dashboards())
+ fiscal_year_name = fiscal_year.get("name")
+ start_date = str(fiscal_year.get("year_start_date"))
+ end_date = str(fiscal_year.get("year_end_date"))
+
return frappe._dict({
"dashboards": get_dashboards(),
- "charts": get_charts(),
- "number_cards": get_number_cards(),
+ "charts": get_charts(company, fiscal_year_name, start_date, end_date),
+ "number_cards": get_number_cards(company, fiscal_year_name, start_date, end_date),
})
def get_company_for_dashboards():
@@ -24,12 +35,6 @@
return company_list[0].name
return None
-company = frappe.get_doc("Company", get_company_for_dashboards())
-fiscal_year = get_fiscal_year(nowdate(), as_dict=1)
-fiscal_year_name = fiscal_year.get("name")
-start_date = str(fiscal_year.get("year_start_date"))
-end_date = str(fiscal_year.get("year_end_date"))
-
def get_dashboards():
return [{
"name": "Buying",
@@ -48,7 +53,7 @@
]
}]
-def get_charts():
+def get_charts(company, fiscal_year_name, start_date, end_date):
return [
{
"name": "Purchase Order Analysis",
@@ -139,7 +144,7 @@
}
]
-def get_number_cards():
+def get_number_cards(company, fiscal_year_name, start_date, end_date):
return [
{
"name": "Annual Purchase",