StockItem: filtering improvements

- Optional 'cacade' param
- Filter by null parent

InvenTree/InvenTree/static/script/inventree/stock.js

@@ -42,6 +42,10 @@ function loadStockTable(table, options) {
     
     var params = options.params || {};
 
+    // Enforce 'cascade' option
+    // TODO - Make this user-configurable?
+    params.cascade = true;
+
     console.log('load stock table');
 
     table.inventreeTable({

InvenTree/stock/api.py

@@ -396,10 +396,21 @@ class StockList(generics.ListCreateAPIView):
         # Does the client wish to filter by stock location?
         loc_id = self.request.query_params.get('location', None)
 
-        if loc_id:
+        cascade = str2bool(self.request.query_params.get('cascade', False))
+
+        if loc_id is not None:
+
+            # Filter by 'null' location (i.e. top-level items)
+            if isNull(loc_id):
+                stock_list = stock_list.filter(location=None)
+            else:
                 try:
+                    # If '?cascade=true' then include items which exist in sub-locations
+                    if cascade:
                         location = StockLocation.objects.get(pk=loc_id)
                         stock_list = stock_list.filter(location__in=location.getUniqueChildren())
+                    else:
+                        stock_list = stock_list.filter(location=loc_id)
                     
                 except (ValueError, StockLocation.DoesNotExist):
                     pass