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

Merge pull request #23263 from Semiranis/uom_after_qty

Browse Source 
feat: Option to print UOM after quantity
This commit is contained in:
rohitwaghchaure 2020-09-04 16:06:46 +05:30 committed by GitHub
commit c9a5afaa1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/setup/install.py
View File

@ -20,6 +20,7 @@ def after_install():
frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert() frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert()
set_single_defaults() set_single_defaults()
create_compact_item_print_custom_field() create_compact_item_print_custom_field()
create_print_uom_after_qty_custom_field()
create_print_zero_amount_taxes_custom_field() create_print_zero_amount_taxes_custom_field()
add_all_roles_to("Administrator") add_all_roles_to("Administrator")
create_default_cash_flow_mapper_templates() create_default_cash_flow_mapper_templates()
@ -66,6 +67,16 @@ def create_compact_item_print_custom_field():
}) })
def create_print_uom_after_qty_custom_field():
create_custom_field('Print Settings', {
'label': _('Print UOM after Quantity'),
'fieldname': 'print_uom_after_quantity',
'fieldtype': 'Check',
'default': 0,
'insert_after': 'compact_item_print'
})
def create_print_zero_amount_taxes_custom_field(): def create_print_zero_amount_taxes_custom_field():
create_custom_field('Print Settings', { create_custom_field('Print Settings', {
'label': _('Print taxes with zero amount'), 'label': _('Print taxes with zero amount'),

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

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