From ed6dd8cd5b6b790ae83a81709559d0c47bd6da84 Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Mon, 14 Apr 2025 11:32:44 +0530 Subject: [PATCH 1/4] fix: print builder beta print option not working --- .../templates/print_format/print_format.css | 3 +++ frappe/www/printview.py | 27 ++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/frappe/templates/print_format/print_format.css b/frappe/templates/print_format/print_format.css index a10b218b94..2a5b8be1f6 100644 --- a/frappe/templates/print_format/print_format.css +++ b/frappe/templates/print_format/print_format.css @@ -38,6 +38,9 @@ body { .col, *[class^="col-"] { max-width: none !important; } + .label { + border: none; + } } @media screen { diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 7dad803961..7f40d20223 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -75,15 +75,24 @@ def get_context(context) -> PrintContext: make_access_log( doctype=frappe.form_dict.doctype, document=frappe.form_dict.name, file_type="PDF", method="Print" ) - body = get_rendered_template( - doc, - print_format=print_format, - meta=meta, - trigger_print=frappe.form_dict.trigger_print, - no_letterhead=frappe.form_dict.no_letterhead, - letterhead=letterhead, - settings=settings, - ) + + if print_format.print_format_builder_beta: + from frappe.utils.weasyprint import get_html + + body = get_html( + doctype=frappe.form_dict.doctype, name=frappe.form_dict.name, print_format=print_format.name + ) + body += trigger_print_script + else: + body = get_rendered_template( + doc, + print_format=print_format, + meta=meta, + trigger_print=frappe.form_dict.trigger_print, + no_letterhead=frappe.form_dict.no_letterhead, + letterhead=letterhead, + settings=settings, + ) make_access_log( doctype=frappe.form_dict.doctype, document=frappe.form_dict.name, file_type="PDF", method="Print" From 5b8dde43bd3264f9cd870cdcd4753d87648b9855 Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Mon, 14 Apr 2025 11:56:09 +0530 Subject: [PATCH 2/4] chore: use get() method to get attr --- frappe/www/printview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 7f40d20223..394ffc7b23 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -76,7 +76,7 @@ def get_context(context) -> PrintContext: doctype=frappe.form_dict.doctype, document=frappe.form_dict.name, file_type="PDF", method="Print" ) - if print_format.print_format_builder_beta: + if print_format.get("print_format_builder_beta"): from frappe.utils.weasyprint import get_html body = get_html( From e266956a197b77b3813fdb5e51529852a1ea3b1b Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Mon, 14 Apr 2025 12:18:31 +0530 Subject: [PATCH 3/4] test: fix print format failing test --- frappe/core/print_format/__init__.py | 0 frappe/core/print_format/_test_print_format_1/__init__.py | 0 frappe/www/printview.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 frappe/core/print_format/__init__.py create mode 100644 frappe/core/print_format/_test_print_format_1/__init__.py diff --git a/frappe/core/print_format/__init__.py b/frappe/core/print_format/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/print_format/_test_print_format_1/__init__.py b/frappe/core/print_format/_test_print_format_1/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 394ffc7b23..2a5d0b7e67 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -76,7 +76,7 @@ def get_context(context) -> PrintContext: doctype=frappe.form_dict.doctype, document=frappe.form_dict.name, file_type="PDF", method="Print" ) - if print_format.get("print_format_builder_beta"): + if print_format and print_format.get("print_format_builder_beta"): from frappe.utils.weasyprint import get_html body = get_html( From 65fd87a19809bec643e802ba313eb44341892849 Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Mon, 14 Apr 2025 12:21:07 +0530 Subject: [PATCH 4/4] chore: remove unwanted files --- frappe/core/print_format/__init__.py | 0 frappe/core/print_format/_test_print_format_1/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 frappe/core/print_format/__init__.py delete mode 100644 frappe/core/print_format/_test_print_format_1/__init__.py diff --git a/frappe/core/print_format/__init__.py b/frappe/core/print_format/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/core/print_format/_test_print_format_1/__init__.py b/frappe/core/print_format/_test_print_format_1/__init__.py deleted file mode 100644 index e69de29bb2..0000000000