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

Revert "feat: Option to print UOM after quantity"

Browse Source 
This reverts commit a787882a8f55333d7f41a4df9c09e01d05b540df.
This commit is contained in:
Frappe ERPnext 2020-09-03 17:30:25 +02:00
parent f28bef868d
commit a5d5e70bf4
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/print_settings.py
View File

@ -7,15 +7,9 @@ from frappe.utils import cint
def print_settings_for_item_table(doc):
if frappe.db.get_single_value("Print Settings", "print_uom_after_quantity") != 1:
doc.print_templates = {
"qty": "templates/print_formats/includes/item_table_qty.html"
}
else:
doc.print_templates = {
"qty": "templates/print_formats/includes/item_table_qty_swapped.html"
}
doc.print_templates = {
"qty": "templates/print_formats/includes/item_table_qty.html"
}
doc.hide_in_print_layout = ["uom", "stock_uom"]
doc.flags.compact_item_print = cint(frappe.db.get_single_value("Print Settings", "compact_item_print"))

5
erpnext/templates/print_formats/includes/item_table_qty_swapped.html
View File

@ -1,5 +0,0 @@
{{ 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 %}