Merge branch 'master' of https://github.com/inventree/InvenTree into part-import

InvenTree/order/serializers.py

@@ -17,6 +17,8 @@ from InvenTree.serializers import InvenTreeAttachmentSerializerField
 
 from company.serializers import CompanyBriefSerializer, SupplierPartSerializer
 from part.serializers import PartBriefSerializer
+from stock.serializers import LocationBriefSerializer
+from stock.serializers import StockItemSerializer, LocationSerializer
 
 from .models import PurchaseOrder, PurchaseOrderLineItem
 from .models import PurchaseOrderAttachment, SalesOrderAttachment
@@ -41,7 +43,7 @@ class POSerializer(InvenTreeModelSerializer):
         """
         Add extra information to the queryset
 
-        - Number of liens in the PurchaseOrder
+        - Number of lines in the PurchaseOrder
         - Overdue status of the PurchaseOrder
         """
 
@@ -116,6 +118,8 @@ class POLineItemSerializer(InvenTreeModelSerializer):
 
     purchase_price_string = serializers.CharField(source='purchase_price', read_only=True)
 
+    destination = LocationBriefSerializer(source='get_destination', read_only=True)
+
     class Meta:
         model = PurchaseOrderLineItem
 
@@ -132,6 +136,7 @@ class POLineItemSerializer(InvenTreeModelSerializer):
             'purchase_price',
             'purchase_price_currency',
             'purchase_price_string',
+            'destination',
         ]
 
 
@@ -232,11 +237,38 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer):
     This includes some fields from the related model objects.
     """
 
-    location_path = serializers.CharField(source='get_location_path')
-    location_id = serializers.IntegerField(source='get_location')
-    serial = serializers.CharField(source='get_serial')
-    po = serializers.CharField(source='get_po')
-    quantity = serializers.FloatField()
+    part = serializers.PrimaryKeyRelatedField(source='item.part', read_only=True)
+    order = serializers.PrimaryKeyRelatedField(source='line.order', many=False, read_only=True)
+    serial = serializers.CharField(source='get_serial', read_only=True)
+    quantity = serializers.FloatField(read_only=True)
+    location = serializers.PrimaryKeyRelatedField(source='item.location', many=False, read_only=True)
+
+    # Extra detail fields
+    order_detail = SalesOrderSerializer(source='line.order', many=False, read_only=True)
+    part_detail = PartBriefSerializer(source='item.part', many=False, read_only=True)
+    item_detail = StockItemSerializer(source='item', many=False, read_only=True)
+    location_detail = LocationSerializer(source='item.location', many=False, read_only=True)
+
+    def __init__(self, *args, **kwargs):
+
+        order_detail = kwargs.pop('order_detail', False)
+        part_detail = kwargs.pop('part_detail', False)
+        item_detail = kwargs.pop('item_detail', False)
+        location_detail = kwargs.pop('location_detail', False)
+
+        super().__init__(*args, **kwargs)
+
+        if not order_detail:
+            self.fields.pop('order_detail')
+
+        if not part_detail:
+            self.fields.pop('part_detail')
+
+        if not item_detail:
+            self.fields.pop('item_detail')
+
+        if not location_detail:
+            self.fields.pop('location_detail')
 
     class Meta:
         model = SalesOrderAllocation
@@ -246,10 +278,14 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer):
             'line',
             'serial',
             'quantity',
-            'location_id',
-            'location_path',
-            'po',
+            'location',
+            'location_detail',
             'item',
+            'item_detail',
+            'order',
+            'order_detail',
+            'part',
+            'part_detail',
         ]