refactor: logic moved to standard template

Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
This commit is contained in:
Frappe ERPnext 2020-09-03 17:31:21 +02:00
parent a5d5e70bf4
commit 9355641c49

View File

@ -1,6 +1,15 @@
{% 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>
{% set qty_first=frappe.db.get_single_value("Print Settings", "print_uom_after_quantity") %}
{% if qty_first %}
{{ doc.get_formatted("qty", doc) }}
{% if (doc.uom and not doc.is_print_hide("uom")) %} {{ _(doc.uom) }}
{% elif (doc.stock_uom and not doc.is_print_hide("stock_uom")) %} {{ _(doc.stock_uom) }}
{%- endif %}
{% else %}
{% 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) }}
{%- endif %}
{{ doc.get_formatted("qty", doc) }}