.

.gitignore

@@ -544,3 +544,11 @@
 /ReportImp/DiakonischesWerkPassau/obj/Debug
 /ReportImp/BeWoRimbach/obj/Debug
 /ReportImp/Wichernhaus/obj
+/ReportImp/FAMRheinSiegGbr/obj/Release
+/ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Release
+/ReportImp/DiakonischesWerkPassau/obj/Release
+/ReportImp/DiakonischesWerkRegensburg/obj/Debug
+/ReportImp/DiakonischesWerkRegensburg/obj/Release
+/ReportImp/CarlSonnenscheinHaus/obj/Debug
+/ReportImp/CarlSonnenscheinHaus/obj/Release
+/ReportImp/SozialwerkAachenerChristen/obj/Release

BeWo.sln

@@ -485,6 +485,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoRimbach", "ReportImp\Be
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasGuenzburgNeuUlm", "ReportImp\CaritasGuenzburgNeuUlm\CaritasGuenzburgNeuUlm.csproj", "{2C075472-0BEE-46CA-A996-7E0FB2B1A717}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuwoWesel", "ReportImp\BetreuwoWesel\BetreuwoWesel.csproj", "{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -3752,6 +3754,22 @@ Global
 		{2C075472-0BEE-46CA-A996-7E0FB2B1A717}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2C075472-0BEE-46CA-A996-7E0FB2B1A717}.Release|x86.ActiveCfg = Release|Any CPU
 		{2C075472-0BEE-46CA-A996-7E0FB2B1A717}.Release|x86.Build.0 = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|.NET.Build.0 = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|.NET.ActiveCfg = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|.NET.Build.0 = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3990,6 +4008,7 @@ Global
 		{FA8D88C5-5D07-4AD6-96D2-0B3CB3FAE2F6} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{74A81A4F-DEDD-47EE-8023-E331F5552C46} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{2C075472-0BEE-46CA-A996-7E0FB2B1A717} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

BeWo/BeWo.csproj

@@ -89,6 +89,10 @@
     <ManifestTimestampUrl>
     </ManifestTimestampUrl>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Blacklight.Wpf.Controls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -312,6 +316,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Detail\UrlaubskontoView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\OwnChatSettingsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1040,6 +1048,9 @@
     <Compile Include="View\Detail\DebugMessageLogView.xaml.cs">
       <DependentUpon>DebugMessageLogView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\UrlaubskontoView.xaml.cs">
+      <DependentUpon>UrlaubskontoView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\OwnChatSettingsView.xaml.cs">
       <DependentUpon>OwnChatSettingsView.xaml</DependentUpon>
     </Compile>

BeWo/Core/BeWoUtils.cs

@@ -129,7 +129,7 @@ namespace BeWo.Core
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                     GroupBoxContent = control,
                     Owner = BeWoApp.CurrentBeWo.MainWindow,
-                    rootGroupBox = { Header = "Layout speichern" }
+                    rootGroupBox = { Header = "Bericht auswählen" }
                 };
 
                 control.CancelButtonClicked += () => beWoWindow.Close();

BeWo/View/Controls/DPCtrlDay.cs

@@ -4,6 +4,7 @@ using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -32,15 +33,17 @@ namespace BeWo.View.Controls
 
                     if (c != null && info != null)
                     {
-                        if(info.StatusInformation == null)
+                        if (info.StatusInformation == null)
                         {
                             var dc = info.DienstInfoDC;
 
                             var right = info.DayOfWeek == DayOfWeek.Sunday || info.IsLastColumn;
                             var bottom = info.IsLastRow;
 
-                            c.Border = new Thickness(0, 0, Convert.ToDouble(right), Convert.ToDouble(bottom));
+                            c.Path_Notice.Visibility = info.MarkierungBenoetigt ? Visibility.Visible : Visibility.Collapsed;
 
+                            c.Border = new Thickness(0, 0, Convert.ToDouble(right), Convert.ToDouble(bottom));
+                        
                             if (!info.IsInContractRange)
                             {
                                 c.Background = Brushes.Gray;
@@ -48,11 +51,27 @@ namespace BeWo.View.Controls
                                 c.Text = string.Empty;
                                 c.ToolTip = "Kein gültiger Arbeitsvertrag";
                             }
-                            else if (info.Reason != null && !info.IsFeiertag /*&& info.DayOfWeek != DayOfWeek.Saturday && info.DayOfWeek != DayOfWeek.Sunday*/)
+                            else if (info.AbsenceTime != null && info.Feiertag == null)
                             {
+                                string additionToTooltip = "";
+                                var start = info.AbsenceTime.Start.Value;
+                                var end = info.AbsenceTime.End.Value;
+                                var startArray = start.ToString().Split(' ');
+                                var endArray = end.ToString().Split(' ');
+
+                                if (start.Date == end.Date)
+                                {
+                                    if (start.TimeOfDay == end.TimeOfDay)
+                                        additionToTooltip = " (ganzer Tag)";
+                                    else
+                                        additionToTooltip = " (halber Tag)";
+                                }
+                                else
+                                    additionToTooltip = string.Format(" ({0} - {1})", startArray[0], endArray[0]); 
+
                                 c.Foreground = Brushes.Red;
-                                c.Text = $"{info.Reason.Description[0]}";
-                                c.ToolTip = $"{info.Reason.Description}";
+                                c.Text = $"{info.AbsenceTime.Reason.Description[0]}";
+                                c.ToolTip = $"{info.AbsenceTime.Reason.Description}" + additionToTooltip;
 
                                 if (info.DayOfWeek == DayOfWeek.Saturday || info.DayOfWeek == DayOfWeek.Sunday)
                                     c.Background = new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF"));
@@ -60,14 +79,19 @@ namespace BeWo.View.Controls
                                     c.Background = Brushes.White;
 
                             }
-                            else if (dc != null)
+                            else if (info.OverTime != null)
                             {
-                                var bg = string.IsNullOrEmpty(dc.Farbe) ? Brushes.White : (SolidColorBrush)new BrushConverter().ConvertFrom(dc.Farbe);
-                                var grey = 0.2989 * bg.Color.R + 0.5870 * bg.Color.G + 0.1140 * bg.Color.B;
+                                c.Foreground = Brushes.Red;
+                                c.Text = "ÜS";
+                                c.ToolTip = (dc == null) ? string.Format("Überstunden:\t{0:0.00}\nAuszahlung:\t{1}\nBemerkung:\t{2}", 
+                                    info.OverTime.Betrag, info.OverTime.Auszahlungsart.Name, info.OverTime.Notice) : null;
 
-                                c.Background = bg;
-                                c.Foreground = grey < 70 ? Brushes.White : Brushes.Black;
-                                c.ToolTip = new DPCtrlDienstTooltip(dc, info.Bemerkung, info.Zeiten);
+                                if (info.DayOfWeek == DayOfWeek.Saturday || info.DayOfWeek == DayOfWeek.Sunday)
+                                    c.Background = new SolidColorBrush(ColorExtensions.FromHexString("EFEFEF"));
+                                else if (dc != null)
+                                    c.Background = (SolidColorBrush)new BrushConverter().ConvertFrom(dc.Farbe);
+                                else
+                                    c.Background = Brushes.White;
                             }
                             else
                             {
@@ -79,17 +103,22 @@ namespace BeWo.View.Controls
                             if (dc != null)
                             {
                                 c.Text = $"{dc.Kurz}";
-                                if (!info.Bemerkung.IsNullOrEmpty())
-                                {
-                                    bemerkungVorhanden = true;
-                                    c.Path_Notice.Visibility = Visibility.Visible;
-                                }
-                                else
+                                if (c.Path_Notice.Visibility == Visibility.Collapsed)
                                 {
                                     c.BorderThickness = new Thickness(0, 0, 0, 0);
                                     c.BorderBrush = Brushes.Transparent;
-                                    c.Path_Notice.Visibility = Visibility.Collapsed;
                                 }
+                                var bg = string.IsNullOrEmpty(dc.Farbe) ? Brushes.White : (SolidColorBrush)new BrushConverter().ConvertFrom(dc.Farbe);
+                                var grey = 0.2989 * bg.Color.R + 0.5870 * bg.Color.G + 0.1140 * bg.Color.B;
+
+                                c.Background = bg;
+                                if (info.OverTime == null && info.AbsenceTime == null)
+                                    c.Foreground = grey < 70 ? Brushes.White : Brushes.Black;
+                                else
+                                    c.Foreground = Brushes.Red;
+
+
+                                c.ToolTip = new DPCtrlDienstTooltip(dc, info.Bemerkung, info.Zeiten, info.OverTime, info.AbsenceTime);
                             }
                             else
                             {
@@ -128,10 +157,10 @@ namespace BeWo.View.Controls
                             }
                         }
 
-                        if (info.IsFeiertag)
+                        if (info.Feiertag != null)
                         {
                             c.Background = Brushes.LightPink;
-                            c.ToolTip = "Gesetzl. Feiertag";
+                            c.ToolTip = info.Feiertag.Name + " (gesetzl. Feiertag)";
                         }
                     }
                 }));
@@ -186,7 +215,8 @@ namespace BeWo.View.Controls
     public class DPCtrlDayInformation
     {
         public DienstInfoDC DienstInfoDC { get; set; }
-        public AbsenceReasonDC Reason { get; set; }
+        public AbsenceTimeDC AbsenceTime { get; set; }
+        public OvertimeDC OverTime { get; set; }
         public bool IsInContractRange { get; set; }
         public bool IsLastRow { get; set; }
         public bool IsLastColumn { get; set; }
@@ -194,8 +224,8 @@ namespace BeWo.View.Controls
         public StatusInformation StatusInformation { get; set; }
         public string Bemerkung { get; set; }
         public string[] Zeiten { get; set; }
-        public bool IsFeiertag { get; set; }
-       
+        public FeiertagDC Feiertag { get; set; }
+        public bool MarkierungBenoetigt { get; set; }
     }
 
     public class StatusInformation

BeWo/View/Controls/DPCtrlDienstTooltip.xaml

@@ -13,13 +13,20 @@
       <RowDefinition Height="Auto" />
       <RowDefinition Height="Auto" />
       <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
     </Grid.RowDefinitions>
     <TextBlock Grid.Row="0" Grid.Column="0" Text="Dienst:"/>
     <TextBlock Grid.Row="2" Grid.Column="0" Text="Start:"/>
-    <TextBlock Grid.Row="4" Grid.Column="0" Text="Pausendauer:"/>
     <TextBlock Grid.Row="3" Grid.Column="0" Text="Ende:"/>
-      
-    <TextBlock Grid.Row="6" Grid.Column="0" Text="Bemerkung:"/> 
+    <TextBlock Grid.Row="4" Grid.Column="0" Text="Pausendauer:"/>
+    <TextBlock Grid.Row="6" Grid.Column="0" Text="Bemerkung:"/>
+    <TextBlock x:Name="lblUeberstunden" Grid.Row="8" Grid.Column="0" Text="Überstunden:" Visibility="Collapsed" />
+    <TextBlock x:Name="lblAuszahlungsart" Grid.Row="9" Grid.Column="0" Text="Auszahlung:" Visibility="Collapsed" />
+    <TextBlock x:Name="lblUrlaub" Grid.Row="11" Grid.Column="0" Text="Urlaub:" Visibility="Collapsed" />
 
     <Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"/>
     
@@ -28,10 +35,15 @@
     <TextBlock Grid.Row="4" Grid.Column="2" x:Name="TxtPausendauer"/>
     <TextBlock Grid.Row="3" Grid.Column="2" x:Name="TxtEnde"/>
     <TextBlock Grid.Row="6" Grid.Column="2" x:Name="TxtBemerkung" MaxWidth="275" TextWrapping="Wrap"/>
+    <TextBlock Grid.Row="8" Grid.Column="2" x:Name="TxtUeberstunden" Visibility="Collapsed" />
+    <TextBlock Grid.Row="9" Grid.Column="2" x:Name="TxtAuszahlungsart" Visibility="Collapsed" />
+    <TextBlock Grid.Row="11" Grid.Column="2" x:Name="TxtUrlaub" Visibility="Collapsed" />
      
-    <Separator Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3"/> 
-     
-      
-      
-  </Grid>
+    <Separator Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3"/>
+
+    <Separator x:Name="sepUeberstunden"  Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" Visibility="Collapsed"/>
+    <Separator x:Name="sepUrlaub"  Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="3" Visibility="Collapsed"/>
+
+
+    </Grid>
 </UserControl>

BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs

@@ -16,7 +16,7 @@ namespace BeWo.View.Controls
     /// </summary>
     public partial class DPCtrlDienstTooltip : UserControl
     {
-        public DPCtrlDienstTooltip(DienstInfoDC dienst, string bemerkung, string[] zeiten)
+        public DPCtrlDienstTooltip(DienstInfoDC dienst, string bemerkung, string[] zeiten, OvertimeDC overtime, AbsenceTimeDC absence)
         {
             InitializeComponent();
 
@@ -27,6 +27,42 @@ namespace BeWo.View.Controls
             TxtStart.Text = zeiten[0];
             TxtStart.Foreground = dienst.Start.ToString("HH:mm").Equals(zeiten[0]) ? TxtDienst.Foreground : Brushes.CornflowerBlue;  
             TxtBemerkung.Text = bemerkung;
+            
+            if (overtime != null)
+            {
+                TxtUeberstunden.Text = string.Format("{0:0.00}", overtime.Betrag);
+                TxtAuszahlungsart.Text = overtime.Auszahlungsart.Name;
+
+                TxtUeberstunden.Visibility = Visibility.Visible;
+                TxtAuszahlungsart.Visibility = Visibility.Visible;
+                lblUeberstunden.Visibility = Visibility.Visible;
+                lblAuszahlungsart.Visibility = Visibility.Visible;
+                sepUeberstunden.Visibility = Visibility.Visible;
+            }
+            if (absence != null)
+            {
+                string tooltipString = "";
+                var start = absence.Start.Value;
+                var end = absence.End.Value;
+                var startArray = start.ToString().Split(' ');
+                var endArray = end.ToString().Split(' ');
+
+                if (start.Date == end.Date)
+                {
+                    if (start.TimeOfDay == end.TimeOfDay)
+                        tooltipString = "ganzer Tag";
+                    else
+                        tooltipString = "halber Tag";
+                }
+                else
+                    tooltipString = string.Format("{0} - {1}", startArray[0], endArray[0]);
+
+                TxtUrlaub.Text = tooltipString;
+
+                lblUrlaub.Visibility = Visibility.Visible;
+                TxtUrlaub.Visibility = Visibility.Visible;
+                sepUrlaub.Visibility = Visibility.Visible;
+            }
         }
     }
 }

BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs

@@ -54,7 +54,7 @@ namespace BeWo.View.Controls
 
                              if(information.Row == 0 && !information.Statuszeile)
                              {
-                                 ctrl.Text = string.Format("{0:0}", information.SummeTage);
+                                 ctrl.Text = string.Format("{0:0.00}", information.SummeTage);
                                  ctrl.ToolTip = "Abwesenheiten an Wochenend- und Feiertagen werden nicht mitgezählt.";
                              }
                          }

BeWo/View/Controls/DienstplanerControl.xaml

@@ -1,15 +1,26 @@
 <UserControl x:Class="BeWo.View.Controls.DienstplanerControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
         <Border x:Name="boLight" IsHitTestVisible="True" Background="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" BorderThickness="0 0 1 1" BorderBrush="#FFBFBFBF" />
-        <Border x:Name="bo" IsHitTestVisible="True" Background="Transparent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" BorderThickness="0 0 0 0" BorderBrush="#FF000000" />
+        <Border x:Name="bo" IsHitTestVisible="True" Background="Transparent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" BorderThickness="0 0 0 0" BorderBrush="#FF000000" >
+            <Rectangle x:Name="Path_Notice" Visibility="Collapsed" Fill="Black" Margin="15,-50,-8,-15" RenderTransformOrigin="0.5,0.5">
+                <Rectangle.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform/>
+                        <RotateTransform Angle="-45"/>
+                        <TranslateTransform/>
+                    </TransformGroup>
+                </Rectangle.RenderTransform>
+            </Rectangle>
+        </Border>
         <TextBlock Name="txt" FontSize="15" Margin="3" HorizontalAlignment="Center" VerticalAlignment="Center" />
-        <Path
+        <!--<Path
             x:Name="Path_Notice"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Fill="DarkOrange"
+            Fill="Black"
             Data="M 22,1 L 27,1 L 27,5" Margin="21.031,0,0.804,20.416" Stretch="Fill" Width="6" Height="6"
             Visibility="Collapsed"
-		/>
+		/>-->
     </Grid>
 </UserControl>

BeWo/View/Controls/ListboxSelectControl.xaml

@@ -18,8 +18,9 @@
       <RowDefinition Height="*" />
       <RowDefinition Height="Auto" />
     </Grid.RowDefinitions>
-    <ListBox x:Name="Listbox" Grid.ColumnSpan="3" Margin="3, 3, 3, 0" SelectionMode="Single"/>
-    <Button x:Name="CancelButton" Grid.Row="1" Grid.Column="1" Content="Abbrechen" Margin="3" Click="CancelButton_Click"/>
-    <Button x:Name="SelectButton" Grid.Row="1" Grid.Column="2" Content="Auswählen" Margin="3" Click="SelectButton_Click"/>
+    <ListBox x:Name="Listbox" Grid.ColumnSpan="3" Margin="3, 3, 3, 0" SelectionMode="Single" FontSize="14" MouseDoubleClick="Listbox_OnMouseDoubleClick"/>
+      <Button x:Name="SelectButton" Grid.Row="1" Grid.Column="1" Content=" Auswählen " Margin="3" Click="SelectButton_Click"/>
+    <Button x:Name="CancelButton" Grid.Row="1" Grid.Column="2" Content=" Abbrechen " Margin="3" Click="CancelButton_Click"/>
+    
   </Grid>
 </UserControl>

BeWo/View/Controls/ListboxSelectControl.xaml.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Web.UI.WebControls;
 using System.Windows;
 using System.Windows.Documents;
+using System.Windows.Input;
 using BeWo.Annotations;
 
 using BS.Shared;
@@ -42,5 +43,10 @@ namespace BeWo.View.Controls
         {
             SelectButtonClicked?.Invoke();
         }
+
+        private void Listbox_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            SelectButtonClicked?.Invoke();
+        }
     }
 }

BeWo/View/Detail/CustomerView.xaml

@@ -1836,6 +1836,6 @@
     <Popup Margin="10" x:Name="popup_personOrganisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
       <localSearchView:OrganisationSearchView x:Name="personOrganisationsearchview" />
     </Popup>
-    <Border x:Name="popup_content" />
+    <Border x:Name="popup_content" Margin="0,10,0,-10" />
   </Grid>
 </localView:BeWoView>

BeWo/View/Detail/CustomerView.xaml.cs

@@ -681,15 +681,17 @@ namespace BeWo.View.Detail
         {
             var gb = tabitem_diagnosis.Resources["gb_possible"] as GroupBox;
             var c = (gb.Content as Grid).FindFirstVisualChild<GridControl>();
+            var temp = c.ItemsSource;
 
             c.Width = grid_choosenDiagnosis.ActualWidth;
 
             c.FilterString = string.Empty;
             c.View.FocusedRowHandle = DataControlBase.AutoFilterRowHandle;
             (c.View as TableView).FocusedColumn = c.Columns[1];
-
+            temp = c.ItemsSource;
             // var t =  c.View.GetCellElementByRowHandleAndColumn(GridControl.AutoFilterRowHandle, c.Columns[1]);
             MainControl.ShowControlAsModalPopup(gb, HorizontalAlignment.Center, VerticalAlignment.Top);
+            temp = c.ItemsSource;
         }
 
         private void button_addDisability_Click(object sender, RoutedEventArgs e)

BeWo/View/Detail/DienstView.xaml

@@ -46,6 +46,7 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
@@ -67,6 +68,8 @@
                         </Style>
                     </ComboBox.ItemContainerStyle>
                 </ComboBox>
+                <ComboBox x:Name="_WohnheimeCombobox" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Column="5" Height="23" Margin="3" ItemsSource="{Binding Path=AllWohnheime, Mode=OneWay}" Width="200">
+                </ComboBox>
             </Grid>
             <!--Zweite Zeile-->
             <Grid Grid.Column="0" Grid.Row="1">
@@ -131,7 +134,19 @@
                         </dxg:GridColumn.DisplayTemplate>
                         <dxg:GridColumn.EditTemplate>
                             <ControlTemplate>
-                                <Button x:Name="Part_Editor" BorderThickness="0" Style="{x:Null}" Background="{Binding EditValue}" Foreground="{Binding EditValue}" Height="21" HorizontalAlignment="Stretch" Click="Part_Editor_Click"></Button>
+                                <Button x:Name="Part_Editor" BorderThickness="0" Style="{x:Null}" Background="{Binding EditValue}" Foreground="{Binding EditValue}" Height="21" HorizontalAlignment="Stretch" Click="Part_Editor_Click" />
+                            </ControlTemplate>
+                        </dxg:GridColumn.EditTemplate>
+                    </dxg:GridColumn>
+                    <dxg:GridColumn x:Name="_ColumnWohnheim" FieldName="Wohnheim" Header="Wohnheim" Width="100">
+                        <dxg:GridColumn.DisplayTemplate>
+                            <ControlTemplate>
+                                <Label Content="{Binding Value}" />
+                            </ControlTemplate>
+                        </dxg:GridColumn.DisplayTemplate>
+                        <dxg:GridColumn.EditTemplate>
+                            <ControlTemplate>
+                                <Button x:Name="Button_WohnheimPicker" BorderThickness="0" Style="{x:Null}" Height="21" HorizontalAlignment="Stretch" Click="Button_WohnheimPicker_Click" />
                             </ControlTemplate>
                         </dxg:GridColumn.EditTemplate>
                     </dxg:GridColumn>
@@ -155,6 +170,10 @@
                     </ListBox.ItemContainerStyle>
                 </ListBox>
             </Popup>
+            <Popup x:Name="_PopupWohnheimPicker" StaysOpen="false" Placement="MousePoint" Width="200">
+                <ComboBox x:Name="_Combobox_Wohnheimpicker" BorderThickness="0" Loaded="Listbox_Wohnheimpicker_Loaded" SelectionChanged="Combobox_Wohnheimpicker_SelectionChanged" Height="20"/>
+
+            </Popup>
         </Grid>
     </GroupBox>
 </localView:BeWoView>

BeWo/View/Detail/DienstView.xaml.cs

@@ -16,16 +16,20 @@ using DevExpress.Xpf.Editors.Settings;
 using DevExpress.Xpf.Grid;
 using System.Windows.Controls;
 using System.Windows.Media;
+using BS.Shared.DataContracts.Compact;
+using DevExpress.Xpf.Editors;
 
 namespace BeWo.View.Detail
 {
 	public partial class DienstView : BeWoView
 	{
         private DienstInfoListVM _ViewModel;
+        private List<CompactWohnheimDC> WohnheimListe;
 
         public DienstView(DienstInfoListVM listVM)
         {
             InitializeComponent();
+            WohnheimListe = ServiceFacade.DoCustomerServiceSync(x => x.GetAllActiveWohnheimeCompact());
             _FarbeComboBox.ItemTemplateSelector = new ComboBoxTemplateSelector(_FarbeComboBox);
             ViewModel = listVM;
         }
@@ -84,6 +88,9 @@ namespace BeWo.View.Detail
             {
                 if (ViewModel.NewVM.StartDT.Year != 2000)
                     ViewModel.NewVM.StartDT = new DateTime(2000, 1, 1, ViewModel.NewVM.StartDT.Hour, ViewModel.NewVM.StartDT.Minute, ViewModel.NewVM.StartDT.Second);
+                var wh = _WohnheimeCombobox.SelectedItem as CompactWohnheimDC;
+                if (wh.WohnheimOid != -1)
+                    ViewModel.NewVM.Wohnheim = ServiceFacade.DoCustomerServiceSync(s => s.LoadWohnheim(wh.WohnheimOid)); 
                 ViewModel.AddNewVMToList();
             }
         }
@@ -133,5 +140,73 @@ namespace BeWo.View.Detail
                 _PopupColorPicker.IsOpen = false;
             }
         }
+
+        private void Listbox_Wohnheimpicker_Loaded(object sender, RoutedEventArgs e)
+        {
+            ((ComboBox)sender).ItemsSource = ViewModel.AllWohnheime;
+
+        }
+
+        private void Button_WohnheimPicker_Click(object sender, RoutedEventArgs e)
+        {
+            var itemssource = _Combobox_Wohnheimpicker.ItemsSource as List<CompactWohnheimDC>;
+            _PopupWohnheimPicker.IsOpen = true;
+            _Combobox_Wohnheimpicker.IsDropDownOpen = true;
+
+            var dienst = GetSelectedDienst();
+            if (dienst != null)
+            {
+                foreach (var item in itemssource)
+                {
+                    if (dienst.Wohnheim != null)
+                    {
+                        if (item.WohnheimOid == dienst.Wohnheim.WohnheimOid.Value)
+                        {
+                            _Combobox_Wohnheimpicker.SelectedItem = item;
+                            break;
+                        }
+                    }
+                    else
+                        _Combobox_Wohnheimpicker.SelectedItem = null;
+                }
+            }
+            
+        }
+
+        private void Combobox_Wohnheimpicker_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var selection = _Combobox_Wohnheimpicker.SelectedItem as CompactWohnheimDC;
+            if (selection != null)
+            {
+                var vm = GetSelectedDienst();
+                if (vm != null)
+                {
+                    if (selection.WohnheimOid != -1)
+                    {
+                        var dc = ServiceFacade.DoCustomerServiceSync(s => s.LoadWohnheim(selection.WohnheimOid));
+                        vm.Wohnheim = dc;
+                    }
+                    else
+                        vm.Wohnheim = null;
+                }
+            }
+            
+            _PopupWohnheimPicker.IsOpen = false;
+        }
+        private DienstInfoVM GetSelectedDienst()
+        {
+            DienstInfoVM vm = null;
+
+            DataViewBase view = _GridControl.View;
+            RowData data = view.FocusedRowData;
+
+            if (data != null && data.RowHandle != null)
+            {
+                int rowHandle = data.RowHandle.Value;
+                vm = _GridControl.GetRow(rowHandle) as DienstInfoVM;
+            }
+
+            return vm;
+        }
     }
 }

BeWo/View/Detail/EmployeeView.xaml

@@ -77,7 +77,7 @@
                 </dxg:GridControl.View>
             </dxg:GridControl>
 
-            <dxg:GridControl x:Key="datagrid_leavedays" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" HorizontalAlignment="Stretch" >
+            <!--<dxg:GridControl x:Key="datagrid_leavedays" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" HorizontalAlignment="Stretch" >
                 <dxg:GridControl.Columns>
                     <dxg:GridColumn Header=""  FixedWidth="True" Width="24" ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
@@ -94,15 +94,13 @@
                         </dxg:GridColumn.CellToolTipTemplate>
                     </dxg:GridColumn>
                     <dxg:GridColumn FieldName="AnzahlTage" Header="Anzahl Tage" Width="100" EditSettings="{dxe:TextSettings DisplayFormat=f2, Mask=f2, MaskType=Numeric, HorizontalContentAlignment=Left}" AllowEditing="False" >
-                        <!--<dxg:GridColumn.CellStyle >
-                            
-                        </dxg:GridColumn.CellStyle>-->
+                       
                     </dxg:GridColumn>
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
                     <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" ShowHorizontalLines="False" ShowVerticalLines="False" />
                 </dxg:GridControl.View>
-            </dxg:GridControl>
+            </dxg:GridControl>-->
 
             <DataTemplate x:Key="DropDownItemTemplate">
                 <Border Height="20" MinWidth="20" Background="{Binding}" BorderThickness="1" CornerRadius="2" HorizontalAlignment="Stretch" BorderBrush="Black" />
@@ -670,8 +668,8 @@
                             </Grid>
                         </TabItem>
 
-                        <TabItem Header="Urlaubstage" Selector.Selected="LeaveDaysTabItem_Selected"  x:Name="LeaveDaysTabItem"> <!--Grid: datagrid_leavedays-->
-                            <GroupBox Grid.Column="0" x:Name="groupbox_giftLeaveDays" Grid.Row="1" Grid.ColumnSpan="2" Header="Urlaubstage schenken" Style="{StaticResource ObjectEditGroupBox}">
+                        <TabItem Header="Urlaubskonto" Selector.Selected="LeaveDaysTabItem_Selected"  x:Name="LeaveDaysTabItem"> <!--Grid: datagrid_leavedays-->
+                            <!--<GroupBox Grid.Column="0" x:Name="groupbox_giftLeaveDays" Grid.Row="1" Grid.ColumnSpan="2" Header="Urlaubskonto" Style="{StaticResource ObjectEditGroupBox}">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*" />
@@ -681,7 +679,7 @@
                                         <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
 
-                                    <dxe:ComboBoxEdit x:Name="_YearPicker" Height="25" Grid.Row="0" Width="100" Margin="0 5 0 5" HorizontalAlignment="Left" EditValueChanged="_YearPicker_EditValueChanged"/>
+                                    <dxe:ComboBoxEdit x:Name="_YearPicker" Height="25" PopupMaxHeight="150" Grid.Row="0" Width="100" Margin="0 5 0 5" HorizontalAlignment="Left" EditValueChanged="_YearPicker_EditValueChanged"/>
                                     <Button Grid.Column="0" Grid.Row="0" HorizontalAlignment="Right" Margin="0 5 0 5" Name="button_openLeaveDayDialogue" Click="button_openLeaveDayDialogue_Click" Style="{DynamicResource {x:Type Button}}" Content="Urlaubstag(e) schenken" Visibility="Collapsed"/>
                                     
                                     <controls:PopupNonTopmost Grid.Row="0" Grid.Column="0" Topmost="False" x:Name="popup_giftLeaveday" Width="350" StaysOpen="True" Placement="MousePoint">
@@ -717,10 +715,10 @@
                                             </GroupBox>
                                         </Border>
                                     </controls:PopupNonTopmost>
-                                    <!-- In WPFGridLeaveDays wird Urlaubskontodatagrid eingefügt -->
+                                    --><!-- In WPFGridLeaveDays wird Urlaubskontodatagrid eingefügt --><!--
                                     <Grid x:Name="WPFGridLeaveDays" Grid.Row="1" Grid.Column="0" Margin="0 10 0 0"/>
                                 </Grid>
-                            </GroupBox>
+                            </GroupBox>-->
                         </TabItem>
 
                         <TabItem Header="ownChat" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />

BeWo/View/Detail/Report/AbwesenheitsEditView.xaml

@@ -25,18 +25,21 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" MinHeight="100"/>
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <Label Grid.Column="0" Grid.Row="0" Content="Start:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-        <dxe:DateEdit x:Name="_DatePickerStartDate" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" AllowNullInput="False" />
+        <dxe:DateEdit x:Name="_DatePickerStartDate" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" AllowNullInput="False" EditValueChanged="_DatePickerStartDate_EditValueChanged"/>
         <Label Grid.Column="0" Grid.Row="1"  Content="Ende:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-        <dxe:DateEdit x:Name="_DatePickerEndDate" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" />
-        <Label Grid.Column="0" Grid.Row="2" Content="Kategorie:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-        <dxe:ComboBoxEdit x:Name="_ReasonPicker" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" DisplayMember="Description"/>
-        <Label Grid.Column="0" Grid.Row="3" Content="Bemerkung:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-        <TextBox x:Name="_NoticeTxt" Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="2" Margin="3"/>
+        <dxe:DateEdit x:Name="_DatePickerEndDate" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" MaskType="DateTimeAdvancingCaret" HorizontalAlignment="Stretch" Margin="3" EditValueChanged="_DatePickerEndDate_EditValueChanged"/>
+        <Label Grid.Column="0" Grid.Row="2" Content="Halber Tag:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+        <CheckBox x:Name="_HalberTag" Grid.Column="2" Grid.Row="2" Margin="3 6 3 3" Checked="_HalberTag_Checked" Unchecked="_HalberTag_Unchecked"></CheckBox>
+        <Label Grid.Column="0" Grid.Row="3" Content="Kategorie:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+        <dxe:ComboBoxEdit x:Name="_ReasonPicker" Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="2" Margin="3" DisplayMember="Description"/>
+        <Label Grid.Column="0" Grid.Row="4" Content="Bemerkung:" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+        <TextBox x:Name="_NoticeTxt" Grid.Column="2" Grid.Row="4" Grid.ColumnSpan="2" Margin="3"/>
         <Button x:Name="_DeleteBtn" Visibility="Collapsed"  Grid.Column="0" Grid.Row="5" Content="Löschen" Margin="3" Click="DeleteBtn_Click" HorizontalAlignment="Left" />
         <Button x:Name="_SaveBtn" Grid.Column="2" Grid.Row="5" Content="Speichern" Margin="3, 3, 4, 3" HorizontalAlignment="Right" Click="SaveBtn_Click" MinWidth="80"/>
         <Button x:Name="_CancelBtn"  Grid.Column="3" Grid.Row="5" Content="Abbrechen" Margin="3" Click="CancelBtn_Click"/>

BeWo/View/Detail/Report/AbwesenheitsEditView.xaml.cs

@@ -44,6 +44,7 @@ namespace BeWo.View.Detail.Report
                 _DeleteBtn.Visibility = Visibility.Visible;
 
                 AbsenceTime = (AbsenceTimeDC)appointment.CustomFields[nameof(AbsenceTimeDC)];
+                
 
                 _ReasonPicker.SelectedItem = AbsenceTime.Reason;
                 _NoticeTxt.Text = AbsenceTime.Notice;
@@ -57,8 +58,16 @@ namespace BeWo.View.Detail.Report
                 _ReasonPicker.SelectedItem = reasons[0];
             }
 
+            _DatePickerStartDate.EditValue = AbsenceTime.Start.Value;
             _DatePickerStartDate.DateTime = AbsenceTime.Start.Value;
-            if (AbsenceTime.End.HasValue) _DatePickerEndDate.DateTime = AbsenceTime.End.Value;
+            if (AbsenceTime.End.HasValue)
+            {
+                _DatePickerEndDate.EditValue = AbsenceTime.End.Value;
+                _DatePickerEndDate.DateTime = AbsenceTime.End.Value;
+
+                if (_DatePickerStartDate.DateTime.Date == _DatePickerEndDate.DateTime.Date && _DatePickerStartDate.DateTime.TimeOfDay != _DatePickerEndDate.DateTime.TimeOfDay)
+                    _HalberTag.IsChecked = true;
+            }
         }
         
         private void CancelBtn_Click(object sender, RoutedEventArgs e)
@@ -130,5 +139,35 @@ namespace BeWo.View.Detail.Report
             Parent.UpdateUrlaubkonto(AbsenceTime.EmployeeOid.Value);
             Parent.UpdateScheduler();
         }
+
+        private void _DatePickerStartDate_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
+        {
+            _HalberTag.Visibility = _DatePickerStartDate.DateTime.Date == _DatePickerEndDate.DateTime.Date ? Visibility.Visible : Visibility.Collapsed;
+            if (_HalberTag.Visibility == Visibility.Collapsed)
+                _HalberTag.IsChecked = false;
+        }
+
+        private void _DatePickerEndDate_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
+        {
+            _HalberTag.Visibility = _DatePickerStartDate.DateTime.Date == _DatePickerEndDate.DateTime.Date ? Visibility.Visible : Visibility.Collapsed;
+            if (_HalberTag.Visibility == Visibility.Collapsed)
+                _HalberTag.IsChecked = false;
+        }
+
+        private void _HalberTag_Checked(object sender, RoutedEventArgs e)
+        {
+            _DatePickerStartDate.DateTime = new DateTime(_DatePickerStartDate.DateTime.Year, _DatePickerStartDate.DateTime.Month, _DatePickerStartDate.DateTime.Day,
+                                                        12, 0, 0);
+            _DatePickerEndDate.DateTime = new DateTime(_DatePickerEndDate.DateTime.Year, _DatePickerEndDate.DateTime.Month, _DatePickerEndDate.DateTime.Day,
+                                                        16, 30, 0);
+        }
+
+        private void _HalberTag_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _DatePickerStartDate.DateTime = new DateTime(_DatePickerStartDate.DateTime.Year, _DatePickerStartDate.DateTime.Month, _DatePickerStartDate.DateTime.Day,
+                                                        0, 0, 0);
+            _DatePickerEndDate.DateTime = new DateTime(_DatePickerEndDate.DateTime.Year, _DatePickerEndDate.DateTime.Month, _DatePickerEndDate.DateTime.Day,
+                                                        0, 0, 0);
+        }
     }
 }

BeWo/View/Detail/Report/AbwesenheitsEmployeeHeader.xaml.cs

@@ -61,9 +61,9 @@ namespace BeWo.View.Detail.Report
                                     krankheitstage.Add(tag);
                             }
 
-                            c._EmployeeUrlaubDieserMonat.Text = "Urlaub/Monat: " + dc.TageUrlaub+ " Tage";
-                            c._EmployeeKrankheitDieserMonat.Text = "Krankheit/Monat: " + dc.TageKrankheit + " Tage";
-                            ((AbwesenheitsEmployeeHeaderTooltip)c.ToolTip).Set(dc.Employee, Convert.ToInt32(dc.TageUrlaub), Convert.ToInt32(dc.TageKrankheit), dc.Month);
+                            c._EmployeeUrlaubDieserMonat.Text = "Urlaub/Monat: " + string.Format("{0:0.00}", dc.TageUrlaub) + " Tage";
+                            c._EmployeeKrankheitDieserMonat.Text = "Krankheit/Monat: " + string.Format("{0:0.00}", dc.TageKrankheit) + " Tage";
+                            ((AbwesenheitsEmployeeHeaderTooltip)c.ToolTip).Set(dc.Employee, dc.TageUrlaub, dc.TageKrankheit, dc.Month);
 
                         }
                     }

BeWo/View/Detail/Report/AbwesenheitsEmployeeHeaderTooltip.xaml.cs

@@ -24,7 +24,7 @@ namespace BeWo.View.Detail.Report
             InitializeComponent();
         }
 
-        public void Set(EmployeeDC emp, int tageUrlaub, int tageKrankheit, int month)
+        public void Set(EmployeeDC emp, decimal tageUrlaub, decimal tageKrankheit, int month)
         {
             var konto = emp.Urlaubskonto;
 

BeWo/View/Detail/Report/AbwesenheitsView.xaml.cs

@@ -1,5 +1,6 @@
 using BeWo.Core;
 using BeWo.ServiceProxy;
+using BeWo.ViewModel;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
@@ -310,6 +311,8 @@ namespace BeWo.View.Detail.Report
                         var appointment = _SchedulerStorage.CreateAppointment(AppointmentType.Normal);
 
                         SchedulerHelper.OverrideAppointmentWithAbsenceTime(appointment, absence); //Auskommentieren entfernt Einträge aus Planer
+                        appointment.Start = absence.Start.Value;
+                        appointment.End = absence.End.Value.Date == absence.Start.Value.Date ? absence.End.Value : absence.End.Value.AddDays(1);
 
                         _AppointmentStorage.Add(appointment);
                     }
@@ -372,19 +375,20 @@ namespace BeWo.View.Detail.Report
             bool urlaubVerfallen = info.Month >= urlaubskonto.UrlaubsVerfallsdatum.Month ? true : false;
 
             string xamlstring = ServiceFacade.DoOperationsServiceSync(s => s.GetInformationStringForUrlaubsplaner(urlaubskonto, info.TageUrlaub, info.TageKrankheit, urlaubVerfallen));
-            var control = new InformationView();
-            control.SetXaml(xamlstring);
+            var control = new UrlaubskontoView(info.Employee);
+            //var control = new InformationView();
+            //control.SetXaml(xamlstring);
 
             var beWoWindow = new BeWoWindow();
 
-            control.ButtonCloseClicked += () => beWoWindow.Close();
+            //control.ButtonCloseClicked += () => beWoWindow.Close();
 
-            beWoWindow.Height = 100;
-            beWoWindow.Width = 400;
+            beWoWindow.Height = 500;
+            beWoWindow.Width = 1000;
             beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             beWoWindow.GroupBoxContent = control;
             beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
-            beWoWindow.rootGroupBox.Header = "Infos zu " + info.Employee.LastNameFirstName;
+            beWoWindow.rootGroupBox.Header = "Urlaubskonto von " + info.Employee.LastNameFirstName;
             beWoWindow.ShowDialog();
         }
 
@@ -409,8 +413,14 @@ namespace BeWo.View.Detail.Report
                     if (spanne.End == null)
                         spanne.End = new DateTime(info.Year, info.Month, DateTime.DaysInMonth(info.Year, info.Month));
                     // Nur ein Tag
-                    if (spanne.Start == spanne.End)
-                        tageUrlaub++;
+                    if (spanne.Start.Value.Date == spanne.End.Value.Date)
+                    {
+                        if (spanne.Start.Value.TimeOfDay != spanne.End.Value.TimeOfDay)
+                            tageUrlaub += 0.5m;
+                        else
+                            tageUrlaub++;
+
+                    }
                     // Mehrere Tage
                     else
                     {

BeWo/View/Detail/Report/DienstplanerView.xaml

@@ -13,7 +13,7 @@
                     xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
                     x:Class="BeWo.View.Detail.Report.DienstplanerView"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch" Focusable="True" Loaded="BeWoView_Loaded">
+                    VerticalAlignment="Stretch" Focusable="True">
     <!--DienstplanerValue="{Binding Value}"-->
     <localView:BeWoView.Resources>
         <ControlTemplate x:Key="ctrlDay">
@@ -22,9 +22,6 @@
         <ControlTemplate x:Key="ctrlWeek">
             <controls:DPCtrlWeek Margin="0" Focusable="True" DPCtrlWeekInformation="{Binding Value}"/>
         </ControlTemplate>
-        <ControlTemplate x:Key="ctrlMonth">
-            <controls:DPCtrlMonth Margin="0" Focusable="True" DPCtrlMonthInformation="{Binding Value}"/>
-        </ControlTemplate>
         <ControlTemplate x:Key="ctrlEmp">
             <controls:DPCtrlEmployee Margin="0" Focusable="True" EmployeeInformation="{Binding Value}"/>
         </ControlTemplate>
@@ -88,6 +85,7 @@
 
                 <Button x:Name="_BtnAnzeigen" Grid.Column="5" Content="Anzeigen" MinWidth="100" Margin="10,3,3,3" Click="BtnAnzeigen_Click"/>
                 <WrapPanel Grid.Column="7" HorizontalAlignment="Right" Margin="10,3,3,3">
+                    <Button x:Name="button_mehrereDienste" Content="Mehrere Dienste anlegen" Margin=" 0 0 5 0" Click="button_mehrereDienste_Click"  Visibility="Collapsed"/>
                     <Button x:Name="button_neuerMitarbeiter" Content="Neuen Mitarbeiter einfügen" Margin=" 0 0 5 0" Click="button_neuerMitarbeiter_Click" Visibility="Collapsed"/>
                     <Button x:Name="_BtnRemoveAllDiensteForMonth" Content="Alle Schichten entfernen" Click="_BtnRemoveAllDiensteForMonth_Click" Visibility="Collapsed"/>
                 </WrapPanel>
@@ -112,6 +110,58 @@
                         </GroupBox>
                     </Border>
                 </controls:PopupNonTopmost>
+                <controls:PopupNonTopmost Topmost="False" x:Name="popUp_mehrereDienste"  Width="350" StaysOpen="False" Placement="MousePoint">
+                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
+                        <GroupBox x:Name="groupbox_popUp_mehereDienste" Header="Mehrere Dienste hinzufügen" Style="{StaticResource ObjectEditGroupBox}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="70" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="auto" />
+                                </Grid.ColumnDefinitions>
+                                <Label Grid.Column="0" Grid.Row="0" Margin="0 5 0 0" Content="Mitarbeiter" />
+                                <ComboBox x:Name="combobox_mehrereDienste_mitarbeiter" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0 5 0 0" />
+                                <ListBox x:Name="mehrereDienste_listbox_dienste" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" MaxHeight="250" Margin="5 10 0 10" 
+                                         SelectionChanged="mehrereDienste_listbox_dienste_SelectionChanged">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Tag="{Binding}">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                </Grid.ColumnDefinitions>
+                                                <controls:DPCtrlIcon IsHitTestVisible="False" Margin="3" Width="25" Height="25" Cursor="Hand" DienstValue="{Binding}" />
+                                                <TextBlock Margin="3 3 6 3" Cursor="Hand" Grid.Column="1" VerticalAlignment="Center" Text="{Binding DarstellungInPopUp}" />
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                                <WrapPanel FlowDirection="LeftToRight" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3">
+                                    <Label Content="Startzeit:"/>
+                                    <dxe:TextEdit x:Name="mehrereDienste_textbox_startzeit" Width="75" Margin="10 0 10 0"  MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d"/>
+                                    <Label Content="Endzeit:" />
+                                    <dxe:TextEdit x:Name="mehrereDienste_textbox_endzeit"  Width="75"  Margin="10 0 0 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d"/>
+                                </WrapPanel>
+                                <Calendar x:Name="_CalenderControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" SelectionMode="MultipleRange" 
+                                          HorizontalAlignment="Left" Margin="5 10 0 10" IsTodayHighlighted="False" />
+
+                                <Button x:Name="mehrereDienste_button_speichern" Content="Dienste erstellen" Grid.Column="2" Grid.Row="4" Click="mehrereDienste_button_speichern_Click"/>
+                            </Grid>
+                        </GroupBox>
+                    </Border>
+                </controls:PopupNonTopmost>
 
 
 

BeWo/View/Detail/UrlaubskontoView.xaml

@@ -0,0 +1,96 @@
+<localView:BeWoView x:Class="BeWo.View.Detail.UrlaubskontoView" 
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:localView="clr-namespace:BeWo.View"
+                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+                    xmlns:controls="clr-namespace:BeWo.View.Controls" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch" Focusable="True">
+
+
+    <Grid Background="{StaticResource ObjectEditBackgroundBrush}" x:Name="rootGrid">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <GroupBox Grid.Column="0" x:Name="groupbox_giftLeaveDays" Grid.Row="0" Grid.ColumnSpan="2" Header="Urlaubskonto" Style="{StaticResource ObjectEditGroupBox}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <dxe:ComboBoxEdit x:Name="_YearPicker" Height="25" PopupMaxHeight="150" Grid.Row="0" Width="100" Margin="0 5 0 5" HorizontalAlignment="Left" EditValueChanged="_YearPicker_EditValueChanged"/>
+                <Button Grid.Column="0" Grid.Row="0" HorizontalAlignment="Right" Margin="0 5 0 5" Name="button_openLeaveDayDialogue" Click="button_openLeaveDayDialogue_Click" Style="{DynamicResource {x:Type Button}}" Content="Urlaubstag(e) schenken" Visibility="Collapsed"/>
+
+                <controls:PopupNonTopmost Grid.Row="0" Grid.Column="0" Topmost="False" x:Name="popup_giftLeaveday" Width="350" StaysOpen="True" Placement="MousePoint">
+                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
+                        <GroupBox x:Name="groupbox_addLeaveday" Header="Urlaubstag(e) schenken" Style="{StaticResource ObjectEditGroupBox}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <Label Content="Tage" Grid.Row="0" Grid.Column="0" />
+                                <Label Content="Erläuterung" Grid.Row="1" Grid.Column="0" />
+                                <Label Content="Datum" Grid.Row="2" Grid.Column="0" />
+
+                                <dxe:SpinEdit x:Name="addLeaveDays_anzahlTage" Grid.Column="1" Grid.Row="0" Height="23" Margin="3" MaskType="Numeric" Mask="########0.00" MinValue="0.5" MaxValue="30" Value="1.00" Increment="0.5" />
+                                <TextBox x:Name="addLeaveDays_erlaeuterung" Grid.Column="1" Grid.Row="1" Height="23" Margin="3" />
+                                <dxe:DateEdit x:Name="addLeaveDays_datum" Grid.Column="1" Grid.Row="2" Height="23" Margin="3" MaskType="DateTime" Mask="dd.MM.yyyy" />
+                                <Label x:Name="addLeaveDays_datumswarnung" Content="Datum muss gesetzt werden!" Grid.Column="1" Grid.Row="3" Margin="0 0 3 3" Foreground="Red" />
+
+                                <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Right" Margin="0 10 0 0">
+                                    <Button Name="addLeaveDays_button_cancel" Click="button_cancel_Click"  Style="{DynamicResource {x:Type Button}}" Content="Abbrechen" />
+                                    <Button Margin="5,0,0,3" Name="addLeaveDays_button_addLeaveDay" Click="button_addLeaveDay_Click"  Style="{DynamicResource {x:Type Button}}" Content="Schenken" />
+                                </StackPanel>
+                            </Grid>
+                        </GroupBox>
+                    </Border>
+                </controls:PopupNonTopmost>
+                <!-- In WPFGridLeaveDays wird Urlaubskontodatagrid eingefügt -->
+                <Grid x:Name="WPFGridLeaveDays" Grid.Row="1" Grid.Column="0" Margin="0 10 0 0">
+                    <dxg:GridControl x:Name="_GridLeaveDays" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" HorizontalAlignment="Stretch" >
+                        <dxg:GridControl.Columns>
+                            <dxg:GridColumn Header=""  FixedWidth="True" Width="24" ReadOnly="True">
+                                <dxg:GridColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <Button x:Name="button_removeLeaveDay" Content="r" FontFamily="Webdings" Click="button_removeLeaveDay_Click"  Width="19" Height="19" VerticalAlignment="Center" Visibility="{Binding Path=Data.IsDeletable, Converter={StaticResource BoolVisibilityConverter}}"/>
+                                    </DataTemplate>
+                                </dxg:GridColumn.CellTemplate>
+                            </dxg:GridColumn>
+                            <dxg:GridColumn FieldName="Erlaeuterung" CellToolTipBinding="{Binding}" Header="Erläuterung" Width="50" AllowEditing="False">
+                                <dxg:GridColumn.CellToolTipTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Tooltip}" />
+                                    </DataTemplate>
+                                </dxg:GridColumn.CellToolTipTemplate>
+                            </dxg:GridColumn>
+                            <dxg:GridColumn FieldName="AnzahlTage" Header="Anzahl Tage" Width="100" EditSettings="{dxe:TextSettings DisplayFormat=f2, Mask=f2, MaskType=Numeric, HorizontalContentAlignment=Left}" AllowEditing="False" />
+
+                        </dxg:GridControl.Columns>
+                        <dxg:GridControl.View>
+                            <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" ShowHorizontalLines="False" ShowVerticalLines="False" />
+                        </dxg:GridControl.View>
+                    </dxg:GridControl>
+                </Grid>
+            </Grid>
+        </GroupBox>
+
+    </Grid>
+
+</localView:BeWoView>

BeWo/View/Detail/UrlaubskontoView.xaml.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+using BeWo.Controls;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.View.Search;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using BeWo.Core.Service;
+
+using BS.Shared;
+using BS.Shared.Extensions;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.ClientPartials;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Services;
+using BS.Shared.Translation;
+using DevExpress.Xpf.RichEdit;
+using SupportConceptService = BeWo.Core.Service.SupportConceptService;
+using System.Linq;
+using DevExpress.Xpf.Grid;
+using System.Windows.Media.Imaging;
+using DevExpress.Utils;
+using System.Windows.Markup;
+using DevExpress.Xpf.Editors;
+
+namespace BeWo.View.Detail
+{
+    public partial class UrlaubskontoView
+    {
+		public EmployeeDC DataContract { get; set; }
+
+        public UrlaubskontoView(EmployeeDC DataContract)
+        {
+			this.DataContract = DataContract;
+            InitializeComponent();
+			InitDateComboBox();
+
+		}
+
+		private void InitDateComboBox()
+		{
+			var year = new List<int>();
+			for (int i = DateTime.Today.Year + 1; i > DateTime.Today.Year - 20; i--)
+			{
+				year.Add(i);
+			}
+
+			_YearPicker.ItemsSource = year;
+			_YearPicker.SelectedItem = DateTime.Today.Year;
+		}
+		private void _YearPicker_EditValueChanged(object sender, EditValueChangedEventArgs e)
+		{
+			if (_GridLeaveDays == null)
+			{
+				_GridLeaveDays = rootGrid.Resources["datagrid_leavedays"] as GridControl;
+
+				WPFGridLeaveDays.Children.Add(_GridLeaveDays);
+			}
+
+			var urlaubskonto = ServiceFacade.DoEmployeeServiceSync(s => s.ErstelleUrlaubskontoDarstellung(DataContract, (int)_YearPicker.SelectedItem));
+
+			if (urlaubskonto == null)
+			{
+				urlaubskonto = new List<UrlaubskontoDarstellungDC>();
+				urlaubskonto.Add(new UrlaubskontoDarstellungDC()
+				{
+					Erlaeuterung = "Es existiert kein Vertrag für ausgewähltes Jahr",
+				});
+				button_openLeaveDayDialogue.Visibility = Visibility.Collapsed;
+			}
+			else
+				button_openLeaveDayDialogue.Visibility = Visibility.Visible;
+
+			_GridLeaveDays.ItemsSource = urlaubskonto;
+		}
+
+		private void button_addLeaveDay_Click(object sender, RoutedEventArgs e)
+		{
+			var anzahlTage = Convert.ToDecimal(addLeaveDays_anzahlTage.Value);
+			var erlaeuterung = addLeaveDays_erlaeuterung.Text;
+			var datum = addLeaveDays_datum.EditValue;
+			if (datum == null)
+			{
+				addLeaveDays_datumswarnung.Visibility = Visibility.Visible;
+				return;
+			}
+			else
+				addLeaveDays_datumswarnung.Visibility = Visibility.Collapsed;
+
+			GeschenkterUrlaubstagDC dc = new GeschenkterUrlaubstagDC()
+			{
+				AnzahlTage = anzahlTage,
+				Date = (DateTime)datum,
+				Employee = (long)DataContract.EmployeeOid,
+				GeschenkterUrlaubstagNotice = erlaeuterung
+			};
+			ServiceFacade.DoEmployeeServiceSync(s => s.InsertGeschenkterUrlaubstag(dc));
+
+			var urlaubskonto = ServiceFacade.DoEmployeeServiceSync(s => s.ErstelleUrlaubskontoDarstellung(DataContract, (int)_YearPicker.SelectedItem));
+
+			popup_giftLeaveday.IsOpen = false;
+
+			_GridLeaveDays.ItemsSource = urlaubskonto;
+
+		}
+		private void button_removeLeaveDay_Click(object sender, RoutedEventArgs e)
+		{
+			// Auf geschenkte Urlaubstage umprogrammieren
+			var dc = _GridLeaveDays.GetCurrentValue<UrlaubskontoDarstellungDC>();
+			var herkunftarray = dc.Herkunft.Split(':');
+			if (herkunftarray.Length == 2 && herkunftarray[0] == "GeschenkterUrlaubstagOid")
+			{
+				long oid = Convert.ToInt64(herkunftarray[1]);
+				ServiceFacade.DoEmployeeServiceSync(s => s.DeleteGeschenkterUrlaubstag(oid));
+
+				var urlaubskonto = ServiceFacade.DoEmployeeServiceSync(s => s.ErstelleUrlaubskontoDarstellung(DataContract, (int)_YearPicker.SelectedItem));
+
+				_GridLeaveDays.ItemsSource = urlaubskonto;
+			}
+		}
+
+		private void combobox_employmenttype_EditValueChanged(object sender, EditValueChangedEventArgs e)
+		{
+			//var contract = tabcontrol_contracts.SelectedItem as ContractVM;
+
+			//         if (contract.EmploymentType != null && contract.EmploymentType.LeaveDays != null)
+			//         {
+			//             contract.EmploymentTypeLeaveDaysVisibility = Visibility.Visible;
+			//             contract.LeaveDaysVisibility = Visibility.Collapsed;
+			//         }
+			//         else
+			//         {
+			//             contract.EmploymentTypeLeaveDaysVisibility = Visibility.Collapsed;
+			//             contract.LeaveDaysVisibility = Visibility.Visible;
+			//         }
+
+			//var index = tabcontrol_contracts.SelectedIndex;
+			//if(index == tabcontrol_contracts.Items.Count - 1)
+			//         {
+			//	Cache.GetInstance().ClearEmployees();
+			//	BeWoApp.MainControl.ResetView(UIContext.Employee);
+			//}
+			//else
+			//         {
+			//	tabcontrol_contracts.SelectedIndex = tabcontrol_contracts.Items.Count - 1;
+			//	tabcontrol_contracts.SelectedIndex = index;
+			//}
+		}
+
+		private void button_openLeaveDayDialogue_Click(object sender, RoutedEventArgs e)
+		{
+			popup_giftLeaveday.IsOpen = true;
+		}
+		private void button_cancel_Click(object sender, RoutedEventArgs e)
+		{
+			popup_giftLeaveday.IsOpen = false;
+			addLeaveDays_anzahlTage.EditValue = string.Format("{0:0.00}", 1.00);
+			addLeaveDays_erlaeuterung.Text = "";
+			addLeaveDays_datum.EditValue = null;
+		}
+	}
+}

BeWo/View/Detail/UrlaubstagSchenkenView.xaml

@@ -17,14 +17,18 @@
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
             <Label Grid.Column="0" Grid.Row="0" Margin="0 5 0 0" Content="Anzahl Tage:"/>
             <dxe:SpinEdit x:Name="spinEdit_AnzahlTage" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0" MinValue="0.5" MaxValue="35" Value="1" Margin="0 5 5 0" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Increment="0.5"/>
             <Label Grid.Column="0" Grid.Row="1" Margin="0 5 0 0" Content="Erläuterung:" />
             <dxe:TextEdit x:Name="textedit_erlaeuterung" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1" Margin="0 5 5 0"/>
-            <CheckBox x:Name="checkbox_FuerAlleMitarbeiter" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3" Margin="5 10 0 5" Content="Für alle Mitarbeiter" Checked="Checkbox_FuerAlleMitarbeiter_Checked" Unchecked="Checkbox_FuerAlleMitarbeiter_Unchecked" />
+            <Label Grid.Column="0" Grid.Row="2" Margin="0 5 0 0" Content="Datum:"/>
+            <dxe:DateEdit x:Name="addLeaveDays_datum" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Height="23" Margin="0 5 5 0" MaskType="DateTime" Mask="dd.MM.yyyy" />
+
+            <CheckBox x:Name="checkbox_FuerAlleMitarbeiter" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3" Margin="5 10 0 5" Content="Für alle Mitarbeiter" Checked="Checkbox_FuerAlleMitarbeiter_Checked" Unchecked="Checkbox_FuerAlleMitarbeiter_Unchecked" />
             
-            <dxg:GridControl x:Name="EmployeeSelectionGrid" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Margin="5" SelectionMode="MultipleRow">
+            <dxg:GridControl x:Name="EmployeeSelectionGrid" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="3" Margin="5" SelectionMode="MultipleRow">
                 <dxg:GridControl.Columns>
                     <dxg:GridColumn Header="Name des Mitarbeiters" FieldName="LastNameFirstName" Width="*" AllowEditing="False"/>
                 </dxg:GridControl.Columns>

BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs

@@ -77,7 +77,7 @@ namespace BeWo.View.Detail
                                 var urlaubstag = new GeschenkterUrlaubstagDC()
                                 {
                                     AnzahlTage = anzahlTage,
-                                    Date = DateTime.Now.Date,
+                                    Date = addLeaveDays_datum.DateTime,
                                     Employee = (long)oid,
                                     GeschenkterUrlaubstagNotice = textedit_erlaeuterung.Text
                                 };
@@ -105,7 +105,7 @@ namespace BeWo.View.Detail
                         var urlaubstag = new GeschenkterUrlaubstagDC()
                         {
                             AnzahlTage = anzahlTage,
-                            Date = DateTime.Now.Date,
+                            Date = addLeaveDays_datum.DateTime,
                             Employee = (long)oid,
                             GeschenkterUrlaubstagNotice = textedit_erlaeuterung.Text
                         };

BeWo/View/Detail/Urlaubsuebersicht.xaml.cs

@@ -80,7 +80,7 @@ namespace BeWo.View.Detail
                     Name = info.Employee.LastNameFirstName,
                     ResturlaubVorjahr = string.Format("{0:0.00}", info.Employee.Urlaubskonto.ResturlaubVorjahrTotal),
                     VerfallenerResturlaub = string.Format("{0:0.00}", info.Employee.Urlaubskonto.VerfallenerUrlaub),
-                    Urlaubsanspruch = string.Format("{0:0.00}", info.Employee.Urlaubskonto.Urlaubsanspruch),
+                    Urlaubsanspruch = string.Format("{0:0.00}", info.Employee.Urlaubskonto.Urlaubsanspruch - anzGeschenkteTage),
                     Resturlaub = string.Format("{0:0.00}", info.Employee.Urlaubskonto.Resturlaub),
                     TageKrankheit = string.Format("{0:0.00}", info.TageKrankheit),
                     TageUrlaub = string.Format("{0:0.00}", info.TageUrlaub),
@@ -96,6 +96,12 @@ namespace BeWo.View.Detail
             List<TableObject> tableObjects = new List<TableObject>();
             var absencetimes = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllEmployeeAbsenceTimesForYear(Information[0].Year)); // Prüfen, ob z.B. 27.12.2020 - 05.01.2021 drin wäre
 
+            List<long?> empOids = new List<long?>();
+            foreach (var info in information)
+                empOids.Add(info.Employee.EmployeeOid);
+
+            var dictUrlaub = ServiceFacade.DoEmployeeServiceSync(s => s.BerechneAnzEinerAbwesenheitFuerMehrereMitarbeiter(empOids, information[0].Year, "urlaub"));
+            var dictKrankheit = ServiceFacade.DoEmployeeServiceSync(s => s.BerechneAnzEinerAbwesenheitFuerMehrereMitarbeiter(empOids, information[0].Year, "krank"));
 
             foreach (var info in information)
             {
@@ -110,67 +116,14 @@ namespace BeWo.View.Detail
                     Name = info.Employee.LastNameFirstName,
                     ResturlaubVorjahr = string.Format("{0:0.00}", info.Employee.Urlaubskonto.ResturlaubVorjahrTotal),
                     VerfallenerResturlaub = string.Format("{0:0.00}", info.Employee.Urlaubskonto.VerfallenerUrlaub),
-                    Urlaubsanspruch = string.Format("{0:0.00}", info.Employee.Urlaubskonto.Urlaubsanspruch),
+                    Urlaubsanspruch = string.Format("{0:0.00}", info.Employee.Urlaubskonto.Urlaubsanspruch - anzGeschenkteTage),
                     Resturlaub = string.Format("{0:0.00}", info.Employee.Urlaubskonto.Resturlaub),
-                    TageKrankheit = "",
-                    TageUrlaub = "",
+                    TageKrankheit = string.Format("{0:0.00}", dictKrankheit.First(d => d.Key == info.Employee.EmployeeOid).Value),
+                    TageUrlaub = string.Format("{0:0.00}", dictUrlaub.First(d => d.Key == info.Employee.EmployeeOid).Value),
                     GeschenkteUrlaubstage = string.Format("{0:0.00}", anzGeschenkteTage)
                 };
 
                 //TageKrankheit und TageUrlaub setzen
-                int urlaubstage = 0;
-                int krankheitstage = 0;
-
-                foreach (var at in absencetimes)
-                {
-                    if(at.EmployeeOid == info.Employee.EmployeeOid)
-                    {
-                        //Start und Ende sind im gleichen Monat
-                        if (at.Start.Value.Month == at.End.Value.Month) 
-                        {
-                            for (int i = at.Start.Value.Day; i <= at.End.Value.Day; i++)
-                            {
-                                var tempDate = new DateTime(at.Start.Value.Year, at.Start.Value.Month, i);
-                                if (tempDate.DayOfWeek != DayOfWeek.Saturday && tempDate.DayOfWeek != DayOfWeek.Sunday)
-                                {
-                                    if (at.Reason.Description.ToLower().Contains("urlaub"))
-                                        urlaubstage++;
-                                    else if (at.Reason.Description.ToLower().Contains("krank"))
-                                        krankheitstage++;
-                                }
-                            }
-                        }
-                        //Start und Ende sind in verschiedenen Monaten
-                        else
-                        {
-                            for (int i = at.Start.Value.Day; i <= DateTime.DaysInMonth(at.Start.Value.Year, at.Start.Value.Month); i++)
-                            {
-                                var tempDate = new DateTime(at.Start.Value.Year, at.Start.Value.Month, i);
-                                if (tempDate.DayOfWeek != DayOfWeek.Saturday && tempDate.DayOfWeek != DayOfWeek.Sunday)
-                                {
-                                    if (at.Reason.Description.ToLower().Contains("urlaub"))
-                                        urlaubstage++;
-                                    else if (at.Reason.Description.ToLower().Contains("krank"))
-                                        krankheitstage++;
-                                }
-                            }
-                            for (int i = 1; i <= at.End.Value.Day; i++)
-                            {
-                                var tempDate = new DateTime(at.End.Value.Year, at.End.Value.Month, i);
-                                if (tempDate.DayOfWeek != DayOfWeek.Saturday && tempDate.DayOfWeek != DayOfWeek.Sunday)
-                                {
-                                    if (at.Reason.Description.ToLower().Contains("urlaub"))
-                                        urlaubstage++;
-                                    else if (at.Reason.Description.ToLower().Contains("krank"))
-                                        krankheitstage++;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                to.TageUrlaub = string.Format("{0:0.00}", urlaubstage);
-                to.TageKrankheit = string.Format("{0:0.00}", krankheitstage);
 
                 tableObjects.Add(to);
             }

BeWo/View/HomeView.xaml.cs

@@ -460,6 +460,7 @@ namespace BeWo.View
                                                         return;
                                                     }
                                                     serviceRecord.SetInsertedOn(DateTime.Now);
+                                                    serviceRecord.EditAlwaysAllowed = true;
                                                     var newView = new ChatDokumentationsView(vm, serviceRecord);
                                                     newView.ShowDialog();
                                                 })));

BeWo/View/Report/AnnualReport/AnnualReportView.xaml

@@ -51,11 +51,11 @@
                 
                 <Label x:Name="lblCostcenter" Content="{markup:Translate Kostenträger:}" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" />
                 <uc:PopUpEdit Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1" 
-                              IsReadOnly="True" x:Name="popupedit_costcenter" DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_costcenter_PopUpClick" HorizontalAlignment="Left" Width="200" HorizontalContentAlignment="Left" Height="24" Margin="3" />
+                              IsReadOnly="True" x:Name="popupedit_costcenter" DeleteButtonVisibility="Visible" DeleteClick="popupedit_organisation_DeleteClick" PopUpClick="popupedit_costcenter_PopUpClick" HorizontalAlignment="Left" Width="200" HorizontalContentAlignment="Left" Height="24" Margin="3" />
 
                 <Label  Content="Team:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" />
-                <uc:PopUpEdit Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="2" 
-                              IsReadOnly="True" x:Name="popupedit_team" DeleteButtonVisibility="Collapsed" PopUpClick="popupedit_team_PopUpClick" 
+                <uc:PopUpEdit Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="2" DeleteClick="popupedit_team_DeleteClick"
+                              IsReadOnly="True" x:Name="popupedit_team" DeleteButtonVisibility="Visible" PopUpClick="popupedit_team_PopUpClick" 
                               HorizontalAlignment="Left" Width="200" HorizontalContentAlignment="Left" Height="24" Margin="3" />
 
                 <Label  Content="Betreuungsart:" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" />

BeWo/View/Report/AnnualReport/AnnualReportView.xaml.cs

@@ -213,5 +213,17 @@ namespace BeWo.View.Report.AnnualReport
         {
             this.popup_team.IsOpen = true;
         }
+
+        private void popupedit_team_DeleteClick(object sender, RoutedEventArgs e)
+        {
+            _SelectedTeam = null;
+            this.popupedit_team.Text = "";
+        }
+
+        private void popupedit_organisation_DeleteClick(object sender, RoutedEventArgs e)
+        {
+            _SelectedOrganisation = null;
+            this.popupedit_costcenter.Text = "";
+        }
     }
 }

BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs

@@ -235,11 +235,21 @@ namespace BeWo.View.Report.Kilometerauswertung
             {
                 if(_ReportType == KilometerauslastungsType.Customer)
                 {
-                    ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertung(SelectedCustomer.CustomerOid, rangeDate), ShowReport, true);
+                    if (SelectedCustomer != null)
+                    {
+                        ServiceFacade.DoReportServiceAsync(
+                            s => s.CreateKilometerauswertung(SelectedCustomer.CustomerOid, rangeDate), ShowReport,
+                            true);
+                    }
                 }
                 else
                 {
-                    ServiceFacade.DoReportServiceAsync(s => s.CreateEmployeeKilometerauswertung(SelectedEmployee.EmployeeOid, rangeDate), ShowReport, true);
+                    if (SelectedEmployee != null)
+                    {
+                        ServiceFacade.DoReportServiceAsync(
+                            s => s.CreateEmployeeKilometerauswertung(SelectedEmployee.EmployeeOid, rangeDate),
+                            ShowReport, true);
+                    }
                 }
             }
         }

BeWo/ViewModel/DienstInfoVM.cs

@@ -23,6 +23,7 @@ namespace BeWo.ViewModel
         private DateTime _StartDT;
         private DateTime _EndeDT;
         private int _Pause;
+        private WohnheimDC _Wohnheim;
 
         public DienstInfoVM(DienstInfoDC dienstDC) : base(dienstDC, dienstDC.Oid == null)
         { }
@@ -187,6 +188,19 @@ namespace BeWo.ViewModel
                 }
             }
         }
+        public WohnheimDC Wohnheim
+        {
+            get { return _Wohnheim; }
+            set
+            {
+                if (AreDifferent(_Wohnheim, value))
+                {
+                    _Wohnheim = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.Wohnheim, value), nameof(_Wohnheim));
+                    FirePropertyChanged(nameof(_Wohnheim));
+                }
+            }
+        }
 
         protected override void InitByDataContract(DienstInfoDC bDataContract)
         {
@@ -198,6 +212,7 @@ namespace BeWo.ViewModel
             _StartDT = bDataContract.Start;
             _EndeDT = bDataContract.Ende;
             _Pause = bDataContract.Pause;
+            _Wohnheim = bDataContract.Wohnheim;
 
             if (!string.IsNullOrEmpty(bDataContract.Farbe))
             {
@@ -216,6 +231,7 @@ namespace BeWo.ViewModel
             bDataContract.Pause = _Pause;
             bDataContract.Start = _StartDT;
             bDataContract.Ende = _EndeDT;
+            bDataContract.Wohnheim = _Wohnheim;
 
             return bDataContract;
         }

BeWo/ViewModel/ListViewModel/DienstListVM.cs

@@ -3,9 +3,11 @@ using System.Drawing;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Media;
+using BeWo.ServiceProxy;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
 using Color = System.Drawing.Color;
 
 namespace BeWo.ViewModel.ListViewModel
@@ -21,11 +23,33 @@ namespace BeWo.ViewModel.ListViewModel
             get
             {
                 var lTemp = typeof(Color).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Static).Select(pi => (Color)pi.GetGetMethod().Invoke(null, null)).ToList();
+                for (int i = lTemp.Count - 1; i >= 0; i--)
+                {
+                    var o = lTemp[i];
+                    if (o.Name.ToLower().Contains("black"))
+                        lTemp.Remove(o);
+                    else if (o.Name.ToLower().Contains("red")) 
+                        lTemp.Remove(o);
+                }
 
                 lTemp.Sort((x, y) => x.GetBrightness().CompareTo(y.GetBrightness()));
 
                 return lTemp.Select(c => new SolidColorBrush(System.Windows.Media.Color.FromArgb(c.A, c.R, c.G, c.B))).ToList();
             }
         }
+        public List<CompactWohnheimDC> AllWohnheime
+        {
+            get
+            {
+                var liste = new List<CompactWohnheimDC>();
+                liste.Add(new CompactWohnheimDC
+                {
+                    WohnheimOid = -1,
+                    WohnheimName = ""
+                });
+                liste.AddRange(ServiceFacade.DoCustomerServiceSync(x => x.GetAllActiveWohnheimeCompact()));
+                return liste.OrderBy(l => l.WohnheimName).ToList();
+            }
+        }
     }
 }

BeWo/ViewModel/ServiceRecordVM.cs

@@ -243,6 +243,8 @@ namespace BeWo.ViewModel
             List<ValueListEntryDC> pAllGoals)
             : base(pDC, pDC.ServiceRecordOid == null)
         {
+            EditAlwaysAllowed = false;
+
             _Category2Services = pCategory2Services;
 
             ChangeGoalTree(pAllGoalCategories, pAllGoals);
@@ -918,10 +920,17 @@ namespace BeWo.ViewModel
             }
         }
 
+        public bool EditAlwaysAllowed { get; set; }
+
         public bool EditAllowed
         {
             get
             {
+                if (EditAlwaysAllowed)
+                {
+                    return true;
+                }
+
                 var allowed = false;
 
                 if (BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecordView_Edit))

BeWo/ViewModel/VMFactory.cs

@@ -468,7 +468,7 @@ namespace BeWo.ViewModel
 
         public static void CreateDienstListVMAsync(Action<DienstInfoListVM> pCallBack)
         {
-            ServiceFacade.DoOperationsServiceAsync(s => s.GetAllDienste(),
+            ServiceFacade.DoOperationsServiceAsync(s => s.GetAllDienste(null),
                 r => pCallBack(new DienstInfoListVM(r.ToList())));
         }
 

BeWo/ownChat/ChatView.xaml.cs

@@ -205,7 +205,8 @@ namespace BeWo.ownChat
 
                                                         return;
                                                     }
-
+                                                    serviceRecord.SetInsertedOn(DateTime.Now);
+                                                    serviceRecord.EditAlwaysAllowed = true;
                                                     var newView = new ChatDokumentationsView(vm, serviceRecord);
                                                     newView.ShowDialog();
                                                 })));

BeWoAllReports.sln

@@ -652,6 +652,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmbulantBetreutesWohnenAstr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wichernhaus", "ReportImp\Wichernhaus\Wichernhaus.csproj", "{ACAA5856-E43A-4F4C-969E-2F4FB0D5A527}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FAMRheinSiegGbr", "ReportImp\FAMRheinSiegGbr\FAMRheinSiegGbr.csproj", "{88273E87-C5F9-4DBF-876A-296527A61B4A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkRegensburg", "ReportImp\DiakonischesWerkRegensburg\DiakonischesWerkRegensburg.csproj", "{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KoelnerBeWoSelbstbestimmtLeben", "ReportImp\KoelnerBeWoSelbstbestimmtLeben\KoelnerBeWoSelbstbestimmtLeben.csproj", "{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonischesWerkPassau", "ReportImp\DiakonischesWerkPassau\DiakonischesWerkPassau.csproj", "{BE015430-F83C-4CAB-902A-5D1962697715}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarlSonnenscheinHaus", "ReportImp\CarlSonnenscheinHaus\CarlSonnenscheinHaus.csproj", "{2CE355CA-0227-4536-B097-C672FCEF4BAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SozialwerkAachenerChristen", "ReportImp\SozialwerkAachenerChristen\SozialwerkAachenerChristen.csproj", "{47A029F9-D420-48D2-BFE3-CB4988346366}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebensWert", "ReportImp\LebensWert\LebensWert.csproj", "{09BA6418-1FC2-4B45-8CE0-BB9C24499442}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PZDDuesseldorf", "ReportImp\PZDDuesseldorf\PZDDuesseldorf.csproj", "{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -7859,6 +7875,198 @@ Global
 		{ACAA5856-E43A-4F4C-969E-2F4FB0D5A527}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ACAA5856-E43A-4F4C-969E-2F4FB0D5A527}.Release|x86.ActiveCfg = Release|Any CPU
 		{ACAA5856-E43A-4F4C-969E-2F4FB0D5A527}.Release|x86.Build.0 = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|.NET.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Debug|x86.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|.NET.Build.0 = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{88273E87-C5F9-4DBF-876A-296527A61B4A}.Release|x86.Build.0 = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|.NET.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Debug|x86.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|.NET.ActiveCfg = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|.NET.Build.0 = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|x86.ActiveCfg = Release|Any CPU
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2}.Release|x86.Build.0 = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|.NET.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Debug|x86.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|.NET.ActiveCfg = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|.NET.Build.0 = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.ActiveCfg = Release|Any CPU
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.Build.0 = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|.NET.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Debug|x86.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|.NET.Build.0 = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|x86.ActiveCfg = Release|Any CPU
+		{BE015430-F83C-4CAB-902A-5D1962697715}.Release|x86.Build.0 = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|.NET.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|.NET.Build.0 = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA}.Release|x86.Build.0 = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|.NET.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Debug|x86.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|.NET.ActiveCfg = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|.NET.Build.0 = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|x86.ActiveCfg = Release|Any CPU
+		{47A029F9-D420-48D2-BFE3-CB4988346366}.Release|x86.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|.NET.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Debug|x86.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|.NET.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|.NET.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|x86.ActiveCfg = Release|Any CPU
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442}.Release|x86.Build.0 = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|.NET.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Debug|x86.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.DebugRemote|x86.Build.0 = Debug|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|.NET.ActiveCfg = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|.NET.Build.0 = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|x86.ActiveCfg = Release|Any CPU
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -8183,6 +8391,14 @@ Global
 		{7FCD3132-1656-4051-B4D8-650DEB349A61} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{6AB16005-E552-4619-9E55-D752FCCAC3B0} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{ACAA5856-E43A-4F4C-969E-2F4FB0D5A527} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{88273E87-C5F9-4DBF-876A-296527A61B4A} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{330C49F0-B2D7-4F09-9F6E-E26FF1038BF2} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{FE240F9F-CC85-4F7D-9080-BEEBE76B0735} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{BE015430-F83C-4CAB-902A-5D1962697715} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{2CE355CA-0227-4536-B097-C672FCEF4BAA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{47A029F9-D420-48D2-BFE3-CB4988346366} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{09BA6418-1FC2-4B45-8CE0-BB9C24499442} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{5C13AB6D-5CB0-4360-A7FC-95DC2686E64D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

BeWoPlanerMobil/Controllers/ChatController.cs

@@ -206,7 +206,16 @@ namespace BeWoPlanerMobil.Controllers
 
                             var miInputList = new List<JsonRueckgabeMitarbeiterInput>();
 
-                            var applicationUsers = applicationUser.Where(appUser => appUser.Employee != null).ToDictionary(appUser => appUser.Employee.Oid);
+                            Dictionary<long?, ApplicationUser> applicationUsers = new Dictionary<long?, ApplicationUser>();
+
+                            foreach (var au in applicationUser)
+                            {
+                                if (au.Employee != null && au.Employee.Oid.HasValue && !applicationUsers.ContainsKey(au.Employee.Oid))
+                                {
+                                    applicationUsers.Add(au.Employee.Oid, au);
+                                }
+                            }
+                            //var applicationUsers2 = applicationUser.Where(appUser => appUser.Employee != null).ToDictionary(appUser => appUser.Employee.Oid);
 
                             foreach (var employee in allEmployees)
                             {

BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs

@@ -108,6 +108,7 @@ namespace BeWoPlanerMobil.Service
                     if (HttpContext.Current.Items["hibernateSession"] != null)
                     {
                         ((ISession)HttpContext.Current.Items["hibernateSession"]).Close();
+                        HttpContext.Current.Items.Remove("hibernateSession");
                     }
                 };
         }
@@ -143,6 +144,7 @@ namespace BeWoPlanerMobil.Service
             {
                 HttpContext.Current.Items.Add("hibernateSession", sf.OpenSession());
                 
+                
                 return true;
             }
 

BeWoPlanerMobil/Web.config

@@ -140,7 +140,7 @@
         <add key="PreserveLoginUrl" value="true" />
         <add key="ClientValidationEnabled" value="true" />
         <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-        <add key="MultitenancyPath" value="..\Host\Multitenancy\" />
+        <add key="MultitenancyPath" value="..\..\..\Host\Multitenancy\" />
         <add key="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
         <add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?k=[TENANT]" />
         <add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />

Data/Access/SearchDAO.cs

@@ -1110,12 +1110,13 @@ namespace BeWo.Data.Access
             return criteria.List<AbsenceTime>().ToList();
         }
 
-        public IEnumerable<AbsenceTime> FindAbsenceTimesForEmployee(DateTime startDate, DateTime endDate, long empOid)
+        public IEnumerable<AbsenceTime> FindAbsenceTimesForEmployee
+            (DateTime startDate, DateTime endDate, long empOid)
         {
             var criteria = CreateCriteriaIsActive<AbsenceTime>()
                 .Add(Restrictions.Eq("EmployeeOid", empOid))
-                .Add(Restrictions.Gt("Start", startDate))
-                .Add(Restrictions.Lt("EndTime", endDate));
+                .Add(Restrictions.Gt(AbsenceTime.PropertyName_Start, startDate))
+                .Add(Restrictions.Lt(AbsenceTime.PropertyName_End, endDate));
 
             return criteria.List<AbsenceTime>().ToList();
         }
@@ -4602,5 +4603,13 @@ namespace BeWo.Data.Access
 
             return result;
         }
+
+        public IList<DienstInfo> FindDiensteForWohnheim(long? whOid)
+        {
+            var criteria = CreateCriteriaIsActive<DienstInfo>()
+                .Add(Restrictions.Or(Restrictions.Eq("Wohnheim", whOid), Restrictions.IsNull("Wohnheim")));
+
+            return criteria.List<DienstInfo>();
+        }
     }
 }

Data/Entities/DienstInfo.cs

@@ -16,6 +16,7 @@ namespace BeWo.Data.Entities
         private DateTime _Start;
         private DateTime _Ende;
         private int _Pause;
+        private long? _Wohnheim;
 
 		public DienstInfo()
 		{
@@ -111,5 +112,19 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+        public virtual long? Wohnheim
+        {
+            get
+            {
+                return _Wohnheim;
+            }
+            set
+            {
+                if (AreDifferent(_Wohnheim, value))
+                {
+                    _Wohnheim = value;
+                }
+            }
+        }
     }
 }

Data/ICF/ICFDAO.cs

@@ -13,7 +13,7 @@ namespace BeWo.Data.ICF
 {
     public static class ICFDAO
     {
-        private static readonly XDocument _File;
+        private static  XDocument _File;
         private static readonly XElement _Root;
 
         static ICFDAO()
@@ -27,7 +27,8 @@ namespace BeWo.Data.ICF
                     file = "icf.xml";
                 }
                 file = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"bin\ICF\" + file);
-                _File = XDocument.Load(file);
+                //file = @"D:\Projects\beyondSoft\BeWoPlaner\BeWo\Data\ICF";
+                _File = XDocument.Load(file); // Hier entsteht ein error
 
                 //_File = XDocument.Load(@"D:\Projects\BeWoPlaner\BeWo\Data\ICF\icf.xml");
                 Debug.WriteLine("Dokument geladen");
@@ -42,7 +43,8 @@ namespace BeWo.Data.ICF
 
         public static IList<ValueListEntryDC> GetIcf()
         {
-            if (_Root == null) return null;
+            if (_Root == null) 
+                return null;
 
             long id = 1;
 

Data/Mappings/DienstInfo.hbm.xml

@@ -21,5 +21,6 @@
     <property column="Start"                            type="DateTime"                               name="Start" />
     <property column="Ende"                             type="DateTime"                               name="Ende" />
     <property column="Pause"                            type="int"                                    name="Pause" />
+    <property column="Wohnheim"                         type="Int64"                                  name="Wohnheim" />
   </class>
 </hibernate-mapping>

Host/ReportView.aspx.cs

@@ -156,6 +156,9 @@ namespace Host
                     case ReportTypes.RosterReport:
                         report = CreateRosterReport();
                         break;
+                    case ReportTypes.RosterReportIst:
+                        report = CreateRosterReportIst();
+                        break;
                     case ReportTypes.VorlagenReport:
                         report = CreateVorlagenReport();
                         break;
@@ -718,7 +721,7 @@ namespace Host
 
         private XtraReport CreateRosterReport()
         {
-            DateTime dt = DateTime.ParseExact(Request.Params["dt"], "MM.yyyy", CultureInfo.InvariantCulture);
+            DateTime dt = DateTime.ParseExact(Request.Params["dt"], "dd.MM.yyyy", CultureInfo.InvariantCulture);
             long wOid = int.Parse(Request.Params["wid"]);
             
             List<int> feiertage = new List<int>();
@@ -727,6 +730,15 @@ namespace Host
                 feiertage = Request.Params["ft"].Split(';').Select(int.Parse).ToList(); 
             return reportCreator.CreateRosterReport(wOid, dt, feiertage);
         }
+        private XtraReport CreateRosterReportIst()
+        {
+            DateTime dt = DateTime.ParseExact(Request.Params["dt"], "dd.MM.yyyy", CultureInfo.InvariantCulture);
+            long wOid = int.Parse(Request.Params["wid"]);
+            
+            List<int> feiertage = new List<int>();
+
+            return reportCreator.CreateRosterReportIst(wOid, dt);
+        }
 
         private XtraReport CreateVorlagenReport()
         {
@@ -760,8 +772,14 @@ namespace Host
         }
 
         private AbstractReportCreator GetReportCreator()
-		{
-			String t = slicedToken["tenant"].ToString();
+        {
+            long? templateOid = null;
+		    if (Request.Params["template"] != null)
+		    {
+		        templateOid = long.Parse(Request.Params["template"]);
+		    }
+
+		    String t = slicedToken["tenant"].ToString();
 			AbstractReportCreator creator = null;
 #if DEBUG
 
@@ -788,7 +806,7 @@ namespace Host
 
 			if (creator == null)
 				creator = new DefaultReportCreator();
-
+            creator.TemplateOid = templateOid;
 			creator.Tenant = t;
 			creator.ReportPath = customerDllPath;
 

Model/Change_2021_09_28_DienstInfo.txt

@@ -0,0 +1,2 @@
+ALTER TABLE `bewodemo`.`dienstinfo` 
+ADD COLUMN `Wohnheim` BIGINT NULL AFTER `Pause`;

Model/Changes_2021_05_25_GeschenkterUrlaubstag_Nachkomma.txt

@@ -1,2 +1,2 @@
-ALTER TABLE `bewodemo`.`geschenkterurlaubstag` 
+ALTER TABLE `geschenkterurlaubstag` 
 CHANGE COLUMN `AnzahlTage` `AnzahlTage` DECIMAL(18,10) NULL DEFAULT NULL ;

Report/AbstractReportCreator.cs

@@ -16,8 +16,9 @@ namespace BeWo.Report
 		public string ReportPath { get; set; }
 
 		public string TempPath { get; set; }
+	    public long? TemplateOid { get; set; }
 
-		public abstract XtraReport CreateCustomerDataReport(long customerOid);
+	    public abstract XtraReport CreateCustomerDataReport(long customerOid);
 
 		public abstract XtraReport CreateCustomerInvoiceReport(long invoiceOid);
 
@@ -82,6 +83,7 @@ namespace BeWo.Report
         public abstract XtraReport CreateAbsenceReport(DateTime dt, List<long> abs, List<long> empTypes, List<long> teams, List<int> feiertage);
 
         public abstract XtraReport CreateRosterReport(long wOid, DateTime dt, List<int> feiertage);
+        public abstract XtraReport CreateRosterReportIst(long wOid, DateTime dt);
 
         public abstract XtraReport CreateKilometerauswertung(long customerOid, DateTime rangeDate);
 

Report/DefaultReportCreator.cs

@@ -43,6 +43,19 @@ namespace BeWo.Report
         {
             IBeWoReport<T> result = null;
 
+            if (TemplateOid.HasValue && TemplateOid.Value > 0)
+            {
+                var template = DAOFactory.GenericDAO.LoadByID<ReportTemplate>(TemplateOid.Value);
+
+                if (!String.IsNullOrEmpty(template.ReferenceClass))
+                {
+                    specificReportId = template.ReferenceClass;
+                }
+                else if (!String.IsNullOrEmpty(template.DisplayName))
+                {
+                    specificReportId = template.DisplayName;
+                }
+            }
             Type[] lAllReportTypes = null;
 
             if (Tenant != null && File.Exists(ReportPath))
@@ -1021,7 +1034,67 @@ namespace BeWo.Report
 
             //report.SetReportDataSource(RosterRO.Create(service.GetDienstEintraege(wOid, dt.Year, dt.Month), service.GetAllDienste(), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month));
             report.SetReportDataSource(RosterRO.CreateNew(dienstEintraege, vertretungen, employee,
-                service.GetAllDienste(), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertage));
+                service.GetAllDienste(wOid), service2.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertage));
+
+            return report as XtraReport;
+        }
+        public override XtraReport CreateRosterReportIst(long wOid, DateTime dt)
+        {
+            var opertionsService = new OperationsServiceImp();
+            var customerService = new CustomerServiceImp();
+            var employeeService = new EmployeeServiceImp();
+            
+            var report = FindReportImp<RosterIstRO>();
+
+            var dienstEintraege = opertionsService.GetAllDienstEintraegeAsList(wOid, dt.Year, dt.Month);
+            var vertretungen = opertionsService.GetAllDienstvertretungenAsList(wOid, dt.Year, dt.Month);
+
+            List<long> employeeOids = new List<long>();
+            foreach (var eintrag in dienstEintraege)
+            {
+                if (!employeeOids.Contains(eintrag.EmployeeOid))
+                    employeeOids.Add(eintrag.EmployeeOid);
+            }
+            foreach (var vertretung in vertretungen)
+            {
+                if (!employeeOids.Contains(vertretung.EmployeeOid))
+                    employeeOids.Add(vertretung.EmployeeOid);
+            }
+
+            var employee = MapperFactory.EmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.GetActiveByIDs<Employee>(employeeOids));
+
+            List<AbsenceTimeDC> absences = employeeService.GetMultipleEmployeeAbsenceTimesForMonth(dt.Year, dt.Month, employeeOids);
+            List<FeiertagDC> feiertageDCs = opertionsService.ErstelleDefaultFeiertage(dt.Year).Where(f => f.Datum.Month == dt.Month).ToList();
+
+            Dictionary<long?, decimal> stundenBeiAbwesenheit = new Dictionary<long?, decimal>();
+            foreach (var emp in employee)
+            {
+                ContractDC currentContract = null;
+                foreach (var c in emp.Contracts)
+                {
+                    if (!c.ContractEndDate.HasValue)
+                    {
+                        if (dt >= c.EntryDate)
+                        {
+                            currentContract = c;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        if (dt >= c.EntryDate && dt <= c.ContractEndDate)
+                        {
+                            currentContract = c;
+                            break;
+                        }
+                    }
+                }
+                if (currentContract != null)
+                    stundenBeiAbwesenheit.Add(emp.EmployeeOid, currentContract.WeeklyTotalHours.Value / currentContract.WeeklyDays);
+            }
+
+            report.SetReportDataSource(RosterIstRO.Create(dienstEintraege, vertretungen, employee, opertionsService.GetAllDienste(wOid), 
+                customerService.GetAllActiveWohnheimeCompact().First(x => x.WohnheimOid == wOid), dt.Year, dt.Month, feiertageDCs, absences, stundenBeiAbwesenheit));
 
             return report as XtraReport;
         }

Report/DefaultReports/Quittierungsbeleg.Designer.cs

@@ -298,7 +298,7 @@ namespace BeWo.Report.DefaultReports
             new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
             this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.picSignature.Name = "picSignature";
-            this.picSignature.SizeF = new System.Drawing.SizeF(158F, 18F);
+            this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F);
             this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             this.picSignature.StylePriority.UseBorders = false;
             this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);

Report/DefaultReports/RosterIstReport.cs

@@ -0,0 +1,29 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace BeWo.Report.DefaultReports
+{
+	[IDSpecificClass(Identifier = "RosterIstReport")]
+	public partial class RosterIstReport : XtraReport, IBeWoReport<RosterIstRO>
+	{
+        
+        public RosterIstReport()
+		{
+			InitializeComponent();
+		}
+
+		public void SetReportDataSource(RosterIstRO pRO)
+		{
+		    
+		    this.RosterIstRO.DataSource = pRO;
+        }
+        
+    }
+}

Report/DefaultReports/RosterIstReport.designer.cs

@@ -0,0 +1,739 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.Report.DefaultReports
+{
+    partial class RosterIstReport
+    {
+        /// <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();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.fieldSumSpecial = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldSumSonntag = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldSumFeiertag = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldHours = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldSick = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldVacation = new DevExpress.XtraReports.UI.CalculatedField();
+            this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldSumHours = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
+            this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.RosterIstRO = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RosterIstRO)).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;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2,
+            this.lblMonat,
+            this.xrTableHeader});
+            this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Detail1.HeightF = 159.0834F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTable2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.08332F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1,
+            this.xrTableRow3,
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(764.9999F, 54F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            this.xrTable2.StylePriority.UseTextAlignment = false;
+            this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell25});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 0.75540991165010141D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.Text = "Mitarbeiter/in:";
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell1.Weight = 0.138246012405208D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell25.Multiline = true;
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseFont = false;
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.Text = "[Mitarbeiter.FirstName] [Mitarbeiter.LastName]";
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell25.Weight = 0.74307226093795853D;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9,
+            this.xrTableCell16});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 0.75540991165010141D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            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.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "Monat";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell9.Weight = 0.138246012405208D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.Text = "[Monat]";
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.74307226093795853D;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell4,
+            this.xrTableCell6});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 0.75540991165010141D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UsePadding = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "Jahr";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell4.Weight = 0.138246012405208D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "[Jahr]";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell6.Weight = 0.74307226093795853D;
+            // 
+            // lblMonat
+            // 
+            this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+            this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.lblMonat.Multiline = true;
+            this.lblMonat.Name = "lblMonat";
+            this.lblMonat.SizeF = new System.Drawing.SizeF(764.9999F, 25F);
+            this.lblMonat.StyleName = "Title";
+            this.lblMonat.StylePriority.UseFont = false;
+            this.lblMonat.Text = "Ist-Dienstplan für [Mitarbeiter.LastNameFirstName]";
+            // 
+            // xrTableHeader
+            // 
+            this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableHeader.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.0834F);
+            this.xrTableHeader.Name = "xrTableHeader";
+            this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRowHeader});
+            this.xrTableHeader.SizeF = new System.Drawing.SizeF(784.0001F, 30F);
+            this.xrTableHeader.StylePriority.UseBackColor = false;
+            this.xrTableHeader.StylePriority.UseBorders = false;
+            this.xrTableHeader.StylePriority.UseFont = false;
+            this.xrTableHeader.StylePriority.UsePadding = false;
+            this.xrTableHeader.StylePriority.UseTextAlignment = false;
+            this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRowHeader
+            // 
+            this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5,
+            this.xrTableCell3,
+            this.xrTableCell2,
+            this.xrTableCell17,
+            this.xrTableCell7,
+            this.xrTableCell10,
+            this.xrTableCell14,
+            this.xrTableCell20});
+            this.xrTableRowHeader.Name = "xrTableRowHeader";
+            this.xrTableRowHeader.Weight = 0.79999999999999982D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "Datum";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell5.Weight = 0.090819619300785318D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Dienst / Schicht";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell3.Weight = 0.12339622204960969D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell2.StylePriority.UsePadding = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "von";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.055281508180805843D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell17.StylePriority.UsePadding = false;
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            this.xrTableCell17.Text = "bis";
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell17.Weight = 0.055281508180805843D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Dauer";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 0.040276527440411478D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Multiline = true;
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell10.StylePriority.UseBackColor = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "Urlaub";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell10.Weight = 0.059230186611278594D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell14.StylePriority.UsePadding = false;
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "Krankheit";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell14.Weight = 0.059230186613465526D;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.DetailReport1});
+            this.DetailReport.DataMember = "PageObjects";
+            this.DetailReport.DataSource = this.RosterIstRO;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // DetailReport1
+            // 
+            this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail2});
+            this.DetailReport1.DataMember = "PageObjects.EintraegeProMitarbeiter";
+            this.DetailReport1.DataSource = this.RosterIstRO;
+            this.DetailReport1.Level = 0;
+            this.DetailReport1.Name = "DetailReport1";
+            this.DetailReport1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBandExceptLastEntry;
+            // 
+            // Detail2
+            // 
+            this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.Detail2.Font = new System.Drawing.Font("Arial", 8F);
+            this.Detail2.HeightF = 22F;
+            this.Detail2.Name = "Detail2";
+            this.Detail2.StylePriority.UseFont = false;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(784.0001F, 22F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell11,
+            this.xrTableCell15,
+            this.xrTableCell12,
+            this.xrTableCell18,
+            this.xrTableCell19,
+            this.xrTableCell8,
+            this.xrTableCell13,
+            this.xrTableCell21});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 0.88D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Datum", "{0:dddd, dd.}")});
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell11.StylePriority.UseFont = false;
+            this.xrTableCell11.StylePriority.UsePadding = false;
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell11.Weight = 0.10369703848137056D;
+            this.xrTableCell11.XlsxFormatString = "ddd. dd.MM.yyyy";
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Dienst.DienstName")});
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell15.StylePriority.UsePadding = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.Text = "xrTableCell15";
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell15.Weight = 0.1408927193730917D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "[Startzeit]";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell12.Weight = 0.0631199375083197D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell18.StylePriority.UsePadding = false;
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            this.xrTableCell18.Text = "[Endzeit]";
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell18.Weight = 0.063119937508325091D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.DauerInStunden")});
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell19.StylePriority.UsePadding = false;
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            this.xrTableCell19.Text = "xrTableCell19";
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell19.Weight = 0.045987386683637457D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Urlaub")});
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "xrTableCell8";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell8.Weight = 0.067628507251571782D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Krankheit")});
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell13.StylePriority.UsePadding = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "xrTableCell13";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.0676285623346416D;
+            // 
+            // Title
+            // 
+            this.Title.BackColor = System.Drawing.Color.White;
+            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+            this.Title.ForeColor = System.Drawing.Color.Black;
+            this.Title.Name = "Title";
+            // 
+            // FieldCaption
+            // 
+            this.FieldCaption.BackColor = System.Drawing.Color.White;
+            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+            this.FieldCaption.Name = "FieldCaption";
+            // 
+            // PageInfo
+            // 
+            this.PageInfo.BackColor = System.Drawing.Color.White;
+            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.PageInfo.ForeColor = System.Drawing.Color.Black;
+            this.PageInfo.Name = "PageInfo";
+            // 
+            // DataField
+            // 
+            this.DataField.BackColor = System.Drawing.Color.White;
+            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // fieldSumSpecial
+            // 
+            this.fieldSumSpecial.DataMember = "EmployeeDetailList.Days";
+            this.fieldSumSpecial.Expression = "Sum([SpecialHours])";
+            this.fieldSumSpecial.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldSumSpecial.Name = "fieldSumSpecial";
+            // 
+            // fieldSumSonntag
+            // 
+            this.fieldSumSonntag.DataMember = "EmployeeDetailList.Days";
+            this.fieldSumSonntag.Expression = "Sum([HoursSunday])";
+            this.fieldSumSonntag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldSumSonntag.Name = "fieldSumSonntag";
+            // 
+            // fieldSumFeiertag
+            // 
+            this.fieldSumFeiertag.DataMember = "EmployeeDetailList.Days";
+            this.fieldSumFeiertag.Expression = "Sum([HoursHoliday])";
+            this.fieldSumFeiertag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldSumFeiertag.Name = "fieldSumFeiertag";
+            // 
+            // fieldHours
+            // 
+            this.fieldHours.DataMember = "EmployeeDetailList.Days";
+            this.fieldHours.Expression = "[MinutesTotal]/60";
+            this.fieldHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldHours.Name = "fieldHours";
+            // 
+            // fieldSick
+            // 
+            this.fieldSick.DataMember = "EmployeeDetailList.Days";
+            this.fieldSick.Expression = "Iif([HoursSick] > 0, \'x\', \'\')";
+            this.fieldSick.FieldType = DevExpress.XtraReports.UI.FieldType.String;
+            this.fieldSick.Name = "fieldSick";
+            // 
+            // fieldVacation
+            // 
+            this.fieldVacation.DataMember = "EmployeeDetailList.Days";
+            this.fieldVacation.Expression = "Iif([HoursInVacation] > 0, \'x\', \'\')";
+            this.fieldVacation.FieldType = DevExpress.XtraReports.UI.FieldType.String;
+            this.fieldVacation.Name = "fieldVacation";
+            // 
+            // calculatedField1
+            // 
+            this.calculatedField1.DataMember = "EmployeeDetailList.Days";
+            this.calculatedField1.DisplayName = "fieldSumSamstag";
+            this.calculatedField1.Expression = "Sum([HoursSaturday])";
+            this.calculatedField1.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.calculatedField1.Name = "calculatedField1";
+            // 
+            // fieldSumHours
+            // 
+            this.fieldSumHours.DataMember = "EmployeeDetailList.Days";
+            this.fieldSumHours.Expression = "Sum([MinutesTotal]/60)";
+            this.fieldSumHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldSumHours.Name = "fieldSumHours";
+            // 
+            // fieldSumHoliday2
+            // 
+            this.fieldSumHoliday2.DataMember = "EmployeeDetailList.Days";
+            this.fieldSumHoliday2.Expression = "Sum([HoursHoliday2])";
+            this.fieldSumHoliday2.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldSumHoliday2.Name = "fieldSumHoliday2";
+            // 
+            // fieldIstArbeitszeit
+            // 
+            this.fieldIstArbeitszeit.DataMember = "EmployeeDetailList";
+            this.fieldIstArbeitszeit.Expression = "[StundenGesamtIst]+[UeberstundenVormonat]";
+            this.fieldIstArbeitszeit.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldIstArbeitszeit.Name = "fieldIstArbeitszeit";
+            // 
+            // fieldUeberstundenGesamt
+            // 
+            this.fieldUeberstundenGesamt.DataMember = "EmployeeDetailList";
+            this.fieldUeberstundenGesamt.Expression = "Iif([Ueberstunden] == ?,  0, [Ueberstunden])+Iif([UeberstundenVormonat] == ?,  0," +
+    " [UeberstundenVormonat])";
+            this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
+            // 
+            // PageFooter
+            // 
+            this.PageFooter.HeightF = 100F;
+            this.PageFooter.Name = "PageFooter";
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell20.StylePriority.UsePadding = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            this.xrTableCell20.Text = "Bemerkung";
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell20.Weight = 0.1356371757796013D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "PageObjects.EintraegeProMitarbeiter.Notice")});
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell21.StylePriority.UsePadding = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell21.Weight = 0.1548692640734802D;
+            // 
+            // RosterIstRO
+            // 
+            this.RosterIstRO.DataSource = typeof(BeWo.Report.ReportObjects.RosterIstRO);
+            this.RosterIstRO.Name = "RosterIstRO";
+            // 
+            // RosterIstReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.PageFooter});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldSumSpecial,
+            this.fieldSumSonntag,
+            this.fieldSumFeiertag,
+            this.fieldHours,
+            this.fieldSick,
+            this.fieldVacation,
+            this.calculatedField1,
+            this.fieldSumHours,
+            this.fieldSumHoliday2,
+            this.fieldIstArbeitszeit,
+            this.fieldUeberstundenGesamt});
+            this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
+            this.RosterIstRO});
+            this.DataSource = this.RosterIstRO;
+            this.DisplayName = "Mitarbeiterstundenkonto";
+            this.Font = new System.Drawing.Font("Arial", 8F);
+            this.Margins = new System.Drawing.Printing.Margins(21, 22, 50, 50);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RosterIstRO)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+        private DevExpress.XtraReports.UI.DetailBand Detail2;
+        private DevExpress.XtraReports.UI.CalculatedField fieldSumSpecial;
+        private DevExpress.XtraReports.UI.CalculatedField fieldSumSonntag;
+        private DevExpress.XtraReports.UI.CalculatedField fieldSumFeiertag;
+        private DevExpress.XtraReports.UI.CalculatedField fieldHours;
+        private DevExpress.XtraReports.UI.CalculatedField fieldSick;
+        private DevExpress.XtraReports.UI.CalculatedField fieldVacation;
+        private DevExpress.XtraReports.UI.CalculatedField calculatedField1;
+        private DevExpress.XtraReports.UI.CalculatedField fieldSumHours;
+        private DevExpress.XtraReports.UI.CalculatedField fieldSumHoliday2;
+        private DevExpress.XtraReports.UI.CalculatedField fieldIstArbeitszeit;
+        private DevExpress.XtraReports.UI.CalculatedField fieldUeberstundenGesamt;
+        private DevExpress.DataAccess.ObjectBinding.ObjectDataSource RosterIstRO;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRLabel lblMonat;
+        private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.PageFooterBand PageFooter;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+    }
+}

Report/DefaultReports/RosterIstReport.resx

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

Report/DefaultReports/RosterReport.Designer.cs

@@ -32,8 +32,6 @@ namespace BeWo.Report.DefaultReports
             this.components = new System.ComponentModel.Container();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrLabel_Time = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel_Image = new DevExpress.XtraReports.UI.XRLabel();
             this.lblCustomerName = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -46,6 +44,8 @@ namespace BeWo.Report.DefaultReports
             this.approvedText = new DevExpress.XtraReports.UI.CalculatedField();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel_Time = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel_Image = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -67,36 +67,6 @@ namespace BeWo.Report.DefaultReports
             this.ReportHeader.HeightF = 223.9583F;
             this.ReportHeader.Name = "ReportHeader";
             // 
-            // xrLabel_Time
-            // 
-            this.xrLabel_Time.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel_Time.LocationFloat = new DevExpress.Utils.PointFloat(37F, 73.23335F);
-            this.xrLabel_Time.Multiline = true;
-            this.xrLabel_Time.Name = "xrLabel_Time";
-            this.xrLabel_Time.SizeF = new System.Drawing.SizeF(124.36F, 25F);
-            this.xrLabel_Time.StylePriority.UseFont = false;
-            this.xrLabel_Time.StylePriority.UseTextAlignment = false;
-            this.xrLabel_Time.Text = "\r\n";
-            this.xrLabel_Time.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel_Image
-            // 
-            this.xrLabel_Image.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel_Image.BorderWidth = 0.25F;
-            this.xrLabel_Image.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel_Image.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.22919F);
-            this.xrLabel_Image.Multiline = true;
-            this.xrLabel_Image.Name = "xrLabel_Image";
-            this.xrLabel_Image.SizeF = new System.Drawing.SizeF(25F, 25F);
-            this.xrLabel_Image.StylePriority.UseBorders = false;
-            this.xrLabel_Image.StylePriority.UseBorderWidth = false;
-            this.xrLabel_Image.StylePriority.UseFont = false;
-            this.xrLabel_Image.StylePriority.UseTextAlignment = false;
-            this.xrLabel_Image.Text = "\r\n";
-            this.xrLabel_Image.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            // 
             // lblCustomerName
             // 
             this.lblCustomerName.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -189,6 +159,38 @@ namespace BeWo.Report.DefaultReports
             this.bottomMarginBand1.HeightF = 20F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrLabel_Time
+            // 
+            this.xrLabel_Time.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrLabel_Time.LocationFloat = new DevExpress.Utils.PointFloat(30.75F, 73.23338F);
+            this.xrLabel_Time.Multiline = true;
+            this.xrLabel_Time.Name = "xrLabel_Time";
+            this.xrLabel_Time.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrLabel_Time.SizeF = new System.Drawing.SizeF(124.36F, 19.99581F);
+            this.xrLabel_Time.StylePriority.UseFont = false;
+            this.xrLabel_Time.StylePriority.UsePadding = false;
+            this.xrLabel_Time.StylePriority.UseTextAlignment = false;
+            this.xrLabel_Time.Text = "\r\n";
+            this.xrLabel_Time.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel_Image
+            // 
+            this.xrLabel_Image.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel_Image.BorderWidth = 0.25F;
+            this.xrLabel_Image.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrLabel_Image.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.22919F);
+            this.xrLabel_Image.Multiline = true;
+            this.xrLabel_Image.Name = "xrLabel_Image";
+            this.xrLabel_Image.SizeF = new System.Drawing.SizeF(20F, 20F);
+            this.xrLabel_Image.StylePriority.UseBorders = false;
+            this.xrLabel_Image.StylePriority.UseBorderWidth = false;
+            this.xrLabel_Image.StylePriority.UseFont = false;
+            this.xrLabel_Image.StylePriority.UseTextAlignment = false;
+            this.xrLabel_Image.Text = "\r\n";
+            this.xrLabel_Image.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.RosterRO);

Report/DefaultReports/RosterReport.cs

@@ -119,7 +119,8 @@ namespace BeWo.Report.DefaultReports
                         TextAlignment = xrLabel_Time.TextAlignment,
                         WidthF = xrLabel_Time.WidthF,
                         HeightF = xrLabel_Time.HeightF,
-                        Text = AdaptTime(d.Start.TimeOfDay, d.Ende.TimeOfDay)
+                        Text = AdaptTime(d.Start.TimeOfDay, d.Ende.TimeOfDay),
+                        Padding = xrLabel_Time.Padding
                     });
 
                 elem++;

Report/Report.csproj

@@ -235,6 +235,12 @@
     <Compile Include="DefaultReports\AbwesenheitsPrintReport.Designer.cs">
       <DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="DefaultReports\RosterIstReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DefaultReports\RosterIstReport.designer.cs">
+      <DependentUpon>RosterIstReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="DefaultReports\VorlageReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -507,6 +513,7 @@
     <Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" />
     <Compile Include="ReportObjects\BudgetnachweisAnhangRO.cs" />
     <Compile Include="ReportObjects\FlsAuslastungsauswertungRO.cs" />
+    <Compile Include="ReportObjects\RosterIstRO.cs" />
     <Compile Include="ReportObjects\RosterRO.cs" />
     <Compile Include="ReportObjects\AdditionalServiceBookingRO.cs" />
     <Compile Include="ReportObjects\AbsenceRO.cs" />
@@ -560,6 +567,9 @@
       <DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="DefaultReports\RosterIstReport.resx">
+      <DependentUpon>RosterIstReport.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DefaultReports\VorlageReport.resx">
       <DependentUpon>VorlageReport.cs</DependentUpon>
       <SubType>Designer</SubType>

Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs

@@ -337,7 +337,9 @@ namespace BeWo.Report.ReportObjects
 
 				    flsSollGesamt += BerechneFlsSoll(emp, c, berichtsAnfang, berichtsEnde, tatSollStdImVertragsUndBerichtzeitraum, stundenSollProMonat);
 
-                    berichtsAnfang = berichtsEnde;
+
+
+					berichtsAnfang = berichtsEnde;
 					berichtsEnde = monatsEnde;
 					c = GetNextValidContractForDate(berichtsAnfang, emp);
 
@@ -399,12 +401,21 @@ namespace BeWo.Report.ReportObjects
 
 				decimal alteExtraUeberstunden = 0;
 				BerechneUeberstundenBis(empDetail, groupFilteredRecords, ro.ReportStartDate, out ueberstundenVormonat,
-					out alteExtraUeberstunden);
+					out alteExtraUeberstunden); // ABCDEF statt alle SR alle Diensteinträge abarbeiten
 
+				var alleDiensteintraege = DAOFactory.GenericDAO.GetAllActive<DienstEintrag>().Where(d => d.EmployeeOid == empDetail.Employee.Oid).ToList();
+				var alleDienstvertretungen = DAOFactory.GenericDAO.GetAllActive<Dienstvertretung>().Where(d => d.EmployeeOid == empDetail.Employee.Oid).ToList();
+
+				decimal? ueberstundenVormonatFuerDienstplanung;
+				decimal? alteExtraUeberstundenDienstplanung;
+				//empDetail.DienstplanIst += BerechneDienstplanIst(empDetail, alleDiensteintraege, alleDienstvertretungen, ro.ReportStartDate, 
+				//												out ueberstundenVormonatFuerDienstplanung, out alteExtraUeberstundenDienstplanung); // ABCDEF
+				
+				var dienstplanIstAlsStunden = empDetail.DienstplanIst / 60;
 
 				decimal extraStunden = 0;
 
-				BerechneExtraUeberstunden(emp, monatsAnfang, monatsEnde, out extraStunden);
+				BerechneExtraUeberstunden(emp, monatsAnfang, monatsEnde, out extraStunden); // OverTimes
 
 				if (ShouldCreateDayDetails())
 				{
@@ -434,7 +445,224 @@ namespace BeWo.Report.ReportObjects
 		    ro.EmployeeDetailList = FilterEmployeeList(ro.EmployeeDetailList);
 		}
 
-	    protected virtual void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
+        #region Ist-Berechnung für Dienstplanung
+        public decimal BerechneDienstplanIst(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, List<DienstEintrag> eintraege, List<Dienstvertretung> vertretungen, DateTime monat, out decimal? ueberstunden, out decimal? alteExtraUeberstunden) // ABCDEF
+        {
+			ueberstunden = null;
+			alteExtraUeberstunden = 0;
+
+			decimal dpIst = 0;
+
+
+			MitarbeiterstundenkontoRO.EmployeeDetail edTotal = new MitarbeiterstundenkontoRO.EmployeeDetail();
+			Employee emp = empDetail.Employee;
+			Contract c = emp.FirstContract;
+
+			// Der Einfachheit halber: Vertretungen in Einträge umwandeln
+			eintraege.AddRange(VertretungenUmwandeln(vertretungen.ToList()));
+
+            if (c != null)
+            {
+                Dictionary<string, List<DienstEintrag>> eintragDict = CreateDiensteintragDictByDate(eintraege);
+
+                DateTime start = c.EntryDate.HasValue ? c.EntryDate.Value : new DateTime(2011, 1, 1);
+                while (c != null && start < monat)
+                {
+                    DateTime contractEnd = c.ContractEndDate.HasValue ? c.ContractEndDate.Value : DateTime.MaxValue;
+                    decimal bu = 0;
+                    decimal weeklyTotalHours = this.maxWochenstunden;
+                    int anzWochentage = ANZ_WOCHENTAGE;
+
+                    if (c.WeeklyTotalHours.HasValue)
+                    {
+                        weeklyTotalHours = c.WeeklyTotalHours.Value;
+                        bu = c.WeeklyTotalHours.Value / maxWochenstunden;
+                    }
+
+                    while (start < monat && start < contractEnd)
+                    {
+                        decimal flsIst = 0;
+                        decimal mittelbarIst = 0;
+                        decimal minutenMonat = 0;
+                        DateTime ende = new DateTime(start.Year, start.Month, 1).AddMonths(1);
+                        if (contractEnd < DateTime.MaxValue && contractEnd.AddDays(1) < ende)
+                            ende = contractEnd.AddDays(1);
+
+                        List<DienstEintrag> entriesThisMonth = new List<DienstEintrag>();
+                        string key = string.Format("{0:yyyyMM}", start);
+
+                        if (eintragDict.ContainsKey(key))
+                        {
+                            foreach (var item in eintragDict[key])
+                            {
+                                minutenMonat += Convert.ToDecimal(item.DauerInStunden * 60);
+                                entriesThisMonth.Add(item);
+                            }
+                        }
+						dpIst += minutenMonat;
+
+                        decimal arbeitstage = GetArbeitstageImBereich(start, ende, emp);
+
+                        var arbeitstageProWoche = anzWochentage;
+                        if (c != null && c.WeeklyDays.HasValue && c.WeeklyDays.Value > 0)
+                            arbeitstageProWoche = c.WeeklyDays.Value;
+
+                        var soll = GetSollNachArbeitszeiten(emp, start, ende);
+                        if (!soll.HasValue)
+                        {
+                            var stundenSollProMonat = BerechneSollProMonat(emp, start, ende);
+                            soll = stundenSollProMonat;
+                        }
+
+                        if (!soll.HasValue)
+                        {
+
+                            if (!soll.HasValue)
+                            {
+                                decimal maxSollMonat = arbeitstage * (maxWochenstunden / arbeitstageProWoche);
+                                if (arbeitstageProWoche <= 5)
+                                {
+                                    maxSollMonat = arbeitstage * (maxWochenstunden / 5);
+                                }
+
+                                soll = maxSollMonat * bu;
+                            }
+                        }
+
+
+
+						decimal sollMitarbeiter = soll ?? 0;
+						var ath = GetAbsenceTimeDaysWithWorkWeeks(emp, start, ende, arbeitstageProWoche);
+
+						MitarbeiterstundenkontoRO.EmployeeDetail ed = new MitarbeiterstundenkontoRO.EmployeeDetail();
+						ed.SollProTag = weeklyTotalHours / arbeitstageProWoche;
+						ed.ArbeitstageProWoche = arbeitstageProWoche;
+						ed.ArbeitstageImBerichtszeitraum = arbeitstage;
+						ed.SollProWoche = BerechneSollProWoche(c, ed);
+						ed.AbsenceTimeDays = ath;
+						ed.Employee = emp;
+						ed.StundenSollMax = sollMitarbeiter;
+
+						if (ath.TageGesamt.HasValue)
+						{
+							var minusStunden = BerechneStundenDurchAbwesenheiten(ath, start, ende, c, ed);
+							sollMitarbeiter -= minusStunden;
+							if (sollMitarbeiter < 0 && !StundenDurchAbwesenheitenDuerfenNegativSein())
+							{
+								sollMitarbeiter = 0;
+							}
+						}
+
+						decimal stundenMonat = minutenMonat / 60m;
+						stundenMonat = ((flsIst * AddRateFactorToIst()) + mittelbarIst) / 60m;
+
+
+						if (!ueberstunden.HasValue)
+							ueberstunden = 0;
+						ueberstunden += stundenMonat - sollMitarbeiter;
+
+						decimal extraUeberstunden = 0;
+						BerechneExtraUeberstunden(emp, start, ende, out extraUeberstunden);
+						ueberstunden += extraUeberstunden;
+
+						alteExtraUeberstunden = extraUeberstunden;
+
+						ed.StundenSollOhneUrlaubKrankheit = sollMitarbeiter;
+						ed.StundenGesamtIst = stundenMonat;
+						ed.Ueberstunden = ueberstunden;
+						ed.UeberstundenVormonat = edTotal.Ueberstunden;
+
+						edTotal.StundenSollOhneUrlaubKrankheit += sollMitarbeiter;
+						edTotal.StundenSollMax += soll ?? 0;
+						edTotal.FlsIst += flsIst / 60;
+						edTotal.MittelbarIst += mittelbarIst / 60;
+						edTotal.StundenGesamtIst += stundenMonat;
+						edTotal.Ueberstunden = ueberstunden;
+
+						start = ende;
+					}
+
+					if (start >= contractEnd)
+					{
+						var ctemp = GetNextValidContractForDate(start, emp);
+						if (ctemp != null && ctemp.Oid != c.Oid)
+						{
+							c = ctemp;
+						}
+						else
+						{
+							c = null;
+						}
+
+						if (c != null && c.EntryDate.HasValue && c.EntryDate >= start)
+							start = c.EntryDate.Value;
+						else
+						{
+							start = start.AddMonths(1);
+							c = GetNextValidContractForDate(start, emp);
+							if (c != null && c.EntryDate.HasValue && c.EntryDate >= start)
+								start = c.EntryDate.Value;
+						}
+					}
+				}
+            }
+            return dpIst;
+        }
+
+        private Dictionary<string, List<DienstEintrag>> CreateDiensteintragDictByDate(List<DienstEintrag> eintraege)
+        {
+			var dict = new Dictionary<string, List<DienstEintrag>>();
+
+			foreach (var item in eintraege)
+			{
+				//if (!IsServiceRecordFehlzeit(item))
+				//{
+				
+				string key = string.Format("{0:yyyyMM}", item.Datum);
+
+				List<DienstEintrag> list;
+				if (!dict.ContainsKey(key))
+				{
+					list = new List<DienstEintrag>();
+					dict.Add(key, list);
+				}
+				else
+				{
+					list = dict[key];
+				}
+				list.Add(item);
+				
+				//}
+			}
+			return dict;
+		}
+
+		private List<DienstEintrag> VertretungenUmwandeln(List<Dienstvertretung> vertretungen)
+        {
+			List<DienstEintrag> eintraege = new List<DienstEintrag>();
+
+			foreach (var v in vertretungen)
+			{
+				eintraege.Add(new DienstEintrag()
+				{
+					Datum = v.Datum,
+					DauerInStunden = v.DauerInStunden,
+					DienstOid = v.DienstOid,
+					EmployeeOid = v.EmployeeOid,
+					Endzeit = v.Endzeit,
+					Notice = v.Notice,
+					Startzeit = v.Startzeit,
+					WohnheimOid = v.WohnheimOid,
+					Zeile = v.Zeile
+				});
+			}
+
+			return eintraege;
+		}
+		#endregion 
+
+
+		protected virtual void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
 	    {
 	        //do nothing
 	    }

Report/ReportObjects/MitarbeiterstundenkontoRO.cs

@@ -339,6 +339,7 @@ namespace BeWo.Report.ReportObjects
             public decimal? EmployeeSalaryByContract { get; set; }
             public decimal? EmployeeSalaryByHours { get; set; }
             public EmploymentType EmploymentType { get; set; }
+			public decimal DienstplanIst { get; set; }
         }
 
 		public class DayDetail

Report/ReportObjects/RosterIstRO.cs

@@ -0,0 +1,175 @@
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.Report.ReportObjects
+{
+    public class RosterIstRO : AbstractBeWoReportObject<RosterIstRO>
+    {
+        public List<PageObject> PageObjects { get; set; }
+
+        public static RosterIstRO Create(List<DienstEintragDC> dienstEintragDCs, List<DienstvertretungDC> dienstvertretungDCs, List<EmployeeDC> employee, 
+            List<DienstInfoDC> dienstInfoDCs, CompactWohnheimDC compactWohnheimDC, int year, int month, List<FeiertagDC> feiertage, List<AbsenceTimeDC> absences, 
+            Dictionary<long?, decimal> stundenBeiAbwesenheit)
+        {
+            RosterIstRO ro = new RosterIstRO();
+            ro.PageObjects = new List<PageObject>();
+
+            // (Vorerst) leere Einträge erstellen
+            List<Listeneintrag> eintraege = new List<Listeneintrag>();
+            int pos = 0;
+            foreach (var emp in employee)
+            {
+                for (int i = 1; i <= DateTime.DaysInMonth(year, month); i++)
+                {
+                    string kr = null;
+                    string ur = null;
+                    var datum = new DateTime(year, month, i);
+                    if (absences.Any(a => datum >= a.Start && datum <= a.End && a.EmployeeOid == emp.EmployeeOid && a.Reason.Description.ToLower().Contains("urlaub")))
+                    {
+                        ur = string.Format("{0:0.00}", stundenBeiAbwesenheit[emp.EmployeeOid]);
+                    }
+                    else if (absences.Any(a => datum >= a.Start && datum <= a.End && a.EmployeeOid == emp.EmployeeOid && a.Reason.Description.ToLower().Contains("krank")))
+                    {
+                        kr = string.Format("{0:0.00}", stundenBeiAbwesenheit[emp.EmployeeOid]);
+                    }
+                   
+                    eintraege.Add(new Listeneintrag()
+                    {
+                        Position = pos,
+                        Datum = datum,
+                        EmployeeOid = (long)emp.EmployeeOid,
+                        DauerInStunden = null,
+                        Dienst = null,
+                        Endzeit = null,
+                        Startzeit = null,
+                        Notice = feiertage.Any(f => f.Datum == datum) ? feiertage.First(f => f.Datum == datum).Name : null,
+                        Krankheit =  kr,
+                        Urlaub = ur,
+                    });
+
+                    pos++;
+                }
+            }
+            
+
+            foreach (var item in dienstEintragDCs)
+            {
+                string[] urlaubKrankheit = UrlaubUndKrankheitUeberpruefen(item, null, absences, stundenBeiAbwesenheit);
+
+                var temp = eintraege.First(e => e.Datum == item.Datum && e.EmployeeOid == item.EmployeeOid && e.Dienst == null); 
+                if (temp != null)
+                {
+                    eintraege[temp.Position] = new Listeneintrag()
+                    { 
+                        Datum = item.Datum,
+                        DauerInStunden = string.Format("{0:0.00}", item.DauerInStunden),
+                        Dienst = dienstInfoDCs.First(i => i.Oid == item.DienstOid),
+                        EmployeeOid = item.EmployeeOid,
+                        Endzeit = item.Endzeit,
+                        Notice = item.Notice,
+                        Startzeit = item.Startzeit,
+                        Urlaub = urlaubKrankheit[0],
+                        Krankheit = urlaubKrankheit[1]
+                    };
+                }
+            }
+            foreach (var item in dienstvertretungDCs)
+            {
+                string[] urlaubKrankheit = UrlaubUndKrankheitUeberpruefen(null, item, absences, stundenBeiAbwesenheit);
+
+                var temp = eintraege.First(e => e.Datum == item.Datum && e.EmployeeOid == item.EmployeeOid && e.Dienst == null);
+                if (temp != null)
+                {
+                    eintraege[temp.Position] = new Listeneintrag()
+                    {
+                        Datum = item.Datum,
+                        DauerInStunden = string.Format("{0:0.00}", item.DauerInStunden),
+                        Dienst = dienstInfoDCs.First(i => i.Oid == item.DienstOid),
+                        EmployeeOid = item.EmployeeOid,
+                        Endzeit = item.Endzeit,
+                        Notice = item.Notice,
+                        Startzeit = item.Startzeit,
+                        Urlaub = urlaubKrankheit[0],
+                        Krankheit = urlaubKrankheit[1]
+                    };
+                }
+                    
+            }
+
+            foreach (EmployeeDC emp in employee)
+            {
+                ro.PageObjects.Add(new PageObject()
+                {
+                    Jahr = year,
+                    Monat = new DateTime(year, month, 1).ToString("MMMM", CultureInfo.CreateSpecificCulture("de")),
+                    Mitarbeiter = emp,
+                    EintraegeProMitarbeiter = eintraege.Where(e => e.EmployeeOid == emp.EmployeeOid).OrderBy(e => e.Datum).ToList()
+                });
+            }
+
+            return ro;
+        }
+
+        private static string[] UrlaubUndKrankheitUeberpruefen(DienstEintragDC eintrag, DienstvertretungDC vertretung, List<AbsenceTimeDC> abwesenheiten, Dictionary<long?, decimal> stundenBeiAbwesenheit)
+        {
+            string[] urlaubKrankheit = new string[] { " ", " " };
+            if (eintrag != null)
+            {
+                foreach (var absence in abwesenheiten)
+                {
+                    if (eintrag.Datum >= absence.Start && eintrag.Datum <= absence.End.Value && eintrag.EmployeeOid == absence.EmployeeOid)
+                    {
+                        if (absence.Reason.Description.ToLower().Contains("urlaub"))
+                            urlaubKrankheit[0] = string.Format("{0:0.00}", stundenBeiAbwesenheit[absence.EmployeeOid]);
+                        else if (absence.Reason.Description.ToLower().Contains("krank"))
+                            urlaubKrankheit[1] = string.Format("{0:0.00}", stundenBeiAbwesenheit[absence.EmployeeOid]);
+                    }
+                }
+            }
+            else if (vertretung != null)
+            {
+                foreach (var absence in abwesenheiten)
+                {
+                    if (vertretung.Datum >= absence.Start && vertretung.Datum <= absence.End.Value && vertretung.EmployeeOid == absence.EmployeeOid)
+                    {
+                        if (absence.Reason.Description.ToLower().Contains("urlaub"))
+                            urlaubKrankheit[0] = string.Format("{0:0.00}", stundenBeiAbwesenheit[absence.EmployeeOid]);
+                        else if (absence.Reason.Description.ToLower().Contains("krank"))
+                            urlaubKrankheit[1] = string.Format("{0:0.00}", stundenBeiAbwesenheit[absence.EmployeeOid]);
+                    }
+                }
+            }
+
+            return urlaubKrankheit;
+        }
+    }
+
+    public class Listeneintrag
+    {
+        public int Position { get; set; }
+
+        public long EmployeeOid { get; set; }
+        public string Notice { get; set; }
+        public DienstInfoDC Dienst { get; set; }
+        public DateTime Datum { get; set; }
+        public string Startzeit { get; set; }
+        public string Endzeit { get; set; }
+        public string DauerInStunden { get; set; }
+        public string Urlaub { get; set; }
+        public string Krankheit { get; set; }
+    }
+    public class PageObject
+    {
+        public EmployeeDC Mitarbeiter { get; set; }
+        public string Monat { get; set; }
+        public int Jahr { get; set; }
+        public List<Listeneintrag> EintraegeProMitarbeiter { get; set; }
+
+    }
+}

ReportImp/AlphaEv/Validation/ServiceRecordValidator.cs

@@ -14,7 +14,17 @@ namespace AlphaEv.Validation
 {
 	public class CustomServiceRecordValidator : ServiceRecordValidator
 	{
-	    public override List<ServiceRecordValidationResultDC> ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics,
+	    public override string[] GetIgnoreCategoriesForOverlappingCheck()
+	    {
+	        return new[] { "Arbeitszeiterfassung" };
+	    }
+
+	    //public override string[] GetIgnoreServiceDescriptionsForOverlappingCheck()
+	    //{
+	    //    return new[] { "Arbeitszeit", "Pause", "Urlaub", "Krank" };
+	    //}
+
+        public override List<ServiceRecordValidationResultDC> ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics,
 	        int maxDaysEditServiceRecordsAllowed, IList<long> employeeOids, IList<long> cb2scOids)
 	    {
 	        var list = base.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids);

ReportImp/AmbulantBetreutesWohnenAstridPulm/AmbulantBetreutesWohnenAstridPulm.csproj

@@ -49,6 +49,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Quittierungsbeleg.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Quittierungsbeleg.Designer.cs">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+    </Compile>
     <Compile Include="QuittierungsbelegMitDatum.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -88,6 +94,10 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Quittierungsbeleg.resx">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="QuittierungsbelegMitDatum.resx">
       <DependentUpon>QuittierungsbelegMitDatum.cs</DependentUpon>
       <SubType>Designer</SubType>

ReportImp/AmbulantBetreutesWohnenAstridPulm/Quittierungsbeleg.cs

@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Text.RegularExpressions;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace AmbulantBetreutesWohnenAstridPulm
+{
+    public partial class Quittierungsbeleg : XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+        public Quittierungsbeleg()
+        {
+            InitializeComponent();
+        }
+
+        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>();
+
+                foreach (var sd in pRO.Services)
+                {
+                    if (sd.IsBillable)
+                    {
+                        ServicesOverviewRO.CreateSignatureString(sd);
+                        if (sd.IsGroup)
+                        {
+                            //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+                            hatGruppen = true;
+                        }
+                        servicesBillable.Add(sd);
+                    }
+                }
+
+                pRO.Services = servicesBillable;
+            }
+
+            if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
+            {
+                lblHatAbwesenheiten.Text = "X";
+            }
+
+            if (!hatGruppen)
+            {
+                lblHatGruppen.Text = "X";
+            }
+
+            ErstelleAbwesenheitenTabelle(pRO);
+            
+            bindingSource1.DataSource = pRO;
+        }
+
+        private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRo)
+        {
+            if (pRo.Abwesenheiten != null)
+            {
+                int newRows = 0;
+                int index = 1;
+                foreach (var at in pRo.Abwesenheiten)
+                {
+                    DevExpress.XtraReports.UI.XRTableRow row = null;
+                    if (index < xrTableAbwesenheiten.Rows.Count)
+                    {
+                        row = xrTableAbwesenheiten.Rows[index];
+                    }
+                    else
+                    {
+                        row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
+                        newRows++;
+                    }
+
+                    row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
+                    int? days = null;
+
+                    if (at.End.HasValue)
+                    {
+                        row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
+                        days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
+                    }
+                    else
+                    {
+                        row.Cells[1].Text = "unbekannt";
+                    }
+
+                    row.Cells[2].Text = String.Format("{0:0}", days);
+
+                    index++;
+                }
+
+                if (newRows > 0)
+                {
+                    lblUnterschriftKlient.Top += newRows * 20;
+                    lblUnterschriftMitarbeiter.Top += newRows * 20;
+                }
+            }
+        }
+
+        // TODO: Wie anzeigen? Alle?
+        private void EmployeeSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
+        {
+            return;
+
+            if(sender is XRPictureBox pictureBox)
+            {
+                var base64String = pictureBox.Tag as string;
+
+                if(!string.IsNullOrWhiteSpace(base64String))
+                {
+                    var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                    var binaryData = Convert.FromBase64String(base64Data);
+                    var image = ByteArrayToImage(binaryData);
+
+                    pictureBox.Image = image;
+                }
+                else
+                {
+                    pictureBox.Image = null;
+                }
+            }
+        }
+
+        // TODO: Wie anzeigen? Alle?
+        // TODO: Visibile der Datumstextboxen auf true setzen!
+        private void CustomerSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
+        {
+            return;
+
+            if(sender is XRPictureBox pictureBox)
+            {
+                var base64String = pictureBox.Tag as string;
+
+                if(!string.IsNullOrWhiteSpace(base64String))
+                {
+                    var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                    var binaryData = Convert.FromBase64String(base64Data);
+                    var image = ByteArrayToImage(binaryData);
+
+                    pictureBox.Image = image;
+                }
+                else
+                {
+                    pictureBox.Image = null;
+                }
+            }
+        }
+
+        private void picSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
+        {
+            XRPictureBox xrBox = sender as XRPictureBox;
+            //var test = this.GetCurrent
+            string base64String = xrBox.Tag as string;
+            if (!String.IsNullOrWhiteSpace(base64String))
+            {
+                var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
+                var binData = Convert.FromBase64String(base64Data);
+                Image img = ByteArrayToImage(binData);
+                xrBox.Image = Utils.CropImage(img);
+            }
+            else
+            {
+                xrBox.Image = null;
+            }
+        }
+
+        public Image ByteArrayToImage(byte[] byteArrayIn)
+        {
+            using(var memoryStream = new MemoryStream(byteArrayIn))
+            {
+                return Image.FromStream(memoryStream);
+            }
+        }
+    }
+}

ReportImp/AmbulantBetreutesWohnenAstridPulm/ServiceInvoiceReport.Designer.cs

@@ -111,7 +111,7 @@ namespace AmbulantBetreutesWohnenAstridPulm
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrPictureBox1});
             this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportHeader.HeightF = 120F;
+            this.ReportHeader.HeightF = 150F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
@@ -131,7 +131,7 @@ namespace AmbulantBetreutesWohnenAstridPulm
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 90F;
+            this.topMarginBand1.HeightF = 60F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
@@ -817,7 +817,7 @@ namespace AmbulantBetreutesWohnenAstridPulm
             this.Font = new System.Drawing.Font("Verdana", 10F);
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 75, 90, 50);
+            this.Margins = new System.Drawing.Printing.Margins(75, 75, 60, 50);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;

ReportImp/AmbulantBetreutesWohnenAstridPulm/SettlementReport.Designer.cs

@@ -137,7 +137,7 @@ namespace AmbulantBetreutesWohnenAstridPulm
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrPictureBox1});
             this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
-            this.ReportHeader.HeightF = 101.25F;
+            this.ReportHeader.HeightF = 150F;
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
@@ -698,7 +698,7 @@ namespace AmbulantBetreutesWohnenAstridPulm
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.HeightF = 96.875F;
+            this.topMarginBand1.HeightF = 50F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
@@ -1031,7 +1031,7 @@ namespace AmbulantBetreutesWohnenAstridPulm
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 74, 97, 100);
+            this.Margins = new System.Drawing.Printing.Margins(75, 74, 50, 100);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;

ReportImp/AwoDortmund/Export/DiamantExporter.cs

@@ -86,6 +86,7 @@ namespace AwoDortmund.Export
 
                 List<long> cats = new List<long>();
                 cats.Add(33); // Assistenzleistung
+                cats.Add(38); // Assistenzleistung
                 var assiSql = GetMonatlicheAbrechnungStringForCatsSql(date, cats, null);
                 dtAssi = ExecuteQuery(assiSql, date);
 
@@ -102,7 +103,33 @@ namespace AwoDortmund.Export
 
 
             StringBuilder sb = new StringBuilder();
+            List<DataRow> mergedRows = new List<DataRow>();
+            Dictionary<long, DataRow> oid2Row = new Dictionary<long, DataRow>();
             foreach (DataRow row in dt.Rows)
+            {
+                long oid = (long)row[0];
+
+                if (!oid2Row.ContainsKey(oid))
+                {
+                    oid2Row.Add(oid, row);
+                    mergedRows.Add(row);
+                }
+                else
+                {
+                    var firstRow = oid2Row[oid];
+
+                    decimal? betrag1Obj = firstRow[15] as decimal?;
+                    decimal? betrag2Obj = firstRow[38] as decimal?;
+
+                    decimal? betragNeu1Obj = row[15] as decimal?;
+                    decimal? betragNeu2Obj = row[38] as decimal?;
+
+                    firstRow[15] = (betrag1Obj ?? 0) + (betragNeu1Obj ?? 0);
+                    firstRow[38] = (betrag2Obj ?? 0) + (betragNeu2Obj ?? 0);
+                }
+            }
+
+            foreach (DataRow row in mergedRows)
             {
                 if (sb.Length > 0)
                 {
@@ -441,7 +468,7 @@ null,
 null,
 null,
 Round(sip.Claim, 2) AS 'Betrag',
-CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber is null, '', cb2sc.CustomerRefenrenceNumber), ' Abrechnung 02.2019 ', org.Name) as 'Verwendung',
+CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber is null, '', cb2sc.CustomerRefenrenceNumber), ' Abrechnung :PeriodePunkt ', org.Name) as 'Verwendung',
 null,
 null,
 'EUR',
@@ -464,7 +491,7 @@ null,
 null,
 null,
 Round(sip.Claim * -1, 2) AS 'Betrag2',
-CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber is null, '', cb2sc.CustomerRefenrenceNumber), ' Abrechnung 02.2019 ', org.Name) as 'Verwendung2',
+CONCAT(p.`LastName`, ', ', p.`FirstName`, ' ', IF(cb2sc.CustomerRefenrenceNumber is null, '', cb2sc.CustomerRefenrenceNumber), ' Abrechnung :PeriodePunkt ', org.Name) as 'Verwendung2',
 null
 FROM `supportconcept` sc 
 INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
@@ -713,9 +740,11 @@ ORDER BY p.`LastName`
         public static DataTable ExecuteQuery(String sql, DateTime dt)
         {
             var newsql = sql;
+            newsql = newsql.Replace(":PeriodePunkt", String.Format("{0:MM.yyyy}", dt));
             newsql = newsql.Replace(":PeriodeSlash", String.Format("{0:MM/yyyy}", dt));
             newsql = newsql.Replace(":Periode", String.Format("{0:MMyyyy}", dt));
             newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:ddMMyyyy}", dt));
+            newsql = newsql.Replace(":Abrechnungsmonat", String.Format("{0:ddMMyyyy}", dt));
             newsql = newsql.Replace(":Monat_Start", String.Format("{0:yyyy-MM}-01", dt));
             dt = dt.AddMonths(1);
             newsql = newsql.Replace(":Monat_End", String.Format("{0:yyyy-MM}-01", dt));

ReportImp/BeWoDirekt/ServicesOverviewReport.Designer.cs

@@ -29,87 +29,87 @@ namespace BeWoDirekt
         /// </summary>
         private void InitializeComponent()
         {
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Stundenzettel));
-			this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-			this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
-			this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-			this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
-			this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
-			this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
-			this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-			this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.cellEinzel = new DevExpress.XtraReports.UI.XRTableCell();
-			this.cellGruppe = new DevExpress.XtraReports.UI.XRTableCell();
-			this.cellTelefon = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-			this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-			this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
-			this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-			this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
-			this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-			this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
-			this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
-			this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
-			this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
-			this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
-			this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-			this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
-			this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-			this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-			this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-			this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
-			this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
-			this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
-			this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
-			this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
-			((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
-			// 
-			// Detail
-			// 
-			this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Stundenzettel));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellEinzel = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGruppe = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellTelefon = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTableServiceRecords1});
-			this.Detail.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
-			this.Detail.HeightF = 20F;
-			this.Detail.Name = "Detail";
-			this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.Detail.StylePriority.UseFont = false;
-			this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-			// 
-			// xrTableServiceRecords1
-			// 
-			this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.Detail.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.Detail.HeightF = 20F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.StylePriority.UseFont = false;
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableServiceRecords1
+            // 
+            this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-			this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-			this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-			this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
-			this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
+            this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2});
-			this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(720F, 20F);
-			this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
-			this.xrTableServiceRecords1.StylePriority.UseBorders = false;
-			this.xrTableServiceRecords1.StylePriority.UseFont = false;
-			this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
-			this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-			// 
-			// xrTableRow2
-			// 
-			this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(720F, 20F);
+            this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
+            this.xrTableServiceRecords1.StylePriority.UseBorders = false;
+            this.xrTableServiceRecords1.StylePriority.UseFont = false;
+            this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false;
+            this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell3,
             this.xrTableCell6,
             this.xrTableCell7,
@@ -117,111 +117,111 @@ namespace BeWoDirekt
             this.xrTableCell4,
             this.xrTableCell11,
             this.xrTableCell8});
-			this.xrTableRow2.Name = "xrTableRow2";
-			this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.xrTableRow2.StylePriority.UseTextAlignment = false;
-			this.xrTableRow2.Weight = 0.625D;
-			// 
-			// xrTableCell3
-			// 
-			this.xrTableCell3.Name = "xrTableCell3";
-			this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell3.StylePriority.UseFont = false;
-			this.xrTableCell3.StylePriority.UsePadding = false;
-			this.xrTableCell3.StylePriority.UseTextAlignment = false;
-			this.xrTableCell3.Text = "Datum";
-			this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell3.Weight = 0.17070142678521449D;
-			// 
-			// xrTableCell6
-			// 
-			this.xrTableCell6.Name = "xrTableCell6";
-			this.xrTableCell6.Text = "Einzel";
-			this.xrTableCell6.Weight = 0.17070143572302726D;
-			// 
-			// xrTableCell7
-			// 
-			this.xrTableCell7.Name = "xrTableCell7";
-			this.xrTableCell7.Text = "Gruppe";
-			this.xrTableCell7.Weight = 0.17070143312389743D;
-			// 
-			// xrTableCell10
-			// 
-			this.xrTableCell10.Name = "xrTableCell10";
-			this.xrTableCell10.Text = "Telefon";
-			this.xrTableCell10.Weight = 0.17070143312389741D;
-			// 
-			// xrTableCell4
-			// 
-			this.xrTableCell4.Name = "xrTableCell4";
-			this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell4.StylePriority.UsePadding = false;
-			this.xrTableCell4.StylePriority.UseTextAlignment = false;
-			this.xrTableCell4.Text = "Von - bis";
-			this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell4.Weight = 0.34140286624779481D;
-			// 
-			// xrTableCell11
-			// 
-			this.xrTableCell11.Multiline = true;
-			this.xrTableCell11.Name = "xrTableCell11";
-			this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell11.StylePriority.UseFont = false;
-			this.xrTableCell11.StylePriority.UsePadding = false;
-			this.xrTableCell11.StylePriority.UseTextAlignment = false;
-			this.xrTableCell11.Text = "Minuten";
-			this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell11.Weight = 0.24385917121416095D;
-			// 
-			// xrTableCell8
-			// 
-			this.xrTableCell8.Name = "xrTableCell8";
-			this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell8.StylePriority.UsePadding = false;
-			this.xrTableCell8.StylePriority.UseTextAlignment = false;
-			this.xrTableCell8.Text = "Mitarbeiter";
-			this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell8.Weight = 0.48771833035657958D;
-			// 
-			// DetailReport
-			// 
-			this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow2.StylePriority.UseTextAlignment = false;
+            this.xrTableRow2.Weight = 0.625D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Datum";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell3.Weight = 0.17070142678521449D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "Einzel";
+            this.xrTableCell6.Weight = 0.17070143572302726D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Text = "Gruppe";
+            this.xrTableCell7.Weight = 0.17070143312389743D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Text = "Telefon";
+            this.xrTableCell10.Weight = 0.17070143312389741D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell4.StylePriority.UsePadding = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "Von - bis";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell4.Weight = 0.34140286624779481D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell11.StylePriority.UseFont = false;
+            this.xrTableCell11.StylePriority.UsePadding = false;
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Minuten";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell11.Weight = 0.24385917121416095D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "Mitarbeiter";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell8.Weight = 0.48771833035657958D;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
             this.Detail1});
-			this.DetailReport.DataMember = "Services";
-			this.DetailReport.DataSource = this.bindingSource1;
-			this.DetailReport.Level = 0;
-			this.DetailReport.Name = "DetailReport";
-			this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-			// 
-			// Detail1
-			// 
-			this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.DetailReport.DataMember = "Services";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable3});
-			this.Detail1.Font = new System.Drawing.Font("Arial", 10F);
-			this.Detail1.HeightF = 20F;
-			this.Detail1.Name = "Detail1";
-			this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.Detail1.StylePriority.UseFont = false;
-			this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-			// 
-			// xrTable3
-			// 
-			this.xrTable3.BorderColor = System.Drawing.Color.Black;
-			this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            this.Detail1.Font = new System.Drawing.Font("Arial", 10F);
+            this.Detail1.HeightF = 20F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail1.StylePriority.UseFont = false;
+            this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.BorderColor = System.Drawing.Color.Black;
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-			this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-			this.xrTable3.Name = "xrTable3";
-			this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow6});
-			this.xrTable3.SizeF = new System.Drawing.SizeF(720F, 20F);
-			this.xrTable3.StylePriority.UseFont = false;
-			this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-			// 
-			// xrTableRow6
-			// 
-			this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTable3.SizeF = new System.Drawing.SizeF(720F, 20F);
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
             this.xrTableCell13,
             this.cellEinzel,
             this.cellGruppe,
@@ -229,300 +229,288 @@ namespace BeWoDirekt
             this.xrTableCell5,
             this.xrTableCell15,
             this.xrTableCell9});
-			this.xrTableRow6.Name = "xrTableRow6";
-			this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-			this.xrTableRow6.StylePriority.UseTextAlignment = false;
-			this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-			this.xrTableRow6.Weight = 1D;
-			// 
-			// xrTableCell13
-			// 
-			this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow6.StylePriority.UseTextAlignment = false;
+            this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableRow6.Weight = 1D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM}")});
-			this.xrTableCell13.Name = "xrTableCell13";
-			this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell13.StylePriority.UseFont = false;
-			this.xrTableCell13.StylePriority.UsePadding = false;
-			this.xrTableCell13.StylePriority.UseTextAlignment = false;
-			this.xrTableCell13.Text = "xrTableCell13";
-			this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell13.Weight = 0.088383822474591978D;
-			// 
-			// cellEinzel
-			// 
-			this.cellEinzel.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UsePadding = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "xrTableCell13";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell13.Weight = 0.088383822474591978D;
+            // 
+            // cellEinzel
+            // 
+            this.cellEinzel.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSQualifiedString")});
-			this.cellEinzel.Name = "cellEinzel";
-			this.cellEinzel.Weight = 0.088383850933659427D;
-			// 
-			// cellGruppe
-			// 
-			this.cellGruppe.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.cellEinzel.Name = "cellEinzel";
+            this.cellEinzel.Weight = 0.088383850933659427D;
+            // 
+            // cellGruppe
+            // 
+            this.cellGruppe.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSUnqualifiedString")});
-			this.cellGruppe.Name = "cellGruppe";
-			this.cellGruppe.Weight = 0.0883838220344431D;
-			// 
-			// cellTelefon
-			// 
-			this.cellTelefon.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.cellGruppe.Name = "cellGruppe";
+            this.cellGruppe.Weight = 0.0883838220344431D;
+            // 
+            // cellTelefon
+            // 
+            this.cellTelefon.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
-			this.cellTelefon.Name = "cellTelefon";
-			this.cellTelefon.Weight = 0.0883838220344431D;
-			// 
-			// xrTableCell5
-			// 
-			this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.cellTelefon.Name = "cellTelefon";
+            this.cellTelefon.Weight = 0.0883838220344431D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")});
-			this.xrTableCell5.Name = "xrTableCell5";
-			this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell5.StylePriority.UsePadding = false;
-			this.xrTableCell5.StylePriority.UseTextAlignment = false;
-			this.xrTableCell5.Text = "xrTableCell5";
-			this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell5.Weight = 0.17676763428909786D;
-			// 
-			// xrTableCell15
-			// 
-			this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "xrTableCell5";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell5.Weight = 0.17676763428909786D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")});
-			this.xrTableCell15.Name = "xrTableCell15";
-			this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell15.StylePriority.UseFont = false;
-			this.xrTableCell15.StylePriority.UsePadding = false;
-			this.xrTableCell15.StylePriority.UseTextAlignment = false;
-			this.xrTableCell15.Text = "xrTableCell15";
-			this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-			this.xrTableCell15.Weight = 0.12626260632260158D;
-			// 
-			// xrTableCell9
-			// 
-			this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UsePadding = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.Text = "xrTableCell15";
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell15.Weight = 0.12626260632260158D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeFullname")});
-			this.xrTableCell9.Name = "xrTableCell9";
-			this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
-			this.xrTableCell9.StylePriority.UsePadding = false;
-			this.xrTableCell9.StylePriority.UseTextAlignment = false;
-			this.xrTableCell9.Text = "xrTableCell9";
-			this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-			this.xrTableCell9.Weight = 0.25252518132778173D;
-			// 
-			// bindingSource1
-			// 
-			this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-			// 
-			// formattingRuleStartDate
-			// 
-			this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
-			this.formattingRuleStartDate.DataMember = "ServicesDouble";
-			// 
-			// 
-			// 
-			this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-			this.formattingRuleStartDate.Name = "formattingRuleStartDate";
-			// 
-			// ReportHeader
-			// 
-			this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "xrTableCell9";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell9.Weight = 0.25252518132778173D;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
+            // formattingRuleStartDate
+            // 
+            this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
+            this.formattingRuleStartDate.DataMember = "ServicesDouble";
+            this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleStartDate.Name = "formattingRuleStartDate";
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrRichText1,
             this.xrLabel1});
-			this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
-			this.ReportHeader.HeightF = 150F;
-			this.ReportHeader.Name = "ReportHeader";
-			this.ReportHeader.StylePriority.UseFont = false;
-			// 
-			// xrRichText1
-			// 
-			this.xrRichText1.Font = new System.Drawing.Font("Arial", 11F);
-			this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.04167F);
-			this.xrRichText1.Name = "xrRichText1";
-			this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-			this.xrRichText1.SizeF = new System.Drawing.SizeF(659.375F, 86.16666F);
-			// 
-			// xrLabel1
-			// 
-			this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
-			this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-			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(660F, 25F);
-			this.xrLabel1.StylePriority.UseFont = false;
-			this.xrLabel1.StylePriority.UseTextAlignment = false;
-			this.xrLabel1.Text = "Leistungsnachweis über direkte Betreuungszeiten";
-			this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-			// 
-			// formattingRuleServiceDesc
-			// 
-			this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
-			this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
-			// 
-			// 
-			// 
-			this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-			this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
-			// 
-			// formattingRuleCostBearer
-			// 
-			this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
-			this.formattingRuleCostBearer.DataMember = "ServicesDouble";
-			// 
-			// 
-			// 
-			this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-			this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
-			// 
-			// formattingRuleEmployeeName
-			// 
-			this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
-			this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
-			// 
-			// 
-			// 
-			this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-			this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
-			// 
-			// topMarginBand1
-			// 
-			this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
+            this.ReportHeader.HeightF = 150F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Arial", 11F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.04167F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(659.375F, 86.16666F);
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            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(660F, 25F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "Leistungsnachweis über direkte Betreuungszeiten";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // formattingRuleServiceDesc
+            // 
+            this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
+            this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
+            // 
+            // formattingRuleCostBearer
+            // 
+            this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleCostBearer.DataMember = "ServicesDouble";
+            this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
+            // 
+            // formattingRuleEmployeeName
+            // 
+            this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
+            this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
+            this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel10,
             this.xrLabel2});
-			this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
-			this.topMarginBand1.HeightF = 118.125F;
-			this.topMarginBand1.Name = "topMarginBand1";
-			this.topMarginBand1.StylePriority.UseFont = false;
-			// 
-			// xrLabel10
-			// 
-			this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
-			this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 65.00001F);
-			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(660F, 43.125F);
-			this.xrLabel10.StylePriority.UseFont = false;
-			this.xrLabel10.StylePriority.UseTextAlignment = false;
-			this.xrLabel10.Text = "Ambulant Betreutes Wohnen\r\nErftstrasse 76, 41460 Neuss";
-			this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-			// 
-			// xrLabel2
-			// 
-			this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
-			this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 45F);
-			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(660F, 20F);
-			this.xrLabel2.StylePriority.UseFont = false;
-			this.xrLabel2.StylePriority.UseTextAlignment = false;
-			this.xrLabel2.Text = "BeWo-direkt";
-			this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-			// 
-			// bottomMarginBand1
-			// 
-			this.bottomMarginBand1.HeightF = 30F;
-			this.bottomMarginBand1.Name = "bottomMarginBand1";
-			// 
-			// ReportFooter
-			// 
-			this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
+            this.topMarginBand1.HeightF = 118.125F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            this.topMarginBand1.StylePriority.UseFont = false;
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 65.00001F);
+            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(660F, 43.125F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.StylePriority.UseTextAlignment = false;
+            this.xrLabel10.Text = "Ambulant Betreutes Wohnen\r\nErftstrasse 76, 41460 Neuss";
+            this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 45F);
+            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(660F, 20F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "BeWo-direkt";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel7,
             this.xrLabel6,
             this.xrLabel5});
-			this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
-			this.ReportFooter.HeightF = 64.70997F;
-			this.ReportFooter.Name = "ReportFooter";
-			this.ReportFooter.StylePriority.UseFont = false;
-			// 
-			// xrLabel7
-			// 
-			this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-			this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(223.0001F, 46.70836F);
-			this.xrLabel7.Name = "xrLabel7";
-			this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-			this.xrLabel7.SizeF = new System.Drawing.SizeF(200F, 17.99997F);
-			this.xrLabel7.StylePriority.UseBorders = false;
-			this.xrLabel7.StylePriority.UseFont = false;
-			this.xrLabel7.Text = "Klient";
-			// 
-			// xrLabel6
-			// 
-			this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-			this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(446F, 46.71F);
-			this.xrLabel6.Name = "xrLabel6";
-			this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-			this.xrLabel6.SizeF = new System.Drawing.SizeF(200F, 17.99997F);
-			this.xrLabel6.StylePriority.UseBorders = false;
-			this.xrLabel6.StylePriority.UseFont = false;
-			this.xrLabel6.Text = "Leitung";
-			// 
-			// xrLabel5
-			// 
-			this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-			this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.70836F);
-			this.xrLabel5.Name = "xrLabel5";
-			this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-			this.xrLabel5.SizeF = new System.Drawing.SizeF(200F, 17.99997F);
-			this.xrLabel5.StylePriority.UseBorders = false;
-			this.xrLabel5.StylePriority.UseFont = false;
-			this.xrLabel5.Text = "Datum";
-			// 
-			// fieldAbrechenbareMinuten
-			// 
-			this.fieldAbrechenbareMinuten.DataMember = "Services";
-			this.fieldAbrechenbareMinuten.Expression = "Iif([IsBillable], [Minutes], 0)";
-			this.fieldAbrechenbareMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
-			this.fieldAbrechenbareMinuten.Name = "fieldAbrechenbareMinuten";
-			// 
-			// fieldBillableFLS
-			// 
-			this.fieldBillableFLS.Expression = "[TotalFLMBillable] / 60";
-			this.fieldBillableFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
-			this.fieldBillableFLS.Name = "fieldBillableFLS";
-			// 
-			// fieldAbrechenbareFLS
-			// 
-			this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2";
-			this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
-			this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
-			// 
-			// fieldGruppe
-			// 
-			this.fieldGruppe.DataMember = "Services";
-			this.fieldGruppe.Expression = "Iif([IsGroup], \'Gruppe\' , \'\')";
-			this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
-			this.fieldGruppe.Name = "fieldGruppe";
-			// 
-			// Stundenzettel
-			// 
-			this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F);
+            this.ReportFooter.HeightF = 64.70997F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(223.0001F, 46.70836F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(200F, 17.99997F);
+            this.xrLabel7.StylePriority.UseBorders = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Klient";
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(446F, 46.71F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(200F, 17.99997F);
+            this.xrLabel6.StylePriority.UseBorders = false;
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = "bewo-direkt";
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.70836F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(200F, 17.99997F);
+            this.xrLabel5.StylePriority.UseBorders = false;
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.Text = "Datum";
+            // 
+            // fieldAbrechenbareMinuten
+            // 
+            this.fieldAbrechenbareMinuten.DataMember = "Services";
+            this.fieldAbrechenbareMinuten.Expression = "Iif([IsBillable], [Minutes], 0)";
+            this.fieldAbrechenbareMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldAbrechenbareMinuten.Name = "fieldAbrechenbareMinuten";
+            // 
+            // fieldBillableFLS
+            // 
+            this.fieldBillableFLS.Expression = "[TotalFLMBillable] / 60";
+            this.fieldBillableFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldBillableFLS.Name = "fieldBillableFLS";
+            // 
+            // fieldAbrechenbareFLS
+            // 
+            this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2";
+            this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
+            // 
+            // fieldGruppe
+            // 
+            this.fieldGruppe.DataMember = "Services";
+            this.fieldGruppe.Expression = "Iif([IsGroup], \'Gruppe\' , \'\')";
+            this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
+            this.fieldGruppe.Name = "fieldGruppe";
+            // 
+            // Stundenzettel
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
             this.Detail,
             this.DetailReport,
             this.ReportHeader,
             this.topMarginBand1,
             this.bottomMarginBand1,
             this.ReportFooter});
-			this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
             this.fieldAbrechenbareMinuten,
             this.fieldBillableFLS,
             this.fieldAbrechenbareFLS,
             this.fieldGruppe});
-			this.DataSource = this.bindingSource1;
-			this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.DataSource = this.bindingSource1;
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.formattingRuleStartDate,
             this.formattingRuleServiceDesc,
             this.formattingRuleCostBearer,
             this.formattingRuleEmployeeName});
-			this.Margins = new System.Drawing.Printing.Margins(50, 50, 118, 30);
-			this.PageHeight = 1169;
-			this.PageWidth = 827;
-			this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-			this.SnapGridSize = 9F;
-			this.Version = "13.1";
-			((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+            this.Margins = new System.Drawing.Printing.Margins(50, 50, 118, 30);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.SnapGridSize = 9F;
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
 

ReportImp/BeWoDirekt/SettlementReport.resx

@@ -140,6 +140,11 @@ Mit freundlichen Grüßen
 
 
 Guido Tümmers</value>
+  </data>
+  <data name="xrLabel2.Text" xml:space="preserve">
+    <value>Eingliederungshilfe nach §§ 113, 78 SGB IX für [Salutation2] [CustomerName], geb. [CustomerBirthdayString]
+Wohnhaft [CustomerStreet] in [CustomerPostalCode] [CustomerTown]
+AZ: [CustomerReferenceNumber]</value>
   </data>
   <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>

ReportImp/BeWoSchillingReports/SettlementReport.Designer.cs

@@ -102,22 +102,22 @@ namespace BeWo.BeWoSchillingReports
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrRichText8 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -884,9 +884,17 @@ namespace BeWo.BeWoSchillingReports
             this.bottomMarginBand1.HeightF = 75F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(162.0845F, 60F);
+            // 
             // xrRichText8
             // 
-            this.xrRichText8.Font = new System.Drawing.Font("Arial", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrRichText8.Font = new System.Drawing.Font("Times New Roman", 9.75F);
             this.xrRichText8.LocationFloat = new DevExpress.Utils.PointFloat(278.0843F, 0F);
             this.xrRichText8.Name = "xrRichText8";
             this.xrRichText8.SerializableRtfString = resources.GetString("xrRichText8.SerializableRtfString");
@@ -917,14 +925,6 @@ namespace BeWo.BeWoSchillingReports
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
             this.xrRichText2.SizeF = new System.Drawing.SizeF(116F, 60F);
             // 
-            // xrRichText1
-            // 
-            this.xrRichText1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrRichText1.Name = "xrRichText1";
-            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(162.0845F, 60F);
-            // 
             // GroupHeader1
             // 
             this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -963,15 +963,16 @@ namespace BeWo.BeWoSchillingReports
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.Version = "17.1";
             this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("Spitzabrechnung.Watermark.Image")));
+            this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom;
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 

ReportImp/BellaDonna/BellaDonna.csproj

@@ -48,6 +48,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Finanzauswertung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Finanzauswertung.designer.cs">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+    </Compile>
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Invoicing\CustomInvoiceNumberGenerator.cs" />
     <Compile Include="Invoicing\DefaultInvoiceCreation.cs" />
@@ -103,6 +109,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Finanzauswertung.resx">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Quittierungsbeleg.resx">
       <DependentUpon>Quittierungsbeleg.cs</DependentUpon>

ReportImp/BellaDonna/CustomReportCreator.cs

@@ -59,7 +59,7 @@ namespace BellaDonna
             {
                 var ib = DAOFactory.GenericDAO.LoadByID<InvoiceBase>(invoiceBaseOid.Value);
 
-                if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Landschaftsverband Rheinland")
+                if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Landschaftsverband Rheinland" || ib.CostBearer2SupportConcept.CostBearer.Organisation.Name == "Amt für Soziales und Wohnen Essen")
                 {
                     var report = new Rechnung67();
                     var si = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoiceBaseOid.Value);

ReportImp/BellaDonna/Finanzauswertung.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+
+namespace BellaDonna
+{
+	public partial class Finanzauswertung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<FinanceRO>
+    {
+        public Finanzauswertung()
+        {
+            InitializeComponent();
+        }
+
+		public void SetReportDataSource(FinanceRO pRO)
+        {
+            pRO.CalculateBillableAmountInReportTimeSpan();
+            CalculatePaidAmountInReportTimeSpan(pRO);
+
+            if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+			{
+				DateTime start = pRO.ReportStartDate.Value;
+				DateTime end = pRO.ReportEndDate.Value;
+
+				if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
+				    end.Day == DateTime.DaysInMonth(end.Year, end.Month))
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
+					
+				}
+				else
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					
+				}
+				if (pRO.RateFactor.HasValue)
+				{
+					cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
+				}
+				else
+				{
+					cellRateFactorHeader.Visible = false;
+					cellRateFactor.Visible = false;
+				}
+				
+			}
+			else
+			{
+				cellBewilligtImZeitraumHeader.Visible = false;
+				cellBewilligteFLSImBereich.Visible = false;
+				cellGeleistetImBereich.Visible = false;
+				cellGeleistetImZeitraumHeader.Visible = false;
+				cellRateFactorHeader.Visible = false;
+				cellRateFactor.Visible = false;
+			}
+            this.bindingSource1.DataSource = pRO;
+        }
+
+        public void CalculatePaidAmountInReportTimeSpan(FinanceRO pRO)
+        {
+            if (pRO.SupportConceptFinanceList != null)
+            {
+                foreach (var scRo in pRO.SupportConceptFinanceList)
+                {
+                    if (scRo.Costbearer2Supportconcept != null)
+                    {
+                        CalculatePaidAmountInReportTimeSpan(scRo, pRO.ReportStartDate ?? DateTime.MinValue, pRO.ReportEndDate ?? DateTime.MaxValue);
+                    }
+                }
+            }
+
+
+        }
+
+        private void CalculatePaidAmountInReportTimeSpan(FinanceRO.SupportConceptFinanceRO scRo, DateTime start, DateTime end)
+        {
+            var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(scRo.Costbearer2Supportconcept
+                .CostBearer2SupportConceptOid.Value);
+
+            var bookingList = c2s.AccountingTransactions;
+
+            bookingList = bookingList.Where(i => i.GueltigkeitsDatum.HasValue && i.GueltigkeitsDatum.Value.Date <= end && i.GueltigkeitsDatum >= start).ToList();
+
+            decimal abschlZahlungen = 0;
+            foreach (var item in bookingList)
+            {
+                abschlZahlungen += item.Amount;
+            }
+
+            
+
+            scRo.AmountPaidInReportTimeSpan = abschlZahlungen;
+        }
+
+    }
+
+}

ReportImp/BellaDonna/Finanzauswertung.designer.cs

@@ -0,0 +1,801 @@
+using BeWo.Report.ReportObjects;
+namespace BellaDonna
+{
+    partial class Finanzauswertung
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRateFactor = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellRateFactorHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Expanded = false;
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.Detail1.Font = new System.Drawing.Font("Arial", 9F);
+            this.Detail1.HeightF = 25F;
+            this.Detail1.KeepTogetherWithDetailReports = true;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(1050F, 25F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            this.xrTable2.StylePriority.UseTextAlignment = false;
+            this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell8,
+            this.xrTableCell10,
+            this.xrTableCell9,
+            this.xrTableCell14,
+            this.xrTableCell12,
+            this.cellBewilligteFLSImBereich,
+            this.cellGeleistetImBereich,
+            this.cellRateFactor,
+            this.xrTableCell26});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
+            this.xrTableCell6.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Mitarbeiter/in";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 0.5317577529262556D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal", "{0:c}")});
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "xrTableCell8";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell8.Weight = 0.44313146794248365D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan", "{0:c}")});
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "xrTableCell9";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell9.Weight = 0.44313146335503761D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount", "{0:c}")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "xrTableCell10";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell10.Weight = 0.44313146284443172D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "xrTableCell14";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell14.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell12.Weight = 0.35450516999471204D;
+            // 
+            // cellBewilligteFLSImBereich
+            // 
+            this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
+            this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellBewilligteFLSImBereich.Weight = 0.35450516993088632D;
+            // 
+            // cellGeleistetImBereich
+            // 
+            this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellGeleistetImBereich.Weight = 0.3545051698989734D;
+            // 
+            // cellRateFactor
+            // 
+            this.cellRateFactor.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor", "{0:0.00}")});
+            this.cellRateFactor.Name = "cellRateFactor";
+            this.cellRateFactor.StylePriority.UseTextAlignment = false;
+            this.cellRateFactor.Text = "cellRateFactor";
+            this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellRateFactor.Weight = 0.35450516989897335D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan", "{0:c}")});
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell26.Weight = 0.35450516989897335D;
+            // 
+            // lblTitel
+            // 
+            this.lblTitel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.lblTitel.Name = "lblTitel";
+            this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblTitel.SizeF = new System.Drawing.SizeF(1030F, 23F);
+            this.lblTitel.StylePriority.UseFont = false;
+            this.lblTitel.Text = "Finanzauswertung";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupFooter1,
+            this.GroupHeader2,
+            this.GroupFooter2});
+            this.DetailReport.DataMember = "SupportConceptFinanceList";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.GroupFooter1.HeightF = 0F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.StylePriority.UseFont = false;
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.GroupHeader2.HeightF = 50F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(1050F, 50F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell2,
+            this.xrTableCell3,
+            this.xrTableCell5,
+            this.xrTableCell4,
+            this.xrTableCell13,
+            this.xrTableCell11,
+            this.cellBewilligtImZeitraumHeader,
+            this.cellGeleistetImZeitraumHeader,
+            this.cellRateFactorHeader,
+            this.xrTableCell25});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1.3953493323567705D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "KlientIn/Hilfeplan";
+            this.xrTableCell1.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Kostenträger";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.53175775292625538D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Gesamt laut Bewilligung";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell3.Weight = 0.44313146794248376D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "Bereits gezahlt";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell4.Weight = 0.44313146335503761D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "Noch offen";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell5.Weight = 0.4431314628444315D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "Bis dato bewilligte FLS";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Bis dato geleistete FLS";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell11.Weight = 0.35450516999471204D;
+            // 
+            // cellBewilligtImZeitraumHeader
+            // 
+            this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader";
+            this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
+            this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellBewilligtImZeitraumHeader.Weight = 0.35450516993088627D;
+            // 
+            // cellGeleistetImZeitraumHeader
+            // 
+            this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
+            this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS";
+            this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGeleistetImZeitraumHeader.Weight = 0.35450516989897335D;
+            // 
+            // cellRateFactorHeader
+            // 
+            this.cellRateFactorHeader.Name = "cellRateFactorHeader";
+            this.cellRateFactorHeader.StylePriority.UseTextAlignment = false;
+            this.cellRateFactorHeader.Text = "geleistete Std. x 1,2";
+            this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellRateFactorHeader.Weight = 0.3545051698989734D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.Text = "Betrag";
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell25.Weight = 0.3545051698989734D;
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.GroupFooter2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+            this.GroupFooter2.HeightF = 25F;
+            this.GroupFooter2.Level = 1;
+            this.GroupFooter2.Name = "GroupFooter2";
+            this.GroupFooter2.StylePriority.UseFont = false;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(1050F, 25F);
+            this.xrTable3.StylePriority.UseBorders = false;
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UsePadding = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell19,
+            this.xrTableCell18,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell24,
+            this.xrTableCell27});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.CanGrow = false;
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.CanGrow = false;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.5317577529262556D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.CanGrow = false;
+            this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountTotal")});
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:c}";
+            xrSummary1.IgnoreNullValues = true;
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell17.Summary = xrSummary1;
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell17.Weight = 0.44313146794248365D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.CanGrow = false;
+            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan")});
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            xrSummary3.FormatString = "{0:c}";
+            xrSummary3.IgnoreNullValues = true;
+            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell18.Summary = xrSummary3;
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell18.Weight = 0.4431314633550375D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.CanGrow = false;
+            this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.OpenAmount")});
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            xrSummary2.FormatString = "{0:c}";
+            xrSummary2.IgnoreNullValues = true;
+            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell19.Summary = xrSummary2;
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell19.Weight = 0.44313146284443172D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.CanGrow = false;
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.IgnoreNullValues = true;
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell20.Summary = xrSummary4;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell20.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanGrow = false;
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            xrSummary5.FormatString = "{0:0.00}";
+            xrSummary5.IgnoreNullValues = true;
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell21.Summary = xrSummary5;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell21.Weight = 0.35450516999471215D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanGrow = false;
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            xrSummary6.FormatString = "{0:0.00}";
+            xrSummary6.IgnoreNullValues = true;
+            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell22.Summary = xrSummary6;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell22.Weight = 0.35450516993088632D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.CanGrow = false;
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpan")});
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            xrSummary7.FormatString = "{0:0.00}";
+            xrSummary7.IgnoreNullValues = true;
+            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell23.Summary = xrSummary7;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell23.Weight = 0.3545051698989734D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.CanGrow = false;
+            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHoursInReportTimeSpanWithFactor")});
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseTextAlignment = false;
+            xrSummary8.FormatString = "{0:0.00}";
+            xrSummary8.IgnoreNullValues = true;
+            xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell24.Summary = xrSummary8;
+            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell24.Weight = 0.35450516989897335D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.StylePriority.UseTextAlignment = false;
+            xrSummary9.FormatString = "{0:c}";
+            xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell27.Summary = xrSummary9;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell27.Weight = 0.35450516989897335D;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblTitel});
+            this.ReportHeader.HeightF = 52.08333F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // pageFooterBand1
+            // 
+            this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPageInfo2,
+            this.xrPageInfo1});
+            this.pageFooterBand1.HeightF = 48F;
+            this.pageFooterBand1.Name = "pageFooterBand1";
+            // 
+            // xrPageInfo2
+            // 
+            this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrPageInfo2.Format = "Seite {0} von {1}";
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(969.9999F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(79.99982F, 23F);
+            this.xrPageInfo2.StyleName = "PageInfo";
+            this.xrPageInfo2.StylePriority.UseFont = false;
+            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrPageInfo1
+            // 
+            this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrPageInfo1.Name = "xrPageInfo1";
+            this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+            this.xrPageInfo1.SizeF = new System.Drawing.SizeF(270.0002F, 23F);
+            this.xrPageInfo1.StyleName = "PageInfo";
+            this.xrPageInfo1.StylePriority.UseFont = false;
+            // 
+            // Title
+            // 
+            this.Title.BackColor = System.Drawing.Color.White;
+            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+            this.Title.ForeColor = System.Drawing.Color.Black;
+            this.Title.Name = "Title";
+            // 
+            // FieldCaption
+            // 
+            this.FieldCaption.BackColor = System.Drawing.Color.White;
+            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+            this.FieldCaption.Name = "FieldCaption";
+            // 
+            // PageInfo
+            // 
+            this.PageInfo.BackColor = System.Drawing.Color.White;
+            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.PageInfo.ForeColor = System.Drawing.Color.Black;
+            this.PageInfo.Name = "PageInfo";
+            // 
+            // DataField
+            // 
+            this.DataField.BackColor = System.Drawing.Color.White;
+            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // fieldFLS
+            // 
+            this.fieldFLS.DataMember = "FLSReportGroups";
+            this.fieldFLS.DataSource = this.bindingSource1;
+            this.fieldFLS.Expression = "[TotalFLM] / 60";
+            this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldFLS.Name = "fieldFLS";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ReportFooter.HeightF = 31.25F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // Finanzauswertung
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter});
+            this.DataSource = this.bindingSource1;
+            this.Landscape = true;
+            this.Margins = new System.Drawing.Printing.Margins(55, 55, 50, 30);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel lblTitel;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellRateFactorHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellRateFactor;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+		private DevExpress.XtraReports.UI.XRTable xrTable3;
+		private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+		private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+    }
+}

ReportImp/BellaDonna/Finanzauswertung.resx

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

ReportImp/BellaDonna/Invoicing/DefaultInvoiceCreation.cs

@@ -16,9 +16,32 @@ namespace BellaDonna.Invoicing
     {
         public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
         {
+            
             base.SetRecipientInformation(serviceInvoice, costBearer);
-           
-            if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
+
+            if (costBearer.Organisation.Name.Contains("Jugendamt"))
+            {
+                if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null &&
+                    serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson != null)
+                {
+                    var address = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson
+                        .InvoiceAddress;
+                    if (address == null)
+                    {
+                        address = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson
+                            .Address;
+                    }
+
+                    if (address != null)
+                    {
+                        serviceInvoice.InvoiceBase.RecipientAddress = address.CopyToNew();
+
+                        serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName;
+                        serviceInvoice.InvoiceBase.RecipientPersonLastName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.LastName;
+                    }
+                }
+            }
+            else if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
             {
                 var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
 

ReportImp/BellaDonna/ServiceInvoiceReport.cs

@@ -4,7 +4,7 @@ using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
-
+using BS.Shared;
 using DevExpress.XtraReports.UI;
 
 namespace BellaDonna
@@ -41,9 +41,7 @@ namespace BellaDonna
         private void SetzeAdresse(ServiceInvoiceRO pRO)
         {
             StringBuilder sb = new StringBuilder();
-
-            long? customerOid = pRO.CustomerOid;
-            if (!customerOid.HasValue)
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.Contains("Jugendamt"))
             {
                 if (pRO.InvoiceBase.SupportConceptCostBearerRelDc != null)
                 {
@@ -51,36 +49,63 @@ namespace BellaDonna
                     if (c2sOid.HasValue)
                     {
                         var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(c2sOid.Value);
-                        customerOid = c2s.SupportConcept.Customer.Oid;
+                        var p = c2s.CostBearerContactPerson;
+                        if (p != null)
+                        {
+                            pRO.RecipientContactPerson = "Frau ";
+                            if (p.Sex.HasValue && p.Sex.Value == Sex.Male)
+                            {
+                                pRO.RecipientContactPerson = "Herr ";
+                            }
+
+                            pRO.RecipientContactPerson += p.FirstNameLastName;
+                        }
                     }
                 }
-                
             }
-            if (customerOid.HasValue)
+            else
             {
-                Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(customerOid.Value);
-
-                if (c.Person.InvoiceAddress != null)
+                long? customerOid = pRO.CustomerOid;
+                if (!customerOid.HasValue)
                 {
-                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine1))
+                    if (pRO.InvoiceBase.SupportConceptCostBearerRelDc != null)
                     {
-                        sb.AppendLine(c.Person.InvoiceAddress.AddressLine1);
-                    }
-                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine2))
-                    {
-                        sb.AppendLine(c.Person.InvoiceAddress.AddressLine2);
-                    }
-                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.Street))
-                    {
-                        sb.AppendLine(c.Person.InvoiceAddress.Street);
-                    }
-                    if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.PostalCode) || !String.IsNullOrEmpty(c.Person.InvoiceAddress.Town))
-                    {
-                        sb.AppendLine(String.Format("{0} {1}", c.Person.InvoiceAddress.PostalCode, c.Person.InvoiceAddress.Town).Trim());
+                        var c2sOid = pRO.InvoiceBase.SupportConceptCostBearerRelDc.CostBearer2SupportConceptOid;
+                        if (c2sOid.HasValue)
+                        {
+                            var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(c2sOid.Value);
+                            customerOid = c2s.SupportConcept.Customer.Oid;
+                        }
                     }
 
                 }
+                if (customerOid.HasValue)
+                {
+                    Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(customerOid.Value);
+
+                    if (c.Person.InvoiceAddress != null)
+                    {
+                        if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine1))
+                        {
+                            sb.AppendLine(c.Person.InvoiceAddress.AddressLine1);
+                        }
+                        if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.AddressLine2))
+                        {
+                            sb.AppendLine(c.Person.InvoiceAddress.AddressLine2);
+                        }
+                        if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.Street))
+                        {
+                            sb.AppendLine(c.Person.InvoiceAddress.Street);
+                        }
+                        if (!String.IsNullOrEmpty(c.Person.InvoiceAddress.PostalCode) || !String.IsNullOrEmpty(c.Person.InvoiceAddress.Town))
+                        {
+                            sb.AppendLine(String.Format("{0} {1}", c.Person.InvoiceAddress.PostalCode, c.Person.InvoiceAddress.Town).Trim());
+                        }
+
+                    }
+                }
             }
+            
 
             if (sb.Length == 0)
             {
@@ -88,17 +113,20 @@ namespace BellaDonna
                 {
                     sb.AppendLine(pRO.RecipientOrganisation);
                 }
-
-                if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+                if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1))
                 {
-                    sb.AppendLine(pRO.RecipientContactPerson);
+                    sb.AppendLine(pRO.RecipientAddressLine1);
                 }
-
                 if (!String.IsNullOrEmpty(pRO.RecipientDivision))
                 {
                     sb.AppendLine(pRO.RecipientDivision);
                 }
 
+                if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+                {
+                    sb.AppendLine(pRO.RecipientContactPerson);
+                }
+                
                 if (!String.IsNullOrEmpty(pRO.RecipientStreet))
                 {
                     sb.AppendLine(pRO.RecipientStreet);

ReportImp/BetreutesWohnenAmRheinReports/SettlementReport.Designer.cs

@@ -91,9 +91,9 @@ namespace BeWo.BetreutesWohnenAmRheinReports
             this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -360,9 +360,6 @@ namespace BeWo.BetreutesWohnenAmRheinReports
             // ruleRateFactorNull
             // 
             this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
-            // 
-            // 
-            // 
             this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.ruleRateFactorNull.Name = "ruleRateFactorNull";
             // 
@@ -784,10 +781,6 @@ namespace BeWo.BetreutesWohnenAmRheinReports
             this.xrLabel7.StylePriority.UseFont = false;
             this.xrLabel7.Text = "Abschließende Bemerkungen:";
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
-            // 
             // topMarginBand1
             // 
             this.topMarginBand1.HeightF = 20F;
@@ -798,6 +791,10 @@ namespace BeWo.BetreutesWohnenAmRheinReports
             this.bottomMarginBand1.HeightF = 50F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -814,7 +811,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.1";
+            this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();

ReportImp/BetreutesWohnenAmRheinReports/SettlementReport.cs

@@ -17,6 +17,7 @@ namespace BeWo.BetreutesWohnenAmRheinReports
 
         public void SetReportDataSource(SettlementRO pRO)
         {
+            pRO.CustomerReferenceNumberAndDate = pRO.CustomerReferenceNumberAndDate.Replace("Az.:", "GP:");
             this.bindingSource1.DataSource = pRO;
         }
     }

ReportImp/BetreutesWohnenAmRheinReports/SettlementReport2.cs

@@ -18,10 +18,9 @@ namespace BeWo.BetreutesWohnenAmRheinReports.Neu
         public void SetReportDataSource(Settlement2RO pRO)
         {
             if (pRO.RateFactor > 0)
-            {
                 cellRateFactor.Text = String.Format("{0:c}", pRO.AmountBillableTotal - (pRO.AmountBillableTotal / (decimal)pRO.RateFactor));
-            }
 
+            pRO.CustomerReferenceNumberAndDate = pRO.CustomerReferenceNumberAndDate.Replace("Az.:", "GP:");
             this.bindingSource1.DataSource = pRO;
         }
     }

ReportImp/BetreuwoWesel/BetreuwoWesel.csproj

@@ -177,6 +177,8 @@
     <Compile Include="ServicesOverviewReportFLS.designer.cs">
       <DependentUpon>ServicesOverviewReportFLS.cs</DependentUpon>
     </Compile>
+    <Compile Include="Service\CustomCustomerService.cs" />
+    <Compile Include="Service\CustomEmployeeService.cs" />
     <Compile Include="SettlementReport.cs">
       <SubType>Component</SubType>
     </Compile>

ReportImp/BetreuwoWesel/Service/CustomCustomerService.cs

@@ -0,0 +1,59 @@
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+
+namespace BetreuWoWesel
+{
+    public class CustomCustomerService : CustomerService
+    {
+        
+        public override long InsertNewCustomer(CustomerDC pCustomerDc)
+        {
+            var cOid = base.InsertNewCustomer(pCustomerDc);
+
+            CreateBeWoFolder("01 Bewilligungsbescheid Kostenträger", cOid, null);
+            CreateBeWoFolder("02 IHP", cOid, null);
+            CreateBeWoFolder("03 Reflexionsgespräche", cOid, null);
+            CreateBeWoFolder("04 Gesetzliche Betreuung ", cOid, null);
+            CreateBeWoFolder("05 Gesundheitsfürsorge", cOid, null);
+            CreateBeWoFolder("06 Aktennotizen", cOid, null);
+            CreateBeWoFolder("07 FuD", cOid, null);
+            CreateBeWoFolder("08 Betreuungsverträge", cOid, null);
+            CreateBeWoFolder("09 Sonstige", cOid, null);
+            
+            return cOid;
+        }
+
+        private void CreateBeWoFolder(string name, long? cOid, long? parentOid)
+        {
+            BeWoFolder f = new BeWoFolder();
+            f.Name = name;
+            f.ObjectOid = cOid;
+            f.ObjectTid = TableID.Customer;
+            f.ParentBeWoFolderOid = parentOid;
+
+            DAOFactory.GenericDAO.Insert(f);
+        }
+    }
+
+    public class Folder
+    {
+        public Folder(String name)
+        {
+            Name = name;
+            Subfolder = new List<Folder>();
+        }
+        public String Name { get; set; }
+
+        public List<Folder> Subfolder { get; set; }
+    }
+}

ReportImp/BetreuwoWesel/Service/CustomEmployeeService.cs

@@ -0,0 +1,43 @@
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetreuWoWesel
+{
+    public class CustomEmployeeService : EmployeeService
+    {
+        public override long InsertNewEmployee(EmployeeDC pEmployeeDC)
+        {
+            var eOid = base.InsertNewEmployee(pEmployeeDC);
+
+            var folder01 = CreateBeWoFolder("01 Arbeitsverträge", eOid, null);
+            CreateBeWoFolder("Nicht unterschrieben", eOid, folder01.Oid);
+            CreateBeWoFolder("02 Arbeitszeugnisse", eOid, null);
+            CreateBeWoFolder("03 Krankenkasse, Versicherung", eOid, null);
+            CreateBeWoFolder("04 Sonstige Unterlagen", eOid, null);
+
+
+            return eOid;
+        }
+
+        private BeWoFolder CreateBeWoFolder(string name, long? eOid, long? parentOid)
+        {
+            BeWoFolder f = new BeWoFolder();
+            f.Name = name;
+            f.ObjectOid = eOid;
+            f.ObjectTid = TableID.Employee;
+            f.ParentBeWoFolderOid = parentOid;
+
+            DAOFactory.GenericDAO.Insert(f);
+
+            return f;
+        }
+    }
+}

ReportImp/BetreuwoWesel/ServiceInvoiceReport.resx

@@ -2991,7 +2991,7 @@
 </value>
   </data>
   <data name="xrRichText5.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABBAHUAZgBzAGkAYwBoAHQAcwByAGEAdABcAGwAaQBuAGUAIABWAG8AcgBzAGkAdAB6AGUAbgBkAGUAcgAgAGQAZQBzACAAQQBSACwAIAB9AHsAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASgBcAHUAMgA1ADIAXAAnAGYAYwByAGcAZQBuACAATABhAG4AdABlAHIAbQBhAG4AbgB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAcwBsADIANQA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAYgBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQAgAEUAbABpAHMAYQBiAGUAdABoACAARwBcAHUAMgA0ADYAXAAnAGYANgByAGwAaQBjAGgAfQB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAXABsAGkAbgBlACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABNAGEAcgB0AGkAbgBhACAAQgBhAHUAaABhAHUAcwB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAcwBsADIANQA4AFwAcwBsAG0AdQBsAHQAMQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABIAGUAaQBrAGUAIAB2AG8AbgAgAEcAaQBtAGIAbwByAG4AfQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAH0A</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABBAHUAZgBzAGkAYwBoAHQAcwByAGEAdABcAGwAaQBuAGUAIABWAG8AcgBzAGkAdAB6AGUAbgBkAGUAcgAgAGQAZQBzACAAQQBSACwAIAB9AHsAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAASgBcAHUAMgA1ADIAXAAnAGYAYwByAGcAZQBuACAATABhAG4AdABlAHIAbQBhAG4AbgB9AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAcwBsADIANQA4AFwAcwBsAG0AdQBsAHQAMQBcAGYAMgBcAGYAcwAxADYAXABjAGYAMQBcAHAAYQByAH0A</value>
   </data>
   <data name="xrRichText4.SerializableRtfString" xml:space="preserve">
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAHsAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABWAG8AcgBzAHQAYQBuAGQAfQBcAGIAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMgA1ADgAXABzAGwAbQB1AGwAdAAxAHsAXABiAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAQgBpAHIAZwBpAHQAIABNAGUAbABjAGgAZQByAHMAfQB7AFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAXABsAGkAbgBlACAAQQBtAHQAcwBnAGUAcgBpAGMAaAB0ACAAVwBlAHMAZQBsACwAIABWAGUAcgBlAGkAbgBzAHIAZQBnAGkAcwB0AGUAcgBuAHUAbQBtAGUAcgAgADUANQA3ADgAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==</value>

ReportImp/Bussmannshof/Budgetnachweis.cs

@@ -10,7 +10,7 @@ using DevExpress.XtraReports.UI;
 namespace Bussmannshof
 {
     [IDSpecificClass(Identifier = "LWLNEU")]
-    public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
+    public partial class Budgetnachweis : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport<SettlementRO>
     {
         public Budgetnachweis()
         {

ReportImp/Bussmannshof/BudgetnachweisAnhang.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Linq;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+namespace Bussmannshof
+{
+	public partial class BudgetnachweisAnhang : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<BudgetnachweisAnhangRO>
+	{
+		public BudgetnachweisAnhang()
+		{
+			InitializeComponent();
+		}
+
+		public void SetReportDataSource(BudgetnachweisAnhangRO pRO)
+		{
+		    if (!String.IsNullOrEmpty(pRO.CustomerDC.LastName))
+		    {
+		        //pRO.CustomerDC.LastName = pRO.CustomerDC.LastName.Replace("/", "").Replace("LWL Psych", "").Replace("LWL Sucht", "").Trim();
+
+
+		    }
+			//if (pRO.Transaktionen != null)
+			//{
+			//	pRO.Transaktionen = pRO.Transaktionen.OrderBy(o => o.Belegdatum).ToList();
+			//}
+			
+			bindingSource1.DataSource = pRO;
+		}
+	}
+}

ReportImp/Bussmannshof/BudgetnachweisAnhang.resx

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

ReportImp/Bussmannshof/Bussmannshof.csproj

@@ -48,6 +48,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BudgetnachweisAnhang.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BudgetnachweisAnhang.Designer.cs">
+      <DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CustomReportCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Reporting\ReportCreator.cs" />
     <Compile Include="SettlementReport.cs">
@@ -64,6 +71,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="BudgetnachweisAnhang.resx">
+      <DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="SettlementReport.resx">
       <DependentUpon>SettlementReport.cs</DependentUpon>
@@ -93,7 +104,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Invoiceing\" />
+    <Folder Include="Invoicing\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

ReportImp/Bussmannshof/CustomReportCreator.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using DevExpress.XtraReports.Design;
+using DevExpress.XtraReports.UI;
+
+namespace Bussmannshof
+{
+	public class CustomReportCreator : DefaultReportCreator
+	{
+        public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
+        {
+            return base.CreateSettlementReport(dcId, invoiceBaseOid, true);
+        }
+
+    }
+}

ReportImp/Bussmannshof/SettlementReport.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
-using BeWo.Report;
 using BeWo.Report.ReportObjects;
+using BeWo.Report;
 using BS.Shared.DataContracts;
+using DevExpress.XtraReports.UI;
 
 namespace Bussmannshof
 {
@@ -17,206 +20,24 @@ namespace Bussmannshof
 
         public void SetReportDataSource(SettlementRO pRO)
         {
-	        bool isDefaultSpitzabrechnung = false;
+            xrCheckBox2.Checked = true;
 
-			if (String.IsNullOrEmpty(pRO.Notice))
-			{
-				lblNotice.Visible = false;
-			}
+            if (pRO.CostBearer2SupportConceptOid > 0)
+            {
+                var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
 
-	        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 (c2s.SupportConcept.Customer.TerminationDate.HasValue)
+                {
+                    xrCheckBox1.Text = String.Format(" Die Betreuung wurde beendet am {0:dd.MM.yyyy}",
+                        c2s.SupportConcept.Customer.TerminationDate);
+                    xrCheckBox2.Checked = false;
+                    xrCheckBox1.Checked = 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.##} 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.##} FLS {3}x {4:c}",
-								ii.ItemPeriodStart, ii.ItemPeriodEnd,
-								ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
-								ii.AmountPerUnit);
-						}
-					}
-				}
-	        }
-	        
-
-	        this.bindingSource1.DataSource = pRO;
+            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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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.##} 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/Bussmannshof/SettlementReport.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,9 +117,13 @@
   <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 name="xrLabel4.Text" xml:space="preserve">
+    <value>Sollte sich bei der Abrechnung der FLS ein Auszahlungsbetrag zu unseren Gunsten ergeben, bitten wir um Erstattung auf folgendes Konto:
+
+Kreditinstitut: Sparkasse Bochum   IBAN: DE39 4305 0001 0016 0007 05</value>
+  </data>
+  <data name="xrLabel12.Text" xml:space="preserve">
+    <value>Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§ 75 ff. SGB XII bzw. §§ 125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§ 2 Abs.1 der Vergütungsvereinbarung).</value>
   </data>
   <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>