From ceeea6180e3e38fe3808daf4ad950b7fb6a8dd10 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 15 Jul 2022 13:29:17 +0530 Subject: [PATCH] fix: dont override default report options in charts Sales analytics and purchase analytics reports are clearing the default options which includes number shortening, axis options etc. This makes report unreadable when dealing with large numbers. --- .../buying/report/purchase_analytics/purchase_analytics.js | 7 ++----- erpnext/selling/report/sales_analytics/sales_analytics.js | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/erpnext/buying/report/purchase_analytics/purchase_analytics.js b/erpnext/buying/report/purchase_analytics/purchase_analytics.js index ba8535a3ae48..e70e431cd66b 100644 --- a/erpnext/buying/report/purchase_analytics/purchase_analytics.js +++ b/erpnext/buying/report/purchase_analytics/purchase_analytics.js @@ -130,11 +130,8 @@ frappe.query_reports["Purchase Analytics"] = { labels: raw_data.labels, datasets: new_datasets, }; - chart_options = { - data: new_data, - type: "line", - }; - frappe.query_report.render_chart(chart_options); + const new_options = Object.assign({}, frappe.query_report.chart_options, {data: new_data}); + frappe.query_report.render_chart(new_options); frappe.query_report.raw_chart_data = new_data; }, diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.js b/erpnext/selling/report/sales_analytics/sales_analytics.js index d527e42ea4a1..d99449648827 100644 --- a/erpnext/selling/report/sales_analytics/sales_analytics.js +++ b/erpnext/selling/report/sales_analytics/sales_analytics.js @@ -109,11 +109,8 @@ frappe.query_reports["Sales Analytics"] = { labels: raw_data.labels, datasets: new_datasets, }; - - frappe.query_report.render_chart({ - data: new_data, - type: "line", - }); + const new_options = Object.assign({}, frappe.query_report.chart_options, {data: new_data}); + frappe.query_report.render_chart(new_options); frappe.query_report.raw_chart_data = new_data; },