From 7f4c397d8f2931208fe322f30602a8b485dce8c6 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Fri, 14 Feb 2025 12:09:48 +0100
Subject: [PATCH 1/3] =?UTF-8?q?CustomerView.xaml=20-=20Kommentar=20zum=20D?=
 =?UTF-8?q?ictionary=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/View/Detail/CustomerView.xaml       | 2 +-
 Service/Plugins/TranslationDictionary.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml
index a11a066d5..6235bbd1a 100644
--- a/BeWo/View/Detail/CustomerView.xaml
+++ b/BeWo/View/Detail/CustomerView.xaml
@@ -1147,7 +1147,7 @@
                                             <Label
                                                 Grid.Row="9"
                                                 Grid.Column="0"
-                                                Content="Kommentar" />
+                                                Content="{markup:Translate CustomerKommentar}" />
                                             <uc:NullItemComboBox
                                                 Grid.Row="0"
                                                 Grid.Column="3"
diff --git a/Service/Plugins/TranslationDictionary.cs b/Service/Plugins/TranslationDictionary.cs
index 1dd470dd9..1753c2f73 100644
--- a/Service/Plugins/TranslationDictionary.cs
+++ b/Service/Plugins/TranslationDictionary.cs
@@ -84,6 +84,7 @@ namespace BeWo.Service.Plugins
             AddOrReplaceTranslation(dict, "CustomerVerhalten", "Verhalten");
             AddOrReplaceTranslation(dict, "CustomerBetreuungsbedarf", "Betreuungsbedarf");
             AddOrReplaceTranslation(dict, "CustomerBemerkungenSbd", "Allgemeine Bemerkungen");
+            AddOrReplaceTranslation(dict, "CustomerKommentar", "Kommentar");
 
             AddOrReplaceTranslation(dict, "EmployeePflege", "Pflege");
             AddOrReplaceTranslation(dict, "EmployeeToilettengang", "Toilettengang");

From 429cef5b92339c480fc8713d21265c87dc5849f6 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Fri, 14 Feb 2025 12:10:18 +0100
Subject: [PATCH 2/3] =?UTF-8?q?AsSozialeDienstleistungenEV/CustomReportCre?=
 =?UTF-8?q?ator.cs=20-=20doch=20T=C3=A4tigkeitsbericht=20an=20alle=20Rechn?=
 =?UTF-8?q?ungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomReportCreator.cs                    | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/ReportImp/AsSozialeDienstleistungenEV/CustomReportCreator.cs b/ReportImp/AsSozialeDienstleistungenEV/CustomReportCreator.cs
index 129f651cb..88df276ca 100644
--- a/ReportImp/AsSozialeDienstleistungenEV/CustomReportCreator.cs
+++ b/ReportImp/AsSozialeDienstleistungenEV/CustomReportCreator.cs
@@ -49,31 +49,26 @@ namespace AsSozialeDienstleistungenEV
                 XtraReport invoiceReport = null;
                 IBeWoReport<ServiceInvoiceRO> singleReport = FindReportImp<ServiceInvoiceRO>(iDC.InvoiceBase.InvoiceId);
 
-                if (iDC.InvoiceBase != null && iDC.InvoiceBase.InvoiceId != "Jugendamt")
+                if (iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null)
                 {
+                    var seite1 = new ServiceInvoiceReport();
+                    var ro = ServiceInvoiceRO.Create(iDC);
+                    seite1.SetReportDataSource(ro);
+                    seite1.CreateDocument();
 
-                    if (iDC.ServiceInvoicePeriods.Count > 0 && iDC.ServiceInvoicePeriods[0].SupportConceptApprovalPeriod.ServiceCategory != null)
+                    int month = iDC.InvoiceBase.AccountingPeriodStart.Value.Month;
+                    int year = iDC.InvoiceBase.AccountingPeriodStart.Value.Year;
+                    long cOid = iDC.InvoiceBase.SupportConceptCostBearerRelDc.SupportConcept.Customer.CustomerOid;
+                    long oOid = iDC.InvoiceBase.RecipientOrganisationOid ?? 0;
+
+                    while (month <= iDC.InvoiceBase.AccountingPeriodEnd.Value.Month)
                     {
-                        var seite1 = new ServiceInvoiceReport();
-                        var ro = ServiceInvoiceRO.Create(iDC);
+                        var qb = CreateServiceOverviewSingleCustomerReport(cOid, month, year, oOid, 0, null, 1, DateTime.DaysInMonth(year, month));
+                        qb.CreateDocument();
 
-                        seite1.SetReportDataSource(ro);
-                        seite1.CreateDocument();
-
-                        int month = iDC.InvoiceBase.AccountingPeriodStart.Value.Month;
-                        int year = iDC.InvoiceBase.AccountingPeriodStart.Value.Year;
-                        long cOid = iDC.InvoiceBase.SupportConceptCostBearerRelDc.SupportConcept.Customer.CustomerOid;
-                        long oOid = iDC.InvoiceBase.RecipientOrganisationOid ?? 0;
-
-                        while (month <= iDC.InvoiceBase.AccountingPeriodEnd.Value.Month)
-                        {
-                            var qb = CreateServiceOverviewSingleCustomerReport(cOid, month, year, oOid, 0, null, 1, DateTime.DaysInMonth(year, month));
-                            qb.CreateDocument();
-
-                            seite1.Pages.AddRange(qb.Pages);
-                            invoiceReport = seite1;
-                            month++;
-                        }
+                        seite1.Pages.AddRange(qb.Pages);
+                        invoiceReport = seite1;
+                        month++;
                     }
                 }
                 else

From 78182e719de7ce5348d792a090e7fbd0ac2ab244 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Fri, 14 Feb 2025 12:10:52 +0100
Subject: [PATCH 3/3] 
 MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs -
 FuegeAbgelaufeneHilfeplaeneMitAktuellenBewilligungenHinzu

---
 .../Invoicing/CollectiveInvoiceCreation.cs    | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs
index 92401045d..de07957c0 100644
--- a/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs
+++ b/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CollectiveInvoiceCreation.cs
@@ -31,12 +31,12 @@ namespace MalteserJohanniterJohanneshaus.Invoicing
         // die haben 5 Standorte, die über Kostenstellen unter Notiz im Hilfeplan identifiziert werden
         // Es werden grundsätzlich volle Tagessätze aus der Verwaltung abgerechnet, bei Abwesenheiten > 3 Tage,
         // werden alle Abwesenheitstage nur mit 75 % berechnet
-
         public override List<ServiceInvoiceDC> GenerateServiceInvoices(long costBearerOid,
             DateTimeSpan invoicePeriod,
             Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
         {
             var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
+            FuegeAbgelaufeneHilfeplaeneMitAktuellenBewilligungenHinzu(costBearer, invoicePeriod, supportConcepts2ServiceRecords);
             var invoiceList = new List<ServiceInvoice>();
             ServiceInvoice invoice;
             Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> TeamKaldauen = new Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>>();
@@ -89,18 +89,47 @@ namespace MalteserJohanniterJohanneshaus.Invoicing
             return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result;
         }
 
+        private void FuegeAbgelaufeneHilfeplaeneMitAktuellenBewilligungenHinzu(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+        {
+            var alleHilfeplaene = DAOFactory.GenericDAO.GetAllActive<SupportConcept>();
+            var cs = new CustomerService();
+            foreach (var sc in alleHilfeplaene)
+            {
+                foreach (var c2s in sc.CostBearer2SupportConceptList)
+                {
+                    if (c2s.EndDate < invoicePeriod.StartDate)
+                    {
+                        if (c2s.CostBearer.Oid == costBearer.Oid)
+                        {
+                            foreach (var ap in c2s.ApprovalPeriodList)
+                            {
+                                if (ap.EndDate >= invoicePeriod.StartDate && ap.StartDate <= invoicePeriod.EndDate)
+                                {
+                                    var scDc = cs.CreateFlatSupportConcept(sc, c2s);
+                                    supportConcepts2ServiceRecords.Add(scDc, new List<ServiceRecordDC>());
+                                    break;
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
         private ServiceInvoice CreateCollectiveBilling2(CostBearer costBearer, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
         {
             var invoice = new ServiceInvoice();
             var newDict = new Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>>();
 
-            foreach (var sc2sr in supportConcepts2ServiceRecords) // Abrechnung erfolgt auch wenn nur beantragt
-            {
-                if (sc2sr.Key.IsApproved)
-                    newDict.Add(sc2sr.Key, sc2sr.Value);
-            }
+                foreach (var sc2sr in supportConcepts2ServiceRecords)
+                {
+                    if (!sc2sr.Key.IsArchived && !sc2sr.Key.IsDeleted)
+                        newDict.Add(sc2sr.Key, sc2sr.Value);
+                }
 
-            SetRecipientInformation(invoice, costBearer);
+                SetRecipientInformation(invoice, costBearer);
             SetSenderInformation(invoice);
             SetInvoiceBaseData(0, invoice, costBearer, invoicePeriod, newDict.Keys.ToList());
             SetCollectiveBillingBaseData(0, invoice, costBearer, invoicePeriod, newDict);