From e116895523cc5d6605381fcee1c1425259f736e5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 30 Jul 2019 12:55:11 +0530
Subject: [PATCH 1/2] chore: updated frappe charts

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 38ca8e2472..d937545f6c 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "cookie": "^0.3.1",
     "express": "^4.16.2",
     "fast-deep-equal": "^2.0.1",
-    "frappe-charts": "^1.2.3",
+    "frappe-charts": "^1.2.4",
     "frappe-datatable": "^1.13.5",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index b334f88bd0..3fff25ad04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1754,9 +1754,9 @@ fragment-cache@^0.2.1:
     map-cache "^0.2.2"
 
 frappe-charts@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.2.3.tgz#ee1840864cfe5c9371b61f8ec9b8624633fdc84d"
-  integrity sha512-nHDCERSKni0JDT/0eooGpR3nE/NBKcAJEgbZfjojoA5D3jK4cT6B4kRT3m9EgIqMkwPllZncWUPp0zYtN8WSsQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.2.4.tgz#d9f4bf6eda5a3f270d0707682f6fa14014292326"
+  integrity sha512-aTTOwZ99PTNbBPbujyZnUFwnbcBUksDol8FKXEiUkY7CYKZdvHaRzVrXsw2r48B05xdn+HFMEKfOl5X2zqMYsg==
 
 frappe-datatable@^1.13.5:
   version "1.13.5"

From 69580ce98c9a02f951148c2f871fa380456c21cb Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 30 Jul 2019 12:55:33 +0530
Subject: [PATCH 2/2] refactor: enabled shortenNumbers chart options

---
 frappe/core/page/dashboard/dashboard.js               | 3 ++-
 frappe/public/js/frappe/form/dashboard.js             | 5 ++++-
 frappe/public/js/frappe/views/reports/query_report.js | 5 ++++-
 frappe/public/js/frappe/views/reports/report_view.js  | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index f3b8b76ea6..ebaf8615d4 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -232,7 +232,8 @@ class DashboardChart {
 			type: chart_type_map[this.chart_doc.type],
 			colors: [this.chart_doc.color || "light-blue"],
 			axisOptions: {
-				xIsSeries: this.chart_doc.timeseries
+				xIsSeries: this.chart_doc.timeseries,
+				shortenYAxisNumbers: 1
 			}
 		};
 		this.chart_container.find('.chart-loading-state').addClass('hide');
diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js
index 1e4e063204..d5d83eed53 100644
--- a/frappe/public/js/frappe/form/dashboard.js
+++ b/frappe/public/js/frappe/form/dashboard.js
@@ -495,7 +495,10 @@ frappe.ui.form.Dashboard = Class.extend({
 		this.chart_area.empty().removeClass('hidden');
 		$.extend(args, {
 			type: 'line',
-			colors: ['green']
+			colors: ['green'],
+			axisOptions: {
+				shortenYAxisNumbers: 1
+			}
 		});
 		this.show();
 
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index aae6619664..a371d7f762 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -535,7 +535,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				]
 			},
 			type: type,
-			colors: colors
+			colors: colors,
+			axisOptions: {
+				shortenYAxisNumbers: 1
+			}
 		};
 
 		function get_column_values(column_name) {
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 112ad4edde..7c9b0a1334 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -492,6 +492,9 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			data: data,
 			type: args.chart_type,
 			colors: ['#70E078', 'light-blue', 'orange', 'red'],
+			axisOptions: {
+				shortenYAxisNumbers: 1
+			},
 
 			format_tooltip_x: value => value.doc.name,
 			format_tooltip_y: