Merge pull request #37464 from frappe/pdf-generator-issue
This commit is contained in:
commit
5daf2656dd
3 changed files with 4 additions and 5 deletions
|
|
@ -741,9 +741,7 @@ frappe.ui.form.PrintView = class {
|
|||
encodeURIComponent(this.get_letterhead()) +
|
||||
"&settings=" +
|
||||
encodeURIComponent(JSON.stringify(this.additional_settings)) +
|
||||
(this.lang_code ? "&_lang=" + this.lang_code : "") +
|
||||
"&pdf_generator=" +
|
||||
encodeURIComponent(pdf_generator)
|
||||
(this.lang_code ? "&_lang=" + this.lang_code : "")
|
||||
)
|
||||
);
|
||||
if (!w) {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
{{ _("Print") }}
|
||||
</a>
|
||||
<a class="p-2"
|
||||
href="/api/method/frappe.utils.print_format.download_pdf?doctype={{doctype|e}}&name={{name|e}}&format={{print_format|e}}&letterhead={{letterhead|e}}&no_letterhead={{no_letterhead|e}}&_lang={{lang|e}}&key={{key|e}}">
|
||||
href="/api/method/frappe.utils.print_format.download_pdf?doctype={{doctype|e}}&name={{name|e}}&format={{print_format|e}}&letterhead={{letterhead|e}}&no_letterhead={{no_letterhead|e}}&_lang={{lang|e}}&key={{key|e}}&pdf_generator={{pdf_generator|e}}">
|
||||
{{ _('Get PDF') }}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ def get_context(context) -> PrintContext:
|
|||
|
||||
# Include selected print format name in access log
|
||||
print_format_name = getattr(print_format, "name", "Standard")
|
||||
pdf_generator = getattr(print_format, "pdf_generator", "wkhtmltopdf")
|
||||
|
||||
make_access_log(
|
||||
doctype=frappe.form_dict.doctype,
|
||||
|
|
@ -114,7 +115,7 @@ def get_context(context) -> PrintContext:
|
|||
"print_format": print_format_name,
|
||||
"letterhead": letterhead,
|
||||
"no_letterhead": frappe.form_dict.no_letterhead,
|
||||
"pdf_generator": frappe.form_dict.get("pdf_generator", "wkhtmltopdf"),
|
||||
"pdf_generator": frappe.form_dict.get("pdf_generator", pdf_generator),
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue