From c4db308dce00a0d17963b1b53374f8c1f5e4789f Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 8 Sep 2022 16:26:07 +1000
Subject: [PATCH] Display more units (#3664)

* <

* Display units in "used in" table

* Display units in BOM table

* Include units in the 'available' column of BOM table
---
 InvenTree/part/templates/part/part_base.html |  2 +-
 InvenTree/templates/js/translated/bom.js     | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index f649f74c0b..9b09a58521 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -205,7 +205,7 @@
         <tr>
             <td><span class='fas fa-shopping-cart'></span></td>
             <td>{% trans "On Order" %}</td>
-            <td>{% decimal on_order %} {% include "part/part_units.html" %}/td>
+            <td>{% decimal on_order %} {% include "part/part_units.html" %}</td>
         </tr>
         {% endif %}
         {% if part.component %}
diff --git a/InvenTree/templates/js/translated/bom.js b/InvenTree/templates/js/translated/bom.js
index 3d03e20c94..e41b96cd09 100644
--- a/InvenTree/templates/js/translated/bom.js
+++ b/InvenTree/templates/js/translated/bom.js
@@ -868,6 +868,10 @@ function loadBomTable(table, options={}) {
             // Let's make it a bit more pretty
             text = parseFloat(text);
 
+            if (row.sub_part_detail && row.sub_part_detail.units) {
+                text += ` <small>${row.sub_part_detail.units}</small>`;
+            }
+
             if (row.optional) {
                 text += ' ({% trans "Optional" %})';
             }
@@ -923,6 +927,10 @@ function loadBomTable(table, options={}) {
 
             var text = `${available_stock}`;
 
+            if (row.sub_part_detail && row.sub_part_detail.units) {
+                text += ` <small>${row.sub_part_detail.units}</small>`;
+            }
+
             if (available_stock <= 0) {
                 text += `<span class='fas fa-times-circle icon-red float-right' title='{% trans "No Stock Available" %}'></span>`;
             } else {
@@ -1482,6 +1490,10 @@ function loadUsedInTable(table, part_id, options={}) {
                 formatter: function(value, row) {
                     var html = value;
 
+                    if (row.sub_part_detail && row.sub_part_detail.units) {
+                        html += ` <small>${row.sub_part_detail.units}</small>`;
+                    }
+
                     if (row.parent && row.parent != 'top-level-item') {
                         html += ` <em>({% trans "Inherited from parent BOM" %})</em>`;
                     }