Added notes field to JobDocumentSetMileStoneLink

prs.classes/Entities/Job/DocumentSet/JobDocumentSetMileStoneLink.cs

@@ -30,19 +30,23 @@ namespace Comal.Classes
         [Obsolete("Replaced with Submitted", true)]
         public DateTime Issued { get; set; } 
 
-        [DateTimeEditor(Editable = Editable.Hidden)]
+        [NotesEditor]
         [EditorSequence(5)]
+        public String[] Notes { get; set; }
+
+        [DateTimeEditor(Editable = Editable.Hidden)]
+        [EditorSequence(6)]
         public DateTime Submitted { get; set; } 
         
         [DateTimeEditor(Editable = Editable.Hidden)]
-        [EditorSequence(6)]
+        [EditorSequence(7)]
         public DateTime Expected { get; set; }
         
         [DateTimeEditor(Editable = Editable.Hidden)]
-        [EditorSequence(7)]
+        [EditorSequence(8)]
         public DateTime Closed { get; set; }
         
-        [EditorSequence(6)]
+        [EditorSequence(9)]
         public EmployeeLink Employee { get; set; }
         
         [NullEditor] 

prs.desktop/Panels/Jobs/BillOfMaterials/JobBillOfMaterialsItemsGrid.cs

@@ -42,21 +42,14 @@ namespace PRSDesktop
         protected override void Init()
         {
             base.Init();
-            HiddenColumns.Add(x => x.Dimensions.Unit.ID);
-            HiddenColumns.Add(x => x.Dimensions.Unit.Format);
-            HiddenColumns.Add(x => x.Dimensions.Unit.Formula);
-            HiddenColumns.Add(x => x.Dimensions.Unit.HasLength);
-            HiddenColumns.Add(x => x.Dimensions.Unit.HasWidth);
-            HiddenColumns.Add(x => x.Dimensions.Unit.HasWeight);
-            HiddenColumns.Add(x => x.Dimensions.Unit.HasHeight);
-            HiddenColumns.Add(x => x.Dimensions.Unit.HasQuantity);
-            HiddenColumns.Add(x => x.Dimensions.Length);
-            HiddenColumns.Add(x => x.Dimensions.Width);
-            HiddenColumns.Add(x => x.Dimensions.Height);
-            HiddenColumns.Add(x => x.Dimensions.Weight);
-            HiddenColumns.Add(x => x.Dimensions.Quantity);
-            HiddenColumns.Add(x => x.Dimensions.UnitSize);
-            HiddenColumns.Add(x => x.Dimensions.Value);
+
+            foreach(var column in new Columns<JobBillOfMaterialsItem>()
+                .AddDimensionsColumns(x => x.Dimensions, Dimensions.ColumnsType.Data)
+                .GetColumns())
+            {
+                HiddenColumns.Add(column);
+            }
+
             HiddenColumns.Add(x => x.Product.ID);
             HiddenColumns.Add(x => x.Product.Code);
             HiddenColumns.Add(x => x.Product.Name);
@@ -98,11 +91,11 @@ namespace PRSDesktop
             Progress.Show("Working");
             var result = new CoreTable();
             result.LoadColumns(typeof(JobRequisitionItem));
-            List<JobRequisitionItem> requiItems = new List<JobRequisitionItem>();
-            foreach (CoreRow row in SelectedRows)
+            var requiItems = new List<JobRequisitionItem>();
+            foreach (var BOMitem in SelectedRows.ToObjects<JobBillOfMaterialsItem>())
             {
-                JobBillOfMaterialsItem BOMitem = row.ToObject<JobBillOfMaterialsItem>();
-                JobRequisitionItem requiItem = new JobRequisitionItem();
+                var requiItem = new JobRequisitionItem();
+
                 requiItem.Qty = BOMitem.Quantity;
                 requiItem.UnitCost = BOMitem.UnitCost;
                 requiItem.Product.ID = BOMitem.Product.ID;
@@ -119,6 +112,7 @@ namespace PRSDesktop
                 requiItem.Job.Synchronise(BillOfMaterials.Job);
                 requiItem.Supplier.ID = BOMitem.Supplier.ID;
                 requiItem.Notes = "Create from BOM " + BOMitem.BillOfMaterials.Description + " on " + DateTime.Now.ToString("hh:mm t dd-MMM-yy") + " by " + empName;
+
                 requiItems.Add(requiItem);
             }
             result.LoadRows(requiItems);