Construct table of "shipments"

InvenTree/order/api.py

@@ -810,7 +810,7 @@ order_api_urls = [
         ])),
 
         url(r'^shipment/', include([
-            url(r'^(?P<pk>\d)+/', include([
+            url(r'^(?P<pk>\d+)/', include([
                 url(r'^.*$', SOShipmentDetail.as_view(), name='api-so-shipment-detail'),
             ])),
             url(r'^.*$', SOShipmentList.as_view(), name='api-so-shipment-list'),

InvenTree/order/migrations/0055_auto_20211025_0645.py

@@ -41,6 +41,9 @@ def add_shipment(apps, schema_editor):
             order=order,
         )
 
+        if order.status == SalesOrderStatus.SHIPPED:
+            shipment.shipment_date = order.shipment_date
+
         shipment.save()
 
         # Iterate through each allocation associated with this order

InvenTree/order/templates/order/sales_order_detail.html

@@ -33,6 +33,32 @@
     </div>
 </div>
 
+<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-shipments'>
+    {% if order.is_pending %}
+    <div class='panel-heading'>
+        <h4>{% trans "Pending Shipments" %}</h4>
+    </div>
+    <div class='panel-content'>
+        {% if roles.sales_order.change %}
+        <div id='pending-shipment-toolbar' class='btn-group' style='float: right;'>
+            <div class='btn-group'>
+                <button type='button' class='btn btn-success' id='new-shipment'>
+                    <span class='fas fa-plus-circle'></span> {% trans "New Shipment" %}
+                </button>
+            </div>
+        </div>
+        {% endif %}
+        <table class='table table-striped table-condensed' id='pending-shipments-table' data-toolbar='#pending-shipment-toolbar'></table>
+    </div>
+    {% endif %}
+    <div class='panel-heading'>
+        <h4>{% trans "Completed Shipments" %}</h4>
+    </div>
+    <div class='panel-content'>
+        <table class='table table-striped table-condensed' id='completed-shipments-table'></table>
+    </div>
+</div>
+
 <div class='panel panel-default panel-inventree panel-hidden' id='panel-order-builds'>
     <div class='panel-heading'>
         <h4>{% trans "Build Orders" %}</h4>
@@ -79,6 +105,23 @@
 {% block js_ready %}
 {{ block.super }}
 
+    // Callback when the "shipments" panel is first loaded
+    onPanelLoad('order-shipments', function() {
+
+        {% if order.is_pending %}
+        loadSalesOrderShipmentTable('#pending-shipments-table', {
+            order: {{ order.pk }},
+            shipped: false,
+        });
+        {% endif %}
+
+        loadSalesOrderShipmentTable('#completed-shipments-table', {
+            order: {{ order.pk }},
+            shipped: true,
+        });
+
+    });
+
     $('#edit-notes').click(function() {
         constructForm('{% url "api-so-detail" order.pk %}', {
             fields: {

InvenTree/order/templates/order/so_navbar.html

@@ -16,6 +16,13 @@
         </a>
     </li>
 
+    <li class='list-group-item' title='{% trans "Shipments" %}'>
+        <a href='#' id='select-order-shipments' class='nav-toggle'>
+            <span class='fas fa-truck sidebar-icon'></span>
+            {% trans "Shipments" %}
+        </a>
+    </li>
+
     <li class='list-group-item' title='{% trans "Build Orders" %}'>
         <a href='#' id='select-order-builds' class='nav-toggle'>
             <span class='fas fa-tools sidebar-icon'></span>