Merge pull request #1222 from SchrodingersGat/bom-upload-fix

Fix IPN comparison against null value

InvenTree/InvenTree/static/script/inventree/tables.js

@@ -131,7 +131,6 @@ $.fn.inventreeTable = function(options) {
 
     // Callback when a column is changed
     options.onColumnSwitch = function(field, checked) {
-        console.log(`${field} -> ${checked}`);
         
         var columns = table.bootstrapTable('getVisibleColumns');
 

InvenTree/part/templates/part/detail.html

@@ -214,9 +214,9 @@
         <tr>
             <td>
                 {% if part.active %}
-                <span class='fas fa-check-square'></span>
+                <span class='fas fa-check-circle icon-green'></span>
                 {% else %}
-                <span class='fas fa-times-square'></span>
+                <span class='fas fa-times-circle icon-red'></span>
                 {% endif %}
             </td>
             <td><b>{% trans "Active" %}</b></td>

InvenTree/part/views.py

@@ -1320,7 +1320,7 @@ class BomUpload(InvenTreeRoleMixin, FormView):
                 # Otherwise, check to see if there is a matching IPN
                 try:
                     if row['part_ipn']:
-                        part_matches = [part for part in self.allowed_parts if row['part_ipn'].lower() == part.IPN.lower()]
+                        part_matches = [part for part in self.allowed_parts if part.IPN and row['part_ipn'].lower() == str(part.IPN.lower())]
     
                         # Check for single match
                         if len(part_matches) == 1:

InvenTree/stock/serializers.py

@@ -208,6 +208,7 @@ class StockItemSerializer(InvenTreeModelSerializer):
             'stale',
             'status',
             'status_text',
+            'stocktake_date',
             'supplier_part',
             'supplier_part_detail',
             'tracking_items',

InvenTree/stock/views.py

@@ -1721,7 +1721,7 @@ class StockItemCreate(AjaxCreateView):
 
                 item = form.save(commit=False)
                 item.user = self.request.user
-                item.save()
+                item.save(user=self.request.user)
 
                 return item
             
@@ -1732,7 +1732,7 @@ class StockItemCreate(AjaxCreateView):
             
             item = form.save(commit=False)
             item.user = self.request.user
-            item.save()
+            item.save(user=self.request.user)
 
             return item
 

InvenTree/templates/js/stock.js

@@ -590,6 +590,11 @@ function loadStockTable(table, options) {
                     return locationDetail(row);
                 }
             },
+            {
+                field: 'stocktake_date',
+                title: '{% trans "Stocktake" %}',
+                sortable: true,
+            },
             {% settings_value "STOCK_ENABLE_EXPIRY" as expiry %}
             {% if expiry %}
             {