nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[resolved] merge-conflicts

Browse Source
This commit is contained in:
Saurabh
2018-09-12 14:48:30 +05:30
parent 8dade79002 b3737c812a
commit 393dd4286a
18 changed files with 697 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/templates/print_formats/includes/item_table_qty.html
View File

@@ -1,4 +1,6 @@
{% if (doc.stock_uom and not doc.is_print_hide("stock_uom")) or (doc.uom and not doc.is_print_hide("uom")) -%}
<small class="pull-left">{{ _(doc.uom or doc.stock_uom) }}</small>
{% if (doc.uom and not doc.is_print_hide("uom")) %}
<small class="pull-left">{{ _(doc.uom) }}</small>
{% elif (doc.stock_uom and not doc.is_print_hide("stock_uom")) %}
<small class="pull-left">{{ _(doc.stock_uom) }}</small>
{%- endif %}
{{ doc.get_formatted("qty", doc) }}