diff --git a/.vscode/launch.json b/.vscode/launch.json
index fcc80a75..b77f3b95 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/DataList/PartInventoryRequestDataList.cs b/server/AyaNova/DataList/PartInventoryRequestDataList.cs
index 665a55ce..add13d17 100644
--- a/server/AyaNova/DataList/PartInventoryRequestDataList.cs
+++ b/server/AyaNova/DataList/PartInventoryRequestDataList.cs
@@ -34,18 +34,18 @@ namespace AyaNova.DataList
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
             DefaultColumns = new List<string>() {
-                    "WorkOrderSerialNumber",                   
-                    "Customer",                  
-                    "PartPartNumber",
-                    "PartName",
-                    "WorkOrderItemPartRequestQuantity",
-                    "WorkOrderItemPartRequestPurchaseOrder",
-                    "WorkOrderItemPartRequestOrderedDate",
-                    "WorkOrderItemPartRequestExpectedReceiveDate",
-                    "WorkOrderItemPartRequestReceived"
+                 "PartPartNumber",
+                    "WorkOrderSerialNumber",
+                   "Customer",
+                   "PartName",
+                   "WorkOrderItemPartRequestQuantity",
+                   "WorkOrderItemPartRequestPurchaseOrder",
+                   "WorkOrderItemPartRequestOrderedDate",
+                   "WorkOrderItemPartRequestExpectedReceiveDate",
+                   "WorkOrderItemPartRequestReceived"
 
                   };
-            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "PartPartNumber", "+" } };
+            DefaultSortBy = new Dictionary<string, string>() { { "PartPartNumber", "+" }, { "WorkOrderSerialNumber", "-" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
 
 
@@ -67,8 +67,7 @@ namespace AyaNova.DataList
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 AType = (int)AyaType.Part,
                 SqlIdColumnName = "apart.id",
-                SqlValueColumnName = "apart.partnumber",
-                IsRowId = true
+                SqlValueColumnName = "apart.partnumber"
             });
 
             FieldDefinitions.Add(new DataListFieldDefinition
@@ -147,7 +146,7 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aworkorderitempartrequest.received"
             });
 
-             FieldDefinitions.Add(new DataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "PurchaseOrderItemUIOrderedFrom",
                 FieldKey = "POVENDOR",
@@ -157,7 +156,7 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "apovendor.name"
             });
 
-             FieldDefinitions.Add(new DataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "PartWholesalerID",
                 FieldKey = "PartWholesalerID",
@@ -167,7 +166,7 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "apartwholesaler.name"
             });
 
-             FieldDefinitions.Add(new DataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "PartAlternativeWholesalerID",
                 FieldKey = "PartAlternativeWholesalerID",
@@ -177,7 +176,7 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "apartaltwholesaler.name"
             });
 
-             FieldDefinitions.Add(new DataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "PartManufacturerID",
                 FieldKey = "PartManufacturerID",
@@ -187,7 +186,7 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "apartmanu.name"
             });
 
-             FieldDefinitions.Add(new DataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "PartManufacturerNumber",
                 FieldKey = "PartManufacturerNumber",
@@ -336,12 +335,13 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "WorkOrderSerialNumber",
+                TKey = "WorkOrder",
                 FieldKey = "WorkOrderSerialNumber",
                 AType = (int)AyaType.WorkOrderItemPartRequest,
                 UiFieldDataType = (int)UiFieldDataType.Integer,
                 SqlIdColumnName = "aworkorderitempartrequest.id",
-                SqlValueColumnName = "viewworkorder.serial"
+                SqlValueColumnName = "viewworkorder.serial",
+                IsRowId = true
             });
 
             FieldDefinitions.Add(new DataListFieldDefinition