diff --git a/frappe/public/js/frappe/form/print_utils.js b/frappe/public/js/frappe/form/print_utils.js index 06a5843ae4..b0f117973d 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"); @@ -48,6 +54,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..8e0f31280b 100644 --- a/frappe/public/js/frappe/views/reports/print_grid.html +++ b/frappe/public/js/frappe/views/reports/print_grid.html @@ -4,8 +4,8 @@
{% endif %} {% if subtitle %} -{{ 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 23e6abe610..6692135bb6 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1496,7 +1496,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(), @@ -1526,7 +1526,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, @@ -1792,7 +1792,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); }, @@ -1806,7 +1807,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);