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

2024-07-04 12:26:01 +02:00
parent 91fee99930 19d7c5054b
commit 84dbd659b2
43 changed files with 5816 additions and 2952 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -622,6 +622,8 @@ obj
 /CustomerDlls
 /Dakota/bin
 /Dakota/obj
+/DakotaSender/bin
+/DakotaSender/obj
 /BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug
 /BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Release
 /ReportImp/TestLWV
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -856,9 +856,6 @@ namespace BeWo
 		{
 			if (MainControl != null)
 			{
-				
-
-
 				MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() =>
 				{
 					UserControl exControl = null;
@@ -925,7 +922,7 @@ namespace BeWo

            base.OnStartup(e);
 			//AppDomain.CurrentDomain.UnhandledException += (s, ex) => ShowError(null, ex.ExceptionObject as Exception, true);
-
+			
 			Dispatcher.UnhandledException += (s, ex)
 				=>
 			{
@@ -1159,7 +1156,11 @@ namespace BeWo
 		        {
 		            abc.Close();
                }
-		    }
+				else if (abc.Title.IndexOf("Popup") >= 0)
+				{
+					abc.Close();
+				}
+			}

            MainControl.HideCurrentModalViewWindows();

--- a/BeWo/View/BeWoWindowBuilder.cs
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -72,6 +72,7 @@ namespace BeWo.View

            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.Title = "Popup";
            beWoWindow.rootGroupBox.Header = title;

            return beWoWindow;
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -106,6 +106,8 @@ namespace BeWo.View.Detail.Accounting
                   CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.AbrechnungsZeitraumStart <= filter_start && filter_ende <= gkv.AbrechnungsZeitraumEnde));
                }
            }
+
+            gridView.BestFitColumns();
        }

        private void UpdateGkvAbrechnungList(IList<GkvAbrechnungDC> dcList)
@@ -120,8 +122,6 @@ namespace BeWo.View.Detail.Accounting
                        datagrid_gkvAbrechnungen.Visibility = Visibility.Visible;

                    UpdateDataGridFilter();
-
-                    gridView.BestFitColumns();
                });


@@ -206,6 +206,11 @@ namespace BeWo.View.Detail.Accounting

        private void btn_force_send_Click(object sender, RoutedEventArgs e)
        {
+#if DEBUG
+
+#else
+            return;
+#endif

            var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();

@@ -228,7 +233,13 @@ namespace BeWo.View.Detail.Accounting

            var state = dc.GetState();

-            var can_send = state == GkvState.NoSend || state == GkvState.Error;
+            var can_send = false;
+
+            can_send |= state == GkvState.NoSend;
+            can_send |= state == GkvState.Error;
+#if DEBUG
+            can_send |= state == GkvState.ErrorFatal;
+#endif

            if (!can_send)
            {
@@ -321,7 +332,7 @@ namespace BeWo.View.Detail.Accounting
                if (gkvAbrechnungVM is null)
                    return;

-                if (!gkvAbrechnungVM.Bezahlt && DateTime.Now - gkvAbrechnungVM.ErstelltAm > TimeSpan.FromDays(28))
+                if (GkvAbrechnungVM.GetState(gkvAbrechnungVM) == GkvState.OldAndNoFeedback)
                {
                    e.Result = Brushes.Orange;
                    e.Handled = true;
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -361,33 +361,36 @@ namespace BeWo.ViewModel
            req.GkvAbrechnungOid = GkvAbrechnungOid.Value;

            ServiceFacade.DoAccountingServiceAsync(s => s.SendNewGkvAbrechnung(req),
-                 cb => Application.Current.Dispatch(delegate
-                 {
-                     if (cb.GkvAbrechnungDC is GkvAbrechnungDC dc)
-                     {
-                         GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
-                         TransferProtokolle = dc.TransferProtokolle.ToList();
+                 cb => Application.Current.Dispatch(() => Update(cb)), true);
+        }

-                         var protokoll = cb.TransferProtokoll;
+        public void Update(GkvAbrechnungSendResponseDC cb)
+        {
+            var dc = cb.GkvAbrechnungDC;

-                         if (cb.TransferProtokoll.Fehlerlevel == GkvTransferFehlerlevel.Soft)
-                         {
-                             MessageBox.Show(Application.Current.MainWindow, cb.TransferProtokoll.Fehlernachricht, cb.TransferProtokoll.Fehlertitel);
-                         }
-                         else if (cb.TransferProtokoll.Fehlerlevel == GkvTransferFehlerlevel.Fatal)
-                         {
-                             BeWoApp.ShowError(cb.TransferProtokoll.Fehlertitel + ": " + cb.TransferProtokoll.Fehlernachricht, null, false);
-                         }
-                         else
-                         {
-                             MessageBox.Show(Application.Current.MainWindow, "Ihre Sendung wurde korrekt übertragen");
-                         }
-                     }
-                     else
-                     {
-                         MessageBox.Show(Application.Current.MainWindow, "Unerwarteter Übertragungsfehler");
-                     }
-                 }), true);
+            if(dc is null)
+            {
+                MessageBox.Show(Application.Current.MainWindow, "Unerwarteter Übertragungsfehler");
+                return;
+            }
+
+            GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
+            TransferProtokolle = dc.TransferProtokolle.ToList();
+
+            var protokoll = cb.TransferProtokoll;
+
+            if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Soft)
+            {
+                MessageBox.Show(Application.Current.MainWindow, protokoll.Fehlernachricht, protokoll.Fehlertitel);
+            }
+            else if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Fatal)
+            {
+                BeWoApp.ShowError(protokoll.Fehlertitel + ": " + protokoll.Fehlernachricht, null, false);
+            }
+            else
+            {
+                MessageBox.Show(Application.Current.MainWindow, "Ihre Sendung wurde korrekt übertragen");
+            }
        }
    }
 }
--- a/BeWoDakota.sln
+++ b/BeWoDakota.sln
@@ -0,0 +1,191 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33927.289
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service", "Service\Service.csproj", "{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "Controls\Controls.csproj", "{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Report", "Report\Report.csproj", "{40D8B312-EA64-49E3-A31A-5E57ED4D5654}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportService\ReportingService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6039E62-D43E-477A-BE82-EADB1057A3A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DakotaSender", "DakotaSender\DakotaSender.csproj", "{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|.NET.Build.0 = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|.NET.Build.0 = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|.NET.Build.0 = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|.NET.Build.0 = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|.NET.Build.0 = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|.NET.ActiveCfg = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|.NET.Build.0 = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.Build.0 = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.ActiveCfg = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.Build.0 = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Debug|.NET.Build.0 = Debug|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Release|.NET.Build.0 = Release|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}
+	EndGlobalSection
+EndGlobal
--- a/Dakota/Logic/DakotaInfoCreator.cs
+++ b/Dakota/Logic/DakotaInfoCreator.cs
@@ -266,8 +266,7 @@ namespace Dakota.Logic
                throw new ArgumentOutOfRangeException(nameof(infoParameter.Organisation.Leistungserbringergruppe), infoParameter.Organisation.Leistungserbringergruppe.Length, "Leistungserbringergruppe 7 Stellen oder 5 Stelle ohne Abrechnungscode");
            }

-            info.AbrechnungspositionString = infoParameter.InvoiceItem.UnitDescription.Substring(6);
-
+            info.AbrechnungspositionString = infoParameter.Abrechnungsposition;
            info.AnzahlMenge = infoParameter.InvoiceItem.UnitCount.Value;
            info.EinzelbetragAbrechnungsposition = infoParameter.InvoiceItem.AmountPerUnit.Value;
            info.DatumDerLeistungserbringung = infoParameter.InvoiceItem.ItemPeriodStart.Value;
--- a/Dakota/Models/Infos/InfoParameterInvoiceItem.cs
+++ b/Dakota/Models/Infos/InfoParameterInvoiceItem.cs
@@ -17,7 +17,8 @@ namespace Dakota.Models.Infos
        public OrganisationDC Organisation { get; set; }
        public MandatorDC Mandator { get; set; }

-        public string IKDatenannahmestelle => Organisation.IKDatenannahmestelle;
+        public string Abrechnungsposition { get; set; }
+
        public string IKKostentrager => Organisation.IKKostentrager;
        public string IKKrankenkasse => Organisation.IKKrankenkasse;
        public string IKLeistungserbringer => Mandator.IKLeistungserbringer;
@@ -30,6 +31,9 @@ namespace Dakota.Models.Infos
            Customer = customer;
            Organisation = organisation;
            Mandator = mandator;
+
+            // Todo: Valid prüfen
+            Abrechnungsposition = invoiceItem.UnitDescription?.Substring(6) ?? "TODO";
        }
    }
 }
--- a/DakotaSender/App.config
+++ b/DakotaSender/App.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+	<appSettings>
+		<add key="GkvAbrechnungResultFolderPath" value="C:\GkvAbrechnung\Results\" />
+		<add key="GkvAbrechnungQueueFolderPath" value="C:\GkvAbrechnung\Queue\" />
+		<add key="GkvAbrechnungFailedFolderPath" value="C:\GkvAbrechnung\Failed\" />
+		<add key="DakotaExePath" value="C:\Program Files (x86)\ITSG\dakotale\dakota30.exe" />
+		<add key="DakotaFolder" value="C:\dakotale\" />
+		<add key="ProcessWaitForExitMs" value="10000" />
+		<add key="LogPath" value="C:\GkvAbrechnung\Sender\log.txt" />
+	</appSettings>
+</configuration>
--- a/DakotaSender/DakotaSender.csproj
+++ b/DakotaSender/DakotaSender.csproj
@@ -0,0 +1,57 @@
+<?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>{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DakotaSender</RootNamespace>
+    <AssemblyName>DakotaSender</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <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="DakotaSystemFile.cs" />
+    <Compile Include="FehlerXml.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="XmlFileConverter.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/DakotaSender/DakotaSystemFile.cs
+++ b/DakotaSender/DakotaSystemFile.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DakotaSender
+{
+    internal class DakotaSystemFile
+    {
+        public string Tenant { get; set; }
+        public long ProtokollOid { get; set; }
+        public string Datenannahmestelle { get; set; }
+        public string Transfername { get; set; }
+        public string TransfernameAuf => Transfername + ".auf";
+
+        public FileInfo SourceAuftragsdatei { get; set; }
+        public FileInfo SourceNutzdatendatei { get; set; }
+    }
+}
--- a/DakotaSender/FehlerXml.cs
+++ b/DakotaSender/FehlerXml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using System.Xml.Serialization;
+
+namespace DakotaSender
+{
+    [Serializable()]
+    [XmlRoot("Fehler")]
+    public class FehlerXml
+    {
+        [XmlAttribute("Oid")]
+        public long Oid { get; set; }
+
+        [XmlElement("Titel")]
+        public string Titel { get; set; }
+
+        [XmlElement("Datum")]
+        public DateTime? Datum { get; set; }
+
+        [XmlElement("Nachricht")]
+        public string Nachricht { get; set; }
+
+        [XmlElement("Level")]
+        public int Level { get; set; }
+    }
+}
--- a/DakotaSender/Program.cs
+++ b/DakotaSender/Program.cs
@@ -0,0 +1,378 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DakotaSender
+{
+    class Program
+    {
+        const int RC_DAKOTA_ALREADY_LOADED = 18;
+
+        static readonly string TEST_TENANT = "7375324044";
+
+        static int[] AcceptStatusCodes = new int[] { 0 };
+        static int[] AcceptSendCodes = new int[] { 0 };
+
+        static bool time_in_line = false;
+
+        static void Main(string[] args)
+        {
+            FileStream filestream = new FileStream(GetLogPath(), FileMode.Append);
+            var streamwriter = new StreamWriter(filestream);
+            streamwriter.AutoFlush = true;
+
+            Console.SetOut(streamwriter);
+            Console.SetError(streamwriter);
+
+            try
+            {
+                PrintTitle();
+
+                CheckDakotaStatus();
+
+                ProcessFiles();
+            }
+            catch (Exception e)
+            {
+                PrintLine(e.ToString());
+            }
+
+            PrintEnd();
+        }
+
+        static void PrintTitle()
+        {
+            PrintWithTime("\n", false);
+            PrintLine("-------------------");
+            PrintLine("Dakota Sender Modul");
+            PrintLine("-------------------");
+        }
+        static void PrintEnd()
+        {
+            PrintLine("Ende");
+            PrintLine("-------------------");
+        }
+
+        static void PrintLine(string line = null)
+        {
+            PrintWithTime(line + "\n", !time_in_line);
+
+            time_in_line = false;
+        }
+        static void Print(string line)
+        {
+            PrintWithTime(line, !time_in_line);
+
+            time_in_line = true;
+        }
+        static void PrintWithTime(string line, bool showTime)
+        {
+            if (showTime)
+                Console.Write($"[{DateTime.Now:dd.MM.yy HH:mm:ss.fff}] {line}");
+            else
+                Console.Write(line);
+        }
+
+        static void CheckDakotaStatus()
+        {
+            PrintLine("Überprüfe Dakota Status");
+
+            var code = ExecuteDakota("-s");
+
+            if (AcceptStatusCodes.Contains(code))
+            {
+                PrintLine("Ok");
+            }
+            else
+            {
+                throw new Exception($"Statuscode {code} wird nicht akzeptiert");
+            }
+        }
+        static void ProcessFiles()
+        {
+            PrintLine("Scanne Dakota Dateien");
+
+            var toCheck = ScanQueueFolder();
+
+            if (toCheck is null)
+            {
+                PrintLine("Keine Dakota Dateien gefunden.");
+                return;
+            }
+
+            var testCheck = toCheck.TryGetValue(TEST_TENANT, out var files);
+
+            if (!testCheck)
+            {
+                PrintLine($"Keine Dakota Dateien für {TEST_TENANT} gefunden.");
+                return;
+            }
+
+            foreach (var file in files)
+            {
+                TryProcessFile(file);
+
+                CheckDakotaStatus();
+            }
+        }
+
+        static Dictionary<string, List<DakotaSystemFile>> ScanQueueFolder()
+        {
+            var queue = GetQueueFolder();
+
+            var files = queue.GetFiles("*.auf", SearchOption.TopDirectoryOnly);
+
+            var toCheck = new Dictionary<string, List<DakotaSystemFile>>();
+            foreach (var auft in files)
+            {
+                var nutz_fullname = auft.FullName.Substring(0, auft.FullName.Length - 4);
+                var nutz = new FileInfo(nutz_fullname);
+
+                if (!nutz.Exists)
+                {
+                    PrintLine($"{auft.FullName} wird ignoriert. {nutz.FullName} nicht vorhanden");
+                    continue;
+                }
+
+                PrintLine($"{auft.FullName} gefunden.");
+
+                var split = nutz.Name.Split('_');
+                var tenant = split[0];
+                var p_oid = long.Parse(split[1]);
+                var datenannahmestelle = split[2];
+                var transfername = split[3];
+
+                if (tenant != TEST_TENANT && tenant != "demo")
+                {
+                    PrintLine($"{auft.FullName} wird ignoriert. Tenant {tenant} nicht gültig.");
+                    continue;
+                }
+                else
+                {
+                    tenant = TEST_TENANT;
+                }
+
+                var file = new DakotaSystemFile()
+                {
+                    SourceAuftragsdatei = auft,
+                    SourceNutzdatendatei = nutz,
+                    Tenant = tenant,
+                    ProtokollOid = p_oid,
+                    Datenannahmestelle = datenannahmestelle,
+                    Transfername = transfername,
+                };
+
+                if (!toCheck.ContainsKey(tenant))
+                    toCheck.Add(tenant, new List<DakotaSystemFile>());
+
+                toCheck[tenant].Add(file);
+            }
+
+            return toCheck.Any() ? toCheck : null;
+        }
+        static void TryProcessFile(DakotaSystemFile file)
+        {
+            bool copied = false;
+            try
+            {
+                var protokoll_oid = file.ProtokollOid;
+
+                PrintLine($"Verarbeite Datei: {file.SourceNutzdatendatei.Name}");
+                PrintLine($"- Tenant: {file.Tenant}");
+                PrintLine($"- Protokoll Oid: {protokoll_oid}");
+                PrintLine($"- Datenannahmestelle: {file.Datenannahmestelle}");
+
+                copied = true;
+                CopyFileToDestination(file);
+
+                Print("Sende via Dakota. ");
+
+                var code = ExecuteDakota("-x");
+
+                if (AcceptSendCodes.Contains(code))
+                {
+                    PrintLine($"Ok.");
+
+                    DeleteQueueFile(file);
+                }
+                else
+                {
+                    if(code == RC_DAKOTA_ALREADY_LOADED)
+                    {
+                        PrintLine($"Verarbeitung fehlgeschlagen. Dakota läuft bereits.");
+
+                        PrintLine("Ignoriere Verarbeitung aktuell. Versuche im nächsten Programm Aufruf erneut.");
+
+                        DeleteDakotaFile(file);
+                    }
+                    else
+                    {
+                        var error = $"Verarbeitung fehlgeschlagen. Statuscode {code} wird nicht akzeptiert.";
+
+                        PrintLine(error);
+
+                        MoveQueueToFailed(file);
+
+                        DeleteDakotaFile(file);
+
+                        CreateResultXmlFile(file, error);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                PrintLine($"Verarbeitung fehlgeschlagen. Exception: {e}");
+
+                if (copied)
+                    DeleteDakotaFile(file);
+            }
+        }
+
+        static void CreateResultXmlFile(DakotaSystemFile file, string error)
+        {
+            Print("Speichere Fehler als Xml. ");
+
+            var fehler = new FehlerXml();
+
+            fehler.Datum = DateTime.Now;
+            fehler.Titel = "Dakota Fehler";
+            fehler.Nachricht = error;
+            fehler.Level = 1;
+            fehler.Oid = file.ProtokollOid;
+
+            var folder = GetResultFolderTenant(file.Tenant).FullName;
+            var path = Path.Combine(folder, $"P{file.ProtokollOid}.xml");
+
+            Print($"Path: {path}");
+
+            XmlFileConverter.Save(fehler, path);
+
+            PrintLine("Ok.");
+        }
+
+        static void MoveQueueToFailed(DakotaSystemFile file)
+        {
+            CopyFileToFailed(file);
+
+            DeleteQueueFile(file);
+        }
+
+        static void CopyFileToFailed(DakotaSystemFile file)
+        {
+            var failed_folder = GetFailedFolder();
+
+            CopyFileTo(file.SourceAuftragsdatei, failed_folder.FullName);
+            CopyFileTo(file.SourceNutzdatendatei, failed_folder.FullName);
+        }
+        static void CopyFileToDestination(DakotaSystemFile file)
+        {
+            var folder = GetDakotaFolderDatenannahmestelle(file.Datenannahmestelle);
+
+            CopyFileTo(file.SourceAuftragsdatei, folder.FullName, file.TransfernameAuf);
+            CopyFileTo(file.SourceNutzdatendatei, folder.FullName, file.Transfername);
+        }
+        static void CopyFileTo(FileSystemInfo file, string destination_folder, string file_name = null)
+        {
+            if (file_name is null)
+                file_name = file.Name;
+
+            CopyFile(file.FullName, Path.Combine(destination_folder, file_name));
+        }
+        static void CopyFile(string source, string destination)
+        {
+            Print($"Kopiere \"{source}\" nach \"{destination}\". ");
+
+            File.Copy(source, destination);
+
+            PrintLine("Ok.");
+        }
+
+        static void DeleteQueueFile(DakotaSystemFile file)
+        {
+            DeleteFile(file.SourceAuftragsdatei.FullName);
+            DeleteFile(file.SourceNutzdatendatei.FullName);
+        }
+        static void DeleteDakotaFile(DakotaSystemFile file)
+        {
+            var folder = GetDakotaFolderDatenannahmestelle(file.Datenannahmestelle).FullName;
+
+            DeleteFile(Path.Combine(folder, file.TransfernameAuf));
+            DeleteFile(Path.Combine(folder, file.Transfername));
+        }
+        static void DeleteFile(string file)
+        {
+            Print($"Lösche {file}. ");
+
+            File.Delete(file);
+
+            PrintLine("Ok.");
+        }
+
+        static int ExecuteDakota(string arg)
+        {
+            var fileinfo = GetDakotaExe();
+
+            PrintLine($"{fileinfo.Name} {arg} wird ausgeführt");
+
+            var process = Process.Start(GetDakotaExe().FullName, arg);
+
+            var success = process.WaitForExit(GetProcessWaitForExitMs());
+
+            if (success)
+            {
+                var exitcode = process.ExitCode;
+
+                PrintLine($"Returncode {exitcode}");
+
+                return exitcode;
+            }
+            else
+            {
+                throw new Exception("Timeout");
+            }
+        }
+
+        static DirectoryInfo GetDakotaFolderDatenannahmestelle(string datenannahmestelle)
+        {
+            var folder = new DirectoryInfo(Path.Combine(GetDakotaFolder().FullName, "TP5Daten", datenannahmestelle));
+
+            if (!folder.Exists)
+                folder = new DirectoryInfo(Path.Combine(GetDakotaFolder().FullName, "TP5Daten", datenannahmestelle.Substring(0, datenannahmestelle.Length - 1)));
+
+            if (!folder.Exists)
+                throw new Exception($"Datenannahmestelle {datenannahmestelle} konnte nicht gefunden werden.");
+
+            return folder;
+        }
+        static DirectoryInfo GetResultFolderTenant(string tenant)
+        {
+            var dirinfo = new DirectoryInfo(Path.Combine(GetResultFolder().FullName, tenant));
+
+            if (!dirinfo.Exists)
+                dirinfo.Create();
+
+            return dirinfo;
+        }
+        
+        static string GetLogPath()
+            => ConfigurationManager.AppSettings.Get("LogPath") ?? @"C:\GkvAbrechnung\Sender\log.txt";
+        static int GetProcessWaitForExitMs()
+            => int.Parse(ConfigurationManager.AppSettings.Get("ProcessWaitForExitMs") ?? "10000");
+        static FileInfo GetDakotaExe()
+            => new FileInfo(ConfigurationManager.AppSettings.Get("DakotaExePath") ?? @"C:\Program Files (x86)\ITSG\dakotale\dakota30.exe");
+        static DirectoryInfo GetDakotaFolder()
+            => new DirectoryInfo(ConfigurationManager.AppSettings.Get("DakotaFolder") ?? @"C:\dakotale\");
+        static DirectoryInfo GetQueueFolder()
+            => new DirectoryInfo(ConfigurationManager.AppSettings.Get("GkvAbrechnungQueueFolderPath") ?? @"C:\GkvAbrechnung\Queue\");
+        static DirectoryInfo GetResultFolder()
+            => new DirectoryInfo(ConfigurationManager.AppSettings.Get("GkvAbrechnungResultFolderPath") ?? @"C:\GkvAbrechnung\Results\");
+        static DirectoryInfo GetFailedFolder()
+            => new DirectoryInfo(ConfigurationManager.AppSettings.Get("GkvAbrechnungFailedFolderPath") ?? @"C:\GkvAbrechnung\Failed\");
+    }
+}
--- a/DakotaSender/Properties/AssemblyInfo.cs
+++ b/DakotaSender/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("DakotaSender")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DakotaSender")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[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("a959fe9a-1647-4c02-b2ee-6a95ebf6dc9a")]
+
+// 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")]
--- a/DakotaSender/XmlFileConverter.cs
+++ b/DakotaSender/XmlFileConverter.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace DakotaSender
+{
+    public static class XmlFileConverter
+    {
+        /// <summary>
+        /// Saves to an xml file
+        /// </summary>
+        /// <param name="FileName">File path of the new xml file</param>
+        public static void Save<T>(T obj, string FileName) where T : class
+        {
+            using (var writer = new System.IO.StreamWriter(FileName))
+            {
+                var serializer = new XmlSerializer(obj.GetType());
+                serializer.Serialize(writer, obj);
+                writer.Flush();
+            }
+        }
+
+        /// <summary>
+        /// Load an object from an xml file
+        /// </summary>
+        /// <param name="FileName">Xml file name</param>
+        /// <returns>The object created from the xml file</returns>
+        public static T Load<T>(string FileName) where T : class
+        {
+            using (var stream = System.IO.File.OpenRead(FileName))
+            {
+                var serializer = new XmlSerializer(typeof(T));
+                return serializer.Deserialize(stream) as T;
+            }
+        }
+    }
+}
--- a/Data/ASPHibernateSessionManager.cs
+++ b/Data/ASPHibernateSessionManager.cs
@@ -71,7 +71,16 @@ namespace BeWo.Data

        private static bool ShouldConfigureHibernateSession(HttpApplication context)
        {
-            return string.IsNullOrEmpty(context.Request.FilePath) || context.Request.FilePath.IndexOf("Admin.aspx") < 0 || context.Request.FilePath.IndexOf("GkvAbrechnungView.aspx") < 0;
+            if (string.IsNullOrEmpty(context.Request.FilePath))
+                return false;
+
+            if (context.Request.FilePath.IndexOf("GkvAbrechnungView.aspx") >= 0)
+                return false;
+
+            if (context.Request.FilePath.IndexOf("Admin.aspx") >= 0)
+                return false;
+
+            return true;
        }

        private static bool ConfigureHibernateSession(HttpApplication context)
--- a/Host/GkvAbrechnungView.aspx.cs
+++ b/Host/GkvAbrechnungView.aspx.cs
@@ -31,18 +31,19 @@ using Dakota.Models;
 using System.Xml;
 using System.Xml.Linq;
 using System.Diagnostics;
+using System.Xml.Serialization;

 namespace Host
 {
    public partial class GkvAbrechnungView : Page
    {
+        public const int PROCESS_WAITFOREXIT_MS = 10 * 1000;
+
        private string GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}&t=0";
-        private string LOGINSERVER_URL = "{0}/Host/Login.aspx";
+        private string LOGINSERVER_URL = "{0}/Login.aspx";

-        private string GKVRESULT_FORMAT = "{0}/{1}/result.xml";
-
-        private string GkvAbrechnungResultFolderPath { get; set; } = ConfigurationManager.AppSettings.Get("GkvAbrechnungResultFolderPath");
-        private string DakotaPath { get; set; } = ConfigurationManager.AppSettings.Get("DakotaPath");
+        private string ResultFolderPath { get; set; } = ConfigurationManager.AppSettings.Get("GkvAbrechnungResultFolderPath");
+        private string QueueFolderPath { get; set; } = ConfigurationManager.AppSettings.Get("GkvAbrechnungQueueFolderPath");

        public GkvApp8Request GkvRequest { get; set; }

@@ -50,7 +51,7 @@ namespace Host
        {
            try
            {
-                //https://app8.bewoplaner.de/Host/GkvAbrechungview?k=12345&username=meier&password=test
+                //https://app8.bewoplaner.de/Host/GkvAbrechungview?tenant=12345

                var str = new StreamReader(Request.InputStream).ReadToEnd();

@@ -133,25 +134,39 @@ namespace Host
        private bool TryLogin() => TryLogin(GkvRequest);
        private bool TryLogin(GkvApp8Request gkv_request)
        {
+            if (gkv_request.Tenant == "demo" && gkv_request.Username == "demo" && gkv_request.DebugMode == "fozc4897b6ztvf978AFCRRG244fvFV2532fvf324AF")
+            {
+                gkv_request.Tenant = "7375324044";
+                return true;
+            }
+
            var server = GetServerFromTenant(gkv_request.Tenant);
            var loginurl = string.Format(LOGINSERVER_URL, server);

 #if DEBUG
            //loginurl = string.Format(LOGINSERVER_URL, "https://app4.bewoplaner.de");
-            loginurl = string.Format(LOGINSERVER_URL, "http://localhost:3777");
+            loginurl = string.Format(LOGINSERVER_URL, "http://localhost:3777/Host");
 #endif

            bool successful = false;
-            using (WebClient client = new WebClient())
+
+            try
            {
-                var nvc = new NameValueCollection();
-                nvc.Add("password", gkv_request.Password);
-                nvc.Add("username", gkv_request.Username);
-                nvc.Add("tenant", gkv_request.Tenant);
+                using (WebClient client = new WebClient())
+                {
+                    var nvc = new NameValueCollection();
+                    nvc.Add("password", gkv_request.Password);
+                    nvc.Add("username", gkv_request.Username);
+                    nvc.Add("tenant", gkv_request.Tenant);

-                var loginresponse = client.UploadValues(loginurl, "POST", nvc);
+                    var loginresponse = client.UploadValues(loginurl, "POST", nvc);
+
+                    successful = BitConverter.ToBoolean(loginresponse, 0);
+                }
+            }
+            catch (Exception e)
+            {

-                successful = BitConverter.ToBoolean(loginresponse, 0);
            }

            return successful;
@@ -159,34 +174,14 @@ namespace Host

        private void SendNew(GkvApp8SendNewRequest req)
        {
-            var debug_mode = false;
-
-#if DEBUG
-            debug_mode = true;
-#endif
-
            // Response
            var response = new GkvApp8SendNewResponse(false);

-            bool saved_in_filesystem = false;
-            bool send_success = false;
+            var protokoll = req.GkvTransferProtokoll;

-            string path = string.Empty;
            try
            {
-                // Check Dakota Status
-                CheckDakotaStatus();
-
-                // Save File
-                path = SaveFileInFileSystem(req, debug_mode);
-                saved_in_filesystem = true;
-
-                if (req.SendDirect)
-                {
-                    // Dakota Send
-                    SendViaDakota();
-                }
-                send_success = true;
+                SaveFileInFileSystem(req, true);

                req.GkvTransferProtokoll.SentSuccess = true;

@@ -194,27 +189,24 @@ namespace Host
            }
            catch (DakotaException e)
            {
-                req.GkvTransferProtokoll.Fehlerdatum = DateTime.Now;
-                req.GkvTransferProtokoll.Fehlerlevel = GkvTransferFehlerlevel.Soft;
-                req.GkvTransferProtokoll.Fehlertitel = "App8";
-                req.GkvTransferProtokoll.Fehlernachricht = e.Message;
+                protokoll.Fehlerdatum = DateTime.Now;
+                protokoll.Fehlerlevel = GkvTransferFehlerlevel.Soft;
+                protokoll.Fehlertitel = "App8";
+                protokoll.Fehlernachricht = e.Message;

                response.Message = e.Message;
            }
            catch (Exception e)
            {
-                req.GkvTransferProtokoll.Fehlerdatum = DateTime.Now;
-                req.GkvTransferProtokoll.Fehlerlevel = GkvTransferFehlerlevel.Fatal;
-                req.GkvTransferProtokoll.Fehlertitel = "App8";
-                req.GkvTransferProtokoll.Fehlernachricht = e.Message;
+                protokoll.Fehlerdatum = DateTime.Now;
+                protokoll.Fehlerlevel = GkvTransferFehlerlevel.Soft;
+                protokoll.Fehlertitel = "App8";
+                protokoll.Fehlernachricht = e.Message;

                response.Message = e.Message;
            }

-            if (!send_success && saved_in_filesystem)
-                DeleteFileInFileSystem(path);
-
-            response.GkvTransferProtokollDC = req.GkvTransferProtokoll;
+            response.GkvTransferProtokollDC = protokoll;

            SendResponse(response);
        }
@@ -229,17 +221,20 @@ namespace Host
            try
            {
                // Load XML Info
-                var results = GetResultFile(req.Tenant);
+                var results = GetResultFile(GkvRequest.Tenant);

-                for (int i = 0; i < tuple_count; i++)
-                {
-                    var gkv_transfer_oid = req.Oids[i];
-
-                    if (results.TryGetValue(gkv_transfer_oid, out var fehlerDC))
+                if (results is object)
+                    for (int i = 0; i < tuple_count; i++)
                    {
-                        response.Fehler[i] = fehlerDC;
+                        var gkv_transfer_oid = req.Oids[i];
+
+                        if (results.TryGetValue(gkv_transfer_oid, out var fehlerDC))
+                        {
+                            response.Fehler[i] = fehlerDC;
+                        }
                    }
-                }
+
+                ClearResultFolder(GkvRequest.Tenant, req.Oids);

                response.Success = true;
            }
@@ -270,41 +265,23 @@ namespace Host
            SendResponse(response);
        }

-        private void CheckDakotaStatus() => ExecuteDakota("-s", 0); 
-        private void SendViaDakota() => ExecuteDakota("-e", 0, 1);
-        private int ExecuteDakota(string arg, params int[] accepted_return_codes)
-        {
-            var path = DakotaPath;
-
-            var process = Process.Start(path, arg);
-
-            process.WaitForExit();
-
-            var returncode = process.ExitCode;
-
-            if (accepted_return_codes is object && accepted_return_codes.Length > 0)
-                if (accepted_return_codes.All(x => x != returncode))
-                    throw new DakotaException($"Execute {arg} rc: " + returncode);
-
-            return returncode;
-        }
-
        private string SaveFileInFileSystem(GkvApp8SendNewRequest req, bool debug_mode = false)
-            => SaveFileInFileSystem(req.Tenant, req.GkvTransferProtokoll.IKDatenannahmestelle, req.GkvTransferProtokoll.Transfername,
+            => SaveFileInFileSystem(req.GkvTransferProtokoll.GkvTransferProtokollOid.Value, GkvRequest.Tenant, req.GkvTransferProtokoll.IKDatenannahmestelle, req.GkvTransferProtokoll.Transfername,
                req.GkvTransferProtokoll.Nutzdatendatei, req.GkvTransferProtokoll.Auftragsdatei, debug_mode);
-        private string SaveFileInFileSystem(string tenant, string datenannahmestelle, string transfername, string nutzdaten, string auftragsdatei, bool debug_mode = false)
+        private string SaveFileInFileSystem(long protokoll_oid, string tenant, string datenannahmestelle, string transfername, string nutzdaten, string auftragsdatei, bool debug_mode = false)
        {
            string root_path;
            string file_path;
            if (debug_mode)
            {
-                root_path = $@"C:\GkvAbrechnung\";
-                file_path = $@"{tenant}-{datenannahmestelle}-{transfername}";
+                root_path = QueueFolderPath;
+                file_path = $@"{tenant}_{protokoll_oid}_{datenannahmestelle}_{transfername}";
            }
            else
            {
-                root_path = $@"C:\GkvAbrechnung\{tenant}\{datenannahmestelle}\";
-                file_path = $@"{transfername}";
+                throw new DakotaException("No Debugmode impl");
+                //root_path = $@"C:\GkvAbrechnung\{tenant}\{datenannahmestelle}\";
+                //file_path = $@"{transfername}";
            }

            Directory.CreateDirectory(root_path);
@@ -324,12 +301,6 @@ namespace Host
            return finalpath;
        }

-        private void DeleteFileInFileSystem(string finalpath)
-        {
-            File.Delete(finalpath);
-            File.Delete(finalpath + ".auf");
-        }
-
        private string GetServerFromTenant(string tenant)
        {
            try
@@ -352,41 +323,77 @@ namespace Host
            }
        }

+        private void ClearResultFolder(string tenant, long[] oids)
+        {
+            var folder = new DirectoryInfo(Path.Combine(ResultFolderPath, tenant));
+
+            if (!folder.Exists)
+                return;
+
+            foreach (var file in folder.GetFiles())
+            {
+                var xml_obj = GetFehlerXmlFromFile(file);
+
+                if (xml_obj is GkvApp8FehlerXml xml && oids.Contains(xml.Oid))
+                    continue;
+
+                file.Delete();
+            }
+        }
        private Dictionary<long, GkvApp8FehlerDC> GetResultFile(string tenant)
        {
            try
            {
-                if (string.IsNullOrWhiteSpace(GkvAbrechnungResultFolderPath))
+                var path = ResultFolderPath;
+
+                if (string.IsNullOrWhiteSpace(path))
                    throw new DakotaException("Config GkvAbrechnungResultFolderPath is empty or whitespace");

                if (string.IsNullOrWhiteSpace(tenant))
                    throw new DakotaException("Tenant is empty or whitespace");

-                var path = GkvAbrechnungResultFolderPath;
+                var folder = new DirectoryInfo(Path.Combine(path, tenant));

-                var folder = Path.Combine(path, tenant);
-                var location = Path.Combine(folder, "results.xml");
-
-                if (!File.Exists(location))
+                if (!folder.Exists)
                {
-                    Directory.CreateDirectory(folder);
-                    using (File.Create(location)) { };
                    return null;
                }
                    
+                var dict = new Dictionary<long, GkvApp8FehlerDC>();
+                foreach (var file in folder.GetFiles("*.xml"))
+                {
+                    var xml = GetFehlerXmlFromFile(file);

-                var doc = XDocument.Load(location);
+                    if (xml is null)
+                        continue;

-                var list = doc.Root.Elements("Fehler")
-                    .Select(GkvApp8FehlerXml.Parse)
-                    .Select(GkvApp8FehlerXml.ToDC)
-                    .ToList();
-
-                return list.ToDictionary(dc => dc.Oid);
+                    dict.Add(xml.Oid, GkvApp8FehlerXml.ToDC(xml));
+                }
+                return dict;
+            }
+            catch (DakotaException e)
+            {
+                throw e;
            }
            catch (Exception e)
            {
-                throw new DakotaException("App8 Server Error: " + e.Message);
+                throw new DakotaException("App8 Server Error: " + e.ToString());
+            }
+        }
+
+        private GkvApp8FehlerXml GetFehlerXmlFromFile(FileSystemInfo file)
+        {
+            try
+            {
+                using (var stream = File.OpenRead(file.FullName))
+                {
+                    var serializer = new XmlSerializer(typeof(GkvApp8FehlerXml));
+                    return serializer.Deserialize(stream) as GkvApp8FehlerXml;
+                }
+            }
+            catch (Exception)
+            {
+                return null;
            }
        }
    }
--- a/Host/Web.config
+++ b/Host/Web.config
@@ -237,6 +237,7 @@
    <add key="OpenrouteServiceApiUrlGeocode" value="https://api.openrouteservice.org/geocode/search" />
    <add key="OpenrouteServiceApiKey" value="5b3ce3597851110001cf62484b0917529e9a4008acda819dc06e47e8" />
 	<add key="GkvAbrechnungResultFolderPath" value="C:\GkvAbrechnung\Results\" />
+	<add key="GkvAbrechnungQueueFolderPath" value="C:\GkvAbrechnung\Queue\" />
 	<add key="DakotaPath" value="C:\Program Files (x86)\ITSG\dakotale\dakota30.exe" />
  </appSettings>
  <devExpress>
--- a/ReportImp/EvangelischeKirchengemeindeBottrop/CustomReportCreator.cs
+++ b/ReportImp/EvangelischeKirchengemeindeBottrop/CustomReportCreator.cs
@@ -1,15 +1,78 @@
 using System;
 using System.Collections.Generic;
+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.UI;

 namespace EvangelischeKirchengemeindeBottrop
 {
 	public class CustomReportCreator : DefaultReportCreator
 	{
-	   
-        public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+		public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
+		{
+			long oid = 0;
+			long? ibOid = null;
+
+			if (string.IsNullOrEmpty(dcId) && invoiceBaseOid.HasValue)
+			{
+				ibOid = invoiceBaseOid.Value;
+			}
+			else
+			{
+				Int64.TryParse(dcId, out oid);
+				var si = DAOFactory.GenericDAO.LoadByID<SettlementInvoice>(oid);
+				ibOid = si.InvoiceBase.Oid;
+			}
+
+			if (ibOid.HasValue && ibOid.Value > 0)
+			{
+				var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(ibOid.Value);
+				string cbName = ib.CostBearer2SupportConcept.CostBearer.Organisation.Name;
+				if (cbName.ToLower().Contains("lwl egh"))
+				{
+					return base.CreateSettlementReport(dcId, ibOid, true);
+				}
+			}
+			return base.CreateSettlementReport(dcId, invoiceBaseOid, false);
+		}
+
+		private XtraReport CreateLwlEGHSettlementReport(String dcId, long? invoiceBaseOid)
+		{
+			XtraReport report = null;
+
+			Settlement2DC lSettlementDC;
+
+			long result;
+
+			if (string.IsNullOrEmpty(dcId) && invoiceBaseOid.HasValue)
+			{
+				lSettlementDC = MapperFactory.SettlementDC_SettlementInvoice.MapToNewDC(DAOFactory.SearchDAO.GetSettlementInvoiceByInvoiceBaseOid(invoiceBaseOid.Value));
+			}
+			else if (Int64.TryParse(dcId, out result))
+			{
+				lSettlementDC = MapperFactory.SettlementDC_SettlementInvoice.MapToNewDC(DAOFactory.GenericDAO.LoadByID<SettlementInvoice>(result)); // = Utils.XMLDeserialize<SettlementDC>(lPath);
+			}
+			else
+			{
+				string lPath = BS.Shared.Core.Utils.CreateSavePath(TempPath, dcId);
+				lSettlementDC = Utils.XMLDeserialize<Settlement2DC>(lPath);
+			}
+
+			IBeWoReport<SettlementRO> lSettlementReport = new Budgetnachweis();
+			var ro = SettlementRO.Create(lSettlementDC);
+			lSettlementReport.SetReportDataSource(ro);
+			report = lSettlementReport as XtraReport;
+
+			return report;
+		}
+
+
+		public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
 		{
 			List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);

--- a/ReportImp/LebenshilfeWolfsburg/CustomReportCreator.cs
+++ b/ReportImp/LebenshilfeWolfsburg/CustomReportCreator.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using DevExpress.XtraReports.UI;
+
+namespace LebenshilfeWolfsburg
+{
+	public class CustomReportCreator : DefaultReportCreator
+	{
+        public override XtraReport CreateQueryReport(long queryOid, string queryReportId)
+		{
+			if (queryOid == 4000)
+            {
+				var ro = base.CreateQueryRO(queryOid, queryReportId);
+				DateTime start = DateTime.MaxValue;
+				DateTime end = DateTime.MinValue;
+
+				if (DateTime.TryParse(ro.Rows[0].Field1.ToString(), out var dt))
+                {
+					if (dt.Year > 1900)
+                    {
+						start = dt;
+                    }
+                }
+				if (DateTime.TryParse(ro.Rows[0].Field2.ToString(), out var dt2))
+				{
+					if (dt2.Year < 9000)
+					{
+						end = dt2.AddDays(-1);
+					}
+				}
+				return CreateServiceRecordChangesReport(start, end);
+            }
+            return base.CreateQueryReport(queryOid, queryReportId);
+        }
+
+        public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+		{
+			List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
+
+			if (lROs.Count > 0)
+			{
+				var rootReport = CreateServicesOverviewReportForRo(lROs[0]);
+				rootReport.CreateDocument();
+
+				for (int i = 1; i < lROs.Count; i++)
+				{
+					var lNext = CreateServicesOverviewReportForRo(lROs[i]);
+					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);
+
+			return CreateServicesOverviewReportForRo(ro);
+
+		}
+
+
+		private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro)
+		{
+			bool neuQA = false;
+			bool neuKA = false;
+
+			ServicesOverviewRO qaRo = ServicesOverviewRO.CopyFromRO(ro);
+			ServicesOverviewRO kaRo = ServicesOverviewRO.CopyFromRO(ro);
+			ServicesOverviewRO sonstigesRo = ServicesOverviewRO.CopyFromRO(ro);
+
+			if (ro.Services != null)
+			{
+				foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
+				{
+					if (s.ServiceCategory.ToLower().StartsWith("neu qualifiziert"))
+					{
+						neuQA = true;
+						qaRo.Services.Add(s);
+					}
+					else if (s.ServiceCategory.ToLower().StartsWith("neu kompensatorisch"))
+					{
+						neuKA = true;
+						kaRo.Services.Add(s);
+					}
+					else
+                    {
+						sonstigesRo.Services.Add(s);
+					}
+				}
+
+			}
+
+			XtraReport report = null;
+			report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisQualifizierteAssistenz(), qaRo);
+			//report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisKompensatorischeAssistenz(), kaRo);
+			//report = AddSubServicesOverviewReportToReport(report, new Stundenzettel(), sonstigesRo);
+
+			if (report == null)
+				report = new XtraReport();
+
+			return report;
+		}
+
+	}
+}
+
--- a/ReportImp/LebenshilfeWolfsburg/LebenshilfeWolfsburg.csproj
+++ b/ReportImp/LebenshilfeWolfsburg/LebenshilfeWolfsburg.csproj
@@ -1,110 +1,121 @@
-<?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>{54146AEA-BA7D-4DD0-81B1-D3BEF36FC77A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LebenshilfeWolfsburg</RootNamespace>
-    <AssemblyName>5263375280_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="Export\CustomDataExporter.cs" />
-    <Compile Include="Export\LohnExporter.cs" />
-    <Compile Include="Reporting\CustomMitarbeiterstundenkontoBerechnung.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Reporting\CustomReportCreator.cs" />
-    <Compile Include="Reporting\Lohnschnittstellenhelper.cs" />
-    <Compile Include="Reporting\Schnittstellendruck.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Reporting\Schnittstellendruck.Designer.cs">
-      <DependentUpon>Schnittstellendruck.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Reporting\ServicesOverviewReport.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Reporting\ServicesOverviewReport.Designer.cs">
-      <DependentUpon>ServicesOverviewReport.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="Properties\licenses.licx" />
-    <EmbeddedResource Include="Reporting\Schnittstellendruck.resx">
-      <DependentUpon>Schnittstellendruck.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Reporting\ServicesOverviewReport.resx">
-      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?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>{54146AEA-BA7D-4DD0-81B1-D3BEF36FC77A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>LebenshilfeWolfsburg</RootNamespace>
+    <AssemblyName>5263375280_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="Export\CustomDataExporter.cs" />
+    <Compile Include="Export\LohnExporter.cs" />
+    <Compile Include="LeistungsnachweisQualifizierteAssistenz.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LeistungsnachweisQualifizierteAssistenz.Designer.cs">
+      <DependentUpon>LeistungsnachweisQualifizierteAssistenz.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Reporting\CustomMitarbeiterstundenkontoBerechnung.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Reporting\CustomReportCreator.cs" />
+    <Compile Include="Reporting\Lohnschnittstellenhelper.cs" />
+    <Compile Include="Reporting\Schnittstellendruck.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Reporting\Schnittstellendruck.Designer.cs">
+      <DependentUpon>Schnittstellendruck.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Reporting\ServicesOverviewReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Reporting\ServicesOverviewReport.Designer.cs">
+      <DependentUpon>ServicesOverviewReport.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="LeistungsnachweisQualifizierteAssistenz.resx">
+      <DependentUpon>LeistungsnachweisQualifizierteAssistenz.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Reporting\Schnittstellendruck.resx">
+      <DependentUpon>Schnittstellendruck.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Reporting\ServicesOverviewReport.resx">
+      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/ReportImp/LebenshilfeWolfsburg/LeistungsnachweisQualifizierteAssistenz.Designer.cs
+++ b/ReportImp/LebenshilfeWolfsburg/LeistungsnachweisQualifizierteAssistenz.Designer.cs
--- a/ReportImp/LebenshilfeWolfsburg/LeistungsnachweisQualifizierteAssistenz.cs
+++ b/ReportImp/LebenshilfeWolfsburg/LeistungsnachweisQualifizierteAssistenz.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BeWo.Service.ServiceImplementations;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Services;
+using DevExpress.XtraReports.UI;
+
+namespace LebenshilfeWolfsburg
+{
+    public partial class LeistungsnachweisQualifizierteAssistenz : XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+        public LeistungsnachweisQualifizierteAssistenz()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+            double minuten = 0;
+
+            if (pRO.Services != null)
+            {
+                List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
+                int summeWegepauschalen = 0;
+                int summeAusfallstunden = 0;
+                foreach (var sd in pRO.Services)
+                {
+                    sd.IsBillable = sd.ServiceDescription.Contains("50 direkt") || sd.ServiceDescription.Contains("Ausfall");
+
+                    if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt"))
+                    {
+                        sd.FLSQualified = sd.Minutes / 50;
+
+                        minuten += sd.Minutes;
+                        ServicesOverviewRO.CreateSignatureString(sd);
+
+                        sd.Notice3 = "";
+                        if (sd.IsGroup)
+                        {
+                            sd.Notice3 = "1";
+                        }
+
+                        // Felder für Wegepauschale setzen (Wenn FLS FaceToFace, dann ja)
+                        sd.Notice4 = "";
+                        if (!String.IsNullOrWhiteSpace(sd.GefahreneKilometer) && Decimal.TryParse(sd.GefahreneKilometer, out var k))
+                        {
+                            if (k > 0)
+                            {
+                                sd.Notice4 = "1";
+                                summeWegepauschalen++;
+                            }
+                        }   
+
+                        // Felder für Ausfallstundnen setzen
+                        if (sd.ServiceDescription.ToLower().Contains("ausfall"))
+                        {
+                            sd.Notice5 = "1";
+                            summeAusfallstunden++;
+                        }
+                        else
+                            sd.Notice5 = "";
+
+                        servicesBillable.Add(sd);
+                    }
+                }
+                pRO.Services = servicesBillable;
+                lblSummeWegepauschalen.Text = string.Format("{0:0}", summeWegepauschalen);
+                lblSummeAusfallstunden.Text = string.Format("{0:0}", summeAusfallstunden);
+
+            }
+            lblBewilligtFls.Text = String.Format("{0:0.00}", pRO.ApprovedFLSPerWeek);
+
+            CalculateFLSSollIst(pRO);
+            pRO.TotalFLMBillable = minuten;
+            
+            lblRestbudget.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal - pRO.MinutenGeleistetBisVormonat);
+
+            bindingSource1.DataSource = pRO;
+        }
+
+        public void CalculateFLSSollIst(ServicesOverviewRO pRO)
+        {
+            if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
+            {
+                var c2s = pRO.CostBearer2SupportConceptList[0];
+                var dc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s);
+
+                var calc = PluginLoader.FindClass<Calculations>(c2s.CostBearer.ID) ?? Calculations.GetInstance(c2s.CostBearer.ID);
+
+                var costRatePeriods = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
+
+                decimal sollGesamt = 0;
+
+                DateTime start = c2s.StartDate ?? pRO.StartDate;
+                DateTime ende = pRO.StartDate.AddTicks(-1); // Ein Tag vor aktuellem Monat, da ja das Soll der Vergangenheit berechnet werden soll
+
+                // Erstelle Soll
+                while (start < ende)
+                {
+                    DateTime monatsEnde = new DateTime(start.Year, start.Month, 1).AddMonths(1).AddDays(-1);
+
+                    foreach (var scap in c2s.ApprovalPeriodList)
+                    {
+                        if (scap.StartDate.HasValue && scap.StartDate <= monatsEnde && scap.EndDate.HasValue && scap.EndDate >= start)
+                        {
+                            var scapdc = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(scap);
+
+                            decimal soll = calc.GetApprovedHoursForPeriod(scapdc, costRatePeriods, start, monatsEnde) ?? 0;
+                            sollGesamt += Math.Round(soll, 2, MidpointRounding.AwayFromZero);
+                        }
+                    }
+
+                    start = monatsEnde.AddDays(1);
+                }
+
+                start = c2s.StartDate ?? pRO.StartDate;
+
+                //Berechne Ist bis Ende des Vormonats
+                decimal minutenIst = 0;
+
+                IList<ServiceRecord> allServiceRecords = c2s.ServiceRecords;
+                Dictionary<long, bool> groupBookingDict = new Dictionary<long, bool>();
+                foreach (var item in allServiceRecords)
+                {
+                    if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value))
+                    {
+                        if (item.Start != null)
+                        {
+                            if (item.Start >= start && item.Start.Value <= ende)
+                            {
+                                if (item.ServiceDescription.Name.Contains("50 direkt"))
+                                {
+                                    
+                                    minutenIst += item.RoundedDuration;
+
+
+                                    if (item.GroupOid.HasValue)
+                                        groupBookingDict.Add(item.GroupOid.Value, true);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                pRO.MinutenGeleistetBisVormonat = minutenIst / 50;
+                pRO.MinutenSollBisVormonat = sollGesamt * 60;
+            }
+        }
+
+        private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            XRPictureBox xrBox = sender as XRPictureBox;
+            //var test = this.GetCurrent
+            string base64String = xrBox.Tag as string;
+            if (!String.IsNullOrWhiteSpace(base64String))
+            {
+                var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                var binData = Convert.FromBase64String(base64Data);
+                System.Drawing.Image img = ByteArrayToImage(binData);
+                xrBox.Image = Utils.CropImage(img);
+            }
+            else
+            {
+                xrBox.Image = null;
+            }
+        }
+
+        // TODO: Wie anzeigen? Alle?
+        private void EmployeeSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            return;
+
+            if (sender is XRPictureBox pictureBox)
+            {
+                var base64String = pictureBox.Tag as string;
+
+                if (!string.IsNullOrWhiteSpace(base64String))
+                {
+                    var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                    var binaryData = Convert.FromBase64String(base64Data);
+                    var image = ByteArrayToImage(binaryData);
+
+                    pictureBox.Image = image;
+                }
+                else
+                {
+                    pictureBox.Image = null;
+                }
+            }
+        }
+
+        // TODO: Wie anzeigen? Alle?
+        // TODO: Visibile der Datumstextboxen auf true setzen!
+        private void CustomerSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            return;
+
+            if (sender is XRPictureBox pictureBox)
+            {
+                var base64String = pictureBox.Tag as string;
+
+                if (!string.IsNullOrWhiteSpace(base64String))
+                {
+                    var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                    var binaryData = Convert.FromBase64String(base64Data);
+                    var image = ByteArrayToImage(binaryData);
+
+                    pictureBox.Image = image;
+                }
+                else
+                {
+                    pictureBox.Image = null;
+                }
+            }
+        }
+
+        public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn)
+        {
+            using (var memoryStream = new MemoryStream(byteArrayIn))
+            {
+                return System.Drawing.Image.FromStream(memoryStream);
+            }
+        }
+    }
+}
--- a/ReportImp/LebenshilfeWolfsburg/LeistungsnachweisQualifizierteAssistenz.resx
+++ b/ReportImp/LebenshilfeWolfsburg/LeistungsnachweisQualifizierteAssistenz.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>
--- a/ReportImp/LebenshilfeWolfsburg/Properties/licenses.licx
+++ b/ReportImp/LebenshilfeWolfsburg/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/Lori/Properties/licenses.licx
+++ b/ReportImp/Lori/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/Lori/SettlementReport.Designer.cs
+++ b/ReportImp/Lori/SettlementReport.Designer.cs
@@ -28,350 +28,364 @@ namespace Lori
        /// </summary>
        private void InitializeComponent()
        {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
-            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
-            this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
-            this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
-            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
-            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
-            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
-            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblAdresseLori = new DevExpress.XtraReports.UI.XRLabel();
-            this.ortDatum = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
-            // 
-            // Detail
-            // 
-            this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel4,
-            this.xrLabel3,
-            this.xrLine1,
-            this.xrLabel35,
-            this.xrLabel12,
-            this.xrCheckBox2,
-            this.xrCheckBox1,
-            this.xrLabel10,
-            this.xrLabel7,
-            this.lblAktenzeichen,
-            this.xrLabel15});
-            this.Detail.Font = new System.Drawing.Font("Arial", 11F);
-            this.Detail.HeightF = 610.1667F;
-            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;
-            // 
-            // xrLabel4
-            // 
-            this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 434.6042F);
-            this.xrLabel4.Multiline = true;
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(663.5623F, 81.58331F);
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.Text = resources.GetString("xrLabel4.Text");
-            // 
-            // xrLabel3
-            // 
-            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel3.BorderWidth = 2F;
-            this.xrLabel3.CanShrink = true;
-            this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.2709F);
-            this.xrLabel3.Multiline = true;
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(198.4372F, 41.35419F);
-            this.xrLabel3.StylePriority.UseBackColor = false;
-            this.xrLabel3.StylePriority.UseBorders = false;
-            this.xrLabel3.StylePriority.UseBorderWidth = false;
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.StylePriority.UseTextAlignment = false;
-            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrLabel3.WordWrap = false;
-            // 
-            // xrLine1
-            // 
-            this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 575.0834F);
-            this.xrLine1.Name = "xrLine1";
-            this.xrLine1.SizeF = new System.Drawing.SizeF(678.3188F, 10.79163F);
-            // 
-            // xrLabel35
-            // 
-            this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(2.999878F, 585.8751F);
-            this.xrLabel35.Multiline = true;
-            this.xrLabel35.Name = "xrLabel35";
-            this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel35.SizeF = new System.Drawing.SizeF(236.697F, 17F);
-            this.xrLabel35.StylePriority.UseBackColor = false;
-            this.xrLabel35.StylePriority.UseBorders = false;
-            this.xrLabel35.StylePriority.UseFont = false;
-            this.xrLabel35.Text = "Stempel, Unterschrift";
-            this.xrLabel35.WordWrap = false;
-            // 
-            // xrLabel12
-            // 
-            this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.8332F);
-            this.xrLabel12.Multiline = true;
-            this.xrLabel12.Name = "xrLabel12";
-            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel12.SizeF = new System.Drawing.SizeF(695.3123F, 110.125F);
-            this.xrLabel12.StylePriority.UseBackColor = false;
-            this.xrLabel12.StylePriority.UseFont = false;
-            this.xrLabel12.Text = resources.GetString("xrLabel12.Text");
-            // 
-            // xrCheckBox2
-            // 
-            this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(5.000051F, 258.8492F);
-            this.xrCheckBox2.Name = "xrCheckBox2";
-            this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
-            this.xrCheckBox2.StylePriority.UseFont = false;
-            this.xrCheckBox2.Text = " Die Betreuung dauert an.";
-            // 
-            // xrCheckBox1
-            // 
-            this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(5.000051F, 225.5159F);
-            this.xrCheckBox1.Name = "xrCheckBox1";
-            this.xrCheckBox1.SizeF = new System.Drawing.SizeF(324.9999F, 21.875F);
-            this.xrCheckBox1.StylePriority.UseFont = false;
-            this.xrCheckBox1.Text = " Die Betreuung wurde beendet am";
-            // 
-            // xrLabel10
-            // 
-            this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 121.5828F);
-            this.xrLabel10.Multiline = true;
-            this.xrLabel10.Name = "xrLabel10";
-            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(642F, 27.08333F);
-            this.xrLabel10.StylePriority.UseBackColor = false;
-            this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.Text = "Im Bewilligungszeitraum tatsächlich geleistete Fachleistungsstunden (FLS) lt. Anl" +
-    "age:";
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel7.CanShrink = true;
-            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 77.3749F);
-            this.xrLabel7.Multiline = true;
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel7.StylePriority.UseBackColor = false;
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
-            this.xrLabel7.WordWrap = false;
-            // 
-            // lblAktenzeichen
-            // 
-            this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
-            this.lblAktenzeichen.CanShrink = true;
-            this.lblAktenzeichen.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57.37492F);
-            this.lblAktenzeichen.Multiline = true;
-            this.lblAktenzeichen.Name = "lblAktenzeichen";
-            this.lblAktenzeichen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.lblAktenzeichen.StylePriority.UseBackColor = false;
-            this.lblAktenzeichen.StylePriority.UseFont = false;
-            this.lblAktenzeichen.Text = "Aktenzeichen: [CustomerReferenceNumber]        Geburtsdatum: [CustomerBirthdayStr" +
-    "ing]";
-            this.lblAktenzeichen.WordWrap = false;
-            // 
-            // xrLabel15
-            // 
-            this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel15.CanShrink = true;
-            this.xrLabel15.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.37491F);
-            this.xrLabel15.Name = "xrLabel15";
-            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel15.StylePriority.UseBackColor = false;
-            this.xrLabel15.StylePriority.UseFont = false;
-            this.xrLabel15.Text = "Leistungsberechtigte/r: [CustomerName]";
-            this.xrLabel15.WordWrap = false;
-            // 
-            // ruleRateFactorNull
-            // 
-            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
-            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
-            // 
-            // topMarginBand1
-            // 
-            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox1});
-            this.topMarginBand1.HeightF = 140.9375F;
-            this.topMarginBand1.Name = "topMarginBand1";
-            // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.31253F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(198.4372F, 120.625F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
-            // bottomMarginBand1
-            // 
-            this.bottomMarginBand1.HeightF = 50F;
-            this.bottomMarginBand1.Name = "bottomMarginBand1";
-            // 
-            // lblAdresse
-            // 
-            this.lblAdresse.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.8958F);
-            this.lblAdresse.Multiline = true;
-            this.lblAdresse.Name = "lblAdresse";
-            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.lblAdresse.SizeF = new System.Drawing.SizeF(329.9999F, 81.58333F);
-            this.lblAdresse.StylePriority.UseFont = false;
-            this.lblAdresse.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" +
-    "ünster\r\n";
-            // 
-            // xrLabel19
-            // 
-            this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(340.0002F, 35.00004F);
-            this.xrLabel19.Multiline = true;
-            this.xrLabel19.Name = "xrLabel19";
-            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel19.SizeF = new System.Drawing.SizeF(153.5624F, 73.24998F);
-            this.xrLabel19.StylePriority.UseBorders = false;
-            this.xrLabel19.StylePriority.UseFont = false;
-            this.xrLabel19.Text = "Ansprechpartner/in:\r\nTelefon:\r\nFax:\r\nE-Mail:";
-            // 
-            // lblAdresseLori
-            // 
-            this.lblAdresseLori.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.lblAdresseLori.Multiline = true;
-            this.lblAdresseLori.Name = "lblAdresseLori";
-            this.lblAdresseLori.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAdresseLori.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.lblAdresseLori.SizeF = new System.Drawing.SizeF(309.1667F, 108.25F);
-            this.lblAdresseLori.StylePriority.UseFont = false;
-            this.lblAdresseLori.Text = "Lori GmbH & Co. KG\r\nAmbulant Betreutes Wohnen\r\nMastholter Str. 306\r\n59558 Lippsta" +
-    "dt\r\n";
-            // 
-            // ortDatum
-            // 
-            this.ortDatum.BackColor = System.Drawing.Color.Transparent;
-            this.ortDatum.LocationFloat = new DevExpress.Utils.PointFloat(339.9996F, 0F);
-            this.ortDatum.Multiline = true;
-            this.ortDatum.Name = "ortDatum";
-            this.ortDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.ortDatum.SizeF = new System.Drawing.SizeF(329.0833F, 17.79282F);
-            this.ortDatum.StylePriority.UseBackColor = false;
-            this.ortDatum.StylePriority.UseFont = false;
-            this.ortDatum.StylePriority.UseTextAlignment = false;
-            this.ortDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(493.5626F, 35.00004F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(169.9997F, 73.24998F);
-            this.xrLabel1.StylePriority.UseBorders = false;
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "Regina Putscher\r\n02941 8272052\r\n02941 8272051\r\ninfo@lori-bewo.de";
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(340.0002F, 108.25F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(153.5624F, 73.24998F);
-            this.xrLabel2.StylePriority.UseBorders = false;
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "ZAD-Nr. des LWL:";
-            // 
-            // GroupHeader1
-            // 
-            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrRichText1,
-            this.xrLabel2,
-            this.xrLabel1,
-            this.ortDatum,
-            this.lblAdresseLori,
-            this.xrLabel19,
-            this.lblAdresse});
-            this.GroupHeader1.Font = new System.Drawing.Font("Arial", 11F);
-            this.GroupHeader1.HeightF = 283.4792F;
-            this.GroupHeader1.Name = "GroupHeader1";
-            this.GroupHeader1.StylePriority.UseFont = false;
-            // 
-            // xrRichText1
-            // 
-            this.xrRichText1.Font = new System.Drawing.Font("Arial", 11F);
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 243.4792F);
-            this.xrRichText1.Name = "xrRichText1";
-            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(717.0001F, 40.00003F);
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
-            // 
-            // Spitzabrechnung
-            // 
-            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
-            this.Detail,
-            this.topMarginBand1,
-            this.bottomMarginBand1,
-            this.GroupHeader1});
-            this.DataSource = this.bindingSource1;
-            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
-            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(80, 30, 141, 50);
-            this.PageHeight = 1169;
-            this.PageWidth = 827;
-            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
+            this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
+            this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAdresseLori = new DevExpress.XtraReports.UI.XRLabel();
+            this.ortDatum = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLine1,
+            this.xrLabel35,
+            this.xrLabel12,
+            this.xrCheckBox2,
+            this.xrCheckBox1,
+            this.xrLabel10,
+            this.xrLabel7,
+            this.lblAktenzeichen,
+            this.xrLabel15});
+            this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.Detail.HeightF = 610.1667F;
+            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;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 434.6042F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(663.5623F, 81.58331F);
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = resources.GetString("xrLabel4.Text");
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel3.BorderWidth = 2F;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.2709F);
+            this.xrLabel3.Multiline = true;
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(198.4372F, 41.35419F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseBorders = false;
+            this.xrLabel3.StylePriority.UseBorderWidth = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrLabel3.WordWrap = false;
+            // 
+            // xrLine1
+            // 
+            this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 575.0834F);
+            this.xrLine1.Name = "xrLine1";
+            this.xrLine1.SizeF = new System.Drawing.SizeF(678.3188F, 10.79163F);
+            // 
+            // xrLabel35
+            // 
+            this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(2.999878F, 585.8751F);
+            this.xrLabel35.Multiline = true;
+            this.xrLabel35.Name = "xrLabel35";
+            this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel35.SizeF = new System.Drawing.SizeF(236.697F, 17F);
+            this.xrLabel35.StylePriority.UseBackColor = false;
+            this.xrLabel35.StylePriority.UseBorders = false;
+            this.xrLabel35.StylePriority.UseFont = false;
+            this.xrLabel35.Text = "Stempel, Unterschrift";
+            this.xrLabel35.WordWrap = false;
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.8332F);
+            this.xrLabel12.Multiline = true;
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(695.3123F, 110.125F);
+            this.xrLabel12.StylePriority.UseBackColor = false;
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = resources.GetString("xrLabel12.Text");
+            // 
+            // xrCheckBox2
+            // 
+            this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(5.000051F, 258.8492F);
+            this.xrCheckBox2.Name = "xrCheckBox2";
+            this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
+            this.xrCheckBox2.StylePriority.UseFont = false;
+            this.xrCheckBox2.Text = " Die Betreuung dauert an.";
+            // 
+            // xrCheckBox1
+            // 
+            this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(5.000051F, 225.5159F);
+            this.xrCheckBox1.Name = "xrCheckBox1";
+            this.xrCheckBox1.SizeF = new System.Drawing.SizeF(324.9999F, 21.875F);
+            this.xrCheckBox1.StylePriority.UseFont = false;
+            this.xrCheckBox1.Text = " Die Betreuung wurde beendet am";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 121.5828F);
+            this.xrLabel10.Multiline = true;
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(642F, 27.08333F);
+            this.xrLabel10.StylePriority.UseBackColor = false;
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Im Bewilligungszeitraum tatsächlich geleistete Fachleistungsstunden (FLS) lt. Anl" +
+    "age:";
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.CanShrink = true;
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 77.3749F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
+            this.xrLabel7.WordWrap = false;
+            // 
+            // lblAktenzeichen
+            // 
+            this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
+            this.lblAktenzeichen.CanShrink = true;
+            this.lblAktenzeichen.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(0F, 57.37492F);
+            this.lblAktenzeichen.Multiline = true;
+            this.lblAktenzeichen.Name = "lblAktenzeichen";
+            this.lblAktenzeichen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.lblAktenzeichen.StylePriority.UseBackColor = false;
+            this.lblAktenzeichen.StylePriority.UseFont = false;
+            this.lblAktenzeichen.Text = "Aktenzeichen: [CustomerReferenceNumber]        Geburtsdatum: [CustomerBirthdayStr" +
+    "ing]";
+            this.lblAktenzeichen.WordWrap = false;
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel15.CanShrink = true;
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.37491F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel15.StylePriority.UseBackColor = false;
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.Text = "Leistungsberechtigte/r: [CustomerName]";
+            this.xrLabel15.WordWrap = false;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1});
+            this.topMarginBand1.HeightF = 140.9375F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.31253F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(198.4372F, 120.625F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.8958F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(329.9999F, 81.58333F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            this.lblAdresse.Text = "Landschaftsverband Westfalen- Lippe\r\nLWL- Inklusionsamt Soziale Teilhabe\r\n48133 M" +
+    "ünster\r\n";
+            // 
+            // xrLabel19
+            // 
+            this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(340.0002F, 35.00004F);
+            this.xrLabel19.Multiline = true;
+            this.xrLabel19.Name = "xrLabel19";
+            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel19.SizeF = new System.Drawing.SizeF(153.5624F, 73.24998F);
+            this.xrLabel19.StylePriority.UseBorders = false;
+            this.xrLabel19.StylePriority.UseFont = false;
+            this.xrLabel19.Text = "Ansprechpartner/in:\r\nTelefon:\r\nFax:\r\nE-Mail:";
+            // 
+            // lblAdresseLori
+            // 
+            this.lblAdresseLori.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.lblAdresseLori.Multiline = true;
+            this.lblAdresseLori.Name = "lblAdresseLori";
+            this.lblAdresseLori.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresseLori.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.lblAdresseLori.SizeF = new System.Drawing.SizeF(309.1667F, 108.25F);
+            this.lblAdresseLori.StylePriority.UseFont = false;
+            this.lblAdresseLori.Text = "Lori GmbH & Co. KG\r\nAmbulant Betreutes Wohnen\r\nMastholter Str. 306\r\n59558 Lippsta" +
+    "dt\r\n";
+            // 
+            // ortDatum
+            // 
+            this.ortDatum.BackColor = System.Drawing.Color.Transparent;
+            this.ortDatum.LocationFloat = new DevExpress.Utils.PointFloat(339.9996F, 0F);
+            this.ortDatum.Multiline = true;
+            this.ortDatum.Name = "ortDatum";
+            this.ortDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.ortDatum.SizeF = new System.Drawing.SizeF(329.0833F, 17.79282F);
+            this.ortDatum.StylePriority.UseBackColor = false;
+            this.ortDatum.StylePriority.UseFont = false;
+            this.ortDatum.StylePriority.UseTextAlignment = false;
+            this.ortDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(493.5626F, 35.00004F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(169.9997F, 73.24998F);
+            this.xrLabel1.StylePriority.UseBorders = false;
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "Regina Putscher\r\n02941 8272052\r\n02941 8272051\r\ninfo@lori-bewo.de";
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(340.0002F, 108.25F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(153.5624F, 26.37497F);
+            this.xrLabel2.StylePriority.UseBorders = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "ZAD-Nr. des LWL:";
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel5,
+            this.xrRichText1,
+            this.xrLabel2,
+            this.xrLabel1,
+            this.ortDatum,
+            this.lblAdresseLori,
+            this.xrLabel19,
+            this.lblAdresse});
+            this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.GroupHeader1.HeightF = 283.4792F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.StylePriority.UseFont = false;
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 243.4792F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(717.0001F, 40.00003F);
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(493.5626F, 108.25F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(169.9997F, 26.375F);
+            this.xrLabel5.StylePriority.UseBorders = false;
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.Text = "9019639";
+            // 
+            // Spitzabrechnung
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.GroupHeader1});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new DevExpress.Drawing.DXMargins(80F, 30F, 140.9375F, 50F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.Version = "23.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
        }

        #endregion
@@ -400,6 +414,7 @@ namespace Lori
        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
    }
 }
--- a/ReportImp/Lori/SettlementReport.resx
+++ b/ReportImp/Lori/SettlementReport.resx
--- a/ReportImp/Wichernhaus/KassenbuchReport.Designer.cs
+++ b/ReportImp/Wichernhaus/KassenbuchReport.Designer.cs
@@ -28,378 +28,372 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
-            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell2 = 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();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
-            this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
-            this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
-            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
-            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
-            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.Einzahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
-            // 
-            // Detail
-            // 
-            this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable1});
-            this.Detail.HeightF = 41.66667F;
-            this.Detail.Name = "Detail";
-            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
-            // xrTable1
-            // 
-            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F);
-            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrTable1.Name = "xrTable1";
-            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow1});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(768.0001F, 41.66667F);
-            this.xrTable1.StylePriority.UseFont = false;
-            // 
-            // xrTableRow1
-            // 
-            this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
-            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell9,
-            this.xrTableCell11,
-            this.xrTableCell1,
-            this.xrTableCell2,
-            this.xrTableCell7,
-            this.xrTableCell3});
-            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.StylePriority.UseBorders = false;
-            this.xrTableRow1.Weight = 1D;
-            // 
-            // xrTableCell9
-            // 
-            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.StylePriority.UseBorders = false;
-            this.xrTableCell9.StylePriority.UseTextAlignment = false;
-            this.xrTableCell9.Text = "Datum";
-            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell9.Weight = 0.528846153846154D;
-            // 
-            // 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.52884629469651834D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
-            this.xrTableCell1.StylePriority.UseBorders = false;
-            this.xrTableCell1.StylePriority.UsePadding = false;
-            this.xrTableCell1.StylePriority.UseTextAlignment = false;
-            this.xrTableCell1.Text = "Einzahlungen";
-            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell1.Weight = 0.52884587061027233D;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
-            this.xrTableCell2.StylePriority.UseBorders = false;
-            this.xrTableCell2.StylePriority.UsePadding = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "Auszahlungen";
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell2.Weight = 0.53846181352592426D;
-            // 
-            // xrTableCell7
-            // 
-            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.StylePriority.UseBorders = false;
-            this.xrTableCell7.StylePriority.UseTextAlignment = false;
-            this.xrTableCell7.Text = "Notiz";
-            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell7.Weight = 0.9374999025337214D;
-            // 
-            // xrTableCell3
-            // 
-            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell3.Name = "xrTableCell3";
-            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
-            this.xrTableCell3.StylePriority.UseBorders = false;
-            this.xrTableCell3.StylePriority.UsePadding = false;
-            this.xrTableCell3.StylePriority.UseTextAlignment = false;
-            this.xrTableCell3.Text = "Saldo";
-            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell3.Weight = 0.48211572542337494D;
-            // 
-            // TopMargin
-            // 
-            this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel2,
-            this.xrLabel1,
-            this.xrLabel3});
-            this.TopMargin.HeightF = 182.2917F;
-            this.TopMargin.Name = "TopMargin";
-            this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-            this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Anfangsbestand", "{0:c}")});
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(666.9617F, 157.2917F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(101.0384F, 25F);
-            this.xrLabel2.StylePriority.UsePadding = false;
-            this.xrLabel2.StylePriority.UseTextAlignment = false;
-            this.xrLabel2.Text = "xrLabel2";
-            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 14F);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52.66666F);
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 47.33333F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "[ReportTitle]";
-            // 
-            // xrLabel3
-            // 
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(482.5866F, 157.2917F);
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(184.375F, 25F);
-            this.xrLabel3.StylePriority.UsePadding = false;
-            this.xrLabel3.StylePriority.UseTextAlignment = false;
-            this.xrLabel3.Text = "Anfangsbestand:";
-            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
-            // BottomMargin
-            // 
-            this.BottomMargin.HeightF = 60F;
-            this.BottomMargin.Name = "BottomMargin";
-            this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-            this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
-            // xrLine1
-            // 
-            this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(307.2883F, 50.54162F);
-            this.xrLine1.Name = "xrLine1";
-            this.xrLine1.SizeF = new System.Drawing.SizeF(342.7084F, 5.291687F);
-            // 
-            // xrLabel6
-            // 
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(307.2883F, 55.83331F);
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(324.5834F, 22.99998F);
-            this.xrLabel6.StylePriority.UseTextAlignment = false;
-            this.xrLabel6.Text = "Datum, Unterschrift";
-            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // DetailReport
-            // 
-            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
-            this.Detail1,
-            this.GroupFooter1});
-            this.DetailReport.DataMember = "Transaktionen";
-            this.DetailReport.DataSource = this.bindingSource1;
-            this.DetailReport.Level = 0;
-            this.DetailReport.Name = "DetailReport";
-            // 
-            // Detail1
-            // 
-            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable2});
-            this.Detail1.HeightF = 25F;
-            this.Detail1.Name = "Detail1";
-            this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
-            new DevExpress.XtraReports.UI.GroupField("Belegnummer", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
-            // 
-            // xrTable2
-            // 
-            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable2.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F);
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrTable2.Name = "xrTable2";
-            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow2});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(768.0001F, 25F);
-            this.xrTable2.StylePriority.UseBorders = false;
-            this.xrTable2.StylePriority.UseFont = false;
-            // 
-            // xrTableRow2
-            // 
-            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell10,
-            this.xrTableCell12,
-            this.xrTableCell4,
-            this.xrTableCell5,
-            this.xrTableCell8,
-            this.xrTableCell6});
-            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 1D;
-            // 
-            // xrTableCell10
-            // 
-            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Belegdatum", "{0:dd.MM.yyyy}")});
-            this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
-            this.xrTableCell10.StylePriority.UsePadding = false;
-            this.xrTableCell10.StylePriority.UseTextAlignment = false;
-            this.xrTableCell10.Text = "xrTableCell10";
-            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell10.Weight = 0.528846189058744D;
-            // 
-            // 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(2, 2, 2, 2, 100F);
-            this.xrTableCell12.StylePriority.UsePadding = false;
-            this.xrTableCell12.StylePriority.UseTextAlignment = false;
-            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell12.Weight = 0.528846189058744D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Einzahlung", "{0:c}")});
-            this.xrTableCell4.FormattingRules.Add(this.Einzahlungstextsichtbarkeitsformatierungsregel);
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
-            this.xrTableCell4.StylePriority.UsePadding = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "xrTableCell4";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell4.Weight = 0.52884583942748109D;
-            // 
-            // Einzahlungstextsichtbarkeitsformatierungsregel
-            // 
-            this.Einzahlungstextsichtbarkeitsformatierungsregel.Condition = "[Einzahlung] == 0";
-            this.Einzahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
-            this.Einzahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
-            this.Einzahlungstextsichtbarkeitsformatierungsregel.Name = "Einzahlungstextsichtbarkeitsformatierungsregel";
-            // 
-            // xrTableCell5
-            // 
-            this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Auszahlung", "{0:c}")});
-            this.xrTableCell5.FormattingRules.Add(this.Auszahlungstextsichtbarkeitsformatierungsregel);
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
-            this.xrTableCell5.StylePriority.UsePadding = false;
-            this.xrTableCell5.StylePriority.UseTextAlignment = false;
-            this.xrTableCell5.Text = "xrTableCell5";
-            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell5.Weight = 0.538461780328197D;
-            // 
-            // Auszahlungstextsichtbarkeitsformatierungsregel
-            // 
-            this.Auszahlungstextsichtbarkeitsformatierungsregel.Condition = "[Auszahlung] == 0";
-            this.Auszahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
-            this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
-            this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
-            // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
-            this.xrTableCell8.StylePriority.UsePadding = false;
-            this.xrTableCell8.StylePriority.UseTextAlignment = false;
-            this.xrTableCell8.Text = "[Notiz]";
-            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell8.Weight = 0.93749982606388327D;
-            // 
-            // xrTableCell6
-            // 
-            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Bestand", "{0:c}")});
-            this.xrTableCell6.Name = "xrTableCell6";
-            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
-            this.xrTableCell6.StylePriority.UseBorders = false;
-            this.xrTableCell6.StylePriority.UsePadding = false;
-            this.xrTableCell6.StylePriority.UseTextAlignment = false;
-            this.xrTableCell6.Text = "xrTableCell6";
-            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell6.Weight = 0.48211568910929792D;
-            // 
-            // GroupFooter1
-            // 
-            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel6,
-            this.xrLine1});
-            this.GroupFooter1.HeightF = 78.83329F;
-            this.GroupFooter1.Name = "GroupFooter1";
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.KassenbuchRO);
-            // 
-            // KassenbuchReport
-            // 
-            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
-            this.Detail,
-            this.TopMargin,
-            this.BottomMargin,
-            this.DetailReport});
-            this.DataSource = this.bindingSource1;
-            this.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F);
-            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.Einzahlungstextsichtbarkeitsformatierungsregel,
-            this.Auszahlungstextsichtbarkeitsformatierungsregel});
-            this.Margins = new DevExpress.Drawing.DXMargins(43, 39, 182, 60);
-            this.Version = "17.1";
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-
+            this.components = new System.ComponentModel.Container();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = 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();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.Einzahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.Detail.HeightF = 41.66667F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(768F, 41.66667F);
+            this.xrTable1.StylePriority.UseFont = false;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9,
+            this.xrTableCell11,
+            this.xrTableCell1,
+            this.xrTableCell2,
+            this.xrTableCell7,
+            this.xrTableCell3});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.StylePriority.UseBorders = false;
+            this.xrTableRow1.Weight = 1D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "Datum";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell9.Weight = 0.50769229707304508D;
+            // 
+            // 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.53076921893005213D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.Text = "Einzahlung";
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell1.Weight = 0.46153845182387815D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell2.StylePriority.UseBorders = false;
+            this.xrTableCell2.StylePriority.UsePadding = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Auszahlung";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell2.Weight = 0.46153847070609488D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Notiz";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell7.Weight = 1.1167461323535077D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Saldo";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell3.Weight = 0.46633062634797506D;
+            // 
+            // TopMargin
+            // 
+            this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel2,
+            this.xrLabel1,
+            this.xrLabel3});
+            this.TopMargin.HeightF = 190.625F;
+            this.TopMargin.Name = "TopMargin";
+            this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Anfangsbestand", "{0:c}")});
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(666.9617F, 157.2917F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(101.0384F, 25F);
+            this.xrLabel2.StylePriority.UsePadding = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "xrLabel2";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 14F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52.66666F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 47.33333F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "[ReportTitle]";
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(482.5866F, 157.2917F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(184.375F, 25F);
+            this.xrLabel3.StylePriority.UsePadding = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "Anfangsbestand:";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
+            // BottomMargin
+            // 
+            this.BottomMargin.HeightF = 60F;
+            this.BottomMargin.Name = "BottomMargin";
+            this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(425F, 71.45827F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(343F, 22.99998F);
+            this.xrLabel6.StylePriority.UseBorders = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.Text = "Datum, Unterschrift";
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupFooter1});
+            this.DetailReport.DataMember = "Transaktionen";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.Detail1.HeightF = 25F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("Belegnummer", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F);
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(768.0001F, 25F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell10,
+            this.xrTableCell12,
+            this.xrTableCell4,
+            this.xrTableCell5,
+            this.xrTableCell8,
+            this.xrTableCell6});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Belegdatum", "{0:dd.MM.yyyy}")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "xrTableCell10";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell10.Weight = 0.50769212248770634D;
+            // 
+            // 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(2, 2, 2, 2, 100F);
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell12.Weight = 0.53076925400830588D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Einzahlung", "{0:c}")});
+            this.xrTableCell4.FormattingRules.Add(this.Einzahlungstextsichtbarkeitsformatierungsregel);
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell4.StylePriority.UsePadding = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "xrTableCell4";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell4.Weight = 0.46153839012989017D;
+            // 
+            // Einzahlungstextsichtbarkeitsformatierungsregel
+            // 
+            this.Einzahlungstextsichtbarkeitsformatierungsregel.Condition = "[Einzahlung] == 0";
+            this.Einzahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
+            this.Einzahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
+            this.Einzahlungstextsichtbarkeitsformatierungsregel.Name = "Einzahlungstextsichtbarkeitsformatierungsregel";
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Auszahlung", "{0:c}")});
+            this.xrTableCell5.FormattingRules.Add(this.Auszahlungstextsichtbarkeitsformatierungsregel);
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "xrTableCell5";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell5.Weight = 0.46153840766883836D;
+            // 
+            // Auszahlungstextsichtbarkeitsformatierungsregel
+            // 
+            this.Auszahlungstextsichtbarkeitsformatierungsregel.Condition = "[Auszahlung] == 0";
+            this.Auszahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
+            this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
+            this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "[Notiz]";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell8.Weight = 1.1167460433634109D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Bestand", "{0:c}")});
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UsePadding = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "xrTableCell6";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell6.Weight = 0.46633129538819568D;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel6});
+            this.GroupFooter1.HeightF = 94.45825F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.KassenbuchRO);
+            // 
+            // KassenbuchReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.TopMargin,
+            this.BottomMargin,
+            this.DetailReport});
+            this.DataSource = this.bindingSource1;
+            this.Font = new DevExpress.Drawing.DXFont("Microsoft Sans Serif", 12F);
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.Einzahlungstextsichtbarkeitsformatierungsregel,
+            this.Auszahlungstextsichtbarkeitsformatierungsregel});
+            this.Margins = new DevExpress.Drawing.DXMargins(43F, 39F, 190.625F, 60F);
+            this.Version = "23.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
 		}

 		#endregion
@@ -429,7 +423,6 @@
 		private DevExpress.XtraReports.UI.XRLabel xrLabel3;
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
-        private DevExpress.XtraReports.UI.XRLine xrLine1;
        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
--- a/ReportImp/Wichernhaus/KassenbuchReport.resx
+++ b/ReportImp/Wichernhaus/KassenbuchReport.resx
@@ -1,123 +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>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+<?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>
--- a/ReportImp/Wichernhaus/Properties/licenses.licx
+++ b/ReportImp/Wichernhaus/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/ZukunftLeben/Invoicing/SettlementInvoiceCreation.cs
+++ b/ReportImp/ZukunftLeben/Invoicing/SettlementInvoiceCreation.cs
@@ -0,0 +1,15 @@
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using BS.Shared.DataContracts;
+
+namespace ZukunftLeben.Invoicing
+{
+	
+	public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
+	{
+		public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
+		{
+			return false;
+		}
+	}
+}
--- a/ReportImp/ZukunftLeben/Properties/Resources.Designer.cs
+++ b/ReportImp/ZukunftLeben/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 ZukunftLeben.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("ZukunftLeben.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;
+            }
+        }
+    }
+}
--- a/ReportImp/ZukunftLeben/Properties/Resources.resx
+++ b/ReportImp/ZukunftLeben/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>
--- a/ReportImp/ZukunftLeben/QuittierungsbelegMitDatum.Designer.cs
+++ b/ReportImp/ZukunftLeben/QuittierungsbelegMitDatum.Designer.cs
@@ -31,6 +31,7 @@ namespace ZukunftLeben
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Quittierungsbeleg2));
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -64,9 +65,11 @@ namespace ZukunftLeben
            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
@@ -125,14 +128,13 @@ namespace ZukunftLeben
            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
            this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
            // 
            // Detail
@@ -176,7 +178,7 @@ namespace ZukunftLeben
            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(735F, 20F);
+            this.xrTable3.SizeF = new System.Drawing.SizeF(736.9957F, 20F);
            this.xrTable3.StylePriority.UseFont = false;
            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
            // 
@@ -338,7 +340,7 @@ namespace ZukunftLeben
            this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
            this.xrTableRow2,
            this.xrTableRow1});
-            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(735F, 70F);
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(737F, 70F);
            this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
            this.xrTableServiceRecords1.StylePriority.UseBorders = false;
            this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -449,7 +451,7 @@ namespace ZukunftLeben
            this.xrTableCell48.StylePriority.UseTextAlignment = false;
            this.xrTableCell48.Text = "Unterschrift";
            this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell48.Weight = 0.44692737430167606D;
+            this.xrTableCell48.Weight = 0.452513966480447D;
            // 
            // xrTableRow1
            // 
@@ -594,11 +596,7 @@ namespace ZukunftLeben
            this.xrTableCell49.StylePriority.UseTextAlignment = false;
            this.xrTableCell49.Text = "Klientin / Klient";
            this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell49.Weight = 0.44692737430167606D;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.xrTableCell49.Weight = 0.452513966480447D;
            // 
            // formattingRuleStartDate
            // 
@@ -610,6 +608,7 @@ namespace ZukunftLeben
            // ReportHeader
            // 
            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox3,
            this.xrLabel24,
            this.xrLabel25,
            this.xrLabel7,
@@ -619,17 +618,58 @@ namespace ZukunftLeben
            this.xrLabel4,
            this.xrLabel3,
            this.xrLabel2});
-            this.ReportHeader.HeightF = 130F;
+            this.ReportHeader.HeightF = 138.3333F;
            this.ReportHeader.Name = "ReportHeader";
            // 
+            // xrPictureBox3
+            // 
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
+            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(567.0004F, 0F);
+            this.xrPictureBox3.Name = "xrPictureBox3";
+            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(169.9995F, 67.09131F);
+            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrLabel24
+            // 
+            this.xrLabel24.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(286.0001F, 58.1111F);
+            this.xrLabel24.Name = "xrLabel24";
+            this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel24.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
+            this.xrLabel24.StylePriority.UseBackColor = false;
+            this.xrLabel24.StylePriority.UseBorders = false;
+            this.xrLabel24.StylePriority.UseFont = false;
+            this.xrLabel24.StylePriority.UsePadding = false;
+            this.xrLabel24.StylePriority.UseTextAlignment = false;
+            this.xrLabel24.Text = "Bewilligte FLS wöchentlich";
+            this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel25
+            // 
+            this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
+            this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(464.7502F, 58.1111F);
+            this.xrLabel25.Name = "xrLabel25";
+            this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel25.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F);
+            this.xrLabel25.StylePriority.UseBackColor = false;
+            this.xrLabel25.StylePriority.UseBorders = false;
+            this.xrLabel25.StylePriority.UseFont = false;
+            this.xrLabel25.StylePriority.UsePadding = false;
+            this.xrLabel25.StylePriority.UseTextAlignment = false;
+            this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
            // xrLabel7
            // 
            this.xrLabel7.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
+            this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(286.0002F, 88.6111F);
            this.xrLabel7.Name = "xrLabel7";
            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
            this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
@@ -646,7 +686,7 @@ namespace ZukunftLeben
            this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(406.6391F, 88.6111F);
            this.xrLabel8.Name = "xrLabel8";
            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
            this.xrLabel8.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F);
@@ -663,10 +703,10 @@ namespace ZukunftLeben
            this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(108.1389F, 88.6111F);
            this.xrLabel6.Name = "xrLabel6";
            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(177.3655F, 30.50001F);
            this.xrLabel6.StylePriority.UseBackColor = false;
            this.xrLabel6.StylePriority.UseBorders = false;
            this.xrLabel6.StylePriority.UseFont = false;
@@ -679,10 +719,10 @@ namespace ZukunftLeben
            // 
            this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.1111F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(108.1389F, 58.1111F);
            this.xrLabel5.Name = "xrLabel5";
            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(177.3655F, 30.50001F);
            this.xrLabel5.StylePriority.UseBackColor = false;
            this.xrLabel5.StylePriority.UseBorders = false;
            this.xrLabel5.StylePriority.UseFont = false;
@@ -698,16 +738,16 @@ namespace ZukunftLeben
            | DevExpress.XtraPrinting.BorderSide.Right) 
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 88.6111F);
            this.xrLabel4.Name = "xrLabel4";
            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(108.1389F, 30.50001F);
            this.xrLabel4.StylePriority.UseBackColor = false;
            this.xrLabel4.StylePriority.UseBorders = false;
            this.xrLabel4.StylePriority.UseFont = false;
            this.xrLabel4.StylePriority.UsePadding = false;
            this.xrLabel4.StylePriority.UseTextAlignment = false;
-            this.xrLabel4.Text = "Klientin, Klient";
+            this.xrLabel4.Text = "Klientin / Klient";
            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            // 
            // xrLabel3
@@ -716,10 +756,10 @@ namespace ZukunftLeben
            this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
            | DevExpress.XtraPrinting.BorderSide.Right)));
            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58.1111F);
            this.xrLabel3.Name = "xrLabel3";
            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(108.1389F, 30.50001F);
            this.xrLabel3.StylePriority.UseBackColor = false;
            this.xrLabel3.StylePriority.UseBorders = false;
            this.xrLabel3.StylePriority.UseFont = false;
@@ -732,11 +772,11 @@ namespace ZukunftLeben
            // 
            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F);
            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(674.9998F, 25F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(565.0004F, 25F);
            this.xrLabel2.StylePriority.UseFont = false;
            this.xrLabel2.StylePriority.UseTextAlignment = false;
            this.xrLabel2.Text = "Quittierungsbeleg [Mandator.Name]";
@@ -810,7 +850,7 @@ namespace ZukunftLeben
            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(414.9998F, 20.00001F);
            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(322F, 20F);
            this.xrLabel11.StylePriority.UseBackColor = false;
            this.xrLabel11.StylePriority.UseBorders = false;
            this.xrLabel11.StylePriority.UseFont = false;
@@ -906,7 +946,7 @@ namespace ZukunftLeben
            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(415F, 0F);
            this.xrLabel10.Name = "xrLabel10";
            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(322F, 20F);
            this.xrLabel10.StylePriority.UseBackColor = false;
            this.xrLabel10.StylePriority.UseBorders = false;
            this.xrLabel10.StylePriority.UseFont = false;
@@ -941,7 +981,7 @@ namespace ZukunftLeben
            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 40.00003F);
            this.xrLabel21.Name = "xrLabel21";
            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel21.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel21.SizeF = new System.Drawing.SizeF(322F, 20F);
            this.xrLabel21.StylePriority.UseBackColor = false;
            this.xrLabel21.StylePriority.UseBorders = false;
            this.xrLabel21.StylePriority.UseFont = false;
@@ -1373,40 +1413,9 @@ namespace ZukunftLeben
            this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
            this.fieldKontaktArt.Name = "fieldKontaktArt";
            // 
-            // xrLabel24
+            // bindingSource1
            // 
-            this.xrLabel24.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F);
-            this.xrLabel24.Name = "xrLabel24";
-            this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel24.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
-            this.xrLabel24.StylePriority.UseBackColor = false;
-            this.xrLabel24.StylePriority.UseBorders = false;
-            this.xrLabel24.StylePriority.UseFont = false;
-            this.xrLabel24.StylePriority.UsePadding = false;
-            this.xrLabel24.StylePriority.UseTextAlignment = false;
-            this.xrLabel24.Text = "Bewilligte FLS wöchentlich";
-            this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel25
-            // 
-            this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
-            this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F);
-            this.xrLabel25.Name = "xrLabel25";
-            this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel25.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F);
-            this.xrLabel25.StylePriority.UseBackColor = false;
-            this.xrLabel25.StylePriority.UseBorders = false;
-            this.xrLabel25.StylePriority.UseFont = false;
-            this.xrLabel25.StylePriority.UsePadding = false;
-            this.xrLabel25.StylePriority.UseTextAlignment = false;
-            this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
            // 
            // Quittierungsbeleg2
            // 
@@ -1432,12 +1441,14 @@ namespace ZukunftLeben
            this.PageWidth = 827;
            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

        }
@@ -1540,5 +1551,6 @@ namespace ZukunftLeben
        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
        private DevExpress.XtraReports.UI.XRLabel xrLabel24;
        private DevExpress.XtraReports.UI.XRLabel xrLabel25;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
    }
 }
--- a/ReportImp/ZukunftLeben/QuittierungsbelegMitDatum.resx
+++ b/ReportImp/ZukunftLeben/QuittierungsbelegMitDatum.resx
--- a/ReportImp/ZukunftLeben/SettlementReport2.Designer.cs
+++ b/ReportImp/ZukunftLeben/SettlementReport2.Designer.cs
--- a/ReportImp/ZukunftLeben/SettlementReport2.cs
+++ b/ReportImp/ZukunftLeben/SettlementReport2.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using System.Text.RegularExpressions;
+using BS.Shared.Extensions;
+
+namespace BeWo.Report.DefaultReports
+{
+    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
+    {
+        public Spitzabrechnung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(Settlement2RO pRO)
+        {
+			if (String.IsNullOrEmpty(pRO.Notice))
+			{
+				lblNotice.Visible = false;
+			}
+
+			decimal rateFactor = 1;
+
+			foreach (var ii in pRO.InvoiceItems)
+			{
+				if (ii.RateFactor.HasValue)
+				{
+					rateFactor = (100 + ii.RateFactor.Value) / 100;
+				}
+
+				if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
+                {				
+					Zwischensumme.Visible = true;
+					//if (!ii.ItemDescription.IsNullOrEmpty())
+					//{
+					//ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
+					//}
+					ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
+					ii.ItemDescription = "Fehlkontakte";
+				}
+				else if (ii.ItemDescription.IsNullOrEmpty())
+                {
+					ii.ItemDescription = "Fachleistungsstunden";
+				}
+			}
+			pRO.RateFactor = (double)rateFactor;
+
+            this.bindingSource1.DataSource = pRO;
+        }
+    }
+}
--- a/ReportImp/ZukunftLeben/SettlementReport2.resx
+++ b/ReportImp/ZukunftLeben/SettlementReport2.resx
--- a/ReportImp/ZukunftLeben/ZL_Logo_2021_RGB_für
+++ b/ReportImp/ZukunftLeben/ZL_Logo_2021_RGB_für
--- a/ReportImp/ZukunftLeben/ZukunftLeben.csproj
+++ b/ReportImp/ZukunftLeben/ZukunftLeben.csproj
@@ -55,13 +55,25 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Invoicing\SettlementInvoiceCreation.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="QuittierungsbelegMitDatum.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="QuittierungsbelegMitDatum.Designer.cs">
      <DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
    </Compile>
+    <Compile Include="SettlementReport2.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport2.Designer.cs">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Data\Data.csproj">
@@ -83,10 +95,18 @@
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
    <EmbeddedResource Include="QuittierungsbelegMitDatum.resx">
      <DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport2.resx">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -889,23 +889,22 @@ namespace BeWo.Service.ServiceImplementations
                {
                    response.Message = "Validierung fehlgeschlagen";
                    return response;
-                }    
+                }

-                string response_app8_str = SendApp8SendNewRequest(protokoll, user.LoginName, user.RC2EncryptedHash);
+                if (entity.GkvTransferProtokolle is null)
+                    entity.GkvTransferProtokolle = new List<GkvTransferProtokoll>();

-                if (string.IsNullOrEmpty(response_app8_str))
-                    throw new DakotaException("Leere Antwort", "App8");
+                entity.GkvTransferProtokolle.Add(protokoll);

-                var response_app8 = JsonConvert.DeserializeObject<GkvApp8SendNewResponse>(response_app8_str);
+                DAOFactory.GenericDAO.Update(entity);

-                if (!response_app8.Success)
-                    throw new DakotaException(response_app8.Message, "App8 Error");
+                var app8_response = SendApp8SendNewRequest(protokoll, user.LoginName, user.RC2EncryptedHash);

-                var app8_protokoll = response_app8.GkvTransferProtokollDC;
+                var app8_protokoll = app8_response.GkvTransferProtokollDC;

                MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MergeWithEntity(app8_protokoll, protokoll);

-                response.Successful = true;
+                response.Successful = app8_response.Success;
            }
            catch (DakotaException de)
            {
@@ -922,11 +921,6 @@ namespace BeWo.Service.ServiceImplementations
                protokoll.Fehlertitel = "Erstellung (kritisch)";
            }

-            if (entity.GkvTransferProtokolle is null)
-                entity.GkvTransferProtokolle = new List<GkvTransferProtokoll>();
-
-            entity.GkvTransferProtokolle.Add(protokoll);
-
            DAOFactory.GenericDAO.Update(entity);

            response.TransferProtokoll = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewDC(protokoll);
@@ -944,7 +938,7 @@ namespace BeWo.Service.ServiceImplementations

                var state = GkvAbrechnung.GetState(gkvAbrechnung);

-                if (state == GkvState.Waiting || state == GkvState.OldAndNoFeedback || state == GkvState.Paid || state == GkvState.ErrorFatal)
+                if (state == GkvState.Waiting || state == GkvState.OldAndNoFeedback || state == GkvState.Paid)
                {
                    return false;
                }
@@ -1042,7 +1036,7 @@ namespace BeWo.Service.ServiceImplementations
            {
                transfernummer = DAOFactory.SearchDAO.GetNextTransfernummer(datenannahmestelle);
            }
-            else if (state == GkvState.Error)
+            else if (state == GkvState.Error || state == GkvState.ErrorFatal)
            {
                transfernummer = gkvAbrechnung.GkvTransferProtokolle.Last().Transfernummer;
            }
@@ -1067,14 +1061,14 @@ namespace BeWo.Service.ServiceImplementations
            return new Tuple<int, int>(d, t);
        }

-        private string SendApp8SendNewRequest(GkvTransferProtokoll protokoll, string loginName, string hashed_password)
+        private GkvApp8SendNewResponse SendApp8SendNewRequest(GkvTransferProtokoll protokoll, string loginName, string hashed_password)
        {
            var gkv_transfer_dc = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewDC(protokoll);

            var url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";

 #if DEBUG
-            url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
+            //url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
 #endif

            var request_app8 = new GkvApp8SendNewRequest
@@ -1083,14 +1077,19 @@ namespace BeWo.Service.ServiceImplementations
                GkvTransferProtokoll = gkv_transfer_dc,
                Username = loginName,
                Password = hashed_password,
-                Tenant = MultitenancyOperationContextExt.Current.Tenant
+                Tenant = MultitenancyOperationContextExt.Current.Tenant, 
+                DebugMode = "fozc4897b6ztvf978AFCRRG244fvFV2532fvf324AF"
            };

 #if DEBUG
            request_app8.SendDirect = false;
 #endif

-            return SendApp8Request(url, request_app8);
+            var response_app8_str = SendApp8Request(url, request_app8);
+
+            var response_app8 = JsonConvert.DeserializeObject<GkvApp8SendNewResponse>(response_app8_str);
+
+            return response_app8;
        }
        /// <summary>
        /// 
@@ -1105,16 +1104,13 @@ namespace BeWo.Service.ServiceImplementations

            var url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";

-#if DEBUG
-            url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
-#endif
-
            var request = new GkvApp8GetStatusRequest
            {
                Username = loginName,
                Password = hashed_password,
                Tenant = MultitenancyOperationContextExt.Current.Tenant,
-                Oids = new long[updateables_len]
+                Oids = new long[updateables_len],
+                DebugMode = "fozc4897b6ztvf978AFCRRG244fvFV2532fvf324AF",
            };

            for (int id = 0; id < updateables_len; id++)
@@ -1125,16 +1121,21 @@ namespace BeWo.Service.ServiceImplementations
                request.Oids[id] = gkv_transfer.GkvTransferProtokollOid.Value;
            }

-            var response_app8_str = SendApp8Request(url, JsonConvert.SerializeObject(request));
+            GkvApp8GetStatusResponse response_app8;
+            try
+            {
+                var response_app8_str = SendApp8Request(url, JsonConvert.SerializeObject(request));

-            var response_app8 = JsonConvert.DeserializeObject<GkvApp8GetStatusResponse>(response_app8_str);
-
-            if (!response_app8.Success)
+                response_app8 = JsonConvert.DeserializeObject<GkvApp8GetStatusResponse>(response_app8_str);
+            }
+            catch(Exception e)
            {
                return true;
-                throw new NotImplementedException("App 8 Anfrage nicht erfolgreich");
            }

+            if (!response_app8.Success)
+                throw new DakotaException(response_app8.Message);
+            
            bool allAreUpToDate = true;
            for (int id = 0; id < updateables_len; id++)
            {
@@ -1164,15 +1165,26 @@ namespace BeWo.Service.ServiceImplementations
        private string SendApp8Request(string url, object request) => SendApp8Request(url, JsonConvert.SerializeObject(request));
        private string SendApp8Request(string url, string dataString)
        {
-            url += "?tenant=" + MultitenancyOperationContextExt.Current.Tenant;
-
            string response_app8_str;
-            using (WebClient client = new WebClient())
-            {
-                client.Headers.Add(HttpRequestHeader.ContentType, "application/json");

-                response_app8_str = client.UploadString(url, "POST", dataString);
+            try
+            {
+                url += "?tenant=" + MultitenancyOperationContextExt.Current.Tenant;
+
+                using (WebClient client = new WebClient())
+                {
+                    client.Headers.Add(HttpRequestHeader.ContentType, "application/json");
+
+                    response_app8_str = client.UploadString(url, "POST", dataString);
+                }
            }
+            catch(Exception e)
+            {
+                throw new DakotaException(e.Message, "App8");
+            }
+
+            if (string.IsNullOrEmpty(response_app8_str))
+                throw new DakotaException("Leere Antwort", "App8");

            return response_app8_str;
        }
--- a/Shared/DataContracts/GkvAbrechnung/GkvApp8Request.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvApp8Request.cs
@@ -19,6 +19,9 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
        [DataMember]
        public string Tenant { get; set; }

+        [DataMember]
+        public string DebugMode { get; set; }
+
        [DataMember]
        public GkvAbrechnungApp8RequestTypeDC Type { get; set; }
    }
				`@@ -0,0 +1 @@`
				`DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`