inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00
Code

Fix issue 3371 (#3381)

Browse Source 
* Add missing underscore for translation

* Fix issue #3371

* Modify comment
This commit is contained in:
miggland 2022-07-21 14:09:52 +02:00 committed by GitHub
parent 864d69d968
commit 2bc8556993
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/order/models.py
View File

@ -1217,7 +1217,7 @@ class SalesOrderShipment(models.Model):
reference = models.CharField( reference = models.CharField(
max_length=100, max_length=100,
blank=False, blank=False,
verbose_name=('Shipment'), verbose_name=_('Shipment'),
help_text=_('Shipment number'), help_text=_('Shipment number'),
default='1', default='1',
) )

4
InvenTree/order/serializers.py
View File

@ -981,6 +981,10 @@ class SalesOrderShipmentCompleteSerializer(serializers.ModelSerializer):
# Extract shipping date (defaults to today's date) # Extract shipping date (defaults to today's date)
shipment_date = data.get('shipment_date', datetime.now()) 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( shipment.complete_shipment(
user, user,