Merge pull request #4524 from pratu16x7/update-charts

Update charts version

frappe/public/js/frappe/form/dashboard.js

@@ -339,7 +339,7 @@ frappe.ui.form.Dashboard = Class.extend({
 				type: 'heatmap',
 				height: 100,
 				start: new Date(moment().subtract(1, 'year').toDate()),
-				count_label: frappe.model.scrub(this.frm.doctype) + "s",
+				count_label: "interactions",
 				discrete_domains: 0,
 				data: {}
 			});
@@ -409,7 +409,8 @@ frappe.ui.form.Dashboard = Class.extend({
 		$.extend(args, {
 			parent: '.form-graph',
 			type: 'line',
-			height: 140
+			height: 140,
+			colors: ['green']
 		});
 		this.show();
 

frappe/utils/goal.py

@@ -98,7 +98,7 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
 	summary_values = [
 		{
 			'title': _("This month"),
-			'color': 'green',
+			'color': '#ffa00a',
 			'value': formatted_value
 		}
 	]
@@ -114,12 +114,12 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
 		summary_values += [
 			{
 				'title': _("Goal"),
-				'color': 'blue',
+				'color': '#5e64ff',
 				'value': formatted_goal
 			},
 			{
 				'title': _("Completed"),
-				'color': 'green',
+				'color': '#28a745',
 				'value': str(int(round(float(current_month_value)/float(goal)*100))) + "%"
 			}
 		]
@@ -131,7 +131,6 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
 		'data': {
 			'datasets': [
 				{
-					'color': 'green',
 					'values': values,
 					'formatted': values_formatted
 				}