| commit | 167aa7655ddf3f5d6414431a1183b24f50907354 | [log] [tgz] |
|---|---|---|
| author | Prssanna Desai <prssud@gmail.com> | Mon Nov 04 15:42:20 2019 +0530 |
| committer | GitHub <noreply@github.com> | Mon Nov 04 15:42:20 2019 +0530 |
| tree | 4f77db12b6ab683e7b5b65f972a23a2864e7c2f8 | |
| parent | 7e2b030052ca2e0ea9766500749d666b24bdaa36 [diff] | |
| parent | 50b6976c67604384ecc3b554acfd77f59ec45be3 [diff] |
Merge branch 'develop' into dashboard-fix
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 d098d84..716bef3 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
@@ -19,6 +19,11 @@ else: chart = frappe._dict(frappe.parse_json(chart)) timespan = chart.timespan + + if chart.timespan == 'Select Date Range': + from_date = chart.from_date + to_date = chart.to_date + timegrain = chart.time_interval filters = frappe.parse_json(chart.filters_json)