diff --git a/frappe/public/html/print_template.html b/frappe/public/html/print_template.html index 80069f4bf3..03dc439b61 100644 --- a/frappe/public/html/print_template.html +++ b/frappe/public/html/print_template.html @@ -14,19 +14,6 @@
- {% if print_settings.repeat_header_footer %} - - {% endif %} -
20 %} {% if can_use_smaller_font %} @@ -40,6 +27,18 @@
{% endif %} {{ content }} + {% if print_settings.repeat_header_footer %} + + {% endif %}
diff --git a/frappe/public/js/frappe/microtemplate.js b/frappe/public/js/frappe/microtemplate.js index f3041c677a..3f5a4665c4 100644 --- a/frappe/public/js/frappe/microtemplate.js +++ b/frappe/public/js/frappe/microtemplate.js @@ -163,6 +163,21 @@ frappe.render_template = function (name, data) { } w.document.write(html); + + // show footer on print + const footer = w.document.getElementById("footer-html"); + if (footer) { + footer.classList.remove("visible-pdf"); + footer.style.marginTop = "auto"; + + const print_format = w.document.querySelector(".print-format"); + if (print_format) { + print_format.style.display = "flex"; + print_format.style.flexDirection = "column"; + print_format.style.minHeight = "100vh"; + } + } + w.document.close(); }), (frappe.render_tree = function (opts) { diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index c719996dd9..1298593a0c 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1683,7 +1683,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { async render_report_letterhead(print_settings) { if (!print_settings.with_letter_head || !print_settings.letter_head_name) return; - if (print_settings.__letter_head_rendered) return; const filters = this.get_filter_values ? this.get_filter_values() : {}; const doc_context = Object.assign({}, filters); @@ -1699,7 +1698,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { }); if (r.message) { print_settings.letter_head = r.message; - print_settings.__letter_head_rendered = true; } } catch (e) { // fall back silently if rendering fails