diff --git a/ReportImp/PerspektivenEV/CustomReportCreator.cs b/ReportImp/PerspektivenEV/CustomReportCreator.cs index cbbf6e4f4..a58352b4c 100644 --- a/ReportImp/PerspektivenEV/CustomReportCreator.cs +++ b/ReportImp/PerspektivenEV/CustomReportCreator.cs @@ -81,7 +81,6 @@ namespace PerspektivenEV } else { - var count = 0; foreach (var i in invs) { if (i.ServiceInvoicePeriods != null && i.ServiceInvoicePeriods.Count > 0) @@ -105,21 +104,6 @@ namespace PerspektivenEV else { var anhang2 = new LwvKASpitzabrechnung(); - //if (ro.ServiceInvoicePeriods != null && ro.ServiceInvoicePeriods.Count > 0) - //{ - // foreach (var sip in ro.ServiceInvoicePeriods) - // { - // if (sip.ServiceInvoiceItems != null && sip.ServiceInvoiceItems.Count > 1 - // && sip.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Substring(sip.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Length - 2) == "KA") - // { - // var einzel = new LwvKASpitzabrechnung(); - // var kaRo = LwvKASpitzabrechnungRO.Create(sip.CostBearer2SupportConcept.Oid.Value, ro.AccountingPeriodEnd, sip.SupportConceptApprovalPeriod.Oid.Value, null); - // einzel.SetReportDataSource(kaRo); - // einzel.CreateDocument(); - // anhang2.Pages.AddRange((einzel).Pages); - // } - // } - //} return (XtraReport)anhang2; } } @@ -217,7 +201,8 @@ namespace PerspektivenEV foreach (var sip in ro.ServiceInvoicePeriods) { if (sip.ServiceInvoiceItems != null && sip.ServiceInvoiceItems.Count > 1 - && sip.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Substring(sip.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Length - 2) == "KA") + && sip.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Substring(sip.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Length - 2) == "KA" + && iDC.InvoiceBase.AccountingPeriodStart.HasValue && iDC.InvoiceBase.AccountingPeriodStart.Value < new DateTime(2026, 7, 1)) // KA-Spitzabrechnung entfaellt ab 01.07.2026 { var anhang2 = new LwvKASpitzabrechnung(); var kaRo = LwvKASpitzabrechnungRO.Create(sip.CostBearer2SupportConcept.Oid.Value, ro.AccountingPeriodEnd, sip.SupportConceptApprovalPeriod.Oid.Value, null);