diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js index 1cb90dbc3d..5238d0d556 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -484,6 +484,11 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { { label: __("Right", null, "alignment"), value: "right" }, ], }, + { + label: __("Hide Label"), + fieldname: "nolabel", + fieldtype: "Check", + }, { label: __("Remove Field"), fieldtype: "Button", @@ -497,10 +502,12 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { }); d.set_value("label", field.attr("data-label")); + d.set_value("nolabel", field.attr("data-nolabel")); d.set_primary_action(__("Update"), function () { field.attr("data-align", d.get_value("align")); field.attr("data-label", d.get_value("label")); + field.attr("data-nolabel", d.get_value("nolabel")); field.find(".field-label").html(d.get_value("label")); d.hide(); }); @@ -608,6 +615,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { var parent = $(this).parents(".print-format-builder-field:first"), doctype = parent.attr("data-doctype"), label = parent.attr("data-label"), + nolabel = parent.attr("data-nolabel"), columns = parent.attr("data-columns").split(","), column_names = $.map(columns, function (v) { return v.split("|")[0]; @@ -792,6 +800,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { fieldtype = $this.attr("data-fieldtype"), align = $this.attr("data-align"), label = $this.attr("data-label"), + nolabel = $this.attr("data-nolabel"), df = { fieldname: $this.attr("data-fieldname"), print_hide: 0, @@ -805,6 +814,10 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { df.label = label; } + if (cint(nolabel)) { + df.nolabel = 1; + } + if (fieldtype === "Table") { // append the user selected columns to visible_columns var columns = $this.attr("data-columns").split(","); diff --git a/frappe/printing/page/print_format_builder/print_format_builder_field.html b/frappe/printing/page/print_format_builder/print_format_builder_field.html index 67bc4d3e53..78f5bef24f 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder_field.html +++ b/frappe/printing/page/print_format_builder/print_format_builder_field.html @@ -3,6 +3,7 @@ title="{{ __("Hidden") }}"{% } %} data-fieldname="{%= field.fieldname %}" data-label="{{ __(field.label, context=field.parent) }}" + data-nolabel="{%= field.nolabel ? 1 : 0 %}" {% if field.align %}data-align="{{ field.align }}"{% endif %} data-fieldtype="{%= field.fieldtype %}" diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 3c6a73cfc4..06abd9d004 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -88,7 +88,13 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" }) -%} {% set render_field = doc.get(df.fieldname) != 0 if df.fieldtype == "Check" else doc.get(df.fieldname) != None %} - {% if render_field %} + {% if render_field and df.nolabel %} +
{{ doc.get(df.fieldname)|e }}
{% else -%}