From 351c5fb7d0b432ab7a559f85581d071590ab4f24 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Fri, 7 Jun 2019 09:54:36 +1000 Subject: [PATCH] Fix for 'on_order' calculation - Handle null results --- InvenTree/company/models.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index 324e5dcf59..33841d59db 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -237,6 +237,9 @@ class SupplierPart(models.Model): @property def manufacturer_string(self): + """ Format a MPN string for this SupplierPart. + Concatenates manufacture name and part number + """ items = [] @@ -315,7 +318,16 @@ class SupplierPart(models.Model): totals = self.open_orders().aggregate(Sum('quantity'), Sum('received')) - return totals['quantity__sum'] - totals['received__sum'] + # Quantity on order + q = totals.get('quantity__sum', 0) + + # Quantity received + r = totals.get('received__sum', 0) + + if q is None or r is None: + return 0 + else: + return q - r def purchase_orders(self):