diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js index 50e0959f43..f3a0380051 100644 --- a/frappe/public/js/frappe/form/print.js +++ b/frappe/public/js/frappe/form/print.js @@ -156,8 +156,8 @@ frappe.ui.form.PrintPreview = Class.extend({ this.preview(); }, set_default_print_language: function () { - var print_format = this.get_print_format(); - this.lang_code = print_format.default_print_language || frappe.boot.lang; + var print_format = this.get_print_format(); + this.lang_code = print_format.default_print_language || this.frm.doc.language || frappe.boot.lang; this.language_sel.val(this.lang_code); }, multilingual_preview: function () { @@ -309,7 +309,7 @@ frappe.ui.form.PrintPreview = Class.extend({ doc: this.frm.doc, print_format: this.selected_format(), no_letterhead: !this.with_letterhead() ? 1 : 0, - _lang: this.lang_code + _lang: this.lang_code, }, callback: function (r) { if (!r.exc) { diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 5da86cb225..6a3e93065d 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -171,7 +171,7 @@ def convert_markdown(doc, meta): @frappe.whitelist() def get_html_and_style(doc, name=None, print_format=None, meta=None, - no_letterhead=None, trigger_print=False, style=None, lang=None): + no_letterhead=None, trigger_print=False, style=None): """Returns `html` and `style` of print format, used in PDF etc""" if isinstance(doc, string_types) and isinstance(name, string_types):