Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Positive qty in sales return print (#19310)

Browse Source
This commit is contained in:
Nabin Hait 2019-10-21 13:36:26 +05:30 committed by GitHub
parent 49a46f08de
commit 8232bd01d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html
View File

@ -9,7 +9,7 @@
</div> </div>
<div class="col-xs-{{ "3" if df.fieldtype=="Check" else "7" }} value"> <div class="col-xs-{{ "3" if df.fieldtype=="Check" else "7" }} value">
{% if doc.get(df.fieldname) != None -%} {% 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 %} {% endif %}
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
<div class="col-xs-5 {%- if doc.align_labels_right %} text-right{%- endif -%}"> <div class="col-xs-5 {%- if doc.align_labels_right %} text-right{%- endif -%}">
<label>{{ charge.get_formatted("description") }}</label></div> <label>{{ charge.get_formatted("description") }}</label></div>
<div class="col-xs-7 text-right"> <div class="col-xs-7 text-right">
{{ frappe.utils.fmt_money((charge.tax_amount)|int|abs, currency=doc.currency) }} {{ frappe.utils.fmt_money((charge.tax_amount)|abs, currency=doc.currency) }}
</div> </div>
</div> </div>
{%- endif -%} {%- endif -%}
@ -65,8 +65,10 @@
{% for tdf in visible_columns %} {% 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 not d.flags.compact_item_print or tdf.fieldname in doc.get(df.fieldname)[0].flags.compact_item_fields %}
<td class="{{ get_align_class(tdf) }}" {{ fieldmeta(df) }}> <td class="{{ get_align_class(tdf) }}" {{ fieldmeta(df) }}>
{% if tdf.fieldtype == 'Currency' %} {% if tdf.fieldname == 'qty' %}
<div class="value">{{ frappe.utils.fmt_money((d[tdf.fieldname])|int|abs, currency=doc.currency) }}</div></td> <div class="value">{{ (d[tdf.fieldname])|abs }}</div></td>
{% elif tdf.fieldtype == 'Currency' %}
<div class="value">{{ frappe.utils.fmt_money((d[tdf.fieldname])|abs, currency=doc.currency) }}</div></td>
{% else %} {% else %}
<div class="value">{{ print_value(tdf, d, doc, visible_columns) }}</div></td> <div class="value">{{ print_value(tdf, d, doc, visible_columns) }}</div></td>
{% endif %} {% endif %}
@ -117,7 +119,7 @@
{{ render_currency(df, doc) }} {{ render_currency(df, doc) }}
{% elif df.fieldtype =='Table' %} {% elif df.fieldtype =='Table' %}
{{ render_table(df, doc)}} {{ render_table(df, doc)}}
{% elif doc[df.fieldname] %} {% elif doc[df.fieldname] and df.fieldname != 'total_qty' %}
{{ render_field(df, doc) }} {{ render_field(df, doc) }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}