From 2bc85569936fa5f497b0bcd05591cabf27a31401 Mon Sep 17 00:00:00 2001
From: miggland <miggland@users.noreply.github.com>
Date: Thu, 21 Jul 2022 14:09:52 +0200
Subject: [PATCH] Fix issue 3371 (#3381)

* Add missing underscore for translation

* Fix issue #3371

* Modify comment
---
 InvenTree/order/models.py      | 2 +-
 InvenTree/order/serializers.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
index 22ea2dba8e..fef6344240 100644
--- a/InvenTree/order/models.py
+++ b/InvenTree/order/models.py
@@ -1217,7 +1217,7 @@ class SalesOrderShipment(models.Model):
     reference = models.CharField(
         max_length=100,
         blank=False,
-        verbose_name=('Shipment'),
+        verbose_name=_('Shipment'),
         help_text=_('Shipment number'),
         default='1',
     )
diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py
index dafd9b5817..e2ec2c8761 100644
--- a/InvenTree/order/serializers.py
+++ b/InvenTree/order/serializers.py
@@ -981,6 +981,10 @@ class SalesOrderShipmentCompleteSerializer(serializers.ModelSerializer):
 
         # Extract shipping date (defaults to today's date)
         shipment_date = data.get('shipment_date', datetime.now())
+        if shipment_date is None:
+            # Shipment date should not be None - check above only
+            # checks if shipment_date exists in data
+            shipment_date = datetime.now()
 
         shipment.complete_shipment(
             user,