Merge pull request #2199 from SchrodingersGat/partial-shipment

Create SalesOrderShipment model
inventree · Dec 4, 2021 · 3f2cdf9 · 3f2cdf9
2 parents 6bc3e3c + 9ec5e39
commit 3f2cdf9
Show file tree

Hide file tree

Showing 40 changed files with 2,585 additions and 656 deletions.
diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py
@@ -12,10 +12,13 @@
 INVENTREE_SW_VERSION = "0.6.0 dev"
 
 # InvenTree API version
-INVENTREE_API_VERSION = 20
+INVENTREE_API_VERSION = 21
 
 """
 Increment this API version number whenever there is a significant change to the API that any clients need to know about
+v21 -> 2021-12-04
+    - Adds support for multiple "Shipments" against a SalesOrder
+    - Refactors process for stock allocation against a SalesOrder
 
 v20 -> 2021-12-03
     - Adds ability to filter POLineItem endpoint by "base_part"

diff --git a/InvenTree/build/serializers.py b/InvenTree/build/serializers.py
@@ -423,7 +423,7 @@ def validate(self, data):
         Validation
         """
 
-        super().validate(data)
+        data = super().validate(data)
 
         items = data.get('items', [])
 

diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
@@ -222,4 +222,4 @@
         });
     }
 
-{% endblock %}
+{% endblock %}
diff --git a/InvenTree/order/admin.py b/InvenTree/order/admin.py
@@ -10,7 +10,7 @@
 
 from .models import PurchaseOrder, PurchaseOrderLineItem
 from .models import SalesOrder, SalesOrderLineItem
-from .models import SalesOrderAllocation
+from .models import SalesOrderShipment, SalesOrderAllocation
 
 
 class PurchaseOrderLineItemInlineAdmin(admin.StackedInline):
@@ -137,6 +137,15 @@ class SalesOrderLineItemAdmin(ImportExportModelAdmin):
     )
 
 
+class SalesOrderShipmentAdmin(ImportExportModelAdmin):
+
+    list_display = [
+        'order',
+        'shipment_date',
+        'reference',
+    ]
+
+
 class SalesOrderAllocationAdmin(ImportExportModelAdmin):
 
     list_display = (
@@ -152,4 +161,5 @@ class SalesOrderAllocationAdmin(ImportExportModelAdmin):
 admin.site.register(SalesOrder, SalesOrderAdmin)
 admin.site.register(SalesOrderLineItem, SalesOrderLineItemAdmin)
 
+admin.site.register(SalesOrderShipment, SalesOrderShipmentAdmin)
 admin.site.register(SalesOrderAllocation, SalesOrderAllocationAdmin)
-Original file line number
+Diff line change
@@ Expand Up / @@ -222,4 +222,4 @@ @@
             });
         }
-    {% endblock %}
+    {% endblock %}