diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 7a16ef3464..9273f138f5 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -29,8 +29,10 @@ Sr {% for tdf in visible_columns %} + {% if data and not data[0].flags.compact_item_print or tdf.fieldname in doc.get(df.fieldname)[0].flags.compact_item_fields %} {{ _(tdf.label) }} + {% endif %} {% endfor %} @@ -39,8 +41,10 @@ {{ d.idx }} {% for tdf in visible_columns %} + {% if not d.flags.compact_item_print or tdf.fieldname in doc.get(df.fieldname)[0].flags.compact_item_fields %} -
{{ print_value(tdf, d, doc) }}
+
{{ print_value(tdf, d, doc, visible_columns) }}
+ {% endif %} {% endfor %} {% endfor %} @@ -94,7 +98,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {{ print_value(df, doc) }} {% endmacro %} -{%- macro print_value(df, doc, parent_doc=None) -%} +{%- macro print_value(df, doc, parent_doc=None, visible_columns=None) -%} {% if doc.print_templates and doc.print_templates.get(df.fieldname) %} {% include doc.print_templates[df.fieldname] %}