Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

BeWo/Scheduler/ViewModel/CustomFieldStorage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using BS.Shared.DataContracts;
@@ -17,6 +18,16 @@ namespace BeWo.Scheduler.ViewModel
             {
                 var result = Subject;
 
+                // Man darf den Betreff nicht sehen, wenn man der Originator ist und nicht in der nicht leeren EmployeeList ist oder man weder Originator noch in der EmployeeList ist
+
+                var isInEmployeeList = EmployeeList.Any(e2A => e2A.Employee.Equals(BeWoApp.CompactLoggedOnEmployee));
+                var isOriginator = Originator.Equals(BeWoApp.CompactLoggedOnEmployee);
+
+                if(IsPrivate && (!isOriginator && !isInEmployeeList || !isInEmployeeList))
+                {
+                    result = "Privat";
+                }
+
                 if(IsTask)
                 {
                     result = result ?? string.Empty;

BeWoPlanerMobil/BeWoPlanerMobil.csproj

@@ -283,6 +283,7 @@
     <Compile Include="Controllers\CustomerController.cs" />
     <Compile Include="Controllers\DevExpressSchedulerController.cs" />
     <Compile Include="Controllers\ExternalSignatureController.cs" />
+    <Compile Include="Controllers\ReportBaseController.cs" />
     <Compile Include="Controllers\ReportController.cs" />
     <Compile Include="Controllers\ReportViewerController.cs" />
     <Compile Include="Controllers\SchedulerController.cs" />
@@ -575,7 +576,7 @@
     <Content Include="Views\Customer\DocumentPartial.cshtml" />
     <Content Include="Scripts\moment\moment.min.js.map" />
     <Content Include="Scripts\moment\moment-with-locales.min.js.map" />
-    <Content Include="Views\Customer\CustomerReportPartial.cshtml" />
+    <Content Include="Views\Shared\BeWoReportPartial.cshtml" />
     <Content Include="Views\Scheduler\FiveDaySchedulerPartial.cshtml" />
     <Content Include="Views\Scheduler\OneDaySchedulerPartial.cshtml" />
     <Content Include="Views\Scheduler\SevenDaySchedulerPartial.cshtml" />
@@ -593,7 +594,6 @@
     <Content Include="Views\Main\MultiBookingPartial.cshtml" />
     <Content Include="Views\Report\QuittierungsbelegsResultPartial.cshtml" />
     <Content Include="Views\ReportViewer\ReportViewer.cshtml" />
-    <Content Include="Views\ReportViewer\DocumentWebViewerPartial.cshtml" />
     <Content Include="Views\Report\ConfirmationReceiptSignaturePartial.cshtml" />
     <Content Include="Views\ReportViewer\ReportViewerFormPartial.cshtml" />
     <Content Include="Views\Main\OneTimeLinkCreationPartial.cshtml" />
@@ -607,6 +607,7 @@
     <Content Include="Views\Main\MultiBookingSelectionPartial.cshtml" />
     <Content Include="Views\Main\MultiBookingScCbRelList.cshtml" />
     <Content Include="Views\Main\GoalRatingPopupContentPartial.cshtml" />
+    <Content Include="Views\ReportViewer\BerichteFormPartialView.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />

BeWoPlanerMobil/Content/style.css

@@ -110,6 +110,10 @@ textarea {
   background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
 }
 
+.collapsing {
+  transition: none !important;
+}
+
 /*!
  * Bootstrap v4.4.1 (https://getbootstrap.com/)
  * Copyright 2011-2019 The Bootstrap Authors

BeWoPlanerMobil/Content/style.scss

@@ -138,4 +138,8 @@ $font-family-sans-serif: 'Signika Negative', sans-serif;
 
 .needs-validation {}
 
+.collapsing {
+    transition: none !important;
+}
+
 @import "bootstrap/scss/bootstrap";

BeWoPlanerMobil/Controllers/CustomerController.cs

@@ -17,7 +17,7 @@ using DevExpress.XtraReports.UI;
 
 namespace BeWoPlanerMobil.Controllers
 {
-    public class CustomerController : AbstractBaseController
+    public class CustomerController : ReportBaseController
     {
         private CustomerModel _Model;
         public CustomerModel Model
@@ -240,6 +240,10 @@ namespace BeWoPlanerMobil.Controllers
 
             var notice = formCollection["notiz"]?.RemoveUppercaseEsszett();
 
+            var krankenkasse = formCollection["krankenkasse"];
+            var versichertennummer = formCollection["versichertennummer"];
+            var versichertenstatus = formCollection["versichertenstatus"];
+
             var customer = Model.SelectedCustomer;
 
             if(customer is null)
@@ -263,6 +267,10 @@ namespace BeWoPlanerMobil.Controllers
                 customer.Sex = castSex;
             }
 
+            customer.HealthInsurance = krankenkasse;
+            customer.InsuranceNumber = versichertennummer;
+            customer.VersichertenStatus = versichertenstatus;
+
             customer.AddressLine1 = adresszusatz;
             customer.Street       = street;
             customer.PostalCode   = postalCode;
@@ -315,6 +323,22 @@ namespace BeWoPlanerMobil.Controllers
         }
 
 
+        [Authorize]
+        public override string ResetReport()
+        {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return LeerzeichenFuerGetMethoden;
+            }
+
+            Model.Report = null;
+            Model.ReportName = null;
+
+            return LeerzeichenFuerGetMethoden;
+        }
+
+
         #region Medikamentenverordnungen
         [Authorize]
         public ActionResult ShowMedList(int reportType)
@@ -322,14 +346,14 @@ namespace BeWoPlanerMobil.Controllers
             if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeMedikamentenliste)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
-                return PartialView("CustomerReportPartial", Model);
+                return PartialView("BeWoReportPartial", Model);
             }
 
             var selectedReportType = (CustomerReportType)reportType;
 
             SelectReport(selectedReportType);
 
-            return PartialView("CustomerReportPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
         }
 
         [Authorize]
@@ -338,14 +362,14 @@ namespace BeWoPlanerMobil.Controllers
             if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeMedikamentenliste)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
-                return PartialView("CustomerReportPartial", Model);
+                return PartialView("BeWoReportPartial", Model);
             }
 
             Model.SelectedReportType = CustomerReportType.Historie;
 
             GenerateMobileMedListForSelectedCustomer(medListOid);
 
-            return PartialView("CustomerReportPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
         }
 
         [Authorize]
@@ -416,14 +440,6 @@ namespace BeWoPlanerMobil.Controllers
                 Model.ZahlungsbelegsReportObject = null;
             }
         }
-
-        [Authorize]
-        public string ResetReport()
-        {
-            Model.Report = null;
-
-            return LeerzeichenFuerGetMethoden;
-        }
         #endregion
 
         #region Bargeldkassen
@@ -614,7 +630,7 @@ namespace BeWoPlanerMobil.Controllers
             if(Model is null)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
-                return PartialView("CustomerReportPartial", Model);
+                return PartialView("BeWoReportPartial", Model);
             }
 
             var bargeldkasse = Model.Bargeldkassen.FirstOrDefault(f => f.BargeldkassenOid.HasValue && f.BargeldkassenOid.Value.Equals(kassenbuchOid));
@@ -624,7 +640,7 @@ namespace BeWoPlanerMobil.Controllers
 
             if(bargeldkasse?.ObjectOid is null)
             {
-                return PartialView("CustomerReportPartial", Model);
+                return PartialView("BeWoReportPartial", Model);
             }
 
             var bargeldkassenReportZeitraum = startDate.Equals(startDate.GetFirstOfMonth()) && endDate.Equals(startDate.GetLastOfMonth()) ? 
@@ -642,7 +658,7 @@ namespace BeWoPlanerMobil.Controllers
             Model.Report = report;
             Model.ReportName = name;
 
-            return PartialView("CustomerReportPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
         }
 
         [Authorize]
@@ -659,7 +675,7 @@ namespace BeWoPlanerMobil.Controllers
             if(Model is null)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
-                return PartialView("CustomerReportPartial", Model);
+                return PartialView("BeWoReportPartial", Model);
             }
 
             var kassenbuch = Model.Bargeldkassen.FirstOrDefault(bargeldkasse => bargeldkasse.Bargeldtransaktionen.Any(transaktion => transaktion.BargeldtransaktionOid.Equals(transaktionsOid)));
@@ -678,7 +694,7 @@ namespace BeWoPlanerMobil.Controllers
                 Model.ReportName                 = "Zahlungsbeleg";
             }
 
-            return PartialView("CustomerReportPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
         }
 
         [Authorize]

BeWoPlanerMobil/Controllers/MainController.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Net;
@@ -155,7 +154,7 @@ namespace BeWoPlanerMobil.Controllers
 
                 var customerFilter = MobileUserSettingsUtils.GetSettingValueAsEnum(userSettings, SettingsKeys.CustomerFilterInZeiterfassung, CustomerFilterEnum.MyCustomer);
 
-                if (customerFilter != CustomerFilterEnum.MyCustomer && !AbstractModel.IsAllowedToSeeSupportConceptFilter)
+                if(customerFilter != CustomerFilterEnum.MyCustomer && !AbstractModel.IsAllowedToSeeSupportConceptFilter)
                 {
                     customerFilter = CustomerFilterEnum.MyCustomer;
                 }
@@ -174,11 +173,6 @@ namespace BeWoPlanerMobil.Controllers
 
                 Model.GroupsOfPeople = EmployeeService.GetAllGroups(GetUser().Employee.EmployeeOid).OrderBy(gop => gop.Name).ToList();
 
-                if(!Model.IsInEditingMode)
-                {
-                    Model.SelectedGoals.Clear();
-                }
-
                 Model.ShowDistanceField = UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.ShowDistanceFields);
 
                 Model.Dokutypes = ValueListService.GetAllValueListEntrysByType(ValueListEntryType.DocumentType);
@@ -231,11 +225,6 @@ namespace BeWoPlanerMobil.Controllers
                     }).ToList();
                 }
 
-                if(Model.ServiceCategories is null)
-				{
-					Model.ServiceCategories = new List<ServiceCategoryModel>();
-				}
-
                 if(Model.SelectedConceptCostBearerRelations is null)
                 {
                     Model.SelectedConceptCostBearerRelations = new List<SupportConceptCostBearerRelDC>();
@@ -255,13 +244,13 @@ namespace BeWoPlanerMobil.Controllers
 
                 Model.IsServiceRecordNoticeMandatory = settingsValue is null || !settingsValue.Equals("0");
 
-                var isInList = !(Model.SelectedSupportConceptListObject is null) && Model.SupportConceptListObjects.Contains(Model.SelectedSupportConceptListObject);
+                var isInList = !(Model.SelectedCostBearer2SupportConceptRelListObject is null) && Model.SupportConceptListObjects.Contains(Model.SelectedCostBearer2SupportConceptRelListObject);
 
-                if(Model.SelectedSupportConceptListObject is null || !isInList)
+                if(Model.SelectedCostBearer2SupportConceptRelListObject is null || !isInList)
                 {
-                    if(!(Model.SelectedSupportConceptListObject is null) && !isInList)
+                    if(!(Model.SelectedCostBearer2SupportConceptRelListObject is null) && !isInList)
                     {
-                        Log.Info($"Model.SelectedSupportConceptListObject.Oid = {Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid} is not in list !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+                        Log.Info($"Model.SelectedSupportConceptListObject.Oid = {Model.SelectedCostBearer2SupportConceptRelListObject.CostBearer2SupportConceptOid} is not in list !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 
                         var sb = new StringBuilder();
                         foreach(var o in Model.SupportConceptListObjects)
@@ -277,7 +266,7 @@ namespace BeWoPlanerMobil.Controllers
 
                     }
 
-                    Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == "-1") ?? Model.SupportConceptListObjects.First();
+                    Model.SelectedCostBearer2SupportConceptRelListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == "-1") ?? Model.SupportConceptListObjects.First();
                     Model.CostBearer2SupportConceptOid = -1;
 
                     Model.HasAnyRatingTypes = AbstractModel.HasRightToRateGoals && OperationsService.GetAllRatingTypes().Any();
@@ -530,11 +519,16 @@ namespace BeWoPlanerMobil.Controllers
             var massnahmen = goals.Where(w => Massnahmentypen.Contains(w.Type)).OrderBy(s => s.DisplayName).ToList();
             var goalTree = new List<GoalTreeItem>();
             var goalTreeDic = new Dictionary<long, GoalTreeItem>();
-            var goalsWithRating = Model.SelectedServiceRecord?.Goals.Where(goal => goal.RatingTypeOid.HasValue).ToList() ?? new List<ValueListEntryDC>();
+            var goalsWithRating = Model.SelectedServiceRecord?.Goals?.Where(goal => goal.RatingTypeOid.HasValue).ToList() ?? new List<ValueListEntryDC>();
             var ratingTypes = OperationsService.GetRatingTypesByOids(goalsWithRating.Where(goal => goal.RatingTypeOid.HasValue).Select(goal => goal.RatingTypeOid.Value).Distinct().ToList());
 
-            foreach(var ziel in ziele.Where(z => z.ValueListEntryOid.HasValue))
+            foreach(var ziel in ziele)
             {
+                if(ziel.ValueListEntryOid is null)
+                {
+                    continue;
+                }
+
                 var treeItem = new GoalTreeItem(true, ziel.Type)
                 {
                     Children = new List<GoalTreeItem>(), 
@@ -553,6 +547,11 @@ namespace BeWoPlanerMobil.Controllers
 
             foreach(var zielMitEltern in goalTreeDic.Values.Where(zielMitEltern => zielMitEltern.ParentOid != null))
             {
+                if(zielMitEltern.ParentOid is null)
+                {
+                    continue;
+                }
+
                 goalTreeDic[zielMitEltern.ParentOid.Value].Children.Add(zielMitEltern);
             }
 
@@ -590,12 +589,9 @@ namespace BeWoPlanerMobil.Controllers
                 goalTreeDic[ziel.ParentOid.Value].Children.Add(kind);
             }
 
-            foreach(var item in goalTreeDic.Values)
+            foreach(var item in goalTreeDic.Values.Where(item => item.Children.Count == 0))
             {
-                if(item.Children.Count == 0)
-                {
-                    item.IsLeaf = true;
-                }
+                item.IsLeaf = true;
             }
 
             goalTree = goalTree.OrderBy(o => o.ValueListEntryOid).ToList();
@@ -622,6 +618,11 @@ namespace BeWoPlanerMobil.Controllers
             {
                 var parentDC = ValueListService.GetValueListEntryByOid(pParentOid);
 
+                if(parentDC?.ValueListEntryOid is null)
+                {
+                    continue;
+                }
+
                 if(!_ParentGoals.ContainsKey(parentDC.ValueListEntryOid.Value))
                 {
                     _ParentGoals.Add(parentDC.ValueListEntryOid.Value, parentDC);
@@ -866,34 +867,6 @@ namespace BeWoPlanerMobil.Controllers
             return "data:image/png;base64," + SignatureUtils.ConvertImageToBase64String(watermarker.Image);
         }
 
-        [Authorize]
-		public string LoadServiceCategories(long pServiceCategoryOid)
-	    {
-	        if (Model is null)
-	        {
-                Logout();
-                return LeerzeichenFuerGetMethoden;
-	        }
-
-            try
-	        {
-	            var serviceCategoryModel = Model.ServiceCategories.FirstOrDefault(s => s.ServiceCategoryOid.HasValue && s.ServiceCategoryOid.Value == pServiceCategoryOid);
-
-                if(serviceCategoryModel != null)
-                {
-                    Model.SelectedServiceCategoryOid = serviceCategoryModel.ServiceCategoryOid;
-                    Model.SelectedServiceDescriptionOid = serviceCategoryModel.ServiceDescriptions.OrderBy(serviceDescription => serviceDescription.Position).FirstOrDefault()?.ServiceDescriptionOid;
-                }
-
-	            return SerializeObject(serviceCategoryModel != null ? serviceCategoryModel.ServiceDescriptions.OrderBy(serviceDescription => serviceDescription.Position).ToList() : new List<ServiceDescriptionDC>());
-	        }
-	        catch(Exception exception)
-	        {
-	            Debug.WriteLine(exception);
-	            throw;
-	        }
-	    }
-
         [Authorize]
         public string LoadCompleteTextbausteinByOid(long pTextbausteinOid)
         {
@@ -1719,17 +1692,15 @@ namespace BeWoPlanerMobil.Controllers
         {
             try
             {
-                if (Model is null)
+                if(Model is null)
                 {
                     TempData[TempDataConstants.DoLogoutKey] = true;
-                    TempData[TempDataConstants.ErrorMessageKey] = "Model ist null!";
                     return Logout();
                 }
 
                 long? cb2ScOid = Convert.ToInt64(formCollection[FormCollectionConstants.CostBearer2SupportConceptOidKey]);
-                Log.Info($"SelectSupportConcept: {cb2ScOid}");
 
-                Model.SelectedServiceDescriptionOid = null;
+                Model.SelectedCostBearerSupportConceptRelOid = cb2ScOid;
 
                 LoadSupportConceptThings(cb2ScOid);
 
@@ -1755,17 +1726,9 @@ namespace BeWoPlanerMobil.Controllers
                 Model.Categories2Descriptions = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
             }
 
-            if(Model.ServiceCategories is null)
-            {
-                Model.ServiceCategories = new List<ServiceCategoryModel>();
-            }
-
-            Model.ServiceCategories.Clear();
             Model.Categories2Descriptions.Clear();
             Model.SelectedServiceCategory = null;
-            Model.SelectedServiceCategoryOid = null;
             Model.SelectedServiceDescription = null;
-            Model.SelectedServiceDescriptionOid = null;
 
             if(cb2ScOid is null && (Model.IsInGroupBookingMode || Model.IsInMultiBookingMode))
             {
@@ -1778,20 +1741,8 @@ namespace BeWoPlanerMobil.Controllers
                 // Alle ServiceDescriptions der ausgewählten Hilfepläne laden
                 var nodes = OperationsService.GetSupportConceptTreeNodeDetailInfos(selectedSupportConcepts.Where(sc => sc.SupportConceptOid.HasValue).Select(sc => sc.SupportConceptOid.Value).ToList());
 
-                if(Model.Categories2Descriptions is null)
-                {
-                    Model.Categories2Descriptions = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
-                }
-
                 Model.Categories2Descriptions = CreateServiceCategory2ServiceDescription(nodes, true);
 
-                if(Model.Categories2Descriptions.Count == 0 && nodes.Any())
-                {
-                    var allServiceDescriptions = OperationsService.GetAllServiceDescriptions();
-
-                    allServiceDescriptions.DoForEach(serviceDescription => Model.Categories2Descriptions.AddOrUpdateValueInDictionary(serviceDescription.Category, serviceDescription));
-                }
-
                 SelectFirstServiceDescription();
 
                 return;
@@ -1800,33 +1751,25 @@ namespace BeWoPlanerMobil.Controllers
             Model.CostBearer2SupportConceptOid = cb2ScOid;
             Model.SelectedSupportConcept =
                 Model.SupportConcepts.FirstOrDefault(
-                    f =>
-                        f.CostBearerRelations.Any(
-                            a =>
-                                a.CostBearer2SupportConceptOid.HasValue &&
-                                a.CostBearer2SupportConceptOid.Value.Equals(Model.CostBearer2SupportConceptOid)));
+                    supportConcept =>
+                        supportConcept.CostBearerRelations.Any(
+                            supportConceptCostBearerRel =>
+                                supportConceptCostBearerRel.CostBearer2SupportConceptOid.HasValue &&
+                                supportConceptCostBearerRel.CostBearer2SupportConceptOid.Value.Equals(Model.CostBearer2SupportConceptOid)));
             
             if(Model.SelectedSupportConcept != null)
             {
-                Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.First(f => long.Parse(f.CostBearer2SupportConceptOid) == cb2ScOid);
+                Model.SelectedCostBearer2SupportConceptRelListObject = Model.SupportConceptListObjects.First(f => long.Parse(f.CostBearer2SupportConceptOid) == cb2ScOid);
 
                 var node = OperationsService.GetSupportConceptTreeNodeDetailInfo(Model.SelectedSupportConcept.Customer.CustomerOid, Model.SelectedSupportConcept.SupportConceptOid, Model.CostBearer2SupportConceptOid);
 
-                Model.ServiceCategories = node.ServiceAccountings.Count > 0
-                    ? CreateServiceCategoryModels(node.ServiceAccountings.Select(sa => sa.ServiceDescription).ToList())
-                    : CreateServiceCategoryModels(OperationsService.GetAllServiceDescriptions());
-
-                Model.ServiceCategories = Model.ServiceCategories.Where(c => !c.OhneHilfeplan.HasValue || c.OhneHilfeplan.Value == AccountingvisibilityType.Beides || c.OhneHilfeplan.Value == AccountingvisibilityType.NurKlientenbezogen).ToList();
-                
                 Model.Categories2Descriptions = CreateServiceCategory2ServiceDescription(new List<SupportConceptTreeNodeDetailInfoDC> { node }, false);
             }
             else if(cb2ScOid == -2) // Ohne Hilfeplan
             {
                 var allServiceDescriptions = OperationsService.GetAllServiceDescriptions();
 
-                Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.First(f => f.CostBearer2SupportConceptOid.Equals(cb2ScOid.ToString()));
-                Model.ServiceCategories = CreateServiceCategoryModels(OperationsService.GetAllServiceDescriptions());
-                Model.ServiceCategories = Model.ServiceCategories.Where(c => !c.OhneHilfeplan.HasValue || c.OhneHilfeplan.Value == AccountingvisibilityType.Beides || c.OhneHilfeplan.Value == AccountingvisibilityType.NichtKlientenbezogen).ToList();
+                Model.SelectedCostBearer2SupportConceptRelListObject = Model.SupportConceptListObjects.First(f => f.CostBearer2SupportConceptOid.Equals(cb2ScOid.ToString()));
 
                 if(Model.Categories2Descriptions is null)
                 {
@@ -1848,8 +1791,8 @@ namespace BeWoPlanerMobil.Controllers
             }
             else if(cb2ScOid == -1) // Hilfeplan Auswählen
             {
-                Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.First(f => f.CostBearer2SupportConceptOid.Equals(cb2ScOid.ToString()));
-                Model.ServiceCategories.Clear();
+                Model.SelectedCostBearer2SupportConceptRelListObject = Model.SupportConceptListObjects.First(f => f.CostBearer2SupportConceptOid.Equals(cb2ScOid.ToString()));
+                
                 if(Model.Categories2Descriptions is null)
                 {
                     Model.Categories2Descriptions = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
@@ -1860,12 +1803,6 @@ namespace BeWoPlanerMobil.Controllers
                 }
             }
 
-            // Kategorien werden nach Position sortiert
-            if (Model.ServiceCategories != null)
-            {
-                Model.ServiceCategories = Model.ServiceCategories.OrderBy(serviceCategory => serviceCategory.Position).ToList();
-            }
-
             // Ist der Klient abwesend, wird dies wie im FaC angezeigt
             if(Model.SelectedSupportConcept?.Customer?.AbsenceTimes?.Any() ?? false)
             {
@@ -1900,18 +1837,18 @@ namespace BeWoPlanerMobil.Controllers
 
             var firstServiceCategory2ServiceDescriptions = Model.Categories2Descriptions.OrderBy(c2d => c2d.Key.Position).ThenBy(c2d => c2d.Key.ServiceCategoryOid).FirstOrDefault(c2d => c2d.Value.Any());
 
-            if(firstServiceCategory2ServiceDescriptions.Key != null)
+            if(firstServiceCategory2ServiceDescriptions.Key is null)
             {
-                var serviceDescription = firstServiceCategory2ServiceDescriptions.Value.OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).First();
-
-                Model.SelectedServiceDescription = serviceDescription;
-                Model.SelectedServiceCategory = serviceDescription.Category;
-                Model.SelectedServiceDescriptionOid = serviceDescription.ServiceDescriptionOid;
-                Model.SelectedServiceCategoryOid = serviceDescription.Category.ServiceCategoryOid;
+                return;
             }
+
+            var serviceDescription = firstServiceCategory2ServiceDescriptions.Value.OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).First();
+
+            Model.SelectedServiceDescription = serviceDescription;
+            Model.SelectedServiceCategory = serviceDescription.Category;
         }
 
-        private static Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> CreateServiceCategory2ServiceDescription(List<SupportConceptTreeNodeDetailInfoDC> nodes, bool isGroupBooking)
+        private Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> CreateServiceCategory2ServiceDescription(List<SupportConceptTreeNodeDetailInfoDC> nodes, bool isGroupBooking)
         {
             var result = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
 
@@ -1926,7 +1863,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 firstNode.ServiceAccountings.DoForEach(serviceAccounting => result.AddOrUpdateValueInDictionary(serviceAccounting.ServiceDescription.Category, serviceAccounting.ServiceDescription));
             }
-            
+
             foreach(var serviceAccounting in firstNode.ServiceAccountings)
             {
                 var serviceDescription = serviceAccounting.ServiceDescription;
@@ -1938,7 +1875,17 @@ namespace BeWoPlanerMobil.Controllers
                 }
             }
 
-            return result.OrderBy(kvp => kvp.Key.Position).ToDictionary(category2Descriptions => category2Descriptions.Key, category2Descriptions => category2Descriptions.Value);
+            if(firstNode.ServiceAccountings.Count == 0)
+            {
+                var allServiceDescriptions = OperationsService.GetAllServiceDescriptions().Where(sd => sd.Category.OhneHilfeplan != AccountingvisibilityType.NichtKlientenbezogen).ToList();
+
+                foreach(var serviceDescription in allServiceDescriptions)
+                {
+                    result.AddOrUpdateValueInDictionary(serviceDescription.Category, serviceDescription);
+                }
+            }
+
+            return result.OrderBy(kvp => kvp.Key.Position).ToDictionary(category2Descriptions => category2Descriptions.Key, category2Descriptions => category2Descriptions.Value.OrderBy(serviceDescription => serviceDescription.Position).ToList());
         }
 
         [HttpPost]
@@ -1991,20 +1938,20 @@ namespace BeWoPlanerMobil.Controllers
             if (Model is null)
             {
                 Logout();
-                return LeerzeichenFuerGetMethoden;
+                return "0";
             }
 
             var sc = Model.SelectedSupportConcept;
             if (!Model.IsInGroupBookingMode && sc is null)
             {
-                return LeerzeichenFuerGetMethoden;
+                return "0";
             }
 
             if(string.IsNullOrEmpty(pGoalOids))
             {
                 Model.SelectedGoals.Clear();
 
-                return LeerzeichenFuerGetMethoden;
+                return "0";
             }
 
             var splitOids = pGoalOids.Trim(';').Split(';');
@@ -2028,15 +1975,13 @@ namespace BeWoPlanerMobil.Controllers
             allGoals.AddRangeIfElementsNotIn(parents);
 
             var goals = allGoals.Where(w => w.ValueListEntryOid.HasValue && selectedGoalOids.Contains(w.ValueListEntryOid.Value)).ToList();
-            
-            // ToDo: Hier liegt der Bug!
-            // ToDo: vorhandene Bewertungen beachten!
+ 
             var stillSelectedGoals = Model.SelectedGoals.Where(s => goals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == s.ValueListEntryOid)).ToList();
 
             Model.SelectedGoals = stillSelectedGoals;
             Model.SelectedGoals.AddRangeIfElementsNotIn(goals);
 
-            return LeerzeichenFuerGetMethoden;
+            return Model.SelectedGoals?.Count.ToString() ?? "0";
         }
 
         [Authorize]
@@ -2052,7 +1997,6 @@ namespace BeWoPlanerMobil.Controllers
 
             Model.SelectedServiceDescription = serviceDescription;
 
-            Model.SelectedServiceDescriptionOid = pServiceDescriptionOid;
             return LeerzeichenFuerGetMethoden;
         }
 
@@ -2171,7 +2115,7 @@ namespace BeWoPlanerMobil.Controllers
 
             var wasSuccessful = long.TryParse(oidString, out var serviceRecordOid);
 
-            if (!wasSuccessful)
+            if(!wasSuccessful)
             {
                 return RedirectToActionPermanent("Main");
             }
@@ -2191,8 +2135,8 @@ namespace BeWoPlanerMobil.Controllers
             var selectedServiceDescription = selectedServiceRecord.ServiceDescription;
             var selectedServiceCategory = selectedServiceDescription.Category;
 
-            Model.SelectedServiceDescriptionOid = selectedServiceDescription.ServiceDescriptionOid;
-            Model.SelectedServiceCategoryOid = selectedServiceCategory.ServiceCategoryOid;
+            Model.SelectedServiceDescription = selectedServiceDescription;
+            Model.SelectedServiceCategory = selectedServiceCategory;
 
             Model.PreviouslySelectedEmployee = Model.SelectedEmployee;
             Model.SelectedEmployee = selectedServiceRecord.Employee;
@@ -2210,8 +2154,6 @@ namespace BeWoPlanerMobil.Controllers
                 Model.SelectedSupportConcept = null;
                 Model.SelectedEmployee = null;
 
-                Model.ServiceCategories = CreateServiceCategoryModels(OperationsService.GetAllServiceDescriptions());
-
                 var group = OperationsService.GetServiceRecordGroup(selectedServiceRecord.GroupOid.Value);
 
                 var employees = group.ServiceRecordList.Select(serviceRecord => serviceRecord.Employee).Distinct().ToList();
@@ -2228,8 +2170,6 @@ namespace BeWoPlanerMobil.Controllers
 
                 LoadServiceCategoriesToModel(null);
 
-                Model.SelectedServiceDescriptionOid = selectedServiceRecord.ServiceDescription.ServiceDescriptionOid;
-                Model.SelectedServiceCategoryOid = selectedServiceRecord.ServiceDescription.Category.ServiceCategoryOid;
                 Model.SelectedServiceDescription = selectedServiceDescription;
                 Model.SelectedServiceCategory = selectedServiceCategory;
 
@@ -2242,7 +2182,7 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public string GetSelectedRecordInformation()
         {
-            if (Model is null)
+            if(Model is null)
             {
                 Logout();
                 return LeerzeichenFuerGetMethoden;
@@ -2250,7 +2190,7 @@ namespace BeWoPlanerMobil.Controllers
 
             var result = LeerzeichenFuerGetMethoden;
 
-            if (Model.SelectedServiceRecordOid.HasValue)
+            if(Model.SelectedServiceRecordOid.HasValue)
             {
                 result = SerializeObject(Model.ServiceRecords.First(f => f.ServiceRecordOid == Model.SelectedServiceRecordOid));
             }
@@ -2498,7 +2438,7 @@ namespace BeWoPlanerMobil.Controllers
                     dateRangeString = node?.SupportConceptTreeNodeDC != null ? node.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC.DateRangeString : "";
                 }
 
-                var result = OperationsService.ValidateServiceRecordEntry(checkServiceRecord, stats, maxDaysEditSRsAllowed, checkServiceRecord.GroupOid.HasValue, employeeOids);
+                var result = OperationsService.ValidateServiceRecord(checkServiceRecord, stats, maxDaysEditSRsAllowed, null, null);
                 validationResults.Add(new ServiceRecord2Validation(checkServiceRecord, result, dateRangeString ?? ""));
             } // Mehrfachbuchung
             else if(Model.IsInMultiBookingMode && !Model.IsInGroupBookingMode)
@@ -2642,9 +2582,20 @@ namespace BeWoPlanerMobil.Controllers
                                 intervall = "" + limitFuerZeiterfassung + " Tagen";
                             }
 
-                            newResult.Message += "Sie k&ouml;nnen keine neuen Leistungen f&uuml;r den " + von + " dokumentieren, da die Zeiterfassung innerhalb von " + intervall + " erfolgen muss.<br /><br />";
-                            exitLoop = true;
-                            newResult.KannTrotzdemGespeichertWerden = false;
+
+                            if(!MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecordAllowEditAfterMindays))
+                            {
+                                if(limitFuerZeiterfassung == 1)
+                                {
+                                    newResult.Message += $"Sie k&ouml;nnen keine neuen Leistungen f&uuml;r den {von} dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.<br /><br />";
+                                }
+                                else
+                                {
+                                    newResult.Message += $"Sie k&ouml;nnen keine neuen Leistungen f&uuml;r den {von} dokumentieren, da die Zeiterfassung innerhalb von {intervall} erfolgen muss.<br /><br />";
+                                }
+
+                                exitLoop = true;
+                            }
 
                             break;
                         case Custom:
@@ -2753,10 +2704,6 @@ namespace BeWoPlanerMobil.Controllers
                 return LeerzeichenFuerGetMethoden;
             }
 
-            var allowDeleteAfterEmployeeSignature = MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowDeleteAfterEmployeeSignature);
-
-            var allowDeleteAll = MobileSessionFacade.CheckForUserRight(UserRightType.CreateAll);
-
             var validationResultList = OperationsService.ValidateServiceRecordDeletion(serviceRecord, Model.Employee.EmployeeOid.Value);
             
             if(validationResultList.Count > 0)
@@ -2813,7 +2760,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             try
             {
-                if (Model is null)
+                if(Model is null)
                 {
                     Logout();
                     return LeerzeichenFuerGetMethoden;
@@ -2822,7 +2769,7 @@ namespace BeWoPlanerMobil.Controllers
                 Model.SelectedEmployee = Model.AllEmployees.First(f => f.EmployeeOid.Equals(employeeOid));
                 return LeerzeichenFuerGetMethoden;
             }
-            catch (Exception e)
+            catch(Exception e)
             {
                 Log.Info("Error in SetServiceRecordEmployee:");
                 Log.Error(e.Message, e);
@@ -2923,7 +2870,7 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult SetGroupBookingMode(FormCollection pFormCollection)
         {
-            if (Model is null)
+            if(Model is null)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
@@ -2947,7 +2894,7 @@ namespace BeWoPlanerMobil.Controllers
         /// </param>
         private void ResetBookingMode(BookingMode bookingMode)
         {
-            if (Model is null)
+            if(Model is null)
             {
                 Logout();
                 return;
@@ -3015,28 +2962,14 @@ namespace BeWoPlanerMobil.Controllers
                 }
 
                 ResetGroupBookingMode();
-
-                if (Model.SelectedSupportConcept != null)
-                {
-                    var details = OperationsService.GetSupportConceptTreeNodeDetailInfo(Model.SelectedSupportConcept.Customer.CustomerOid, Model.SelectedSupportConcept.SupportConceptOid, Model.CostBearer2SupportConceptOid);
-
-                    Model.ServiceCategories = details.ServiceAccountings.Count > 0
-                        ? CreateServiceCategoryModels(details.ServiceAccountings.Select(sa => sa.ServiceDescription).ToList())
-                        : CreateServiceCategoryModels(OperationsService.GetAllServiceDescriptions());
-
-                    Model.ServiceCategories = Model.ServiceCategories.Where(c => !c.OhneHilfeplan.HasValue || c.OhneHilfeplan.Value == AccountingvisibilityType.Beides || c.OhneHilfeplan.Value == AccountingvisibilityType.NurKlientenbezogen).ToList();
-                }
-                else if (Model.CostBearer2SupportConceptOid == -2)
-                {
-                    Model.ServiceCategories = CreateServiceCategoryModels(OperationsService.GetAllServiceDescriptions());
-                    Model.ServiceCategories = Model.ServiceCategories.Where(c => !c.OhneHilfeplan.HasValue || c.OhneHilfeplan.Value == AccountingvisibilityType.Beides || c.OhneHilfeplan.Value == AccountingvisibilityType.NichtKlientenbezogen).ToList();
-                }
             }
+
+            LoadGoals();
         }
 
         private void ResetMultiBookingMode() 
         {
-            Model.ServiceCategories.Clear();
+            Model.Categories2Descriptions.Clear();
             Model.MultiBookingSelectedConceptCostBearerRelations.Clear();
             Model.MultiBookingSelectedEmployees.Clear();
             Model.MultiBookingSelectedGroupOfPeopleOids.Clear();
@@ -3047,7 +2980,7 @@ namespace BeWoPlanerMobil.Controllers
 
         private void ResetGroupBookingMode()
         {
-            Model.ServiceCategories.Clear();
+            Model.Categories2Descriptions.Clear();
             Model.GroupBookingSelectedCostbearerRelOids.Clear();
             Model.GroupBookingSelectedEmployees.Clear();
             Model.GroupBookingSelectedSupportConcepts.Clear();
@@ -3066,6 +2999,8 @@ namespace BeWoPlanerMobil.Controllers
 
             ResetBookingMode(BookingMode.SingleBookingMode);
 
+            LoadServiceCategoriesToModel(Model.SelectedCostBearerSupportConceptRelOid);
+
             return View("Main", Model);
         }
 
@@ -3162,33 +3097,12 @@ namespace BeWoPlanerMobil.Controllers
             Model.MultiBookingSelectedEmployees = new List<CompactEmployeeDC> { MobileSessionFacade.LoggedInCompactEmployee };
             Model.MultiBookingSelectedGroupOfPeopleOids.Clear();
             Model.MultiBookingSelectedSupportConcepts.Clear();
+            Model.SelectedGoals.Clear();
 
             Model.SelectedServiceCategory = null;
-            Model.SelectedServiceCategoryOid = null;
             Model.SelectedServiceDescription = null;
-            Model.SelectedServiceDescriptionOid = null;
 
             LoadServiceCategoriesToModel(Model.CostBearer2SupportConceptOid);
-
-            var serviceDescriptions = Model.GetServiceDesctiptions();
-
-            if(!Model.ServiceCategories.Any() || !serviceDescriptions.Any())
-            {
-                return;
-            }
-
-            // Hier erst nach Kategorie gehen und dann die Leistung mit der niedrigsten Position nehmen!
-
-            var firstCategory = serviceDescriptions.Select(sd => sd.Category).OrderBy(sc => sc.Position).ThenBy(sc => sc.ServiceCategoryOid).First();
-            var firstServiceDescription = serviceDescriptions.Where(sd => sd.Category.ServiceCategoryOid.Value.Equals(firstCategory.ServiceCategoryOid.Value)).OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).First();
-
-            if(serviceDescriptions.Any(a => a.ServiceDescriptionOid.HasValue && Model.SelectedServiceDescriptionOid.HasValue && a.ServiceDescriptionOid.Value.Equals(Model.SelectedServiceDescriptionOid)))
-            {
-                return;
-            }
-
-            Model.SelectedServiceDescriptionOid = firstServiceDescription.ServiceDescriptionOid;
-            Model.SelectedServiceCategoryOid = firstServiceDescription.Category.ServiceCategoryOid;
         }
 
         [Authorize]
@@ -3788,85 +3702,95 @@ namespace BeWoPlanerMobil.Controllers
 
                     LoadSupportConceptThings(-2);
 
-                    var serviceCategory = Model.ServiceCategories.FirstOrDefault();
-                    var serviceDescription = serviceCategory?.ServiceDescriptions.FirstOrDefault();
-
-                    if(!(serviceDescription is null))
+                    if(Model.SelectedServiceDescription != null)
                     {
-                        Model.SelectedServiceCategoryOid = serviceDescription.Category.ServiceCategoryOid;
+                        Model.SelectedServiceCategory = Model.SelectedServiceDescription.Category;
                         var serviceRecord = CreateServiceRecordFromScratch(start.Value, end.Value, null, Model.SelectedEmployee, notice);
-                        serviceRecord.ServiceDescription = serviceDescription;
-                        Model.SelectedServiceRecord = serviceRecord;
-                    }
-                } 
-                // Einzelbuchung
-                else if(supportConceptList.Count == 1 && employeeOids.Count == 1)
-                {
-                    ResetBookingMode(BookingMode.SingleBookingMode);
-
-                    Model.SelectedEmployee = Model.AllEmployees.FirstOrDefault(e => e.EmployeeOid.Equals(employeeOids.FirstOrDefault()));
-
-                    var compactSupportConcept = supportConceptList.First();
-                    var supportConcept = Model.SupportConcepts.FirstOrDefault(f => f.SupportConceptOid.HasValue && f.SupportConceptOid.Value.Equals(compactSupportConcept.SupportConceptOid));
-
-                    var serviceRecord = CreateServiceRecordFromScratch(start.Value, end.Value, supportConcept?.Customer, Model.SelectedEmployee, notice);
-
-                    var costBearer2SupportConcept = supportConcept?.CostBearerRelations.FirstOrDefault();
-
-                    LoadSupportConceptThings(costBearer2SupportConcept?.CostBearer2SupportConceptOid ?? -2);
-
-                    var serviceCategory = Model.ServiceCategories.FirstOrDefault();
-                    var serviceDescription = serviceCategory?.ServiceDescriptions.FirstOrDefault();
-
-                    serviceRecord.CostBearer = costBearer2SupportConcept?.CostBearer;
-                    serviceRecord.CostBearer2SupportConceptOid = costBearer2SupportConcept?.CostBearer2SupportConceptOid;
-                    serviceRecord.ServiceDescription = serviceDescription;
-
-                    if(!(serviceDescription is null))
-                    {
+                        serviceRecord.ServiceDescription = Model.SelectedServiceDescription;
                         Model.SelectedServiceRecord = serviceRecord;
                     }
                 }
-                else // Gruppenbuchung
+                // Einzelbuchung
+                else
                 {
-                    ResetBookingMode(BookingMode.GroupBookingMode);
-
-                    Model.GroupBookingSelectedEmployees = Model.AllEmployees.Where(w => employeeOids.Contains(w.EmployeeOid)).ToList();
-
-                    var roundedDuration = (int)((end - start)?.TotalMinutes ?? 0);
-
-                    Model.SelectedServiceRecord = new ServiceRecordDC()
+                    var availableRelOids = new List<long>();
+                    Model.SupportConceptListObjects.DoForEach(sclo =>
                     {
-                        Start              = start,
-                        End                = end,
-                        RoundedDuration    = roundedDuration,
-                        Notice             = notice,
-                        ServiceDescription = Model.ServiceCategories.FirstOrDefault()?.ServiceDescriptions.FirstOrDefault()
-                    };
-
-                    var supportConceptsForGroupBooking = Model.SupportConcepts.Where(sc => sc.SupportConceptOid.HasValue && supportConceptList.Any(csc => csc.SupportConceptOid.Equals(sc.SupportConceptOid.Value))).ToList();
-                    
-                    var costBearer2SupportConceptOids = new List<long>();
-                    var costBearer2SupportConcepts = new List<SupportConceptCostBearerRelDC>();
-
-                    foreach(var supportConcept in supportConceptsForGroupBooking)
-                    {
-                        var costBearer2SupportConcept = supportConcept.CostBearerRelations.FirstOrDefault();
-
-                        if(costBearer2SupportConcept?.CostBearer2SupportConceptOid is null)
+                        if(long.TryParse(sclo.CostBearer2SupportConceptOid, out var costBearer2SupportConceptRelOid))
                         {
-                            continue;
+                            availableRelOids.AddIfNotIn(costBearer2SupportConceptRelOid);
+                        }
+                    });
+
+                    if(supportConceptList.Count == 1 && employeeOids.Count == 1)
+                    {
+                        ResetBookingMode(BookingMode.SingleBookingMode);
+
+                        Model.SelectedEmployee = Model.AllEmployees.FirstOrDefault(e => e.EmployeeOid.Equals(employeeOids.FirstOrDefault()));
+
+                        var compactSupportConcept = supportConceptList.First();
+                        var supportConcept = Model.SupportConcepts.FirstOrDefault(f => f.SupportConceptOid.HasValue && f.SupportConceptOid.Value.Equals(compactSupportConcept.SupportConceptOid));
+
+                        var serviceRecord = CreateServiceRecordFromScratch(start.Value, end.Value, supportConcept?.Customer, Model.SelectedEmployee, notice);
+
+                        var costBearer2SupportConcept = supportConcept?.CostBearerRelations.FirstOrDefault(cbRel => cbRel.CostBearer2SupportConceptOid.HasValue && availableRelOids.Contains(cbRel.CostBearer2SupportConceptOid.Value));
+
+                        LoadSupportConceptThings(costBearer2SupportConcept?.CostBearer2SupportConceptOid ?? -2);
+
+                        serviceRecord.CostBearer = costBearer2SupportConcept?.CostBearer;
+                        serviceRecord.CostBearer2SupportConceptOid = costBearer2SupportConcept?.CostBearer2SupportConceptOid;
+                        serviceRecord.ServiceDescription = Model.SelectedServiceDescription;
+
+                        if(Model.SelectedServiceDescription != null)
+                        {
+                            Model.SelectedServiceRecord = serviceRecord;
+                        }
+                    }
+                    else // Gruppenbuchung
+                    {
+                        ResetBookingMode(BookingMode.GroupBookingMode);
+
+                        Model.GroupBookingSelectedEmployees = Model.AllEmployees.Where(w => employeeOids.Contains(w.EmployeeOid)).ToList();
+
+                        var roundedDuration = (int) ((end - start)?.TotalMinutes ?? 0);
+
+                        Model.SelectedServiceRecord = new ServiceRecordDC()
+                        {
+                            Start = start,
+                            End = end,
+                            RoundedDuration = roundedDuration,
+                            Notice = notice,
+                            ServiceDescription = Model.GetSelectedOrFirstServiceDescription()
+                        };
+
+                        var supportConceptsForGroupBooking = Model.SupportConcepts.Where(sc => sc.SupportConceptOid.HasValue && supportConceptList.Any(csc => csc.SupportConceptOid.Equals(sc.SupportConceptOid.Value))).ToList();
+
+                        var costBearer2SupportConceptOids = new List<long>();
+                        var costBearer2SupportConcepts = new List<SupportConceptCostBearerRelDC>();
+
+                        foreach(var supportConcept in supportConceptsForGroupBooking)
+                        {
+                            var costBearer2SupportConcept = supportConcept?.CostBearerRelations.FirstOrDefault(cbRel => cbRel.CostBearer2SupportConceptOid.HasValue && availableRelOids.Contains(cbRel.CostBearer2SupportConceptOid.Value));
+
+                            if(costBearer2SupportConcept?.CostBearer2SupportConceptOid is null)
+                            {
+                                continue;
+                            }
+
+                            costBearer2SupportConceptOids.AddIfNotIn(costBearer2SupportConcept.CostBearer2SupportConceptOid.Value);
+                            costBearer2SupportConcepts.AddIfNotIn(costBearer2SupportConcept);
                         }
 
-                        costBearer2SupportConceptOids.AddIfNotIn(costBearer2SupportConcept.CostBearer2SupportConceptOid.Value);
-                        costBearer2SupportConcepts.AddIfNotIn(costBearer2SupportConcept);
-                    }
+                        if(costBearer2SupportConceptOids.Any())
+                        {
+                            Model.GroupBookingSelectedCostbearerRelOids = costBearer2SupportConceptOids;
+                            Model.SelectedConceptCostBearerRelations = costBearer2SupportConcepts;
+                            Model.GroupBookingSelectedSupportConcepts = supportConceptsForGroupBooking;
+                        }
 
-                    if(costBearer2SupportConceptOids.Any())
-                    {
-                        Model.GroupBookingSelectedCostbearerRelOids = costBearer2SupportConceptOids;
-                        Model.SelectedConceptCostBearerRelations = costBearer2SupportConcepts;
-                        Model.GroupBookingSelectedSupportConcepts = supportConceptsForGroupBooking;
+                        LoadServiceCategoriesToModel(null);
+
+                        LoadGoals();
                     }
                 }
 
@@ -4560,7 +4484,7 @@ namespace BeWoPlanerMobil.Controllers
 
             var serviceRecord = Model.GetServiceRecord(serviceRecordOid);
 
-            var hilfeplan    = Model.SelectedSupportConceptListObject.NameAndDateOfBirth + " | " + Model.SelectedSupportConceptListObject.SupportConceptTimeSpan;
+            var hilfeplan    = Model.SelectedCostBearer2SupportConceptRelListObject.NameAndDateOfBirth + " | " + Model.SelectedCostBearer2SupportConceptRelListObject.SupportConceptTimeSpan;
             var leistung     = serviceRecord.ServiceDescription.Name;
             var kategorie    = serviceRecord.ServiceDescription.Category;
             var employee     = $"{serviceRecord.Employee.FirstName} {serviceRecord.Employee.LastName}";
@@ -4616,15 +4540,15 @@ namespace BeWoPlanerMobil.Controllers
             if(Model is null)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
-                return PartialView("Category2ServiceDescriptionPartial", Model);
+                return PartialView("Category2ServiceDescriptionPartial");
             }
 
             if(long.TryParse(categoryOidStr, out var categoryOid))
             {
                 Model.SelectedServiceCategory = Model.Categories2Descriptions.FirstOrDefault(f => f.Key?.ServiceCategoryOid != null && f.Key.ServiceCategoryOid.Value.Equals(categoryOid)).Key;
-                Model.SelectedServiceCategoryOid = Model.SelectedServiceCategory?.ServiceCategoryOid;
+                //Model.SelectedServiceCategoryOid = Model.SelectedServiceCategory?.ServiceCategoryOid;
                 Model.SelectedServiceDescription = null;
-                Model.SelectedServiceDescriptionOid = null;
+                //Model.SelectedServiceDescriptionOid = null;
 
                 if(Model.SelectedServiceCategory is null)
                 {
@@ -4634,7 +4558,7 @@ namespace BeWoPlanerMobil.Controllers
                 var selectedServiceDescription = Model.Categories2Descriptions[Model.SelectedServiceCategory].OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).FirstOrDefault();
 
                 Model.SelectedServiceDescription = selectedServiceDescription;
-                Model.SelectedServiceDescriptionOid = selectedServiceDescription?.ServiceDescriptionOid;
+                //Model.SelectedServiceDescriptionOid = selectedServiceDescription?.ServiceDescriptionOid;
             }
 
             return PartialView("Category2ServiceDescriptionPartial", Model);

BeWoPlanerMobil/Controllers/ReportBaseController.cs

@@ -0,0 +1,10 @@
+using System.Web.Mvc;
+
+namespace BeWoPlanerMobil.Controllers
+{
+    public abstract class ReportBaseController : AbstractBaseController
+    {
+        [Authorize]
+        public abstract string ResetReport();
+    }
+}

BeWoPlanerMobil/Controllers/ReportViewerController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Web.Mvc;
 using BeWo.Report;
 using BeWo.Service.Plugins;
+using BeWo.View.Navigation.Filter;
 using BeWoPlanerMobil.Models;
 using BeWoPlanerMobil.Service;
 using BeWoPlanerMobil.Util;
@@ -14,7 +15,7 @@ using BS.Shared.DataContracts.Compact;
 
 namespace BeWoPlanerMobil.Controllers
 {
-    public class ReportViewerController : AbstractBaseController
+    public class ReportViewerController : ReportBaseController
     {
         private ReportViewerModel _Model;
 
@@ -79,6 +80,7 @@ namespace BeWoPlanerMobil.Controllers
 
             Model.ReportTypes = new List<SelectListItem>();
 
+#if DEBUG
             //if(AbstractModel.HasRightToViewReports)
             //{
             //    Model.ReportTypes.Add(new SelectListItem
@@ -87,6 +89,7 @@ namespace BeWoPlanerMobil.Controllers
             //        Value = "0"
             //    });
             //}
+#endif
 
             if(AbstractModel.HasRightToViewMitarbeiterstundenkonto)
             {
@@ -97,11 +100,38 @@ namespace BeWoPlanerMobil.Controllers
                 });
             }
 
-            // ToDo: Bis auf weiteres nur Mitarbeiterstundenkonto anzeigen!
-            Model.SelectedReportType = ReportType.Mitarbeiterstundenkonto;//ReportType.Berichte;
+            Model.SelectedReportType = ReportType.Mitarbeiterstundenkonto;
+
+#if DEBUG
+            //Model.SelectedReportType = ReportType.Berichte;
+#endif
 
             Model.Queries = QueryService.GetAllQueriesOfType(QueryType.Public);
 
+            if(Model.Employee?.EmployeeOid.HasValue ?? false)
+            {
+                Model.SupportConcepts = EmployeeService.GetActiveSupportConceptsForEmployee(Model.Employee.EmployeeOid, CustomerFilterEnum.All);
+            }
+            else
+            {
+                Model.SupportConcepts = new List<SupportConceptDC>();
+            }
+
+            if(Model.SelectedCostBearer2SupportConceptRelListObject is null)
+            {
+                Model.SelectedCostBearer2SupportConceptRelListObject = Model.CostBearer2SupportConceptRelListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == "-1") ?? Model.CostBearer2SupportConceptRelListObjects.First();
+            }
+
+            if(Model.SelectedMonthForBericht is null)
+            {
+                Model.SelectedMonthForBericht = Model.Months.FirstOrDefault(m => m.Value.Equals(DateTime.Today.Month.ToString()));
+            }
+
+            if(Model.SelectedYearForBericht is null || Model.SelectedYearForBericht.Value < DateTime.Today.AddYears(-10).Year)
+            {
+                Model.SelectedYearForBericht = DateTime.Today.Year;
+            }
+
             return View(Model);
         }
 
@@ -113,7 +143,7 @@ namespace BeWoPlanerMobil.Controllers
                 TempData[TempDataConstants.DoLogoutKey] = true;
             }
 
-            return PartialView("DocumentWebViewerPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
         }
 
         [Authorize]
@@ -121,42 +151,74 @@ namespace BeWoPlanerMobil.Controllers
         {
             try
             {
-                if (Model?.Employee?.EmployeeOid is null || reportOid is null)
+                if(Model?.Employee?.EmployeeOid is null || reportOid is null)
                 {
                     TempData[TempDataConstants.DoLogoutKey] = true;
-                    return PartialView("DocumentWebViewerPartial");
+                    return PartialView("BeWoReportPartial");
                 }
 
                 var selectedQuery = Model.Queries.FirstOrDefault(query => query.Oid.Equals(reportOid.Value));
 
-                var queryParameter = selectedQuery?.Parameter ?? new List<QueryParamDC>();
-
-                if (selectedQuery is null)
+                if(selectedQuery is null)
                 {
                     Model.Report = null;
-                    return PartialView("DocumentWebViewerPartial", Model);
+                    return PartialView("BeWoReportPartial", Model);
                 }
 
+                Model.SelectedQuery = selectedQuery;
+
                 var dcid = $"{MobileSessionFacade.Tenant}queryeoid{Model.Employee.EmployeeOid.Value}";
 
-                var test = QueryService.ExecuteQuery(selectedQuery.Oid, null);
+                var queryResult = QueryService.ExecuteQuery(selectedQuery.Oid, null);
                 
-                if (test is null)
+                if(queryResult is null)
                 {
-                    return PartialView("DocumentWebViewerPartial", Model);
+                    return PartialView("BeWoReportPartial", Model);
                 }
 
-                QueryService.PrepareQueryReport(test, dcid);
+                QueryService.PrepareQueryReport(queryResult, dcid);
                 var queryReport = Model.ReportCreator.CreateQueryReport(selectedQuery.Oid, dcid);
+
                 Model.Report = queryReport;
+                Model.ReportName = selectedQuery.Title;
             }
-            catch (Exception e)
+            catch(Exception e)
             {
                 Log.Error(e);
-                TempData[TempDataConstants.ErrorMessageKey] = e.Message;
+                if(Model != null)
+                {
+                    Model.ReportName = "Fehler";
+                }
+                TempData[TempDataConstants.ReportErrorMessageKey] = e.Message;
             }
 
-            return PartialView("DocumentWebViewerPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
+        }
+
+        [Authorize]
+        public ActionResult LoadBerichteForm(long? reportOid)
+        {
+            try
+            {
+                if(Model?.Employee?.EmployeeOid is null || reportOid is null)
+                {
+                    TempData[TempDataConstants.DoLogoutKey] = true;
+                    return PartialView("BerichteFormPartialView");
+                }
+
+                var selectedQuery = Model.Queries.FirstOrDefault(query => query.Oid.Equals(reportOid.Value));
+
+                Model.SelectedQuery = selectedQuery;
+
+                return PartialView("BerichteFormPartialView", Model);
+            }
+            catch(Exception exception)
+            {
+                Log.Error(exception);
+                TempData[TempDataConstants.ReportErrorMessageKey] = exception.Message;
+            }
+
+            return PartialView("BerichteFormPartialView", Model);
         }
 
         //[Authorize]
@@ -214,7 +276,7 @@ namespace BeWoPlanerMobil.Controllers
             if(Model?.Employee?.EmployeeOid is null)
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
-                return PartialView("DocumentWebViewerPartial");
+                return PartialView("BeWoReportPartial");
             }
 
             if(!string.IsNullOrWhiteSpace(parameters))
@@ -290,7 +352,7 @@ namespace BeWoPlanerMobil.Controllers
                 }
             }
             
-            return PartialView("DocumentWebViewerPartial", Model);
+            return PartialView("BeWoReportPartial", Model);
         }
 
         private static AbstractReportCreator GetReportCreator()
@@ -305,5 +367,88 @@ namespace BeWoPlanerMobil.Controllers
 #endif
             return creator;
         }
+
+        [Authorize]
+        public override string ResetReport()
+        {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return LeerzeichenFuerGetMethoden;
+            }
+
+            Model.Report = null;
+            Model.ReportName = null;
+
+            return LeerzeichenFuerGetMethoden;
+        }
+
+        // ToDo: Parameter hinzufügen
+        [Authorize]
+        public ActionResult CreateBerichtWithParameters()
+        {
+            if(Model?.SelectedQuery is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("BeWoReportPartial");
+            }
+
+
+
+            return PartialView("BeWoReportPartial", Model);
+        }
+
+        [Authorize]
+        public ActionResult SelectCostBearer2SupportConceptRel(long? relOid)
+        {
+            if(Model?.SelectedQuery is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("BerichteFormPartialView", Model);
+            }
+
+            if(relOid != null)
+            {
+                Model.SelectedCostBearer2SupportConceptRelListObject = Model.CostBearer2SupportConceptRelListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid != null && f.CostBearer2SupportConceptOid.Equals(relOid.Value.ToString()));
+            }
+
+            return PartialView("BerichteFormPartialView", Model);
+        }
+
+        [Authorize]
+        public ActionResult SelectMonth(string selectedMonth)
+        {
+            if(Model?.SelectedQuery is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("BerichteFormPartialView");
+            }
+
+            var month = Model.Months.FirstOrDefault(f => f.Value.Equals(selectedMonth));
+
+            if(month != null)
+            {
+                Model.SelectedMonthForBericht = month;
+            }
+
+            return PartialView("BerichteFormPartialView", Model);
+        }
+
+        [Authorize]
+        public ActionResult SelectYear(string selectedYear)
+        {
+            if(Model?.SelectedQuery is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("BerichteFormPartialView");
+            }
+
+            if(int.TryParse(selectedYear, out var year))
+            {
+                Model.SelectedYearForBericht = year;
+            }
+
+            return PartialView("BerichteFormPartialView", Model);
+        }
     }
 }

BeWoPlanerMobil/Models/AbstractModel.cs

@@ -5,6 +5,7 @@ using BeWoPlanerMobil.Util;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
+using DevExpress.XtraReports.UI;
 
 namespace BeWoPlanerMobil.Models
 {
@@ -50,7 +51,7 @@ namespace BeWoPlanerMobil.Models
 #if DEBUG
                 showEmployeeSignatureSetting = "1";
 #endif
-                return CheckRights(new List<UserRightType>{ UserRightType.Analysis_ServiceOverview_View, UserRightType.Signature_ProvideMonthlySignature }) && showEmployeeSignatureSetting != null && showEmployeeSignatureSetting.Equals("1");
+                return CheckRights(new List<UserRightType> { UserRightType.Analysis_ServiceOverview_View, UserRightType.Signature_ProvideMonthlySignature }) && showEmployeeSignatureSetting != null && showEmployeeSignatureSetting.Equals("1");
             }
         }
 
@@ -212,5 +213,34 @@ namespace BeWoPlanerMobil.Models
         public static bool HasRightToViewBetreuung => CheckRight(UserRightType.Customer_ViewBetreuung);
 
         public static string UserMessage { get; set; }
+
+        public XtraReport Report { get; set; }
+        public string ReportName { get; set; }
+
+        protected static string GetIsNotApproved(SupportConceptCostBearerRelDC rel)
+        {
+            var result = string.Empty;
+
+            var customer = rel.SupportConcept.Customer;
+
+            if(customer.TerminationDate.HasValue)
+            {
+                var terminationReason = string.Empty;
+
+                if(!string.IsNullOrEmpty(customer.TerminationReason))
+                {
+                    terminationReason += $", Begründung: {customer.TerminationReason}";
+                }
+
+                result += $" (Betreuung beendet am: {customer.TerminationDate:dd.MM.yyyy}{terminationReason})";
+            }
+
+            if(rel.ApprovedStartDate is null || rel.ApprovedEndDate is null)
+            {
+                result += " nicht bewilligt!";
+            }
+
+            return result;
+        }
     }
 }

BeWoPlanerMobil/Models/CustomerModel.cs

@@ -106,32 +106,6 @@ namespace BeWoPlanerMobil.Models
             }
         }
 
-        // ToDo: KGW
-        //public List<SelectListItem> OldMedLists
-        //{
-        //    get
-        //    {
-        //        var result = new List<SelectListItem>();
-
-        //        var ungueltigeListen = SelectedCustomer.Medikamentenverordnungslisten.Where(w => !w.Gueltig).OrderByDescending(x => x.ErstellDatum).ToList();
-
-        //        foreach(var list in ungueltigeListen)
-        //        {
-        //            result.Add(new SelectListItem
-        //            {
-        //                Value = list.MedikamentenverordnungslistenOid.Value.ToString(),
-        //                Text = $"{(list.MedListType ? "Medikamentenverordnungsliste" : "Bedarfsmedikamentenverordnungsliste")} vom {list.ErstellDatum}"
-        //            });
-        //        }
-
-        //        return result;
-        //    }
-        //}
-
-        public XtraReport Report { get; set; }
-
-        public string ReportName { get; set; }
-
         public List<BargeldkassenDC> Bargeldkassen { get; set; } = new List<BargeldkassenDC>();
 
         [Display(Name = "Kategorie")]

BeWoPlanerMobil/Models/MainModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics;
 using System.Linq;
 using System.Web.Mvc;
 using BeWo.View.Navigation.Filter;
@@ -17,6 +16,8 @@ namespace BeWoPlanerMobil.Models
 {
 	public class MainModel : AbstractModel
     {
+        public long? SelectedCostBearerSupportConceptRelOid { get; set; }
+
         [Display(Name = "Nur meine Klienten anzeigen")]
         public bool ShowOnlyOwnSupportConcepts { get; set; }
 
@@ -96,10 +97,9 @@ namespace BeWoPlanerMobil.Models
 		[Display(Name = "Hilfeplan")]
 		public long? CostBearer2SupportConceptOid { get; set; }
 
-		[Display(Name = "Kategorie")]
-		public long? SelectedServiceCategoryOid { get; set; }
-	    
-		public long? SelectedServiceDescriptionOid { get; set; }
+        public long? SelectedServiceCategoryOid => SelectedServiceCategory?.ServiceCategoryOid;
+
+        public long? SelectedServiceDescriptionOid => SelectedServiceDescription?.ServiceDescriptionOid;
 
 		public long? SelectedServiceRecordOid { get; set; }
 
@@ -188,6 +188,7 @@ namespace BeWoPlanerMobil.Models
         public long ServiceRecordOid { get; set; }
 
 		public List<SupportConceptDC> SupportConcepts { get; set; }
+        // ToDo: Veraltet!
 		public List<ServiceCategoryModel> ServiceCategories { get; set; }
 
         public List<TextModuleDC> Textbausteine { get; set; } = new List<TextModuleDC>();
@@ -239,15 +240,15 @@ namespace BeWoPlanerMobil.Models
             ErrorWert                  = 1;
 		}
 
-        public IEnumerable<SupportConceptListObject> SupportConceptListObjects
+        public IEnumerable<CostBearer2SupportConceptRelListObject> SupportConceptListObjects
         {
             get
             {
-                var allCostBearerRelations = new List<SupportConceptListObject> {new SupportConceptListObject("Hilfeplan auswählen", "", "-1", false, false), new SupportConceptListObject("Ohne Hilfeplan", "", "-2", false, false) };
+                var allCostBearerRelations = new List<CostBearer2SupportConceptRelListObject> {new CostBearer2SupportConceptRelListObject("Hilfeplan auswählen", "", "-1", false, false), new CostBearer2SupportConceptRelListObject("Ohne Hilfeplan", "", "-2", false, false) };
                 foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
                 {
                     allCostBearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now.Date).Select(
-                        cb => new SupportConceptListObject(
+                        cb => new CostBearer2SupportConceptRelListObject(
                             $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}", 
                             $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}", 
                             cb.CostBearer2SupportConceptOid.ToString(), 
@@ -259,48 +260,24 @@ namespace BeWoPlanerMobil.Models
             }
         }
 
-        private static string GetIsNotApproved(SupportConceptCostBearerRelDC rel)
-        {
-            var result = string.Empty;
+        
 
-            var customer = rel.SupportConcept.Customer;
-
-            if(customer.TerminationDate.HasValue)
-            {
-                var terminationReason = string.Empty;
-
-                if(!string.IsNullOrEmpty(customer.TerminationReason))
-                {
-                    terminationReason += $", Begründung: {customer.TerminationReason}";
-                }
-
-                result += $" (Betreuung beendet am: {customer.TerminationDate:dd.MM.yyyy}{terminationReason})";
-            }
-
-            if(rel.ApprovedStartDate is null || rel.ApprovedEndDate is null)
-            {
-                result += " nicht bewilligt!";
-            }
-
-            return result;
-        }
-
-        public SupportConceptListObject SelectedSupportConceptListObject { get; set; }
+        public CostBearer2SupportConceptRelListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
 
         public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; }
 
         public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, GroupBookingSelectedGroupOfPeopleOids);
 
-        public IEnumerable<SupportConceptListObject> SupportConceptListObjectsForGroupBooking
+        public IEnumerable<CostBearer2SupportConceptRelListObject> SupportConceptListObjectsForGroupBooking
         {
             get
             {
-                var allCostbearerRelations = new List<SupportConceptListObject>();
+                var allCostbearerRelations = new List<CostBearer2SupportConceptRelListObject>();
 
                 foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
                 {
                     allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now).Select(
-                        cb => new SupportConceptListObject(
+                        cb => new CostBearer2SupportConceptRelListObject(
                             $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}", 
                             $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}", 
                             cb.CostBearer2SupportConceptOid.ToString(), 
@@ -719,16 +696,16 @@ namespace BeWoPlanerMobil.Models
         public List<long> MultiBookingSelectedCostbearerRelOids { get; set; } = new List<long>();
         public List<CompactEmployeeDC> MultiBookingSelectedEmployees { get; set; } = new List<CompactEmployeeDC>();
 
-        public List<SupportConceptListObject> MultiBookingSupportConceptListObjects
+        public List<CostBearer2SupportConceptRelListObject> MultiBookingSupportConceptListObjects
         {
             get
             {
-                var allCostbearerRelations = new List<SupportConceptListObject>();
+                var allCostbearerRelations = new List<CostBearer2SupportConceptRelListObject>();
 
                 foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
                 {
                     allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate == null || w.EndDate.Value >= DateTime.Now).Select(
-                        cb => new SupportConceptListObject(
+                        cb => new CostBearer2SupportConceptRelListObject(
                             $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
                             $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
                             cb.CostBearer2SupportConceptOid.ToString(),
@@ -772,12 +749,10 @@ namespace BeWoPlanerMobil.Models
 
         public bool FilterGroupServiceCategories { get; set; }
 
-        public Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> Categories2Descriptions { get; set; }
+        public Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> Categories2Descriptions { get; set; } = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
 
         public ServiceCategoryDC SelectedServiceCategory { get; set; }
 
-        private ServiceDescriptionDC _SelectedServiceDescription;
-
         public ServiceDescriptionDC SelectedServiceDescription { get; set; }
 
         public ServiceDescriptionDC GetSelectedOrFirstServiceDescription()
@@ -818,7 +793,7 @@ namespace BeWoPlanerMobil.Models
         }
     }
 
-    public class SupportConceptListObject
+    public class CostBearer2SupportConceptRelListObject
     {
         public string NameAndDateOfBirth { get; }
 
@@ -832,7 +807,7 @@ namespace BeWoPlanerMobil.Models
         public bool ExpiresInThreeMonthsOrLess { get; }
 
 
-        public SupportConceptListObject(string pNameAndDateOfBirth, string pSupportConceptTimeSpan, string pCostBearer2SupportConceptOid, bool isAboutToExpire, bool expiresIn3MonthOrLess)
+        public CostBearer2SupportConceptRelListObject(string pNameAndDateOfBirth, string pSupportConceptTimeSpan, string pCostBearer2SupportConceptOid, bool isAboutToExpire, bool expiresIn3MonthOrLess)
         {
             NameAndDateOfBirth = pNameAndDateOfBirth;
             SupportConceptTimeSpan = pSupportConceptTimeSpan;
@@ -846,12 +821,12 @@ namespace BeWoPlanerMobil.Models
 
         public override bool Equals(object obj)
         {
-            if (!(obj is SupportConceptListObject))
+            if (!(obj is CostBearer2SupportConceptRelListObject))
             {
                 return false;
             }
 
-            var obj2 = (SupportConceptListObject) obj;
+            var obj2 = (CostBearer2SupportConceptRelListObject) obj;
 
             return Equals(CostBearer2SupportConceptOid, obj2.CostBearer2SupportConceptOid);
         }

BeWoPlanerMobil/Models/ReportViewerModel.cs

@@ -6,8 +6,6 @@ using System.Web.Mvc;
 using BeWo.Report;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
-using DevExpress.XtraPrinting.Native;
-using DevExpress.XtraReports.UI;
 
 namespace BeWoPlanerMobil.Models
 {
@@ -80,11 +78,13 @@ namespace BeWoPlanerMobil.Models
                     return result;
                 }
 
-                result.Add(new SelectListItem { Text = "", Value = "0" });
+                result.Add(new SelectListItem { Text = "", Value = "0_0" });
 
                 foreach(var query in Queries)
                 {
-                    result.Add(new SelectListItem { Text = query.Title, Value = query.Oid.ToString() });
+                    var hasParameters = query.Parameter != null && query.Parameter.Count > 0;
+
+                    result.Add(new SelectListItem { Text = query.Title, Value = $"{query.Oid}_{(hasParameters ? "1" : "0")}" });
                 }
 
                 return result;
@@ -150,48 +150,35 @@ namespace BeWoPlanerMobil.Models
 
         public List<CompactEmployeeDC> SelectedEmployees { get; set; }
         public List<CompactTeamDC> SelectedTeams { get; set; }
+        public QueryDC SelectedQuery { get; set; }
 
 
+        public List<SupportConceptDC> SupportConcepts { get; set; }
 
-        public XtraReport Report { get; set; }
+        public CostBearer2SupportConceptRelListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
 
-        public double ReportRatio
+        public IEnumerable<CostBearer2SupportConceptRelListObject> CostBearer2SupportConceptRelListObjects
         {
             get
             {
-                if(Report is null)
+                var allCostBearerRelations = new List<CostBearer2SupportConceptRelListObject> { new CostBearer2SupportConceptRelListObject("Hilfeplan auswählen", "", "-1", false, false), new CostBearer2SupportConceptRelListObject("Ohne Hilfeplan", "", "-2", false, false) };
+                foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
                 {
-                    return 0d;
+                    allCostBearerRelations.AddRange(sc.CostBearerRelations.Select(
+                        cb => new CostBearer2SupportConceptRelListObject(
+                            $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
+                            $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}",
+                            cb.CostBearer2SupportConceptOid.ToString(),
+                            cb.SupportConcept.IsAboutToExpire,
+                            cb.SupportConcept.ExpiresIn3MonthOrLess))
+                    );
                 }
-
-                var width = 1f;
-                var height = 1f;
-                var ratio = 1d;
-
-                if(Report.Pages.Count == 0)
-                {
-                    return Math.Round(21d / 27d, 2);
-                }
-
-                foreach(PSPage page in Report.Pages)
-                {
-                    var size = page.Size;
-                    if(size.Width > width)
-                    {
-                        width = size.Width;
-                    }
-
-                    if(size.Height > height)
-                    {
-                        height = size.Height;
-                    }
-                }
-
-                ratio = width < height ? width / height : height / width;
-
-                return Math.Round(ratio, 2);
+                return allCostBearerRelations;
             }
         }
+
+        public SelectListItem SelectedMonthForBericht { get; set; }
+        public int? SelectedYearForBericht { get; set; }
     }
 
     public enum ReportType 

BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js

@@ -24,12 +24,6 @@ function checkJson(str) {
     return true;
 }
 
-function serviceDescriptionSelectOnReset(categorySelectId, leistungSelectId, textmoduleContainerId, treeId) {
-    setTimeout(function () {
-        loadServiceDescriptions(categorySelectId, leistungSelectId, textmoduleContainerId, treeId);
-    }, 100);
-}
-
 function showAlertMessage(message) {
     $("#form-alert").html(message);
     $("#form-alert").show();
@@ -316,29 +310,9 @@ function checkChildNodes(parentOid) {
     });
 }
 
-function getCheckedGoals() {
-    var rootElement = $("#goals-tree");
-    var checkboxes = rootElement.find("input");
 
-    var selectedGoals = "";
 
-    $.each(checkboxes, function(index, checkbox) {
-        var box = $(checkbox);
-        var id = box.attr("id");
 
-        if(box.prop("checked") === true && !id.includes("goal")) {
-            selectedGoals += id + ";";
-        }
-    });
-
-    return selectedGoals.substr(0, selectedGoals.length - 1);
-}
-
-function updateSelectedGoals() {
-    var selectedGoals = getCheckedGoals();
-
-    $.get(getUpdateGoalsUrl(), { pGoalOids: selectedGoals });
-}
 
 function validateDistanceInput() {
     checkNumberInput("distance");

BeWoPlanerMobil/Util/FormCollectionConstants.cs

@@ -76,5 +76,6 @@
         public static string HasWarningMessageKey => "HasWarningMessage";
         public static string ErrorMessageKey => "ErrorMessage";
         public static string DoLogoutKey => "DoLogout";
+        public static string ReportErrorMessageKey => "ReportErrorMessage";
     }
 }

BeWoPlanerMobil/Util/JsonCustomer.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using System.Web.Mvc;
-using BeWo.Data.Entities;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
@@ -58,12 +55,6 @@ namespace BeWoPlanerMobil.Util
 
         public Dictionary<string, string> ICD10Diagnosen { get; }
 
-        /*
-            var gueltigVon = Model.SelectedCustomer.AusweisGueltigVon?.ToString("dd.MM.yyyy");
-            var gueltigBis = Model.SelectedCustomer.AusweisGueltigBis?.ToString("dd.MM.yyyy");
-            var beiblattGueltigBis = Model.SelectedCustomer.BeiblattGueltigBis?.ToString("dd.MM.yyyy");
-         */
-
         public bool HasDiagnosen => ICD10Diagnosen?.Any() ?? false;
         public bool HasDisabilities { get; }
 
@@ -78,9 +69,17 @@ namespace BeWoPlanerMobil.Util
         public string SchwebiPflegegrad { get; }
         public string SchwebiAktenzeichen { get; }
         public bool HasSchwebi { get; }
+        public string Krankenkasse { get; }
+        public string Versichertennummer { get; }
+        public string Versichertenstatus { get; }
+
 
         public JsonCustomer(CustomerDC customer, List<BeWoFolderDC> folderTree, Dictionary<string, string> icd10Diagnosen)
         {
+            Krankenkasse = customer.HealthInsurance;
+            Versichertennummer = customer.InsuranceNumber;
+            Versichertenstatus = customer.VersichertenStatus;
+
             HasDisabilities = customer.Disabilities.Any();
             SchwebiIsUnlimited = customer.AusweisUnbefristetGueltig == true ? "JA" : "NEIN";
             SchwebiGradDerBehinderung = customer.GradDerBehinderung;
@@ -190,9 +189,6 @@ namespace BeWoPlanerMobil.Util
             {
                 Organisations.Add(new JsonOrganisation(organisation));
             }
-
-            // TODO: Dokumente anzeigen und herunterladbar machen
-            
         }
     }
 }

BeWoPlanerMobil/Util/MobileUtils.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
+using System.Web.Mvc;
 using BeWoPlanerMobil.Models;
 using BS.Shared;
 using BS.Shared.Core;
@@ -25,6 +26,23 @@ namespace BeWoPlanerMobil.Util
         public static string TempDataServiceRecordValidationKey => "ServiceRecordValidationResults";
         public static string TempDataFormIdKey => "form-id";
 
+        public static List<int> Years
+        {
+            get
+            {
+                var heuer = DateTime.Today.Year;
+
+                var result = new List<int>();
+
+                for(var i = heuer + 1; i >= heuer - 10; i--)
+                {
+                    result.AddIfNotIn(i);
+                }
+
+                return result;
+            }
+        }
+
         public static DateTime ConvertTimeStringToDateTime(string timeString)
         {
             var dt = DateTime.Now.Date;
@@ -367,12 +385,13 @@ namespace BeWoPlanerMobil.Util
         {
             var result = new BeWoLoginState(-1, null);
 
-            const string baseUrl = "https://support.bewoplaner.de/api";
-            const string resource = "getstate.php";
+#if DEBUG
+            return result;
+#endif
 
-            var client = new RestClient(baseUrl);
+            var client = new RestClient("https://support.bewoplaner.de/api");
 
-            var request = new RestRequest(resource, Method.GET);
+            var request = new RestRequest("getstate.php", Method.GET);
 
             request.AddParameter("k", tenant, ParameterType.QueryString);
             request.AddParameter("type", 1, ParameterType.QueryString);

BeWoPlanerMobil/Util/Umfeldsperson.cs

@@ -16,6 +16,7 @@ namespace BeWoPlanerMobil.Util
         public string Titel { get; set; }
         public string FormattedName => $"{Titel}{(!string.IsNullOrWhiteSpace(Titel) ? " " : "")}{Vorname} {Nachname}";
 
+        public string Notice { get; set; }
         public long? Customer2PersonOid { get; }
 
         public Umfeldsperson(CustomerPersonRelationDC umfeldspersonDC)
@@ -32,6 +33,7 @@ namespace BeWoPlanerMobil.Util
             EMail = person.Communication3 ?? string.Empty;
             Fax = person.Communication4 ?? string.Empty;
             Titel = person.Title ?? string.Empty;
+            Notice = umfeldspersonDC.Customer2PersonNotice;
         }
     }
 }

BeWoPlanerMobil/Views/Customer/Customer.cshtml

@@ -222,6 +222,42 @@
                                                     </div>
                                                 </div>
                                             </div>
+                                            <div class="row">
+                                                <div class="form-group w-100">
+                                                    <div class="input-group">
+                                                        <div class="input-group-prepend">
+                                                            <div class="input-group-text customer-prepend-text-eigenschaften">
+                                                                Krankenkasse
+                                                            </div>
+                                                        </div>
+                                                        <input @inputDisabled maxlength="45" type="text" class="form-control" id="krankenkasse" name="krankenkasse" value="@Model.SelectedJsonCustomer.Krankenkasse" />
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="form-group w-100">
+                                                    <div class="input-group">
+                                                        <div class="input-group-prepend">
+                                                            <div class="input-group-text customer-prepend-text-eigenschaften">
+                                                                Versichertennummer
+                                                            </div>
+                                                        </div>
+                                                        <input @inputDisabled maxlength="45" type="text" class="form-control" id="versichertennummer" name="versichertennummer" value="@Model.SelectedJsonCustomer.Versichertennummer" />
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="form-group w-100">
+                                                    <div class="input-group">
+                                                        <div class="input-group-prepend">
+                                                            <div class="input-group-text customer-prepend-text-eigenschaften">
+                                                                Versichertenstatus
+                                                            </div>
+                                                        </div>
+                                                        <input @inputDisabled maxlength="16" type="text" class="form-control" id="versichertenstatus" name="versichertenstatus" value="@Model.SelectedJsonCustomer.Versichertenstatus" />
+                                                    </div>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -411,8 +447,8 @@
                                         </div>
                                     </div>
                                 </div>
-
-                                <div class="col-sm-12 col-md-6 col-lg-12 my-3">
+                                
+                            <div class="col-sm-12 col-md-6 col-lg-12 my-3">
                                     <div class="card w-100 h-100">
                                         <div class="card-header">
                                             <div class="clearfix">
@@ -572,6 +608,14 @@
                                                             @umfeldPerson.Fax
                                                         </div>
                                                     </div>
+                                                    <div class="row mb-3">
+                                                        <div class="col text-secondary text-left">
+                                                            Notiz:
+                                                        </div>
+                                                        <div class="col-auto text-right">
+                                                            @umfeldPerson.Notice
+                                                        </div>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
@@ -1005,7 +1049,7 @@
 
 @* ----- Reports; Medikamentenlisten, Bargeldkassenreport, Zahlungsbelege ----- *@
 <div id="customer-report-popup-container">
-    @Html.Partial("CustomerReportPartial", Model)
+    @Html.Partial("BeWoReportPartial", Model)
 </div>
 
 

BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml

@@ -97,8 +97,7 @@
                 function () {
                     hideSpinner();
 
-                    //$("#customer-report-container").height($(window).height() * .8);
-                    $("#customer-report-popup").modal("show");
+                    $("#bewo-report-popup").modal("show");
                 }
             );
         } catch(error) {
@@ -311,8 +310,7 @@
                 function () {
                     hideSpinner();
 
-                    //$("#customer-report-container").height($(window).height() * .8);
-                    $("#customer-report-popup").modal("show");
+                    $("#bewo-report-popup").modal("show");
                 }
             );
         } catch(error) {

BeWoPlanerMobil/Views/Customer/CustomerMedListPartial.cshtml

@@ -32,8 +32,7 @@
                     medListOid: oid
                 },
                 function () {
-                    //$("#customer-report-container").height($(window).height() * .8);
-                    $("#customer-report-popup").modal("show");
+                    $("#bewo-report-popup").modal("show");
                     hideSpinner();
                 }
             );
@@ -72,7 +71,7 @@
                     reportType: selectedReportType
                 },
                 function () {
-                    $("#customer-report-popup").modal("show");
+                    $("#bewo-report-popup").modal("show");
                     hideSpinner();
                 });
         } catch(error) {

BeWoPlanerMobil/Views/Main/GoalRatingPopupContentPartial.cshtml

@@ -45,7 +45,14 @@
     <ul class="list-group">
         @foreach(var ratingType in Model.GoalRatingTypes)
         {
-            <li class="list-group-item" id="grt-@ratingType.RatingTypeOid" onclick="rateGoal(@ratingType.RatingTypeOid)">@ratingType.DisplayName</li>
+            <li class="list-group-item" style="cursor: pointer;">
+                <div class="form-check" style="cursor: pointer;">
+                    <input style="cursor: pointer;" class="form-check-input" type="radio" name="goal-rating-radios" id="grt-radio-@ratingType.RatingTypeOid" onclick="rateGoal(@ratingType.RatingTypeOid)"/>
+                    <label style="cursor: pointer;" class="form-check-label" for="grt-radio-@ratingType.RatingTypeOid">
+                        @ratingType.DisplayName
+                    </label>
+                </div>
+            </li>
         }
     </ul>
 }

BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml

@@ -25,52 +25,26 @@
         try {
             var text = $("#goal-search-input").val().toLowerCase();
 
-            if (text.length === 0 || !text.replace(/\s\g/, '').length) {
+            if(text.length === 0 || !text.replace(/\s\g/, '').length) {
                 resetGoalTreeSearch();
                 return;
             }
 
-            $(".goal-card").hide();
+            $(".goal-card, .goal-text").hide();
 
             var goalLabels = $(".goal-name-label");
 
-            $.each(goalLabels, function(index, item) {
-                var goalText = $.trim($(item).text());
+            $.each(goalLabels, function (index, item) {
+                var label = $(item);
 
-                var isLeaf = $(item).parent().prop("class").includes("goal-text");
-
-                if(goalText.toLowerCase().includes(text)) {
-                    $.each($($(item).parents(".goal-card")), function(cardIndex, card) {
-                        $(card).show();
-                        $(card).find(".collapse").collapse("show");
-                    });
-                } else if(isLeaf) {
-                    var parent1 = $($(item).parent());
-
-                    if(parent1 !== undefined && parent1 !== null) {
-                        var parent2 = $(parent1.parent());
-
-                        if(parent2 !== undefined && parent2 !== null) {
-                            var parent3 = $(parent2.parent());
-
-                            if (parent3 !== undefined && parent3 !== null && parent3.siblings().length > 0) {
-                                var cardHeader = $(parent3.siblings()[0]);
-
-                                if (cardHeader !== undefined && cardHeader !== null && cardHeader.children().length > 0) {
-                                    var clearFix = $(cardHeader.children()[0]);
-
-                                    if (clearFix !== undefined && clearFix !== null && clearFix.children().length > 0) {
-                                        var goalCardHeader = $(clearFix.children()[0]);
-
-                                        if(goalCardHeader !== undefined && goalCardHeader === null){
-                                            $(item).parent().hide();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                var goalText = $.trim(label.text());
+                
+                if (false === goalText.toLowerCase().includes(text)) {
+                    return;
                 }
+
+                var parents = label.parents(".goal-card, .goal-text");
+                parents.show();
             });
         } catch(error) {
             showErrorPopup(error);
@@ -93,10 +67,76 @@
             showErrorPopup(error);
         }
     }
+
+    function getCheckedGoals() {
+        try {
+            var rootElement = $("#goals-tree");
+            var checkboxes = rootElement.find("input");
+
+            var selectedGoals = "";
+
+            $.each(checkboxes, function(index, checkbox) {
+                var box = $(checkbox);
+                var id = box.attr("id").split("-")[2];
+
+                if(box.prop("checked") === true && !id.includes("goal")) {
+                    selectedGoals += id + ";";
+                }
+            });
+
+            return selectedGoals.substr(0, selectedGoals.length - 1);
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+
+    function updateSelectedGoals() {
+        try {
+            var selectedGoals = getCheckedGoals();
+
+            $.get("@Url.Action("UpdateGoals")", {pGoalOids: selectedGoals}, function (numberOfSelectedGoals) {
+                $("#goals-button").html(`Ziele <span class='badge badge-light text-primary'>${numberOfSelectedGoals}</span>`);
+            });
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+
+    function toggleAllGoalsSelection(element) {
+        try {
+            $('.goal-input').prop("checked", $(element).is(':checked'));
+            updateSelectedGoals();
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+
+    function showAllGoals() {
+        try {
+            $(".goal-collapse").collapse("show");
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+
+    function hideAllGoals() {
+        try {
+            $(".goal-collapse").collapse("hide");
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
 </script>
 
+@*
+    ToDo für Montag, 15.07.2024: Bis 30 Ziele/Maßnahmen standardmäßig alles ausklappen, ansonsten einklappen
+    ToDo: Alles/Nichts auswählen implementieren
+*@
+
 @helper BuildGoalTreeBranch(GoalTreeItem goalTreeItem)
 {
+    var collapseClass = Model.GoalTree.Count <= 30 ? "collapse show" : "collapse";
+
     var isChecked = Model.SelectedGoals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == goalTreeItem.ValueListEntryOid);
     var isCheckedValue = isChecked ? "checked" : string.Empty;
     
@@ -123,12 +163,12 @@
             <div class="card-header px-2" onclick="cardHeaderClick('#goal-chevron-@goalTreeItem.ValueListEntryOid', '#collapsable-goal-tree-branch-@goalTreeItem.ValueListEntryOid')">
                 <div class="clearfix">
                     <div class="custom-control custom-checkbox goal-card-header float-left" onclick="stopToggle(event)" >
-                        <input type="checkbox" class="custom-control-input" value="@goalTreeItem.ValueListEntryOid" @isCheckedValue id="@goalTreeItem.ValueListEntryOid" onchange="updateSelectedGoals()" />
-                        <label class="custom-control-label goal-name-label @textClass" for="@goalTreeItem.ValueListEntryOid">@goalTreeItem.Header</label>
-                        @if(AbstractModel.HasRightToRateGoals)
+                        <input type="checkbox" class="custom-control-input goal-input" value="@goalTreeItem.ValueListEntryOid" @isCheckedValue id="goal-cb-@goalTreeItem.ValueListEntryOid" onchange="updateSelectedGoals()" />
+                        <label class="custom-control-label goal-name-label @textClass" for="goal-cb-@goalTreeItem.ValueListEntryOid">@goalTreeItem.Header</label>
+                        @if(AbstractModel.HasRightToRateGoals && ratingType != null)
                         {
-                            <span id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
-                                @(ratingType?.DisplayName ?? goalTreeItem.RatingName)
+                            <span style="cursor: pointer;" id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
+                                @(ratingType.DisplayName ?? goalTreeItem.RatingName)
                             </span>
                         }
                     </div>
@@ -137,7 +177,7 @@
                     </div>
                 </div>
             </div>
-            <div class="collapse" id="collapsable-goal-tree-branch-@goalTreeItem.ValueListEntryOid">
+            <div class="@collapseClass goal-collapse" id="collapsable-goal-tree-branch-@goalTreeItem.ValueListEntryOid">
                 <div class="card-body p-1 goal-list">
                     @foreach(var child in goalTreeItem.Children.OrderBy(child => child.Header))
                     {
@@ -152,12 +192,12 @@
         var marginBottom = goalTreeItem.IsGoal ? "mb-3 mx-2" : "";
 
         <div class="custom-control custom-checkbox goal-text @marginBottom">
-            <input type="checkbox" class="custom-control-input" id="@goalTreeItem.ValueListEntryOid" @isCheckedValue onchange="updateSelectedGoals()">
-            <label for="@goalTreeItem.ValueListEntryOid" class="custom-control-label goal-name-label @textClass">@goalTreeItem.Header</label>
-            @if(AbstractModel.HasRightToRateGoals)
+            <input type="checkbox" class="custom-control-input goal-input" id="goal-cb-@goalTreeItem.ValueListEntryOid" @isCheckedValue onchange="updateSelectedGoals()">
+            <label for="goal-cb-@goalTreeItem.ValueListEntryOid" class="custom-control-label goal-name-label @textClass">@goalTreeItem.Header</label>
+            @if(AbstractModel.HasRightToRateGoals && ratingType != null)
             {
-                <span id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
-                    @(ratingType?.DisplayName ?? goalTreeItem.RatingName)
+                <span id="goal-rating-@goalTreeItem.ValueListEntryOid" style="cursor: pointer;" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
+                    @(ratingType.DisplayName ?? goalTreeItem.RatingName)
                 </span>
             }
         </div>

BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml

@@ -66,7 +66,9 @@
 {
     <div class="form-row">
         <div class="col-md">
-            <button type="button" class="btn btn-primary form-control my-3" data-toggle="modal" data-target="#goal-popup" id="goals-button">Ziele</button>
+            <button type="button" class="btn btn-primary form-control my-3" data-toggle="modal" data-target="#goal-popup" id="goals-button">
+                Ziele <span class="badge badge-light text-primary">@Model.SelectedGoals.Count</span>
+            </button>
         </div>
     </div>
     <div class="form-row">

BeWoPlanerMobil/Views/Main/Main.cshtml

@@ -110,74 +110,6 @@
         });
     }
 
-    function loadServiceDescriptions(categorySelectId, leistungSelectId, textmoduleContainerId, treeId) {
-        showSpinner();
-        var selectedCategoryOid = $(`#${categorySelectId}`).find(":selected").val();
-
-        if (selectedCategoryOid === null || selectedCategoryOid === undefined) {
-            hideSpinner();
-            return;
-        }
-
-        $.get("@Url.Action("LoadServiceCategories")", { pServiceCategoryOid: selectedCategoryOid })
-            .done(function (data) {
-                if(false === checkJson(data)) {
-                    logWarning("loadServiceDescriptions: Der zurückgegebene Wert ist kein gültiges JSON!");
-                    hideSpinner();
-                    return;
-                }
-
-                var serviceDescriptions = parseJason(data);
-                var serviceDescriptionsSelect = $(`#${leistungSelectId}`);
-
-                serviceDescriptionsSelect.empty();
-                serviceDescriptionsSelect.val("");
-
-                $.each(serviceDescriptions, function (index, serviceDescription) {
-                    serviceDescriptionsSelect.append(`<option value="${serviceDescription.ServiceDescriptionOid}">${serviceDescription.Name}</option>`);
-                });
-
-                var serviceDescriptionToEdit = 0;
-
-                if(@Model.SelectedServiceRecordsServiceDescriptionOid > 0) {
-                    serviceDescriptionToEdit = parseFloat("@Model.SelectedServiceRecordsServiceDescriptionOid");
-                } else if ("@Model.SelectedServiceDescriptionOid.HasValue.ToString().ToLower()" === "true") {
-                    serviceDescriptionToEdit = parseFloat("@Model.SelectedServiceDescriptionOid");
-                }
-
-                var selectedOid = 0;
-
-                if(serviceDescriptionToEdit > 0) {
-                    $(`#${leistungSelectId} > option`).each(function() {
-                        var val = $(this).val();
-
-                        if(serviceDescriptionToEdit == val) {
-                            serviceDescriptionsSelect.val(val);
-                            selectedOid = val;
-                        }
-                    });
-                } else {
-                    if(serviceDescriptions[0] !== undefined) {
-                        var servDescrOid = serviceDescriptions[0].ServiceDescriptionOid;
-                        logInfo(`ServiceDescriptionOid: ${servDescrOid}`);
-                        serviceDescriptionsSelect.val(servDescrOid);
-                        selectedOid = servDescrOid;
-                    }
-                }
-
-                if(selectedOid > 0) {
-                    $.get(getSetServiceDescriptionUrl(), { pServiceDescriptionOid: selectedOid }).done(function() {
-                        hideSpinner();
-                    });
-                }
-
-                $("#" + textmoduleContainerId).show();
-                $("#" + treeId).load('@Url.Action("LoadUpToDateTextModules")', null, function () {
-                    hideSpinner();
-                });
-            });
-    }
-
     $(function() {
         $("#start-date-picker").datetimepicker({
             locale: "de",
@@ -282,9 +214,9 @@
                 leistungSelectId = "mb-leistung-select";
             }*@
 
-            if("@Model.IsInGroupBookingMode".toLowerCase() === "false") {
+            @*if("@Model.IsInGroupBookingMode".toLowerCase() === "false") {
                 loadServiceDescriptions("category-select", "leistung-select", 'textmodule-container', 'tree');
-            }
+            }*@
             
 
             initializeTimeInputs();
@@ -491,10 +423,6 @@
         return "@Url.Action("SetServiceRecordEmployee")";
     }
 
-    function getLoadServiceCategoriesUrl() {
-        return "@Url.Action("LoadServiceCategories")";
-    }
-
     function getSetServiceDescriptionUrl() {
         return "@Url.Action("SetServiceDescription")";
     }
@@ -539,10 +467,6 @@
         return @Html.Raw(Json.Encode(Model.SelectedGoals.Select(s => s.ValueListEntryOid.Value).ToArray()));
     }
 
-    function getUpdateGoalsUrl() {
-        return "@Url.Action("UpdateGoals")";
-    }
-
     function getIsInEditingMode() {
         var boolString = "@Model.IsInEditingMode";
 
@@ -969,7 +893,7 @@
 
 @*----- Ziele/Maßnahmen-Popup ----- *@
 <div class="modal" tabindex="-1" role="dialog" id="goal-popup">
-    <div class="modal-dialog modal-dialog-scrollable" role="document">
+    <div class="modal-dialog modal-dialog-scrollable h-100" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h6 class="modal-title">Ziele und Ma&szlig;nahmen</h6>
@@ -993,7 +917,21 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Schlie&szlig;en</button>
+                <div class="clearfix w-100">
+                    <div class="custom-control custom-checkbox float-left mr-3">
+                        <input type="checkbox" class="custom-control-input" id="checkAllGoalsButton" onchange="toggleAllGoalsSelection(this)" />
+                        <label for="checkAllGoalsButton" class="custom-control-label">
+                            Alle Ziele
+                        </label>
+                    </div>
+                    <button type="button" class="btn btn-primary float-left mr-2" onclick="showAllGoals()">
+                        Alle auf
+                    </button>
+                    <button type="button" class="btn btn-primary float-left" onclick="hideAllGoals()">
+                        Alle zu
+                    </button>
+                    <button type="button" class="btn btn-primary float-right" data-dismiss="modal">Schlie&szlig;en</button>
+                </div>
             </div>
         </div>
     </div>

BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml

@@ -62,7 +62,7 @@
 
 @if(!(Model is null))
 {
-    using(Html.BeginForm("CreateMultiBooking", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset('mb-category-select', 'mb-leistung-select', 'textmodule-container', 'tree')", id = "multiBookingForm" }))
+    using(Html.BeginForm("CreateMultiBooking", "Main", FormMethod.Post, new { id = "multiBookingForm" }))
     {
         var startDate = Model.SelectedServiceRecord?.Start?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
         var endDate = Model.SelectedServiceRecord?.End?.ToShortDateString() ?? DateTime.Today.ToShortDateString();

BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml

@@ -204,15 +204,15 @@
                                 }
 
 #if DEBUG
-                if(goal.RatingTypeOid.HasValue)
-                {
-                    var goalRating = Model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value));
+                                if(goal.RatingTypeOid.HasValue)
+                                {
+                                    var goalRating = Model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value));
 
-                    if(goalRating?.DisplayName != null && goalRating.DisplayName.Length > 0)
-                    {
-                        massnahmenString += $"<strong style='color: blue;'>({goalRating.DisplayName})</strong>";
-                    }
-                }
+                                    if(goalRating?.DisplayName != null && goalRating.DisplayName.Length > 0)
+                                    {
+                                        massnahmenString += $" <strong style='color: blue;'>({goalRating.DisplayName})</strong>";
+                                    }
+                                }
 #endif
 
                                 if(serviceRecord.Goals.IndexOf(goal) < serviceRecord.Goals.Count - 1)
@@ -223,10 +223,42 @@
 
                             if(serviceRecord.ServiceRecordOid.HasValue && Model.ServiceRecordOids2GoalHeader.ContainsKey(serviceRecord.ServiceRecordOid.Value))
                             {
-                                foreach(var goalHeader in Model.ServiceRecordOids2GoalHeader[serviceRecord.ServiceRecordOid.Value])
+                                var ziele = serviceRecord.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList();
+
+                                foreach(var ziel in ziele)
                                 {
-                                    zieleString += $"{goalHeader}, ";
+                                    if(ziel.Abbreviation != null && ziel.TypeDescription != null)
+                                    {
+                                        zieleString += $"{ziel.Abbreviation}: {ziel.TypeDescription} ";
+                                    }
+                                    else if(ziel.Abbreviation is null && ziel.TypeDescription != null)
+                                    {
+                                        zieleString += ziel.TypeDescription;
+                                    }
+                                    else if(ziel.Abbreviation != null && ziel.TypeDescription is null)
+                                    {
+                                        zieleString += ziel.Abbreviation;
+                                    }
+
+#if DEBUG
+                                    if(ziel.RatingTypeOid.HasValue)
+                                    {
+                                        var zielbewertung = Model.GoalRatingTypes.FirstOrDefault(goalRatingType => goalRatingType.RatingTypeOid.HasValue && goalRatingType.RatingTypeOid.Equals(ziel.RatingTypeOid.Value));
+
+                                        if(zielbewertung?.DisplayName != null && zielbewertung.DisplayName.Length > 0)
+                                        {
+                                            zieleString += $" <strong style='color: blue;'>({zielbewertung.DisplayName})</strong>";
+                                        }
+                                    }
+#endif
+
+                                    zieleString += ", ";
                                 }
+
+                                //foreach(var goalHeader in Model.ServiceRecordOids2GoalHeader[serviceRecord.ServiceRecordOid.Value])
+                                //{
+                                //    zieleString += $"{goalHeader}, ";
+                                //}
                             }
 
                             zieleString = zieleString.TrimEnd(' ').TrimEnd(',');
@@ -328,14 +360,18 @@
                             }
                             @if(serviceRecord.Goals != null && serviceRecord.Goals.Count > 0)
                             {
-                                <div class="row">
-                                    <div class="col text-secondary">
-                                        Ziele:
+                                if(!string.IsNullOrEmpty(zieleString))
+                                {
+                                    <div class="row">
+                                        <div class="col text-secondary">
+                                            Ziele:
+                                        </div>
+                                        <div class="col">
+                                            @(new HtmlString(zieleString))
+                                        </div>
                                     </div>
-                                    <div class="col">
-                                        @zieleString
-                                    </div>
-                                </div>
+                                }
+                                
                                 if(serviceRecord.Goals.Any(goal => goal.Type == ValueListEntryType.SupportConceptGoalType || goal.Type == ValueListEntryType.SupportConceptIndividualGoalType))
                                 {
                                     <div class="row">

BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml

@@ -88,7 +88,7 @@
         {
             using(Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new { Id = "selectSupportConceptForm", onreset = "resetSingleBookingForm()" }))
             {
-                var selectedSuportConceptTimeSpanColorClass = Model.SelectedSupportConceptListObject.IsAboutToExpire ? "text-bewo-is-about-to-expire" : Model.SelectedSupportConceptListObject.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
+                var selectedSuportConceptTimeSpanColorClass = Model.SelectedCostBearer2SupportConceptRelListObject.IsAboutToExpire ? "text-bewo-is-about-to-expire" : Model.SelectedCostBearer2SupportConceptRelListObject.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
                 <div>
                     <div class="container p-0">
                         <div class="row">
@@ -96,10 +96,10 @@
                                 <div class="list-group">
                                     <a href="#" class="list-group-item flex-column align-items-start no-underline" data-toggle="modal" data-target="#supportConceptList">
                                         <div class="d-flex">
-                                            <h5 class="mb-1 text-dark text-left" id="selectedSupportConceptCustomerInfo">@Model.SelectedSupportConceptListObject.NameAndDateOfBirth</h5>
+                                            <h5 class="mb-1 text-dark text-left" id="selectedSupportConceptCustomerInfo">@Model.SelectedCostBearer2SupportConceptRelListObject.NameAndDateOfBirth</h5>
                                         </div>
                                         <p class="mb-1 text-left @selectedSuportConceptTimeSpanColorClass" id="selectedSupportConceptInfo">
-                                            @Model.SelectedSupportConceptListObject.SupportConceptTimeSpan
+                                            @Model.SelectedCostBearer2SupportConceptRelListObject.SupportConceptTimeSpan
                                         </p>
                                     </a>
                                 </div>
@@ -118,7 +118,7 @@
                 </div>
                 <!-- Hilfeplanauswahlpopup  modal-dialog-centered-->
                 <div class="modal" role="dialog" tabindex="-1" id="supportConceptList">
-                    <div class="modal-dialog text-center" role="document">
+                    <div class="modal-dialog text-center modal-dialog-scrollable" role="document">
                         <div class="modal-content">
                             <div class="modal-header">
                                 <h5 class="modal-title">Hilfeplanauswahl</h5>
@@ -163,7 +163,7 @@
                 </div>
                 <!-- /Hilfeplanauswahlpopup -->
 
-                <input type="text" class="d-none" name="CostBearer2SupportConceptOid" id="CostBearer2SupportConceptOid" value="@Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid">
+                <input type="text" class="d-none" name="CostBearer2SupportConceptOid" id="CostBearer2SupportConceptOid" value="@Model.SelectedCostBearer2SupportConceptRelListObject.CostBearer2SupportConceptOid">
             }
 
             if(Model.IsCustomerAbsence)
@@ -177,7 +177,7 @@
                 </div>
             }
 
-            using(Html.BeginForm("CreateOrUpdateServiceRecord", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset('category-select', 'leistung-select', 'textmodule-container', 'tree')", id = "singleBookingForm" }))
+            using(Html.BeginForm("CreateOrUpdateServiceRecord", "Main", FormMethod.Post, new { id = "singleBookingForm" }))
             {
                 <div class="mt-3">
                     @* ----- Einzelbuchung: Mitarbeiter ----- *@
@@ -198,7 +198,9 @@
                         <!-- Einzelbuchung: Ziele -->
                         <div class="form-row">
                             <div class="col-md">
-                                <button type="button" class="btn btn-primary form-control my-3" data-toggle="modal" data-target="#goal-popup" id="goals-button">Ziele</button>
+                                <button type="button" class="btn btn-primary form-control my-3" data-toggle="modal" data-target="#goal-popup" id="goals-button">
+                                    Ziele <span class="badge badge-light text-primary">@Model.SelectedGoals.Count</span>
+                                </button>
                             </div>
                         </div>
                         <div class="form-row">
@@ -208,39 +210,10 @@
                         </div>
 
                     }
-
-                    @* ----- Einzelbuchung: Leistungskategorie ----- *@
-                    <div class="form-row">
-                        <div class="col-md">
-                            <div class="form-group my-2">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <div class="input-group-text prepend-input-group-text">
-                                            Kategorie
-                                        </div>
-                                    </div>
-                                    @Html.DropDownListFor(m => m.SelectedServiceCategoryOid, Model.ServiceCategoryListItems, new { onchange = "loadServiceDescriptions('category-select', 'leistung-select', 'textmodule-container', 'tree')", @class = "custom-select", Id = "category-select" })
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
-
-                    @* ----- Einzelbuchung: Leistung ----- *@
-                    <div class="form-row">
-                        <div class="col-md">
-                            <div class="form-group my-2">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <div class="input-group-text prepend-input-group-text">
-                                            Leistung
-                                        </div>
-                                    </div>
-                                    <select class="custom-select" id="leistung-select" name="ServiceDescription" onchange="setServiceDescription('leistung-select')">
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
+                    
+                    @* ----- Einzelbuchung: Kategorie & Leistung ----- *@
+                    <div id="category-to-description-container">
+                        @Html.Partial("Category2ServiceDescriptionPartial", Model)
                     </div>
 
                     @* ----- Marker ----- *@

BeWoPlanerMobil/Views/ReportViewer/BerichteFormPartialView.cshtml

@@ -0,0 +1,209 @@
+@using BeWoPlanerMobil.Util
+@using BS.Shared
+@model BeWoPlanerMobil.Models.ReportViewerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
+@*
+    Formular-Inputs:
+
+    1. SupportConcept wie in SingleBookingFormPartial.cshtml
+    2. Employee
+    3. Customer
+    4. Team
+    5. Organisation
+    6. Month
+    7. Year (DateTime.Now.Year - 10 bis DateTime.Now.Year + 1)
+    8. Date
+    9. DateRange (Start & Ende)
+    10. ValueListEntry, z.B. Betreuungsart_8 -> Name: Betreuungsart, ValueListEntryType: 8
+    11. ServiceCategory
+    12. Custom
+    13. Text
+
+
+
+
+    // ToDo: Beim Auswählen eines Hilfeplans etc. berichte-form-container neu laden!
+*@
+
+<script type="text/javascript">
+    function selectCostBearer2SupportConceptRel(relOid) {
+        try {
+            $("#berichte-form-container").load("@Url.Action("SelectCostBearer2SupportConceptRel")", {relOid: relOid});
+        } catch (error) {
+            showErrorPopup(error);
+        }
+    }
+
+    function selectMonth() {
+        try {
+            var selectedMonth = $("#month-select").find(":selected").val();
+
+            $("#berichte-form-container").load("@Url.Action("SelectMonth")", {selectedMonth: selectedMonth});
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+
+    function selectYear() {
+        try {
+            var selectedYear = $("#year-select").find(":selected").val();
+
+            $("#berichte-form-container").load("@Url.Action("SelectYear")", {selectedYear: selectedYear});
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+</script>
+
+@if(Model.SelectedQuery != null && Model.SelectedQuery.Parameter != null && Model.SelectedQuery.Parameter.Count > 0)
+{
+<div class="mt-3">
+    @foreach(var parameter in Model.SelectedQuery.Parameter)
+    {
+        switch(parameter.ParamType)
+        {
+            case QueryParameterType.SupportConcept:
+                var selectedSuportConceptTimeSpanColorClass = Model.SelectedCostBearer2SupportConceptRelListObject.IsAboutToExpire ? "text-bewo-is-about-to-expire" : Model.SelectedCostBearer2SupportConceptRelListObject.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
+                <div class="form-row">
+                    <div>
+                        <div class="container p-0">
+                            <div class="row">
+                                <div class="col mt-3">
+                                    <div class="list-group">
+                                        <a href="#" class="list-group-item flex-column align-items-start no-underline" data-toggle="modal" data-target="#supportConceptList">
+                                            <div class="d-flex">
+                                                <h5 class="mb-1 text-dark text-left" id="selectedSupportConceptCustomerInfo">@Model.SelectedCostBearer2SupportConceptRelListObject.NameAndDateOfBirth</h5>
+                                            </div>
+                                            <p class="mb-1 text-left @selectedSuportConceptTimeSpanColorClass" id="selectedSupportConceptInfo">
+                                                @Model.SelectedCostBearer2SupportConceptRelListObject.SupportConceptTimeSpan
+                                            </p>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal" role="dialog" tabindex="-1" id="supportConceptList">
+                    <div class="modal-dialog text-center modal-dialog-scrollable" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h5 class="modal-title">Hilfeplanauswahl</h5>
+                                <button type="button" class="close" data-dismiss="modal" onclick="resetSupportConceptSearch()">
+                                    <span>&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <!-- Hilfeplansuche -->
+                                <div class="input-group mb-3">
+                                    <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="supportConceptSearchOnChange()" id="support-concept-search-input" />
+                                    <div class="input-group-append">
+                                        <button class="btn btn-outline-secondary" type="button" onclick="resetSupportConceptSearch()">
+                                            <span class="fas fa-times-circle"></span>
+                                        </button>
+                                    </div>
+                                </div>
+
+                                <hr />
+
+                                <!-- Hilfeplanliste -->
+                                <div class="list-group">
+                                    @foreach(var supportConceptListObject in Model.CostBearer2SupportConceptRelListObjects)
+                                    {
+                                        var timeSpanColorClass = supportConceptListObject.IsAboutToExpire ? "text-bewo-is-about-to-expire" : supportConceptListObject.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
+
+                                        <a href="#" class="list-group-item flex-column align-items-start no-underline blubb-test" onclick="selectCostBearer2SupportConceptRel(@supportConceptListObject.CostBearer2SupportConceptOid)" data-dismiss="modal">
+                                            <div class="justify-content-between">
+                                                <h5 class="mb-1 text-dark text-left supportconcept-name-header">
+                                                    @supportConceptListObject.NameAndDateOfBirth
+                                                </h5>
+                                            </div>
+                                            <p class="mb-1 text-left @timeSpanColorClass">
+                                                @supportConceptListObject.SupportConceptTimeSpan
+                                            </p>
+                                        </a>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                break;
+            case QueryParameterType.Employee:
+                break;
+            case QueryParameterType.Customer:
+                break;
+            case QueryParameterType.Month:
+                <div class="form-row">
+                    <div class="col-md">
+                        <div class="form-group my-2">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <div class="input-group-text prepend-input-group-text">
+                                        Monat
+                                    </div>
+                                </div>
+                                <select class="custom-select" id="month-select" onchange="selectMonth()">
+                                    @foreach(var month in Model.Months)
+                                    {
+                                        var selected = Model.SelectedMonthForBericht != null && month.Equals(Model.SelectedMonthForBericht) ? " selected" : string.Empty;
+
+                                        <option value="@month.Value"@selected>@month.Text</option>
+                                    }
+                                </select>
+                                <select class="custom-select" id="year-select" onchange="selectYear()">
+                                    @foreach(var year in MobileUtils.Years)
+                                    {
+                                        var selected = Model.SelectedYearForBericht.HasValue && year.Equals(Model.SelectedYearForBericht.Value) ? " selected" : string.Empty;
+
+                                        <option value="@MobileUtils.Years.IndexOf(year)"@selected>@year</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                break;
+            case QueryParameterType.Date:
+                break;
+            case QueryParameterType.DateRange:
+                break;
+            case QueryParameterType.Team:
+                break;
+            case QueryParameterType.CostCenter:
+                break;
+            case QueryParameterType.ServiceCategory:
+                break;
+            case QueryParameterType.ServiceDescription:
+                break;
+            case QueryParameterType.Text:
+                break;
+            case QueryParameterType.Year:
+                break;
+            case QueryParameterType.CurrentUser:
+                break;
+            case QueryParameterType.CurrentEmployee:
+                break;
+            case QueryParameterType.ValueListEntryType:
+                break;
+            case QueryParameterType.Organisation:
+                break;
+            case QueryParameterType.Custom:
+                break;
+        }
+    }
+</div>
+}
+

BeWoPlanerMobil/Views/ReportViewer/DocumentWebViewerPartial.cshtml

@@ -1,38 +0,0 @@
-
-@using BeWoPlanerMobil.Util
-@model BeWoPlanerMobil.Models.ReportViewerModel
-
-@{
-    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
-    {
-        <text>
-            <script type="text/javascript">
-                $("#second-logout-form").submit();
-            </script>
-        </text>
-    }
-}
-
-<script type="text/javascript">
-    function initEvent(s, e) {
-        var viewer = $("#webDocumentViewer1");
-
-        var newHeight = parseFloat('@Model.ReportRatio.ToString().Replace(',', '.')') * parseFloat(viewer.width().toString());
-
-        logInfo3(viewer.width() + " x " + newHeight);
-
-        $("#webDocumentViewer1").height(newHeight);
-    }
-</script>
-
-<div class="mt-3">
-    @Html.DevExpress().WebDocumentViewer(settings =>
-    {
-        settings.MobileMode = true;
-        settings.Name = "webDocumentViewer1";
-        settings.SettingsMobile.ReaderMode = true;
-        settings.Width = Unit.Percentage(100);
-        settings.ClientSideEvents.Init = "initEvent";
-
-    }).Bind(Model.Report).GetHtml()
-</div>

BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml

@@ -28,21 +28,6 @@
         }
     }
 
-    // ToDo: Nicht hier laden, sondern nur, wenn keine weiteren Variablen benötigt werden!
-    function loadCustomReport() {
-        try {
-            var selectedReportOid = $("#msk-customReportSelect").val();
-
-            showSpinner();
-            $("#msk-report-container").load("@Url.Action("LoadCustomReport")", { reportOid: selectedReportOid }, function () {
-                toggleMitarbeiterstundenForm();
-                hideSpinner();
-            });
-        } catch (error) {
-            showErrorPopup(error);
-        }
-    }
-
     function updateForm() {
         try {
             var selectedReportType = $("#msk-report-type-select").val();
@@ -57,6 +42,14 @@
             showErrorPopup(error);
         }
     }
+
+    function closeReport() {
+        try {
+            $.get("@Url.Action("ResetReport")");
+        } catch (error) {
+            showErrorPopup(error);
+        }
+    }
 </script>
 
 <div class="container-fluid my-3">
@@ -74,11 +67,9 @@
                 </div>
             </div>
         </div>
-        <div class="col-sm-12 col-md-8 col-lg-8 col-xl-9" id="msk-report-container">
-            @if(!(Model.Report is null))
-            {
-                @Html.Partial("DocumentWebViewerPartial", Model)
-            }
-        </div>
     </div>
+</div>
+
+<div id="msk-report-container">
+    @Html.Partial("BeWoReportPartial", Model)
 </div>

BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml

@@ -111,24 +111,67 @@
                 }
             }
 
-            parameterString += ";" + ansicht;
+            parameterString += `;${ansicht}`;
 
             showSpinner();
             $("#msk-report-container").load("@Url.Action("LoadMitarbeiterstundenkonto")", { parameters: parameterString }, function() {
                 hideSpinner();
+                $("#bewo-report-popup").modal("show");
             });
         } catch (error) {
             showErrorPopup(error);
         }
     }
+
+    function loadCustomReport() {
+        try {
+            var selectedReportOid2HasParameters = $("#msk-customReportSelect").val();
+
+            if(selectedReportOid2HasParameters === undefined || selectedReportOid2HasParameters === null || selectedReportOid2HasParameters.includes("_") === false) {
+                return;
+            }
+
+            var oid2HasParams = selectedReportOid2HasParameters.split("_");
+
+            var hasParameters = oid2HasParams[1] === "1";
+
+            var selectedReportOid = oid2HasParams[0];
+
+            if(hasParameters) {
+                $("#berichte-form-container").load("@Url.Action("LoadBerichteForm")", {reportOid: selectedReportOid}, function() {
+                    hideSpinner();
+                    toggleMitarbeiterstundenForm();
+                    $("#berichte-form-container").show();
+                });
+            } else {
+                showSpinner();
+                $("#berichte-form-container").empty();
+                $("#berichte-form-container").hide();
+                $("#msk-report-container").load("@Url.Action("LoadCustomReport")", {reportOid: selectedReportOid}, function () {
+                    hideSpinner();
+                    toggleMitarbeiterstundenForm();
+                    $("#bewo-report-popup").modal("show");
+                });
+            }
+
+            
+        } catch (error) {
+            showErrorPopup(error);
+        }
+    }
+
 </script>
 
 
-@*ToDo: Bis auf weiteres nur Mitarbeiterstundenkonto anzeigen!*@
-@*@if(Model.SelectedReportType == ReportType.Berichte)
-    {
-        @Html.DropDownListFor(model => model.SelectedCustomReport, Model.CustomReports, new { @class = "custom-select", id = "msk-customReportSelect", onchange = "loadCustomReport()" })
-    }*@
+@if(Model.SelectedReportType == ReportType.Berichte)
+{
+    @Html.DropDownListFor(model => model.SelectedCustomReport, Model.CustomReports, new { @class = "custom-select", id = "msk-customReportSelect", onchange = "loadCustomReport()" })
+
+    <div id="berichte-form-container" style="display: none;">
+        @Html.Partial("BerichteFormPartialView", Model)
+    </div>
+    
+}
 
 @if(Model.SelectedReportType == ReportType.Mitarbeiterstundenkonto && AbstractModel.HasRightToViewMitarbeiterstundenkonto)
 {

BeWoPlanerMobil/Views/Shared/BeWoReportPartial.cshtml

@@ -1,7 +1,8 @@
-@model BeWoPlanerMobil.Models.CustomerModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.AbstractModel
 
 <script type="text/javascript">
-    function customerReportViewerInit(s, e) {
+    function bewoReportViewerInit(s, e) {
         try {
             s.UpdateLocalization({
                 'Page': 'Seite',
@@ -12,12 +13,16 @@
         }
     }
 
-    $(document).on("shown.bs.modal", "#customer-report-popup", function() {
-        customerReportViewer.AdjustControl();
+    $(document).on("shown.bs.modal", "#bewo-report-popup", function () {
+        if(bewoReportViewer === undefined) {
+            return;
+        }
+
+        bewoReportViewer.AdjustControl();
     });
 </script>
 
-<div class="modal" data-backdrop="static" tabindex="-1" role="dialog" id="customer-report-popup">
+<div class="modal" data-backdrop="static" tabindex="-1" role="dialog" id="bewo-report-popup">
     <div class="modal-dialog modal-xl modal-dialog-scrollable" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -26,17 +31,23 @@
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body" id="customer-report-container" style="height: 90vh !important;">
-                @if(Model?.Report != null)
+            <div class="modal-body" style="height: 90vh !important;">
+                @if(TempData[TempDataConstants.ReportErrorMessageKey] is string reportErrorMessage)
+                {
+                <div class="alert alert-danger" role="alert">
+                    @(new HtmlString(reportErrorMessage))
+                </div>
+                }
+                else if(Model?.Report != null)
                 {
                     @Html.DevExpress().WebDocumentViewer(settings =>
                     {
-                        settings.Name = "customerReportViewer";
+                        settings.Name = "bewoReportViewer";
                         settings.Width = Unit.Percentage(100);
                         settings.Height = Unit.Percentage(100);
                         settings.MobileMode = true;
                         settings.SettingsMobile.ReaderMode = true;
-                        settings.ClientSideEvents.Init = "customerReportViewerInit";
+                        settings.ClientSideEvents.Init = "bewoReportViewerInit";
                     }).Bind(Model.Report).GetHtml()
                 }
             </div>

BeWoPlanerMobil/Views/Shared/_Layout.cshtml

@@ -551,14 +551,25 @@
     </div>
 
 
-    @if(!(TempData[TempDataConstants.ErrorMessageKey] is null))
+    @if(TempData[TempDataConstants.ErrorMessageKey] != null)
     {
-        <div class="container-fluid mt-3">
+        <script type="text/javascript">
+            function clearErrorLog() {
+                try {
+                    $("#error-message-alert").html("");
+                    $("#error-alert-container").hide();
+                } catch (error) {
+                    showErrorPopup(error);
+                }
+            }
+        </script>
+        <div class="container-fluid mt-3" id="error-alert-container">
             <div class="row d-flex justify-content-center">
                 <div class="col-md-3 col-lg-4">
-                    <div class="alert alert-danger" role="alert">
+                    <div class="alert alert-danger" id="error-message-alert" role="alert">
                         @TempData[TempDataConstants.ErrorMessageKey]
                     </div>
+                    <button type="button" class="btn btn-primary" onclick="clearErrorLog()">Error Log leeren</button>
                 </div>
             </div>
         </div>

Report/DefaultReports/KassenbelegReport.Designer.cs

@@ -30,6 +30,7 @@
 		{
             this.components = new System.ComponentModel.Container();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -47,7 +48,6 @@
             this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
             this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -74,6 +74,15 @@
             this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
+            // xrPictureBox2
+            // 
+            this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "SignatureImage")});
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(407.5867F, 252F);
+            this.xrPictureBox2.Name = "xrPictureBox2";
+            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(241.4133F, 35.50003F);
+            this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // xrLabel2
             // 
             this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.2917F);
@@ -219,7 +228,8 @@
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Titel")});
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -229,14 +239,12 @@
             // 
             // TopMargin
             // 
-            this.TopMargin.HeightF = 100F;
             this.TopMargin.Name = "TopMargin";
             this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
             // BottomMargin
             // 
-            this.BottomMargin.HeightF = 100F;
             this.BottomMargin.Name = "BottomMargin";
             this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -245,15 +253,6 @@
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.KassenbelegRO);
             // 
-            // xrPictureBox2
-            // 
-            this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Image", null, "SignatureImage")});
-            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(407.5867F, 252F);
-            this.xrPictureBox2.Name = "xrPictureBox2";
-            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(241.4133F, 35.50003F);
-            this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
             // KassenbelegReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -261,8 +260,13 @@
             this.TopMargin,
             this.BottomMargin});
             this.DataSource = this.bindingSource1;
-            this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.Version = "17.1";
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.Margins = new DevExpress.Drawing.DXMargins(100F, 77F, 100F, 100F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 

Report/DefaultReports/KassenbelegReport.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

Report/DefaultReports/KassenbuchReport.Designer.cs

@@ -35,6 +35,7 @@
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -51,10 +52,9 @@
             this.Einzahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -71,7 +71,8 @@
             // 
             // xrTable1
             // 
-            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -133,6 +134,17 @@
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             this.xrTableCell2.Weight = 0.46153846740722654D;
             // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseBorders = false;
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Belegnummer";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell11.Weight = 0.46153844686654888D;
+            // 
             // xrTableCell7
             // 
             this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
@@ -185,7 +197,8 @@
             // 
             // xrLabel1
             // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 71.41666F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -305,6 +318,18 @@
             this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
             this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
             // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Belegnummer")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 3, 2, 100F);
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell12.Weight = 0.46153848207913922D;
+            // 
             // xrTableCell8
             // 
             this.xrTableCell8.Multiline = true;
@@ -331,29 +356,6 @@
             this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell6.Weight = 0.46153843806340167D;
             // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.StylePriority.UseBorders = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "Belegnummer";
-            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell11.Weight = 0.46153844686654888D;
-            // 
-            // xrTableCell12
-            // 
-            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Belegnummer")});
-            this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 3, 2, 100F);
-            this.xrTableCell12.StylePriority.UsePadding = false;
-            this.xrTableCell12.StylePriority.UseTextAlignment = false;
-            this.xrTableCell12.Text = "xrTableCell12";
-            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell12.Weight = 0.46153848207913922D;
-            // 
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -374,12 +376,16 @@
             this.BottomMargin,
             this.DetailReport});
             this.DataSource = this.bindingSource1;
-            this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.Einzahlungstextsichtbarkeitsformatierungsregel,
             this.Auszahlungstextsichtbarkeitsformatierungsregel});
-            this.Margins = new DevExpress.Drawing.DXMargins(75, 75, 157, 74);
-            this.Version = "17.1";
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 51F, 156.6667F, 74F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();

Report/DefaultReports/KassenbuchReport.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

ReportImp/BetreuWoReports/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -48,7 +48,7 @@ namespace BetreuWoReports
 	            dd.NightStart = 22;
 	            dd.NightEnd = 6;
             }
-	        return dd;
+            return dd;
 	    }
 
         public override void CalculateAbsenceTimesForDay(MitarbeiterstundenkontoRO.DayDetail dd,

ReportImp/BetreuwoWesel/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -50,6 +50,10 @@ namespace BetreuWoWesel
 	            dd.NightStart = 22;
 	            dd.NightEnd = 6;
 	        }
+            if (date >= new DateTime(2024, 07, 01))
+            {
+                dd.NightStart = 21;
+            }
 
             return dd;
 	    }

ReportImp/CaritasverbandDuerenJuelichEV/CaritasverbandDuerenJuelichEV.csproj

@@ -58,6 +58,17 @@
     <Compile Include="Export\CustomDataExporter.cs" />
     <Compile Include="Export\DiamantExporter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Data\Data.csproj">
@@ -77,5 +88,16 @@
       <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ReportImp/CaritasverbandDuerenJuelichEV/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace KundeXyz.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("KundeXyz.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

ReportImp/CaritasverbandDuerenJuelichEV/Properties/Resources.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ReportImp/CaritasverbandDuerenJuelichEV/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/CaritasverbandDuerenJuelichEV/ServiceInvoiceReport.cs

@@ -0,0 +1,29 @@
+using System;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace CaritasverbandDuerenJuelichEV
+{
+    public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
+    {
+        public ServiceInvoiceReport()
+        {
+            this.InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServiceInvoiceRO pRO)
+        {
+			DateTime start = pRO.AccountingPeriodStart;
+			DateTime end = pRO.AccountingPeriodEnd;
+            lblRechnungsnummer.Text = pRO.InvoiceNumber;
+
+            lblBewZeitraum.Text = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}", pRO.InvoiceBase.SupportConceptCostBearerRelDc.StartDate, pRO.InvoiceBase.SupportConceptCostBearerRelDc.EndDate);
+
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}

ReportImp/CaritasverbandDuerenJuelichEV/ServiceInvoiceReport.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ReportImp/CaritasverbandKelheim/Service/CustomSaveInterceptor.cs

@@ -13,7 +13,7 @@ namespace CaritasverbandKelheim.Service
         public override void BeforeSaveServiceRecord(ServiceRecord sr)
         {
             // Vor 7 Minuten soll abgerundet, danach 15 aufgerundet werden, wenn bei KT 15 Min eingestellt ist und es Bezirk Niederbayern ist
-            if (sr.CostBearer2SupportConcept.CostBearer.Organisation.Name.ToLower().Contains("bezirk niederbayern") && sr.Start.HasValue && sr.End.HasValue)
+            if (sr.CostBearer2SupportConcept != null && sr.CostBearer2SupportConcept.CostBearer.Organisation.Name.ToLower().Contains("bezirk niederbayern") && sr.Start.HasValue && sr.End.HasValue)
             {
                 if (sr.DurationMinutes <= 7)
                 {

ReportImp/DomizielAnsbach/CustomReportCreator.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
+using System.Linq;
+using BeWo.Data;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
@@ -340,6 +342,118 @@ namespace DomizielAnsbach
             return new XtraReport();
         }
 
+        private List<ServicesOverviewRO> Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, int endDay, long? serviceCategoryOid = null)
+        {
+            var roList = new List<ServicesOverviewRO>();
+
+            List<long> customerOids = new List<long>();
+
+            ApplicationUser loggedInUser = null;
+
+            if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+            {
+                loggedInUser = LoggedInUserOperationContextExt.Current.User;
+            }
+            else
+            {
+                loggedInUser = SessionFacade.LoggedInUser;
+            }
+
+            if (loggedInUser != null && loggedInUser.Employee != null)
+            {
+                bool all = false;
+                foreach (var group in loggedInUser.UserGroups)
+                {
+                    if (group.Name.ToLower().Contains("admin") || group.Name.ToLower().Contains("verwaltung"))
+                    {
+                        all = true;
+                    }
+                }
+
+                if (all)
+                {
+                    customerOids.AddRange(DAOFactory.GenericDAO.GetAllActive<Customer>()
+                        .OrderBy(ob => ob.Person.LastName + ", " + ob.Person.FirstName).Select(c => c.Oid.Value));
+                }
+                else
+                {
+                    var teams = DAOFactory.SearchDAO.FindLeadingTeams(loggedInUser.Employee.Oid.Value);
+
+                    foreach (var team in teams)
+                    {
+                        foreach (var employee in team.MemberList)
+                        {
+                            foreach (var e2c in employee.Employee2CustomerList)
+                            {
+                                if (e2c.Customer.IsActive == ActivationTypeId.Active)
+                                {
+                                    foreach (var v2o in e2c.ValueList)
+                                    {
+                                        if (v2o.Entry.Type == ValueListEntryType.StaffRoleType &&
+                                            v2o.Entry.Value.Contains("Hauptbetreuung"))
+                                        {
+                                            if (!customerOids.Contains(e2c.Customer.Oid.Value))
+                                            {
+                                                customerOids.Add(e2c.Customer.Oid.Value);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+            }
+
+
+
+            foreach (var coid in customerOids)
+            {
+                var ro = ServicesOverviewRO.Create(coid, pMonth, pYear, true, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
+
+                //ServicesOverviewRO ro = ServicesOverviewRO.Create(customer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, searchServiceRecordsByEndDate, serviceCategoryOid);
+                if (ro != null)
+                {
+                    roList.Add(ro);
+                }
+            }
+
+            return roList.OrderBy(r => r.CustomerLastName + ", " + r.CustomerFirstName).ToList();
+        }
+
+        public override XtraReport CreateServiceOverviewReportForCustomers(IList<long> customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
+        {
+            var roList = new List<ServicesOverviewRO>();
+
+            foreach (var coid in customerOids)
+            {
+                var ro = ServicesOverviewRO.Create(coid, month, year, true, orgaOid ?? 0, empOid ?? 0, startDay, endDay, serviceCategoryOid);
+                if (ro != null)
+                {
+                    roList.Add(ro);
+                }
+            }
+
+            if (roList.Count > 0)
+            {
+
+                var rootReport = CreateServicesOverviewReportForRo(roList[0], serviceCategoryOid);
+                rootReport.CreateDocument();
+
+                for (int i = 1; i < roList.Count; i++)
+                {
+                    var lNext = CreateServicesOverviewReportForRo(roList[i], serviceCategoryOid);
+                    lNext.CreateDocument();
+                    rootReport.Pages.AddRange(lNext.Pages);
+                }
+
+                return rootReport;
+            }
+            return new XtraReport();
+
+        }
+
         public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
         {
             var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);

ReportImp/InputFamilienhilfe/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/InputFamilienhilfe/RechnungNeu.Designer.cs

@@ -39,7 +39,7 @@ namespace InputFamilienhilfe.Neu
             this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblRechnungsnummer = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
@@ -89,7 +89,7 @@ namespace InputFamilienhilfe.Neu
             this.xrLabel14,
             this.xrLabel12,
             this.xrLabel11,
-            this.xrLabel9,
+            this.lblRechnungsnummer,
             this.xrLabel8,
             this.xrLabel7,
             this.xrLabel6,
@@ -108,9 +108,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrPageInfo2
             // 
-            this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 7F);
+            this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 7F);
             this.xrPageInfo2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(54)))), ((int)(((byte)(141)))));
-            this.xrPageInfo2.Format = "Seite {0} von {1}";
             this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(508.67F, 252F);
             this.xrPageInfo2.Name = "xrPageInfo2";
             this.xrPageInfo2.SizeF = new System.Drawing.SizeF(185.0002F, 23F);
@@ -118,6 +117,7 @@ namespace InputFamilienhilfe.Neu
             this.xrPageInfo2.StylePriority.UseForeColor = false;
             this.xrPageInfo2.StylePriority.UseTextAlignment = false;
             this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
             // 
             // xrLine2
             // 
@@ -129,7 +129,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel13
             // 
-            this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(337.5041F, 338.8334F);
             this.xrLabel13.Multiline = true;
             this.xrLabel13.Name = "xrLabel13";
@@ -140,7 +141,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel14
             // 
-            this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(337.5041F, 366.8333F);
             this.xrLabel14.Multiline = true;
             this.xrLabel14.Name = "xrLabel14";
@@ -151,7 +153,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel12
             // 
-            this.xrLabel12.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(244.8639F, 366.8333F);
             this.xrLabel12.Multiline = true;
             this.xrLabel12.Name = "xrLabel12";
@@ -164,7 +167,8 @@ namespace InputFamilienhilfe.Neu
             // 
             this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 366.8333F);
             this.xrLabel11.Multiline = true;
             this.xrLabel11.Name = "xrLabel11";
@@ -173,22 +177,24 @@ namespace InputFamilienhilfe.Neu
             this.xrLabel11.StylePriority.UseFont = false;
             this.xrLabel11.Text = "Rechnungsnr.:";
             // 
-            // xrLabel9
+            // lblRechnungsnummer
             // 
-            this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.lblRechnungsnummer.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
-            this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 338.8334F);
-            this.xrLabel9.Multiline = true;
-            this.xrLabel9.Name = "xrLabel9";
-            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(105.1402F, 17.00003F);
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.Text = "Rechnungsnr.:";
+            this.lblRechnungsnummer.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.lblRechnungsnummer.LocationFloat = new DevExpress.Utils.PointFloat(139.7237F, 338.8334F);
+            this.lblRechnungsnummer.Multiline = true;
+            this.lblRechnungsnummer.Name = "lblRechnungsnummer";
+            this.lblRechnungsnummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblRechnungsnummer.SizeF = new System.Drawing.SizeF(105.1402F, 17.00003F);
+            this.lblRechnungsnummer.StylePriority.UseFont = false;
+            this.lblRechnungsnummer.Text = "Rechnungsnr.:";
             // 
             // xrLabel8
             // 
-            this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.8639F, 338.8334F);
             this.xrLabel8.Multiline = true;
             this.xrLabel8.Name = "xrLabel8";
@@ -199,7 +205,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel7
             // 
-            this.xrLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 366.8333F);
             this.xrLabel7.Multiline = true;
             this.xrLabel7.Name = "xrLabel7";
@@ -210,7 +217,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel6
             // 
-            this.xrLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 338.8334F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
@@ -229,7 +237,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel4
             // 
-            this.xrLabel4.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 16F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(54)))), ((int)(((byte)(141)))));
             this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(20.41646F, 298.5833F);
             this.xrLabel4.Multiline = true;
@@ -242,7 +251,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel3
             // 
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(54)))), ((int)(((byte)(141)))));
             this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(508.67F, 281F);
             this.xrLabel3.Multiline = true;
@@ -300,7 +310,7 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrPictureBox1
             // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
             this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(390.6407F, 0F);
             this.xrPictureBox1.Name = "xrPictureBox1";
             this.xrPictureBox1.SizeF = new System.Drawing.SizeF(177.8329F, 135.8334F);
@@ -344,7 +354,7 @@ namespace InputFamilienhilfe.Neu
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrSubreport1});
-            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
+            this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.GroupHeader1.HeightF = 26.63867F;
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
@@ -358,7 +368,7 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrPictureBox2
             // 
-            this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
+            this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
             this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(20.41687F, 234.4999F);
             this.xrPictureBox2.Name = "xrPictureBox2";
             this.xrPictureBox2.SizeF = new System.Drawing.SizeF(197.9167F, 65.55556F);
@@ -378,7 +388,8 @@ namespace InputFamilienhilfe.Neu
             // 
             // xrLabel2
             // 
-            this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(20.83333F, 317.0556F);
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -427,14 +438,16 @@ namespace InputFamilienhilfe.Neu
             this.GroupFooter1});
             this.DataSource = this.bindingSource1;
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
-            this.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(70, 20, 80, 52);
+            this.Margins = new DevExpress.Drawing.DXMargins(70F, 20F, 80F, 52.5F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
+            this.Version = "23.2";
+            this.AfterPrint += new System.EventHandler(this.ChangeName);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
@@ -475,7 +488,7 @@ namespace InputFamilienhilfe.Neu
         private DevExpress.XtraReports.UI.XRLabel xrLabel14;
         private DevExpress.XtraReports.UI.XRLabel xrLabel12;
         private DevExpress.XtraReports.UI.XRLabel xrLabel11;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.XRLabel lblRechnungsnummer;
         private DevExpress.XtraReports.UI.XRLabel xrLabel8;
         private DevExpress.XtraReports.UI.XRLabel lblFrist;
         private DevExpress.XtraReports.UI.XRRichText xrRichText4;

ReportImp/InputFamilienhilfe/RechnungNeu.cs

@@ -11,6 +11,8 @@ namespace InputFamilienhilfe.Neu
 {
     public partial class Rechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServiceInvoiceRO>
     {
+        public string invoiceName;
+
         public Rechnung()
         {
             InitializeComponent();
@@ -42,6 +44,15 @@ namespace InputFamilienhilfe.Neu
             }
             lblAdresse.Text = sb.ToString();
 
+            DateTime end = pRO.AccountingPeriodEnd;
+            string alias = "";
+            if (pRO.ServiceInvoicePeriods != null)
+            {
+                alias = pRO.ServiceInvoicePeriods[0].Customer.CustomerAlias;
+            }
+            invoiceName = String.Format("-{0:MM} {1} {2} {3}", end, pRO.CustomerLastName, alias, pRO.InvoiceBase.RecipientPersonLastName);
+            lblRechnungsnummer.Text = pRO.InvoiceNumber;
+
             bool isVerfahrensbeistandschaft = false;
             decimal amount = 0;
 
@@ -100,5 +111,10 @@ namespace InputFamilienhilfe.Neu
 
             this.bindingSource1.DataSource = pRO;
         }
+
+        private void ChangeName(object sender, EventArgs e)
+        {
+            PrintingSystem.Document.Name = lblRechnungsnummer.Text + invoiceName;
+        }
     }
 }

ReportImp/InputFamilienhilfe/Stundennachweis.designer.cs

@@ -67,8 +67,6 @@ namespace InputFamilienhilfe
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
@@ -80,6 +78,10 @@ namespace InputFamilienhilfe
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -478,41 +480,15 @@ namespace InputFamilienhilfe
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel8,
             this.xrLabel11,
-            this.xrLabel8});
+            this.xrPictureBox1,
+            this.xrLabel17});
             this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
-            this.ReportFooter.HeightF = 34.24999F;
+            this.ReportFooter.HeightF = 47.12499F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
-            // xrLabel11
-            // 
-            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00002F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(172.2084F, 24.24997F);
-            this.xrLabel11.StylePriority.UseBorders = false;
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.StylePriority.UsePadding = false;
-            this.xrLabel11.StylePriority.UseTextAlignment = false;
-            this.xrLabel11.Text = "Datum";
-            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
-            // xrLabel8
-            // 
-            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(527.0002F, 9.999974F);
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(202.8263F, 24.24997F);
-            this.xrLabel8.StylePriority.UseBorders = false;
-            this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.StylePriority.UseTextAlignment = false;
-            this.xrLabel8.Text = "Unterschrift Mitarbeiter";
-            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
             // fieldAbrechenbareMinuten
             // 
             this.fieldAbrechenbareMinuten.DataMember = "Services";
@@ -621,6 +597,57 @@ namespace InputFamilienhilfe
             this.xrLabel29.StylePriority.UseBorders = false;
             this.xrLabel29.StylePriority.UseFont = false;
             // 
+            // xrLabel8
+            // 
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(527.0002F, 21.62494F);
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(202.8263F, 24.24997F);
+            this.xrLabel8.StylePriority.UseBorders = false;
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.StylePriority.UseTextAlignment = false;
+            this.xrLabel8.Text = "Unterschrift Mitarbeiter";
+            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.62494F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(68.04174F, 24.24997F);
+            this.xrLabel11.StylePriority.UseBorders = false;
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UsePadding = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.Text = "Datum";
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(729.8265F, 11.62497F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(68.04174F, 21.62494F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(136.8289F, 25.50005F);
+            this.xrLabel17.StylePriority.UseBackColor = false;
+            this.xrLabel17.StylePriority.UseTextAlignment = false;
+            this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
             // Stundennachweis
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -643,12 +670,12 @@ namespace InputFamilienhilfe
             this.formattingRuleCostBearer,
             this.formattingRuleEmployeeName});
             this.Landscape = true;
-            this.Margins = new DevExpress.Drawing.DXMargins(70, 30, 50, 30);
+            this.Margins = new DevExpress.Drawing.DXMargins(70F, 30F, 50F, 30F);
             this.PageHeight = 827;
             this.PageWidth = 1169;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.SnapGridSize = 9F;
-            this.Version = "17.1";
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
@@ -691,12 +718,10 @@ namespace InputFamilienhilfe
 		private DevExpress.XtraReports.UI.XRLabel xrLabel23;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel2;
 		private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
-		private DevExpress.XtraReports.UI.XRLabel xrLabel11;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-		private DevExpress.XtraReports.UI.XRLabel xrLabel8;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
         private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
@@ -709,5 +734,9 @@ namespace InputFamilienhilfe
         private DevExpress.XtraReports.UI.XRLabel xrLabel15;
         private DevExpress.XtraReports.UI.XRLabel xrLabel29;
         private DevExpress.XtraReports.UI.XRPictureBox picSignature;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
     }
 }

ReportImp/InputFamilienhilfe/Stundennachweis.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 17</value>
-  </metadata>
 </root>

ReportImp/InputFamilienhilfe/StundennachweisBetrUmgang.designer.cs

@@ -39,6 +39,7 @@ namespace InputFamilienhilfe
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -50,6 +51,7 @@ namespace InputFamilienhilfe
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
             this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -59,6 +61,7 @@ namespace InputFamilienhilfe
             this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
@@ -79,9 +82,8 @@ namespace InputFamilienhilfe
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -195,6 +197,16 @@ namespace InputFamilienhilfe
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell7.Weight = 1.0383315006861644D;
             // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell14.StylePriority.UsePadding = false;
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "Mitarbeiter";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell14.Weight = 0.34140310964292758D;
+            // 
             // xrTableCell5
             // 
             this.xrTableCell5.Name = "xrTableCell5";
@@ -323,6 +335,16 @@ namespace InputFamilienhilfe
             this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell10.Weight = 0.53761578524847153D;
             // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.Text = "[EmployeeFirstName] [EmployeeLastName]";
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.17676768285722475D;
+            // 
             // xrTableCell9
             // 
             this.xrTableCell9.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -435,6 +457,10 @@ namespace InputFamilienhilfe
             this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell21.Weight = 1.8899072958599905D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
             // formattingRuleStartDate
             // 
             this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -478,10 +504,12 @@ namespace InputFamilienhilfe
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel17,
+            this.xrPictureBox1,
             this.xrLabel11,
             this.xrLabel8});
             this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
-            this.ReportFooter.HeightF = 34.24999F;
+            this.ReportFooter.HeightF = 47.33334F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
@@ -489,10 +517,10 @@ namespace InputFamilienhilfe
             // 
             this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00002F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21.83329F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(172.2084F, 24.24997F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(68.04174F, 24.24997F);
             this.xrLabel11.StylePriority.UseBorders = false;
             this.xrLabel11.StylePriority.UseFont = false;
             this.xrLabel11.StylePriority.UsePadding = false;
@@ -503,7 +531,7 @@ namespace InputFamilienhilfe
             // xrLabel8
             // 
             this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(527.0002F, 9.999974F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(527.0002F, 21.83329F);
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel8.SizeF = new System.Drawing.SizeF(202.8263F, 24.24997F);
@@ -621,29 +649,28 @@ namespace InputFamilienhilfe
             this.xrLabel29.StylePriority.UseBorders = false;
             this.xrLabel29.StylePriority.UseFont = false;
             // 
-            // xrTableCell14
+            // xrLabel17
             // 
-            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
-            this.xrTableCell14.StylePriority.UsePadding = false;
-            this.xrTableCell14.StylePriority.UseTextAlignment = false;
-            this.xrTableCell14.Text = "Mitarbeiter";
-            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell14.Weight = 0.34140310964292758D;
+            this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(68.04174F, 21.83329F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(136.8289F, 25.50005F);
+            this.xrLabel17.StylePriority.UseBackColor = false;
+            this.xrLabel17.StylePriority.UseTextAlignment = false;
+            this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
-            // xrTableCell16
+            // xrPictureBox1
             // 
-            this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
-            this.xrTableCell16.StylePriority.UsePadding = false;
-            this.xrTableCell16.StylePriority.UseTextAlignment = false;
-            this.xrTableCell16.Text = "[EmployeeFirstName] [EmployeeLastName]";
-            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell16.Weight = 0.17676768285722475D;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(729.8265F, 11.83332F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             // 
             // StundennachweisBetrUmgang
             // 
@@ -667,12 +694,12 @@ namespace InputFamilienhilfe
             this.formattingRuleCostBearer,
             this.formattingRuleEmployeeName});
             this.Landscape = true;
-            this.Margins = new DevExpress.Drawing.DXMargins(70, 30, 50, 30);
+            this.Margins = new DevExpress.Drawing.DXMargins(70F, 30F, 50F, 30F);
             this.PageHeight = 827;
             this.PageWidth = 1169;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.SnapGridSize = 9F;
-            this.Version = "17.1";
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
@@ -735,5 +762,7 @@ namespace InputFamilienhilfe
         private DevExpress.XtraReports.UI.XRPictureBox picSignature;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }

ReportImp/InputFamilienhilfe/StundennachweisBetrUmgang.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 17</value>
-  </metadata>
 </root>

ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs

@@ -22,17 +22,23 @@ namespace LeWoAachen.Invoicing
 
 	    public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
 	    {
-	        if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Assistenz"))
+	        if (!iServiceRecord.ServiceDescription.Name.Contains("Assistenz"))
 	        {
 	            return null;
 	        }
 	        return base.CreateInvoiceItem(iServiceRecord, scap, calc);
 	    }
 
-	    //public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
+		public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
+		Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
+		{
+			return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
+		}
+
+		//public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
 		//	Calculations calc)
 		//{
 		//	return itemList;
 		//}
-    }
+	}
 }

ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs

@@ -15,7 +15,7 @@ namespace LeWoAachen.Invoicing
 
                 foreach (var sr in list)
                 {
-                    var sd = sr.ServiceDescription.Category;
+                    var sd = sr.ServiceDescription;
                     var ic = GetInvoiceCreatorForCategory(sd);
                     if (ic != null)
                         return ic;
@@ -25,7 +25,7 @@ namespace LeWoAachen.Invoicing
 		    return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords);
 		}
 
-        private InvoiceCreation GetInvoiceCreatorForCategory(ServiceCategoryDC sd)
+        private InvoiceCreation GetInvoiceCreatorForCategory(ServiceDescriptionDC sd)
         {
             if (sd != null && !String.IsNullOrEmpty(sd.Name))
             {
@@ -34,7 +34,6 @@ namespace LeWoAachen.Invoicing
                 {
                     return new CustomAssistenzInvoiceCreation();
                 }
-
             }
             return null;
         }

ReportImp/LeWoAachen/Invoicing/SettlementInvoiceCreation.cs

@@ -52,7 +52,7 @@ namespace LeWoAachen.Invoicing
 
 	    public override bool IsServiceRecordBillable(ServiceRecord iRecord)
         {
-            if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("Assistenz"))
+            if (iRecord.ServiceDescription.Name.Contains("Assistenz"))
             {
                 return false;
             }

ReportImp/SKFLeverkusenJuHi/CustomReportCreator.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using DevExpress.XtraReports.Design;
+using DevExpress.XtraReports.UI;
+
+namespace SkfLeverkusenJuHi
+{
+	public class CustomReportCreator : DefaultReportCreator
+	{
+        public override XtraReport CreateQueryReport(long queryOid, string queryReportId)
+        {
+            if (queryOid == 100)
+                return CreateHilfeplanStand(queryOid, queryReportId);
+
+            return base.CreateQueryReport(queryOid, queryReportId);
+        }
+
+        private XtraReport CreateHilfeplanStand(long queryOid, string queryReportId)
+        {
+            var query = DAOFactory.GenericDAO.LoadByID<Query>(queryOid);
+
+            if (query == null)
+                return new XtraReport();
+
+            var path = Path.Combine(TempPath, queryReportId + ".xml");
+            var table = Utils.XMLDeserialize<DataTable>(path);
+            var qro = QueryRO.Create(query, table);
+
+
+            if (qro.Rows.Count > 0)
+            {
+                DateTime monat = DateTime.Parse(qro.Rows[0].Field1.ToString());
+                DateTime start = new DateTime(monat.Year, monat.Month, 1);
+                DateTime end = monat.AddMonths(1).AddDays(-1);
+
+                var ro = FinanceRO.Create(start, end);
+                var druck = new HilfeplanStand();
+                druck.SetReportDataSource(ro);
+                return druck;
+            }
+
+            return new XtraReport();
+        }
+    }
+}

ReportImp/SKFLeverkusenJuHi/HilfeplanStand.cs

@@ -0,0 +1,63 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+namespace SkfLeverkusenJuHi
+{
+	public partial class HilfeplanStand : DevExpress.XtraReports.UI.XtraReport// , IBeWoReport<FinanceRO>
+    {
+        public HilfeplanStand()
+        {
+            InitializeComponent();
+        }
+
+		public void SetReportDataSource(FinanceRO pRO)
+        {
+            pRO.CalculateBillableAmountInReportTimeSpan();
+
+			if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+			{
+				DateTime start = pRO.ReportStartDate.Value;
+				DateTime end = pRO.ReportEndDate.Value;
+
+				if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
+					end.Day == DateTime.DaysInMonth(end.Year, end.Month))
+				{
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
+				}
+				else
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					//cellFehlkontakteHeader.Text = String.Format("Fehl-\nkontakte {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+				}
+			}
+			else
+			{
+				cellBewilligtImZeitraumHeader.Visible = false;
+				cellBewilligteFLSImBereich.Visible = false;
+				cellGeleistetImBereich.Visible = false;
+				cellGeleistetImZeitraumHeader.Visible = false;
+			}
+
+			if (pRO.GruppierungLeistungskategorie && pRO.SupportConceptFinanceList != null)
+			{
+				GroupHeader1.Visible = true;
+				GroupFooter1.Visible = true;
+				foreach (var scRo in pRO.SupportConceptFinanceList)
+				{
+					if (String.IsNullOrEmpty(scRo.Leistungskategorie))
+					{
+						scRo.GruppierungsKategorie = " ";
+					}
+					else
+					{
+						scRo.GruppierungsKategorie = String.Format("Leistungskategorie {0}", scRo.Leistungskategorie);
+					}
+				}
+			}
+
+			this.bindingSource1.DataSource = pRO;
+        }
+	}
+}

ReportImp/SKFLeverkusenJuHi/HilfeplanStand.designer.cs

@@ -0,0 +1,842 @@
+using BeWo.Report.ReportObjects;
+namespace SkfLeverkusenJuHi
+{
+    partial class HilfeplanStand
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.fieldQuote = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Expanded = false;
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
+            this.Detail1.HeightF = 25F;
+            this.Detail1.KeepTogetherWithDetailReports = true;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(750.7535F, 25F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            this.xrTable2.StylePriority.UseTextAlignment = false;
+            this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell14,
+            this.xrTableCell12,
+            this.cellBewilligteFLSImBereich,
+            this.cellGeleistetImBereich,
+            this.xrTableCell4});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
+            this.xrTableCell6.Weight = 0.60558788893554072D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Mitarbeiter/in";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 0.63838082782953D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "xrTableCell14";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell14.Weight = 0.28372480548067947D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell12.Weight = 0.28372458888817886D;
+            // 
+            // cellBewilligteFLSImBereich
+            // 
+            this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
+            this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellBewilligteFLSImBereich.Weight = 0.28372448604304579D;
+            // 
+            // cellGeleistetImBereich
+            // 
+            this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGeleistetImBereich.Weight = 0.283725013997122D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.fieldQuote")});
+            this.xrTableCell4.Multiline = true;
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "xrTableCell4";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell4.TextFormatString = "{0:0.00} %";
+            this.xrTableCell4.Weight = 0.28372471635795421D;
+            // 
+            // lblTitel
+            // 
+            this.lblTitel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.lblTitel.Name = "lblTitel";
+            this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblTitel.SizeF = new System.Drawing.SizeF(732.0001F, 23F);
+            this.lblTitel.StylePriority.UseFont = false;
+            this.lblTitel.Text = "Auslastung der Hilfepläne für [ReportEndDate!MMMM yyyy]";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupFooter1,
+            this.GroupHeader2,
+            this.GroupFooter2,
+            this.GroupHeader1});
+            this.DetailReport.DataMember = "SupportConceptFinanceList";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable4});
+            this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.GroupFooter1.HeightF = 25F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.StylePriority.UseFont = false;
+            this.GroupFooter1.Visible = false;
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(750.7535F, 25F);
+            this.xrTable4.StylePriority.UseBorders = false;
+            this.xrTable4.StylePriority.UseFont = false;
+            this.xrTable4.StylePriority.UsePadding = false;
+            this.xrTable4.StylePriority.UseTextAlignment = false;
+            this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell28,
+            this.xrTableCell31,
+            this.xrTableCell35,
+            this.xrTableCell36,
+            this.xrTableCell37,
+            this.xrTableCell38,
+            this.xrTableCell5});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.CanGrow = false;
+            this.xrTableCell28.Multiline = true;
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Weight = 0.60558783954998552D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.CanGrow = false;
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell31.Weight = 0.63838077729640186D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.CanGrow = false;
+            this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.StylePriority.UseFont = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:0.00}";
+            xrSummary1.IgnoreNullValues = true;
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell35.Summary = xrSummary1;
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell35.Weight = 0.28372475627338145D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.CanGrow = false;
+            this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.StylePriority.UseFont = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            xrSummary2.FormatString = "{0:0.00}";
+            xrSummary2.IgnoreNullValues = true;
+            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell36.Summary = xrSummary2;
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell36.Weight = 0.28372478320383415D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.CanGrow = false;
+            this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.StylePriority.UseFont = false;
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            xrSummary3.FormatString = "{0:0.00}";
+            xrSummary3.IgnoreNullValues = true;
+            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell37.Summary = xrSummary3;
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell37.Weight = 0.28372402234654781D;
+            // 
+            // xrTableCell38
+            // 
+            this.xrTableCell38.CanGrow = false;
+            this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan")});
+            this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell38.Name = "xrTableCell38";
+            this.xrTableCell38.StylePriority.UseFont = false;
+            this.xrTableCell38.StylePriority.UseTextAlignment = false;
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.IgnoreNullValues = true;
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell38.Summary = xrSummary4;
+            this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell38.Weight = 0.28372542787203264D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.fieldQuote")});
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell5.Multiline = true;
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseFont = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            xrSummary5.Func = DevExpress.XtraReports.UI.SummaryFunc.Avg;
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell5.Summary = xrSummary5;
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell5.TextFormatString = "{0:0.00} %";
+            this.xrTableCell5.Weight = 0.2837245078964965D;
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.GroupHeader2.HeightF = 50F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(3.051758E-05F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(750.7535F, 50F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell2,
+            this.xrTableCell13,
+            this.xrTableCell11,
+            this.cellBewilligtImZeitraumHeader,
+            this.cellGeleistetImZeitraumHeader,
+            this.xrTableCell3});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1.3953493323567705D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "KlientIn/Hilfeplan";
+            this.xrTableCell1.Weight = 0.60558773298601487D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Kostenträger";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.63838077443825825D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "Bis dato bewilligte FLS";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.28372478333148538D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Bis dato geleistete FLS";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell11.Weight = 0.28372478320383404D;
+            // 
+            // cellBewilligtImZeitraumHeader
+            // 
+            this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader";
+            this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
+            this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellBewilligtImZeitraumHeader.Weight = 0.28372477997345991D;
+            // 
+            // cellGeleistetImZeitraumHeader
+            // 
+            this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
+            this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS";
+            this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGeleistetImZeitraumHeader.Weight = 0.28372477847753641D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Multiline = true;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Quote Erbringung FLS";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell3.Weight = 0.28372475141943343D;
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.GroupFooter2.HeightF = 0F;
+            this.GroupFooter2.Level = 1;
+            this.GroupFooter2.Name = "GroupFooter2";
+            this.GroupFooter2.StylePriority.UseFont = false;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1});
+            this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("GruppierungsKategorie", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            this.GroupHeader1.HeightF = 43.75F;
+            this.GroupHeader1.Level = 1;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.Visible = false;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.GruppierungsKategorie")});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(732.0001F, 23F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "xrLabel1";
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblTitel});
+            this.ReportHeader.HeightF = 52.08333F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // pageFooterBand1
+            // 
+            this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPageInfo2,
+            this.xrPageInfo1});
+            this.pageFooterBand1.HeightF = 48F;
+            this.pageFooterBand1.Name = "pageFooterBand1";
+            // 
+            // xrPageInfo2
+            // 
+            this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(602F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 23F);
+            this.xrPageInfo2.StyleName = "PageInfo";
+            this.xrPageInfo2.StylePriority.UseFont = false;
+            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
+            // 
+            // xrPageInfo1
+            // 
+            this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrPageInfo1.Name = "xrPageInfo1";
+            this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+            this.xrPageInfo1.SizeF = new System.Drawing.SizeF(270.0002F, 23F);
+            this.xrPageInfo1.StyleName = "PageInfo";
+            this.xrPageInfo1.StylePriority.UseFont = false;
+            // 
+            // Title
+            // 
+            this.Title.BackColor = System.Drawing.Color.White;
+            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
+            this.Title.ForeColor = System.Drawing.Color.Black;
+            this.Title.Name = "Title";
+            // 
+            // FieldCaption
+            // 
+            this.FieldCaption.BackColor = System.Drawing.Color.White;
+            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+            this.FieldCaption.Name = "FieldCaption";
+            // 
+            // PageInfo
+            // 
+            this.PageInfo.BackColor = System.Drawing.Color.White;
+            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
+            this.PageInfo.ForeColor = System.Drawing.Color.Black;
+            this.PageInfo.Name = "PageInfo";
+            // 
+            // DataField
+            // 
+            this.DataField.BackColor = System.Drawing.Color.White;
+            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // fieldFLS
+            // 
+            this.fieldFLS.DataMember = "FLSReportGroups";
+            this.fieldFLS.DataSource = this.bindingSource1;
+            this.fieldFLS.Expression = "[TotalFLM] / 60";
+            this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldFLS.Name = "fieldFLS";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.ReportFooter.HeightF = 25F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(750.7535F, 25F);
+            this.xrTable3.StylePriority.UseBorders = false;
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UsePadding = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell8});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.CanGrow = false;
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Weight = 0.60558783954998552D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.CanGrow = false;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.63838077729640186D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.CanGrow = false;
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            xrSummary6.FormatString = "{0:0.00}";
+            xrSummary6.IgnoreNullValues = true;
+            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell20.Summary = xrSummary6;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell20.Weight = 0.28372497273821351D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanGrow = false;
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            xrSummary7.FormatString = "{0:0.00}";
+            xrSummary7.IgnoreNullValues = true;
+            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell21.Summary = xrSummary7;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell21.Weight = 0.28372456673900209D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanGrow = false;
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            xrSummary8.FormatString = "{0:0.00}";
+            xrSummary8.IgnoreNullValues = true;
+            xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell22.Summary = xrSummary8;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell22.Weight = 0.28372423881137987D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.CanGrow = false;
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan")});
+            this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            xrSummary9.FormatString = "{0:0.00}";
+            xrSummary9.IgnoreNullValues = true;
+            xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell23.Summary = xrSummary9;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell23.Weight = 0.28372499494236858D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.fieldQuote")});
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell8.Multiline = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            xrSummary10.Func = DevExpress.XtraReports.UI.SummaryFunc.Avg;
+            xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell8.Summary = xrSummary10;
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell8.TextFormatString = "{0:0.00} %";
+            this.xrTableCell8.Weight = 0.28372472436132851D;
+            // 
+            // fieldQuote
+            // 
+            this.fieldQuote.DataMember = "SupportConceptFinanceList";
+            this.fieldQuote.Expression = "Round([BillableHoursInReportTimeSpan]/[ApprovedHoursInReportTimeSpan]*100, 2)";
+            this.fieldQuote.Name = "fieldQuote";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+            // 
+            // HilfeplanStand
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldQuote});
+            this.DataSource = this.bindingSource1;
+            this.Margins = new DevExpress.Drawing.DXMargins(45F, 19F, 50F, 30F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel lblTitel;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.CalculatedField fieldQuote;
+    }
+}

ReportImp/SKFLeverkusenJuHi/HilfeplanStand.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ReportImp/SKFLeverkusenJuHi/Leistungsdoku.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared.Extensions;
+using BS.Shared;
+
+namespace SkfLeverkusenJuHi
+{
+    public partial class Leistungsdoku : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+		public Leistungsdoku()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+
+            if (pRO.CustomerOid > 0)
+            {
+                var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
+                if (!String.IsNullOrEmpty(c.DebitorNumber))
+                {
+                    lblDebitor.Text = c.DebitorNumber;
+                }
+            }
+            if (pRO.Services != null)
+            {
+                foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
+                {
+                    if(s.ServiceDescription == "Hausbesuch")
+                    {
+                        s.ServiceDescription = s.Notice;
+                    }
+				}
+                decimal stundensatz = GetStundensatz(pRO);
+                lblStundensatz.Text = String.Format("{0} €", Math.Round(stundensatz, 2));
+                lblRechnungsbetrag.Text = String.Format("{0} €", Math.Round(pRO.TotalFLMBillable / 60 * (double)stundensatz, 2));
+            }
+
+            this.bindingSource1.DataSource = pRO;
+        }
+
+        private decimal GetStundensatz(ServicesOverviewRO pRO)
+        {
+            if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
+            {
+                var c2s = pRO.CostBearer2SupportConceptList[0];
+                var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
+                var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRO.StartDate);
+
+                if (cp != null && cp.CostRateValue.HasValue)
+                {
+                    return cp.CostRateValue.Value;
+                }
+            }
+
+            return 0;
+        }
+    }
+}

ReportImp/SKFLeverkusenJuHi/Leistungsdoku.designer.cs

@@ -0,0 +1,921 @@
+using BeWo.Report.ReportObjects;
+namespace SkfLeverkusenJuHi
+{
+	partial class Leistungsdoku
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblDebitor = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblRechnungsbetrag = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblStundensatz = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldHausbesuch = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldTelefonat = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieledInstitutionen = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldBegleitung = new DevExpress.XtraReports.UI.CalculatedField();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.StylePriority.UseFont = false;
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableServiceRecords1
+            // 
+            this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 0F);
+            this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
+            this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2,
+            this.xrTableRow1});
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(1070F, 40F);
+            this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
+            this.xrTableServiceRecords1.StylePriority.UseBorders = false;
+            this.xrTableServiceRecords1.StylePriority.UseFont = false;
+            this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
+            this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell6,
+            this.xrTableCell1,
+            this.xrTableCell4,
+            this.xrTableCell7,
+            this.xrTableCell5,
+            this.xrTableCell11,
+            this.xrTableCell23});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow2.StylePriority.UseTextAlignment = false;
+            this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableRow2.Weight = 0.625D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Datum";
+            this.xrTableCell3.Weight = 0.25412289792011183D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.Text = "Uhrzeit";
+            this.xrTableCell6.Weight = 0.44195481695285233D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.Text = "Leistung";
+            this.xrTableCell1.Weight = 0.44195483113515177D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseBorders = false;
+            this.xrTableCell4.Text = "Hausbesuch";
+            this.xrTableCell4.Weight = 0.345277206987911D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.Text = "Begleitung ";
+            this.xrTableCell7.Weight = 0.34159379925556532D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseBorders = false;
+            this.xrTableCell5.Text = "Telefonate";
+            this.xrTableCell5.Weight = 0.3489606084977096D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell14,
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell18,
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell24});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.StylePriority.UseTextAlignment = false;
+            this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableRow1.Weight = 0.625D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseBorders = false;
+            this.xrTableCell14.Weight = 0.25412285502233195D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.Text = "von";
+            this.xrTableCell16.Weight = 0.2209774078245238D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseBorders = false;
+            this.xrTableCell17.Text = "bis";
+            this.xrTableCell17.Weight = 0.22097758135506662D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.StylePriority.UseBorders = false;
+            this.xrTableCell18.Weight = 0.441954761978062D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseBorders = false;
+            this.xrTableCell19.Weight = 0.34527711008714529D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseBorders = false;
+            this.xrTableCell20.Text = "des Klienten";
+            this.xrTableCell20.Weight = 0.34159379139110568D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseBorders = false;
+            this.xrTableCell21.Weight = 0.348960599258771D;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupHeader1});
+            this.DetailReport.DataMember = "Services";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.Detail1.HeightF = 20F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail1.StylePriority.UseFont = false;
+            this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.BorderColor = System.Drawing.Color.Black;
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow6});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(1070F, 20F);
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell13,
+            this.xrTableCell15,
+            this.xrTableCell12,
+            this.xrTableCell2,
+            this.xrTableCell8,
+            this.xrTableCell10,
+            this.xrTableCell25,
+            this.xrTableCell26,
+            this.xrTableCell9});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow6.StylePriority.UseTextAlignment = false;
+            this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableRow6.Weight = 1D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")});
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UsePadding = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "xrTableCell13";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.11616175161089598D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:HH:mm}")});
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UsePadding = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.Text = "xrTableCell15";
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell15.Weight = 0.10101012437796897D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDate", "{0:HH:mm}")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.Weight = 0.10101008584564547D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription", "{0:0.00}")});
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "xrTableCell2";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell2.Weight = 0.20202026376715682D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldHausbesuch")});
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Weight = 0.15782816981713821D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldBegleitung")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Weight = 0.15614466202903848D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
+            this.xrTableCell9.Multiline = true;
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell9.Weight = 0.18686869615374946D;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableServiceRecords1});
+            this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.GroupHeader1.HeightF = 40F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.RepeatEveryPage = true;
+            this.GroupHeader1.StylePriority.UseFont = false;
+            // 
+            // formattingRuleStartDate
+            // 
+            this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
+            this.formattingRuleStartDate.DataMember = "ServicesDouble";
+            this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleStartDate.Name = "formattingRuleStartDate";
+            // 
+            // formattingRuleServiceDesc
+            // 
+            this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
+            this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
+            // 
+            // formattingRuleCostBearer
+            // 
+            this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleCostBearer.DataMember = "ServicesDouble";
+            this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
+            // 
+            // formattingRuleEmployeeName
+            // 
+            this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
+            this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            this.topMarginBand1.StylePriority.UseFont = false;
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel5,
+            this.xrLabel2,
+            this.xrLabel3,
+            this.lblRechnungsbetrag,
+            this.lblStundensatz,
+            this.xrLabel6,
+            this.xrLabel11,
+            this.xrLabel4});
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.ReportFooter.HeightF = 88.24994F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 10.00001F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(172.2084F, 24.24997F);
+            this.xrLabel11.StylePriority.UseBorders = false;
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UsePadding = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.Text = "Gesamtstundenzahl:";
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel4.BorderWidth = 1F;
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(172.2089F, 10.00001F);
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(110.4168F, 24.24997F);
+            this.xrLabel4.StylePriority.UseBorders = false;
+            this.xrLabel4.StylePriority.UseBorderWidth = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.StylePriority.UsePadding = false;
+            this.xrLabel4.StylePriority.UseTextAlignment = false;
+            this.xrLabel4.Text = "[fieldBillableFLS!0.00]";
+            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // fieldAbrechenbareMinuten
+            // 
+            this.fieldAbrechenbareMinuten.DataMember = "Services";
+            this.fieldAbrechenbareMinuten.Expression = "[Minutes] / 60";
+            this.fieldAbrechenbareMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldAbrechenbareMinuten.Name = "fieldAbrechenbareMinuten";
+            // 
+            // fieldBillableFLS
+            // 
+            this.fieldBillableFLS.Expression = "[TotalFLMBillable] / 60";
+            this.fieldBillableFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldBillableFLS.Name = "fieldBillableFLS";
+            // 
+            // fieldAbrechenbareFLS
+            // 
+            this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2";
+            this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(316.9999F, 82.91664F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(89.9166F, 20F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = "Klient:";
+            // 
+            // xrLabel23
+            // 
+            this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(406.9166F, 82.91664F);
+            this.xrLabel23.Name = "xrLabel23";
+            this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel23.SizeF = new System.Drawing.SizeF(309.2916F, 20F);
+            this.xrLabel23.StylePriority.UseBorders = false;
+            this.xrLabel23.StylePriority.UseFont = false;
+            this.xrLabel23.Text = "[CustomerFirstName] [CustomerLastName] ";
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblDebitor,
+            this.xrLabel16,
+            this.xrLabel17,
+            this.xrLabel13,
+            this.xrLabel14,
+            this.xrLabel10,
+            this.xrLabel7,
+            this.xrLabel1,
+            this.xrLabel23,
+            this.xrLabel12});
+            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.ReportHeader.HeightF = 122.9167F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(272.2083F, 20F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "SkF e.V. Leverkusen";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 16F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(382.2921F, 22.91667F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(278.3745F, 20F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "Leistungsdokumentation";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(382.2921F, 42.91668F);
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(278.3745F, 20F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.StylePriority.UseTextAlignment = false;
+            this.xrLabel10.Text = "Ambulante erzieherische Hilfen";
+            this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(2.708308F, 82.91664F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(114.2917F, 20F);
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.Text = "Jugendamt: ";
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(116.9999F, 82.91664F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(200.0001F, 20F);
+            this.xrLabel14.StylePriority.UseBorders = false;
+            this.xrLabel14.StylePriority.UseFont = false;
+            // 
+            // xrLabel16
+            // 
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(716.2081F, 82.91664F);
+            this.xrLabel16.Name = "xrLabel16";
+            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(89.25006F, 20F);
+            this.xrLabel16.StylePriority.UseFont = false;
+            this.xrLabel16.Text = "Hilfeart:";
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(805.4583F, 82.91664F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(263.5417F, 20F);
+            this.xrLabel17.StylePriority.UseBorders = false;
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.Text = "§ 27 i.V.m. §31 SGB VIII";
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseBorders = false;
+            this.xrTableCell11.Text = "Kontakte mit";
+            this.xrTableCell11.Weight = 0.37289939962373342D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell22.Multiline = true;
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseBorders = false;
+            this.xrTableCell22.Text = "anderen Institutionen";
+            this.xrTableCell22.Weight = 0.37289936870797979D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell23.Multiline = true;
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseBorders = false;
+            this.xrTableCell23.Text = "Handzeichen";
+            this.xrTableCell23.Weight = 0.40880797618266135D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell24.Multiline = true;
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseBorders = false;
+            this.xrTableCell24.Text = "Mitarbeiter";
+            this.xrTableCell24.Weight = 0.40880798651084249D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldTelefonat")});
+            this.xrTableCell25.Multiline = true;
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.Weight = 0.15951199285619985D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieledInstitutionen")});
+            this.xrTableCell26.Multiline = true;
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell26.Weight = 0.17045455832857681D;
+            // 
+            // lblDebitor
+            // 
+            this.lblDebitor.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblDebitor.LocationFloat = new DevExpress.Utils.PointFloat(458.792F, 102.9167F);
+            this.lblDebitor.Name = "lblDebitor";
+            this.lblDebitor.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblDebitor.SizeF = new System.Drawing.SizeF(89.9166F, 20F);
+            this.lblDebitor.StylePriority.UseFont = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 54.04164F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(172F, 25F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "Betrag:";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(406.9166F, 59.24991F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(130.0836F, 19.79172F);
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "Gesamt:";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // lblRechnungsbetrag
+            // 
+            this.lblRechnungsbetrag.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblRechnungsbetrag.LocationFloat = new DevExpress.Utils.PointFloat(537.0001F, 59.24991F);
+            this.lblRechnungsbetrag.Name = "lblRechnungsbetrag";
+            this.lblRechnungsbetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblRechnungsbetrag.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
+            this.lblRechnungsbetrag.StylePriority.UseFont = false;
+            this.lblRechnungsbetrag.StylePriority.UseTextAlignment = false;
+            this.lblRechnungsbetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            // 
+            // lblStundensatz
+            // 
+            this.lblStundensatz.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblStundensatz.LocationFloat = new DevExpress.Utils.PointFloat(296.4998F, 59.24991F);
+            this.lblStundensatz.Name = "lblStundensatz";
+            this.lblStundensatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblStundensatz.SizeF = new System.Drawing.SizeF(110.4168F, 19.79173F);
+            this.lblStundensatz.StylePriority.UseFont = false;
+            this.lblStundensatz.StylePriority.UseTextAlignment = false;
+            this.lblStundensatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 34.24997F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(172.2084F, 19.79166F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.Text = "Abrechnung:";
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // fieldHausbesuch
+            // 
+            this.fieldHausbesuch.DataMember = "Services";
+            this.fieldHausbesuch.Expression = "Iif([ServiceCategoryAbbr] == \'HB\' Or [ServiceCategoryAbbr] == \'HBH\',Round([Minute" +
+    "s]/60, 2),\'\')";
+            this.fieldHausbesuch.Name = "fieldHausbesuch";
+            // 
+            // fieldTelefonat
+            // 
+            this.fieldTelefonat.DataMember = "Services";
+            this.fieldTelefonat.Expression = "Iif([ServiceCategoryAbbr] == \'TEL\',Round([Minutes]/60, 2),\'\')";
+            this.fieldTelefonat.Name = "fieldTelefonat";
+            // 
+            // fieledInstitutionen
+            // 
+            this.fieledInstitutionen.DataMember = "Services";
+            this.fieledInstitutionen.Expression = "Iif([ServiceCategoryAbbr] == \'KI\',Round([Minutes]/60, 2),\'\')\n";
+            this.fieledInstitutionen.Name = "fieledInstitutionen";
+            // 
+            // fieldBegleitung
+            // 
+            this.fieldBegleitung.DataMember = "Services";
+            this.fieldBegleitung.Expression = "Iif([ServiceCategoryAbbr] == \'BGL\',Round([Minutes]/60, 2),\'\')\n";
+            this.fieldBegleitung.Name = "fieldBegleitung";
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(172.2089F, 59.24991F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(110.208F, 19.79173F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.Text = "je FLS";
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
+            // Leistungsdoku
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldAbrechenbareMinuten,
+            this.fieldBillableFLS,
+            this.fieldAbrechenbareFLS,
+            this.fieldHausbesuch,
+            this.fieldTelefonat,
+            this.fieledInstitutionen,
+            this.fieldBegleitung});
+            this.DataSource = this.bindingSource1;
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.formattingRuleStartDate,
+            this.formattingRuleServiceDesc,
+            this.formattingRuleCostBearer,
+            this.formattingRuleEmployeeName});
+            this.Landscape = true;
+            this.Margins = new DevExpress.Drawing.DXMargins(69F, 30F, 50F, 30F);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.SnapGridSize = 9F;
+            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
+        private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+		private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel23;
+		private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+		private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+        private DevExpress.XtraReports.UI.XRLabel lblDebitor;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel lblRechnungsbetrag;
+        private DevExpress.XtraReports.UI.XRLabel lblStundensatz;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.CalculatedField fieldHausbesuch;
+        private DevExpress.XtraReports.UI.CalculatedField fieldTelefonat;
+        private DevExpress.XtraReports.UI.CalculatedField fieledInstitutionen;
+        private DevExpress.XtraReports.UI.CalculatedField fieldBegleitung;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+    }
+}

ReportImp/SKFLeverkusenJuHi/Leistungsdoku.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ReportImp/SKFLeverkusenJuHi/LeistungsdokuKurz.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared.Extensions;
+using BS.Shared;
+
+namespace SkfLeverkusenJuHi
+{
+    public partial class LeistungsdokuKurz : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+		public LeistungsdokuKurz()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+
+            if (pRO.CustomerOid > 0)
+            {
+                var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
+                if (!String.IsNullOrEmpty(c.DebitorNumber))
+                {
+                    lblDebitor.Text = c.DebitorNumber;
+                }
+            }
+            if (pRO.Services != null)
+            {
+                foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
+                {
+                    if(s.ServiceDescription == "Hausbesuch")
+                    {
+                        s.ServiceDescription = s.Notice;
+                    }
+				}
+                decimal stundensatz = GetStundensatz(pRO);
+                lblStundensatz.Text = String.Format("{0} €", Math.Round(stundensatz, 2));
+                lblRechnungsbetrag.Text = String.Format("{0} €", Math.Round(pRO.TotalFLMBillable / 60 * (double)stundensatz, 2));
+            }
+
+            this.bindingSource1.DataSource = pRO;
+        }
+
+        private decimal GetStundensatz(ServicesOverviewRO pRO)
+        {
+            if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
+            {
+                var c2s = pRO.CostBearer2SupportConceptList[0];
+                var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
+                var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRO.StartDate);
+
+                if (cp != null && cp.CostRateValue.HasValue)
+                {
+                    return cp.CostRateValue.Value;
+                }
+            }
+
+            return 0;
+        }
+    }
+}

ReportImp/SKFLeverkusenJuHi/LeistungsdokuKurz.designer.cs

@@ -0,0 +1,783 @@
+using BeWo.Report.ReportObjects;
+namespace SkfLeverkusenJuHi
+{
+	partial class LeistungsdokuKurz
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblRechnungsbetrag = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblStundensatz = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.lblDebitor = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldHausbesuch = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldTelefonat = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieledInstitutionen = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldBegleitung = new DevExpress.XtraReports.UI.CalculatedField();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.StylePriority.UseFont = false;
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableServiceRecords1
+            // 
+            this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 0F);
+            this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
+            this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2,
+            this.xrTableRow1});
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(910.1313F, 40F);
+            this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
+            this.xrTableServiceRecords1.StylePriority.UseBorders = false;
+            this.xrTableServiceRecords1.StylePriority.UseFont = false;
+            this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
+            this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell4,
+            this.xrTableCell7,
+            this.xrTableCell5,
+            this.xrTableCell11});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow2.StylePriority.UseTextAlignment = false;
+            this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableRow2.Weight = 0.625D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Datum";
+            this.xrTableCell3.Weight = 0.25412289792011183D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseBorders = false;
+            this.xrTableCell4.Text = "Hausbesuch";
+            this.xrTableCell4.Weight = 0.345277206987911D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.Text = "Begleitung ";
+            this.xrTableCell7.Weight = 0.34159379925556532D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseBorders = false;
+            this.xrTableCell5.Text = "Telefonate";
+            this.xrTableCell5.Weight = 0.3489606084977096D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseBorders = false;
+            this.xrTableCell11.Text = "Kontakte mit";
+            this.xrTableCell11.Weight = 0.37289939962373342D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell14,
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.StylePriority.UseTextAlignment = false;
+            this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableRow1.Weight = 0.625D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseBorders = false;
+            this.xrTableCell14.Weight = 0.27646339764005712D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseBorders = false;
+            this.xrTableCell19.Weight = 0.37563118610178892D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseBorders = false;
+            this.xrTableCell20.Text = "des Klienten";
+            this.xrTableCell20.Weight = 0.37162395897722023D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseBorders = false;
+            this.xrTableCell21.Weight = 0.37963870946319772D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell22.Multiline = true;
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseBorders = false;
+            this.xrTableCell22.Text = "anderen Institutionen";
+            this.xrTableCell22.Weight = 0.40568163736999907D;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupHeader1});
+            this.DetailReport.DataMember = "Services";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.Detail1.HeightF = 20F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail1.StylePriority.UseFont = false;
+            this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.BorderColor = System.Drawing.Color.Black;
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow6});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(910.1318F, 20F);
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell13,
+            this.xrTableCell8,
+            this.xrTableCell10,
+            this.xrTableCell25,
+            this.xrTableCell26});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow6.StylePriority.UseTextAlignment = false;
+            this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableRow6.Weight = 1D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")});
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UsePadding = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "xrTableCell13";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.11616175161089598D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldHausbesuch")});
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Weight = 0.15782816981713821D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldBegleitung")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Weight = 0.15614466202903848D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldTelefonat")});
+            this.xrTableCell25.Multiline = true;
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.Weight = 0.15951199285619985D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieledInstitutionen")});
+            this.xrTableCell26.Multiline = true;
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell26.Weight = 0.17045455832857681D;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableServiceRecords1});
+            this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.GroupHeader1.HeightF = 40F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.RepeatEveryPage = true;
+            this.GroupHeader1.StylePriority.UseFont = false;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
+            // formattingRuleStartDate
+            // 
+            this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
+            this.formattingRuleStartDate.DataMember = "ServicesDouble";
+            this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleStartDate.Name = "formattingRuleStartDate";
+            // 
+            // formattingRuleServiceDesc
+            // 
+            this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
+            this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
+            // 
+            // formattingRuleCostBearer
+            // 
+            this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleCostBearer.DataMember = "ServicesDouble";
+            this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
+            // 
+            // formattingRuleEmployeeName
+            // 
+            this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
+            this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            this.topMarginBand1.StylePriority.UseFont = false;
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel5,
+            this.xrLabel2,
+            this.xrLabel3,
+            this.lblRechnungsbetrag,
+            this.lblStundensatz,
+            this.xrLabel6,
+            this.xrLabel11,
+            this.xrLabel4});
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.ReportFooter.HeightF = 88.24994F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(172.2089F, 59.24991F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(110.208F, 19.79173F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.Text = "je FLS";
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 54.04164F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(172F, 25F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "Betrag:";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(438.4875F, 59.24994F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(130.0836F, 19.79172F);
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "Gesamt:";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // lblRechnungsbetrag
+            // 
+            this.lblRechnungsbetrag.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblRechnungsbetrag.LocationFloat = new DevExpress.Utils.PointFloat(568.5711F, 59.24994F);
+            this.lblRechnungsbetrag.Name = "lblRechnungsbetrag";
+            this.lblRechnungsbetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblRechnungsbetrag.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F);
+            this.lblRechnungsbetrag.StylePriority.UseFont = false;
+            this.lblRechnungsbetrag.StylePriority.UseTextAlignment = false;
+            this.lblRechnungsbetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            // 
+            // lblStundensatz
+            // 
+            this.lblStundensatz.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblStundensatz.LocationFloat = new DevExpress.Utils.PointFloat(328.0707F, 59.24994F);
+            this.lblStundensatz.Name = "lblStundensatz";
+            this.lblStundensatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblStundensatz.SizeF = new System.Drawing.SizeF(110.4168F, 19.79173F);
+            this.lblStundensatz.StylePriority.UseFont = false;
+            this.lblStundensatz.StylePriority.UseTextAlignment = false;
+            this.lblStundensatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 34.24997F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(172.2084F, 19.79166F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.Text = "Abrechnung:";
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 10.00001F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(172.2084F, 24.24997F);
+            this.xrLabel11.StylePriority.UseBorders = false;
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UsePadding = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.Text = "Gesamtstundenzahl:";
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel4.BorderWidth = 1F;
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(172.2089F, 10.00001F);
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(110.4168F, 24.24997F);
+            this.xrLabel4.StylePriority.UseBorders = false;
+            this.xrLabel4.StylePriority.UseBorderWidth = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.StylePriority.UsePadding = false;
+            this.xrLabel4.StylePriority.UseTextAlignment = false;
+            this.xrLabel4.Text = "[fieldBillableFLS!0.00]";
+            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // fieldAbrechenbareMinuten
+            // 
+            this.fieldAbrechenbareMinuten.DataMember = "Services";
+            this.fieldAbrechenbareMinuten.Expression = "[Minutes] / 60";
+            this.fieldAbrechenbareMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldAbrechenbareMinuten.Name = "fieldAbrechenbareMinuten";
+            // 
+            // fieldBillableFLS
+            // 
+            this.fieldBillableFLS.Expression = "[TotalFLMBillable] / 60";
+            this.fieldBillableFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldBillableFLS.Name = "fieldBillableFLS";
+            // 
+            // fieldAbrechenbareFLS
+            // 
+            this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2";
+            this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(328.0707F, 82.91664F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(89.9166F, 20F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = "Klient:";
+            // 
+            // xrLabel23
+            // 
+            this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(417.9873F, 82.91664F);
+            this.xrLabel23.Name = "xrLabel23";
+            this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel23.SizeF = new System.Drawing.SizeF(288.0453F, 20F);
+            this.xrLabel23.StylePriority.UseBorders = false;
+            this.xrLabel23.StylePriority.UseFont = false;
+            this.xrLabel23.Text = "[CustomerFirstName] [CustomerLastName] ";
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblDebitor,
+            this.xrLabel16,
+            this.xrLabel17,
+            this.xrLabel13,
+            this.xrLabel14,
+            this.xrLabel10,
+            this.xrLabel7,
+            this.xrLabel1,
+            this.xrLabel23,
+            this.xrLabel12});
+            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.ReportHeader.HeightF = 122.9167F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // lblDebitor
+            // 
+            this.lblDebitor.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblDebitor.LocationFloat = new DevExpress.Utils.PointFloat(438.4875F, 102.9167F);
+            this.lblDebitor.Name = "lblDebitor";
+            this.lblDebitor.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblDebitor.SizeF = new System.Drawing.SizeF(121.2919F, 20F);
+            this.lblDebitor.StylePriority.UseFont = false;
+            // 
+            // xrLabel16
+            // 
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(706.0324F, 82.91664F);
+            this.xrLabel16.Name = "xrLabel16";
+            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(89.25006F, 20F);
+            this.xrLabel16.StylePriority.UseFont = false;
+            this.xrLabel16.Text = "Hilfeart:";
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(795.2826F, 82.91664F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(253.4709F, 20F);
+            this.xrLabel17.StylePriority.UseBorders = false;
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.Text = "§ 27 i.V.m. §31 SGB VIII";
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(2.708308F, 82.91664F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(136.3815F, 20F);
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.Text = "Jugendamt: ";
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(139.0898F, 82.91664F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(188.9809F, 20F);
+            this.xrLabel14.StylePriority.UseBorders = false;
+            this.xrLabel14.StylePriority.UseFont = false;
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(382.2921F, 42.91668F);
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(278.3745F, 20F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.StylePriority.UseTextAlignment = false;
+            this.xrLabel10.Text = "Ambulante erzieherische Hilfen";
+            this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(272.2083F, 20F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "SkF e.V. Leverkusen";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 16F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(382.2921F, 22.91667F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(278.3745F, 20F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "Leistungsdokumentation";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // fieldHausbesuch
+            // 
+            this.fieldHausbesuch.DataMember = "Services";
+            this.fieldHausbesuch.Expression = "Iif([ServiceCategoryAbbr] == \'HB\' Or [ServiceCategoryAbbr] == \'HBH\',Round([Minute" +
+    "s]/60, 2),\'\')";
+            this.fieldHausbesuch.Name = "fieldHausbesuch";
+            // 
+            // fieldTelefonat
+            // 
+            this.fieldTelefonat.DataMember = "Services";
+            this.fieldTelefonat.Expression = "Iif([ServiceCategoryAbbr] == \'TEL\',Round([Minutes]/60, 2),\'\')";
+            this.fieldTelefonat.Name = "fieldTelefonat";
+            // 
+            // fieledInstitutionen
+            // 
+            this.fieledInstitutionen.DataMember = "Services";
+            this.fieledInstitutionen.Expression = "Iif([ServiceCategoryAbbr] == \'KI\',Round([Minutes]/60, 2),\'\')\n";
+            this.fieledInstitutionen.Name = "fieledInstitutionen";
+            // 
+            // fieldBegleitung
+            // 
+            this.fieldBegleitung.DataMember = "Services";
+            this.fieldBegleitung.Expression = "Iif([ServiceCategoryAbbr] == \'BGL\',Round([Minutes]/60, 2),\'\')\n";
+            this.fieldBegleitung.Name = "fieldBegleitung";
+            // 
+            // LeistungsdokuKurz
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldAbrechenbareMinuten,
+            this.fieldBillableFLS,
+            this.fieldAbrechenbareFLS,
+            this.fieldHausbesuch,
+            this.fieldTelefonat,
+            this.fieledInstitutionen,
+            this.fieldBegleitung});
+            this.DataSource = this.bindingSource1;
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.formattingRuleStartDate,
+            this.formattingRuleServiceDesc,
+            this.formattingRuleCostBearer,
+            this.formattingRuleEmployeeName});
+            this.Landscape = true;
+            this.Margins = new DevExpress.Drawing.DXMargins(69F, 30F, 50F, 30F);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.SnapGridSize = 9F;
+            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+        private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
+        private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
+		private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel23;
+		private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+		private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+        private DevExpress.XtraReports.UI.XRLabel lblDebitor;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel lblRechnungsbetrag;
+        private DevExpress.XtraReports.UI.XRLabel lblStundensatz;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.CalculatedField fieldHausbesuch;
+        private DevExpress.XtraReports.UI.CalculatedField fieldTelefonat;
+        private DevExpress.XtraReports.UI.CalculatedField fieledInstitutionen;
+        private DevExpress.XtraReports.UI.CalculatedField fieldBegleitung;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+    }
+}

ReportImp/SKFLeverkusenJuHi/LeistungsdokuKurz.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ReportImp/SKFLeverkusenJuHi/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("KundeXyz")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("KundeXyz")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("c1fed668-adb9-47e0-b589-1389618e1b6e")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

ReportImp/SKFLeverkusenJuHi/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/SKFLeverkusenJuHi/SkfLeverkusenJuHi.csproj

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E426D6C6-9A15-4AA5-9FCA-1F71BAB4B8C3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SkfLeverkusenJuHi</RootNamespace>
+    <AssemblyName>7653029063_Reports</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\CustomerDlls\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\CustomerDlls\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomReportCreator.cs" />
+    <Compile Include="HilfeplanStand.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="HilfeplanStand.designer.cs">
+      <DependentUpon>HilfeplanStand.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LeistungsdokuKurz.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LeistungsdokuKurz.designer.cs">
+      <DependentUpon>LeistungsdokuKurz.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Leistungsdoku.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Leistungsdoku.designer.cs">
+      <DependentUpon>Leistungsdoku.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Report\Report.csproj">
+      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
+      <Name>Report</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="HilfeplanStand.resx">
+      <DependentUpon>HilfeplanStand.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LeistungsdokuKurz.resx">
+      <DependentUpon>LeistungsdokuKurz.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Leistungsdoku.resx">
+      <DependentUpon>Leistungsdoku.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

ReportImp/SKFMMonheim/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/SKFMMonheim/RechnungBeWo67.Designer.cs

@@ -36,14 +36,6 @@ namespace SKFMMonheim
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.lblForderung = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
-            this.fieldMinuten = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
-            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
@@ -61,8 +53,16 @@ namespace SKFMMonheim
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            this.lblForderung = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldMinuten = new DevExpress.XtraReports.UI.CalculatedField();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -108,80 +108,6 @@ namespace SKFMMonheim
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
-            // lblForderung
-            // 
-            this.lblForderung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 423.5417F);
-            this.lblForderung.Multiline = true;
-            this.lblForderung.Name = "lblForderung";
-            this.lblForderung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblForderung.SizeF = new System.Drawing.SizeF(642F, 40.41669F);
-            this.lblForderung.StylePriority.UseFont = false;
-            this.lblForderung.Text = "Hieraus ergibt sich eine Forderung von ___ Std. x 49,82 EUR  =  ________ EUR.";
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 211.6667F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 133.5417F);
-            this.xrLabel2.StylePriority.UseBackColor = false;
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = resources.GetString("xrLabel2.Text");
-            this.xrLabel2.WordWrap = false;
-            // 
-            // lblAbrechnungszeitraum
-            // 
-            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 356.0417F);
-            this.lblAbrechnungszeitraum.Multiline = true;
-            this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
-            this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 67.49998F);
-            this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
-            this.lblAbrechnungszeitraum.Text = "Im Zeitraum vom [AccountingPeriodStart!dd.MM.yyyy] bis [AccountingPeriodEnd!dd.MM" +
-    ".yyyy] wurden ____ Dienstleistungsstunden un-\r\nmittelbare Betreuungsleistungen d" +
-    "es Betreuten Wohnens erbracht.\r\n";
-            // 
-            // fieldMinuten
-            // 
-            this.fieldMinuten.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
-            this.fieldMinuten.Expression = "[UnitCount] * 60";
-            this.fieldMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
-            this.fieldMinuten.Name = "fieldMinuten";
-            // 
-            // xrLabel15
-            // 
-            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrLabel15.Multiline = true;
-            this.xrLabel15.Name = "xrLabel15";
-            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel15.SizeF = new System.Drawing.SizeF(676.833F, 194.1667F);
-            this.xrLabel15.StylePriority.UseFont = false;
-            this.xrLabel15.Text = resources.GetString("xrLabel15.Text");
-            // 
-            // GroupFooter2
-            // 
-            this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel4,
-            this.xrLabel15});
-            this.GroupFooter2.HeightF = 267.1528F;
-            this.GroupFooter2.Name = "GroupFooter2";
-            // 
-            // xrLabel4
-            // 
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.7361F);
-            this.xrLabel4.Multiline = true;
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(642F, 40.41669F);
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.Text = "Unterschrift und Stempel des Anbieters ";
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
-            // 
             // xrLabel7
             // 
             this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -346,6 +272,80 @@ namespace SKFMMonheim
             this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell5.Weight = 1D;
             // 
+            // lblForderung
+            // 
+            this.lblForderung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 423.5417F);
+            this.lblForderung.Multiline = true;
+            this.lblForderung.Name = "lblForderung";
+            this.lblForderung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblForderung.SizeF = new System.Drawing.SizeF(642F, 40.41669F);
+            this.lblForderung.StylePriority.UseFont = false;
+            this.lblForderung.Text = "Hieraus ergibt sich eine Forderung von ___ Std. x 49,82 EUR  =  ________ EUR.";
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 211.6667F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 133.5417F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = resources.GetString("xrLabel2.Text");
+            this.xrLabel2.WordWrap = false;
+            // 
+            // lblAbrechnungszeitraum
+            // 
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 356.0417F);
+            this.lblAbrechnungszeitraum.Multiline = true;
+            this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
+            this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 67.49998F);
+            this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
+            this.lblAbrechnungszeitraum.Text = "Im Zeitraum vom [AccountingPeriodStart!dd.MM.yyyy] bis [AccountingPeriodEnd!dd.MM" +
+    ".yyyy] wurden ____ Dienstleistungsstunden un-\r\nmittelbare Betreuungsleistungen d" +
+    "es Betreuten Wohnens erbracht.\r\n";
+            // 
+            // fieldMinuten
+            // 
+            this.fieldMinuten.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
+            this.fieldMinuten.Expression = "[UnitCount] * 60";
+            this.fieldMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldMinuten.Name = "fieldMinuten";
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel15.Multiline = true;
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(676.833F, 194.1667F);
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.Text = resources.GetString("xrLabel15.Text");
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel4,
+            this.xrLabel15});
+            this.GroupFooter2.HeightF = 267.1528F;
+            this.GroupFooter2.Name = "GroupFooter2";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.7361F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(642F, 40.41669F);
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "Unterschrift des Anbieters ";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+            // 
             // RechnungBeWo67
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -362,13 +362,13 @@ namespace SKFMMonheim
             this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new DevExpress.Drawing.DXMargins(75, 75, 222, 71);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 222F, 71F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }

ReportImp/SKFMMonheim/RechnungBeWo67.resx

@@ -136,7 +136,4 @@ sowie der Betreuungsdokumentation nachgewiesen werden. Es wird weiterhin bestät
 dass die Verpflichtungen aus der Leistungs- und Prüfungs- sowie der Vergütungsverein-
 barung eingehalten wurden.</value>
   </data>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

ReportImp/VereinBeratungTherapie/Invoicing/CollectiveInvoiceCreation.cs

@@ -255,8 +255,7 @@ namespace VereinBeratungTherapie.Invoicing
                     if (scapTS.StartDate == ap.StartDate && scapTS.EndDate == ap.EndDate || ap.StartDate < period.End && ap.EndDate > period.Start)
                     {
                         var catBW = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDC(ap.ServiceCategory);
-                        decimal? minPreis;
-                        decimal? minGes;
+                        decimal minPreis = Math.Round(preis.Value / 60, 4, MidpointRounding.AwayFromZero);
                         decimal preisGes;
                         decimal preisBw = 0;
                         decimal lgBw = 0;
@@ -275,18 +274,25 @@ namespace VereinBeratungTherapie.Invoicing
                             }
                             else
                             {
-                                preisBw = Math.Round(Math.Round(preis.Value / 60, 4, MidpointRounding.AwayFromZero) * lgBw, 2, MidpointRounding.AwayFromZero);
+                                preisBw = Math.Round(minPreis * lgBw, 2, MidpointRounding.AwayFromZero);
                                 lgGes = LG + lgBw;
                             }
-                            preisGes = Math.Round(preis.Value * lgGes / 60, 2, MidpointRounding.AwayFromZero);
+                            if (new List<decimal> { 60, 120, 180, 240, 330, 450, 630, 900 }.Contains(lgGes))
+                            {
+                                preisGes = Math.Round(preis.Value * lgGes / 60, 2, MidpointRounding.AwayFromZero);
+                            }
+                            else
+                            {
+                                preisGes = Math.Round(minPreis * lgGes, 2, MidpointRounding.AwayFromZero);
+                            }
                             ii.AmountPerUnit = preisGes - preisBw;
                             ii.AmountTotal = ii.UnitCount * ii.AmountPerUnit;
                             break;
                         }
                         else
                         {
-                            preisBw = Math.Round(preis.Value * lgBw, 2, MidpointRounding.AwayFromZero);
-                            preisGes = Math.Round(preis.Value * (LG + lgBw), 2, MidpointRounding.AwayFromZero);
+                            preisBw = Math.Round(minPreis * lgBw, 2, MidpointRounding.AwayFromZero);
+                            preisGes = Math.Round(minPreis * (LG + lgBw), 2, MidpointRounding.AwayFromZero);
                             ii.AmountPerUnit = preisGes - preisBw;
                             ii.AmountTotal = ii.UnitCount * ii.AmountPerUnit;
                             break;

Service/Plugins/PluginLoader.cs

@@ -109,7 +109,7 @@ namespace BeWo.Service.Plugins
                 //t = "8677523325"; // BeWo Richartz
                 //t = "1765854593"; // Mein Betreutes Wohnen
                 //t = "6802909544"; // Lebenshilfe Coburg
-                //t = "9417634361"; // Synprax
+                t = "9417634361"; // Synprax
                 //t = "5761861730"; // Lebenshilfe Warendorf
                 //t = "6712648331"; // BeWo Färber
                 //t = "4982295287"; // ASB Hamm
@@ -388,8 +388,7 @@ namespace BeWo.Service.Plugins
                 //t = "2544632712"; // Wabe gGmbH
                 //t = "7077286353"; // PariSozial
                 //t = "5000000000";
-                //t = "2663321234"; // Aachener Laienhelfer Initiative e.V. 
-                //t = "8735029937"; // Caritasverband Ostvest e.V.
+
                 return t;
 #else
                 if (MultitenancyOperationContextExt.Current != null)