diff --git a/InvenTree/InvenTree/status_codes.py b/InvenTree/InvenTree/status_codes.py index 930242f396..b7b50a58f7 100644 --- a/InvenTree/InvenTree/status_codes.py +++ b/InvenTree/InvenTree/status_codes.py @@ -43,7 +43,7 @@ class OrderStatus(StatusCode): CANCELLED, LOST, RETURNED - ] + ] class StockStatus(StatusCode): diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index 4f0e45c2aa..68e9cbaf9b 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -140,7 +140,7 @@ class Company(models.Model): - Complete - Failed / lost - - Returned + - Returned """ return self.purchase_orders.exclude(status__in=OrderStatus.OPEN) @@ -153,6 +153,7 @@ class Company(models.Model): return self.purchase_orders.filter(status__in=OrderStatus.FAILED) + class Contact(models.Model): """ A Contact represents a person who works at a particular company. A Company may have zero or more associated Contact objects. @@ -248,7 +249,7 @@ class SupplierPart(models.Model): @property def manufacturer_string(self): """ Format a MPN string for this SupplierPart. - Concatenates manufacture name and part number + Concatenates manufacture name and part number. """ items = [] @@ -314,14 +315,14 @@ class SupplierPart(models.Model): return None def open_orders(self): - """ Return a database query for PO line items for this SupplierPart, + """ Return a database query for PO line items for this SupplierPart, limited to purchase orders that are open / outstanding. """ return self.purchase_order_line_items.prefetch_related('order').filter(order__status__in=OrderStatus.OPEN) def on_order(self): - """ Return the total quantity of items currently on order. + """ Return the total quantity of items currently on order. Subtract partially received stock as appropriate """ @@ -332,13 +333,12 @@ class SupplierPart(models.Model): q = totals.get('quantity__sum', 0) # Quantity received - r = totals.get('received__sum', 0) + r = totals.get('received__sum', 0) if q is None or r is None: return 0 else: - return max(q-r, 0) - + return max(q - r, 0) def purchase_orders(self): """ Returns a list of purchase orders relating to this supplier part """ diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 951de8c6fd..718b26c98c 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -79,7 +79,7 @@ class PurchaseOrderCreate(AjaxCreateView): except Company.DoesNotExist: pass - return initials + return initials class PurchaseOrderEdit(AjaxUpdateView):