Analytics report graph fix
diff --git a/erpnext/buying/report/purchase_analytics/purchase_analytics.js b/erpnext/buying/report/purchase_analytics/purchase_analytics.js
index b55046e..e17973c 100644
--- a/erpnext/buying/report/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/report/purchase_analytics/purchase_analytics.js
@@ -77,9 +77,20 @@
events: {
onCheckRow: function(data) {
row_name = data[2].content;
- row_values = data.slice(5).map(function (column) {
- return column.content;
- })
+ length = data.length;
+
+ var tree_type = frappe.query_report.filters[0].value;
+
+ if(tree_type == "Supplier" || tree_type == "Item") {
+ row_values = data.slice(4,length-1).map(function (column) {
+ return column.content;
+ })
+ }
+ else {
+ row_values = data.slice(3,length-1).map(function (column) {
+ return column.content;
+ })
+ }
entry = {
'name':row_name,
diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.js b/erpnext/selling/report/sales_analytics/sales_analytics.js
index 0df425d..fbe045b 100644
--- a/erpnext/selling/report/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/report/sales_analytics/sales_analytics.js
@@ -76,10 +76,21 @@
events: {
onCheckRow: function(data) {
row_name = data[2].content;
- length = data.length
- row_values = data.slice(4,length-1).map(function (column) {
- return column.content;
- })
+ length = data.length;
+
+ var tree_type = frappe.query_report.filters[0].value;
+
+ if(tree_type == "Customer" || tree_type == "Item") {
+ row_values = data.slice(4,length-1).map(function (column) {
+ return column.content;
+ })
+ }
+ else {
+ row_values = data.slice(3,length-1).map(function (column) {
+ return column.content;
+ })
+ }
+
entry = {
'name':row_name,
'values':row_values
diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.py b/erpnext/selling/report/sales_analytics/sales_analytics.py
index 9cc6c40..c078a08 100644
--- a/erpnext/selling/report/sales_analytics/sales_analytics.py
+++ b/erpnext/selling/report/sales_analytics/sales_analytics.py
@@ -276,7 +276,11 @@
def get_chart_data(self):
length = len(self.columns)
- labels = [d.get("label") for d in self.columns[2:length-1]]
+
+ if self.filters.tree_type in ["Customer", "Supplier", "Item"]:
+ labels = [d.get("label") for d in self.columns[2:length-1]]
+ else:
+ labels = [d.get("label") for d in self.columns[1:length-1]]
self.chart = {
"data": {
'labels': labels,