diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html index d6ab347c922..1d09f73feca 100644 --- a/erpnext/templates/print_formats/includes/item_grid.html +++ b/erpnext/templates/print_formats/includes/item_grid.html @@ -1,8 +1,8 @@ {%- from "templates/print_formats/standard_macros.html" import print_value -%} {%- set std_fields = ("item_code", "item_name", "description", "qty", "rate", "amount", "stock_uom", "uom") -%} {%- set visible_columns = get_visible_columns(doc.get(df.fieldname), table_meta) -%} -{%- set hide_rate = data[0].meta.is_print_hide("rate") -%} -{%- set hide_amount = data[0].meta.is_print_hide("amount") -%} +{%- set hide_rate = data[0].meta.is_print_hide("rate") if data|length else False-%} +{%- set hide_amount = data[0].meta.is_print_hide("amount") if data|length else False-%} @@ -22,12 +22,12 @@ {%- 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.get_formatted("item_name",as_html=True) }}
+
{{ row.get_formatted("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.get_formatted("description", as_html=True) }}

+

{{ row.get_formatted("description") }}

{%- endif %} {%- for field in visible_columns -%} {%- if (field.fieldname not in std_fields) and diff --git a/erpnext/templates/print_formats/includes/taxes.html b/erpnext/templates/print_formats/includes/taxes.html index 50f9d86a38d..bd1e709787b 100644 --- a/erpnext/templates/print_formats/includes/taxes.html +++ b/erpnext/templates/print_formats/includes/taxes.html @@ -5,7 +5,7 @@ {%- if not charge.included_in_print_rate -%}
-
+
{{ frappe.format_value(charge.tax_amount / doc.conversion_rate, table_meta.get_field("tax_amount"), doc, currency=doc.currency) }}