{% trans "Part Parameters" %}
@@ -223,6 +232,21 @@
{{ block.super }}
{% if category %}
+
+ onPanelLoad('stock', function() {
+ loadStockTable(
+ $('#stock-table'),
+ {
+ params: {
+ category: {{ category.pk }},
+ part_detail: true,
+ location_detail: true,
+ supplier_part_detail: true,
+ }
+ }
+ );
+ });
+
onPanelLoad('parameters', function() {
loadParametricPartTable(
"#parametric-part-table",
diff --git a/InvenTree/part/templates/part/category_sidebar.html b/InvenTree/part/templates/part/category_sidebar.html
index 3d945d0433..5468d953ae 100644
--- a/InvenTree/part/templates/part/category_sidebar.html
+++ b/InvenTree/part/templates/part/category_sidebar.html
@@ -14,6 +14,8 @@
{% include "sidebar_link.html" with url=url text=text icon="fa-file-upload" %}
{% endif %}
{% if category %}
+{% trans "Stock Items" as text %}
+{% include "sidebar_item.html" with label='stock' text=text icon='fa-boxes' %}
{% trans "Parameters" as text %}
{% include "sidebar_item.html" with label="parameters" text=text icon="fa-tasks" %}
{% endif %}
\ No newline at end of file
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index 3768cd8787..d4fc5c93d1 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -402,11 +402,16 @@ class StockFilter(rest_filters.FilterSet):
serialized = rest_filters.BooleanFilter(label='Has serial number', method='filter_serialized')
def filter_serialized(self, queryset, name, value):
+ """
+ Filter by whether the StockItem has a serial number (or not)
+ """
+
+ q = Q(serial=None) | Q(serial='')
if str2bool(value):
- queryset = queryset.exclude(serial=None)
+ queryset = queryset.exclude(q)
else:
- queryset = queryset.filter(serial=None)
+ queryset = queryset.filter(q)
return queryset
@@ -417,10 +422,31 @@ class StockFilter(rest_filters.FilterSet):
Filter by whether the StockItem has a batch code (or not)
"""
+ q = Q(batch=None) | Q(batch='')
+
if str2bool(value):
- queryset = queryset.exclude(batch=None)
+ queryset = queryset.exclude(q)
else:
- queryset = queryset.filter(batch=None)
+ queryset = queryset.filter(q)
+
+ return queryset
+
+ tracked = rest_filters.BooleanFilter(label='Tracked', method='filter_tracked')
+
+ def filter_tracked(self, queryset, name, value):
+ """
+ Filter by whether this stock item is *tracked*, meaning either:
+ - It has a serial number
+ - It has a batch code
+ """
+
+ q_batch = Q(batch=None) | Q(batch='')
+ q_serial = Q(serial=None) | Q(serial='')
+
+ if str2bool(value):
+ queryset = queryset.exclude(q_batch & q_serial)
+ else:
+ queryset = queryset.filter(q_batch & q_serial)
return queryset
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index dc93f61e81..43593d3283 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -453,6 +453,12 @@ class StockItem(MPTTModel):
super().clean()
+ if self.serial is not None and type(self.serial) is str:
+ self.serial = self.serial.strip()
+
+ if self.batch is not None and type(self.batch) is str:
+ self.batch = self.batch.strip()
+
try:
if self.part.trackable:
# Trackable parts must have integer values for quantity field!
diff --git a/InvenTree/stock/test_api.py b/InvenTree/stock/test_api.py
index 73bee54110..7f94c6dedf 100644
--- a/InvenTree/stock/test_api.py
+++ b/InvenTree/stock/test_api.py
@@ -210,6 +210,46 @@ class StockItemListTest(StockAPITestCase):
for item in response:
self.assertIsNone(item['serial'])
+ def test_filter_by_has_batch(self):
+ """
+ Test the 'has_batch' filter, which tests if the stock item has been assigned a batch code
+ """
+
+ with_batch = self.get_stock(has_batch=1)
+ without_batch = self.get_stock(has_batch=0)
+
+ n_stock_items = StockItem.objects.all().count()
+
+ # Total sum should equal the total count of stock items
+ self.assertEqual(n_stock_items, len(with_batch) + len(without_batch))
+
+ for item in with_batch:
+ self.assertFalse(item['batch'] in [None, ''])
+
+ for item in without_batch:
+ self.assertTrue(item['batch'] in [None, ''])
+
+ def test_filter_by_tracked(self):
+ """
+ Test the 'tracked' filter.
+ This checks if the stock item has either a batch code *or* a serial number
+ """
+
+ tracked = self.get_stock(tracked=True)
+ untracked = self.get_stock(tracked=False)
+
+ n_stock_items = StockItem.objects.all().count()
+
+ self.assertEqual(n_stock_items, len(tracked) + len(untracked))
+
+ blank = [None, '']
+
+ for item in tracked:
+ self.assertTrue(item['batch'] not in blank or item['serial'] not in blank)
+
+ for item in untracked:
+ self.assertTrue(item['batch'] in blank and item['serial'] in blank)
+
def test_filter_by_expired(self):
"""
Filter StockItem by expiry status
diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js
index 186349b5ac..656a3f9f63 100644
--- a/InvenTree/templates/js/translated/model_renderers.js
+++ b/InvenTree/templates/js/translated/model_renderers.js
@@ -108,7 +108,7 @@ function renderStockItem(name, data, parameters={}, options={}) {
stock_detail = `{% trans "Quantity" %}: ${data.quantity}`;
}
- if (data.batch != null) {
+ if (data.batch) {
stock_detail += ` -
{% trans "Batch" %}: ${data.batch}`;
}
}
diff --git a/InvenTree/templates/js/translated/notification.js b/InvenTree/templates/js/translated/notification.js
index a289dcb8f7..74079669ab 100644
--- a/InvenTree/templates/js/translated/notification.js
+++ b/InvenTree/templates/js/translated/notification.js
@@ -171,6 +171,9 @@ function notificationCheck(force = false) {
{
success: function(response) {
updateNotificationIndicator(response.length);
+ },
+ error: function(xhr) {
+ console.warn('Could not access server: /api/notifications');
}
}
);
diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js
index c13ea41f99..de42528142 100644
--- a/InvenTree/templates/js/translated/stock.js
+++ b/InvenTree/templates/js/translated/stock.js
@@ -241,9 +241,11 @@ function stockItemFields(options={}) {
serial: {
icon: 'fa-hashtag',
},
+ batch: {
+ icon: 'fa-layer-group',
+ },
status: {},
expiry_date: {},
- batch: {},
purchase_price: {
icon: 'fa-dollar-sign',
},
@@ -964,7 +966,7 @@ function adjustStock(action, items, options={}) {
quantity = `#${item.serial}`;
}
- if (item.batch != null) {
+ if (item.batch) {
quantity += ` -
{% trans "Batch" %}: ${item.batch}`;
}
@@ -2657,7 +2659,8 @@ function installStockItem(stock_item_id, part_id, options={}) {
- {% trans "The Stock Item links to a Part which is the BOM for this Stock Item" %}
- {% trans "The Stock Item is currently available in stock" %}
- - {% trans "The Stock Item is serialized and does not belong to another item" %}
+ - {% trans "The Stock Item is not already installed in another item" %}
+ - {% trans "The Stock Item is tracked by either a batch code or serial number" %}
`;
@@ -2683,7 +2686,7 @@ function installStockItem(stock_item_id, part_id, options={}) {
filters: {
part_detail: true,
in_stock: true,
- serialized: true,
+ tracked: true,
},
adjustFilters: function(filters, opts) {
var part = getFormFieldValue('part', {}, opts);
diff --git a/InvenTree/templates/js/translated/table_filters.js b/InvenTree/templates/js/translated/table_filters.js
index 303d484788..c806afd4b1 100644
--- a/InvenTree/templates/js/translated/table_filters.js
+++ b/InvenTree/templates/js/translated/table_filters.js
@@ -242,6 +242,11 @@ function getAvailableTableFilters(tableKey) {
title: '{% trans "Batch" %}',
description: '{% trans "Batch code" %}',
},
+ tracked: {
+ title: '{% trans "Tracked" %}',
+ description: '{% trans "Stock item is tracked by either batch code or serial number" %}',
+ type: 'bool',
+ },
has_purchase_price: {
type: 'bool',
title: '{% trans "Has purchase price" %}',