From 027eaef23c345e6268ea9accac9854b5ff38218b Mon Sep 17 00:00:00 2001 From: HirschleM Date: Wed, 25 Mar 2026 14:08:15 +0100 Subject: [PATCH] MH: DiakonischesWerkMuelheimTwg Finanzauswertung Fix --- .../Finanzauswertung.cs | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/ReportImp/DiakonischesWerkMuelheimTwg/Finanzauswertung.cs b/ReportImp/DiakonischesWerkMuelheimTwg/Finanzauswertung.cs index 598e4142e..d405d91ec 100644 --- a/ReportImp/DiakonischesWerkMuelheimTwg/Finanzauswertung.cs +++ b/ReportImp/DiakonischesWerkMuelheimTwg/Finanzauswertung.cs @@ -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)