From 1a10f5e12448db31ebd00befa0eb1047f25eb715 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Thu, 14 Aug 2025 13:23:11 +0200
Subject: [PATCH] =?UTF-8?q?KetteReports=20-=20Anpassungen=20f=C3=BCr=20Sel?=
 =?UTF-8?q?bstzahler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KetteReports/Invoicing/DefaultInvoiceCreation.cs   | 10 ++++++++++
 ReportImp/KetteReports/ServiceInvoiceReport.cs         |  8 +++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ReportImp/KetteReports/Invoicing/DefaultInvoiceCreation.cs b/ReportImp/KetteReports/Invoicing/DefaultInvoiceCreation.cs
index 9c2843856..725ab6cc3 100644
--- a/ReportImp/KetteReports/Invoicing/DefaultInvoiceCreation.cs
+++ b/ReportImp/KetteReports/Invoicing/DefaultInvoiceCreation.cs
@@ -41,5 +41,15 @@ namespace KetteReports.Invoicing
 
 			serviceInvoice.InvoiceBase.RecipientOrganisation = name;
 		}
+
+		public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
+		{
+			var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
+			if (iServiceRecord != null)
+			{
+				ii.UnitDescription = iServiceRecord.ServiceDescription.CategoryName;
+			}
+			return ii;
+		}
 	}
 }
diff --git a/ReportImp/KetteReports/ServiceInvoiceReport.cs b/ReportImp/KetteReports/ServiceInvoiceReport.cs
index 666ee859a..dd552c349 100644
--- a/ReportImp/KetteReports/ServiceInvoiceReport.cs
+++ b/ReportImp/KetteReports/ServiceInvoiceReport.cs
@@ -56,10 +56,12 @@ namespace KetteReports
                 jugend = true;
             }
             else if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0
-                && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems != null && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems.Count > 0
-                && cats.Any(c => pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription.Contains(c)))
+                && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems != null && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems.Count > 0)
             {
-                jugend = true;
+                if (pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription != null && cats.Any(c => pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription.Contains(c)))
+                {
+                    jugend = true;
+                }
             }
             if (jugend && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription != null)
             {