From 96a0f8246c5ac29dfa660e5cf4c22052fafe209b Mon Sep 17 00:00:00 2001 From: Navin-S-R Date: Thu, 18 Sep 2025 18:43:48 +0530 Subject: [PATCH 1/2] feat: provide an option to show or hide applied filters in report print view --- frappe/public/js/frappe/form/print_utils.js | 16 +++++++++++++++- .../js/frappe/views/reports/print_grid.html | 6 +++--- .../js/frappe/views/reports/query_report.js | 6 ++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/print_utils.js b/frappe/public/js/frappe/form/print_utils.js index 03cf82902f..6c958b2ac5 100644 --- a/frappe/public/js/frappe/form/print_utils.js +++ b/frappe/public/js/frappe/form/print_utils.js @@ -1,4 +1,10 @@ -frappe.ui.get_print_settings = function (pdf, callback, letter_head, pick_columns) { +frappe.ui.get_print_settings = function ( + pdf, + callback, + letter_head, + pick_columns, + has_filters = false +) { var print_settings = locals[":Print Settings"]["Print Settings"]; var company = frappe.defaults.get_default("company"); @@ -47,6 +53,14 @@ frappe.ui.get_print_settings = function (pdf, callback, letter_head, pick_column }, ]; + if (has_filters) { + columns.push({ + label: __("Include filters"), + fieldtype: "Check", + fieldname: "include_filters", + }); + } + if (pick_columns) { columns.push( { diff --git a/frappe/public/js/frappe/views/reports/print_grid.html b/frappe/public/js/frappe/views/reports/print_grid.html index 7af27145a6..1b9dae8d24 100644 --- a/frappe/public/js/frappe/views/reports/print_grid.html +++ b/frappe/public/js/frappe/views/reports/print_grid.html @@ -3,9 +3,9 @@

{{ __(title) }}


{% endif %} -{% if subtitle %} -{{ subtitle }} -
+{% if subtitle && print_settings.include_filters %} + {{ subtitle }} +
{% endif %} diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7dff1236f5..9cffde3e82 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1785,7 +1785,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { false, (print_settings) => this.print_report(print_settings), this.report_doc.letter_head, - this.get_visible_columns() + this.get_visible_columns(), + true ); this.add_portrait_warning(dialog); }, @@ -1799,7 +1800,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { false, (print_settings) => this.pdf_report(print_settings), this.report_doc.letter_head, - this.get_visible_columns() + this.get_visible_columns(), + true ); this.add_portrait_warning(dialog); From 27f2f49c56e1f3d4e3f0a1920f8780d184d2dcd7 Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Fri, 19 Sep 2025 11:06:23 +0530 Subject: [PATCH 2/2] fix: include filters only if checked --- frappe/public/js/frappe/views/reports/print_grid.html | 2 +- frappe/public/js/frappe/views/reports/query_report.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/print_grid.html b/frappe/public/js/frappe/views/reports/print_grid.html index 1b9dae8d24..8e0f31280b 100644 --- a/frappe/public/js/frappe/views/reports/print_grid.html +++ b/frappe/public/js/frappe/views/reports/print_grid.html @@ -3,7 +3,7 @@

{{ __(title) }}


{% endif %} -{% if subtitle && print_settings.include_filters %} +{% if subtitle %} {{ subtitle }}
{% endif %} diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 9cffde3e82..18208f1492 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1495,7 +1495,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { frappe.render_grid({ template: print_settings.columns ? "print_grid" : custom_format, title: __(this.report_name), - subtitle: filters_html, + subtitle: print_settings?.include_filters ? filters_html : null, print_settings: print_settings, landscape: landscape, filters: this.get_filter_values(), @@ -1525,7 +1525,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { const template = print_settings.columns || !custom_format ? "print_grid" : custom_format; const content = frappe.render_template(template, { title: __(this.report_name), - subtitle: filters_html, + subtitle: print_settings?.include_filters ? filters_html : null, filters: applied_filters, data: data, original_data: this.data,