From 0b997dc7848b5c1570ac6e0167276ab9724fa89c Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Fri, 26 Nov 2021 23:30:34 +1100
Subject: [PATCH] Display both 'allocated' and 'fulfilled' quantity values in
 salesorder table

---
 InvenTree/order/serializers.py             |  2 -
 InvenTree/templates/js/translated/order.js | 92 ++++++++++++++--------
 2 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py
index 6a139a32a9..8cb1e8a699 100644
--- a/InvenTree/order/serializers.py
+++ b/InvenTree/order/serializers.py
@@ -553,7 +553,6 @@ class SOLineItemSerializer(InvenTreeModelSerializer):
     quantity = InvenTreeDecimalField()
 
     allocated = serializers.FloatField(source='allocated_quantity', read_only=True)
-    fulfilled = serializers.FloatField(source='fulfilled_quantity', read_only=True)
 
     shipped = InvenTreeDecimalField(read_only=True)
 
@@ -576,7 +575,6 @@ class SOLineItemSerializer(InvenTreeModelSerializer):
             'allocated',
             'allocations',
             'quantity',
-            'fulfilled',
             'reference',
             'notes',
             'order',
diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js
index 6646abafee..5766b7216d 100644
--- a/InvenTree/templates/js/translated/order.js
+++ b/InvenTree/templates/js/translated/order.js
@@ -1918,7 +1918,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
         */
         {
             sortable: true,
-            sortName: 'part__name',
+            sortName: 'part_detail.name',
             field: 'part',
             title: '{% trans "Part" %}',
             switchable: false,
@@ -2015,40 +2015,66 @@ function loadSalesOrderLineItemTable(table, options={}) {
                 },
             },
         );
+
+        columns.push(
+            {
+                field: 'allocated',
+                title: '{% trans "Allocated" %}',
+                switchable: false,
+                sortable: true,
+                formatter: function(value, row, index, field) {
+                        return makeProgressBar(row.allocated, row.quantity, {
+                        id: `order-line-progress-${row.pk}`,
+                    });
+                },
+                sorter: function(valA, valB, rowA, rowB) {
+    
+                    var A = rowA.allocated;
+                    var B = rowB.allocated;
+    
+                    if (A == 0 && B == 0) {
+                        return (rowA.quantity > rowB.quantity) ? 1 : -1;
+                    }
+    
+                    var progressA = parseFloat(A) / rowA.quantity;
+                    var progressB = parseFloat(B) / rowB.quantity;
+    
+                    return (progressA < progressB) ? 1 : -1;
+                }
+            },
+        );
     }
 
-    columns.push(
-        {
-            field: 'allocated',
-            title: pending ? '{% trans "Allocated" %}' : '{% trans "Fulfilled" %}',
-            switchable: false,
-            formatter: function(value, row, index, field) {
+    columns.push({
+        field: 'shipped',
+        title: '{% trans "Shipped" %}',
+        switchable: false,
+        sortable: true,
+        formatter: function(value, row) {
+            return makeProgressBar(row.shipped, row.quantity, {
+                id: `order-line-shipped-${row.pk}`
+            });
+        },
+        sorter: function(valA, valB, rowA, rowB) {
+            var A = rowA.shipped;
+            var B = rowB.shipped;
 
-                var quantity = pending ? row.allocated : row.fulfilled;
-                return makeProgressBar(quantity, row.quantity, {
-                    id: `order-line-progress-${row.pk}`,
-                });
-            },
-            sorter: function(valA, valB, rowA, rowB) {
-
-                var A = pending ? rowA.allocated : rowA.fulfilled;
-                var B = pending ? rowB.allocated : rowB.fulfilled;
-
-                if (A == 0 && B == 0) {
-                    return (rowA.quantity > rowB.quantity) ? 1 : -1;
-                }
-
-                var progressA = parseFloat(A) / rowA.quantity;
-                var progressB = parseFloat(B) / rowB.quantity;
-
-                return (progressA < progressB) ? 1 : -1;
+            if (A == 0 && B == 0) {
+                return (rowA.quantity > rowB.quantity) ? 1 : -1;
             }
-        },
-        {
-            field: 'notes',
-            title: '{% trans "Notes" %}',
-        },
-    );
+
+            var progressA = parseFloat(A) / rowA.quantity;
+            var progressB = parseFloat(B) / rowB.quantity;
+
+            return (progressA < progressB) ? 1 : -1;
+        }
+    });
+
+    columns.push(
+    {
+        field: 'notes',
+        title: '{% trans "Notes" %}',
+    });
 
     if (pending) {
         columns.push({
@@ -2230,7 +2256,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
     $(table).inventreeTable({
         onPostBody: setupCallbacks,
         name: 'salesorderlineitems',
-        sidePagination: 'server',
+        sidePagination: 'client',
         formatNoMatches: function() {
             return '{% trans "No matching line items" %}';
         },
@@ -2246,7 +2272,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
                 // Order is pending
                 return row.allocated > 0;
             } else {
-                return row.fulfilled > 0;
+                return row.shipped > 0;
             }
         },
         detailFormatter: function(index, row, element) {