Improved queryset filtering

order_history/views.py

@@ -84,6 +84,9 @@ def generate_build_order_history(self):
             completion_date__lte=self.end_date
         )
 
+        # Exclude builds which have no completed stock
+        builds = builds.exclude(completed=0)
+
         # Construct a dict of order quantities for each part type
         parts = {}
         history_items = {}
@@ -145,6 +148,9 @@ def generate_purchase_order_history(self):
         # Exclude any lines which do not map to an internal part
         lines = lines.exclude(part__part=None)
 
+        # Exclude lines which have no received stock
+        lines = lines.exclude(received=0)
+
         # Construct a dictionary of purchase history data to part ID
         history_items = {}
         parts = {}
@@ -199,6 +205,9 @@ def generate_sales_order_history(self):
             order__shipment_date__lte=self.end_date
         )
 
+        # Exclude lines which have no shipped stock
+        lines = lines.exclude(shipped=0)
+
         # Construct a dictionary of sales history data to part ID
         history_items = {}
         parts = {}