MH: DiakonischesWerkMuelheimTwg Finanzauswertung Fix
This commit is contained in:
@@ -96,10 +96,7 @@ namespace BeWo.Report.DefaultReports
|
||||
}
|
||||
private void CalculateBillableAmountInTimeSpan(SupportConceptFinanceRO scRo, DateTime? start, DateTime? end, bool totalOrReportTimeSpan, String invoiceCreatorId)
|
||||
{
|
||||
if (scRo.CustomerName.Contains("Test") || scRo.CustomerName.Contains("Kuck"))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
String tenant = null;
|
||||
|
||||
if (MultitenancyOperationContextExt.Current != null)
|
||||
@@ -157,15 +154,33 @@ namespace BeWo.Report.DefaultReports
|
||||
}
|
||||
else
|
||||
{
|
||||
decimal summe = 0;
|
||||
if (scRo.Leistungskategorie == null)
|
||||
{
|
||||
decimal summe = 0;
|
||||
|
||||
foreach (var inv in invoices)
|
||||
summe += inv.ClaimSum ?? 0;
|
||||
foreach (var inv in invoices)
|
||||
summe += inv.ClaimSum ?? 0;
|
||||
|
||||
if (totalOrReportTimeSpan)
|
||||
scRo.BillableAmountUntilNow = summe;
|
||||
if (totalOrReportTimeSpan)
|
||||
scRo.BillableAmountUntilNow = summe;
|
||||
else
|
||||
scRo.BillableAmountInReportTimeSpan = summe;
|
||||
}
|
||||
else
|
||||
scRo.BillableAmountInReportTimeSpan = summe;
|
||||
{
|
||||
decimal summe = 0;
|
||||
|
||||
foreach (var inv in invoices)
|
||||
{
|
||||
if (inv.InvoiceBase != null && inv.InvoiceBase.InvoiceId != null && scRo.Leistungskategorie.Contains(inv.InvoiceBase.InvoiceId))
|
||||
summe += inv.ClaimSum ?? 0;
|
||||
}
|
||||
|
||||
if (totalOrReportTimeSpan)
|
||||
scRo.BillableAmountUntilNow = summe;
|
||||
else
|
||||
scRo.BillableAmountInReportTimeSpan = summe;
|
||||
}
|
||||
}
|
||||
}
|
||||
private CompactSupportConceptDC CreateCompactSupportConcept(SupportConceptCostBearerRelDC c2s)
|
||||
|
||||
Reference in New Issue
Block a user