Merge pull request #31372 from frappe/fix-custom-print
fix(print): handle custom format with custom module
This commit is contained in:
commit
42f9e537d0
1 changed files with 11 additions and 9 deletions
|
|
@ -436,21 +436,23 @@ def get_print_format(doctype: str, print_format: "PrintFormat") -> str:
|
|||
|
||||
# server, find template
|
||||
module = print_format.module or frappe.db.get_value("DocType", doctype, "module")
|
||||
path = os.path.join(
|
||||
get_module_path(module, "Print Format", print_format.name),
|
||||
frappe.scrub(print_format.name) + ".html",
|
||||
)
|
||||
|
||||
if os.path.exists(path):
|
||||
with open(path) as pffile:
|
||||
return pffile.read()
|
||||
else:
|
||||
is_custom_module = frappe.get_cached_value("Module Def", module, "custom")
|
||||
if is_custom_module:
|
||||
if print_format.raw_printing:
|
||||
return print_format.raw_commands
|
||||
if print_format.html:
|
||||
return print_format.html
|
||||
|
||||
frappe.throw(_("No template found at path: {0}").format(path), frappe.TemplateNotFoundError)
|
||||
path = os.path.join(
|
||||
get_module_path(module, "Print Format", print_format.name),
|
||||
frappe.scrub(print_format.name) + ".html",
|
||||
)
|
||||
if os.path.exists(path):
|
||||
with open(path) as pffile:
|
||||
return pffile.read()
|
||||
|
||||
frappe.throw(_("No template found at path: {0}").format(path), frappe.TemplateNotFoundError)
|
||||
|
||||
|
||||
def make_layout(doc: "Document", meta: "Meta", format_data=None) -> list:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue