nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Chart fix in Analytics report

Browse Source
This commit is contained in:
deepeshgarg007
2019-10-12 23:02:53 +05:30
parent aa3d6ed11e
commit b4e61e19bb
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/report/sales_analytics/sales_analytics.js
View File

@@ -80,10 +80,14 @@ frappe.query_reports["Sales Analytics"] = {
var tree_type = frappe.query_report.filters[0].value; var tree_type = frappe.query_report.filters[0].value;
if(tree_type == "Customer" || tree_type == "Item") { if(tree_type == "Customer") {
row_values = data.slice(4,length-1).map(function (column) { row_values = data.slice(4,length-1).map(function (column) {
return column.content; return column.content;
}) })
} else if (tree_type == "Item") {
row_values = data.slice(5,length-1).map(function (column) {
return column.content;
})
} }
else { else {
row_values = data.slice(3,length-1).map(function (column) { row_values = data.slice(3,length-1).map(function (column) {

8
erpnext/selling/report/sales_analytics/sales_analytics.py
View File

@@ -114,7 +114,7 @@ class Analytics(object):
if self.filters["value_quantity"] == 'Value': if self.filters["value_quantity"] == 'Value':
value_field = 'base_amount' value_field = 'base_amount'
else: else:
value_field = 'qty' value_field = 'stock_qty'
self.entries = frappe.db.sql(""" self.entries = frappe.db.sql("""
select i.item_code as entity, i.item_name as entity_name, i.stock_uom, i.{value_field} as value_field, s.{date_field} select i.item_code as entity, i.item_name as entity_name, i.stock_uom, i.{value_field} as value_field, s.{date_field}
@@ -301,8 +301,10 @@ class Analytics(object):
def get_chart_data(self): def get_chart_data(self):
length = len(self.columns) length = len(self.columns)
if self.filters.tree_type in ["Customer", "Supplier", "Item"]: if self.filters.tree_type in ["Customer", "Supplier"]:
labels = [d.get("label") for d in self.columns[2:length-1]] labels = [d.get("label") for d in self.columns[2:length - 1]]
elif self.filters.tree_type == "Item":
labels = [d.get("label") for d in self.columns[3:length - 1]]
else: else:
labels = [d.get("label") for d in self.columns[1:length-1]] labels = [d.get("label") for d in self.columns[1:length-1]]
self.chart = { self.chart = {