vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix(Print): Set Document Language (#7746)

Browse source
This commit is contained in:
Himanshu 2019-06-28 14:12:08 +05:30 • committed by Faris Ansari
parent 6d4ec8e4d6
commit 9067f7adec
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/form/print.js
View file

@ -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) {

2
frappe/www/printview.py
View file

@ -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):