Merge branch 'develop' into update-items-zero-qty

erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py

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

erpnext/selling/report/quotation_trends/quotation_trends.py

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

erpnext/selling/report/sales_analytics/sales_analytics.py

@@ -415,3 +415,8 @@ class Analytics(object):
 		else:
 			labels = [d.get("label") for d in self.columns[1 : length - 1]]
 		self.chart = {"data": {"labels": labels, "datasets": []}, "type": "line"}
+
+		if self.filters["value_quantity"] == "Value":
+			self.chart["fieldtype"] = "Currency"
+		else:
+			self.chart["fieldtype"] = "Float"

erpnext/selling/report/sales_order_trends/sales_order_trends.py

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