Merge remote-tracking branch 'origin/nick' into kenric

prs.desktop/Panels/Requisitions/RequisitionItemGrid.cs

@@ -32,9 +32,20 @@ namespace PRSDesktop
             HiddenColumns.Add(x => x.Product.Dimensions.Width);
             HiddenColumns.Add(x => x.Product.Dimensions.Height);
             HiddenColumns.Add(x => x.Product.Dimensions.Weight);
+            HiddenColumns.Add(x => x.Product.Dimensions.UnitSize);
+            HiddenColumns.Add(x => x.Product.Dimensions.Value);
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.HasQuantity); 
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.HasLength);
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.HasWidth);
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.HasWeight);
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.HasHeight);
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.Formula);
+            HiddenColumns.Add(x => x.Product.Dimensions.Unit.Format);
             //HiddenColumns.Add(x => x.Product.Units.ID);
             HiddenColumns.Add(x => x.Product.NonStock);
-            HiddenColumns.Add(x => x.Holding.ID);
+            HiddenColumns.Add(x => x.Location.ID);
+            HiddenColumns.Add(x => x.Location.Code);
+            HiddenColumns.Add(x => x.Location.Description);
         }
 
         public Requisition Requisition { get; set; }
@@ -113,10 +124,19 @@ namespace PRSDesktop
                     x => x.Name,
                     x => x.DefaultStyle.ID,
                     x => x.Dimensions.Unit.ID,
-                    x=>x.Dimensions.Length,
-                    x=>x.Dimensions.Width,
-                    x=>x.Dimensions.Height,
-                    x=>x.Dimensions.Weight,
+                    x => x.Dimensions.Length,
+                    x => x.Dimensions.Width,
+                    x => x.Dimensions.Height,
+                    x => x.Dimensions.Weight,
+                    x => x.Dimensions.UnitSize,
+                    x => x.Dimensions.Value,
+                    x => x.Dimensions.Unit.HasQuantity,
+                    x => x.Dimensions.Unit.HasLength,
+                    x => x.Dimensions.Unit.HasWidth,
+                    x => x.Dimensions.Unit.HasWeight,
+                    x => x.Dimensions.Unit.HasHeight,
+                    x => x.Dimensions.Unit.Formula,
+                    x => x.Dimensions.Unit.Format,
                     //x => x.Units.ID,
                     x => x.DefaultLocation.ID,
                     x => x.UnitQty,

prs.stores/RequisitionStore.cs

@@ -271,7 +271,7 @@ namespace Comal.Stores
                 var holdingstyleid = item.Holding.Style.ID;
                 var holdingjobid = item.Holding.Job.ID;
 
-                var locationid = item.Holding.Location.ID;
+                var locationid = item.Location.ID;
                 var productid = item.Product.ID;
                 var styleid = item.Style.ID;
                 var jobid = entity.JobLink.ID;