From 9ab532a067336065bba3eac8edf3a07a986197b1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 12 Nov 2024 19:55:49 +1100 Subject: [PATCH] Improve null checks for SalesOrder.shipment (#8469) --- src/backend/InvenTree/order/serializers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/InvenTree/order/serializers.py b/src/backend/InvenTree/order/serializers.py index 6676c312e4..936b8e0f3e 100644 --- a/src/backend/InvenTree/order/serializers.py +++ b/src/backend/InvenTree/order/serializers.py @@ -1720,7 +1720,7 @@ class SalesOrderSerialAllocationSerializer(serializers.Serializer): line_item = data['line_item'] stock_items = data['stock_items'] - shipment = data['shipment'] + shipment = data.get('shipment', None) allocations = [] @@ -1758,10 +1758,10 @@ class SalesOrderShipmentAllocationSerializer(serializers.Serializer): """Run validation against the provided shipment instance.""" order = self.context['order'] - if shipment.shipment_date is not None: + if shipment and shipment.shipment_date is not None: raise ValidationError(_('Shipment has already been shipped')) - if shipment.order != order: + if shipment and shipment.order != order: raise ValidationError(_('Shipment is not associated with this order')) return shipment