From af500bb3f59c865a58a46dfbff452fc2e4f6971d Mon Sep 17 00:00:00 2001
From: P-Froggy <60393001+P-Froggy@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:56:18 +0200
Subject: [PATCH] fix: format filter values in report print view (#20717)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Weißer <michael.weisser@rindenmuehle.de>
---
 frappe/public/js/frappe/views/reports/query_report.js | 4 ++--
 frappe/public/js/frappe/views/reports/report_view.js  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index ee255032bb..9f81f9f6f1 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1424,9 +1424,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		const applied_filters = this.get_filter_values();
 		return Object.keys(applied_filters)
 			.map((fieldname) => {
-				const label = frappe.query_report.get_filter(fieldname).df.label;
+				const docfield = frappe.query_report.get_filter(fieldname).df;
 				const value = applied_filters[fieldname];
-				return `<h6>${__(label)}: ${value}</h6>`;
+				return `<h6>${__(docfield.label)}: ${frappe.format(value, docfield)}</h6>`;
 			})
 			.join("");
 	}
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 83411f0ddf..5e76d61c09 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -1349,9 +1349,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			.map((f) => {
 				const [doctype, fieldname, condition, value] = f;
 				if (condition !== "=") return "";
-
-				const label = frappe.meta.get_label(doctype, fieldname);
-				return `<h6>${__(label)}: ${value}</h6>`;
+				const docfield = frappe.meta.get_docfield(doctype, fieldname);
+				return `<h6>${__(docfield.label)}: ${frappe.format(value, docfield)}</h6>`;
 			})
 			.join("");
 	}