Browse Source

Removed PONumber column from POItem.
Added JobLink to POItemLink
Fixed bill timberline exporter.

Kenric Nugteren 1 year ago
parent
commit
5807502652

+ 0 - 3
prs.classes/Entities/PurchaseOrder/PurchaseOrderItem.cs

@@ -136,9 +136,6 @@ namespace Comal.Classes
         [EntityRelationship(DeleteAction.Cascade)]
         public PurchaseOrderLink PurchaseOrderLink { get; set; }
 
-        [NullEditor]
-        public string PONumber { get; set; }
-
         [NullEditor]
         [EntityRelationship(DeleteAction.SetNull)]
         public BillLineLink BillLine { get; set; }

+ 2 - 3
prs.classes/Entities/PurchaseOrder/PurchaseOrderItemLink.cs

@@ -8,6 +8,8 @@ namespace Comal.Classes
         [PopupEditor(typeof(PurchaseOrderItem), "PurchaseOrderLink.PONumber", "Product.Code", "Description", "Qty", "ExTax", "TaxCode.ID", "TaxCode.Rate", "Tax", "IncTax", "CostCentre.ID", "PurchaseGL.ID")]
         public override Guid ID { get; set; }
 
+        public JobLink Job { get; set; }
+
         [TextBoxEditor(Visible = Visible.Default, Editable = Editable.Hidden)]
         public string Description { get; set; }
 
@@ -17,9 +19,6 @@ namespace Comal.Classes
         [CurrencyEditor(Visible = Visible.Default, Editable = Editable.Hidden)]
         public double Cost { get; set; }
 
-        [IntegerEditor(Editable = Editable.Hidden)]
-        public string PONumber { get; set; }
-
         [CodeEditor(Visible = Visible.Default, Editable = Editable.Hidden)]
         public string SupplierCode { get; set; }
 

+ 5 - 5
prs.shared/Posters/Timberline/BillTimberlinePoster.cs

@@ -304,7 +304,7 @@ public class Module
             model.AddChildTable<BillLine, PurchaseOrderItem>(x => x.OrderItem.ID, x => x.ID, isdefault: true,
                 parentalias: "Bill_BillLine", childalias: "POItem",
                 columns: new Columns<PurchaseOrderItem>(x => x.ID)
-                    .Add(x => x.PONumber)
+                    .Add(x => x.PurchaseOrderLink.PONumber)
                     .Add(x => x.Job.JobNumber)
                     .Add(x => x.Qty)
                     .Add(x => x.Cost));
@@ -343,7 +343,7 @@ public class Module
                 {
                     Vendor = bill.SupplierLink.Code,
                     Invoice = bill.Number,
-                    Description = "",
+                    Description = bill.Description,
                     Amount = bill.IncTax,
                     Tax = bill.Tax,
                     // DiscountOffered
@@ -404,12 +404,12 @@ public class Module
                         };
                         if (purchaseOrderItems.TryGetValue(billLine.OrderItem.ID, out var poItem))
                         {
-                            apdf.Commitment = poItem.PONumber;
+                            apdf.Commitment = poItem.PurchaseOrderLink.PONumber;
                             apdf.Job = poItem.Job.JobNumber;
-                            if (int.TryParse(poItem.ReceivedReference, out var itemNumber))
+                            if (int.TryParse(poItem.PostedReference, out var itemNumber))
                             {
                                 apdf.CommitmentLineItem = itemNumber;
-                                billLine.PostedReference = poItem.ReceivedReference;
+                                billLine.PostedReference = poItem.PostedReference;
                             }
                             apdf.Units = poItem.Qty;
                             apdf.UnitCost = poItem.Cost;