diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html index 1acede89a6..63885c0ae4 100644 --- a/erpnext/templates/print_formats/includes/item_grid.html +++ b/erpnext/templates/print_formats/includes/item_grid.html @@ -5,38 +5,41 @@
{{ _("Sr") }} | -{{ _("Item Name") }} | -{{ _("Description") }} | -{{ _("Qty") }} | -{{ _("Rate") }} | -{{ _("Amount") }} | +{{ _("Sr") }} | +{{ _("Item") }} | +{{ _("Qty") }} | +{{ _("Rate") }} | +{{ _("Amount") }} |
---|---|---|---|---|---|---|---|---|---|---|
{{ row.idx }} | -
- {{ row.item_name }}
- {% if row.item_code != row.item_name and not row.meta.get_field("item_code").print_hide -%}
- Item Code: {{ row.item_code }} + | {{ row.idx }} | +
+ {% if not row.meta.is_print_hide("item_code") -%}
+ {{ row.item_code }}
{%- endif %}
+ {% if (not row.meta.is_print_hide("item_name") and
+ (row.meta.is_print_hide("item_code") or row.item_code != row.item_name)) -%}
+ {{ row.item_name }}
+ {%- endif %}
+ {% if (not row.meta.is_print_hide("description") and row.description and
+ ((row.meta.is_print_hide("item_code") and row.meta.is_print_hide("item_name"))
+ or not (row.item_code == row.item_name == row.description))) -%}
+ {{ row.description }} + {%- endif %} + {%- for field in visible_columns -%} + {%- if (field.fieldname not in std_fields) and + (row[field.fieldname] not in (None, "", 0)) -%} +{{ _(field.label) }}:
+ {{ row.get_formatted(field.fieldname, doc) }}
+ {%- endif -%}
+ {%- endfor -%}
|
-
- {{ row.description }}
- {%- for field in visible_columns -%}
- {%- if (field.fieldname not in std_fields) and
- (row[field.fieldname] not in (None, "", 0)) -%}
-
- {{ _(field.label) }}: - {{ row.get_formatted(field.fieldname, doc) }} - {%- endif -%} - {%- endfor -%} - |
- {{ row.get_formatted("qty", doc) }} + | {{ row.get_formatted("qty", doc) }} {{ row.uom or row.stock_uom }} |
- {{ + | {{ row.get_formatted("rate", doc) }} | -{{ + | {{ row.get_formatted("amount", doc) }} |