diff --git a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html index 2c015192c4..1d758e8935 100644 --- a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html +++ b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html @@ -9,7 +9,7 @@
{% if doc.get(df.fieldname) != None -%} - {{ frappe.utils.fmt_money((doc[df.fieldname])|int|abs, currency=doc.currency) }} + {{ frappe.utils.fmt_money((doc[df.fieldname])|abs, currency=doc.currency) }} {% endif %}
@@ -26,7 +26,7 @@
- {{ frappe.utils.fmt_money((charge.tax_amount)|int|abs, currency=doc.currency) }} + {{ frappe.utils.fmt_money((charge.tax_amount)|abs, currency=doc.currency) }}
{%- endif -%} @@ -65,8 +65,10 @@ {% 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 %} - {% if tdf.fieldtype == 'Currency' %} -
{{ frappe.utils.fmt_money((d[tdf.fieldname])|int|abs, currency=doc.currency) }}
+ {% if tdf.fieldname == 'qty' %} +
{{ (d[tdf.fieldname])|abs }}
+ {% elif tdf.fieldtype == 'Currency' %} +
{{ frappe.utils.fmt_money((d[tdf.fieldname])|abs, currency=doc.currency) }}
{% else %}
{{ print_value(tdf, d, doc, visible_columns) }}
{% endif %} @@ -117,7 +119,7 @@ {{ render_currency(df, doc) }} {% elif df.fieldtype =='Table' %} {{ render_table(df, doc)}} - {% elif doc[df.fieldname] %} + {% elif doc[df.fieldname] and df.fieldname != 'total_qty' %} {{ render_field(df, doc) }} {% endif %} {% endfor %}