|
@@ -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;
|