diff --git a/InvenTree/order/admin.py b/InvenTree/order/admin.py index a213f09764..b7ac71976c 100644 --- a/InvenTree/order/admin.py +++ b/InvenTree/order/admin.py @@ -12,6 +12,7 @@ from .models import PurchaseOrder, PurchaseOrderLineItem from .models import SalesOrder, SalesOrderLineItem from .models import SalesOrderAllocation + class PurchaseOrderAdmin(ImportExportModelAdmin): list_display = ( diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index 8e9910cfc6..3452cc6bb7 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -19,6 +19,7 @@ import os from datetime import datetime from decimal import Decimal +from part.models import Part from stock import models as stock_models from company.models import Company, SupplierPart diff --git a/InvenTree/stock/__init__.py b/InvenTree/stock/__init__.py index 7b58c08fc9..6970329be1 100644 --- a/InvenTree/stock/__init__.py +++ b/InvenTree/stock/__init__.py @@ -6,4 +6,4 @@ It includes models for: - StockLocation - StockItem - StockItemTracking -""" \ No newline at end of file +""" diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py index bcec2c2bf1..2c22665da0 100644 --- a/InvenTree/stock/api.py +++ b/InvenTree/stock/api.py @@ -12,7 +12,6 @@ from django.db.models import Q from .models import StockLocation, StockItem from .models import StockItemTracking -from order.models import SalesOrder from part.models import Part, PartCategory from .serializers import StockItemSerializer diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 7a30b694b5..4ea271c6ab 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -31,7 +31,7 @@ from InvenTree.models import InvenTreeTree from InvenTree.fields import InvenTreeURLField from part.models import Part -from order.models import PurchaseOrder, SalesOrder, SalesOrderAllocation +from order.models import PurchaseOrder, SalesOrder class StockLocation(InvenTreeTree): @@ -426,7 +426,6 @@ class StockItem(MPTTModel): return self.build_allocation_count() + self.sales_order_allocation_count() - def can_delete(self): """ Can this stock item be deleted? It can NOT be deleted under the following circumstances: