From 921ef5ae9ed86d194b662aafece10da176436bc2 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Sat, 4 Dec 2021 10:11:18 +1100
Subject: [PATCH] Tweaks to PO and SO tables

---
 InvenTree/templates/js/translated/order.js | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js
index 2c441d086f..58c86d1894 100644
--- a/InvenTree/templates/js/translated/order.js
+++ b/InvenTree/templates/js/translated/order.js
@@ -761,6 +761,9 @@ function removePurchaseOrderLineItem(e) {
 }
 
 
+/*
+ * Load a table displaying list of purchase orders
+ */
 function loadPurchaseOrderTable(table, options) {
     /* Create a purchase-order table */
 
@@ -808,13 +811,6 @@ function loadPurchaseOrderTable(table, options) {
 
                     var html = renderLink(value, `/order/purchase-order/${row.pk}/`);
 
-                    html += purchaseOrderStatusDisplay(
-                        row.status,
-                        {
-                            classes: 'float-right',
-                        }
-                    );
-
                     if (row.overdue) {
                         html += makeIconBadge('fa-calendar-times icon-red', '{% trans "Order is overdue" %}');
                     }
@@ -839,6 +835,15 @@ function loadPurchaseOrderTable(table, options) {
                 field: 'description',
                 title: '{% trans "Description" %}',
             },
+            {
+                field: 'status',
+                title: '{% trans "Status" %}',
+                switchable: true,
+                sortable: true,
+                formatter: function(value, row) {
+                    return purchaseOrderStatusDisplay(row.status);
+                }
+            },
             {
                 field: 'creation_date',
                 title: '{% trans "Date" %}',
@@ -1172,6 +1177,9 @@ function loadPurchaseOrderLineItemTable(table, options={}) {
 }
 
 
+/*
+ * Load table displaying list of sales orders
+ */
 function loadSalesOrderTable(table, options) {
 
     options.params = options.params || {};
@@ -1254,7 +1262,7 @@ function loadSalesOrderTable(table, options) {
                 field: 'status',
                 title: '{% trans "Status" %}',
                 formatter: function(value, row) {
-                    return salesOrderStatusDisplay(row.status, row.status_text);
+                    return salesOrderStatusDisplay(row.status);
                 }
             },
             {