소스 검색

Added default set of columns for bill line grid. Fixed missing columns in Timberline post

Kenric Nugteren 1 년 전
부모
커밋
985086829a

+ 0 - 1
prs.desktop/Panels/Jobs/JobBillOfMaterialsItemsGrid.cs

@@ -69,7 +69,6 @@ namespace PRSDesktop
             HiddenColumns.Add(x => x.PurchaseOrderItem.ID);
             HiddenColumns.Add(x => x.PurchaseOrderItem.PurchaseOrderLink.PONumber);
             HiddenColumns.Add(x => x.PurchaseOrderItem.ReceivedDate);
-            HiddenColumns.Add(x => x.PurchaseOrderItem.PONumber);
             HiddenColumns.Add(x => x.Packet.ID);
 
             AddButton("Create Requi", null, CreateRequi);

+ 0 - 1
prs.desktop/Panels/Jobs/JobRequisitionItemGrid.cs

@@ -164,7 +164,6 @@ namespace PRSDesktop
             columns.Add<JobRequisitionItem, double>(x => x.Qty, 50, "Qty", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, string>(x => x.Dimensions.UnitSize, 50, "Size", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, string>(x => x.PurchaseOrderItem.PurchaseOrderLink.PONumber, 80, "PO Number", "", Alignment.MiddleLeft);
-            columns.Add<JobRequisitionItem, string>(x => x.PurchaseOrderItem.PONumber, 80, "PO Number", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, DateTime>(x => x.PurchaseOrderItem.DueDate, 80, "Due", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, DateTime>(x => x.PurchaseOrderItem.ReceivedDate, 80, "Received", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, JobRequisitionItemStatus>(x => x.Status, 80, "Status", "", Alignment.MiddleLeft);

+ 0 - 1
prs.desktop/Panels/Products/Reservation Management/JobRequisitionReviewGrid.cs

@@ -256,7 +256,6 @@ namespace PRSDesktop
             columns.Add<JobRequisitionItem, double>(x => x.Qty, 50, "Qty", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, string>(x => x.Dimensions.UnitSize, 50, "Size", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, string>(x => x.PurchaseOrderItem.PurchaseOrderLink.PONumber, 80, "PO Number", "", Alignment.MiddleLeft);
-            columns.Add<JobRequisitionItem, string>(x => x.PurchaseOrderItem.PONumber, 80, "PO Number", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, DateTime>(x => x.PurchaseOrderItem.DueDate, 80, "Due", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, DateTime>(x => x.PurchaseOrderItem.ReceivedDate, 80, "Received", "", Alignment.MiddleLeft);
             columns.Add<JobRequisitionItem, string>(x => x.Notes, 300, "Notes", "", Alignment.MiddleLeft);

+ 22 - 0
prs.desktop/Panels/Suppliers/Bills/SupplierBillLineGrid.cs

@@ -45,6 +45,28 @@ public class SupplierBillLineGrid : DynamicOneToManyGrid<Bill, BillLine>
         ActionColumns.Add(new DynamicImageColumn(pencil, BillLineEdit_Click));
     }
 
+    public override DynamicGridColumns GenerateColumns()
+    {
+        if (IsDirectEditMode())
+        {
+            var columns = new DynamicGridColumns();
+
+            columns.Add<BillLine, string>(x => x.Description, 0, "Description", "", Alignment.MiddleLeft);
+            columns.Add<BillLine, Guid>(x => x.OrderItem.ID, 100, "POItem", "", Alignment.MiddleLeft);
+            columns.Add<BillLine, Guid>(x => x.PurchaseGL.ID, 100, "Purchase GL", "", Alignment.MiddleLeft);
+            columns.Add<BillLine, double>(x => x.ExTax, 70, "Ex. Tax", "", Alignment.MiddleLeft);
+            columns.Add<BillLine, Guid>(x => x.TaxCode.ID, 70, "Tax Code", "", Alignment.MiddleLeft);
+            columns.Add<BillLine, double>(x => x.Tax, 70, "Tax", "", Alignment.MiddleLeft);
+            columns.Add<BillLine, double>(x => x.IncTax, 70, "Inc. Tax", "", Alignment.MiddleLeft);
+
+            return columns;
+        }
+        else
+        {
+            return base.GenerateColumns();
+        }
+    }
+
     protected override void CustomiseEditor(BillLine[] items, DynamicGridColumn column, BaseEditor editor)
     {
         base.CustomiseEditor(items, column, editor);

+ 4 - 1
prs.shared/Posters/Timberline/BillTimberlinePoster.cs

@@ -282,6 +282,7 @@ public class Module
 
             model.SetColumns(new Columns<Bill>(x => x.ID)
                 .Add(x => x.SupplierLink.Code)
+                .Add(x => x.Description)
                 .Add(x => x.Number)
                 .Add(x => x.IncTax)
                 .Add(x => x.Tax)
@@ -307,7 +308,9 @@ public class Module
                     .Add(x => x.PurchaseOrderLink.PONumber)
                     .Add(x => x.Job.JobNumber)
                     .Add(x => x.Qty)
-                    .Add(x => x.Cost));
+                    .Add(x => x.Cost)
+                    .Add(x => x.PostedReference)
+                    );
 
             Script?.Execute(methodname: "BeforePost", parameters: new object[] { model });
             return true;