Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(charts): Pass fieldtype for chart data in selling reports

Browse Source
This commit is contained in:
Gavin D'souza 2022-05-10 15:25:08 +05:30
parent 3b6752dc8b
commit 7bf0e4f8e5
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
View File

@ -238,4 +238,5 @@ def get_chart_data(data):
"datasets": [{"name": _("Total Sales Amount"), "values": datapoints[:30]}], "datasets": [{"name": _("Total Sales Amount"), "values": datapoints[:30]}],
}, },
"type": "bar", "type": "bar",
"fieldtype": "Currency",
} }

1
erpnext/selling/report/quotation_trends/quotation_trends.py
View File

@ -54,4 +54,5 @@ def get_chart_data(data, conditions, filters):
}, },
"type": "line", "type": "line",
"lineOptions": {"regionFill": 1}, "lineOptions": {"regionFill": 1},
"fieldtype": "Currency",
} }

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

@ -415,3 +415,8 @@ class Analytics(object):
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 = {"data": {"labels": labels, "datasets": []}, "type": "line"} self.chart = {"data": {"labels": labels, "datasets": []}, "type": "line"}
if self.filters["value_quantity"] == "Value":
self.chart["fieldtype"] = "Currency"
else:
self.chart["fieldtype"] = "Float"

1
erpnext/selling/report/sales_order_trends/sales_order_trends.py
View File

@ -51,4 +51,5 @@ def get_chart_data(data, conditions, filters):
}, },
"type": "line", "type": "line",
"lineOptions": {"regionFill": 1}, "lineOptions": {"regionFill": 1},
"fieldtype": "Currency",
} }