From 762f9c37ee58826493fdeb92bf284e52ffd53e56 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Sun, 8 Apr 2018 12:59:33 +0530
Subject: [PATCH] Reportview fix (#5397)

- fixes frappe/erpnext#13201
- update frappe-datatable
---
 frappe/public/js/frappe/ui/filters/filter_list.js   |  2 +-
 .../public/js/frappe/views/reports/report_view.js   | 13 +++++--------
 package.json                                        |  2 +-
 yarn.lock                                           |  6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 226eeb54eb..893959723b 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -126,7 +126,7 @@ frappe.ui.FilterGroup = class {
 	}
 
 	clear_filters() {
-		this.filters.map(f => { f.remove(true); });
+		this.filters.map(f => f.remove(true));
 		// {}: Clear page filters, .date-range-picker (called list run())
 		this.filters = [];
 	}
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index c4a8138201..0d45da914f 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -738,7 +738,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			name: title,
 			content: title,
 			width: (docfield ? cint(docfield.width) : null) || null,
-			editable: editable
+			editable: editable,
+			format: (value, row, column, data) => {
+				return frappe.format(value, column.docfield, { always_show_decimals: true }, data);
+			}
 		};
 	}
 
@@ -799,13 +802,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					name: d.name,
 					doctype: col.docfield.parent,
 					content: value,
-					editable: this.is_editable(col.docfield, d),
-					format: value => {
-						if (col.field === 'name') {
-							return frappe.utils.get_form_link(this.doctype, value, true);
-						}
-						return frappe.format(value, col.docfield, { always_show_decimals: true }, d);
-					}
+					editable: this.is_editable(col.docfield, d)
 				};
 			}
 			return {
diff --git a/package.json b/package.json
index dbec001d1c..4d9e2c6266 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "cookie": "^0.3.1",
     "express": "^4.16.2",
-    "frappe-datatable": "^0.0.3",
+    "frappe-datatable": "^0.0.4",
     "frappe-gantt": "^0.1.0",
     "fuse": "^0.4.0",
     "fuse.js": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 0466d0995a..6f7da6ea55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -862,9 +862,9 @@ forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
 
-frappe-datatable@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-0.0.3.tgz#55d3fd7bafdf2a7380efab2ae2aaaa956624fca0"
+frappe-datatable@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-0.0.4.tgz#3fdcd698c2cd7bf7d75e920ed9d2f04f69e3afc9"
   dependencies:
     clusterize.js "^0.18.0"
     lodash "^4.17.5"