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

Merge pull request #1857 from nabinhait/develop

Browse source 
Get print format
This commit is contained in:
Nabin Hait 2016-07-08 08:36:04 +05:30 • committed by GitHub
commit 4a364b7705
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/www/print.py
View file

@ -96,11 +96,7 @@ def get_html(doc, name=None, print_format=None, meta=None,
# determine template
if print_format:
if print_format.standard=="Yes" or print_format.custom_format:
template = jenv.from_string(get_print_format(doc.doctype,
print_format))
elif print_format.format_data:
if print_format.format_data:
# set format data
format_data = json.loads(print_format.format_data)
for df in format_data:
@ -112,6 +108,10 @@ def get_html(doc, name=None, print_format=None, meta=None,
doc.format_data_map = format_data_map
template = "standard"
elif print_format.standard=="Yes" or print_format.custom_format:
template = jenv.from_string(get_print_format(doc.doctype,
print_format))
else:
# fallback