inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 20:45:44 +00:00
Code Activity

Merge branch 'master' into matmair/issue2694

Browse Source
This commit is contained in:
Matthias Mair
2022-03-20 02:29:20 +01:00
committed by GitHub
parent 966eb60dd8 96d89bf4ae
commit cc50eff3a1
38 changed files with 9082 additions and 8844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
InvenTree/order/api.py
View File

@ -970,9 +970,17 @@ class SOAllocationList(generics.ListAPIView):
outstanding = str2bool(outstanding)
if outstanding:
queryset = queryset.filter(line__order__status__in=SalesOrderStatus.OPEN)
# Filter only "open" orders
# Filter only allocations which have *not* shipped
queryset = queryset.filter(
line__order__status__in=SalesOrderStatus.OPEN,
shipment__shipment_date=None,
)
else:
queryset = queryset.exclude(line__order__status__in=SalesOrderStatus.OPEN)
queryset = queryset.exclude(
line__order__status__in=SalesOrderStatus.OPEN,
shipment__shipment_date=None
)
return queryset