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

fix: minor suggested fixes

Browse source
This commit is contained in:
Shllokkk 2026-04-24 13:20:47 +05:30
parent 72cdae85e7
commit 006d0e1754
3 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
frappe/printing/doctype/letter_head/letter_head.json
View file

@ -30,10 +30,9 @@
"footer_image_width",
"header_section",
"content",
"custom_css",
"footer_section",
"footer",
"style_section",
"custom_css",
"scripts_section",
"header_script",
"footer_script",
@ -86,7 +85,6 @@
"label": "Letter Head Image"
},
{
"depends_on": "eval: doc.source === 'Image'",
"fieldname": "image",
"fieldtype": "Attach Image",
"label": "Image"
@ -98,11 +96,10 @@
"label": "Header"
},
{
"depends_on": "eval: doc.source==='HTML'",
"depends_on": "eval:doc.source==='HTML'",
"description": "Letter Head in HTML",
"fieldname": "content",
"fieldtype": "HTML Editor",
"ignore_xss_filter": 1,
"label": "Header HTML",
"oldfieldname": "content",
"oldfieldtype": "Text Editor"
@ -114,11 +111,10 @@
"label": "Footer"
},
{
"depends_on": "eval: doc.footer_source==='HTML'",
"depends_on": "eval:doc.footer_source==='HTML'",
"description": "Footer will display correctly only in PDF",
"fieldname": "footer",
"fieldtype": "HTML Editor",
"ignore_xss_filter": 1,
"label": "Footer HTML"
},
{
@ -172,14 +168,14 @@
"options": "Image\nHTML"
},
{
"depends_on": "eval: doc.source==='HTML'",
"depends_on": "eval:doc.source==='HTML'",
"fieldname": "header_script",
"fieldtype": "Code",
"label": "Header Script",
"options": "Javascript"
},
{
"depends_on": "eval: doc.footer_source==='HTML'",
"depends_on": "eval:doc.footer_source==='HTML'",
"fieldname": "footer_script",
"fieldtype": "Code",
"label": "Footer Script",
@ -187,8 +183,8 @@
},
{
"collapsible": 1,
"collapsible_depends_on": "eval: doc.header_script || doc.footer_script",
"depends_on": "eval: doc.source === 'HTML' || doc.footer_source === 'HTML'",
"collapsible_depends_on": "eval:doc.header_script || doc.footer_script",
"depends_on": "eval:doc.source === 'HTML' || doc.footer_source === 'HTML'",
"fieldname": "scripts_section",
"fieldtype": "Section Break",
"label": "Scripts"
@ -232,18 +228,11 @@
"fieldtype": "Column Break"
},
{
"depends_on": "eval: doc.source === 'HTML' || doc.footer_source === 'HTML'",
"depends_on": "eval:doc.source === 'HTML'",
"fieldname": "custom_css",
"fieldtype": "Code",
"label": "Custom CSS",
"options": "CSS"
},
{
"collapsible": 1,
"depends_on": "eval: doc.source === 'HTML' || doc.footer_source === 'HTML'",
"fieldname": "style_section",
"fieldtype": "Section Break",
"label": "Style"
}
],
"icon": "fa fa-font",
@ -251,7 +240,7 @@
"links": [],
"make_attachments_public": 1,
"max_attachments": 3,
"modified": "2026-04-22 20:25:24.438817",
"modified": "2026-04-24 13:17:34.972069",
"modified_by": "Administrator",
"module": "Printing",
"name": "Letter Head",

4
frappe/utils/print_format.py
View file

@ -305,11 +305,11 @@ def render_letterhead_for_print(letterhead: str | None = None, doc: dict | str |
if letter_head.content:
header = render_template(letter_head.content, {"doc": context_doc})
if letter_head.header_script:
header += f"\n<script>\n{letter_head.header_script}\n</script>\n"
if letter_head.custom_css:
header += f"\n<style>\n{letter_head.custom_css}\n</style>\n"
rendered["header"] = header
if letter_head.header_script:
header += f"\n<script>\n{letter_head.header_script}\n</script>\n"
if letter_head.footer:
footer = render_template(letter_head.footer, {"doc": context_doc})

12
frappe/www/printview.py
View file

@ -230,18 +230,18 @@ def get_rendered_template(
if letter_head.content:
letter_head.content = frappe.utils.jinja.render_template(letter_head.content, {"doc": doc.as_dict()})
if letter_head.header_script:
letter_head.content += f"""
<script>
{letter_head.header_script}
</script>
"""
if letter_head.custom_css:
letter_head.content += f"""
<style>
{letter_head.custom_css}
</style>
"""
if letter_head.header_script:
letter_head.content += f"""
<script>
{letter_head.header_script}
</script>
"""
if letter_head.footer:
letter_head.footer = frappe.utils.jinja.render_template(letter_head.footer, {"doc": doc.as_dict()})