Allowing for interleaving ActionColumns and DataColumns

prs.desktop/Panels/Reservation Management/ReservationManagementItemGrid.cs

@@ -930,14 +930,13 @@ public class ReservationManagementItemGrid : DynamicDataGrid<JobRequisitionItem>
         grid.ColumnsLoaded += (sender, args) =>
         {
             args.ColumnGroupings.Clear();
-            args.ActionColumns.Clear();
-            args.VisibleColumns.Clear();
-            args.VisibleColumns.Add<StockHolding, string>(x => x.Location.Code, 150, "Location", "", Alignment.MiddleLeft);
-            args.VisibleColumns.Add<StockHolding, string>(x => x.Style.Code, 150, "Style Code", "", Alignment.MiddleLeft);
-            args.VisibleColumns.Add<StockHolding, string>(x => x.Style.Description, 0, "Style", "", Alignment.MiddleLeft);
-            args.VisibleColumns.Add<StockHolding, string>(x => x.Dimensions.UnitSize, 150, "Unit Size", "", Alignment.MiddleLeft);
-            args.VisibleColumns.Add<StockHolding, double>(x => x.Units);
-            args.VisibleColumns.Add<StockHolding, double>(x => x.AverageValue, caption: "Cost $");
+            args.Columns.Clear();
+            args.Add(x => x.Location.Code, 150, "Location", "", Alignment.MiddleLeft);
+            args.Add(x => x.Style.Code, 150, "Style Code", "", Alignment.MiddleLeft);
+            args.Add(x => x.Style.Description, 0, "Style", "", Alignment.MiddleLeft);
+            args.Add(x => x.Dimensions.UnitSize, 150, "Unit Size", "", Alignment.MiddleLeft);
+            args.Add(x => x.Units);
+            args.Add(x => x.AverageValue, caption: "Cost $");
         };
 
         var window = DynamicGridUtils.CreateGridWindow("Stock Holdings", grid);

prs.desktop/Panels/Reservation Management/ReservationManagementPanel.xaml.cs

@@ -441,7 +441,7 @@ public partial class ReservationManagementPanel : UserControl, IPanel<JobRequisi
                 };
                 oneToManyPage.ColumnsLoaded += (o, args) =>
                 {
-                    var column = args.VisibleColumns.FirstOrDefault(x => x.ColumnName == $"{nameof(PurchaseOrderItem.Product)}.{nameof(PurchaseOrderItem.Product.ID)}");
+                    var column = args.DataColumns.FirstOrDefault(x => x.ColumnName == $"{nameof(PurchaseOrderItem.Product)}.{nameof(PurchaseOrderItem.Product.ID)}");
                     if(column is not null)
                     {
                         column.Editor.Editable = column.Editor.Editable.Combine(Editable.Disabled);