|
|
@@ -202,10 +202,10 @@ public class ProgressClaimGrid : DynamicItemsListGrid<ProgressClaim>
|
|
|
newItem.JobScope.CopyFrom(scope);
|
|
|
|
|
|
var prev = Invoice.ID == Guid.Empty
|
|
|
- ? InvoiceLines
|
|
|
+ ? InvoiceLines.Where(x => x.Scope.ID == scope.ID)
|
|
|
: InvoiceLines.Where(x => x.Scope.ID == scope.ID && x.InvoiceLink.Date < Invoice.Date);
|
|
|
|
|
|
- var current = InvoiceLines.Where(x => x.InvoiceLink.ID == Invoice.ID && x.Scope.ID == scope.ID);
|
|
|
+ var current = InvoiceLines.Where(x => x.Scope.ID == scope.ID && x.InvoiceLink.ID == Invoice.ID);
|
|
|
|
|
|
|
|
|
newItem.PreviouslyClaimed = prev.Sum(x=>x.ExTax);
|