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

.gitignore

@@ -413,4 +413,5 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
+*.sln.iml
+/ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs

BeWo/BeWo.csproj

@@ -43,12 +43,12 @@
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>ownSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.274</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.277</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>275</ApplicationRevision>
+    <ApplicationRevision>278</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -63,7 +63,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>true</UseVSHostingProcess>
     <Prefer32Bit>false</Prefer32Bit>

BeWo/BeWoApp.xaml.cs

@@ -58,7 +58,7 @@ namespace BeWo
 
 		public static string ShortVersion = "3.27";
 
-		public static string Version = "Version 3.27";
+		public static string Version = "Version 3.27.2";
 
 		public static int RenderTier = 0;
 		public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());

BeWo/LoginControl.xaml.cs

@@ -264,6 +264,10 @@ namespace BeWo
 
         private static String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
 
+        private static String PUB_KEY_R12 = "da982874adbe94fe3be01ee2e54b75ab2c127feda703327e3697ece8318fa5138d0b992e1ecd01513d4ce5286e095531aaa5225d72f42d07c24d403cdf0123b97837f51a653234e686719d04ef84085bbd021a99eba601009a73906d8fa207a0d097d3da456181353d14f9c4c05f6adc0b961ab09fe32aeabd2ad698c79b71ab3b740f3cdbb260be5a4b4e18e9db2a735c8961659efeed3ca6cb4e6fe49ef90046b3ff194d2a63b38e66c6188570c750656f3b74e548830f08585d2d239d5ea3fee8db00a1d2f4e3194df2ee7af6279ee5cd9c2da2f27f9c17adef133739d1b4c82c41d686c0e9ec21f8591b7fb93a7c9f5c019d6204c228bd0aad3cca10ec1b0203010001";
+
+        private static String PUB_KEY_R13 = "a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f0203010001";
+
 
         private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
         {
@@ -284,7 +288,9 @@ namespace BeWo
                         pk.Contains(PUB_KEY_E5.ToLower()) ||
                         pk.Contains(PUB_KEY_E6.ToLower()) ||
                         pk.Contains(PUB_KEY_R10.ToLower()) ||
-                        pk.Contains(PUB_KEY_R11.ToLower()))
+                        pk.Contains(PUB_KEY_R11.ToLower()) ||
+                        pk.Contains(PUB_KEY_R12.ToLower()) ||
+                        pk.Contains(PUB_KEY_R13.ToLower()))
                     {
                         chainContainsPk = true;
                     }

BeWo/Scheduler/View/NewSchedulerView.xaml.cs

@@ -1578,7 +1578,9 @@ namespace BeWo.Scheduler.View
             var mitarbeiterliste = appointment.CF_EmployeeList();
             var istErsteller = ersteller?.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ?? false;
 
-            if(!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !appointment.CF_CanBeEdited())
+            bool canBeEdited = appointment.CF_CanBeEdited();
+
+            if (!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !canBeEdited)
             {
                 darfTerminDetailsSehen = false;
             }
@@ -1946,8 +1948,13 @@ namespace BeWo.Scheduler.View
             var customerList = appointment.CF_CustomerList();
 
             var employeeList = employee2SchedulerAppointmentList.Select(employee2SchedulerAppointment => employee2SchedulerAppointment.Employee).ToList();
+            String notice = appointment.Description;
+            if (String.IsNullOrEmpty(notice))
+            {
+                notice = appointment.Subject;
+            }
 
-            BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, appointment.Subject, appointment, serviceRecords =>
+            BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, notice, appointment, serviceRecords =>
             {
                 try
                 {

BeWo/Scheduler/ViewModel/CustomFieldStorage.cs

@@ -141,6 +141,7 @@ namespace BeWo.Scheduler.ViewModel
             _AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
 
             HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
+            
             CanBeEdited = pAppointment.CanBeEdited;
 
             AbsenceTimeOid = pAppointment.AbsenceTimeOid;

BeWo/View/Detail/SupportConceptView.xaml

@@ -811,7 +811,7 @@
                                                                                            Grid.Column="1"
                                                                                           Grid.Row="8"
                                                                                           Margin="3"
-                                                                                          Text="Max. Kontakte" x:Name="lblContactCountPerInterval" Tag="Direkt"/>
+                                                                                          Text="Max. Kontakte" x:Name="lblContactCountPerInterval" Tag="Direkt" Visibility="Collapsed"/>
                                                                                 <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
                                                                                             Grid.Row="8"
                                                                                             AllowNullInput="True"
@@ -819,11 +819,11 @@
                                                                                             EditValue="{Binding Path=ContactCountPerInterval, UpdateSourceTrigger=PropertyChanged}"
                                                                                             Grid.Column="2"
                                                                                             Margin="3"
-                                                                                            Height="23" Tag="Direkt"/>
+                                                                                            Height="23" Tag="Direkt" Visibility="Collapsed"/>
                                                                                 <TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Column="2" Text="pro"
-                                                                                        Grid.Row="8" x:Name="lblContactCountInterval" Tag="Direkt"/>
+                                                                                        Grid.Column="3" Text="pro"
+                                                                                        Grid.Row="8" x:Name="lblContactCountInterval" Tag="Direkt" Visibility="Collapsed"/>
 																				<ComboBox x:Name="cboContactCountInterval"
                                                                                         Margin="3" Grid.Row="8"
                                                                                         ItemsSource="{x:Static core:EnumTranslations.SupportConceptApprovalInterval2Translations}"
@@ -831,7 +831,8 @@
                                                                                         SelectedValuePath="Key"
                                                                                         DisplayMemberPath="Value"
                                                                                         Height="23"
-                                                                                        Grid.Column="4" Tag="Direkt"/>
+                                                                                        Grid.Column="4" Tag="Direkt" Visibility="Collapsed"
+                                                                                          />
                                                                                 <Button Grid.Row="9" Grid.Column="0" Height="25"
                                                                                         Grid.ColumnSpan="6"
                                                                                         Visibility="{Binding Path=SupportConceptApprovalEmployeeRelations.AddButtonVisibility}"

BeWo/View/Detail/SupportConceptView.xaml.cs

@@ -1246,13 +1246,13 @@ namespace BeWo.View.Detail
 
             var vm = grid.DataContext as SupportConceptApprovalPeriodVM;
 
-            if (vm != null && !SupportConceptApprovalPeriodVM.ShowContactCountFields)
-            {
-                grid.Children[grid.Children.Count - 2].Visibility = Visibility.Collapsed;
-                grid.Children[grid.Children.Count - 3].Visibility = Visibility.Collapsed;
-                grid.Children[grid.Children.Count - 4].Visibility = Visibility.Collapsed;
-                grid.Children[grid.Children.Count - 5].Visibility = Visibility.Collapsed;
-            }
+            //if (vm != null && !SupportConceptApprovalPeriodVM.ShowContactCountFields)
+            //{
+            //    grid.Children[grid.Children.Count - 2].Visibility = Visibility.Collapsed;
+            //    grid.Children[grid.Children.Count - 3].Visibility = Visibility.Collapsed;
+            //    grid.Children[grid.Children.Count - 4].Visibility = Visibility.Collapsed;
+            //    grid.Children[grid.Children.Count - 5].Visibility = Visibility.Collapsed;
+            //}
 
             var gridControl = new GridControl();
 

BeWo/ViewModel/SupportConceptApprovalPeriodVM.cs

@@ -353,14 +353,6 @@ namespace BeWo.ViewModel
             }
         }
 
-        public static bool ShowContactCountFields
-        {
-            get
-            {
-                return BeWoApp.Mandator.BeWoClientType == 11;
-            }
-        }
-
         public SupportConceptApprovalPeriodEmployeeRelListVM SupportConceptApprovalEmployeeRelations
         {
             get { return _SupportConceptApprovalEmployeeRelations; }

BeWo/ownChat/ChatDokumentationsView.xaml.cs

@@ -192,8 +192,13 @@ namespace BeWo.ownChat
                                 if(vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0)
                                 {
                                     var cat1 = vm.PrototypeVM.SortedCategories[0];
-
-                                    dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
+                                    if (vm.PrototypeVM.Category2Services.ContainsKey(cat1))
+                                    {
+                                        if (vm.PrototypeVM.Category2Services[cat1].Count > 0)
+                                        {
+                                            dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
+                                        }
+                                    }
                                 }
 
                                 _ServiceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals)

BeWoAllReports.sln

@@ -926,6 +926,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenszentrumKoenigsborn",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StefanKnauerBeWoHeinsberg", "ReportImp\StefanKnauerBeWoHeinsberg\StefanKnauerBeWoHeinsberg.csproj", "{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhoenixDuerenerVerein", "ReportImp\PhoenixDuerenerVerein\PhoenixDuerenerVerein.csproj", "{25577D25-B655-45FD-983D-189A52159CF6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AwoIntegrationsGGmbH", "ReportImp\AwoIntegrationsGGmbH\AwoIntegrationsGGmbH.csproj", "{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OwnSoftTestSchmitzi", "ReportImp\OwnSoftTestSchmitzi\OwnSoftTestSchmitzi.csproj", "{D357755F-6B30-4CA4-88B9-44F624030AAA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -11329,7 +11335,6 @@ Global
 		{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|x86.ActiveCfg = Release|Any CPU
 		{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB}.Release|x86.Build.0 = Release|Any CPU
-<<<<<<< HEAD
 		{56555705-2801-45DE-8979-93A403873D6D}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{56555705-2801-45DE-8979-93A403873D6D}.Debug|.NET.Build.0 = Debug|Any CPU
 		{56555705-2801-45DE-8979-93A403873D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -11378,6 +11383,78 @@ Global
 		{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|x86.ActiveCfg = Release|Any CPU
 		{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666}.Release|x86.Build.0 = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|.NET.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Debug|x86.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|.NET.ActiveCfg = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|.NET.Build.0 = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|x86.ActiveCfg = Release|Any CPU
+		{25577D25-B655-45FD-983D-189A52159CF6}.Release|x86.Build.0 = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Debug|x86.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|.NET.Build.0 = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}.Release|x86.Build.0 = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|.NET.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|.NET.Build.0 = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -11837,6 +11914,9 @@ Global
 		{75A0A8F5-AE9A-48AF-8BE0-93713CFB89EB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{56555705-2801-45DE-8979-93A403873D6D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{17D0F681-AA64-42A2-9FFA-0ABCBAEEB666} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{25577D25-B655-45FD-983D-189A52159CF6} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{D357755F-6B30-4CA4-88B9-44F624030AAA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

BeWoDatabaseTerminator/BeWoDatabaseTerminator/Program.cs

@@ -57,13 +57,18 @@ namespace BeWoDatabaseTerminator
 
         private const String PUB_KEY_R11 = "BA87BC5C1B0039CBCA0ACDD46710F9013CA54EA561CB26CA52FB1501B7B928F5281EED27B324183967090C08ECE03AB03B770EBDF3E53954410C4EAE41D69974DE51DBEF7BFF58BDA8B713F6DE31D5F272C9726A0B8374959C4600641499F3B1D922D9CDA892AA1C267A3FFEEF58057B089581DB710F8EFBE33109BB09BE504D5F8F91763D5A9D9E83F2E9C466B3E106664348188065A037189A9B843297B1B2BDC4F815009D2788FBE26317966C9B27674BC4DB285E69C279F0495CE02450E1C4BCA105AC7B406D00B4C2413FA758B82FC55C9BA5BB099EF1FEEBB08539FDA80AEF45C478EB652AC2CF5F3CDEE35C4D1BF70B272BAA0B4277534F796A1D87D90203010001";
 
+        private const String PUB_KEY_R12 = "da982874adbe94fe3be01ee2e54b75ab2c127feda703327e3697ece8318fa5138d0b992e1ecd01513d4ce5286e095531aaa5225d72f42d07c24d403cdf0123b97837f51a653234e686719d04ef84085bbd021a99eba601009a73906d8fa207a0d097d3da456181353d14f9c4c05f6adc0b961ab09fe32aeabd2ad698c79b71ab3b740f3cdbb260be5a4b4e18e9db2a735c8961659efeed3ca6cb4e6fe49ef90046b3ff194d2a63b38e66c6188570c750656f3b74e548830f08585d2d239d5ea3fee8db00a1d2f4e3194df2ee7af6279ee5cd9c2da2f27f9c17adef133739d1b4c82c41d686c0e9ec21f8591b7fb93a7c9f5c019d6204c228bd0aad3cca10ec1b0203010001";
+
+        private const String PUB_KEY_R13 = "a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f0203010001";
+
+
 
         private static bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
         {
             try
             {
                 if (certificate == null || chain == null)
-                    return false;
+                    return false; 
 
                 bool chainContainsPk = false;
 
@@ -77,7 +82,9 @@ namespace BeWoDatabaseTerminator
                         pk.Contains(PUB_KEY_E5.ToLower()) ||
                         pk.Contains(PUB_KEY_E6.ToLower()) ||
                         pk.Contains(PUB_KEY_R10.ToLower()) ||
-                        pk.Contains(PUB_KEY_R11.ToLower()))
+                        pk.Contains(PUB_KEY_R11.ToLower()) ||
+                        pk.Contains(PUB_KEY_R12.ToLower()) ||
+                        pk.Contains(PUB_KEY_R13.ToLower()))
                     {
                         chainContainsPk = true;
                     }

BeWoPlanerMobil/BeWoPlanerMobil.csproj

@@ -24,7 +24,7 @@
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
     <TargetFrameworkProfile />
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress>true</Use64BitIISExpress>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TypeScriptToolsVersion>4.3</TypeScriptToolsVersion>
@@ -74,6 +74,7 @@
     <TypeScriptSourceMap>True</TypeScriptSourceMap>
     <TypeScriptMapRoot />
     <TypeScriptSourceRoot />
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -316,6 +317,7 @@
     <Compile Include="Models\MokSupportConceptListObject.cs" />
     <Compile Include="Models\MokMandator.cs" />
     <Compile Include="Models\MokServiceRecord.cs" />
+    <Compile Include="Models\BaseSessionModel.cs" />
     <Compile Include="Models\SchedulerSessionModel.cs" />
     <Compile Include="Models\MainSessionModel.cs" />
     <Compile Include="Models\ReportSessionModel .cs" />
@@ -325,7 +327,6 @@
     <Compile Include="Models\DevToolsModel.cs" />
     <Compile Include="Models\DevExpressSchedulerModel.cs" />
     <Compile Include="Models\ExternalSignatureModel.cs" />
-    <Compile Include="Models\ISessionModel.cs" />
     <Compile Include="Models\ReportModel.cs" />
     <Compile Include="Models\ReportViewerModel.cs" />
     <Compile Include="Models\SchedulerModel.cs" />

BeWoPlanerMobil/BeWoPlanerMobil.csproj.user

@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>false</UseIISExpress>
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress>true</Use64BitIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ProjectFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

BeWoPlanerMobil/Controllers/AbstractBaseController.cs

@@ -66,7 +66,7 @@ namespace BeWoPlanerMobil.Controllers
                 }
                 else
                 {
-                    model.SessionModel = (ISessionModel)Session[sessionkey];
+                    model.SessionModel = (BaseSessionModel)Session[sessionkey];
                 }
             }
         }

BeWoPlanerMobil/Controllers/CustomerController.cs

@@ -983,8 +983,9 @@ namespace BeWoPlanerMobil.Controllers
             var zahlung = kassenbuch?.Bargeldtransaktionen.FirstOrDefault(bargeldtransaktion => bargeldtransaktion.BargeldtransaktionOid.Equals(transaktionsOid));
 
             Model.SelectedBargeldtransaktion = zahlung;
+            Model.SelectedBargeldtransaktionOid = zahlung?.BargeldtransaktionOid;
 
-            if(zahlung != null)
+            if (zahlung != null)
             {
                 Model.SelectedTransaktionsart = (int) zahlung.Zahlungstyp;
             }
@@ -1018,6 +1019,7 @@ namespace BeWoPlanerMobil.Controllers
             }
 
             Model.SelectedBargeldtransaktion = null;
+            Model.SelectedBargeldtransaktionOid = null;
             Model.SelectedTransaktionsart = 0;
 
             Model.SelectedBargeldkasseOid = bargeldkassenOid;
@@ -1088,6 +1090,7 @@ namespace BeWoPlanerMobil.Controllers
             OperationsService.UpdateBargeldkasse(bargeldkasse);
 
             Model.SelectedBargeldkasseOid = null;
+            Model.SelectedBargeldtransaktionOid = null;
 
             ReloadBargeldkassen();
 

BeWoPlanerMobil/Controllers/MainController.cs

@@ -280,16 +280,27 @@ namespace BeWoPlanerMobil.Controllers
 
             if(Model.AllGoals != null)
             {
-                if (Model.SelectedGoals.Count == 0 && Model.SelectedGoalOids.Count > 0) // Diese Abfrage muss bleiben, sonst werden vorher gewählte Bewertungen überschrieben
+                if (Model.SelectedGoals.Count < Model.SelectedGoalOids.Count) // Diese Abfrage muss bleiben, sonst werden vorher gewählte Bewertungen überschrieben
                 {
-                    Model.SelectedGoals = DcToMokMapper.CreateZiele(Model.AllGoals.Where(g => Model.SelectedGoalOids.Contains(g.ValueListEntryOid.Value)));
+                    foreach (var oid in Model.SelectedGoalOids)
+                    {
+                        if (Model.SelectedGoals.Count(g => g.ValueListEntryOid == oid) == 0)
+                        {
+                            var dc = Model.AllGoals.FirstOrDefault(g => g.ValueListEntryOid == oid);
+                            if (dc != null)
+                            {
+                                Model.SelectedGoals.Add(DcToMokMapper.CreateZiel(dc));
+                            }
+                        }
+                    }
+                    
                 }
                 
             }
             
             if(Model.IsInEditingMode && Model.SelectedServiceRecordOid.HasValue)
             {
-                Model.SelectedServiceRecord = Model.ServiceRecords.FirstOrDefault(sr => sr.ServiceRecordOid.Equals(Model.SelectedServiceRecordOid.Value));
+                Model.SelectedServiceRecord = GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false);
             }
         }
 
@@ -1125,7 +1136,7 @@ namespace BeWoPlanerMobil.Controllers
                 var date = DateTime.Parse(formCollection[FormCollectionConstants.ServiceRecordSignatureDateKey]);
                 long.TryParse(formCollection[FormCollectionConstants.ServiceRecordSignatureRecordOidKey], out var serviceRecordOid);
 
-                var serviceRecord = Model.ServiceRecords.FirstOrDefault(sr => sr.ServiceRecordOid.HasValue && sr.ServiceRecordOid.Value.Equals(serviceRecordOid));
+                var serviceRecord = GetServiceRecordDC(serviceRecordOid, false);
 
                 if (serviceRecordOid < 1 || serviceRecord is null)
                 {
@@ -2336,7 +2347,7 @@ namespace BeWoPlanerMobil.Controllers
 
             if(Model.ServiceRecordOidToDelete != null && Model.ServiceRecordOidToDelete > 0 && LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.Equals(UserRightType.ServiceRecordView_Delete))))
             {
-                var serviceRecordDC = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid != null && f.ServiceRecordOid.Value.Equals(Model.ServiceRecordOidToDelete));
+                var serviceRecordDC = GetServiceRecordDC(Model.ServiceRecordOidToDelete.Value, false);
                 var version = serviceRecordDC?.ServiceRecordVersion;
 
                 if(version != null && Model.IsAllowedToDeleteServiceRecord(serviceRecordDC))
@@ -2366,21 +2377,17 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public string UpdateGoals(string pGoalOids)
         {
-            if (Model is null)
+            SkipModelInitialization = true;
+            if (!IsUserLoggedIn())
             {
                 Logout();
                 return "0";
             }
 
-            var sc = Model.SelectedSupportConcept;
-            if (!Model.IsInGroupBookingMode && sc is null)
-            {
-                return "0";
-            }
-
+            
             if(string.IsNullOrEmpty(pGoalOids))
             {
-                Model.SelectedGoals.Clear();
+                Model.SelectedGoalOids.Clear();
 
                 return "0";
             }
@@ -2388,33 +2395,33 @@ namespace BeWoPlanerMobil.Controllers
             var splitOids = pGoalOids.Trim(';').Split(';');
             var selectedGoalOids = splitOids.Select(long.Parse).ToList();
 
-            var allGoals = new List<ValueListEntryDC>();
+            //var allGoals = new List<ValueListEntryDC>();
 
-            if(Model.IsInGroupBookingMode || Model.IsInMultiBookingMode)
-            {
-                var supportConcepts = GetSelectedGroupBookingSupportConcepts();
-                LoadSupportConceptThings(null, false);
+            //if(Model.IsInGroupBookingMode || Model.IsInMultiBookingMode)
+            //{
+            //    var supportConcepts = GetSelectedGroupBookingSupportConcepts();
+            //    LoadSupportConceptThings(null, false);
 
-                supportConcepts.DoForEach(supportConcept => { allGoals.AddRangeIfElementsNotIn(supportConcept.Goals); });
-            }
-            else if(!Model.IsInGroupBookingMode)
-            {
-                allGoals = sc.Goals;
-            }
+            //    supportConcepts.DoForEach(supportConcept => { allGoals.AddRangeIfElementsNotIn(supportConcept.Goals); });
+            //}
+            //else if(!Model.IsInGroupBookingMode)
+            //{
+            //    allGoals = sc.Goals;
+            //}
 
-            var parents = CustomerService.GetSupportConceptGoalParents(allGoals.Where(w => w.ParentOid.HasValue).Select(s => s.ParentOid.Value).ToList());
+            //var parents = CustomerService.GetSupportConceptGoalParents(allGoals.Where(w => w.ParentOid.HasValue).Select(s => s.ParentOid.Value).ToList());
 
-            allGoals.AddRangeIfElementsNotIn(parents);
+            //allGoals.AddRangeIfElementsNotIn(parents);
 
-            var goals = allGoals.Where(w => w.ValueListEntryOid.HasValue && selectedGoalOids.Contains(w.ValueListEntryOid.Value)).ToList();
+            //var goals = allGoals.Where(w => w.ValueListEntryOid.HasValue && selectedGoalOids.Contains(w.ValueListEntryOid.Value)).ToList();
  
-            var stillSelectedGoals = Model.SelectedGoals.Where(s => goals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == s.ValueListEntryOid)).ToList();
+            //var stillSelectedGoals = Model.SelectedGoals.Where(s => goals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == s.ValueListEntryOid)).ToList();
 
-            Model.SelectedGoals = stillSelectedGoals;
-            Model.SelectedGoals.AddRangeIfElementsNotIn(DcToMokMapper.CreateZiele(goals));
-            Model.SelectedGoalOids = Model.SelectedGoals.Select(g => g.ValueListEntryOid.Value).ToList();
+            //Model.SelectedGoals = stillSelectedGoals;
+            //Model.SelectedGoals.AddRangeIfElementsNotIn(DcToMokMapper.CreateZiele(goals));
+            Model.SelectedGoalOids = selectedGoalOids;
 
-            return Model.SelectedGoals?.Count.ToString() ?? "0";
+            return Model.SelectedGoalOids.Count.ToString() ?? "0";
         }
 
         [Authorize]
@@ -2675,7 +2682,7 @@ namespace BeWoPlanerMobil.Controllers
 
             if(Model.SelectedServiceRecordOid.HasValue)
             {
-                result = SerializeObject(Model.ServiceRecords.First(f => f.ServiceRecordOid == Model.SelectedServiceRecordOid));
+                result = SerializeObject(GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false));
             }
 
             return result;
@@ -2690,7 +2697,7 @@ namespace BeWoPlanerMobil.Controllers
                 return LeerzeichenFuerGetMethoden;
             }
 
-            var serviceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(oid)) ?? OperationsService.GetServiceRecordById(oid);
+            var serviceRecord = GetServiceRecordDC(oid, false);
 
             if(serviceRecord?.ServiceRecordOid is null)
             {
@@ -2764,9 +2771,9 @@ namespace BeWoPlanerMobil.Controllers
             }
 
             var checkServiceRecord = new ServiceRecordDC();
-            if(inEditMode)
+            if(inEditMode && Model.SelectedServiceRecordOid.HasValue)
             {
-                checkServiceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(Model.SelectedServiceRecordOid));
+                checkServiceRecord = GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false);
             }
 
             if(checkServiceRecord is null)
@@ -5059,6 +5066,8 @@ namespace BeWoPlanerMobil.Controllers
 
             CreateModelSupportConceptListObjects(false);
             LoadSupportConceptThings(null, true);
+            Model.GoalRatingTypes = OperationsService.GetAllRatingTypes().OrderBy(o => o.Position).ToList();
+            Model.HasAnyRatingTypes = Model.HasRightToRateGoals && Model.GoalRatingTypes.Any();
 
             return PartialView("GoalTreePartial", Model);
         }
@@ -5112,7 +5121,8 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public override string SaveCollapsibleStatus(bool isOpen, string identifier)
         {
-            if(Model is null)
+            SkipModelInitialization = true;
+            if(!IsUserLoggedIn())
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
                 return LeerzeichenFuerGetMethoden;

BeWoPlanerMobil/Models/AbstractModel.cs

@@ -27,7 +27,7 @@ namespace BeWoPlanerMobil.Models
         public bool HasRightToViewEmployeeAppointments => CheckRight(UserRightType.KalenderMitarbeitertermineAnsehen) || CheckRight(UserRightType.ViewAll);
         public bool HasRightToViewAllResourceAppointments => CheckRight(UserRightType.KalenderRessourcentermineAnsehen) || CheckRight(UserRightType.ViewAll);
 
-        public ISessionModel SessionModel { get; internal set; }
+        public BaseSessionModel SessionModel { get; internal set; }
 
         public UserDC LoggedInUser { get; set; }
 
@@ -252,7 +252,7 @@ namespace BeWoPlanerMobil.Models
 
         public List<CompactCustomerDC> Customers { get; set; } = new List<CompactCustomerDC>();
 
-        public Dictionary<string, bool> Collapsibles2IsShown { get; set; } = new Dictionary<string, bool>();
+        public Dictionary<string, bool> Collapsibles2IsShown { get { return SessionModel.Collapsibles2IsShown; } set {SessionModel.Collapsibles2IsShown = value;} }
 
         public bool ShowDifferentQBInterval
         {

BeWoPlanerMobil/Models/BaseSessionModel.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Web.Mvc;
+using BeWo.View.Navigation.Filter;
+using BeWoPlanerMobil.Controllers;
+using BeWoPlanerMobil.Service;
+using BeWoPlanerMobil.Util;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using DevExpress.XtraReports.UI;
+
+namespace BeWoPlanerMobil.Models
+{
+    [Serializable]
+    public abstract class BaseSessionModel
+    {
+        public Dictionary<string, bool> Collapsibles2IsShown { get; set; } = new Dictionary<string, bool>();
+
+        public virtual void ResetValues()
+        {
+            Collapsibles2IsShown = new Dictionary<string, bool>();
+        }
+    }
+}

BeWoPlanerMobil/Models/CustomerSessionModel.cs

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
 namespace BeWoPlanerMobil.Models
 {
     [Serializable]
-    public class CustomerSessionModel : ISessionModel
+    public class CustomerSessionModel : BaseSessionModel
     {
         public long? SelectedCustomerOid { get; set; }
 
@@ -35,8 +35,10 @@ namespace BeWoPlanerMobil.Models
 
         public int SelectedTransaktionsart { get; set; }
 
-        public void ResetValues()
+        public override void ResetValues()
         {
+            base.ResetValues();
+
             SelectedCustomerOid = null;
             //SelectedCustomerFilter = CustomerFilterEnum.All;
             //SelectedReportType = CustomerReportType.Medikamentenliste;

BeWoPlanerMobil/Models/ISessionModel.cs

@@ -1,9 +0,0 @@
-using BeWoPlanerMobil.Service;
-
-namespace BeWoPlanerMobil.Models
-{
-	public interface ISessionModel
-	{
-        void ResetValues();
-    }
-}

BeWoPlanerMobil/Models/MainSessionModel.cs

@@ -6,7 +6,7 @@ using BeWoPlanerMobil.Util;
 namespace BeWoPlanerMobil.Models
 {
     [Serializable]
-    public class MainSessionModel : ISessionModel
+    public class MainSessionModel : BaseSessionModel
     {
         public bool SessionInitialized { get; internal set; }
         public long? SelectedSupportConceptOid { get; internal set; }
@@ -38,9 +38,12 @@ namespace BeWoPlanerMobil.Models
         public bool IsInTransferMode { get; internal set; }
         public IList<MokZiel> SelectedGoals { get; internal set; }
         public List<long> SupportConceptOids { get; set; }
+        public MokServiceRecord SelectedServiceRecord { get; internal set; }
 
-        public void ResetValues()
+        public override void ResetValues()
         {
+            base.ResetValues();
+
             SessionInitialized = false;
             SelectedSupportConceptOid = null;
             SelectedCostBearerSupportConceptOid = null;
@@ -84,6 +87,7 @@ namespace BeWoPlanerMobil.Models
             SelectedGoals = new List<MokZiel>();
 
             SupportConceptOids = new List<long>();
+            SelectedServiceRecord = null;
         }
     }
 }

BeWoPlanerMobil/Models/MokServiceRecord.cs

@@ -1,3 +1,4 @@
+using BS.Shared;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.DataContracts.Invoicing;
 using System;
@@ -10,7 +11,11 @@ namespace BeWoPlanerMobil.Models
 	[Serializable]
     public class MokServiceRecord
 	{
-		public long Oid { get; set; }
+		public long? Oid { get; set; }
+
+        public ServiceRecordTypeId ServiceRecordType { get; set; }
+
+        public int? DistanceInMeter { get; set; }
 
         public DateTime? Start { get; set; }
 

BeWoPlanerMobil/Models/ReportSessionModel .cs

@@ -16,7 +16,7 @@ using DevExpress.XtraReports.UI;
 namespace BeWoPlanerMobil.Models
 {
     [Serializable]
-    public class ReportSessionModel : ISessionModel
+    public class ReportSessionModel : BaseSessionModel
     {
         public long? SelectedCustomerOid { get; set; }
         public long? SelectedEmployeeOid { get; set; }
@@ -37,8 +37,10 @@ namespace BeWoPlanerMobil.Models
         public List<ConfirmationReceiptSignatureObject> SelectedConfirmationReceiptSignatures { get; internal set; }
         public QbSignatureIntervalSelection SelectedIntervalSelection { get; internal set; }
 
-        public void ResetValues()
+        public override void ResetValues()
         {
+            base.ResetValues();
+
             SelectedCustomerOid = null;
             SelectedEmployeeOid = null;
             SelectedTeamOid = null;

BeWoPlanerMobil/Models/ReportViewerSessionModel.cs

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
 namespace BeWoPlanerMobil.Models
 {
     [Serializable]
-    public class ReportViewerSessionModel : ISessionModel
+    public class ReportViewerSessionModel : BaseSessionModel
     {
         public long? SelectedEmployeeOid { get; set; }
         public long? SelectedTeamOid { get; set; }
@@ -24,8 +24,10 @@ namespace BeWoPlanerMobil.Models
         public ReportType SelectedReportType { get; internal set; }
         public long? SelectedQueryOid { get; internal set; }
 
-        public void ResetValues()
+        public override void ResetValues()
         {
+            base.ResetValues();
+
             SelectedEmployeeOid = null;
             SelectedTeamOid = null;
             SelectedMonth = null;

BeWoPlanerMobil/Models/SchedulerSessionModel.cs

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
 namespace BeWoPlanerMobil.Models
 {
     [Serializable]
-    public class SchedulerSessionModel : ISessionModel
+    public class SchedulerSessionModel : BaseSessionModel
     {
         public DateTime SelectedDate { get; set; }
         public long? SelectedAppointmentOid { get; internal set; }
@@ -36,8 +36,10 @@ namespace BeWoPlanerMobil.Models
         public DateTime? IntervalEndDate { get; internal set; }
         public int? IntervalDuration { get; internal set; }
 
-        public void ResetValues()
+        public override void ResetValues()
         {
+            base.ResetValues();
+
             SelectedDate = DateTime.Today;
             SelectedAppointmentOid = null;
             SelectedResourceOids = new List<long>();

BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs

@@ -149,16 +149,16 @@ namespace BeWoPlanerMobil.Service
 	    private static bool ConfigureHibernateSession()
         {
             var tenant = MobileSessionFacade.Tenant;
-
-            if(string.IsNullOrEmpty(tenant))
+            var newTenant = HttpContext.Current.Request.Params["tb_tenant"];
+            if (!String.IsNullOrEmpty(newTenant))
+            {
+                newTenant = newTenant.Trim();
+            }
+            if (string.IsNullOrEmpty(tenant) || (!String.IsNullOrEmpty(newTenant) && !newTenant.Equals(tenant)))
             {
                 //TODO: ist bei showPin=1 null!
-                tenant = HttpContext.Current.Request.Params["tb_tenant"];
-                if (!String.IsNullOrEmpty(tenant))
-                {
-                    tenant = tenant.Trim();
-                }
-                MobileSessionFacade.Tenant = tenant;
+                tenant = newTenant;
+                MobileSessionFacade.Tenant = newTenant;
             }
 
             if(string.IsNullOrEmpty(tenant))

BeWoPlanerMobil/Util/DcToMokMapper.cs

@@ -46,6 +46,8 @@ namespace BeWoPlanerMobil.Util
 			var s = new MokServiceRecord
 			{
 				Oid = dc.ServiceRecordOid.Value,
+				ServiceRecordType = dc.ServiceRecordType,
+				DistanceInMeter = dc.DistanceInMeter,
 				Start = dc.Start,
 				End = dc.End,
 				EmployeeName = dc.Employee.FirstNameLastName,
@@ -106,7 +108,7 @@ namespace BeWoPlanerMobil.Util
 						}
 
 #if DEBUG
-						if (goal.RatingTypeOid.HasValue)
+						if (model != null && goal.RatingTypeOid.HasValue)
 						{
 							var goalRating = model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value));
 
@@ -123,7 +125,7 @@ namespace BeWoPlanerMobil.Util
 						}
 					}
 
-					if (model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid))
+					if (model != null && model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid.Value))
 					{
 						var ziele = dc.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList();
 

BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml

@@ -465,7 +465,7 @@
                                         </div>
                                         <div class="collapse @Html.GetCollapsibleClass(Model.Collapsibles2IsShown, $"bgts-collapsible-{bargeldkasse.BargeldkassenOid}")" id="bgts-collapsible-@bargeldkasse.BargeldkassenOid">
                                             <div class="card-body p-1">
-                                                <table class="bg-bewo-dev table table-sm table-striped w-100 mx-0 px-0 service-record-table">
+                                                <table class="table table-sm table-striped w-100 mx-0 px-0 service-record-table">
                                                     <tbody>
                                                         @{
                                                             var count = 0;

BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml

@@ -142,7 +142,7 @@
     {
         if(selectedBargeldtransaktion.Zahlungsdatum.HasValue)
         {
-            transaktionsdatum = selectedBargeldtransaktion.Zahlungsdatum.Value.ToString("dd.MM.yyyy");
+            transaktionsdatum = selectedBargeldtransaktion.Zahlungsdatum.Value.ToString("yyyy-MM-dd");
         }
 
         transaktionsbelegnummer = selectedBargeldtransaktion.Belegnummer;

BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionshistorienPartial.cshtml

@@ -25,7 +25,7 @@
                 Geändert von
             </td>
             <td class="float-right">
-                @historyEntry.BargeldtransaktionUdpUser
+                @historyEntry.InsUser
             </td>
         </tr>
         <tr>

BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml

@@ -160,7 +160,7 @@
                     <div class="custom-control custom-checkbox goal-card-header float-left" onclick="stopToggle(event)" >
                         <input type="checkbox" class="custom-control-input goal-input" value="@goalTreeItem.ValueListEntryOid" @isCheckedValue id="goal-cb-@goalTreeItem.ValueListEntryOid" onchange="updateSelectedGoals()" />
                         <label class="custom-control-label goal-name-label @textClass" for="goal-cb-@goalTreeItem.ValueListEntryOid">@goalTreeItem.Header</label>
-                        @if(Model.HasRightToRateGoals)
+                        @if(Model.HasAnyRatingTypes)
                         {
                             <span style="cursor: pointer;" id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
                                 @(ratingType?.DisplayName ?? goalTreeItem.RatingName)
@@ -189,7 +189,7 @@
         <div class="custom-control custom-checkbox goal-text @marginBottom">
             <input type="checkbox" class="custom-control-input goal-input" id="goal-cb-@goalTreeItem.ValueListEntryOid" @isCheckedValue onchange="updateSelectedGoals()">
             <label for="goal-cb-@goalTreeItem.ValueListEntryOid" class="custom-control-label goal-name-label @textClass">@goalTreeItem.Header</label>
-            @if(Model.HasRightToRateGoals)
+            @if(Model.HasAnyRatingTypes)
             {
                 <span id="goal-rating-@goalTreeItem.ValueListEntryOid" style="cursor: pointer;" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
                     @(ratingType?.DisplayName ?? goalTreeItem.RatingName)

BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml

@@ -2,7 +2,7 @@
 @model BeWoPlanerMobil.Models.MainModel
 
 @{
-    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    if (TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
     {
         <text>
             <script type="text/javascript">
@@ -40,7 +40,7 @@
 	        prefix = "mb";
         }
 
-        const dokufeldId = `#${prefix}-dokufeld-textarea`;
+        const dokufeldId = `#${prefix}-doku-textarea`;
         const dokuTextareaId = `#${prefix}-doku-textarea-`;
         const textareaContainerId = `#${prefix}-doku_`;
 
@@ -84,14 +84,14 @@
 
 @helper BuildTextModuleTree(TextbausteinDisplayItem textModule)
 {
-    if(textModule.IsParent)
+    if (textModule.IsParent)
     {
         <a href="#" class="list-group-item list-group-item-action mx-0 px-1" onclick="textCategoryOnClick('@textModule.Oid')">
             <span id="@textModule.Oid-icon-span" class="fas fa-angle-down mr-1"></span>
             @textModule.Name
         </a>
         <div id="@textModule.Oid-children-container" style="display: none;" class="list-group list-group-item mx-0 px-1">
-            @foreach(var childTextModule in textModule.Children)
+            @foreach (var childTextModule in textModule.Children)
             {
                 @BuildTextModuleTree(childTextModule)
             }
@@ -105,14 +105,14 @@
     }
 }
 
-@if(Model?.TextModules?.Any() ?? false)
+@if (Model?.TextModules?.Any() ?? false)
 {
     <script type="text/javascript">
         $("#textmodule-container").show();
     </script>
 
     <div class="list-group">
-        @foreach(var textModule in Model.TextModules)
+        @foreach (var textModule in Model.TextModules)
         {
             @BuildTextModuleTree(textModule)
         }

BeWoPlanerMobil/Views/Shared/_Layout.cshtml

@@ -378,16 +378,17 @@
                         <span class="logoff-countdown m-0 p-0" id="countdown" onclick="countdownClick()">&nbsp;</span>
                     </p>
                 </a>
-
+                <span class="logoff-countdown m-0 p-0" >Version 3.27</span>
+                
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive">
                     <span class="navbar-toggler-icon"></span>
                 </button>
 
                 <div class="collapse navbar-collapse" id="navbarResponsive">
                     <ul class="navbar-nav ml-auto">
-                        @if(Html.IsInDebugMode())
+                        @if (Html.IsInDebugMode())
                         {
-                            using(Html.BeginForm("RedirectToDevExpressScheduler", "Main", FormMethod.Post))
+                            using (Html.BeginForm("RedirectToDevExpressScheduler", "Main", FormMethod.Post))
                             {
                                 <li class="nav-item">
                                     <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -397,30 +398,30 @@
                                 </li>
                             }
                         }
-                        
-                        @if(Html.IsInDebugMode())
-                        {
-	                        <li class="nav-item">
-		                        <button class="btn btn-link text-light no-underline" type="button" onclick="localStorage.clear(); logInfo2(`Der lokale Speicher wurde geleert`);">
-			                        <i class="fas fa-trash text-danger"></i>
-			                        Speicher leeren
-		                        </button>
-	                        </li>
 
-	                        using(Html.BeginForm("RedirectToDevTools", "Main", FormMethod.Post))
-	                        {
-		                        <li class="nav-item">
-									<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-										<i class="fas fa-bug text-success"></i>
+                        @if (Html.IsInDebugMode())
+                        {
+                            <li class="nav-item">
+                                <button class="btn btn-link text-light no-underline" type="button" onclick="localStorage.clear(); logInfo2(`Der lokale Speicher wurde geleert`);">
+                                    <i class="fas fa-trash text-danger"></i>
+                                    Speicher leeren
+                                </button>
+                            </li>
+
+                            using (Html.BeginForm("RedirectToDevTools", "Main", FormMethod.Post))
+                            {
+                                <li class="nav-item">
+                                    <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                        <i class="fas fa-bug text-success"></i>
                                         DevTools
-									</button>
-		                        </li>
-	                        }
+                                    </button>
+                                </li>
+                            }
                         }
 
-                        @if(Model.IsAllowedToSeeCustomers)
+                        @if (Model.IsAllowedToSeeCustomers)
                         {
-                            using(Html.BeginForm("RedirectToCustomer", "Main", FormMethod.Post))
+                            using (Html.BeginForm("RedirectToCustomer", "Main", FormMethod.Post))
                             {
                                 <li class="nav-item">
                                     <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -431,7 +432,7 @@
                             }
                         }
 
-                        @using(Html.BeginForm("RedirectToMain", "Main", FormMethod.Post))
+                        @using (Html.BeginForm("RedirectToMain", "Main", FormMethod.Post))
                         {
                             <li class="nav-item">
                                 <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -441,9 +442,9 @@
                             </li>
                         }
 
-                        @if(Model.IsAllowedToSeeScheduler)
+                        @if (Model.IsAllowedToSeeScheduler)
                         {
-                            using(Html.BeginForm("RedirectToScheduler", "Main", FormMethod.Post))
+                            using (Html.BeginForm("RedirectToScheduler", "Main", FormMethod.Post))
                             {
                                 <li class="nav-item">
                                     <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -455,9 +456,9 @@
                         }
 
 
-                        @if(Model.HasRightToViewQuittierungsbelege)
+                        @if (Model.HasRightToViewQuittierungsbelege)
                         {
-                            using(Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
+                            using (Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
                             {
                                 <li class="nav-item">
                                     <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -470,9 +471,9 @@
                             }
                         }
 
-                        @if(Model.HasRightToViewReports && Model.HasRightToViewMitarbeiterstundenkonto)
+                        @if (Model.HasRightToViewReports && Model.HasRightToViewMitarbeiterstundenkonto)
                         {
-                            using(Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post))
+                            using (Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post))
                             {
                                 <li class="nav-item">
                                     <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -498,7 +499,7 @@
                         </li>
 
                         <li class="nav-item">
-                            @using(Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "normal-logout-form" }))
+                            @using (Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "normal-logout-form" }))
                             {
                                 <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
                                     <i class="fas fa-sign-out-alt text-primary"></i>

Dakota/Dakota.csproj

@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>CS0168</NoWarn>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

Data/Access/SearchDAO.cs

@@ -79,6 +79,26 @@ namespace BeWo.Data.Access
             return x.Count > 0 ? DAOFactory.GenericDAO.GetByID<Wohnheim>(x.First()) : null;
         }
 
+        public virtual IList<WohneinheitBelegung> FindWohneinheitBelegungForCustomer(long customerOid, DateTime datum)
+        {
+            var criteria = CreateCriteriaIsActive<WohneinheitBelegung>()
+                .Add(Restrictions.Eq(WohneinheitBelegung.PropertyName_Customer, customerOid))
+                .Add(
+                    Restrictions.Or(
+                        Restrictions.And(
+                            Restrictions.Le(WohneinheitBelegung.PropertyName_StartDate, datum.Date),
+                            Restrictions.Ge(WohneinheitBelegung.PropertyName_EndDate, datum.Date)
+                        ),
+                        Restrictions.And(
+                            Restrictions.Le(WohneinheitBelegung.PropertyName_StartDate, datum.Date),
+                            Restrictions.IsNull(WohneinheitBelegung.PropertyName_EndDate)
+                        )
+                    )
+                );
+
+            return criteria.List<WohneinheitBelegung>();
+        }
+
         public virtual IEnumerable<Customer> FindCustomer(string pFirstName, string pLastName, string pReferenceNumber)
         {
             return CreateCriteria<Customer>()
@@ -5976,7 +5996,7 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
 
             if(days is object)
             {
-                var intervalStart = DateTime.Today;
+                var intervalStart = DateTime.Now.GetShortDateTime().AddDays(-days.Value);
                 var intervalEnd = intervalStart.AddDays(days.Value + 1).AddSeconds(-1);
 
                 var timesCriterion = CreateBetweenDateTimesCriterion(intervalStart, intervalEnd, nameof(ServiceRecord.Start), nameof(ServiceRecord.End));
@@ -6357,7 +6377,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
                 SignatureType = bargeldtransaktion is null ? SignatureTable.SingleSignature : SignatureTable.BargeldkasseneinzahlungsSignature,
                 TimeSpanStart = signatureTimeSpanStart,
                 TimeSpanEnd = signatureTimeSpanEnd,
-                SignatureEventType = signatureEventType
+                SignatureEventType = signatureEventType,
+                DataBild = signature.DataBild
             };
 
             if(serviceRecord?.Oid is object)
@@ -6433,7 +6454,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
                     SignatureInsTs = sig.InsTs,
                     SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature,
                     TimeSpanStart = transaktion.Zahlungsdatum,
-                    TimeSpanEnd = transaktion.Zahlungsdatum
+                    TimeSpanEnd = transaktion.Zahlungsdatum,
+                    DataBild = sig.DataBild
                 });
             });
 
@@ -6465,7 +6487,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
                 SignatureOid = signature.Oid,
                 TimeSpanStart = transaktion.Zahlungsdatum,
                 TimeSpanEnd = transaktion.Zahlungsdatum,
-                SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature
+                SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature,
+                DataBild = signature.DataBild
             };
         }
 

Data/Data.csproj

@@ -47,6 +47,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
     <NoWarn>CS0659, CS0162, CS0168, CS0169</NoWarn>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -57,6 +58,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>

Data/Entities/CustomerVermittlungArbeit.cs

@@ -13,7 +13,7 @@ namespace BeWo.Data.Entities
 		{
 			_Tid = TableID.CustomerGemeinnutzigeArbeit;
 		}
-
+		public virtual VgaTypeEnum VgaType { get; set; }
 		public virtual Customer Customer { get; set; }
 		public virtual Organisation Auftraggeber { get; set; }
 		public virtual Person AuftraggeberAnsprechpartner { get; set; }

Data/Entities/SignatureHistory.cs

@@ -17,7 +17,6 @@ namespace BeWo.Data.Entities
         private DateTime? _SignatureInsTs;
         private SignatureEventType _SignatureEventType;
 
-
         public SignatureHistory()
         {
             _Tid = TableID.SignatureHistory;
@@ -142,5 +141,7 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public virtual string DataBild { get; set; }
     }
 }

Data/Mappings/CustomerVermittlungArbeit.hbm.xml

@@ -13,6 +13,7 @@
     <property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
     <property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared"  />
     <property name="Notice"/>
+	<property name="VgaType" type="BS.Shared.VgaTypeEnum, BS.Shared" />
     <many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer, BeWo.Data" cascade="none"/>
 	<property name="AktenzeichenGericht"/>
     <property name="EigenesAktenzeichen"/>

Data/Mappings/SignatureHistory.hbm.xml

@@ -22,7 +22,8 @@
 		<property column="SignatureTimeSpanEnd" type="DateTime" name="TimeSpanEnd" />
 		<property column="SignatureInsTs" type="DateTime" name="SignatureInsTs" />
 		<property column="SignatureEventType" type="BS.Shared.SignatureEventType, BS.Shared" name="SignatureEventType"/>
-
+		<property name="DataBild" type="String" />
+		
 		<bag name="ServiceRecordOidList" table="servicerecord2signaturehistory" generic="true" cascade="none" batch-size="250">
 			<key column="SignatureHistoryOid" />
 			<element column="ServiceRecordOid" type="Int64" />

Host/Host.csproj

@@ -54,6 +54,7 @@
     <PublishDatabases>false</PublishDatabases>
     <FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />

Model/Changes_2025-09-04_VgaType_SignatureHistory.txt

@@ -0,0 +1,6 @@
+
+ALTER TABLE `CustomerVermittlungArbeit`
+ADD COLUMN `VgaType` int DEFAULT NULL;
+
+ALTER TABLE `SignatureHistory`
+ADD COLUMN `DataBild` longtext DEFAULT NULL;

Model/Changes_alle_fuer_neue_db.txt

@@ -1667,4 +1667,11 @@ ALTER TABLE `Employee`
 ADD COLUMN `GradDerBehinderung` VARCHAR(20) DEFAULT NULL;
 
 ALTER TABLE `Employee`
-ADD COLUMN `AusweisBemerkung` VARCHAR(512) DEFAULT NULL;
+ADD COLUMN `AusweisBemerkung` VARCHAR(512) DEFAULT NULL;
+
+
+ALTER TABLE `CustomerVermittlungArbeit`
+ADD COLUMN `VgaType` int DEFAULT NULL;
+
+ALTER TABLE `SignatureHistory`
+ADD COLUMN `DataBild` longtext DEFAULT NULL;

Report/Report.csproj

@@ -44,7 +44,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
     <NoWarn>CS0659, CS0162, CS0168, CS0649, CS0219</NoWarn>
@@ -56,7 +56,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

ReportImp/AidshilfeDortmund/ServiceInvoiceReport.cs

@@ -18,16 +18,16 @@ namespace AidshilfeDortmund
 
         public void SetReportDataSource(ServiceInvoiceRO pRO)
         {
-			DateTime start = pRO.AccountingPeriodStart;
-			DateTime end = pRO.AccountingPeriodEnd;
-			if (start.Month == end.Month && start.Year == end.Year)
-			{
-				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
-			}
-			else
-			{
-				lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
-			}
+            DateTime start = pRO.AccountingPeriodStart;
+            DateTime end = pRO.AccountingPeriodEnd;
+            if (start.Month == end.Month && start.Year == end.Year)
+            {
+                lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
+            }
+            else
+            {
+                lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
+            }
 
             if (pRO.CustomerSalutation.IsNullOrEmpty())
             {
@@ -49,6 +49,16 @@ namespace AidshilfeDortmund
                 xrCheckBox1.Checked = false;
             }
 
+            if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count == 1 && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems != null && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems.Count == 1)
+            {
+                var ii = pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0];
+                if ("ear to ear".Equals(ii.ServiceDescription))
+                {
+                    ii.ServiceDescription = "face to face"; 
+                }
+            }
+            
+
             this.bindingSource1.DataSource = pRO;
         }
 

ReportImp/AuswegHeikePuetz/AuswegHeikePuetz.csproj

@@ -57,6 +57,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="InvoiceCustomerReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="InvoiceCustomerReport.Designer.cs">
+      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
     <Compile Include="Mitarbeiterarbeitszeitkonto.cs">
       <SubType>Component</SubType>
@@ -65,6 +71,11 @@
       <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
     </Compile>
     <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>
@@ -104,10 +115,18 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="InvoiceCustomerReport.resx">
+      <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Mitarbeiterarbeitszeitkonto.resx">
       <DependentUpon>Mitarbeiterarbeitszeitkonto.cs</DependentUpon>
     </EmbeddedResource>
     <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>

ReportImp/AuswegHeikePuetz/InvoiceCustomerReport.Designer.cs

@@ -0,0 +1,902 @@
+using BeWo.Report.ReportObjects;
+namespace Ausweg
+{
+    partial class InvoiceCustomerReport
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow9});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(671.4175F, 25F);
+            this.xrTable1.StylePriority.UseFont = false;
+            // 
+            // xrTableRow9
+            // 
+            this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell9,
+            this.xrTableCell14,
+            this.xrTableCell10,
+            this.xrTableCell12});
+            this.xrTableRow9.Name = "xrTableRow9";
+            this.xrTableRow9.Weight = 1D;
+            // 
+            // 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, "InvoiceItems.AccountingPeriodStart")});
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UsePadding = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "xrTableCell6";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell6.Weight = 1D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodEnd")});
+            this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "xrTableCell7";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 1D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
+            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "xrTableCell9";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell9.Weight = 2.3350077713203072D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice")});
+            this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell14.StylePriority.UseBorders = false;
+            this.xrTableCell14.StylePriority.UseFont = false;
+            this.xrTableCell14.StylePriority.UsePadding = false;
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "xrTableCell14";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell14.Weight = 0.81217660612832132D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:0.##}")});
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell10.StylePriority.UseBorders = false;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "xrTableCell10";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell10.Weight = 0.6539656324947265D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AmountSum")});
+            this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
+            this.xrTableCell12.StylePriority.UseBorders = false;
+            this.xrTableCell12.StylePriority.UseFont = false;
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell12.Weight = 1.0152204985905673D;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel5,
+            this.xrTable5,
+            this.RecipientPostCodeAndTown,
+            this.xrLabel_RecipientStreet,
+            this.xrLabel_RecipientDivision,
+            this.xrLabel_RecipientContactPerson,
+            this.xrLabel7,
+            this.xrLabel9,
+            this.xrPictureBox3,
+            this.xrTable3,
+            this.xrLabel6,
+            this.lblAnrede,
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLabel2});
+            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.ReportHeader.HeightF = 518.875F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(387.4167F, 298.875F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(283F, 23F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrLabel5.TextFormatString = "Düren, {0:dd.MM.yyyy}";
+            // 
+            // xrTable5
+            // 
+            this.xrTable5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(455.6763F, 155.0834F);
+            this.xrTable5.Name = "xrTable5";
+            this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2,
+            this.xrTableRow1,
+            this.xrTableRow3,
+            this.xrTableRow7,
+            this.xrTableRow12,
+            this.xrTableRow13});
+            this.xrTable5.SizeF = new System.Drawing.SizeF(215.8237F, 108F);
+            this.xrTable5.StylePriority.UseFont = false;
+            this.xrTable5.StylePriority.UseTextAlignment = false;
+            this.xrTable5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell2});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 0.11920529801324505D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell2.ForeColor = System.Drawing.Color.Black;
+            this.xrTableCell2.Multiline = true;
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell2.StylePriority.UseFont = false;
+            this.xrTableCell2.StylePriority.UseForeColor = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Frau Aksoy";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell2.Weight = 1D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 0.11920529801324505D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
+            this.xrTableCell1.ForeColor = System.Drawing.Color.Blue;
+            this.xrTableCell1.Multiline = true;
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UseForeColor = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell1.Weight = 1D;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 0.11920529801324505D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.CanShrink = true;
+            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
+            this.xrTableCell3.ForeColor = System.Drawing.Color.Blue;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell3.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UseForeColor = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "sekretariat@bewo-ausweg.de";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell3.Weight = 1D;
+            // 
+            // xrTableRow7
+            // 
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell8});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.Weight = 0.11920529801324506D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell8.Weight = 1D;
+            // 
+            // xrTableRow12
+            // 
+            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell21});
+            this.xrTableRow12.Name = "xrTableRow12";
+            this.xrTableRow12.Weight = 0.11920529801324503D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanShrink = true;
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell21.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            this.xrTableCell21.Text = "Telefon: 02421 - 20 89 170";
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell21.Weight = 1D;
+            // 
+            // xrTableRow13
+            // 
+            this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22});
+            this.xrTableRow13.Name = "xrTableRow13";
+            this.xrTableRow13.Weight = 0.11920529801324506D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanShrink = true;
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell22.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            this.xrTableCell22.Text = "Telefax: 02421 - 20 89 172";
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell22.Weight = 1D;
+            // 
+            // RecipientPostCodeAndTown
+            // 
+            this.RecipientPostCodeAndTown.CanShrink = true;
+            this.RecipientPostCodeAndTown.Font = new DevExpress.Drawing.DXFont("arial", 11F);
+            this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 223.0834F);
+            this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown";
+            this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F);
+            this.RecipientPostCodeAndTown.StylePriority.UseFont = false;
+            this.RecipientPostCodeAndTown.Text = "[RecipientPostCode] [RecipientTown]";
+            // 
+            // xrLabel_RecipientStreet
+            // 
+            this.xrLabel_RecipientStreet.CanShrink = true;
+            this.xrLabel_RecipientStreet.Font = new DevExpress.Drawing.DXFont("arial", 11F);
+            this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 206.0834F);
+            this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet";
+            this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F);
+            this.xrLabel_RecipientStreet.StylePriority.UseFont = false;
+            this.xrLabel_RecipientStreet.Text = "[RecipientStreet]";
+            // 
+            // xrLabel_RecipientDivision
+            // 
+            this.xrLabel_RecipientDivision.CanShrink = true;
+            this.xrLabel_RecipientDivision.Font = new DevExpress.Drawing.DXFont("arial", 11F);
+            this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 172.5417F);
+            this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision";
+            this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F);
+            this.xrLabel_RecipientDivision.StylePriority.UseFont = false;
+            this.xrLabel_RecipientDivision.Text = "[RecipientDivision]";
+            // 
+            // xrLabel_RecipientContactPerson
+            // 
+            this.xrLabel_RecipientContactPerson.CanShrink = true;
+            this.xrLabel_RecipientContactPerson.Font = new DevExpress.Drawing.DXFont("arial", 11F);
+            this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5417F);
+            this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson";
+            this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 16.54167F);
+            this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false;
+            this.xrLabel_RecipientContactPerson.Text = "[RecipientFirstName] [RecipientLastName]";
+            // 
+            // xrLabel7
+            // 
+            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, 155.0834F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "[RecipientOrganisation]";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel9.CanShrink = true;
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102.7917F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(349.2917F, 17F);
+            this.xrLabel9.StylePriority.UseBorders = false;
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UseTextAlignment = false;
+            this.xrLabel9.Text = "Ausweg   Heike Pütz Pitzlergasse 6 52353 Düren";
+            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // xrPictureBox3
+            // 
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
+            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(387.4167F, 0F);
+            this.xrPictureBox3.Name = "xrPictureBox3";
+            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(262.5833F, 119.7917F);
+            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 493.8749F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow10});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(671.4175F, 25F);
+            this.xrTable3.StylePriority.UseFont = false;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell18,
+            this.xrTableCell19,
+            this.xrTableCell20});
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 1D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell15.StylePriority.UseBorders = false;
+            this.xrTableCell15.StylePriority.UsePadding = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.Text = "Von";
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell15.Weight = 1D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.Text = "Bis";
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 1D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell17.StylePriority.UseBorders = false;
+            this.xrTableCell17.StylePriority.UsePadding = false;
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            this.xrTableCell17.Text = "Posten";
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell17.Weight = 2.3350077713203934D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell18.StylePriority.UseBorders = false;
+            this.xrTableCell18.StylePriority.UsePadding = false;
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            this.xrTableCell18.Text = "Satz";
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell18.Weight = 0.81217660612829246D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell19.StylePriority.UseBorders = false;
+            this.xrTableCell19.StylePriority.UsePadding = false;
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            this.xrTableCell19.Text = "Anzahl";
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell19.Weight = 0.6539656324946691D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+            this.xrTableCell20.StylePriority.UseBorders = false;
+            this.xrTableCell20.StylePriority.UsePadding = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            this.xrTableCell20.Text = "Betrag";
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell20.Weight = 1.0152204985905673D;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 446.875F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(666.9999F, 23.25F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:";
+            // 
+            // lblAnrede
+            // 
+            this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 413.875F);
+            this.lblAnrede.Multiline = true;
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnrede.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F);
+            this.lblAnrede.StylePriority.UseFont = false;
+            this.lblAnrede.Text = "[RecipientSalutation]";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.CanShrink = true;
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.875F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "[CustomerReferenceNumber]";
+            this.xrLabel4.WordWrap = false;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 346.875F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Abrechnung über Betreuungsleistungen";
+            this.xrLabel3.WordWrap = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.CanShrink = true;
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.875F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
+            this.xrLabel2.WordWrap = false;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblNotice,
+            this.xrLabel12,
+            this.xrLabel10,
+            this.xrLabel11,
+            this.xrLabel8,
+            this.xrTable4});
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.ReportFooter.HeightF = 247.5417F;
+            this.ReportFooter.KeepTogether = true;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // lblNotice
+            // 
+            this.lblNotice.Font = new DevExpress.Drawing.DXFont("arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Italic);
+            this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 39.24999F);
+            this.lblNotice.Name = "lblNotice";
+            this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 17F);
+            this.lblNotice.StylePriority.UseFont = false;
+            this.lblNotice.Text = "Abschließende Bemerkungen:";
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207.5418F);
+            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(225F, 39.99995F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = "i.A. Silke Aksoy\r\nSekretariat\r\n";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 103.0835F);
+            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(175F, 20.45835F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Mit freundlichen Grüßen";
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 123.5419F);
+            this.xrLabel11.Multiline = true;
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(175F, 20.45835F);
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.Text = "Ausweg-betreutes Wohnen";
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.CanShrink = true;
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 56.25F);
+            this.xrLabel8.Multiline = true;
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(670.4166F, 18.04168F);
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.Text = "[Notice]";
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(570.5F, 0F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow11});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(101F, 25F);
+            // 
+            // xrTableRow11
+            // 
+            this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell23});
+            this.xrTableRow11.Name = "xrTableRow11";
+            this.xrTableRow11.Weight = 1D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell23.BorderWidth = 2F;
+            this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
+            this.xrTableCell23.StylePriority.UseBorders = false;
+            this.xrTableCell23.StylePriority.UseBorderWidth = false;
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UsePadding = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            this.xrTableCell23.Text = "[TotalClaim]";
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell23.Weight = 3.4827586206896557D;
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 8.333339F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrRichText1});
+            this.bottomMarginBand1.HeightF = 182.25F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 0F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(671.4999F, 124.9583F);
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1});
+            this.DetailReport.DataMember = "InvoiceItems";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
+            this.Detail1.HeightF = 25F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
+            // 
+            // InvoiceCustomerReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.ReportFooter,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.DetailReport});
+            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(97F, 58F, 8.333339F, 182.25F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.Version = "23.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel lblAnrede;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRTable xrTable5;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRLabel lblNotice;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+    }
+}

ReportImp/AuswegHeikePuetz/InvoiceCustomerReport.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Text;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+namespace Ausweg
+{
+    public partial class InvoiceCustomerReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<InvoiceCustomerRO>
+    {
+        public InvoiceCustomerReport()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(InvoiceCustomerRO pRO)
+        {
+	        if (String.IsNullOrEmpty(pRO.Notice))
+	        {
+		        lblNotice.Visible = false;
+	        }
+
+			//StringBuilder sb = new StringBuilder();
+			//if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim()))
+			//{
+			//	sb.AppendLine(pRO.RecipientOrganisation);
+			//}
+			//if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientDivision.Trim()))
+			//{
+			//	sb.AppendLine(pRO.RecipientDivision);
+			//}
+			//if ((!String.IsNullOrEmpty(pRO.RecipientFirstName) && !String.IsNullOrEmpty(pRO.RecipientFirstName.Trim()))
+			//	|| (!String.IsNullOrEmpty(pRO.RecipientLastName) && !String.IsNullOrEmpty(pRO.RecipientLastName.Trim())))
+			//{
+			//	sb.AppendLine(String.Format("{0} {1}", pRO.RecipientFirstName, pRO.RecipientLastName).Trim());
+			//}
+			//if (!String.IsNullOrEmpty(pRO.RecipientStreet) && !String.IsNullOrEmpty(pRO.RecipientStreet.Trim()))
+			//{
+			//	sb.AppendLine(pRO.RecipientStreet);
+			//}
+			//if (!String.IsNullOrEmpty(pRO.RecipientPostCode) && !String.IsNullOrEmpty(pRO.RecipientPostCode.Trim()))
+			//{
+			//	sb.Append(pRO.RecipientPostCode);
+			//	sb.Append(" ");
+			//}
+			//if (!String.IsNullOrEmpty(pRO.RecipientTown) && !String.IsNullOrEmpty(pRO.RecipientTown.Trim()))
+			//{
+			//	sb.Append(pRO.RecipientTown);
+			//}
+			//lblAddress.Text = sb.ToString();
+
+			if (pRO.RecipientSalutation == "Sehr geehrte Damen und Herren,")
+				pRO.RecipientSalutation = "Guten Tag,";
+
+			this.bindingSource1.DataSource = pRO;
+        }
+    }
+}

ReportImp/AuswegHeikePuetz/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 Ausweg.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("Ausweg.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

ReportImp/AuswegHeikePuetz/Properties/Resources.resx

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

ReportImp/AuswegHeikePuetz/ServiceInvoiceReport.Designer.cs

@@ -30,44 +30,23 @@ namespace Ausweg
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport));
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
-            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -92,13 +71,39 @@ namespace Ausweg
             this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.lblFinalSentence = new DevExpress.XtraReports.UI.XRLabel();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -124,58 +129,40 @@ namespace Ausweg
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox3});
-            this.topMarginBand1.HeightF = 157.5F;
+            this.topMarginBand1.HeightF = 15.83333F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
-            // xrPictureBox3
-            // 
-            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
-            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(387.4167F, 37.7083F);
-            this.xrPictureBox3.Name = "xrPictureBox3";
-            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(262.5833F, 119.7917F);
-            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrRichText1});
+            this.bottomMarginBand1.HeightF = 179.875F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // Page1
             // 
             this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.lblAdresse,
+            this.xrLabel6,
+            this.xrPictureBox3,
+            this.xrLabel5,
+            this.xrTable1,
+            this.lblAddress,
             this.xrLabel4,
             this.xrLabel3,
             this.xrLabel2,
             this.lblAnrede,
-            this.xrLabel8,
-            this.lblAbrechnungszeitraum,
-            this.xrTable2});
+            this.lblAbrechnungszeitraum});
             this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.Page1.HeightF = 354.0833F;
+            this.Page1.HeightF = 525.7501F;
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
-            // 
-            // lblAdresse
-            // 
-            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.lblAdresse.Multiline = true;
-            this.lblAdresse.Name = "lblAdresse";
-            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F);
-            this.lblAdresse.StylePriority.UseFont = false;
-            this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
-    "tStreet]\r\n[RecipientPostCodeAndTown]";
             // 
             // xrLabel4
             // 
             this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel4.CanShrink = true;
-            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F);
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 402.7083F);
             this.xrLabel4.Multiline = true;
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -189,9 +176,8 @@ namespace Ausweg
             // 
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F);
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 382.7083F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
@@ -205,9 +191,8 @@ namespace Ausweg
             // 
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, 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, 195F);
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 362.7083F);
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F);
@@ -218,28 +203,18 @@ namespace Ausweg
             // 
             // lblAnrede
             // 
-            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F);
+            this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 465.2083F);
             this.lblAnrede.Name = "lblAnrede";
             this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
             this.lblAnrede.StylePriority.UseFont = false;
             this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
             // 
-            // xrLabel8
-            // 
-            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 172F);
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F);
-            this.xrLabel8.StylePriority.UseTextAlignment = false;
-            this.xrLabel8.Text = "xrLabel8";
-            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            // 
             // lblAbrechnungszeitraum
             // 
-            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F);
+            this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 490.2083F);
             this.lblAbrechnungszeitraum.Multiline = true;
             this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
             this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -247,180 +222,9 @@ namespace Ausweg
             this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
             this.lblAbrechnungszeitraum.Text = "hiermit berechnen wir für den ... folgende erbrachte Tätigkeiten:";
             // 
-            // xrTable2
-            // 
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 0F);
-            this.xrTable2.Name = "xrTable2";
-            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow2,
-            this.xrTableRow5,
-            this.xrTableRow4,
-            this.xrTableRow3,
-            this.xrTableRow1,
-            this.xrTableRow6,
-            this.xrTableRow8,
-            this.xrTableRow7});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 151F);
-            // 
-            // xrTableRow2
-            // 
-            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4});
-            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.CanShrink = true;
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Ihr(e) Ansprechpartner(in):";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell4.Weight = 1D;
-            // 
-            // xrTableRow5
-            // 
-            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell13});
-            this.xrTableRow5.Name = "xrTableRow5";
-            this.xrTableRow5.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.CanShrink = true;
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell13.StylePriority.UseFont = false;
-            this.xrTableCell13.StylePriority.UseTextAlignment = false;
-            this.xrTableCell13.Text = "[SenderContactPerson]";
-            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell13.Weight = 1D;
-            // 
-            // xrTableRow4
-            // 
-            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell11});
-            this.xrTableRow4.Name = "xrTableRow4";
-            this.xrTableRow4.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.CanShrink = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell11.StylePriority.UseFont = false;
-            this.xrTableCell11.StylePriority.UseTextAlignment = false;
-            this.xrTableCell11.Text = "[SenderContactPersonDivision]";
-            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell11.Weight = 1D;
-            // 
-            // xrTableRow3
-            // 
-            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell8});
-            this.xrTableRow3.Name = "xrTableRow3";
-            this.xrTableRow3.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell8
-            // 
-            this.xrTableCell8.CanShrink = true;
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell8.StylePriority.UseFont = false;
-            this.xrTableCell8.StylePriority.UseTextAlignment = false;
-            this.xrTableCell8.Text = "[SenderContactPersonMail]";
-            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell8.Weight = 1D;
-            // 
-            // xrTableRow1
-            // 
-            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1});
-            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.Weight = 0.13245033112582783D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.CanShrink = true;
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell1.StylePriority.UseFont = false;
-            this.xrTableCell1.StylePriority.UseTextAlignment = false;
-            this.xrTableCell1.Text = "[SenderContactPersonPhone]";
-            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell1.Weight = 1D;
-            // 
-            // xrTableRow6
-            // 
-            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell2});
-            this.xrTableRow6.Name = "xrTableRow6";
-            this.xrTableRow6.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.CanShrink = true;
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrTableCell2.StylePriority.UseFont = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "[SenderContactPersonFax]";
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell2.Weight = 1D;
-            // 
-            // xrTableRow8
-            // 
-            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell5});
-            this.xrTableRow8.Name = "xrTableRow8";
-            this.xrTableRow8.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell5
-            // 
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell5.Weight = 1D;
-            // 
-            // xrTableRow7
-            // 
-            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell3});
-            this.xrTableRow7.Name = "xrTableRow7";
-            this.xrTableRow7.StylePriority.UseTextAlignment = false;
-            this.xrTableRow7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableRow7.Weight = 0.11258278145695365D;
-            // 
-            // xrTableCell3
-            // 
-            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
-            this.xrTableCell3.Multiline = true;
-            this.xrTableCell3.Name = "xrTableCell3";
-            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell3.TextFormatString = "GP-Nr.: {0}";
-            this.xrTableCell3.Weight = 1D;
-            // 
-            // xrLabel15
-            // 
-            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 134.375F);
-            this.xrLabel15.Name = "xrLabel15";
-            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
-            this.xrLabel15.StylePriority.UseFont = false;
-            this.xrLabel15.Text = "Mit freundlichen Grüßen";
-            // 
             // xrTable4
             // 
-            this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.xrTable4.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 53.125F);
             this.xrTable4.Name = "xrTable4";
             this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -458,21 +262,9 @@ namespace Ausweg
             this.xrTableCell12.Name = "xrTableCell12";
             this.xrTableCell12.Weight = 3D;
             // 
-            // xrLabel14
-            // 
-            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")});
-            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F);
-            this.xrLabel14.Name = "xrLabel14";
-            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
-            this.xrLabel14.StylePriority.UseFont = false;
-            this.xrLabel14.Text = "[CreatorName]";
-            // 
             // xrLabel9
             // 
-            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic);
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Italic);
             this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 28.125F);
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -525,11 +317,13 @@ namespace Ausweg
             this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell32.Name = "xrTableCell32";
             this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell32.StylePriority.UseBackColor = false;
             this.xrTableCell32.StylePriority.UseBorderColor = false;
             this.xrTableCell32.StylePriority.UseBorders = false;
+            this.xrTableCell32.StylePriority.UseFont = false;
             this.xrTableCell32.StylePriority.UsePadding = false;
             this.xrTableCell32.StylePriority.UseTextAlignment = false;
             this.xrTableCell32.Text = "Zeitraum";
@@ -543,11 +337,13 @@ namespace Ausweg
             this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell37.Name = "xrTableCell37";
             this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell37.StylePriority.UseBackColor = false;
             this.xrTableCell37.StylePriority.UseBorderColor = false;
             this.xrTableCell37.StylePriority.UseBorders = false;
+            this.xrTableCell37.StylePriority.UseFont = false;
             this.xrTableCell37.StylePriority.UsePadding = false;
             this.xrTableCell37.StylePriority.UseTextAlignment = false;
             this.xrTableCell37.Text = "Leistung";
@@ -561,11 +357,13 @@ namespace Ausweg
             this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell35.Name = "xrTableCell35";
             this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell35.StylePriority.UseBackColor = false;
             this.xrTableCell35.StylePriority.UseBorderColor = false;
             this.xrTableCell35.StylePriority.UseBorders = false;
+            this.xrTableCell35.StylePriority.UseFont = false;
             this.xrTableCell35.StylePriority.UsePadding = false;
             this.xrTableCell35.StylePriority.UseTextAlignment = false;
             this.xrTableCell35.Text = "Satz";
@@ -579,11 +377,13 @@ namespace Ausweg
             this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell33.Name = "xrTableCell33";
             this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell33.StylePriority.UseBackColor = false;
             this.xrTableCell33.StylePriority.UseBorderColor = false;
             this.xrTableCell33.StylePriority.UseBorders = false;
+            this.xrTableCell33.StylePriority.UseFont = false;
             this.xrTableCell33.StylePriority.UsePadding = false;
             this.xrTableCell33.StylePriority.UseTextAlignment = false;
             this.xrTableCell33.Text = "Stunden";
@@ -597,11 +397,13 @@ namespace Ausweg
             this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell36.Name = "xrTableCell36";
             this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell36.StylePriority.UseBackColor = false;
             this.xrTableCell36.StylePriority.UseBorderColor = false;
             this.xrTableCell36.StylePriority.UseBorders = false;
+            this.xrTableCell36.StylePriority.UseFont = false;
             this.xrTableCell36.StylePriority.UsePadding = false;
             this.xrTableCell36.StylePriority.UseTextAlignment = false;
             this.xrTableCell36.Text = "Betrag";
@@ -615,11 +417,13 @@ namespace Ausweg
             this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell38.Name = "xrTableCell38";
             this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell38.StylePriority.UseBackColor = false;
             this.xrTableCell38.StylePriority.UseBorderColor = false;
             this.xrTableCell38.StylePriority.UseBorders = false;
+            this.xrTableCell38.StylePriority.UseFont = false;
             this.xrTableCell38.StylePriority.UsePadding = false;
             this.xrTableCell38.StylePriority.UseTextAlignment = false;
             this.xrTableCell38.Text = "pausch Fakt.";
@@ -633,11 +437,13 @@ namespace Ausweg
             this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell34.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
             this.xrTableCell34.Name = "xrTableCell34";
             this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell34.StylePriority.UseBackColor = false;
             this.xrTableCell34.StylePriority.UseBorderColor = false;
             this.xrTableCell34.StylePriority.UseBorders = false;
+            this.xrTableCell34.StylePriority.UseFont = false;
             this.xrTableCell34.StylePriority.UsePadding = false;
             this.xrTableCell34.StylePriority.UseTextAlignment = false;
             this.xrTableCell34.Text = "Gesamt";
@@ -693,10 +499,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Duration")});
+            this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell40.Name = "xrTableCell40";
             this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell40.StylePriority.UseBorderColor = false;
             this.xrTableCell40.StylePriority.UseBorders = false;
+            this.xrTableCell40.StylePriority.UseFont = false;
             this.xrTableCell40.StylePriority.UsePadding = false;
             this.xrTableCell40.StylePriority.UseTextAlignment = false;
             this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
@@ -709,10 +517,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
+            this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell42.Name = "xrTableCell42";
             this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell42.StylePriority.UseBorderColor = false;
             this.xrTableCell42.StylePriority.UseBorders = false;
+            this.xrTableCell42.StylePriority.UseFont = false;
             this.xrTableCell42.StylePriority.UsePadding = false;
             this.xrTableCell42.StylePriority.UseTextAlignment = false;
             this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
@@ -725,10 +535,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")});
+            this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell43.Name = "xrTableCell43";
             this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell43.StylePriority.UseBorderColor = false;
             this.xrTableCell43.StylePriority.UseBorders = false;
+            this.xrTableCell43.StylePriority.UseFont = false;
             this.xrTableCell43.StylePriority.UsePadding = false;
             this.xrTableCell43.StylePriority.UseTextAlignment = false;
             this.xrTableCell43.Text = "xrTableCell43";
@@ -742,10 +554,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")});
+            this.xrTableCell44.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell44.Name = "xrTableCell44";
             this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell44.StylePriority.UseBorderColor = false;
             this.xrTableCell44.StylePriority.UseBorders = false;
+            this.xrTableCell44.StylePriority.UseFont = false;
             this.xrTableCell44.StylePriority.UsePadding = false;
             this.xrTableCell44.StylePriority.UseTextAlignment = false;
             this.xrTableCell44.Text = "xrTableCell44";
@@ -759,10 +573,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")});
+            this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell45.Name = "xrTableCell45";
             this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell45.StylePriority.UseBorderColor = false;
             this.xrTableCell45.StylePriority.UseBorders = false;
+            this.xrTableCell45.StylePriority.UseFont = false;
             this.xrTableCell45.StylePriority.UsePadding = false;
             this.xrTableCell45.StylePriority.UseTextAlignment = false;
             this.xrTableCell45.Text = "xrTableCell45";
@@ -776,10 +592,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
+            this.xrTableCell46.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell46.Name = "xrTableCell46";
             this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell46.StylePriority.UseBorderColor = false;
             this.xrTableCell46.StylePriority.UseBorders = false;
+            this.xrTableCell46.StylePriority.UseFont = false;
             this.xrTableCell46.StylePriority.UsePadding = false;
             this.xrTableCell46.StylePriority.UseTextAlignment = false;
             this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
@@ -792,10 +610,12 @@ namespace Ausweg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
+            this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
             this.xrTableCell47.Name = "xrTableCell47";
             this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell47.StylePriority.UseBorderColor = false;
             this.xrTableCell47.StylePriority.UseBorders = false;
+            this.xrTableCell47.StylePriority.UseFont = false;
             this.xrTableCell47.StylePriority.UsePadding = false;
             this.xrTableCell47.StylePriority.UseTextAlignment = false;
             this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
@@ -804,20 +624,31 @@ namespace Ausweg
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel11,
+            this.xrLabel10,
+            this.xrLabel12,
             this.lblFinalSentence,
             this.xrLabel1,
             this.xrLabel9,
-            this.xrTable4,
-            this.xrLabel14,
-            this.xrLabel15});
-            this.GroupFooter1.HeightF = 206.5833F;
+            this.xrTable4});
+            this.GroupFooter1.HeightF = 280.6249F;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
+            // lblFinalSentence
+            // 
+            this.lblFinalSentence.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.lblFinalSentence.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.12502F);
+            this.lblFinalSentence.Multiline = true;
+            this.lblFinalSentence.Name = "lblFinalSentence";
+            this.lblFinalSentence.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblFinalSentence.SizeF = new System.Drawing.SizeF(650F, 31.58334F);
+            this.lblFinalSentence.StylePriority.UseFont = false;
+            // 
             // xrLabel1
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")});
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
@@ -828,19 +659,275 @@ namespace Ausweg
             this.xrLabel1.Text = "xrLabel1";
             this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
             // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel5.CanShrink = true;
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 92.08F);
+            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(332.9583F, 17F);
+            this.xrLabel5.StylePriority.UseBorders = false;
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.Text = "Ausweg   Heike Pütz Pitzlergasse 6 52353 Düren";
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(461.0095F, 142.5834F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow9,
+            this.xrTableRow11,
+            this.xrTableRow12,
+            this.xrTableRow13,
+            this.xrTableRow15,
+            this.xrTableRow16,
+            this.xrTableRow17,
+            this.xrTableRow18});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(215.8237F, 144F);
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableRow9
+            // 
+            this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6});
+            this.xrTableRow9.Name = "xrTableRow9";
+            this.xrTableRow9.Weight = 0.11920529801324505D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell6.ForeColor = System.Drawing.Color.Black;
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UseForeColor = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "Frau Aksoy";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell6.Weight = 1D;
+            // 
+            // xrTableRow11
+            // 
+            this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell7});
+            this.xrTableRow11.Name = "xrTableRow11";
+            this.xrTableRow11.Weight = 0.11920529801324505D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
+            this.xrTableCell7.ForeColor = System.Drawing.Color.Blue;
+            this.xrTableCell7.Multiline = true;
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UseForeColor = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell7.Weight = 1D;
+            // 
+            // xrTableRow12
+            // 
+            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell10});
+            this.xrTableRow12.Name = "xrTableRow12";
+            this.xrTableRow12.Weight = 0.11920529801324505D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.CanShrink = true;
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
+            this.xrTableCell10.ForeColor = System.Drawing.Color.Blue;
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell10.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UseForeColor = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "sekretariat@bewo-ausweg.de";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell10.Weight = 1D;
+            // 
+            // xrTableRow13
+            // 
+            this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell14});
+            this.xrTableRow13.Name = "xrTableRow13";
+            this.xrTableRow13.Weight = 0.11920529801324506D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell14.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell14.StylePriority.UseFont = false;
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell14.Weight = 1D;
+            // 
+            // xrTableRow15
+            // 
+            this.xrTableRow15.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell21});
+            this.xrTableRow15.Name = "xrTableRow15";
+            this.xrTableRow15.Weight = 0.11920529801324503D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanShrink = true;
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell21.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            this.xrTableCell21.Text = "Telefon: 02421 - 20 89 170";
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell21.Weight = 1D;
+            // 
+            // xrTableRow16
+            // 
+            this.xrTableRow16.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22});
+            this.xrTableRow16.Name = "xrTableRow16";
+            this.xrTableRow16.Weight = 0.11920529801324506D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanShrink = true;
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell22.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            this.xrTableCell22.Text = "Telefax: 02421 - 20 89 172";
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell22.Weight = 1D;
+            // 
+            // xrPictureBox3
+            // 
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
+            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(408.9167F, 0F);
+            this.xrPictureBox3.Name = "xrPictureBox3";
+            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(262.5833F, 119.7917F);
+            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrTableRow17
+            // 
+            this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15});
+            this.xrTableRow17.Name = "xrTableRow17";
+            this.xrTableRow17.Weight = 0.11920529801324506D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell15.Weight = 1D;
+            // 
+            // xrTableRow18
+            // 
+            this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell16});
+            this.xrTableRow18.Name = "xrTableRow18";
+            this.xrTableRow18.Weight = 0.11920529801324506D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
+            this.xrTableCell16.Multiline = true;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell16.TextFormatString = "GP-Nr.: {0}";
+            this.xrTableCell16.Weight = 1D;
+            // 
+            // lblAddress
+            // 
+            this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 139.0834F);
+            this.lblAddress.Multiline = true;
+            this.lblAddress.Name = "lblAddress";
+            this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAddress.SizeF = new System.Drawing.SizeF(317F, 111.5F);
+            this.lblAddress.StylePriority.UseFont = false;
+            this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
+    "tStreet]\r\n[RecipientPostCodeAndTown]";
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(388.5F, 318.6667F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(283F, 23F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrLabel6.TextFormatString = "Düren, {0:dd.MM.yyyy}";
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 146.625F);
+            this.xrLabel11.Multiline = true;
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(175F, 20.45835F);
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.Text = "Ausweg-betreutes Wohnen";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 126.1666F);
+            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(175F, 20.45835F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Mit freundlichen Grüßen";
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230.625F);
+            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(225F, 39.99995F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.Text = "i.A. Silke Aksoy\r\nSekretariat\r\n";
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 0F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(671.4999F, 124.9583F);
+            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
-            // lblFinalSentence
-            // 
-            this.lblFinalSentence.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.12502F);
-            this.lblFinalSentence.Multiline = true;
-            this.lblFinalSentence.Name = "lblFinalSentence";
-            this.lblFinalSentence.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblFinalSentence.SizeF = new System.Drawing.SizeF(650F, 31.58334F);
-            this.lblFinalSentence.StylePriority.UseFont = false;
-            // 
             // ServiceInvoiceReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -855,15 +942,18 @@ namespace Ausweg
             this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F);
+            this.Margins = new DevExpress.Drawing.DXMargins(93.74998F, 48F, 15.83333F, 179.875F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.Version = "23.2";
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
@@ -881,30 +971,12 @@ namespace Ausweg
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.XRLabel xrLabel2;
         private DevExpress.XtraReports.UI.XRLabel lblAnrede;
-		private DevExpress.XtraReports.UI.XRLabel xrLabel8;
         private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
-        private DevExpress.XtraReports.UI.XRTable xrTable2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
         private DevExpress.XtraReports.UI.XRTable xrTable4;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
         private DevExpress.XtraReports.UI.XRLabel xrLabel9;
         private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
 		private DevExpress.XtraReports.UI.DetailBand Detail1;
@@ -928,12 +1000,33 @@ namespace Ausweg
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
-        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
 		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
         private DevExpress.XtraReports.UI.XRLabel lblFinalSentence;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow18;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRLabel lblAddress;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
     }
 }

ReportImp/AuswegHeikePuetz/ServiceInvoiceReport.cs

@@ -70,7 +70,7 @@ namespace Ausweg
             {
                 sb.AppendLine(pRO.RecipientPostCodeAndTown);
             }
-            lblAdresse.Text = sb.ToString();
+            lblAddress.Text = sb.ToString();
         }
     }
 }

ReportImp/AuswegHeikePuetz/SettlementReport2.Designer.cs

@@ -30,8 +30,8 @@ namespace Ausweg
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
+            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -53,6 +53,8 @@ namespace Ausweg
             this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -65,15 +67,19 @@ namespace Ausweg
             this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
             this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -89,6 +95,7 @@ namespace Ausweg
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -104,27 +111,16 @@ namespace Ausweg
             this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -343,15 +339,34 @@ namespace Ausweg
             this.xrTable3,
             this.xrLabel12});
             this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.ReportFooter.HeightF = 254.4583F;
+            this.ReportFooter.HeightF = 236.75F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 145.7082F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(80.69878F, 51.04173F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112.7501F);
+            this.xrLabel11.Multiline = true;
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(175F, 20.45835F);
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.Text = "Ausweg-betreutes Wohnen";
+            // 
             // xrLabel10
             // 
             this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 110F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 92.29167F);
             this.xrLabel10.Multiline = true;
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -369,10 +384,8 @@ namespace Ausweg
             this.xrTableRow7,
             this.xrTableRow9,
             this.xrTableRow21,
-            this.xrTableRow22,
-            this.xrTableRow23,
-            this.xrTableRow24});
-            this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 94F);
+            this.xrTableRow22});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 68F);
             this.xrTable3.StylePriority.UseFont = false;
             // 
             // xrTableRow20
@@ -454,39 +467,10 @@ namespace Ausweg
             this.xrTableCell29.Text = "xrTableCell4";
             this.xrTableCell29.Weight = 3D;
             // 
-            // xrTableRow23
-            // 
-            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell30});
-            this.xrTableRow23.Name = "xrTableRow23";
-            this.xrTableRow23.Weight = 0.23809523809523803D;
-            // 
-            // xrTableCell30
-            // 
-            this.xrTableCell30.Name = "xrTableCell30";
-            this.xrTableCell30.Weight = 3D;
-            // 
-            // xrTableRow24
-            // 
-            this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell31});
-            this.xrTableRow24.Name = "xrTableRow24";
-            this.xrTableRow24.Weight = 0.38095238095238088D;
-            // 
-            // xrTableCell31
-            // 
-            this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")});
-            this.xrTableCell31.Name = "xrTableCell31";
-            this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell31.StylePriority.UsePadding = false;
-            this.xrTableCell31.Text = "xrTableCell8";
-            this.xrTableCell31.Weight = 3D;
-            // 
             // xrLabel12
             // 
             this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 214.4583F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.75F);
             this.xrLabel12.Multiline = true;
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -537,6 +521,115 @@ namespace Ausweg
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
             // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel9.CanShrink = true;
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(349.2917F, 17F);
+            this.xrLabel9.StylePriority.UseBorders = false;
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UseTextAlignment = false;
+            this.xrLabel9.Text = "Ausweg   Heike Pütz Pitzlergasse 6 52353 Düren";
+            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.CanShrink = true;
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 394.5833F);
+            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, 17F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Summe der unmittelbar erbrachten Fachleistungsstunden: [RecordedFLS!0.00]";
+            this.xrLabel7.WordWrap = false;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel6.CanShrink = true;
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 365.8333F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(650F, 17F);
+            this.xrLabel6.StylePriority.UseBackColor = false;
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = "Anzahl der bewilligten Fachleistungsstunden: [ApprovedFLS]";
+            this.xrLabel6.WordWrap = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.CanShrink = true;
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 336.0417F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Bewilligungszeitraum von [AccountingStartDate!dd.MM.yyyy] bis [AccountingEndDate!" +
+    "dd.MM.yyyy]";
+            this.xrLabel2.WordWrap = false;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 246.0833F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(186.4583F, 23F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.TextFormatString = "GP-Nr.: {0}";
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 428.4583F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.rowErbrachteLeistung});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrTable1.StylePriority.UseBorderColor = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            // 
+            // rowErbrachteLeistung
+            // 
+            this.rowErbrachteLeistung.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22});
+            this.rowErbrachteLeistung.Name = "rowErbrachteLeistung";
+            this.rowErbrachteLeistung.Weight = 0.05278140462117753D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell22.StylePriority.UseBorderColor = false;
+            this.xrTableCell22.StylePriority.UseBorders = false;
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.Text = "Erbrachte Leistungen:";
+            this.xrTableCell22.Weight = 1D;
+            // 
             // fieldApprovedFLSWithFactor
             // 
             this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]";
@@ -712,6 +805,10 @@ namespace Ausweg
             this.xrTableCell7.StylePriority.UsePadding = false;
             this.xrTableCell7.Weight = 3D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -883,118 +980,6 @@ namespace Ausweg
             this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell60.Weight = 0.16397432767427886D;
             // 
-            // xrLabel5
-            // 
-            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")});
-            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 246.0833F);
-            this.xrLabel5.Multiline = true;
-            this.xrLabel5.Name = "xrLabel5";
-            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(186.4583F, 23F);
-            this.xrLabel5.StylePriority.UseFont = false;
-            this.xrLabel5.TextFormatString = "GP-Nr.: {0}";
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel2.CanShrink = true;
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 336.0417F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
-            this.xrLabel2.StylePriority.UseBackColor = false;
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Bewilligungszeitraum von [AccountingStartDate!dd.MM.yyyy] bis [AccountingEndDate!" +
-    "dd.MM.yyyy]";
-            this.xrLabel2.WordWrap = false;
-            // 
-            // xrLabel6
-            // 
-            this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel6.CanShrink = true;
-            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 365.8333F);
-            this.xrLabel6.Multiline = true;
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(650F, 17F);
-            this.xrLabel6.StylePriority.UseBackColor = false;
-            this.xrLabel6.StylePriority.UseFont = false;
-            this.xrLabel6.Text = "Anzahl der bewilligten Fachleistungsstunden: [ApprovedFLS]";
-            this.xrLabel6.WordWrap = false;
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel7.CanShrink = true;
-            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 394.5833F);
-            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, 17F);
-            this.xrLabel7.StylePriority.UseBackColor = false;
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.Text = "Summe der unmittelbar erbrachten Fachleistungsstunden: [RecordedFLS!0.00]";
-            this.xrLabel7.WordWrap = false;
-            // 
-            // xrTableCell22
-            // 
-            this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
-            this.xrTableCell22.Name = "xrTableCell22";
-            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell22.StylePriority.UseBorderColor = false;
-            this.xrTableCell22.StylePriority.UseBorders = false;
-            this.xrTableCell22.StylePriority.UseFont = false;
-            this.xrTableCell22.Text = "Erbrachte Leistungen:";
-            this.xrTableCell22.Weight = 1D;
-            // 
-            // rowErbrachteLeistung
-            // 
-            this.rowErbrachteLeistung.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell22});
-            this.rowErbrachteLeistung.Name = "rowErbrachteLeistung";
-            this.rowErbrachteLeistung.Weight = 0.05278140462117753D;
-            // 
-            // xrTable1
-            // 
-            this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 11F);
-            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 428.4583F);
-            this.xrTable1.Name = "xrTable1";
-            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.rowErbrachteLeistung});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrTable1.StylePriority.UseBorderColor = false;
-            this.xrTable1.StylePriority.UseFont = false;
-            // 
-            // xrLabel11
-            // 
-            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial Narrow", 10F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 130.4584F);
-            this.xrLabel11.Multiline = true;
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(175F, 20.45835F);
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.Text = "Ausweg-betreutes Wohnen";
-            // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 163.4166F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(80.69878F, 51.04173F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            // 
             // PageFooter
             // 
             this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1012,26 +997,6 @@ namespace Ausweg
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
             this.xrRichText1.SizeF = new System.Drawing.SizeF(677.9999F, 124.9583F);
             // 
-            // xrLabel9
-            // 
-            this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrLabel9.CanShrink = true;
-            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
-            this.xrLabel9.Name = "xrLabel9";
-            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel9.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(349.2917F, 17F);
-            this.xrLabel9.StylePriority.UseBorders = false;
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.StylePriority.UseTextAlignment = false;
-            this.xrLabel9.Text = "Ausweg   Heike Pütz Pitzlergasse 6 52353 Düren";
-            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1058,12 +1023,12 @@ namespace Ausweg
             this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1097,10 +1062,6 @@ namespace Ausweg
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow22;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
         private DevExpress.XtraReports.UI.XRLabel xrLabel10;
         private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;

ReportImp/AwoIntegrationsGGmbH/AwoIntegrationsGGmbH.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C1FED668-ADB9-47E0-B589-1389618E1B6E}</ProjectGuid>
+    <ProjectGuid>{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AwoIntegrationsGGmbH</RootNamespace>
@@ -55,6 +55,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Calculations\CustomServiceRecordStatisticFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -67,6 +68,12 @@
     <Compile Include="Quittierungsbeleg.Designer.cs">
       <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
     </Compile>
+    <Compile Include="ServiceInvoiceReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceInvoiceReport.Designer.cs">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Data\Data.csproj">
@@ -96,6 +103,10 @@
       <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ServiceInvoiceReport.resx">
+      <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

ReportImp/AwoIntegrationsGGmbH/Calculations/CustomServiceRecordStatisticFactory.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts;
+
+
+namespace AwoIntegrationsGGmbH.Calculations
+{
+	public class CustomServiceRecordStatisticFactory : ServiceRecordStatisticFactory
+    {
+
+        public override ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, DateTime statisticsDate)
+        {
+            var stats = CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate);
+
+            var dc = new ServiceRecordStatisticsInfoDC();
+
+
+            
+            dc.Header = new string[4];
+            dc.Header[0] = "Bewilligungszeitraum:";
+            dc.Header[1] = "Geleistet diesen Monat/Gesamt:";
+            dc.Header[2] = "Bewilligt diesen Monat/Gesamt:";
+            dc.Header[3] = "Frei diesen Monat/Gesamt:";
+
+            dc.ForegroundColor = new string[4];
+            dc.ForegroundColor[0] = "#FF2B508B";
+            dc.ForegroundColor[1] = "#FF2B508B";
+            dc.ForegroundColor[2] = "#FF2B508B";
+            dc.ForegroundColor[3] = "#FF2B508B";
+            
+            dc.PeriodStatisticInfos = new List<ServiceRecordPeriodStatisticsInfoDC>();
+
+
+            if (stats != null)
+            {
+                if (stats.PeriodStatistics.Count > 1 && !TimeSpanIsEqual(stats))
+                    dc.PeriodStatisticInfos.Add(CreateTotalStatistics(stats, statisticsDate));
+
+                foreach (var pdc in stats.PeriodStatistics)
+                {
+                    dc.PeriodStatisticInfos.Add(CreateServiceRecordPeriodStatisticsInfo(stats, pdc, statisticsDate));
+                }
+            }
+
+            return dc;
+        }
+        
+
+        public ServiceRecordPeriodStatisticsInfoDC CreateTotalStatistics(SupportConceptStatisticsDC stats, DateTime statisticsDate)
+        {
+            var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4);
+            dc.LeftValues[0] = "Gesamt";
+
+            dc.LeftValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedThisMonth / 60);
+            dc.RightValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedTotalRounded / 60);
+
+            dc.LeftValues[2] = String.Format("{0:0.00}", stats.MinutesApprovedPerMonth / 60);
+            dc.RightValues[2] = String.Format("{0:0.00}", stats.MinutesApprovedTotal / 60);
+
+            dc.LeftValues[3] = String.Format("{0:0.00}", (stats.MinutesApprovedPerMonth - stats.MinutesProvidedThisMonth) / 60);
+            dc.RightValues[3] = String.Format("{0:0.00}", (stats.MinutesApprovedTotal - stats.MinutesProvidedTotalRounded) / 60);
+
+            return dc;
+        }
+
+        public ServiceRecordPeriodStatisticsInfoDC CreateServiceRecordPeriodStatisticsInfo(SupportConceptStatisticsDC stats, SupportConceptPeriodStatisticsDC periodStats, DateTime statisticsDate)
+        {
+            var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4);
+
+            if (periodStats.SupportConceptApprovalPeriod != null)
+            {
+                if (periodStats.SupportConceptApprovalPeriod.ServiceCategory != null)
+                {
+                    dc.LeftValues[0] = String.Format("{0}: {1:dd.MM.yy} - {2:dd.MM.yy}",
+                                                      periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name,
+                                                      periodStats.SupportConceptApprovalPeriod.StartDate,
+                                                      periodStats.SupportConceptApprovalPeriod.EndDate);
+                }
+                else
+                {
+                    dc.LeftValues[0] = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}",
+                                                   periodStats.SupportConceptApprovalPeriod.StartDate,
+                                                   periodStats.SupportConceptApprovalPeriod.EndDate);
+                }
+            }
+
+            dc.LeftValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedThisMonth / 60);
+            dc.RightValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedTotalRounded / 60);
+
+            dc.LeftValues[2] = String.Format("{0:0.00}", periodStats.MinutesApprovedPerMonth / 60);
+            dc.RightValues[2] = String.Format("{0:0.00}", periodStats.MinutesApprovedTotal / 60);
+
+            dc.LeftValues[3] = String.Format("{0:0.00}", (periodStats.MinutesApprovedPerMonth - periodStats.MinutesProvidedThisMonth) / 60);
+            dc.RightValues[3] = String.Format("{0:0.00}", (periodStats.MinutesApprovedTotal - periodStats.MinutesProvidedTotalRounded) / 60);
+   
+            return dc;
+        }
+
+        public override decimal GetApprovedMinutesPerMonth(SupportConceptPeriodStatisticsDC periodStats)
+        {
+            if (periodStats.SupportConceptApprovalPeriod != null && periodStats.SupportConceptApprovalPeriod.StartDate.HasValue && periodStats.SupportConceptApprovalPeriod.EndDate.HasValue)
+            {
+                if (periodStats.SupportConceptApprovalPeriod.ApprovedBEPerInterval.HasValue && periodStats.SupportConceptApprovalPeriod.ApprovedBEInterval.HasValue && periodStats.SupportConceptApprovalPeriod.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
+                {
+                    return periodStats.SupportConceptApprovalPeriod.ApprovedBEPerInterval.Value * 60;
+                }
+            }
+            return base.GetApprovedMinutesPerMonth(periodStats);
+        }
+    }
+}

ReportImp/AwoIntegrationsGGmbH/Quittierungsbeleg.cs

@@ -2,8 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
 using BeWo.Report.ReportObjects;
+using BS.Shared;
 using BS.Shared.Core;
 using DevExpress.XtraReports.UI;
 
@@ -18,16 +23,6 @@ namespace BeWo.Report.DefaultReports
 
         public void SetReportDataSource(ServicesOverviewRO pRO)
         {
-
-            // Get calling method name
-            //StackTrace stackTrace = new StackTrace();
-            //Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name);
-
-            bool hatGruppen = false;
-
-            //if (pRO == null)
-            //    return;
-
             if (pRO.Services != null)
             {
                 List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -39,8 +34,11 @@ namespace BeWo.Report.DefaultReports
                         ServicesOverviewRO.CreateSignatureString(sd);
 
                         // abklären, wann facetoface ja ist und wann nein
-
-
+                        sd.Notice5 = "Nein";
+                        if (sd.ServiceDescription.ToLower().Contains("face"))
+                        {
+                            sd.Notice5 = "Ja";
+                        }
                         servicesBillable.Add(sd);
                     }
                 }
@@ -48,9 +46,57 @@ namespace BeWo.Report.DefaultReports
                 pRO.Services = servicesBillable;
             }
 
+            if (pRO.CostBearer2SupportConceptList != null)
+            {
+                SetzeBetreuungsAngaben(pRO.CostBearer2SupportConceptList);
+            }
+
             bindingSource1.DataSource = pRO;
         }
-    
+
+        private void SetzeBetreuungsAngaben(IList<CostBearer2SupportConcept> costBearer2SupportConceptList)
+        {
+            var cb2sc = costBearer2SupportConceptList[0];
+            var customer = cb2sc.SupportConcept.Customer;
+
+            foreach (var c2o in customer.Employee2CustomerList)
+            {
+                foreach (var v2o in c2o.ValueList)
+                {
+                    if (v2o.Entry.SystemEntryID.HasValue && v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant
+                        && c2o.Employee != null && c2o.Employee.ValueList != null && c2o.Employee.ValueList.Count > 0)
+                    {
+                        var quali = c2o.Employee.ValueList.Where(v => v.Entry.Type == ValueListEntryType.StaffQualificationsType).FirstOrDefault();
+                        if (quali != null)
+                        {
+                            lblQuali.Text = quali.Entry.Value;
+                        }
+                    }
+                }
+            }
+
+            //Angaben zur Betreuungsart / Hilfeart
+            string angabe = "";
+            var betreuungsarten = customer.ValueList.Where(v2o => v2o.Entry.Type == ValueListEntryType.CustomerCareType).ToList();
+            if (betreuungsarten != null && betreuungsarten.Count > 0)
+            {
+                foreach (var art in betreuungsarten)
+                {
+                    Match match = Regex.Match(art.Entry.Value, @"\(([^)]*)\)");
+
+                    if (match.Success)
+                    {
+                        if (angabe != "")
+                        {
+                            angabe += ", ";
+                        }
+                        angabe += match.Groups[1].Value.Trim();
+                    }
+                }
+                lblBetreuungsart.Text = angabe;
+            }
+        }
+
         private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e)
         {
             XRPictureBox xrBox = sender as XRPictureBox;
@@ -60,7 +106,7 @@ namespace BeWo.Report.DefaultReports
             {
                 var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
                 var binData = Convert.FromBase64String(base64Data);
-                Image img = ByteArrayToImage(binData);
+                System.Drawing.Image img = ByteArrayToImage(binData);
                 xrBox.Image = Utils.CropImage(img);
             }
             else
@@ -69,11 +115,11 @@ namespace BeWo.Report.DefaultReports
             }
         }
 
-        public Image ByteArrayToImage(byte[] byteArrayIn)
+        public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn)
         {
             using(var memoryStream = new MemoryStream(byteArrayIn))
             {
-                return Image.FromStream(memoryStream);
+                return System.Drawing.Image.FromStream(memoryStream);
             }
         }
     }

ReportImp/AwoIntegrationsGGmbH/ServiceInvoiceReport.Designer.cs

@@ -0,0 +1,920 @@
+using BeWo.Report.ReportObjects;
+namespace AwoIntegrationsGGmbH
+{
+    partial class ServiceInvoiceReport
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        	
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.ReportHeader.HeightF = 0F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 157.5F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // Page1
+            // 
+            this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblAdresse,
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLabel2,
+            this.lblAnrede,
+            this.xrLabel8,
+            this.lblAbrechnungszeitraum,
+            this.xrTable2});
+            this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.Page1.HeightF = 388.0417F;
+            this.Page1.Name = "Page1";
+            this.Page1.StylePriority.UseFont = false;
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.5F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientStreet]\r\n[RecipientPostCo" +
+    "deAndTown]";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.CanShrink = true;
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "Kreditoren-Nr. [BusinessPartnerId]";
+            this.xrLabel4.WordWrap = false;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Mittelbindungs-Nr./Aktenzeichen: [CustomerReferenceNumber]";
+            this.xrLabel3.WordWrap = false;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel2.CanShrink = true;
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 255F);
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel2.StylePriority.UseBackColor = false;
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
+            this.xrLabel2.WordWrap = false;
+            // 
+            // lblAnrede
+            // 
+            this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F);
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
+            this.lblAnrede.StylePriority.UseFont = false;
+            this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(474.6666F, 172F);
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(170.8333F, 23F);
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.StylePriority.UseTextAlignment = false;
+            this.xrLabel8.Text = "xrLabel8";
+            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // lblAbrechnungszeitraum
+            // 
+            this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F);
+            this.lblAbrechnungszeitraum.Multiline = true;
+            this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum";
+            this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAbrechnungszeitraum.SizeF = new System.Drawing.SizeF(642F, 34.91669F);
+            this.lblAbrechnungszeitraum.StylePriority.UseFont = false;
+            this.lblAbrechnungszeitraum.Text = "für unten aufgeführte Familie wurde durch die AWP-Integrations gGmbH Ambulante er" +
+    "zieherische Hilfe durchgeführt:";
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(474.6666F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2,
+            this.xrTableRow5,
+            this.xrTableRow4,
+            this.xrTableRow9,
+            this.xrTableRow3,
+            this.xrTableRow1,
+            this.xrTableRow6,
+            this.xrTableRow8,
+            this.xrTableRow7});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(202.1665F, 171F);
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UseTextAlignment = false;
+            this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell4});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.CanShrink = true;
+            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Italic))));
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "Ambulante erzieherische";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell4.Weight = 1D;
+            // 
+            // xrTableRow5
+            // 
+            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell13});
+            this.xrTableRow5.Name = "xrTableRow5";
+            this.xrTableRow5.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.CanShrink = true;
+            this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Italic))));
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "Hilfen";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell13.Weight = 1D;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell11});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.CanShrink = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell11.StylePriority.UseFont = false;
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell11.Weight = 1D;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell8});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 0.099337748344370869D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.CanShrink = true;
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "Kopernikusstr. 110";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell8.Weight = 1D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 0.099337748344370869D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.CanShrink = true;
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.Text = "47167 Duisburg";
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell1.Weight = 1D;
+            // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell2});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Weight = 0.099337748344370883D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.CanShrink = true;
+            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.xrTableCell2.StylePriority.UseFont = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Tel. 0203-595475";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell2.Weight = 1D;
+            // 
+            // xrTableRow8
+            // 
+            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5});
+            this.xrTableRow8.Name = "xrTableRow8";
+            this.xrTableRow8.Weight = 0.099337748344370869D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UseFont = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "Fax 0203-595798";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell5.Weight = 1D;
+            // 
+            // xrTableRow7
+            // 
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.StylePriority.UseTextAlignment = false;
+            this.xrTableRow7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableRow7.Weight = 0.20529801324503311D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Multiline = true;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell3.Weight = 1D;
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("arial", 10F);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.9584F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F);
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.Text = "Mit freundlichen Grüßen";
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90.95834F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow10,
+            this.xrTableRow14});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 26F);
+            this.xrTable4.StylePriority.UseFont = false;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9});
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 0.38095238095238093D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
+            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("arial", 10F);
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.Text = "xrTableCell1";
+            this.xrTableCell9.Weight = 3D;
+            // 
+            // xrTableRow14
+            // 
+            this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell12});
+            this.xrTableRow14.Name = "xrTableRow14";
+            this.xrTableRow14.Weight = 0.23809523809523808D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Weight = 3D;
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 145.8333F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F);
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.Text = "AWO-Integrations gGmbH";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.DetailReport2});
+            this.DetailReport.DataMember = "ServiceInvoicePeriods";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable5});
+            this.Detail1.HeightF = 25F;
+            this.Detail1.Name = "Detail1";
+            // 
+            // xrTable5
+            // 
+            this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable5.Name = "xrTable5";
+            this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow23});
+            this.xrTable5.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+            // 
+            // xrTableRow23
+            // 
+            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell32,
+            this.xrTableCell7,
+            this.xrTableCell37,
+            this.xrTableCell35,
+            this.xrTableCell36});
+            this.xrTableRow23.Name = "xrTableRow23";
+            this.xrTableRow23.Weight = 1D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell32.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell32.StylePriority.UseBackColor = false;
+            this.xrTableCell32.StylePriority.UseBorderColor = false;
+            this.xrTableCell32.StylePriority.UseBorders = false;
+            this.xrTableCell32.StylePriority.UseFont = false;
+            this.xrTableCell32.StylePriority.UsePadding = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            this.xrTableCell32.Text = "Menge";
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell32.Weight = 0.16914709446021486D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell37.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell37.StylePriority.UseBackColor = false;
+            this.xrTableCell37.StylePriority.UseBorderColor = false;
+            this.xrTableCell37.StylePriority.UseBorders = false;
+            this.xrTableCell37.StylePriority.UseFont = false;
+            this.xrTableCell37.StylePriority.UsePadding = false;
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            this.xrTableCell37.Text = "Bezeichnung";
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell37.Weight = 1.2686032037499184D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell35.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell35.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell35.StylePriority.UseBackColor = false;
+            this.xrTableCell35.StylePriority.UseBorderColor = false;
+            this.xrTableCell35.StylePriority.UseBorders = false;
+            this.xrTableCell35.StylePriority.UseFont = false;
+            this.xrTableCell35.StylePriority.UsePadding = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            this.xrTableCell35.Text = "Einzelpreis (EUR)";
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell35.Weight = 0.341677125575521D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell36.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell36.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell36.StylePriority.UseBackColor = false;
+            this.xrTableCell36.StylePriority.UseBorderColor = false;
+            this.xrTableCell36.StylePriority.UseBorders = false;
+            this.xrTableCell36.StylePriority.UseFont = false;
+            this.xrTableCell36.StylePriority.UsePadding = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            this.xrTableCell36.Text = "Gesamtpreis (EUR)";
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell36.Weight = 0.34167667727070028D;
+            // 
+            // DetailReport2
+            // 
+            this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail3,
+            this.GroupFooter1});
+            this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems";
+            this.DetailReport2.DataSource = this.bindingSource1;
+            this.DetailReport2.Level = 0;
+            this.DetailReport2.Name = "DetailReport2";
+            this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
+            // 
+            // Detail3
+            // 
+            this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable6});
+            this.Detail3.HeightF = 25F;
+            this.Detail3.Name = "Detail3";
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow25});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
+            this.xrTable6.StylePriority.UseFont = false;
+            // 
+            // xrTableRow25
+            // 
+            this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell40,
+            this.xrTableCell10,
+            this.xrTableCell42,
+            this.xrTableCell43,
+            this.xrTableCell45});
+            this.xrTableRow25.Name = "xrTableRow25";
+            this.xrTableRow25.Weight = 1D;
+            // 
+            // xrTableCell40
+            // 
+            this.xrTableCell40.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours")});
+            this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell40.Name = "xrTableCell40";
+            this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell40.StylePriority.UseBorderColor = false;
+            this.xrTableCell40.StylePriority.UseBorders = false;
+            this.xrTableCell40.StylePriority.UseFont = false;
+            this.xrTableCell40.StylePriority.UsePadding = false;
+            this.xrTableCell40.StylePriority.UseTextAlignment = false;
+            this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell40.TextFormatString = "{0:0.00}";
+            this.xrTableCell40.Weight = 0.22156574486005953D;
+            // 
+            // xrTableCell42
+            // 
+            this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell42.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
+            this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell42.Name = "xrTableCell42";
+            this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell42.StylePriority.UseBorderColor = false;
+            this.xrTableCell42.StylePriority.UseBorders = false;
+            this.xrTableCell42.StylePriority.UseFont = false;
+            this.xrTableCell42.StylePriority.UsePadding = false;
+            this.xrTableCell42.StylePriority.UseTextAlignment = false;
+            this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell42.Weight = 1.6617428219094768D;
+            // 
+            // xrTableCell43
+            // 
+            this.xrTableCell43.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell43.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.00}")});
+            this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell43.Name = "xrTableCell43";
+            this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell43.StylePriority.UseBorderColor = false;
+            this.xrTableCell43.StylePriority.UseBorders = false;
+            this.xrTableCell43.StylePriority.UseFont = false;
+            this.xrTableCell43.StylePriority.UsePadding = false;
+            this.xrTableCell43.StylePriority.UseTextAlignment = false;
+            this.xrTableCell43.Text = "xrTableCell43";
+            this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell43.Weight = 0.44756306602403606D;
+            // 
+            // xrTableCell45
+            // 
+            this.xrTableCell45.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell45.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:0.00}")});
+            this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell45.Name = "xrTableCell45";
+            this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell45.StylePriority.UseBorderColor = false;
+            this.xrTableCell45.StylePriority.UseBorders = false;
+            this.xrTableCell45.StylePriority.UseFont = false;
+            this.xrTableCell45.StylePriority.UsePadding = false;
+            this.xrTableCell45.StylePriority.UseTextAlignment = false;
+            this.xrTableCell45.Text = "xrTableCell45";
+            this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell45.Weight = 0.44756306435919824D;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel6,
+            this.xrLabel5,
+            this.xrLabel1,
+            this.xrLabel9,
+            this.xrTable4,
+            this.xrLabel14,
+            this.xrLabel15});
+            this.GroupFooter1.HeightF = 236.6667F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel1.BorderWidth = 2F;
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(596.142F, 9.999974F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(80.69104F, 25F);
+            this.xrLabel1.StylePriority.UseBorders = false;
+            this.xrLabel1.StylePriority.UseBorderWidth = false;
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UsePadding = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "xrLabel1";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrLabel1.TextFormatString = "{0}";
+            // 
+            // xrTableRow9
+            // 
+            this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6});
+            this.xrTableRow9.Name = "xrTableRow9";
+            this.xrTableRow9.Weight = 0.13245033112582783D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell6.Weight = 1D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell7.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrTableCell7.Multiline = true;
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell7.StylePriority.UseBackColor = false;
+            this.xrTableCell7.StylePriority.UseBorderColor = false;
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Einheit";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 0.16914709446021486D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.BorderColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell10.Multiline = true;
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
+            this.xrTableCell10.StylePriority.UseBorderColor = false;
+            this.xrTableCell10.StylePriority.UseBorders = false;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "Std.";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell10.Weight = 0.22156574486005953D;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrLabel5.BorderWidth = 2F;
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(596.1421F, 25F);
+            this.xrLabel5.StylePriority.UseBorders = false;
+            this.xrLabel5.StylePriority.UseBorderWidth = false;
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UsePadding = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.Text = "Rechnungsbetrag";
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("arial", 10F);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F);
+            this.xrLabel9.Multiline = true;
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(650F, 33.66667F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.Text = "Die Leistungen im Rhamen der Wohlfahrtspflege sind gem. § 4 Nr. 18 UStG umsatzste" +
+    "uerfrei. \r\nWir bitten um Überweisung auf unser u.g. Konto unter Angabe der Rechn" +
+    "ungsnummer.";
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("arial", 10F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 219.6667F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(175F, 17F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = "Anlagen";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+            // 
+            // ServiceInvoiceReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.Page1,
+            this.DetailReport});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 157.5F, 50F);
+            this.PageHeight = 1169;
+            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.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupHeaderBand Page1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel lblAnrede;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel lblAbrechnungszeitraum;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+		private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.XRTable xrTable5;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
+        private DevExpress.XtraReports.UI.DetailBand Detail3;
+        private DevExpress.XtraReports.UI.XRTable xrTable6;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
+        private DevExpress.XtraReports.UI.XRLabel lblAdresse;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+		private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+    }
+}

ReportImp/AwoIntegrationsGGmbH/ServiceInvoiceReport.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared;
+using BS.Shared.Extensions;
+using DevExpress.XtraReports.UI;
+
+namespace AwoIntegrationsGGmbH
+{
+    public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
+    {
+        public ServiceInvoiceReport()
+        {
+            this.InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServiceInvoiceRO pRO)
+        {
+			String start = String.Format("{0:M} / {0:yyyy}", pRO.AccountingPeriodStart);
+            if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0)
+            {
+                //Angaben zur Betreuungsart / Hilfeart
+                string angabe = "";
+                var customer = pRO.ServiceInvoicePeriods[0].CostBearer2SupportConcept.SupportConcept.Customer;
+                var betreuungsarten = customer.ValueList.Where(v2o => v2o.Entry.Type == ValueListEntryType.CustomerCareType).ToList();
+                if (betreuungsarten != null && betreuungsarten.Count > 0)
+                {
+                    foreach (var art in betreuungsarten)
+                    {
+                        Match match = Regex.Match(art.Entry.Value, @"\(([^)]*)\)");
+
+                        if (match.Success)
+                        {
+                            if (angabe != "")
+                            {
+                                angabe += ", ";
+                            }
+                            angabe += match.Groups[1].Value.Trim();
+                        }
+                    }
+                }
+                foreach (var sip in pRO.ServiceInvoicePeriods)
+                {
+                    if (sip.ServiceInvoiceItems != null && sip.ServiceInvoiceItems.Count > 0)
+                    {
+                        foreach (var ii in sip.ServiceInvoiceItems)
+                        {
+                            ii.ServiceDescription = angabe + " " + start + " Familie " + pRO.CustomerLastName; 
+                        }
+                    }
+                   
+                }
+            }
+            SetzeAdresse(pRO);
+
+            this.bindingSource1.DataSource = pRO;
+        }
+
+        private void SetzeAdresse(ServiceInvoiceRO pRO)
+        {
+            StringBuilder sb = new StringBuilder();
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler")
+            {
+                sb.AppendLine(pRO.RecipientOrganisation);
+            }
+            //if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1))
+            //{
+            //    sb.AppendLine(pRO.RecipientAddressLine1);
+            //}
+            //if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+            //{
+            //    sb.AppendLine(pRO.RecipientContactPerson);
+            //}
+            if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler")
+            {
+                sb.AppendLine(pRO.RecipientDivision);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientPoBox))
+            {
+                sb.AppendLine(pRO.RecipientPoBox);
+            }
+            else if (!String.IsNullOrEmpty(pRO.RecipientStreet))
+            {
+                sb.AppendLine(pRO.RecipientStreet);
+            }
+            if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
+            {
+                sb.AppendLine(pRO.RecipientPostCodeAndTown);
+            }
+            lblAdresse.Text = sb.ToString();
+        }
+    }
+}

ReportImp/AwoIntegrationsGGmbH/ServiceInvoiceReport.resx

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

ReportImp/BeWoAlsdorf/BeWoAlsdorf.csproj

@@ -71,6 +71,7 @@
     <Compile Include="InvoiceCustomerReport.Designer.cs">
       <DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QuittierungsbelegMitDatum.cs">
       <SubType>Component</SubType>
@@ -84,6 +85,18 @@
     <Compile Include="ServicesOverviewReport.Designer.cs">
       <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="SettlementReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport.Designer.cs">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SettlementReport2.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettlementReport2.Designer.cs">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="InvoiceCustomerReport.resx">
@@ -100,6 +113,14 @@
       <SubType>
       </SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport.resx">
+      <DependentUpon>SettlementReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SettlementReport2.resx">
+      <DependentUpon>SettlementReport2.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Data\Data.csproj">

ReportImp/BeWoAlsdorf/Invoicing/SettlementInvoiceCreation.cs

@@ -0,0 +1,14 @@
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using BS.Shared.DataContracts;
+
+namespace BeWoAlsdorf
+{
+	public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
+	{
+		public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
+		{
+			return false;
+		}
+	}
+}

ReportImp/BeWoAlsdorf/Properties/licenses.licx

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

ReportImp/BeWoAlsdorf/SettlementReport.cs

@@ -0,0 +1,227 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWoAlsdorf.Alt
+{
+    public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
+    {
+        public Spitzabrechnung()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(SettlementRO pRO)
+        {
+	        bool isDefaultSpitzabrechnung = false;
+
+			if (String.IsNullOrEmpty(pRO.Notice))
+			{
+				lblNotice.Visible = false;
+			}
+
+	        if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
+	        {
+		        var ii = pRO.InvoiceItems[0];
+				if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null)
+		        {
+			        isDefaultSpitzabrechnung = true;
+		        }
+	        }
+	        if (!isDefaultSpitzabrechnung)
+	        {
+		        if (pRO.DifferentHourlyRateCount > 0 && pRO.HourlyRateNew.HasValue)
+		        {
+			        isDefaultSpitzabrechnung = true;
+		        }
+	        }
+
+	        if (isDefaultSpitzabrechnung)
+	        {
+		        //UpdateAbrechnungsFelder(pRO);
+
+		        pRO.InvoiceItems = CreateDefaultSpitzabrechnungInvoiceItems(pRO);
+	        }
+	        else
+	        {
+				var id = GetCustomerId(pRO);
+				if (id == "LWLNEU")
+				{
+					pRO.RateFactorText = null;
+					pRO.RateFactorText2 = null;
+
+					if (pRO.InvoiceItems != null)
+					{
+						foreach (var ii in pRO.InvoiceItems)
+						{
+							ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00##} FLS x {3:c}",
+								ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit);
+						}
+					}
+				}
+				else
+				{
+					if (pRO.InvoiceItems != null)
+					{
+						foreach (var ii in pRO.InvoiceItems)
+						{
+							ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00##} FLS {3}x {4:c}",
+								ii.ItemPeriodStart, ii.ItemPeriodEnd,
+								ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
+								ii.AmountPerUnit);
+						}
+					}
+				}
+	        }
+
+			if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty())
+			{
+				lblAnrede.Text = "Guten Tag,";
+			}
+
+			this.bindingSource1.DataSource = pRO;
+		}
+
+		private String GetCustomerId(SettlementRO pRO)
+	    {
+		    var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
+		    return cb2sc.CostBearer.ID;
+	    }
+
+		private IList<InvoiceItemDC> CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO)
+		{
+			IList<InvoiceItemDC> itemList = new List<InvoiceItemDC>();
+			if (pRO.DifferentHourlyRateCount == 3)
+			{
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.00##} FLS {3}x {4:c}", 
+						pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString, 
+						pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3
+				});
+
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.00##} FLS {3}x {4:c}",
+						pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld
+				});
+
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.00##} FLS {3}x {4:c}",
+						pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
+				});
+
+			}
+			else if (pRO.DifferentHourlyRateCount == 2)
+			{
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.00##} FLS {3}x {4:c}",
+						pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld
+				});
+
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.00##} FLS {3}x {4:c}",
+						pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
+				});
+
+			}
+			else
+			{
+				itemList.Add(new InvoiceItemDC
+				{
+					ItemDescription = String.Format("{0} bis {1}: {2:0.00##} FLS {3}x {4:c}",
+						pRO.AccountingStartDateString, pRO.AccountingEndDateString,
+						pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
+
+					GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
+				});
+
+			}
+
+			return itemList;
+		}
+
+		private void UpdateAbrechnungsFelder(SettlementRO pRO)
+		{
+			if (pRO.DifferentHourlyRateCount == 3)
+			{
+				//Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] €
+
+				pRO.Abrechnungstext1 = String.Format("{0} bis {1}",
+					pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString);
+
+				pRO.Abrechnungstext1 += String.Format(": {0:0.00##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3);
+
+				//[AccountingStartDateString] - [HourlyRate3EndDateString] sind [RecordedFLSWithHourlyRate3String] Std. x [HourlyRate3String] € =";
+
+				pRO.Betrag1 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatz3 * (decimal)pRO.RateFactor * pRO.HourlyRate3);
+
+
+				pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
+					pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString);
+				pRO.Abrechnungstext2 += String.Format(": {0:0.00##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
+
+				pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
+
+
+				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
+					pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
+				pRO.Abrechnungstext3 += String.Format(": {0:0.00##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
+
+				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
+			}
+			else if (pRO.DifferentHourlyRateCount == 2)
+			{
+
+				pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
+					pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString);
+				pRO.Abrechnungstext2 += String.Format(": {0:0.00##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
+
+				pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
+
+
+				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
+					pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
+				pRO.Abrechnungstext3 += String.Format(": {0:0.00##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
+
+				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
+			}
+			else
+			{
+				pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
+					pRO.AccountingStartDateString, pRO.AccountingEndDateString);
+				pRO.Abrechnungstext3 += String.Format(": {0:0.00##} FLS {1}x {2:c}",
+					pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
+
+				pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
+			}
+		}
+    }
+}

ReportImp/BeWoAlsdorf/SettlementReport.resx

@@ -0,0 +1,124 @@
+<?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>
+  <data name="xrLabel6.Text" xml:space="preserve">
+    <value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
+</value>
+  </data>
+</root>

ReportImp/BeWoAlsdorf/SettlementReport2.cs

@@ -0,0 +1,55 @@
+using System;
+using DevExpress.XtraReports.UI;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using BS.Shared.Extensions;
+
+namespace BeWoAlsdorf
+{
+    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;
+					ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
+					ii.ItemDescription = "Fehlkontakte";
+				}
+				else if (ii.ItemDescription.IsNullOrEmpty())
+                {
+					ii.ItemDescription = "Fachleistungsstunden";
+				}
+			}
+			pRO.RateFactor = (double)rateFactor;
+
+			if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty())
+			{
+				lblAnrede.Text = "Guten Tag,";
+			}
+
+			this.bindingSource1.DataSource = pRO;
+
+			tcApprovedHours.Text = tcApprovedHours.Text.Replace(" FLS", "");
+        }
+    }
+}

ReportImp/BeWoAlsdorf/SettlementReport2.resx

@@ -0,0 +1,124 @@
+<?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>
+  <data name="xrLabel6.Text" xml:space="preserve">
+    <value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
+</value>
+  </data>
+</root>

ReportImp/BetreuWoReports/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -50,7 +50,7 @@ namespace BetreuWoReports
             }
             if (date.Date >= new DateTime(2025, 10, 01))
             {
-                dd.NightStart = 22;
+                dd.NightStart = 21;
                 dd.NightEnd = 6;
             }
             return dd;

ReportImp/CaritasverbandOstvest/Export/DiamantExporter.cs

@@ -71,7 +71,7 @@ namespace CaritasverbandOstvest.Export
                 fullQuery.FileName = String.Format("005F{0:yyyyMM}.er2", date);
                 fullQuery.QueryResult = GetAbrechnungenString(date, dtRg, dtEr);
                 fullQuery.Attachments = GetAbrechnungsBeleg(date, dtRg, dtEr);
-                fullQuery.Title = "Diamant Buchhaltungs Export";
+                fullQuery.Title = "Diamant Buchungs Export";
                 fullQuery.Parameter = q.Parameter;
                 CreateBuchungsExportProtokollEintrag(fullQuery);
             }
@@ -83,7 +83,8 @@ namespace CaritasverbandOstvest.Export
         {
             var exports = DAOFactory.GenericDAO.GetAllActive<BuchungsExport>();
             exports = exports.OrderByDescending(e => e.Datum).ToList();
-            var lastExport = exports.FirstOrDefault(e => e.Name.Contains("Diamant Buchhaltungs Export") && e.Parameter.Contains(String.Format("Monat={0:dd.MM.yyyy}", date)));
+            
+            var lastExport = exports.FirstOrDefault(e => e.Name.Contains("Diamant Buchungs") && e.Parameter.Contains(String.Format("Monat={0:dd.MM.yyyy}", date)));
             if (lastExport != null && lastExport.Parameter.Contains(String.Format("Monat={0:dd.MM.yyyy}", date)))
             {
                 return lastExport.Export;

ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.Designer.cs

@@ -40,6 +40,8 @@ namespace DiakonieMuelheim
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAbrechnungTitel = new DevExpress.XtraReports.UI.XRLabel();
@@ -50,15 +52,16 @@ namespace DiakonieMuelheim
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
-            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
             this.cellStundenGesamt = new DevExpress.XtraReports.UI.XRTableCell();
@@ -76,12 +79,9 @@ namespace DiakonieMuelheim
             this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -154,6 +154,35 @@ namespace DiakonieMuelheim
             this.Page1.Name = "Page1";
             this.Page1.StylePriority.UseFont = false;
             // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(404.5409F, 67.00004F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(124.6669F, 16.99998F);
+            this.xrLabel6.StylePriority.UseBorders = false;
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrLabel6.TextFormatString = "Re-Nr.: {0}";
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")});
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(163.8751F, 358.2916F);
+            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(319.2083F, 17F);
+            this.xrLabel2.Text = "xrLabel2";
+            // 
             // xrLabel1
             // 
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -273,24 +302,19 @@ namespace DiakonieMuelheim
             this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
             new DevExpress.XtraReports.UI.GroupField("HourlyRate", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)});
             // 
-            // ReportFooter
+            // xrLabel3
             // 
-            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel10,
-            this.xrTable4});
-            this.ReportFooter.HeightF = 209.309F;
-            this.ReportFooter.Name = "ReportFooter";
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")});
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(163.8751F, 358.2916F);
-            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(319.2083F, 17F);
-            this.xrLabel2.Text = "xrLabel2";
+            this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(460.4578F, 0F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(87.50006F, 25F);
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "xrLabel20";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
             // xrTable5
             // 
@@ -365,19 +389,27 @@ namespace DiakonieMuelheim
             this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             this.xrLabel22.TextFormatString = "{0:0.00 €}";
             // 
-            // xrLabel3
+            // bindingSource1
             // 
-            this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")});
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(460.4578F, 0F);
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(87.50006F, 25F);
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.StylePriority.UseTextAlignment = false;
-            this.xrLabel3.Text = "xrLabel20";
-            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel10,
+            this.xrTable4});
+            this.ReportFooter.HeightF = 209.309F;
+            this.ReportFooter.Name = "ReportFooter";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.7257F);
+            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(676.9999F, 31.58331F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Unterschrift und Stempel des Anbieters";
             // 
             // xrTable4
             // 
@@ -564,38 +596,6 @@ namespace DiakonieMuelheim
             this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell58.Weight = 0.18235716542350336D;
             // 
-            // xrLabel6
-            // 
-            this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")});
-            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(404.5409F, 67.00004F);
-            this.xrLabel6.Multiline = true;
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(124.6669F, 16.99998F);
-            this.xrLabel6.StylePriority.UseBorders = false;
-            this.xrLabel6.StylePriority.UseFont = false;
-            this.xrLabel6.StylePriority.UseTextAlignment = false;
-            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrLabel6.TextFormatString = "Re-Nr.: {0}";
-            // 
-            // xrLabel10
-            // 
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.7257F);
-            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(676.9999F, 31.58331F);
-            this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.Text = "Unterschrift und Stempel des Anbieters";
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
-            // 
             // ServiceInvoiceReport78
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -621,8 +621,8 @@ namespace DiakonieMuelheim
             xrWatermark1.Id = "Watermark1";
             this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }

ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.resx

@@ -121,7 +121,7 @@
     <value>Sehr geehrte Damen und Herren,
 
 für unsere/n Betreute/n: [CustomerLastName], [CustomerFirstName], geb. am: [CustomerBirthdate!dd.MM.yyyy]
-wohnhaft: [CustomerStreet] [CustomerTown]
+wohnhaft: [CustomerStreet], [CustomerPostalCode] [CustomerTown]
 
 senden wir Ihnen folgende Rechnung:</value>
   </data>

ReportImp/DiakonischesWerkRegensburg/DiakonischesWerkRegensburg.csproj

@@ -56,6 +56,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Calculations\GroupDurationCalculator.cs" />
+    <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceCreationTagespauschale.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.Designer.cs

@@ -33,11 +33,11 @@ namespace DiakonischesWerkRegensburg
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblHeader = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblCustomer = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblReNr2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblReNr = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
             this.lblBetreff = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
@@ -52,22 +52,26 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblEinheit = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblVerwendung = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.lblLeitung = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -81,89 +85,93 @@ namespace DiakonischesWerkRegensburg
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel8,
-            this.xrLabel3,
-            this.xrRichText1,
-            this.xrLabel2,
-            this.xrLabel5,
+            this.lblHeader,
+            this.lblCustomer,
+            this.lblReNr2,
+            this.lblReNr,
+            this.lblAnrede,
             this.lblBetreff,
             this.xrLabel24,
             this.lblAdresse});
-            this.ReportHeader.HeightF = 516.556F;
+            this.ReportHeader.HeightF = 531.8159F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
-            // xrLabel8
+            // lblHeader
             // 
-            this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel8.CanShrink = true;
-            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 300.7083F);
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(555.56F, 27.76F);
-            this.xrLabel8.StylePriority.UseBackColor = false;
-            this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.Text = "[CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy], Akte" +
+            this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(10.01644F, 464.0243F);
+            this.lblHeader.Multiline = true;
+            this.lblHeader.Name = "lblHeader";
+            this.lblHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblHeader.SizeF = new System.Drawing.SizeF(555.5628F, 67.79163F);
+            this.lblHeader.StylePriority.UseFont = false;
+            this.lblHeader.Text = "anbei übersenden wir Ihnen die Abrechnung der \r\nFachleistungsstunden für Ambulant" +
+    " unterstütztes Wohnen \r\nfür [AccountingPeriodStart!MMMM yyyy].";
+            // 
+            // lblCustomer
+            // 
+            this.lblCustomer.BackColor = System.Drawing.Color.Transparent;
+            this.lblCustomer.CanShrink = true;
+            this.lblCustomer.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblCustomer.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 314.25F);
+            this.lblCustomer.Name = "lblCustomer";
+            this.lblCustomer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblCustomer.SizeF = new System.Drawing.SizeF(555.56F, 27.76F);
+            this.lblCustomer.StylePriority.UseBackColor = false;
+            this.lblCustomer.StylePriority.UseFont = false;
+            this.lblCustomer.Text = "[CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy], Akte" +
     "nzeichen: [CustomerReferenceNumber]";
-            this.xrLabel8.WordWrap = false;
+            this.lblCustomer.WordWrap = false;
             // 
-            // xrLabel3
+            // lblReNr2
             // 
-            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel3.CanShrink = true;
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.3332F, 354.8751F);
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
-            this.xrLabel3.StylePriority.UseBackColor = false;
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "[InvoiceNumber] - [AccountingPeriodStart!MMMM yyyy]";
-            this.xrLabel3.WordWrap = false;
+            this.lblReNr2.BackColor = System.Drawing.Color.Transparent;
+            this.lblReNr2.CanShrink = true;
+            this.lblReNr2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblReNr2.LocationFloat = new DevExpress.Utils.PointFloat(178.3402F, 358.6766F);
+            this.lblReNr2.Name = "lblReNr2";
+            this.lblReNr2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblReNr2.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
+            this.lblReNr2.StylePriority.UseBackColor = false;
+            this.lblReNr2.StylePriority.UseFont = false;
+            this.lblReNr2.Text = "[InvoiceNumber] - [AccountingPeriodStart!MMMM yyyy]";
+            this.lblReNr2.WordWrap = false;
             // 
-            // xrRichText1
+            // lblReNr
             // 
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 448.7644F);
-            this.xrRichText1.Name = "xrRichText1";
-            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(555.5628F, 67.7916F);
-            this.xrRichText1.StylePriority.UseFont = false;
+            this.lblReNr.BackColor = System.Drawing.Color.Transparent;
+            this.lblReNr.CanShrink = true;
+            this.lblReNr.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblReNr.LocationFloat = new DevExpress.Utils.PointFloat(9.997749F, 358.6766F);
+            this.lblReNr.Name = "lblReNr";
+            this.lblReNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblReNr.SizeF = new System.Drawing.SizeF(168.3333F, 17F);
+            this.lblReNr.StylePriority.UseBackColor = false;
+            this.lblReNr.StylePriority.UseFont = false;
+            this.lblReNr.Text = "Rechnungsnummer:MMMM yyyy]";
+            this.lblReNr.WordWrap = false;
             // 
-            // xrLabel2
+            // lblAnrede
             // 
-            this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel2.CanShrink = true;
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 354.8751F);
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(168.3333F, 17F);
-            this.xrLabel2.StylePriority.UseBackColor = false;
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Rechnungsnummer:MMMM yyyy]";
-            this.xrLabel2.WordWrap = false;
-            // 
-            // xrLabel5
-            // 
-            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(10.00036F, 397.9167F);
-            this.xrLabel5.Name = "xrLabel5";
-            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
-            this.xrLabel5.StylePriority.UseFont = false;
-            this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
+            this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(10.00708F, 413.1765F);
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F);
+            this.lblAnrede.StylePriority.UseFont = false;
+            this.lblAnrede.Text = "Sehr geehrte Damen und Herren,";
             // 
             // lblBetreff
             // 
             this.lblBetreff.BackColor = System.Drawing.Color.Transparent;
             this.lblBetreff.CanShrink = true;
             this.lblBetreff.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(10.00061F, 272.9167F);
+            this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(10.00055F, 272.9167F);
             this.lblBetreff.Multiline = true;
             this.lblBetreff.Name = "lblBetreff";
             this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblBetreff.SizeF = new System.Drawing.SizeF(555.5629F, 27.79163F);
+            this.lblBetreff.SizeF = new System.Drawing.SizeF(555.5629F, 41.33331F);
             this.lblBetreff.StylePriority.UseBackColor = false;
             this.lblBetreff.StylePriority.UseFont = false;
             this.lblBetreff.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
@@ -240,7 +248,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow25});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(420F, 20F);
+            this.xrTable6.SizeF = new System.Drawing.SizeF(525F, 20F);
             this.xrTable6.StylePriority.UseBorders = false;
             this.xrTable6.StylePriority.UseFont = false;
             this.xrTable6.StylePriority.UsePadding = false;
@@ -251,7 +259,8 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell9,
             this.xrTableCell6,
             this.xrTableCell45,
-            this.xrTableCell3});
+            this.xrTableCell3,
+            this.xrTableCell8});
             this.xrTableRow25.Name = "xrTableRow25";
             this.xrTableRow25.Weight = 0.79999999999999993D;
             // 
@@ -262,7 +271,7 @@ namespace DiakonischesWerkRegensburg
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodEnd")});
             this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
             this.xrTableCell9.StylePriority.UseBorders = false;
             this.xrTableCell9.StylePriority.UseFont = false;
             this.xrTableCell9.StylePriority.UsePadding = false;
@@ -320,6 +329,22 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             this.xrTableCell3.Weight = 0.3985498370752536D;
             // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            this.xrTableCell8.Multiline = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell8.StylePriority.UseBorders = false;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell8.Weight = 0.3985498370752536D;
+            // 
             // GroupHeader3
             // 
             this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -337,7 +362,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTable5.Name = "xrTable5";
             this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable5.SizeF = new System.Drawing.SizeF(420F, 20F);
+            this.xrTable5.SizeF = new System.Drawing.SizeF(525F, 20F);
             this.xrTable5.StylePriority.UseBackColor = false;
             this.xrTable5.StylePriority.UseBorders = false;
             // 
@@ -347,8 +372,9 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell2,
             this.xrTableCell5,
-            this.xrTableCell4,
-            this.xrTableCell1});
+            this.lblEinheit,
+            this.xrTableCell1,
+            this.xrTableCell7});
             this.xrTableRow1.Name = "xrTableRow1";
             this.xrTableRow1.StylePriority.UseBackColor = false;
             this.xrTableRow1.Weight = 0.79999999999999993D;
@@ -359,7 +385,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
             this.xrTableCell2.StylePriority.UseBackColor = false;
             this.xrTableCell2.StylePriority.UseBorders = false;
             this.xrTableCell2.StylePriority.UseFont = false;
@@ -386,21 +412,21 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             this.xrTableCell5.Weight = 0.39854997286544447D;
             // 
-            // xrTableCell4
+            // lblEinheit
             // 
-            this.xrTableCell4.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-            this.xrTableCell4.StylePriority.UseBackColor = false;
-            this.xrTableCell4.StylePriority.UseBorders = false;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UsePadding = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Stunden:";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell4.Weight = 0.39854997465172465D;
+            this.lblEinheit.BackColor = System.Drawing.Color.Transparent;
+            this.lblEinheit.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.lblEinheit.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.lblEinheit.Name = "lblEinheit";
+            this.lblEinheit.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.lblEinheit.StylePriority.UseBackColor = false;
+            this.lblEinheit.StylePriority.UseBorders = false;
+            this.lblEinheit.StylePriority.UseFont = false;
+            this.lblEinheit.StylePriority.UsePadding = false;
+            this.lblEinheit.StylePriority.UseTextAlignment = false;
+            this.lblEinheit.Text = "Stunden";
+            this.lblEinheit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.lblEinheit.Weight = 0.39854997465172465D;
             // 
             // xrTableCell1
             // 
@@ -418,6 +444,23 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             this.xrTableCell1.Weight = 0.39855003527591759D;
             // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrTableCell7.Multiline = true;
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UseBackColor = false;
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Betrag";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell7.Weight = 0.39855003527591759D;
+            // 
             // ReportHeader1
             // 
             this.ReportHeader1.HeightF = 0F;
@@ -426,30 +469,53 @@ namespace DiakonischesWerkRegensburg
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrRichText2,
-            this.xrLabel1});
-            this.ReportFooter.HeightF = 384.4732F;
+            this.lblVerwendung,
+            this.xrRichText1,
+            this.lblLeitung,
+            this.xrRichText3});
+            this.ReportFooter.HeightF = 368.4167F;
             this.ReportFooter.Name = "ReportFooter";
             // 
-            // xrRichText2
+            // lblVerwendung
             // 
-            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(10.0009F, 10.00001F);
-            this.xrRichText2.Name = "xrRichText2";
-            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
-            this.xrRichText2.SizeF = new System.Drawing.SizeF(555.5628F, 220.9166F);
-            this.xrRichText2.StylePriority.UseFont = false;
+            this.lblVerwendung.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblVerwendung.LocationFloat = new DevExpress.Utils.PointFloat(108.79F, 107F);
+            this.lblVerwendung.Name = "lblVerwendung";
+            this.lblVerwendung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblVerwendung.SizeF = new System.Drawing.SizeF(460.7711F, 27.1665F);
+            this.lblVerwendung.StylePriority.UseFont = false;
+            this.lblVerwendung.Text = "Verwendungszweck: [InvoiceNumber] -[AccountingPeriodStart!MMMM yyyy]";
             // 
-            // xrLabel1
+            // xrRichText1
             // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(9.997749F, 246.5564F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.563F, 137.9168F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "Mit freundlichen Grüßen\r\n\r\n\r\n\r\nSandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsl" +
-    "eitung\r\n";
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(10.00706F, 10.00001F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(555.56F, 97F);
+            this.xrRichText1.StylePriority.UseFont = false;
+            this.xrRichText1.StylePriority.UsePadding = false;
+            // 
+            // lblLeitung
+            // 
+            this.lblLeitung.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblLeitung.LocationFloat = new DevExpress.Utils.PointFloat(10.01644F, 306.9585F);
+            this.lblLeitung.Multiline = true;
+            this.lblLeitung.Name = "lblLeitung";
+            this.lblLeitung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblLeitung.SizeF = new System.Drawing.SizeF(555.5628F, 61.45825F);
+            this.lblLeitung.StylePriority.UseFont = false;
+            this.lblLeitung.Text = "Sandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsleitung\r\n";
+            // 
+            // xrRichText3
+            // 
+            this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(9.997718F, 134.1665F);
+            this.xrRichText3.Name = "xrRichText3";
+            this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
+            this.xrRichText3.SizeF = new System.Drawing.SizeF(555.5628F, 105.1252F);
+            this.xrRichText3.StylePriority.UseFont = false;
+            this.xrRichText3.StylePriority.UsePadding = false;
             // 
             // bindingSource1
             // 
@@ -477,10 +543,10 @@ namespace DiakonischesWerkRegensburg
             this.Version = "23.2";
             xrWatermark1.Id = "Watermark1";
             this.Watermarks.Add(xrWatermark1);
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
@@ -490,8 +556,8 @@ namespace DiakonischesWerkRegensburg
 
         private DevExpress.XtraReports.UI.DetailBand Detail;
         private System.Windows.Forms.BindingSource bindingSource1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRLabel lblAnrede;
+        private DevExpress.XtraReports.UI.XRLabel lblReNr;
         private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
         private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
 		private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
@@ -501,25 +567,29 @@ namespace DiakonischesWerkRegensburg
 		private DevExpress.XtraReports.UI.XRLabel lblAdresse;
 		private DevExpress.XtraReports.UI.XRLabel lblBetreff;
         private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
-        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
         private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3;
         private DevExpress.XtraReports.UI.XRTable xrTable5;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell lblEinheit;
         private DevExpress.XtraReports.UI.XRTable xrTable6;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel lblReNr2;
         private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel lblCustomer;
         private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
-        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.XRLabel lblLeitung;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText3;
+        private DevExpress.XtraReports.UI.XRLabel lblHeader;
+        private DevExpress.XtraReports.UI.XRLabel lblVerwendung;
     }
 }

ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.cs

@@ -21,32 +21,9 @@ namespace DiakonischesWerkRegensburg
 
         public void SetReportDataSource(ServiceInvoiceRO pRO)
         {
-            SetzeAdresse(pRO);
-            var sb = new StringBuilder();
-
             pRO.ServiceInvoicePeriods.Sort((a, b) => a.Customer.LastName.CompareTo(b.Customer.LastName));
             foreach (var sip in pRO.ServiceInvoicePeriods)
             {
-                if (sip.Customer != null)
-                {
-                    String anrede = "";
-                    if (sip.Customer.Sex.HasValue && sip.Customer.Sex.Value == Sex.Male)
-                    {
-                        anrede = "Herr";
-                    }
-                    else
-                    {
-                        anrede = "Frau";
-                    }
-
-                    String name = String.Format("{0} {1} {2}", anrede, sip.Customer.FirstName, sip.Customer.LastName);
-
-                    if (!sb.ToString().Contains("name"))
-                    {
-                        sb.AppendLine(name);
-                    }
-                }
-
                 if (sip.ServiceInvoiceItems != null)
                 {
                     foreach (var ii in sip.ServiceInvoiceItems)
@@ -73,31 +50,79 @@ namespace DiakonischesWerkRegensburg
                         sip.NotBillableString = String.Format("{0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
                     }
                 }
-
-
             }
-            if (pRO.RecipientOrganisation.Contains("TWG"))
+            if (pRO.RecipientOrganisation.ToLower().Contains("twg"))
             {
-                lblBetreff.Text = "Therapeutische Wohngemeinschaft";
+                lblBetreff.Text = "Abrechnung Betreuungsentgelt Therapeutsiche \nWohngemeinschaften Regensburg";
+                lblHeader.Text = "anbei übersenden wir Ihnen die Abrechnung des Betreuungsentgeltes für die Therapeutischen Wohngemeinschaften Regensburg";
+                lblLeitung.Text = "Reimund Bauer\nBereichsleitung";
+                lblEinheit.Text = "Tage";
+                lblVerwendung.Text = "Kennwort: Wohngemeinschaften";
+                lblReNr.Visible = false;
+                lblReNr2.Visible = false;
+                int index = pRO.RecipientOrganisation.LastIndexOf('-');
+                pRO.RecipientOrganisation = index >= 0 ? pRO.RecipientOrganisation.Substring(0, index) : pRO.RecipientOrganisation;
+                pRO.RecipientOrganisation.Trim();
             }
+            if (pRO.RecipientOrganisation.ToLower().Contains("hg"))
+            {
+                lblBetreff.Text = "Abrechnung Fachleistungsstunden Hausgemeinschaft Steinweg 14\n93059 Regensburg";
+                lblHeader.Text = "anbei übersenden wir Ihnen die Abrechnung der Fachleistungsstunden für die Hausgemeinschaft Steinweg 14, 93059 Regensburg";
+                lblVerwendung.Text = "Kennwort: Hausgemeinschaft";
+                lblReNr.Visible = false;
+                lblReNr2.Visible = false;
+                int index = pRO.RecipientOrganisation.LastIndexOf('-');
+                pRO.RecipientOrganisation = index >= 0 ? pRO.RecipientOrganisation.Substring(0, index) : pRO.RecipientOrganisation;
+                pRO.RecipientOrganisation.Trim();
+            }
+
+            if (pRO.RecipientOrganisation.ToLower().Contains("selbstzahler"))
+            {
+                lblCustomer.Visible = false;
+                SetzeAnrede(pRO);
+            }
+            SetzeAdresse(pRO);
+            var sb = new StringBuilder();
 
             this.bindingSource1.DataSource = pRO;
         }
 
+        private void SetzeAnrede(ServiceInvoiceRO pRO)
+        {
+            String anrede = "Sehr geehrte Damen und Herren,";
+            if (pRO.ServiceInvoicePeriods.Count > 0)
+            {
+                var c = pRO.ServiceInvoicePeriods[0].Customer;
+                if (c != null)
+                {
+                    if (c.Sex.HasValue && c.Sex.Value == Sex.Male)
+                    {
+                        anrede = "Sehr geehrter Herr " + c.LastName + ",";
+                    }
+                    else if (c.Sex.HasValue && c.Sex.Value == Sex.Female)
+                    {
+                        anrede = "Sehr geehrte Frau " + c.LastName + ",";
+                    }
+                }
+            }
+
+            lblAnrede.Text = anrede;
+        }
+
         private void SetzeAdresse(ServiceInvoiceRO pRO)
         {
             String zusatz = GetAdressZusatz(pRO);
 
             StringBuilder sb = new StringBuilder();
 
-            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !pRO.RecipientOrganisation.ToLower().Contains("selbstzahler"))
             {
                 sb.AppendLine(pRO.RecipientOrganisation);
             }
-            //if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
-            //{
-            //    sb.AppendLine(pRO.RecipientContactPerson);
-            //}
+            if (!String.IsNullOrEmpty(pRO.RecipientContactPerson) && pRO.RecipientOrganisation.ToLower().Contains("selbstzahler"))
+            {
+                sb.AppendLine(pRO.RecipientContactPerson);
+            }
             if (!String.IsNullOrEmpty(pRO.RecipientDivision))
             {
                 sb.AppendLine(pRO.RecipientDivision);

ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceCreation.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Services;
+
+namespace DiakonischesWerkRegensburg.Invoicing
+{
+	public class CustomInvoiceCreation : InvoiceCreation
+	{
+		public override List<ServiceInvoiceDC> GenerateServiceInvoices(long costBearerOid, DateTimeSpan invoicePeriod,
+		   Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords, bool splitInvoices)
+		{
+			var list = base.GenerateServiceInvoices(costBearerOid, invoicePeriod, supportConcepts2ServiceRecords, splitInvoices);
+			if (list != null && list.Count > 0)
+			{
+				var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
+				foreach (var invoice in list)
+				{
+					if (costBearer.IsSingleInvoicePerCustomer) // warum zur Hölle ist das Flag genau falschrum???
+					{
+						invoice.InvoiceBase.InvoiceTypeText = "Sammelrechnung";
+						invoice.InvoiceBase.InvoiceId = "Sammelrechnung";
+					}
+				}
+			}
+			return list;
+		}
+
+		public override ServiceInvoicePeriod CreateServiceInvoicePeriod(SupportConceptApprovalPeriodDC approvalPeriodDC, DateTimeSpan invoiceAccountingPeriodSpan)
+		{
+			var sip = new ServiceInvoicePeriod
+			{
+				Start = invoiceAccountingPeriodSpan.StartDateTime,
+				End = invoiceAccountingPeriodSpan.EndDateTime,
+			};
+
+			return sip;
+		}
+
+		public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
+		{
+			if (costBearer.Organisation.Name.ToLower().Contains("selbstzahler"))
+			{
+				serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
+				serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
+				serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
+				serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
+				serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
+
+				if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
+				{
+					var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
+
+					if (cust.Person.InvoiceAddress != null)
+					{
+						serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew();
+					}
+					else if (cust.Person.Address != null)
+					{
+						serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew();
+					}
+					if (cust.Person.InvoiceAddress != null && cust.Person.InvoiceAddress.AddressLine1 != null) // Anderer Rechnungsempfänger z.B. Vormund
+					{
+						serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.InvoiceAddress.AddressLine1;
+						serviceInvoice.InvoiceBase.RecipientPersonLastName = "";
+					}
+					else
+					{
+						serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName;
+						serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName;
+					}
+					serviceInvoice.InvoiceBase.RecipientPersonOid = cust.Person.Oid;
+					return;
+				}
+				if (costBearer.Organisation.InvoiceAddress != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
+				}
+				else if (costBearer.Organisation.Address != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
+				}
+			}
+			else
+			{
+				if (costBearer.Organisation.InvoiceAddress != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
+				}
+				else if (costBearer.Organisation.Address != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
+				}
+
+				serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
+				serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
+				serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
+				serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
+				serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
+
+				//serviceInvoice.InvoiceBase. = c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)) != null ? c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)).Value : String.Empty;
+
+				if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null &&
+					serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName;
+					serviceInvoice.InvoiceBase.RecipientPersonLastName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.LastName;
+					serviceInvoice.InvoiceBase.RecipientPersonOid = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.Oid;
+				}
+			}
+		}
+	}
+}

ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceCreationTagespauschale.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.Invoicing;
 using BeWo.Service.Plugins;
@@ -12,10 +13,31 @@ using BS.Shared.Services;
 
 namespace DiakonischesWerkRegensburg.Invoicing
 {
-	public class CustomInvoiceCreation : InvoiceCreation
+	public class CustomInvoiceCreationTWG : InvoiceCreation
 	{
 		private DateTime? accountingPeriodStart = null;
 		private DateTime? accountingPeriodEnd = null;
+		private static decimal DEFAULT_PAUSCHALE_TAG = 44.22m;
+
+		public override List<ServiceInvoiceDC> GenerateServiceInvoices(long costBearerOid,
+		   DateTimeSpan invoicePeriod,
+		   Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords, bool splitInvoices)
+		{
+			var list = base.GenerateServiceInvoices(costBearerOid, invoicePeriod, supportConcepts2ServiceRecords, splitInvoices);
+			if (list != null && list.Count > 0)
+            {
+				var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
+				foreach (var invoice in list)
+                {
+					if (costBearer.IsSingleInvoicePerCustomer)
+					{
+						invoice.InvoiceBase.InvoiceTypeText = "Sammelrechnung";
+						invoice.InvoiceBase.InvoiceId = "Sammelrechnung";
+					}
+                }
+            }
+			return list;
+		}
 
 		public override ServiceInvoicePeriod CreateServiceInvoicePeriod(SupportConceptApprovalPeriodDC approvalPeriodDC, DateTimeSpan invoiceAccountingPeriodSpan)
 		{
@@ -24,90 +46,180 @@ namespace DiakonischesWerkRegensburg.Invoicing
 				Start = invoiceAccountingPeriodSpan.StartDateTime,
 				End = invoiceAccountingPeriodSpan.EndDateTime,
 			};
-
+			accountingPeriodStart = invoiceAccountingPeriodSpan.StartDateTime;
+			accountingPeriodEnd = invoiceAccountingPeriodSpan.EndDateTime;
 			return sip;
 		}
 
-		//public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
-		//	IList<CompactSupportConceptDC> supportConceptList)
-		//{
-		//	if (invoicePeriod != null)
-		//	{
-		//		accountingPeriodStart = invoicePeriod.StartDate;
-		//		accountingPeriodEnd = invoicePeriod.EndDate;
-		//	}
-		//	base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
-		//}
+		public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod,
+			  SupportConceptApprovalPeriodDC scap, CostBearer2SupportConcept cb2sc,
+			  DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
+		{
+			serviceInvoicePeriod.ApprovedFixedAmount = null;
+			//base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
+			Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
+			serviceInvoicePeriod.InvoiceItemList.Add(CreateInvoiceItem(scap, calc, cb2sc));
 
-		//public override void SetSingleInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer,
-		//	DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept)
-		//{
-		//	base.SetSingleInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConcept);
+			serviceInvoicePeriod.Claim = serviceInvoicePeriod.InvoiceItemList.Sum(i => i.GrossAmountTotal);
+		}
 
-		//	Person p = invoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.Person;
-		//	invoice.InvoiceBase.InvoiceTitle = String.Format("{0}, {1}, {2}", invoice.InvoiceBase.RecipientOrganisation, p.LastName, p.FirstName);
-		//}
+		public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
+			Calculations calc)
+		{
 
-		//   public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod,
-		//       SupportConceptApprovalPeriodDC scap, CostBearer2SupportConcept cb2sc,
-		//       DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
-		//   {
-		//       serviceInvoicePeriod.ApprovedFixedAmount = null;
-		//          //base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
-		//          Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
-		//          serviceInvoicePeriod.InvoiceItemList.Add(CreateInvoiceItem(scap, calc, cb2sc));
+			return new List<InvoiceItem>();
+		}
 
-		//          serviceInvoicePeriod.Claim = serviceInvoicePeriod.InvoiceItemList.Sum(i => i.GrossAmountTotal);
-		//   }
+		private InvoiceItem CreateInvoiceItem(SupportConceptApprovalPeriodDC scap, Calculations calc, CostBearer2SupportConcept cb2sc)
+		{
+			var invoiceItem = new InvoiceItem();
+			DateTime start = accountingPeriodStart.Value;
+			DateTime end = accountingPeriodEnd.Value;
 
-		//   public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
-		//       Calculations calc)
-		//   {
+			if (scap.StartDate.HasValue && scap.StartDate > start)
+			{
+				start = scap.StartDate.Value;
+			}
+			if (scap.EndDate.HasValue && scap.EndDate < end)
+			{
+				end = scap.EndDate.Value;
+			}
+			int days = BerechneAbrechenbareTage(start, end, cb2sc.SupportConcept.Customer);
 
-		//       return new List<InvoiceItem>();
-		//   }
+			invoiceItem.AmountPerUnit = DEFAULT_PAUSCHALE_TAG;
+			if (scap.ApprovedFixedAmount.HasValue && scap.ApprovedFixedAmountInterval.HasValue &&
+				scap.ApprovedFixedAmountInterval.Value == SupportConceptApprovalInterval.Daily)
+			{
+				invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount.Value;
+			}
+			invoiceItem.UnitCount = days;
+			invoiceItem.AmountTotal = invoiceItem.UnitCount * invoiceItem.AmountPerUnit;
+			invoiceItem.ItemPeriodStart = start;
+			invoiceItem.ItemPeriodEnd = end;
+			invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
+			invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
 
-		//   private InvoiceItem CreateInvoiceItem(SupportConceptApprovalPeriodDC scap, Calculations calc, CostBearer2SupportConcept cb2sc)
-		//{
-		//	var invoiceItem = new InvoiceItem();
+			return invoiceItem;
+		}
 
-		//    DateTime start = accountingPeriodStart.Value;
-		//    DateTime end = accountingPeriodEnd.Value;
+		private int BerechneAbrechenbareTage(DateTime start, DateTime end, Customer customer)
+		{
+			//      Ersten 30 Tage bei Abwesenheiten können abgerechnet werden, ab dem 31.Tag nichts 
 
-		//    if (scap.StartDate.HasValue && scap.StartDate > start)
-		//    {
-		//        start = scap.StartDate.Value;
-		//    }
+			int days = (int)end.Subtract(start).TotalDays + 1;
+			var abs = customer.AbsenceTimes;
+			foreach (var at in abs)
+			{
+				if (at.Start <= end && (!at.End.HasValue || at.End.Value >= start))
+				{
+					int abwesenheitStart = (int)start.Subtract(at.Start.Value).TotalDays + 1;
 
-		//    if (scap.EndDate.HasValue && scap.EndDate < end)
-		//    {
-		//        end = scap.EndDate.Value;
-		//    }
+					DateTime abwStart = start;
+					DateTime abwEnd = end;
 
+					if (at.Start.Value > abwStart)
+					{
+						abwStart = at.Start.Value;
+					}
+					if (at.End.HasValue && at.End.Value < abwEnd)
+					{
+						abwEnd = at.End.Value;
+					}
 
-		//    int days = BerechneAbrechenbareTage(start, end, cb2sc.SupportConcept.Customer);
+					int daysAbwesenheit = (int)abwEnd.Subtract(abwStart).TotalDays + 1;
+					int letzterTag = abwesenheitStart + daysAbwesenheit - 1;
 
-		//    invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount ?? 0;
-		//    if (scap.ApprovedFixedAmount.HasValue && scap.ApprovedFixedAmountInterval.HasValue &&
-		//        scap.ApprovedFixedAmountInterval.Value == SupportConceptApprovalInterval.Daily)
-		//    {
-		//        invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount.Value;
-		//    }
-		//    invoiceItem.UnitCount = days;
-		//    invoiceItem.AmountTotal = invoiceItem.UnitCount * invoiceItem.AmountPerUnit;
-		//    invoiceItem.ItemPeriodStart = start;
-		//    invoiceItem.ItemPeriodEnd = end;
-		//    invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
+					if (letzterTag > 30)
+					{
+						if (abwesenheitStart > 30)
+						{
+							days -= (letzterTag - abwesenheitStart);
+						}
+						else
+						{
+							days -= (letzterTag - 30);
+						}
+					}
+				}
+			}
+			if (days < 0)
+			{
+				days = 0;
+			}
+			return days;
+		}
 
-		//          invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
+		public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
+		{
+			if (costBearer.Organisation.Name.ToLower().Contains("selbstzahler"))
+			{
+				serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
+				serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
+				serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
+				serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
+				serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
 
-		//    return invoiceItem;
-		//}
+				if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
+				{
+					var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
 
-		//   private int BerechneAbrechenbareTage(DateTime start, DateTime end, Customer customer)
-		//   {
-		//       int days = (int)end.Subtract(start).TotalDays + 1;
-		//          return days;
-		//   }
+					if (cust.Person.InvoiceAddress != null)
+					{
+						serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew();
+					}
+					else if (cust.Person.Address != null)
+					{
+						serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew();
+					}
+					if (cust.Person.InvoiceAddress != null && cust.Person.InvoiceAddress.AddressLine1 != null) // Anderer Rechnungsempfänger z.B. Vormund
+					{
+						serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.InvoiceAddress.AddressLine1;
+						serviceInvoice.InvoiceBase.RecipientPersonLastName = "";
+					}
+					else
+					{
+						serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName;
+						serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName;
+					}
+					serviceInvoice.InvoiceBase.RecipientPersonOid = cust.Person.Oid;
+					return;
+				}
+				if (costBearer.Organisation.InvoiceAddress != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
+				}
+				else if (costBearer.Organisation.Address != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
+				}
+			}
+			else
+			{
+				if (costBearer.Organisation.InvoiceAddress != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
+				}
+				else if (costBearer.Organisation.Address != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
+				}
+
+				serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
+				serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
+				serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
+				serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
+				serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
+
+				//serviceInvoice.InvoiceBase. = c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)) != null ? c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)).Value : String.Empty;
+
+				if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null &&
+					serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson != null)
+				{
+					serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName;
+					serviceInvoice.InvoiceBase.RecipientPersonLastName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.LastName;
+					serviceInvoice.InvoiceBase.RecipientPersonOid = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.Oid;
+				}
+			}
+		}
 	}
 }

ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceFactory.cs

@@ -11,10 +11,58 @@ namespace DiakonischesWerkRegensburg.Invoicing
 {
 	public class CustomInvoiceFactory : InvoiceFactory
 	{
-
         public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
         {
+            foreach (var item in supportConcepts2ServiceRecords)
+            {
+                var csc = item.Key;
+                var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(csc.CostBearerRelOids[0]);
+                var org = cb2sc.CostBearer.Organisation;
+
+                if (org.Name.ToLower().Contains("twg")|| org.Function != null && org.Function.Value.Contains("TWG"))
+                {
+                    return new CustomInvoiceCreationTWG();
+                }
+                else
+                {
+                    return new CustomInvoiceCreation();
+                }
+            }
             return new CustomInvoiceCreation();
+
+
+            //    foreach (var list in supportConcepts2ServiceRecords.Values)
+            //    {
+            //        foreach (var sr in list)
+            //        {
+            //            //Hier wird Kategorie geprüft
+            //            var ic = GetInvoiceCreatorForCategory(sr.ServiceDescription.Category.Name);
+            //            if (ic != null)
+            //                return ic;
+
+            //            //Hier wird Organisation geprüft
+            //            if (sr.CostBearer.Name.ToLower().Contains("selbstzahler"))
+            //            {
+            //                return new CustomInvoiceCreation();
+            //            }
+            //        }
+            //    }
+
+
+            //    return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords);
+            //}
+
+            //private InvoiceCreation GetInvoiceCreatorForCategory(String catName)
+            //{
+            //    if (!String.IsNullOrEmpty(catName))
+            //    {
+            //        String cat = catName.ToLower().Trim();
+            //        if (cat.IndexOf("assistenz") >= 0)
+            //            return new CustomInvoiceCreation();
+            //    }
+            //    return null;
+            //}
+            //    return new CustomInvoiceCreation();
         }
     }
 }

ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.Designer.cs

@@ -34,6 +34,10 @@ namespace DiakonischesWerkRegensburg
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.lblVerwendung = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblHeader = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
+            this.lblLeitung = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
@@ -51,6 +55,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -59,7 +64,8 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblEinheit = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
@@ -67,14 +73,16 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblBetreffTabelle = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -92,6 +100,10 @@ namespace DiakonischesWerkRegensburg
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblVerwendung,
+            this.lblHeader,
+            this.xrRichText3,
+            this.lblLeitung,
             this.xrLabel3,
             this.xrLabel1,
             this.xrRichText1,
@@ -100,16 +112,60 @@ namespace DiakonischesWerkRegensburg
             this.lblBetreff,
             this.xrLabel24,
             this.lblAdresse});
-            this.ReportHeader.HeightF = 921.7645F;
+            this.ReportHeader.HeightF = 896.7645F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // lblVerwendung
+            // 
+            this.lblVerwendung.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblVerwendung.LocationFloat = new DevExpress.Utils.PointFloat(107.9138F, 571.8061F);
+            this.lblVerwendung.Name = "lblVerwendung";
+            this.lblVerwendung.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 2, 0, 0, 100F);
+            this.lblVerwendung.SizeF = new System.Drawing.SizeF(457.6461F, 21.95819F);
+            this.lblVerwendung.StylePriority.UseFont = false;
+            this.lblVerwendung.StylePriority.UsePadding = false;
+            this.lblVerwendung.Text = "Verwendungszweck: [InvoiceNumber] -[AccountingPeriodStart!MMMM yyyy]";
+            // 
+            // lblHeader
+            // 
+            this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(10.00099F, 407.0145F);
+            this.lblHeader.Multiline = true;
+            this.lblHeader.Name = "lblHeader";
+            this.lblHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblHeader.SizeF = new System.Drawing.SizeF(555.5628F, 67.79163F);
+            this.lblHeader.StylePriority.UseFont = false;
+            this.lblHeader.Text = "anbei übersenden wir Ihnen die Abrechnung der \r\nFachleistungsstunden für Ambulant" +
+    " unterstütztes Wohnen \r\nfür [AccountingPeriodStart!MMMM yyyy].";
+            // 
+            // xrRichText3
+            // 
+            this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(9.99616F, 593.7642F);
+            this.xrRichText3.Name = "xrRichText3";
+            this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
+            this.xrRichText3.SizeF = new System.Drawing.SizeF(555.5628F, 65.54193F);
+            this.xrRichText3.StylePriority.UseFont = false;
+            this.xrRichText3.StylePriority.UsePadding = false;
+            // 
+            // lblLeitung
+            // 
+            this.lblLeitung.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.lblLeitung.LocationFloat = new DevExpress.Utils.PointFloat(10.00093F, 835.3063F);
+            this.lblLeitung.Multiline = true;
+            this.lblLeitung.Name = "lblLeitung";
+            this.lblLeitung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblLeitung.SizeF = new System.Drawing.SizeF(555.5628F, 61.45825F);
+            this.lblLeitung.StylePriority.UseFont = false;
+            this.lblLeitung.Text = "Sandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsleitung\r\n";
+            // 
             // xrLabel3
             // 
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel3.CanShrink = true;
             this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.334F, 325.7084F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.334F, 342.7084F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
@@ -121,28 +177,32 @@ namespace DiakonischesWerkRegensburg
             // xrLabel1
             // 
             this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 691.5561F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(9.996986F, 659.3062F);
             this.xrLabel1.Multiline = true;
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5628F, 230.2084F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5628F, 115.6251F);
             this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
+            this.xrLabel1.Text = "Bitte schicken Sie uns die Rechnungserläuterung per Mail an\r\ns.wendling@dw-regens" +
+    "burg.de oder stellen Sie in Ihrem \r\nSecure Webmail Portal ein, vielen Dank.\r\n\r\n\r" +
+    "\nMit freundlichen Grüßen\r\n";
             // 
             // xrRichText1
             // 
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 414.3894F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 474.8061F);
             this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(555.5628F, 277.1666F);
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(555.56F, 97F);
             this.xrRichText1.StylePriority.UseFont = false;
+            this.xrRichText1.StylePriority.UsePadding = false;
             // 
             // xrLabel2
             // 
             this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel2.CanShrink = true;
             this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 325.7084F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 342.7084F);
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel2.SizeF = new System.Drawing.SizeF(168.3333F, 17F);
@@ -154,7 +214,7 @@ namespace DiakonischesWerkRegensburg
             // xrLabel5
             // 
             this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(10.00036F, 363.5417F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 375F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -170,7 +230,7 @@ namespace DiakonischesWerkRegensburg
             this.lblBetreff.Multiline = true;
             this.lblBetreff.Name = "lblBetreff";
             this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblBetreff.SizeF = new System.Drawing.SizeF(555.5629F, 41.33331F);
+            this.lblBetreff.SizeF = new System.Drawing.SizeF(555.5629F, 53.83331F);
             this.lblBetreff.StylePriority.UseBackColor = false;
             this.lblBetreff.StylePriority.UseFont = false;
             this.lblBetreff.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
@@ -248,7 +308,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow25});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(660F, 25F);
+            this.xrTable6.SizeF = new System.Drawing.SizeF(700.3333F, 25F);
             this.xrTable6.StylePriority.UseBorders = false;
             this.xrTable6.StylePriority.UseFont = false;
             this.xrTable6.StylePriority.UsePadding = false;
@@ -258,6 +318,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell42,
             this.xrTableCell9,
+            this.xrTableCell15,
             this.xrTableCell45,
             this.xrTableCell3,
             this.xrTableCell10});
@@ -268,7 +329,7 @@ namespace DiakonischesWerkRegensburg
             // 
             this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell42.Name = "xrTableCell42";
             this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
             this.xrTableCell42.StylePriority.UseBorderColor = false;
@@ -276,17 +337,17 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell42.StylePriority.UseFont = false;
             this.xrTableCell42.StylePriority.UsePadding = false;
             this.xrTableCell42.StylePriority.UseTextAlignment = false;
-            this.xrTableCell42.Text = "[ServiceInvoiceItems.CustomerLastname], [ServiceInvoiceItems.CustomerFirstname]";
+            this.xrTableCell42.Text = "[Customer.LastNameFirstName], [ServiceInvoiceItems.CustomerFirstname]";
             this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell42.Weight = 0.6832283923563458D;
+            this.xrTableCell42.Weight = 0.7249818750754653D;
             // 
             // xrTableCell9
             // 
             this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.NotBillableString")});
-            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.Customer.DateOfBirth")});
+            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
             this.xrTableCell9.StylePriority.UseBorders = false;
@@ -294,7 +355,26 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell9.StylePriority.UsePadding = false;
             this.xrTableCell9.StylePriority.UseTextAlignment = false;
             this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell9.Weight = 0.68322841128249778D;
+            this.xrTableCell9.TextFormatString = "*{0:dd.MM.yyyy}";
+            this.xrTableCell9.Weight = 0.32221341731983788D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.NotBillableString")});
+            this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
+            this.xrTableCell15.StylePriority.UseBorders = false;
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UsePadding = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.Text = "xrTableCell15";
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell15.Weight = 0.60098796952274636D;
             // 
             // xrTableCell45
             // 
@@ -302,7 +382,7 @@ namespace DiakonischesWerkRegensburg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")});
-            this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell45.Name = "xrTableCell45";
             this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
             this.xrTableCell45.StylePriority.UseBorderColor = false;
@@ -311,7 +391,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell45.StylePriority.UsePadding = false;
             this.xrTableCell45.StylePriority.UseTextAlignment = false;
             this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell45.Weight = 0.283096864018934D;
+            this.xrTableCell45.Weight = 0.30365714075032513D;
             // 
             // xrTableCell3
             // 
@@ -319,7 +399,7 @@ namespace DiakonischesWerkRegensburg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
-            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell3.Name = "xrTableCell3";
             this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
             this.xrTableCell3.StylePriority.UseBorders = false;
@@ -327,7 +407,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell3.StylePriority.UsePadding = false;
             this.xrTableCell3.StylePriority.UseTextAlignment = false;
             this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell3.Weight = 0.400131519444102D;
+            this.xrTableCell3.Weight = 0.30365657818125125D;
             // 
             // xrTableCell10
             // 
@@ -335,7 +415,7 @@ namespace DiakonischesWerkRegensburg
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:c}")});
-            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
             this.xrTableCell10.StylePriority.UseBorders = false;
@@ -343,7 +423,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell10.StylePriority.UsePadding = false;
             this.xrTableCell10.StylePriority.UseTextAlignment = false;
             this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell10.Weight = 0.45548555017344361D;
+            this.xrTableCell10.Weight = 0.40276721480769961D;
             // 
             // GroupHeader3
             // 
@@ -358,13 +438,16 @@ namespace DiakonischesWerkRegensburg
             this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable5.Font = new DevExpress.Drawing.DXFont("Calibri", 10.5F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 0F);
             this.xrTable5.Name = "xrTable5";
             this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable5.SizeF = new System.Drawing.SizeF(660F, 25F);
+            this.xrTable5.SizeF = new System.Drawing.SizeF(700.3333F, 25F);
             this.xrTable5.StylePriority.UseBackColor = false;
             this.xrTable5.StylePriority.UseBorders = false;
+            this.xrTable5.StylePriority.UseFont = false;
             // 
             // xrTableRow1
             // 
@@ -372,7 +455,8 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell6,
             this.xrTableCell2,
-            this.xrTableCell4,
+            this.xrTableCell8,
+            this.lblEinheit,
             this.xrTableCell1,
             this.xrTableCell5});
             this.xrTableRow1.Name = "xrTableRow1";
@@ -382,7 +466,7 @@ namespace DiakonischesWerkRegensburg
             // xrTableCell6
             // 
             this.xrTableCell6.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
             this.xrTableCell6.StylePriority.UseBackColor = false;
@@ -391,40 +475,54 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell6.StylePriority.UseTextAlignment = false;
             this.xrTableCell6.Text = "Name";
             this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell6.Weight = 0.68322852462418D;
+            this.xrTableCell6.Weight = 0.72498207339026288D;
             // 
             // xrTableCell2
             // 
             this.xrTableCell2.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell2.Name = "xrTableCell2";
             this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
             this.xrTableCell2.StylePriority.UseBackColor = false;
             this.xrTableCell2.StylePriority.UseFont = false;
             this.xrTableCell2.StylePriority.UsePadding = false;
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            this.xrTableCell2.Text = "Zeitraum";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell2.Weight = 0.68322852603339645D;
+            this.xrTableCell2.Weight = 0.32221347091815755D;
             // 
-            // xrTableCell4
+            // xrTableCell8
             // 
-            this.xrTableCell4.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
-            this.xrTableCell4.StylePriority.UseBackColor = false;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UsePadding = false;
-            this.xrTableCell4.StylePriority.UseTextAlignment = false;
-            this.xrTableCell4.Text = "Stunden:";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell4.Weight = 0.28309692864294422D;
+            this.xrTableCell8.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell8.Multiline = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell8.StylePriority.UseBackColor = false;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "Zeitraum";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell8.Weight = 0.60098801947754343D;
+            // 
+            // lblEinheit
+            // 
+            this.lblEinheit.BackColor = System.Drawing.Color.Transparent;
+            this.lblEinheit.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblEinheit.Name = "lblEinheit";
+            this.lblEinheit.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.lblEinheit.StylePriority.UseBackColor = false;
+            this.lblEinheit.StylePriority.UseFont = false;
+            this.lblEinheit.StylePriority.UsePadding = false;
+            this.lblEinheit.StylePriority.UseTextAlignment = false;
+            this.lblEinheit.Text = "Stunden";
+            this.lblEinheit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.lblEinheit.Weight = 0.30365709354121728D;
             // 
             // xrTableCell1
             // 
             this.xrTableCell1.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell1.Name = "xrTableCell1";
             this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
             this.xrTableCell1.StylePriority.UseBackColor = false;
@@ -433,12 +531,12 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell1.StylePriority.UseTextAlignment = false;
             this.xrTableCell1.Text = "Satz";
             this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell1.Weight = 0.40013160209951731D;
+            this.xrTableCell1.Weight = 0.30365710539796026D;
             // 
             // xrTableCell5
             // 
             this.xrTableCell5.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell5.Name = "xrTableCell5";
             this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
             this.xrTableCell5.StylePriority.UseBackColor = false;
@@ -447,7 +545,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell5.StylePriority.UseTextAlignment = false;
             this.xrTableCell5.Text = "Betrag";
             this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell5.Weight = 0.45548564360570709D;
+            this.xrTableCell5.Weight = 0.40276695046829381D;
             // 
             // GroupFooter1
             // 
@@ -466,7 +564,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(660F, 25F);
+            this.xrTable1.SizeF = new System.Drawing.SizeF(700.333F, 25F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseFont = false;
             this.xrTable1.StylePriority.UsePadding = false;
@@ -476,6 +574,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell11,
             this.xrTableCell12,
+            this.xrTableCell16,
             this.xrTableCell13,
             this.xrTableCell7,
             this.xrTableCell14});
@@ -502,13 +601,26 @@ namespace DiakonischesWerkRegensburg
             // 
             this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("arial", 10.5F);
+            this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("arial", 10F);
             this.xrTableCell12.Name = "xrTableCell12";
             this.xrTableCell12.StylePriority.UseBorders = false;
             this.xrTableCell12.StylePriority.UseFont = false;
             this.xrTableCell12.StylePriority.UseTextAlignment = false;
             this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell12.Weight = 1.0361544303131562D;
+            this.xrTableCell12.Weight = 0.46051307982998924D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("arial", 10F);
+            this.xrTableCell16.Multiline = true;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.85894141058559226D;
             // 
             // xrTableCell13
             // 
@@ -525,7 +637,7 @@ namespace DiakonischesWerkRegensburg
             xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
             this.xrTableCell13.Summary = xrSummary1;
             this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell13.Weight = 0.4293308216449338D;
+            this.xrTableCell13.Weight = 0.43399176455654953D;
             // 
             // xrTableCell7
             // 
@@ -537,7 +649,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell7.StylePriority.UseFont = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            this.xrTableCell7.Weight = 0.606823565334193D;
+            this.xrTableCell7.Weight = 0.43399191660378306D;
             // 
             // xrTableCell14
             // 
@@ -554,15 +666,15 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell14.StylePriority.UseTextAlignment = false;
             this.xrTableCell14.Text = "xrTableCell9";
             this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell14.Weight = 0.69076967431961256D;
+            this.xrTableCell14.Weight = 0.57564032003598131D;
             // 
             // ReportHeader1
             // 
             this.ReportHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel7,
             this.xrLabel6,
-            this.xrLabel4});
-            this.ReportHeader1.HeightF = 111.6793F;
+            this.lblBetreffTabelle});
+            this.ReportHeader1.HeightF = 124.2898F;
             this.ReportHeader1.Name = "ReportHeader1";
             this.ReportHeader1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
             // 
@@ -571,7 +683,7 @@ namespace DiakonischesWerkRegensburg
             this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel7.CanShrink = true;
             this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 72.16663F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00086F, 88.83324F);
             this.xrLabel7.Multiline = true;
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -586,7 +698,7 @@ namespace DiakonischesWerkRegensburg
             this.xrLabel6.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel6.CanShrink = true;
             this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 47.49997F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(10.00086F, 64.16664F);
             this.xrLabel6.Multiline = true;
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -596,20 +708,20 @@ namespace DiakonischesWerkRegensburg
             this.xrLabel6.Text = "Einzelaufstellung erstellt am [InvoiceDate]";
             this.xrLabel6.WordWrap = false;
             // 
-            // xrLabel4
+            // lblBetreffTabelle
             // 
-            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel4.CanShrink = true;
-            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
-            this.xrLabel4.Multiline = true;
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(555.5629F, 29.87499F);
-            this.xrLabel4.StylePriority.UseBackColor = false;
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
-            this.xrLabel4.WordWrap = false;
+            this.lblBetreffTabelle.BackColor = System.Drawing.Color.Transparent;
+            this.lblBetreffTabelle.CanShrink = true;
+            this.lblBetreffTabelle.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblBetreffTabelle.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
+            this.lblBetreffTabelle.Multiline = true;
+            this.lblBetreffTabelle.Name = "lblBetreffTabelle";
+            this.lblBetreffTabelle.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblBetreffTabelle.SizeF = new System.Drawing.SizeF(555.5629F, 44.37497F);
+            this.lblBetreffTabelle.StylePriority.UseBackColor = false;
+            this.lblBetreffTabelle.StylePriority.UseFont = false;
+            this.lblBetreffTabelle.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
+            this.lblBetreffTabelle.WordWrap = false;
             // 
             // bindingSource1
             // 
@@ -636,6 +748,7 @@ namespace DiakonischesWerkRegensburg
             this.Version = "23.2";
             xrWatermark1.Id = "Watermark1";
             this.Watermarks.Add(xrWatermark1);
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
@@ -666,7 +779,7 @@ namespace DiakonischesWerkRegensburg
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell lblEinheit;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
         private DevExpress.XtraReports.UI.XRTable xrTable6;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
@@ -687,8 +800,15 @@ namespace DiakonischesWerkRegensburg
         private DevExpress.XtraReports.UI.XRLabel xrLabel1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
         private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRLabel lblBetreffTabelle;
         private DevExpress.XtraReports.UI.XRLabel xrLabel7;
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel lblLeitung;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText3;
+        private DevExpress.XtraReports.UI.XRLabel lblHeader;
+        private DevExpress.XtraReports.UI.XRLabel lblVerwendung;
     }
 }

ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.cs

@@ -44,23 +44,39 @@ namespace DiakonischesWerkRegensburg
                             {
                                 start = cstart;
                             }
-
                             if (start <= cend && cend < end)
                             {
                                 end = cend;
                             }
                         }
-
                         sip.NotBillableString = String.Format("{0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
                     }
                 }
-
-
             }
-            //if (pRO.RecipientOrganisation.Contains("TWG"))
-            //{
-            //    lblBetreff.Text = "Therapeutische Wohngemeinschaft";
-            //}
+            if (pRO.RecipientOrganisation.ToLower().Contains("twg"))
+            {
+                lblBetreff.Text = "Abrechnung Betreuungsentgelt Wohngemeinschaften \nSteinweg 10, Holzgartenstr. 10 und Tegernheimer Weg 26";
+                lblHeader.Text = "anbei übersenden wir Ihnen die Abrechnung des Betreuungsentgeltes für die Wohngemeinschaften Steinweg 10 und Holzgartenstr. 10, " +
+                    "93059 Regensburg und Tegernheimer Weg 26, 93055 Regensburg";
+                lblLeitung.Text = "Reimund Bauer\nBereichsleitung\nAnlage";
+                lblEinheit.Text = "Tage";
+                lblBetreffTabelle.Text = lblBetreff.Text;
+                lblVerwendung.Text = "Kennwort: Wohngemeinschaften";
+                int index = pRO.RecipientOrganisation.LastIndexOf('-');
+                pRO.RecipientOrganisation = index >= 0 ? pRO.RecipientOrganisation.Substring(0, index) : pRO.RecipientOrganisation;
+                pRO.RecipientOrganisation.Trim();
+            }
+            else if (pRO.RecipientOrganisation.ToLower().Contains("hg"))
+            {
+                lblBetreff.Text = "Abrechnung Fachleistungsstunde Hausgemeinschaft Steinweg 14";
+                lblHeader.Text = "anbei übersenden wir Ihnen die Abrechnung der Fachleistungsstunden für die Hausgemeinschaft Steinweg 14, 93059 Regensburg";
+                lblLeitung.Text = "Reimund Bauer\nBereichsleitung\nAnlage";
+                lblBetreffTabelle.Text = lblBetreff.Text;
+                lblVerwendung.Text = "Kennwort:Hausgemeinschaft";
+                int index = pRO.RecipientOrganisation.LastIndexOf('-');
+                pRO.RecipientOrganisation = index >= 0 ? pRO.RecipientOrganisation.Substring(0, index) : pRO.RecipientOrganisation;
+                pRO.RecipientOrganisation.Trim();
+            }
 
             this.bindingSource1.DataSource = pRO;
         }

ReportImp/DomizielAnsbach/Invoicing/CustomInvoiceFactory.cs

@@ -24,7 +24,7 @@ namespace DomizielAnsbach.Invoicing
                         {
 							return new AbwInvoiceCreation();
 						}
-						if (ap.ServiceCategory != null && ap.ServiceCategory.Name.Contains("Persönliches Budget") || ap.ServiceCategory.Name.Contains("Selbstzahler"))
+						if (ap.ServiceCategory != null && (ap.ServiceCategory.Name.Contains("Persönliches Budget") || ap.ServiceCategory.Name.Contains("Selbstzahler")))
 						{
 							return new PBInvoiceCreation();
 						}

ReportImp/DrobDrogenhilfe/DrobDrogenhilfe.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Calculations\CustomGroupDurationCalculator.cs" />
     <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
+    <Compile Include="Invoicing\CustomSettlementInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>

ReportImp/DrobDrogenhilfe/Invoicing/CustomSettlementInvoiceCreation.cs

@@ -15,5 +15,90 @@ namespace DrobDrogenhilfe
 
     internal class CustomSettlementInvoiceCreation : LWLSettlementInvoiceCreation
 	{
+		// muss doch permanent bei denen sein, geht nur um zusammenfassen der Items in Zeile 27
+		// die haben tatsächlich den gleichen Preis zweimal bekommen und brauchen den getrennt ausgewiesen
+		// das kann zu Ärger führen, wenn jemand in einem Zeitraum 2 Bewilligungen hat, dann hätte der LWL die gern zusammen gefasst, also nicht als Standard tauglich
+		public override List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList, bool schneideBeiMaxAb)
+		{
+			List<InvoiceItemDC> iiList = new List<InvoiceItemDC>();
+			var apsByHourlyRate = new Dictionary<String, IList<ApprovalPeriod>>();
+
+			foreach (var ap in apList)
+			{
+				IList<ApprovalPeriod> list = null;
+				String key = String.Format("{0}_{1}_{2:ddMMyyy}", ap.AmountPerUnit, ap.RateFactor, ap.PeriodStartDate);
+
+				if (apsByHourlyRate.ContainsKey(key))
+				{
+					list = apsByHourlyRate[key];
+				}
+				else
+				{
+					list = new List<ApprovalPeriod>();
+					apsByHourlyRate[key] = list;
+				}
+
+				list.Add(ap);
+			}
+
+			decimal maxApprovedFls = si.ApprovedFLS ?? 0;
+			decimal totalHours = 0;
+			foreach (var key in apsByHourlyRate.Keys)
+			{
+				IList<ApprovalPeriod> list = apsByHourlyRate[key];
+				var ii = new InvoiceItemDC();
+
+				decimal minutesTotal = 0;
+				decimal minutesTotalBudget = 0;
+
+				DateTime start = DateTime.MaxValue;
+				DateTime end = DateTime.MinValue;
+
+				decimal rf = si.RateFactor ?? 0;
+				decimal hr = 0;
+
+				foreach (var approvalPeriod in list)
+				{
+					minutesTotal += approvalPeriod.RecordedMinutes;
+					minutesTotalBudget += approvalPeriod.BudgetMinutes;
+					if (approvalPeriod.PeriodStartDate < start)
+						start = approvalPeriod.PeriodStartDate;
+					if (approvalPeriod.PeriodEndDate > end)
+						end = approvalPeriod.PeriodEndDate;
+
+					hr = approvalPeriod.AmountPerUnit;
+					if (approvalPeriod.RateFactor.HasValue)
+					{
+						rf = approvalPeriod.RateFactor.Value;
+					}
+					if (!String.IsNullOrEmpty(approvalPeriod.Notice) && approvalPeriod.Notice == "Fehlkontakte")
+					{
+						hr *= 0.8m;
+						ii.ItemDescription = "Fehlkontakte";
+					}
+				}
+				ii.ItemPeriodStart = start;
+				ii.ItemPeriodEnd = end;
+				ii.RateFactor = rf;
+				ii.AmountPerUnit = hr;
+				decimal hours = Math.Round(minutesTotal / 60m, 2, MidpointRounding.AwayFromZero);
+				hours *= (100 + rf) / 100;
+				hours = Math.Round(hours, 2, MidpointRounding.AwayFromZero);
+
+				decimal hoursBudget = Math.Round(minutesTotalBudget / 60m, 2, MidpointRounding.AwayFromZero);
+				hoursBudget *= (100 + rf) / 100;
+				hoursBudget = Math.Round(hoursBudget, 2, MidpointRounding.AwayFromZero);
+				totalHours += hoursBudget;
+
+				ii.UnitCount = hours;
+				ii.UnitCountBudget = hoursBudget;
+				ii.AmountTotal = Math.Round(hr * hours, 2, MidpointRounding.AwayFromZero);
+				ii.GrossAmountTotal = ii.AmountTotal;
+
+				iiList.Add(ii);
+			}
+
+			return iiList.OrderBy(ii => ii.ItemPeriodStart).ToList();
+		}
 	}
 }

ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs

@@ -30,7 +30,7 @@ namespace FeidPartnerReports.Calculation
             {
                 return 0;
             }
-            return GetApprovedHoursForPeriod(pStart.Value, pEnd.Value, GetApprovedHoursPerMonth(scap));
+            return GetApprovedHoursForPeriod(pStart.Value, pEnd.Value, GetApprovedHoursPerMonth(scap, costRatePeriods));
 
         }
 
@@ -59,7 +59,7 @@ namespace FeidPartnerReports.Calculation
 
             if (scap.StartDate.HasValue)
             {
-                return GetApprovedHoursForPeriod(scap.StartDate.Value, end, GetApprovedHoursPerMonth(scap));
+                return GetApprovedHoursForPeriod(scap.StartDate.Value, end, GetApprovedHoursPerMonth(scap, costRates));
             }
 
             return 0;
@@ -76,7 +76,7 @@ namespace FeidPartnerReports.Calculation
             {
                 foreach (var scap in relDC.ApprovalPeriodList)
                 {
-                    totalApproved += GetApprovedHoursTillNow(scap, null, appointedDate, false) ?? 0;
+                    totalApproved += GetApprovedHoursTillNow(scap, relDC.CostBearer.CostRatePeriods, appointedDate, false) ?? 0;
                 }
             }
 
@@ -90,7 +90,7 @@ namespace FeidPartnerReports.Calculation
                 decimal total = 0;
                 foreach (var scap in relDC.ApprovalPeriodList)
                 {
-                    var approvedPerMonth = GetApprovedHoursPerMonth(scap);
+                    var approvedPerMonth = GetApprovedHoursPerMonth(scap, relDC.CostBearer.CostRatePeriods);
                     // Anpassung auf Minuten noch nötig!!!
                     // var approvedPerMonth = GetApprovedHoursPerMonth(scap, relDC);
                     var approved = GetApprovedHoursForPeriod(scap.StartDate.Value, scap.EndDate.Value, approvedPerMonth);
@@ -126,12 +126,12 @@ namespace FeidPartnerReports.Calculation
             decimal total = 0;
             foreach (var scap in c2s.ApprovalPeriodList)
             {
-                total += GetApprovedHoursPerMonth(scap);
+                total += GetApprovedHoursPerMonth(scap, c2s.CostBearer.CostRatePeriods);
             }
             return total;
         }
 
-        private decimal GetApprovedHoursPerMonth(SupportConceptApprovalPeriodDC scap)
+        private decimal GetApprovedHoursPerMonth(SupportConceptApprovalPeriodDC scap, List<CostRatePeriodDC> costRatePeriods)
         {
             if (scap.ApprovedBEInterval.HasValue && scap.ApprovedBEPerInterval.HasValue)
             {
@@ -153,9 +153,37 @@ namespace FeidPartnerReports.Calculation
                 }
             }
 
-            var flsProWoche = GetApprovedHoursPerWeek(scap, new List<CostRatePeriodDC>()) ?? 0;
+            var flsProWoche = GetApprovedHoursPerWeek(scap, costRatePeriods) ?? 0;
 
             return flsProWoche * 4.34m;
         }
+
+        public override decimal? GetApprovedHoursPerWeekAverage(SupportConceptCostBearerRelDC relDC, bool useIsCalculationWithFactor)
+        {
+            // Fahrtzeiten nicht in Ministatistik nur für Abrechnung
+            relDC.ApprovalPeriodList = relDC.ApprovalPeriodList.Where(p => p.ServiceCategory == null || String.IsNullOrEmpty(p.ServiceCategory.Abbreviation) ||
+            !p.ServiceCategory.Abbreviation.Contains("FZQA")).ToList();
+
+            var duration = relDC.GetApprovedDuration();
+            if (!duration.HasValue)
+            {
+                return null;
+            }
+            if (relDC.ApprovalPeriodList != null && relDC.ApprovalPeriodList.Count == 1)
+            {
+                decimal? hoursPerWeek = GetApprovedHoursPerWeek(relDC.ApprovalPeriodList[0], relDC.CostBearer.CostRatePeriods);
+                if (useIsCalculationWithFactor)
+                    hoursPerWeek = ApplyIsCalculationWithFactor(relDC, hoursPerWeek);
+                return hoursPerWeek;
+            }
+
+            if (duration.Value.Days != 0)
+            {
+                var averagePerDay = this.GetApprovedHoursTotal(relDC, useIsCalculationWithFactor) / duration.Value.Days;
+                return averagePerDay * 7;
+            }
+
+            return null;
+        }
     }  
 }

ReportImp/FeidPartnerReports/CustomSupportConceptAnalysisCreator.cs

@@ -19,7 +19,36 @@ using BeWo.Service.ServiceImplementations;
 namespace FeidPartnerReports
 {
 	public class CustomSupportConceptAnalysisCreator : SupportConceptAnalysisCreator
-	{
+    {
+        public override List<SupportConceptOverviewDC> GetSupportConceptAnalysis2(IList<long> c2sOids, long? employeeOid, long? teamOid, long? catOid, DateTime? startDate, DateTime? endDate,
+            int? expiredMonths, bool showArchivedScs)
+        {
+            var result = base.GetSupportConceptAnalysis2(c2sOids, employeeOid, teamOid, catOid, startDate, endDate, expiredMonths, showArchivedScs);
+            // Die Berechnungen sind jetzt soweit in Ordnung, werden nur im letzen Schritt, dass was hier auch ist, wieder verfälscht,
+            // da der Kostenträger auf Min und nicht wie von denen gewünscht Std ist - das drehe ich hier inkl. Beschriftung in Stunden zurück
+            foreach (var iDC in result)
+            {
+                if (iDC.ServiceUnit.CostRateValue == 1)
+                {
+                    iDC.ServiceUnit.UnitName = "Stunden";
+                    iDC.HeaderString.Replace("Minuten/Woche", "Stunden/Woche");
+                    iDC.BEApprovedPerWeek = iDC.BEApprovedPerWeek / 60m;
+                    iDC.BEApprovedSum = iDC.FLSApprovedSum;
+                    iDC.BEApprovedTillNow = iDC.FLSApprovedTillNow;
+                    iDC.BEBilledTillNow = iDC.FLSBilledTillNow;
+                    iDC.BEDifferenceApprovedRecordedTillNow = iDC.FLSDifferenceApprovedRecordedTillNow;
+                    iDC.BEDifferenceApprovedRecordedTillNowInPercent = iDC.FLSDifferenceApprovedRecordedTillNowInPercent;
+                    iDC.BEOpen = iDC.FLSOpen;
+                    iDC.BEOpenPerWeek = iDC.FLSOpenPerWeek;
+                    if (iDC.BEOpenPerWeek > iDC.BEOpen)
+                        iDC.BEOpenPerWeek = iDC.BEOpen;
+                    iDC.BERecordedTillNow = iDC.FLSRecordedTillNow;
+                    iDC.BERecordedTillNowInPercent = iDC.FLSRecordedTillNowInPercent;
+                }
+            }
+            return result;
+        }
+
         public override List<ServiceRecordDC> GetServiceRecordDCs(CostBearer2SupportConcept c2s, DateTime minDate, DateTime maxDate)
         {
             var dcList = new List<ServiceRecordDC>();
@@ -28,7 +57,11 @@ namespace FeidPartnerReports
                 if (_cs2ServiceRecords.ContainsKey(c2s.Oid.Value))
                 {
                     dcList = _cs2ServiceRecords[c2s.Oid.Value];
-                    dcList.Where(s => s.Start >= minDate && s.Start < maxDate).ToList();
+                    dcList = dcList.Where(s => s.Start >= minDate && s.Start < maxDate).ToList();
+                    if (dcList != null && dcList.Count() > 0)
+                    {
+                        dcList = dcList.Where(s => !s.GroupOid.HasValue).ToList();
+                    }
                 }
             }
 

ReportImp/FeidPartnerReports/Statistics/CustomServiceRecordStatisticFactory.cs

@@ -79,10 +79,11 @@ namespace FeidPartnerReports.Statistics
 						}
 						start = start.AddDays(7);
 					}
-					if (!cb2sc.CostBearer.Organisation.Name.ToLower().Contains("alt"))
-					{
-						item.MinutesApprovedTotal /= 60;
-					}
+					// AB, 12.09.2025: wird jetzt in Calculations schon richtig gemacht
+					//if (!cb2sc.CostBearer.Organisation.Name.ToLower().Contains("alt"))
+					//{
+					//	item.MinutesApprovedTotal /= 60;
+					//}
 					SetMinutesFreePerWeek(stat, item);
 
 				}

ReportImp/FlingernMobilReports/Properties/licenses.licx

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

ReportImp/FlingernMobilReports/ServicesOverviewReport.Designer.cs

@@ -112,6 +112,9 @@ namespace BeWo.FlingernMobilReports
             this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
             this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
+            this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -124,7 +127,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableServiceRecords1});
-            this.Detail.Font = new System.Drawing.Font("Arial", 11F);
+            this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.Detail.HeightF = 40F;
             this.Detail.Name = "Detail";
             this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -205,7 +208,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable3});
-            this.Detail1.Font = new System.Drawing.Font("Arial", 12F);
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
             this.Detail1.HeightF = 20F;
             this.Detail1.Name = "Detail1";
             this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -313,7 +316,7 @@ namespace BeWo.FlingernMobilReports
             this.xrLabel13,
             this.xrLabel12,
             this.xrLabel1});
-            this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
+            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.ReportHeader.HeightF = 234.7917F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
@@ -321,7 +324,7 @@ namespace BeWo.FlingernMobilReports
             // xrLabel2
             // 
             this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(155.2083F, 36.00003F);
             this.xrLabel2.Multiline = true;
             this.xrLabel2.Name = "xrLabel2";
@@ -337,7 +340,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
-            this.xrLabel29.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(311.5835F, 167.5834F);
             this.xrLabel29.Name = "xrLabel29";
             this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -349,7 +352,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
-            this.xrLabel26.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(345.9585F, 131.5834F);
             this.xrLabel26.Name = "xrLabel26";
             this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -362,7 +365,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")});
-            this.xrLabel25.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(311.5835F, 113.5834F);
             this.xrLabel25.Name = "xrLabel25";
             this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -374,7 +377,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")});
-            this.xrLabel24.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(311.5835F, 95.58337F);
             this.xrLabel24.Name = "xrLabel24";
             this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -386,7 +389,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")});
-            this.xrLabel23.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(311.5835F, 77.58337F);
             this.xrLabel23.Name = "xrLabel23";
             this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -397,7 +400,7 @@ namespace BeWo.FlingernMobilReports
             // xrLabel22
             // 
             this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel22.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(1.999919F, 36.00003F);
             this.xrLabel22.Multiline = true;
             this.xrLabel22.Name = "xrLabel22";
@@ -413,7 +416,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year", "Jahr: {0}")});
-            this.xrLabel21.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(168F, 203.5834F);
             this.xrLabel21.Name = "xrLabel21";
             this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -426,7 +429,7 @@ namespace BeWo.FlingernMobilReports
             // 
             this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month", "Monat: {0}")});
-            this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 203.5834F);
             this.xrLabel9.Name = "xrLabel9";
             this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -437,7 +440,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel18
             // 
-            this.xrLabel18.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 167.5834F);
             this.xrLabel18.Name = "xrLabel18";
             this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -447,7 +450,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel15
             // 
-            this.xrLabel15.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 131.5834F);
             this.xrLabel15.Name = "xrLabel15";
             this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -457,7 +460,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel14
             // 
-            this.xrLabel14.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.5834F);
             this.xrLabel14.Name = "xrLabel14";
             this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -467,7 +470,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel13
             // 
-            this.xrLabel13.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 95.58337F);
             this.xrLabel13.Name = "xrLabel13";
             this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -477,7 +480,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel12
             // 
-            this.xrLabel12.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 77.58337F);
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -487,7 +490,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel1
             // 
-            this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))));
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel1.Multiline = true;
             this.xrLabel1.Name = "xrLabel1";
@@ -521,7 +524,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
+            this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
             this.topMarginBand1.HeightF = 90F;
             this.topMarginBand1.Name = "topMarginBand1";
             this.topMarginBand1.StylePriority.UseFont = false;
@@ -534,6 +537,9 @@ namespace BeWo.FlingernMobilReports
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox2,
+            this.xrLabel27,
+            this.xrPictureBox1,
             this.xrLabel20,
             this.xrLabel19,
             this.xrLabel16,
@@ -552,7 +558,7 @@ namespace BeWo.FlingernMobilReports
             this.xrLabel4,
             this.xrLabel3,
             this.xrLabel10});
-            this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.ReportFooter.HeightF = 317.8333F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
@@ -563,7 +569,7 @@ namespace BeWo.FlingernMobilReports
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")});
-            this.xrLabel20.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(450F, 76.75169F);
             this.xrLabel20.Multiline = true;
             this.xrLabel20.Name = "xrLabel20";
@@ -577,7 +583,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel19
             // 
-            this.xrLabel19.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(176.1251F, 76.75169F);
             this.xrLabel19.Multiline = true;
             this.xrLabel19.Name = "xrLabel19";
@@ -590,7 +596,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel16
             // 
-            this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel16.Name = "xrLabel16";
             this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -605,7 +612,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel17
             // 
-            this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00008F);
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -620,7 +628,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // lblFehlkontakt
             // 
-            this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00003F);
             this.lblFehlkontakt.Name = "lblFehlkontakt";
             this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -635,7 +644,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrRichText1
             // 
-            this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(464.2502F, 116.5555F);
             this.xrRichText1.Name = "xrRichText1";
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -644,7 +653,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrRichText2
             // 
-            this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
             this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(464.2502F, 166.5556F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -656,7 +665,7 @@ namespace BeWo.FlingernMobilReports
             this.lblHatGruppen.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblHatGruppen.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(424.9166F, 116.5555F);
             this.lblHatGruppen.Name = "lblHatGruppen";
             this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -673,7 +682,7 @@ namespace BeWo.FlingernMobilReports
             this.lblHatAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblHatAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
             this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(424.9166F, 166.5556F);
             this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten";
             this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -691,7 +700,8 @@ namespace BeWo.FlingernMobilReports
             this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(172.1252F, 116.5555F);
             this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
             this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -719,7 +729,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell16
             // 
-            this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell16.Name = "xrTableCell16";
             this.xrTableCell16.StylePriority.UseBorders = false;
             this.xrTableCell16.StylePriority.UseFont = false;
@@ -731,7 +742,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell17
             // 
-            this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell17.Name = "xrTableCell17";
             this.xrTableCell17.StylePriority.UseBorders = false;
             this.xrTableCell17.StylePriority.UseFont = false;
@@ -743,7 +755,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell18
             // 
-            this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell18.Name = "xrTableCell18";
             this.xrTableCell18.StylePriority.UseBorders = false;
             this.xrTableCell18.StylePriority.UseFont = false;
@@ -764,7 +777,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell19
             // 
-            this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell19.Name = "xrTableCell19";
             this.xrTableCell19.StylePriority.UseFont = false;
             this.xrTableCell19.StylePriority.UseTextAlignment = false;
@@ -773,7 +787,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell20
             // 
-            this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.StylePriority.UseFont = false;
             this.xrTableCell20.StylePriority.UseTextAlignment = false;
@@ -782,7 +797,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell21
             // 
-            this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell21.Name = "xrTableCell21";
             this.xrTableCell21.StylePriority.UseFont = false;
             this.xrTableCell21.StylePriority.UseTextAlignment = false;
@@ -800,7 +816,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell22
             // 
-            this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.StylePriority.UseFont = false;
             this.xrTableCell22.StylePriority.UseTextAlignment = false;
@@ -809,7 +826,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell23
             // 
-            this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell23.Name = "xrTableCell23";
             this.xrTableCell23.StylePriority.UseFont = false;
             this.xrTableCell23.StylePriority.UseTextAlignment = false;
@@ -818,7 +836,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell24
             // 
-            this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell24.Name = "xrTableCell24";
             this.xrTableCell24.StylePriority.UseFont = false;
             this.xrTableCell24.StylePriority.UseTextAlignment = false;
@@ -836,7 +855,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell25
             // 
-            this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell25.Name = "xrTableCell25";
             this.xrTableCell25.StylePriority.UseFont = false;
             this.xrTableCell25.StylePriority.UseTextAlignment = false;
@@ -845,7 +865,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell26
             // 
-            this.xrTableCell26.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell26.Name = "xrTableCell26";
             this.xrTableCell26.StylePriority.UseFont = false;
             this.xrTableCell26.StylePriority.UseTextAlignment = false;
@@ -854,7 +875,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell27
             // 
-            this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell27.Name = "xrTableCell27";
             this.xrTableCell27.StylePriority.UseFont = false;
             this.xrTableCell27.StylePriority.UseTextAlignment = false;
@@ -872,7 +894,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell29
             // 
-            this.xrTableCell29.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell29.Name = "xrTableCell29";
             this.xrTableCell29.StylePriority.UseFont = false;
             this.xrTableCell29.StylePriority.UseTextAlignment = false;
@@ -881,7 +904,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell30
             // 
-            this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell30.Name = "xrTableCell30";
             this.xrTableCell30.StylePriority.UseFont = false;
             this.xrTableCell30.StylePriority.UseTextAlignment = false;
@@ -890,7 +914,8 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrTableCell31
             // 
-            this.xrTableCell31.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
             this.xrTableCell31.Name = "xrTableCell31";
             this.xrTableCell31.StylePriority.UseFont = false;
             this.xrTableCell31.StylePriority.UseTextAlignment = false;
@@ -903,7 +928,7 @@ namespace BeWo.FlingernMobilReports
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel11.BorderWidth = 2F;
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(450F, 40.00003F);
             this.xrLabel11.Name = "xrLabel11";
             this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
@@ -918,7 +943,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel8
             // 
-            this.xrLabel8.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(176.1251F, 40.00003F);
             this.xrLabel8.Multiline = true;
             this.xrLabel8.Name = "xrLabel8";
@@ -968,7 +993,7 @@ namespace BeWo.FlingernMobilReports
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel4.BorderWidth = 2F;
-            this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(450F, 0F);
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
@@ -983,7 +1008,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel3
             // 
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(176.1251F, 0F);
             this.xrLabel3.Multiline = true;
             this.xrLabel3.Name = "xrLabel3";
@@ -996,7 +1021,7 @@ namespace BeWo.FlingernMobilReports
             // 
             // xrLabel10
             // 
-            this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
             this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.5555F);
             this.xrLabel10.Multiline = true;
             this.xrLabel10.Name = "xrLabel10";
@@ -1036,6 +1061,38 @@ namespace BeWo.FlingernMobilReports
             this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldGruppe.Name = "fieldGruppe";
             // 
+            // xrPictureBox2
+            // 
+            this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")});
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(444.8053F, 250.7916F);
+            this.xrPictureBox2.Name = "xrPictureBox2";
+            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
+            this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // xrLabel27
+            // 
+            this.xrLabel27.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(1.999919F, 250.7916F);
+            this.xrLabel27.Name = "xrLabel27";
+            this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel27.SizeF = new System.Drawing.SizeF(115.0001F, 35.50002F);
+            this.xrLabel27.StylePriority.UseBackColor = false;
+            this.xrLabel27.StylePriority.UseTextAlignment = false;
+            this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")});
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(176.1251F, 250.7916F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // Stundenzettel
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1056,12 +1113,12 @@ namespace BeWo.FlingernMobilReports
             this.formattingRuleServiceDesc,
             this.formattingRuleCostBearer,
             this.formattingRuleEmployeeName});
-            this.Margins = new System.Drawing.Printing.Margins(75, 50, 90, 30);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 50F, 90F, 30F);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.SnapGridSize = 9F;
-            this.Version = "17.1";
+            this.Version = "23.2";
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -1155,5 +1212,8 @@ namespace BeWo.FlingernMobilReports
         private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt;
         private DevExpress.XtraReports.UI.XRLabel xrLabel20;
         private DevExpress.XtraReports.UI.XRLabel xrLabel19;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel27;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
     }
 }

ReportImp/FlingernMobilReports/ServicesOverviewReport.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 17</value>
-  </metadata>
   <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
   </data>

ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs

@@ -92,7 +92,7 @@ namespace HausDuelken
                             {
                                 arbeitszeit += duration;
                             }
-                            else if (item.ServiceDescription.ServiceCategory.IsBillable || item.ServiceDescription.ServiceCategory.Abbreviation.ToLower() == "lt24")
+                            else if (item.ServiceDescription.ServiceCategory.IsBillable || (item.ServiceDescription.ServiceCategory.Abbreviation != null && item.ServiceDescription.ServiceCategory.Abbreviation.ToLower() == "lt24"))
                             {
                                 flsGesamt += duration;
                             }
@@ -129,7 +129,11 @@ namespace HausDuelken
                 decimal totalDuration = 0;
                 decimal duration = 0;
                 String cat = item.ServiceDescription.ServiceCategory.Name.ToLower();
-                String kurz = item.ServiceDescription.ServiceCategory.Abbreviation.ToLower();
+                String kurz = "";
+                if (item.ServiceDescription.ServiceCategory.Abbreviation != null)
+                {
+                    kurz = item.ServiceDescription.ServiceCategory.Abbreviation.ToLower();
+                }
 
                 if (item.GroupRoundedDuration.HasValue)
                 {

ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj

@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

ReportImp/IntegraHeinsbergReports/IntegraHeinsbergReports.csproj

@@ -41,7 +41,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

ReportImp/KoelnRingReports/KoelnRingReports.csproj

@@ -41,7 +41,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

ReportImp/LebenshilfeBadKreuznach/Quittierungsbeleg.cs

@@ -77,7 +77,50 @@ namespace LebenshilfeBadKreuznach
             lblGruppe.Text = String.Format("{0:0.00}", gruppe);
 
             ErstelleAbwesenheitenTabelle(pRO);
-                        
+
+
+            //Einmal getätigte Unterschriften sollen nicht verfallen, auch wenn es anschließend Ergänzungen gab
+            var serviceRecordOids = pRO.Services.Select(service => service.ServiceRecordOid).ToList();
+            if (serviceRecordOids.Count > 0 && (pRO.EmployeeSignature == null || pRO.CustomerSignature == null))
+            {
+                var sql = @"
+select distinct crs.SignatureImage, crs.SignatureType, crs.InsTs from 
+confirmationreceiptsignature crs
+inner join confirmationreceiptsignature2servicerecord c2s on c2s.ConfirmationReceiptSignatureOid = crs.Oid
+where c2s.ServiceRecordOid in (:LISTE)
+order by crs.oid desc
+";
+                sql = sql.Replace(":LISTE", String.Join(",", serviceRecordOids));
+                var sqlResult = DAOFactory.SearchDAO.GetSqlResult(sql);
+
+                foreach (object[] item in sqlResult)
+                {
+                    var sig = item[0] as String;
+                    var t = (sbyte)item[1];
+                    var dt = (DateTime)item[2];
+
+                    if (t == 0)
+                    {
+                        if (pRO.EmployeeSignature == null)
+                        {
+                            pRO.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
+                            pRO.EmployeeSignatureDate = dt;
+                        }
+                    }
+                    else if (t == 1)
+                    {
+                        if (pRO.CustomerSignature == null)
+                        {
+                            pRO.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
+                            pRO.CustomerSignatureDate = dt;
+                        }
+                    }
+                }
+                
+            }
+            
+
+
             bindingSource1.DataSource = pRO;
         }