|
|
@@ -164,8 +164,7 @@ public class ProgressClaimGrid : DynamicItemsListGrid<ProgressClaim>
|
|
|
Filter<Assignment>.Where(x => x.Job.ID).IsEqualTo(JobID),
|
|
|
Columns.None<Assignment>()
|
|
|
.Add(x => x.JobScope.ID)
|
|
|
- .Add(x => x.Actual.Duration)
|
|
|
- .Add(x => x.Employee.HourlyRate))
|
|
|
+ .Add(x => x.Cost))
|
|
|
.Add(
|
|
|
Filter<BillLine>.And(
|
|
|
BillFilter(),
|
|
|
@@ -208,7 +207,7 @@ public class ProgressClaimGrid : DynamicItemsListGrid<ProgressClaim>
|
|
|
|
|
|
var assignments = results.GetObjects<Assignment>()
|
|
|
.GroupBy(x => x.JobScope.ID)
|
|
|
- .ToDictionary(x => x.Key, x => x.Sum(x => x.Actual.Duration.TotalHoursDecimal() * x.Employee.HourlyRate));
|
|
|
+ .ToDictionary(x => x.Key, x => x.Sum(x => x.Cost));
|
|
|
var billLines = results.GetObjects<BillLine>()
|
|
|
.GroupBy(x => x.OrderItem.ID != Guid.Empty ? x.OrderItem.JobScope.ID : x.JobScope.ID)
|
|
|
.ToDictionary(x => x.Key, x => x.Sum(x => x.ExTax));
|