Merge pull request #2836 from SchrodingersGat/batch-in-forms

Batch in forms

InvenTree/InvenTree/version.py

@@ -12,11 +12,14 @@ import common.models
 INVENTREE_SW_VERSION = "0.7.0 dev"
 
 # InvenTree API version
-INVENTREE_API_VERSION = 38
+INVENTREE_API_VERSION = 39
 
 """
 Increment this API version number whenever there is a significant change to the API that any clients need to know about
 
+v39 -> 2022-04-18
+    - Adds ability to filter StockItem list by "has_batch" parameter
+
 v38 -> 2022-04-14 : https://github.com/inventree/InvenTree/pull/2828
     - Adds the ability to include stock test results for "installed items"
 

InvenTree/stock/api.py

@@ -410,6 +410,20 @@ class StockFilter(rest_filters.FilterSet):
 
         return queryset
 
+    has_batch = rest_filters.BooleanFilter(label='Has batch code', method='filter_has_batch')
+
+    def filter_has_batch(self, queryset, name, value):
+        """
+        Filter by whether the StockItem has a batch code (or not)
+        """
+
+        if str2bool(value):
+            queryset = queryset.exclude(batch=None)
+        else:
+            queryset = queryset.filter(batch=None)
+
+        return queryset
+
     installed = rest_filters.BooleanFilter(label='Installed in other stock item', method='filter_installed')
 
     def filter_installed(self, queryset, name, value):

InvenTree/templates/js/translated/model_renderers.js

@@ -99,14 +99,22 @@ function renderStockItem(name, data, parameters={}, options={}) {
 
     var stock_detail = '';
 
-    if (data.serial && data.quantity == 1) {
-        stock_detail = `{% trans "Serial Number" %}: ${data.serial}`;
-    } else if (data.quantity == 0) {
+    if (data.quantity == 0) {
         stock_detail = `<span class='badge rounded-pill bg-danger'>{% trans "No Stock"% }</span>`;
     } else {
-        stock_detail = `{% trans "Quantity" %}: ${data.quantity}`;
+        if (data.serial && data.quantity == 1) {
+            stock_detail = `{% trans "Serial Number" %}: ${data.serial}`;
+        } else {
+            stock_detail = `{% trans "Quantity" %}: ${data.quantity}`;
+        }
+
+        if (data.batch != null) {
+            stock_detail += ` - <small>{% trans "Batch" %}: ${data.batch}</small>`;
+        }
     }
 
+
+
     var html = `
     <span>
         ${part_detail}

InvenTree/templates/js/translated/stock.js

@@ -964,6 +964,10 @@ function adjustStock(action, items, options={}) {
             quantity = `#${item.serial}`;
         }
 
+        if (item.batch != null) {
+            quantity += ` - <small>{% trans "Batch" %}: ${item.batch}</small>`;
+        }
+
         var actionInput = '';
 
         if (actionTitle != null) {

InvenTree/templates/js/translated/table_filters.js

@@ -234,6 +234,10 @@ function getAvailableTableFilters(tableKey) {
                 title: '{% trans "Stock status" %}',
                 description: '{% trans "Stock status" %}',
             },
+            has_batch: {
+                title: '{% trans "Has batch code" %}',
+                type: 'bool',
+            },
             batch: {
                 title: '{% trans "Batch" %}',
                 description: '{% trans "Batch code" %}',