Merge remote-tracking branch 'inventree/master' into order-parts-wizard

InvenTree/part/templates/part/part_base.html

@@ -211,44 +211,18 @@
         {% if part.component %}
         {% if required_build_order_quantity > 0 %}
         <tr>
-            <td><span class='fas fa-clipboard-list'></span></td>
+            <td><span class='fas fa-tools'></span></td>
-            <td>{% trans "Required for Build Orders" %}</td>
-            <td>{% decimal required_build_order_quantity %}</td>
-        </tr>
-        <tr>
-            <td><span class='fas fa-dolly'></span></td>
             <td>{% trans "Allocated to Build Orders" %}</td>
-            <td>
+            <td>{% progress_bar allocated_build_order_quantity required_build_order_quantity id='build-order-allocated' max_width='150px' %}</td>
-                {% decimal allocated_build_order_quantity %}
-                {% if allocated_build_order_quantity < required_build_order_quantity %}
-                <span class='fas fa-times-circle icon-red float-right' title='{% trans "Required quantity has not been allocated" %}'></span>
-                {% else %}
-                <span class='fas fa-check-circle icon-green float-right' title='{% trans "Required quantity has been allocated" %}'></span>
-                {% endif %}
-            </td>
         </tr>
         {% endif %}
         {% endif %}
         {% if part.salable %}
         {% if required_sales_order_quantity > 0 %}
         <tr>
-            <td><span class='fas fa-clipboard-list'></span></td>
+            <td><span class='fas fa-truck'></span></td>
-            <td>{% trans "Required for Sales Orders" %}</td>
-            <td>
-                {% decimal required_sales_order_quantity %}
-            </td>
-        </tr>
-        <tr>
-            <td><span class='fas fa-dolly'></span></td>
             <td>{% trans "Allocated to Sales Orders" %}</td>
-            <td>
+            <td>{% progress_bar allocated_sales_order_quantity required_sales_order_quantity id='sales-order-allocated' max_width='150px' %}</td>
-                {% decimal allocated_sales_order_quantity %}
-                {% if allocated_sales_order_quantity < required_sales_order_quantity %}
-                <span class='fas fa-times-circle icon-red float-right' title='{% trans "Required quantity has not been allocated" %}'></span>
-                {% else %}
-                <span class='fas fa-check-circle icon-green float-right' title='{% trans "Required quantity has been allocated" %}'></span>
-                {% endif %}
-            </td>
         </tr>
         {% endif %}
         {% endif %}

InvenTree/part/templatetags/inventree_extras.py

@@ -352,21 +352,24 @@ def visible_global_settings(*args, **kwargs):
 
 
 @register.simple_tag()
-def progress_bar(val, max, *args, **kwargs):
+def progress_bar(val, max_val, *args, **kwargs):
     """
     Render a progress bar element
     """
 
     item_id = kwargs.get('id', 'progress-bar')
 
-    if val > max:
+    val = InvenTree.helpers.normalize(val)
+    max_val = InvenTree.helpers.normalize(max_val)
+
+    if val > max_val:
         style = 'progress-bar-over'
-    elif val < max:
+    elif val < max_val:
         style = 'progress-bar-under'
     else:
         style = ''
 
-    percent = float(val / max) * 100
+    percent = float(val / max_val) * 100
 
     if percent > 100:
         percent = 100
@@ -383,7 +386,7 @@ def progress_bar(val, max, *args, **kwargs):
     html = f"""
     <div id='{item_id}' class='progress' style='{" ".join(style_tags)}'>
         <div class='progress-bar {style}' role='progressbar' aria-valuemin='0' aria-valuemax='100' style='width:{percent}%'></div>
-        <div class='progress-value'>{val} / {max}</div>
+        <div class='progress-value'>{val} / {max_val}</div>
     </div>
     """
 

InvenTree/plugin/builtin/integration/mixins.py

@@ -504,10 +504,10 @@ class APICallMixin:
 
     @property
     def api_headers(self):
-        return {
+        headers = {'Content-Type': 'application/json'}
-            self.API_TOKEN: self.get_setting(self.API_TOKEN_SETTING),
+        if getattr(self, 'API_TOKEN_SETTING'):
-            'Content-Type': 'application/json'
+            headers[self.API_TOKEN] = self.get_setting(self.API_TOKEN_SETTING)
-        }
+        return headers
 
     def api_build_url_args(self, arguments):
         groups = []
@@ -515,16 +515,21 @@ class APICallMixin:
             groups.append(f'{key}={",".join([str(a) for a in val])}')
         return f'?{"&".join(groups)}'
 
-    def api_call(self, endpoint, method: str = 'GET', url_args=None, data=None, headers=None, simple_response: bool = True):
+    def api_call(self, endpoint, method: str = 'GET', url_args=None, data=None, headers=None, simple_response: bool = True, endpoint_is_url: bool = False):
         if url_args:
             endpoint += self.api_build_url_args(url_args)
 
         if headers is None:
             headers = self.api_headers
 
+        if endpoint_is_url:
+            url = endpoint
+        else:
+            url = f'{self.api_url}/{endpoint}'
+
         # build kwargs for call
         kwargs = {
-            'url': f'{self.api_url}/{endpoint}',
+            'url': url,
             'headers': headers,
         }
         if data:

InvenTree/templates/js/translated/bom.js

@@ -691,8 +691,24 @@ function loadBomTable(table, options={}) {
 
     setupFilterList('bom', $(table));
 
-    // Construct the table columns
+    function availableQuantity(row) {
 
+        // Base stock
+        var available = row.available_stock;
+
+        // Substitute stock
+        available += (row.available_substitute_stock || 0);
+
+        // Variant stock
+        if (row.allow_variants) {
+            available += (row.available_variant_stock || 0);
+        }
+
+        return available;
+
+    }
+
+    // Construct the table columns
     var cols = [];
 
     if (options.editable) {
@@ -807,11 +823,10 @@ function loadBomTable(table, options={}) {
             var url = `/part/${row.sub_part_detail.pk}/?display=part-stock`;
 
             // Calculate total "available" (unallocated) quantity
-            var base_stock = row.available_stock;
             var substitute_stock = row.available_substitute_stock || 0;
             var variant_stock = row.allow_variants ? (row.available_variant_stock || 0) : 0;
 
-            var available_stock = base_stock + substitute_stock + variant_stock;
+            var available_stock = availableQuantity(row);
             
             var text = `${available_stock}`;
 
@@ -923,7 +938,7 @@ function loadBomTable(table, options={}) {
             formatter: function(value, row) {
                 var can_build = 0;
 
-                var available = row.available_stock + (row.available_substitute_stock || 0) + (row.available_variant_stock || 0);
+                var available = availableQuantity(row);
 
                 if (row.quantity > 0) {
                     can_build = available / row.quantity;
@@ -937,11 +952,11 @@ function loadBomTable(table, options={}) {
                 var cb_b = 0;
 
                 if (rowA.quantity > 0) {
-                    cb_a = (rowA.available_stock + rowA.available_substitute_stock) / rowA.quantity;
+                    cb_a = availableQuantity(rowA) / rowA.quantity;
                 }
 
                 if (rowB.quantity > 0) {
-                    cb_b = (rowB.available_stock + rowB.available_substitute_stock) / rowB.quantity;
+                    cb_b = availableQuantity(rowB) / rowB.quantity;
                 }
 
                 return (cb_a > cb_b) ? 1 : -1;

InvenTree/templates/js/translated/build.js

@@ -1031,6 +1031,23 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
         return row.required;
     }
 
+    function availableQuantity(row) {
+
+        // Base stock
+        var available = row.available_stock;
+
+        // Substitute stock
+        available += (row.available_substitute_stock || 0);
+
+        // Variant stock
+        if (row.allow_variants) {
+            available += (row.available_variant_stock || 0);
+        }
+
+        return available;
+
+    }
+
     function sumAllocations(row) {
         // Calculat total allocations for a given row
         if (!row.allocations) {
@@ -1429,16 +1446,27 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
                     var url = `/part/${row.sub_part_detail.pk}/?display=part-stock`;
 
                     // Calculate total "available" (unallocated) quantity
-                    var base_stock = row.available_stock;
                     var substitute_stock = row.available_substitute_stock || 0;
                     var variant_stock = row.allow_variants ? (row.available_variant_stock || 0) : 0;
 
-                    var available_stock = base_stock + substitute_stock + variant_stock;
+                    var available_stock = availableQuantity(row);
             
-                    var text = `${available_stock}`;
+                    var required = requiredQuantity(row);
+
+                    var text = '';
+                    
+                    if (available_stock > 0) {
+                        text += `${available_stock}`;
+                    }
+                    
+                    if (available_stock < required) {
+                        text += `<span class='fas fa-times-circle icon-red float-right' title='{% trans "Insufficient stock available" %}'></span>`;
+                    } else {
+                        text += `<span class='fas fa-check-circle icon-green float-right' title='{% trans "Sufficient stock available" %}'></span>`;
+                    }
 
                     if (available_stock <= 0) {
-                        text = `<span class='badge rounded-pill bg-danger'>{% trans "No Stock Available" %}</span>`;
+                        text += `<span class='badge rounded-pill bg-danger'>{% trans "No Stock Available" %}</span>`;
                     } else {
                         var extra = '';
                         if ((substitute_stock > 0) && (variant_stock > 0)) {
@@ -1455,7 +1483,11 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
                     }
         
                     return renderLink(text, url);
-                }
+                },
+                sorter: function(valA, valB, rowA, rowB) {
+
+                    return availableQuantity(rowA) > availableQuantity(rowB) ? 1 : -1;
+                },
             },
             {
                 field: 'allocated',

docker/Dockerfile

@@ -65,8 +65,8 @@ RUN apk add --no-cache git make bash \
     libjpeg-turbo libjpeg-turbo-dev jpeg jpeg-dev \
     libffi libffi-dev \
     zlib zlib-dev \
-    # Cairo deps for WeasyPrint (these will be deprecated once WeasyPrint drops cairo requirement)
+    # Special deps for WeasyPrint (these will be deprecated once WeasyPrint drops cairo requirement)
-    cairo cairo-dev pango pango-dev \
+    cairo cairo-dev pango pango-dev gdk-pixbuf \
     # Fonts
     fontconfig ttf-droid ttf-liberation ttf-dejavu ttf-opensans ttf-ubuntu-font-family font-croscore font-noto \
     # Core python