From 4dcd71e6cba6850d9e2d427993d40dad1f7e9809 Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@beyondsoft.de>
Date: Wed, 31 Jul 2019 14:49:49 +0200
Subject: [PATCH 1/3] =?UTF-8?q?FlexibleReport:=20Mehr=20Filter=20M=C3=B6gl?=
 =?UTF-8?q?ichkeiten=20Datenmenge=20weiter=20reduziert=20Code=20aufger?=
 =?UTF-8?q?=C3=A4umt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/Core/BeWoUtils.cs                        |   2 +-
 BeWo/MainWindow.xaml.cs                       |   5 +-
 .../Detail/Report/FlexibleReportView.xaml     |  91 ++--
 .../Detail/Report/FlexibleReportView.xaml.cs  | 204 ++++----
 Data/Entities/Customer.cs                     |  20 +
 Data/Entities/Person.cs                       |   5 +
 Data/Entities/SupportConcept.cs               |   5 +
 Service/Plugins/FlexibleReportService.cs      | 458 ++++++++----------
 Shared/BeWoEntityEnums.cs                     |   9 +-
 Shared/Core/DateTimeSpan.cs                   |  11 +
 Shared/DataContracts/FlexibleReportDummyDC.cs |   7 +-
 Shared/DataContracts/FlexibleReportEntryDC.cs |   4 +-
 .../DataContracts/FlexibleReportFilterDC.cs   |  27 ++
 .../DataContracts/FlexibleReportResultDC.cs   |   1 +
 14 files changed, 464 insertions(+), 385 deletions(-)

diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index c5213ee0a..f048298e0 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -1951,7 +1951,7 @@ namespace BeWo.Core
 				ThemeManager.SetTheme(window, Theme.Office2010Black);
 			}
 
-			ThemeManager.SetTheme(documentPreviewControl, Theme.Office2007Black);
+			//ThemeManager.SetTheme(documentPreviewControl, Theme.Office2007Black);
 
 			documentPreviewControl.DocumentSource = report;
 
diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs
index dbcc36e9e..6fba923e1 100644
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using BeWo.Core.Config;
 using BeWo.MultiLanguage;
 using BS.Shared.Translation;
-
+using DevExpress.Xpf.Core;
 
 namespace BeWo
 {
@@ -16,6 +16,9 @@ namespace BeWo
         public MainWindow()
         {
             InitializeComponent();
+
+            ApplicationThemeHelper.ApplicationThemeName = "Office2010Black";
+
             ShowLoginControl();
         }
 
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml b/BeWo/View/Detail/Report/FlexibleReportView.xaml
index e3246be41..5ebdf2a00 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml
@@ -20,6 +20,7 @@
           <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="*" />
@@ -40,6 +41,7 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
           </Grid.ColumnDefinitions>
           <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -49,10 +51,11 @@
           <Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" />
           <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
           <Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" />
-          <Button Content="Ansicht speichern" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
-          <Button Content="Ansicht bearbeiten" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
-          <Button Content="Ansicht laden" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
-          <Button Content="Ansicht drucken" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
+          <Button Content="Optionen anzeigen" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" />
+          <Button Content="Ansicht speichern" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
+          <Button Content="Ansicht bearbeiten" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
+          <Button Content="Ansicht laden" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
+          <Button Content="Ansicht drucken" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
         </Grid>
         <!-- ############################################### Mittlere Zeile ###############################################-->
         <Grid Grid.Row="1">
@@ -81,35 +84,69 @@
         </Grid>
         <!-- ############################################### Untere Zeile ###############################################-->
         <Grid Grid.Row="2">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <CheckBox Content="Hilfepläne" Grid.Column="0" Margin="5,5,0,0" x:Name="checkHilepläne"/>
+          <CheckBox Content="Klienten" Grid.Column="1" Margin="5,5,0,0" x:Name="checkKlienten"/>
+          <CheckBox Content="Mitarbeiter" Grid.Column="2" Margin="5,5,0,0" x:Name="checkMitarbeiter"/>
+          <CheckBox Content="Records" Grid.Column="3" Margin="5,5,0,0" x:Name="checkRecords"/>
+          <CheckBox Content="Betrag" Grid.Column="4" Margin="5,5,0,0" x:Name="checkBetrag"/>
+          <CheckBox Content="Kilometer" Grid.Column="5" Margin="5,5,0,0" x:Name="checkKilometer"/>
+          <CheckBox Content="Ist" Grid.Column="6" Margin="5,5,0,0" x:Name="checkIst"/>
+          <CheckBox Content="Soll" Grid.Column="7" Margin="5,5,0,0" x:Name="checkSoll"/>
+        </Grid>
+        <!-- ############################################### PivotGridControl ###############################################-->
+        <Grid Grid.Row="3">
           <Grid.Resources>
           </Grid.Resources>
           <dxlc:LayoutControl x:Name="mainLayout" AllowItemSizing="True" Padding="12" Orientation="Vertical">
             <dxlc:LayoutGroup dxlc:LayoutControl.AllowVerticalSizing="True" Margin="0,0,0,4">
               <dxpg:PivotGridControl  x:Name="myPivotGridControl" RowTreeWidth="225" Visibility="Visible" DataProcessingEngine="LegacyOptimized" Margin="0,10,0,0"  dx:ThemeManager.ThemeName="Office2010Black" CustomCellDisplayText="GridControl_CustomCellDisplayText" CustomFieldValueCells="GridControl_CustomFieldValueCells"
-      ChartProvideDataByColumns="False" ChartSelectionOnly="True" ChartProvideColumnGrandTotals="True" ChartProvideRowGrandTotals="True" ChartDataProvideMode="UseCustomSettings" CustomValueAppearance="MyPivotGridControl_CustomValueAppearance" CustomCellAppearance="MyPivotGridControl_CustomCellAppearance">
+      ChartProvideDataByColumns="False" ChartSelectionOnly="True" ChartProvideColumnGrandTotals="False" ChartProvideRowGrandTotals="True" ChartDataProvideMode="UseCustomSettings" CustomValueAppearance="MyPivotGridControl_CustomValueAppearance" CustomCellAppearance="MyPivotGridControl_CustomCellAppearance" CustomGroupInterval="MyPivotGridControl_CustomGroupInterval" CustomFieldSort="MyPivotGridControl_CustomFieldSort">
+                <dxpg:PivotGridControl.ExcelFieldListState>
+                  <dx:DefaultColumnChooserState Size="400,550" />
+                </dxpg:PivotGridControl.ExcelFieldListState>
                 <dxpg:PivotGridControl.Fields>
-                  <dxpg:PivotGridField x:Name="FlexibleJahr"                      FieldName="Datum"                       Area="ColumnArea"       Width="100"     Caption="Jahr"                  AllowedAreas="ColumnArea,FilterArea"    GroupInterval="DateYear"                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleMonat"                     FieldName="Datum"                       Area="ColumnArea"       Width="80"      Caption="Monat"                 AllowedAreas="ColumnArea,FilterArea"    GroupInterval="DateMonth"                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleWeek"                      FieldName="Datum"                       Area="ColumnArea"       Width="80"      Caption="Woche"                 AllowedAreas="ColumnArea,FilterArea"    GroupInterval="DateWeekOfYear" ValueFormat="KW {0}"         />
-                  <dxpg:PivotGridField x:Name="FlexibleTag"                       FieldName="Datum"                       Area="FilterArea"       Width="40"      Caption="Tag"                   AllowedAreas="ColumnArea,FilterArea"    GroupInterval="DateDay"                                     />
-                  <dxpg:PivotGridField x:Name="FlexibleKlient"                    FieldName="CustomerString"              Area="RowArea"          Width="200"     Caption="Klient"                AllowedAreas="RowArea,FilterArea"       AreaIndex="2" Height="21" SortOrder="Ascending"             />
-                  <dxpg:PivotGridField x:Name="FlexibleSupportConcept"            FieldName="SupportConceptString"        Area="FilterArea"       Width="200"     Caption="Hilfeplan"             AllowedAreas="RowArea,FilterArea"                                                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleMitarbeiter"               FieldName="EmployeeString"              Area="RowArea"          Width="200"     Caption="Mitarbeiter"           AllowedAreas="RowArea,FilterArea"       AreaIndex="1"                                               />
-                  <dxpg:PivotGridField x:Name="FlexibleTeam"                      FieldName="Team"                        Area="FilterArea"       Width="200"     Caption="Team"                  AllowedAreas="RowArea,FilterArea"                                                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleLeistungskategorie"        FieldName="Leistungskategorie"          Area="FilterArea"       Width="200"     Caption="Leistungskategorie"    AllowedAreas="RowArea,FilterArea"                                                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleLeistung"                  FieldName="Leistung"                    Area="FilterArea"       Width="200"     Caption="Leistung"              AllowedAreas="RowArea,FilterArea"                                                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleOrganisation"              FieldName="Organisation"                Area="FilterArea"       Width="200"     Caption="Kostenträger"          AllowedAreas="RowArea,FilterArea"                                                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlMinIst"              FieldName="AnzahlMinutenIst"            Area="FilterArea"       Width="60"      Caption="Ist Min."              AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlStdIst"              FieldName="AnzahlStundenIst"            Area="DataArea"         Width="80"      Caption="Ist Std."              AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlMinSoll"             FieldName="AnzahlMinutenSoll"           Area="FilterArea"       Width="60"      Caption="Soll Min."             AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlStdSoll"             FieldName="AnzahlStundenSoll"           Area="DataArea"         Width="80"      Caption="Soll Std."             AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer"        FieldName="Kilometer"                   Area="FilterArea"       Width="200"     Caption="Gefahrene Kilometer"   AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleBetrag"                    FieldName="Betrag"                      Area="FilterArea"       Width="80"      Caption="Betrag"                AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleStundensatz"               FieldName="Stundensatz"                 Area="FilterArea"       Width="80"      Caption="Stundensatz"           AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleRundungspotenzial"         FieldName="Rundungspotenzial"           Area="FilterArea"       Width="80"      Caption="Rundungspotenzial"     AllowedAreas="DataArea,FilterArea"                                                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollMin"       FieldName="DifferenzIstSollMinuten"     Area="FilterArea"       Width="80"      Caption="Differenz Min."        AllowedAreas="DataArea,FilterArea"      HideEmptyVariationItems="True"                              />
-                  <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollStd"       FieldName="DifferenzIstSollStunden"     Area="DataArea"         Width="80"      Caption="Differenz Std."        AllowedAreas="DataArea,FilterArea"      HideEmptyVariationItems="True"                              />
-                  <dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichung"    UnboundFieldName="ProzAbweichung"       Area="DataArea"         Width="80"      Caption="Prozentual Abweichung" AllowedAreas="DataArea,FilterArea"      />
+                  <dxpg:PivotGridField x:Name="FlexibleJahr"                      FieldName="Datum"                       Area="ColumnArea"       Width="100"     Caption="Jahr"                  AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateYear"                                    />
+                  <dxpg:PivotGridField x:Name="FlexibleMonat"                     FieldName="Datum"                       Area="ColumnArea"       Width="80"      Caption="Monat"                 AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"                       GroupInterval="DateMonth"                                   />
+                  <dxpg:PivotGridField x:Name="FlexibleWeek"                      FieldName="Datum"                       Area="ColumnArea"       Width="80"      Caption="Woche"                 AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"                       GroupInterval="DateWeekOfYear" ValueFormat="KW {0}"         />
+                  <dxpg:PivotGridField x:Name="FlexibleDatum"                     FieldName="Datum"                       Area="FilterArea"       Width="100"     Caption="Datum"                 AllowedAreas="ColumnArea,FilterArea"   DisplayFolder="Spalten"    Visible="False"    GroupInterval="Custom"                                     />
+                  <dxpg:PivotGridField x:Name="FlexibleQuarter"                   FieldName="Datum"                       Area="FilterArea"       Width="100"     Caption="Quartal"               AllowedAreas="ColumnArea,FilterArea"   DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateQuarter"                                     />
+                  <dxpg:PivotGridField x:Name="FlexibleTag"                       FieldName="Datum"                       Area="FilterArea"       Width="40"      Caption="Tag"                   AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateDay"                                     />
+                  <dxpg:PivotGridField x:Name="FlexibleTagYear"                   FieldName="Datum"                       Area="FilterArea"       Width="40"      Caption="Tag Jahr"              AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateDayOfYear"                                     />
+                  <dxpg:PivotGridField x:Name="FlexibleKlient"                    FieldName="CustomerString"              Area="RowArea"          Width="200"     Caption="Klient"                AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"                        AreaIndex="2" Height="21" SortOrder="Ascending"             />
+                  <dxpg:PivotGridField x:Name="FlexibleSupportConcept"            FieldName="SupportConceptString"        Area="FilterArea"       Width="200"     Caption="Hilfeplan"             AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                  <dxpg:PivotGridField x:Name="FlexibleMitarbeiter"               FieldName="EmployeeString"              Area="RowArea"          Width="200"     Caption="Mitarbeiter"           AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"    AreaIndex="1"                                               />
+                  <dxpg:PivotGridField x:Name="FlexibleTeam"                      FieldName="Team"                        Area="FilterArea"       Width="200"     Caption="Team"                  AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                  <dxpg:PivotGridField x:Name="FlexibleLeistungskategorie"        FieldName="Leistungskategorie"          Area="FilterArea"       Width="200"     Caption="Leistungskategorie"    AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                       />
+                  <dxpg:PivotGridField x:Name="FlexibleLeistung"                  FieldName="Leistung"                    Area="FilterArea"       Width="200"     Caption="Leistung"              AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                  <dxpg:PivotGridField x:Name="FlexibleOrganisation"              FieldName="Organisation"                Area="FilterArea"       Width="200"     Caption="Kostenträger"          AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                  <dxpg:PivotGridField x:Name="FlexibleAnzahlMinIst"              FieldName="IstMinuten"                  Area="FilterArea"       Width="60"      Caption="Ist Min."              AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                  <dxpg:PivotGridField x:Name="FlexibleAnzahlStdIst"              FieldName="IstStunden"                  Area="DataArea"         Width="80"      Caption="Ist Std."              AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"                                                            />
+                  <dxpg:PivotGridField x:Name="FlexibleAnzahlMinSoll"             FieldName="SollMinuten"                 Area="FilterArea"       Width="60"      Caption="Soll Min."             AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                  <dxpg:PivotGridField x:Name="FlexibleAnzahlStdSoll"             FieldName="SollStunden"                 Area="DataArea"         Width="80"      Caption="Soll Std."             AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"                                                             />
+                  <dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer"        FieldName="Kilometer"                   Area="FilterArea"       Width="200"     Caption="Gefahrene Kilometer"   AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                  <dxpg:PivotGridField x:Name="FlexibleBetrag"                    FieldName="Betrag"                      Area="FilterArea"       Width="80"      Caption="Betrag"                AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                  <dxpg:PivotGridField x:Name="FlexibleStundensatz"               FieldName="Stundensatz"                 Area="FilterArea"       Width="80"      Caption="Stundensatz"           AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                  <dxpg:PivotGridField x:Name="FlexibleRundungspotenzial"         FieldName="Rundungspotenzial"           Area="FilterArea"       Width="80"      Caption="Rundungspotenzial"     AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                  <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollMin"       FieldName="DifferenzIstSollMinuten"     Area="FilterArea"       Width="80"      Caption="Differenz Min."        AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"  HideEmptyVariationItems="True"                              />
+                  <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollStd"       FieldName="DifferenzIstSollStunden"     Area="DataArea"         Width="80"      Caption="Differenz Std."        AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"  HideEmptyVariationItems="True"                              />
+                  <dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichung"    UnboundFieldName="ProzAbweichung"       Area="DataArea"         Width="80"      Caption="Prozentual Abweichung" AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"/>
                 </dxpg:PivotGridControl.Fields>
               </dxpg:PivotGridControl>
             </dxlc:LayoutGroup>
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
index f56d4254b..65b177181 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
@@ -28,6 +28,8 @@ using MessageBox = System.Windows.MessageBox;
 using BeWo.Data.Access;
 using DevExpress.XtraReports.UI;
 using DevExpress.Data.PivotGrid;
+using System.Windows.Media;
+using DevExpress.Utils.Gesture;
 
 namespace BeWo.View.Detail.Report
 {
@@ -60,6 +62,13 @@ namespace BeWo.View.Detail.Report
             FlexibleGefahreneKilometer.CellFormat = "{0:N0}";
             FlexibleRundungspotenzial.CellFormat = "{0:N0}";
 
+            FlexibleGefahreneKilometer.CellFormat = "{0:N0}";
+            FlexibleKlient.TotalValueFormat = "{0}";
+            FlexibleMitarbeiter.TotalValueFormat = "{0}";
+            FlexibleLeistung.TotalValueFormat = "{0}";
+            FlexibleLeistungskategorie.TotalValueFormat = "{0}";
+            FlexibleQuarter.ValueFormat = "{0}. Quartal";
+
             UFlexibleProzentualeAbweichung.UnboundExpressionMode = FieldUnboundExpressionMode.UseAggregateFunctions;
             UFlexibleProzentualeAbweichung.UnboundType = FieldUnboundColumnType.Decimal;
             UFlexibleProzentualeAbweichung.CellFormat = "{0:P2}";
@@ -68,14 +77,14 @@ namespace BeWo.View.Detail.Report
 
             FlexibleStundensatz.SummaryType = FieldSummaryType.Average;
 
-            FlexibleGefahreneKilometer.CellFormat = "{0:N0}";
-            FlexibleKlient.TotalValueFormat = "{0}";
-            FlexibleMitarbeiter.TotalValueFormat = "{0}";
-            FlexibleLeistung.TotalValueFormat = "{0}";
-            FlexibleLeistungskategorie.TotalValueFormat = "{0}";
+            FlexibleDatum.SortMode = FieldSortMode.Custom;
 
-            datePickerStartDate.DateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
-            datePickerEndDate.DateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).AddMonths(1).AddDays(-1);
+            datePickerEndDate.AllowNullInput = false;
+            datePickerStartDate.AllowNullInput = false;
+
+            var i = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+            datePickerStartDate.DateTime = i;
+            datePickerEndDate.DateTime =  i.AddMonths(1).AddDays(-1);
 
             myPivotGridControl.PrintColumnHeaders = false;
             myPivotGridControl.PrintRowHeaders = false;
@@ -83,6 +92,19 @@ namespace BeWo.View.Detail.Report
             myPivotGridControl.PrintDataHeaders = false;
             myPivotGridControl.PrintUnusedFilterFields = false;
             myPivotGridControl.PrintHeadersOnEveryPage = false;
+
+            myPivotGridControl.AllowCustomizationForm = true;
+            myPivotGridControl.FieldListIncludeVisibleFields = true;
+            myPivotGridControl.GroupFieldsInFieldList = true;
+
+            checkBetrag.IsChecked = true;
+            checkHilepläne.IsChecked = true;
+            checkIst.IsChecked = true;
+            checkKilometer.IsChecked = true;
+            checkKlienten.IsChecked = true;
+            checkMitarbeiter.IsChecked = true;
+            checkRecords.IsChecked = true;
+            checkSoll.IsChecked = true;
         }
         #endregion
 
@@ -93,7 +115,15 @@ namespace BeWo.View.Detail.Report
             {
                 StartDatum = datePickerStartDate.DateTime,
                 EndDatum = datePickerEndDate.DateTime,
-                ReduzierteAnsicht = checkReduzierteAnsicht.IsChecked.Value
+                ReduzierteAnsicht = checkReduzierteAnsicht.IsChecked.Value,
+                AlleHilfeplaneAnzeigen = checkHilepläne.IsChecked.Value,
+                AlleKlientenAnzeigen = checkKlienten.IsChecked.Value,
+                AlleMitarbeiterAnzeigen = checkMitarbeiter.IsChecked.Value,
+                AlleServiceBerichteAnzeigen = checkRecords.IsChecked.Value,
+                BetragAnzeigen = checkBetrag.IsChecked.Value,
+                GefahreneKilometerAnzeigen = checkKilometer.IsChecked.Value,
+                IstAnzeigen = checkIst.IsChecked.Value,
+                SollAnzeigen = checkSoll.IsChecked.Value
             };
 
             ServiceFacade.DoOperationsServiceAsync(
@@ -106,20 +136,22 @@ namespace BeWo.View.Detail.Report
 
                         if (r.Entries != null)
                             foreach (var item in r.Entries)
-                            {
                                 liste.Add(FlexibleReportEntry.InitByFlexibleReportEntryDC(item));
-                            }
 
                         if (r.Dummies != null)
                             foreach (var item in r.Dummies)
-                            {
                                 liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDummyDC(item));
-                            }
 
                         if (r.Employees != null)
-                            liste.AddRange(FlexibleReportEntry.InitByFlexibleReportEmployeeDictornary(r.Employees, filter.StartDatum));
+                            liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDictornary(r.Employees, filter.StartDatum, filter.EndDatum, filter.ReduzierteAnsicht, true));
+
+                        if (r.Customers != null)
+                            liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDictornary(r.Customers, filter.StartDatum, filter.EndDatum, filter.ReduzierteAnsicht, false));
 
                         myPivotGridControl.DataSource = liste;
+
+                        var i = liste.Where(x => x.Datum.Year == 1);
+
                         checkBoxChart.IsEnabled = true;
                     });
                 });
@@ -355,7 +387,17 @@ namespace BeWo.View.Detail.Report
 
         private void MyPivotGridControl_CustomCellAppearance(object sender, PivotCustomCellAppearanceEventArgs e)
         {
+            if (e.ColumnValueType == FieldValueType.Total || e.RowValueType == FieldValueType.Total)
+                if (e.Selected)
+                    e.Background = new SolidColorBrush(Color.FromArgb(180, 193, 180, 120));
+                else
+                    e.Background = new SolidColorBrush(Color.FromArgb(60, 150, 150, 150));
 
+            if (e.ColumnValueType == FieldValueType.GrandTotal || e.RowValueType == FieldValueType.GrandTotal)
+                if (e.Selected)
+                    e.Background = new SolidColorBrush(Color.FromArgb(180, 191, 168, 66));
+                else
+                    e.Background = new SolidColorBrush(Color.FromArgb(60, 120, 120, 120));
         }
 
         private void CheckDataBarPerChanged(object sender, RoutedEventArgs e)
@@ -377,63 +419,35 @@ namespace BeWo.View.Detail.Report
 
         private void ButtonLayoutPrint_Click(object sender, RoutedEventArgs e)
         {
-            var report = new PivotGridReport();
-            var reportPivotGrid = (XRPivotGrid)report.FindControl("xrPivotGrid1", true);
+            myPivotGridControl.ShowPrintPreviewDialog(Window.GetWindow(this));
+        }
 
+        private void MyPivotGridControl_CustomGroupInterval(object sender, PivotCustomGroupIntervalEventArgs e)
+        {
+            e.GroupValue = ((DateTime)e.Value).ToString("ddd, dd.MM.yyyy");
+        }
 
-            myPivotGridControl.SavePivotGridToFile(@"D:\icf\test.dat");
-            reportPivotGrid.DataSource = new PivotFileDataSource(@"D:\icf\test.dat");
-
-            reportPivotGrid.Fields.Clear();
-            foreach (var item in myPivotGridControl.Fields)
+        private void MyPivotGridControl_CustomFieldSort(object sender, PivotCustomFieldSortEventArgs e)
+        {
+            if (e.Field == FlexibleDatum)
             {
-                if (item.Area != FieldArea.FilterArea)
-                {
-                    var field = new DevExpress.XtraReports.UI.PivotGrid.XRPivotGridField();
-                    field.Area = GetArea(item.Area);
-                    field.Caption = item.Caption;
-                    field.Name = item.Name;
-                    field.FieldName = item.FieldName;
-                    field.GroupInterval = GetGroupInterval(item.GroupInterval);
-                    field.AreaIndex = item.AreaIndex;
-                    field.Width = (int)item.Width;
-                    field.ValueFormat.FormatString = item.ValueFormat;
-                    field.CellFormat.FormatType = DevExpress.Utils.FormatType.Custom;
-                    field.CellFormat.FormatString = item.CellFormat;
-                    field.SortOrder = (DevExpress.XtraPivotGrid.PivotSortOrder)((int)item.SortOrder);
-                    field.SortMode = (DevExpress.XtraPivotGrid.PivotSortMode)((int)item.SortMode);
-
-                    if (item.UnboundType != FieldUnboundColumnType.Bound)
-                    {
-                        field.UnboundType = DevExpress.Data.UnboundColumnType.Decimal;
-                        field.UnboundExpression = item.UnboundExpression;
-                        field.UnboundExpressionMode = DevExpress.XtraPivotGrid.UnboundExpressionMode.UseAggregateFunctions;
-                        field.SummaryType = PivotSummaryType.Average;
-                    }
-
-                    reportPivotGrid.Fields.Add(field);
-                }
+                if (e.Value1 == null || e.Value2 == null)
+                    return;
+                e.Handled = true;
+                DateTime d1 = Convert.ToDateTime(e.Value1.ToString().Split(' ')[1]);
+                DateTime d2 = Convert.ToDateTime(e.Value2.ToString().Split(' ')[1]);
+                if (d1 > d2)
+                    e.Result = 1;
+                else if (d1 == d2)
+                    e.Result = 0;
+                else
+                    e.Result = -1;
             }
-            reportPivotGrid.OptionsView.ShowDataHeaders = false;
-            reportPivotGrid.OptionsView.ShowColumnHeaders = false;
-            reportPivotGrid.BestFit();
+        }
 
-            report.CreateDocument();
-
-            var documentPreviewControl = new DocumentPreviewControl { CommandBarStyle = DevExpress.Xpf.DocumentViewer.CommandBarStyle.Bars };
-            documentPreviewControl.Loaded += BeWoUtils.CustomizeReportPreviewToolBar;
-            var window = new BeWoWindow { GroupBoxContent = documentPreviewControl, Owner = BeWoApp.CurrentBeWo.MainWindow };
-
-            ThemeManager.SetTheme(window, Theme.Office2010Black);
-
-            ThemeManager.SetTheme(documentPreviewControl, Theme.Office2007Black);
-
-            documentPreviewControl.DocumentSource = report;
-
-            window.rootGroupBox.Header = "Druckvorschau";
-            window.Title = "Druckvorschau";
-            window.Show();
-            documentPreviewControl.Visibility = Visibility.Visible;
+        private void ButtonShowOptions_Click(object sender, RoutedEventArgs e)
+        {
+            myPivotGridControl.IsFieldListVisible = true;
         }
         #endregion
 
@@ -461,7 +475,7 @@ namespace BeWo.View.Detail.Report
         #region Methoden
         private void InitChart()
         {
-            ChartControl.Diagram = ChartFactory.GenerateDiagram(typeof(BarStackedSeries2D), false);
+            ChartControl.Diagram = ChartFactory.GenerateDiagram(typeof(AreaSeries2D), false);
         }
 
         private IEnumerable<DataBarFormatCondition> CreateDataBarConditions(List<string> columns, List<string> rows, List<string> datas, string formatName)
@@ -510,7 +524,6 @@ namespace BeWo.View.Detail.Report
             }
         }
 
-
         private DevExpress.XtraPivotGrid.PivotGroupInterval GetGroupInterval(FieldGroupInterval groupInterval)
         {
             switch (groupInterval)
@@ -566,13 +579,13 @@ namespace BeWo.View.Detail.Report
 
             public string Leistung { get; set; }
 
-            public decimal AnzahlMinutenIst { get; set; }
+            public decimal? IstMinuten { get; set; }
 
-            public decimal AnzahlStundenIst { get { return AnzahlMinutenIst / 60; } }
+            public decimal? SollMinuten { get; set; }
 
-            public decimal? AnzahlMinutenSoll { get; set; }
+            public decimal? IstStunden { get { return IstMinuten / 60; } }
 
-            public decimal? AnzahlStundenSoll { get { return AnzahlMinutenSoll / 60; } }
+            public decimal? SollStunden { get { return SollMinuten / 60; } }
 
             public DateTime Datum { get; set; }
 
@@ -586,9 +599,9 @@ namespace BeWo.View.Detail.Report
 
             public decimal Rundungspotenzial { get; set; }
 
-            public decimal? DifferenzIstSollMinuten { get { return AnzahlMinutenIst - AnzahlMinutenSoll; } }
+            public decimal DifferenzIstSollMinuten { get { return (IstMinuten ?? 0) - (SollMinuten ?? 0); } }
 
-            public decimal? DifferenzIstSollStunden { get { return DifferenzIstSollMinuten / 60; } }
+            public decimal DifferenzIstSollStunden { get { return DifferenzIstSollMinuten / 60; } }
 
             public string Organisation { get; set; }
 
@@ -599,16 +612,16 @@ namespace BeWo.View.Detail.Report
                     CustomerOid = entryDC.CustomerOid,
                     EmployeeOid = entryDC.EmployeeOid,
                     SupportConceptOid = entryDC.SupportConceptOid,
-                    AnzahlMinutenIst = entryDC.AnzahlMinuten,
+                    IstMinuten = entryDC.IstMinuten,
                     Datum = entryDC.StartDatum,
                     Leistung = entryDC.Leistung,
                     Leistungskategorie = entryDC.Leistungskategorie,
                     Team = entryDC.Team,
-                    AnzahlMinutenSoll = entryDC.AnzahlMinutenSoll,
+                    SollMinuten = entryDC.SollMinuten,
                     Type = entryDC.Type,
                     Kilometer = entryDC.Kilometer,
                     Organisation = entryDC.Organisation,
-                    Rundungspotenzial = entryDC.AnzahlMinuten - ((decimal)entryDC.EndDatum.Subtract(entryDC.StartDatum).TotalMinutes),
+                    Rundungspotenzial = (entryDC.IstMinuten ?? 0) - ((decimal)entryDC.EndDatum.Subtract(entryDC.StartDatum).TotalMinutes),
                     Betrag = entryDC.Betrag,
                     Stundensatz = entryDC.Stundensatz
                 };
@@ -637,8 +650,8 @@ namespace BeWo.View.Detail.Report
                 {
                     flexibleReports.Add(new FlexibleReportEntry()
                     {
-                        AnzahlMinutenSoll = dummyDC.Soll,
-                        AnzahlMinutenIst = 0m,
+                        SollMinuten = dummyDC.Soll ?? 0,
+                        IstMinuten = 0m,
                         Betrag = 0,
                         CustomerOid = dummyDC.CustomerOid,
                         CustomerString = dummyDC.CustomerString,
@@ -654,30 +667,49 @@ namespace BeWo.View.Detail.Report
                         SupportConceptOid = dummyDC.SupportConceptOid,
                         SupportConceptString = dummyDC.SupportConceptString,
                         Team = null,
-                        Type = dummyDC.EntryType
+                        Type = FlexibleReportEntryType.SupportConceptEntry
                     });
                 }
 
                 return flexibleReports;
             }
 
-            public static IList<FlexibleReportEntry> InitByFlexibleReportEmployeeDictornary(Dictionary<long, string> dic, DateTime date)
+            public static IList<FlexibleReportEntry> InitByFlexibleReportDictornary(Dictionary<long, string> dic, DateTime start, DateTime ende, bool reduziert, bool isEmployee)
             {
                 var flexibleReports = new List<FlexibleReportEntry>();
 
                 foreach (var item in dic)
                 {
-                    flexibleReports.Add(new FlexibleReportEntry()
+                    for (DateTime date = start; date <= ende; date = date.AddDays(1))
                     {
-                        EmployeeOid = item.Key,
-                        EmployeeString = item.Value,
-                        Type = FlexibleReportEntryType.EmployeeNullEntry,
-                        Datum = date
-                    });
+                        if (isEmployee)
+                            flexibleReports.Add(new FlexibleReportEntry()
+                            {
+                                EmployeeOid = item.Key,
+                                EmployeeString = item.Value,
+                                Type = FlexibleReportEntryType.EmployeeNullEntry,
+                                Datum = date
+                            });
+                        else
+                            flexibleReports.Add(new FlexibleReportEntry()
+                            {
+                                CustomerOid = item.Key,
+                                CustomerString = item.Value,
+                                Type = FlexibleReportEntryType.CustomerNullEntry,
+                                Datum = date
+                            });
+                        if (reduziert)
+                            break;
+                    }
                 }
 
                 return flexibleReports;
             }
+
+            public override string ToString()
+            {
+                return SollMinuten.ToStringNullCheck() + " [" + Datum.Day.ToString() + "]";
+            }
         }
 
         public class FlexibleReportLayout
diff --git a/Data/Entities/Customer.cs b/Data/Entities/Customer.cs
index 326da6d45..af222e9c8 100644
--- a/Data/Entities/Customer.cs
+++ b/Data/Entities/Customer.cs
@@ -712,5 +712,25 @@ namespace BeWo.Data.Entities
 	    public virtual bool Aggressiv { get; set; }
 	    public virtual bool Hygienebelehrung { get; set; }
 	    public virtual String Schutzstufe { get; set; }
+
+        public virtual string TeamSimpleString
+        {
+            get
+            {
+                if (Team2CustomerList == null)
+                    return null;
+
+                string name = "";
+
+                foreach (var t2c in Team2CustomerList)
+                {
+                    if (name.Length > 0)
+                        name += ", ";
+                    name = t2c.Team.Name;
+                }
+
+                return name;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Data/Entities/Person.cs b/Data/Entities/Person.cs
index 24d62c391..a0c39fedb 100644
--- a/Data/Entities/Person.cs
+++ b/Data/Entities/Person.cs
@@ -427,5 +427,10 @@ namespace BeWo.Data.Entities
             }
         }
         public virtual IList<Image> Images { get; set; }
+        
+        public virtual string LastNameFirstName
+        {
+            get { return string.Format("{0}, {1}", LastName, FirstName); }
+        }
     }
 }
\ No newline at end of file
diff --git a/Data/Entities/SupportConcept.cs b/Data/Entities/SupportConcept.cs
index d419c645b..2f485aba8 100644
--- a/Data/Entities/SupportConcept.cs
+++ b/Data/Entities/SupportConcept.cs
@@ -336,5 +336,10 @@ namespace BeWo.Data.Entities
 	            }
 	        }
 	    }
+
+        public virtual string TimeSpanString
+        {
+            get { return string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", StartDate, EndDate); }
+        }
     }
 }
\ No newline at end of file
diff --git a/Service/Plugins/FlexibleReportService.cs b/Service/Plugins/FlexibleReportService.cs
index e87868b58..cead64a66 100644
--- a/Service/Plugins/FlexibleReportService.cs
+++ b/Service/Plugins/FlexibleReportService.cs
@@ -26,128 +26,59 @@ namespace BeWo.Service.Plugins
         public virtual FlexibleReportResultDC GetAllFlexibleReportEntrys(FlexibleReportFilterDC filter)
         {
             var result = new FlexibleReportResultDC();
+
             result.StartDatum = filter.StartDatum;
             result.EndDatum = filter.EndDatum;
 
-            BuildStundensatzDictionaries();
-
             var calc = PluginLoader.FindClass<Calculations>();
 
-            var span = new DateTimeSpan() { StartDateTime = filter.StartDatum.Date, EndDateTime = filter.EndDatum.Date.AddDays(1).AddTicks(-1) };
-            var alleRec = DAOFactory.SearchDAO.FindServiceRecordsInSpan(span, null).ToList();
+            var filterZeitraum = new DateTimeSpan() { StartDateTime = filter.StartDatum.Date, EndDateTime = filter.EndDatum.Date.AddDays(1).AddTicks(-1) };
 
-            if (!filter.ReduzierteAnsicht)
+            if (filter.AlleHilfeplaneAnzeigen)
             {
-                result.Dummies = new List<FlexibleReportDummyDC>();
+                var alleHelp = DAOFactory.GenericDAO.GetAllActiveAndArchived<SupportConcept>();
 
-                // Zwischenspeicher für die richtigen Zeiträume
-                var dateTimeSpan = new DateTimeSpan();
-
-                var alleHps = DAOFactory.GenericDAO.GetAllActiveAndArchived<SupportConcept>();
-                var alleEmps = DAOFactory.GenericDAO.GetAllActiveAndArchived<Employee>();
-
-                foreach (var hilfePlan in alleHps.Where(x => span.StartDate <= x.EndDate && span.EndDate >= x.StartDate))
+                if (alleHelp.Count > 0)
                 {
-                    // Holt sich den richtigen Zeitraum zum erstellen der Daten
-                    dateTimeSpan.StartDate = span.StartDate > hilfePlan.StartDate ? span.StartDate : hilfePlan.StartDate.Value;
-                    dateTimeSpan.EndDate = span.EndDate < hilfePlan.EndDate ? span.EndDate : hilfePlan.EndDate.Value;
+                    var dummies = GetFlexibleReportResult_Dummies(alleHelp, filterZeitraum, calc, filter.SollAnzeigen);
 
-                    foreach (var c2s in hilfePlan.CostBearer2SupportConceptList.Where(x => span.StartDate <= x.EndDate && span.EndDate >= x.StartDate))
-                    {
-                        foreach (var approvalPeriod in c2s.ApprovalPeriodList.Where(x => span.StartDate <= x.EndDate && span.EndDate >= x.StartDate))
-                        {
-                            // Holt sich den richtigen Zeitraum zum erstellen der Daten
-                            dateTimeSpan.StartDate = span.StartDate > approvalPeriod.StartDate ? span.StartDate : approvalPeriod.StartDate.Value;
-                            dateTimeSpan.EndDate = span.EndDate < approvalPeriod.EndDate ? span.EndDate : approvalPeriod.EndDate.Value;
-
-                            // Wenn kein Mitarbeiter dem Bewilligungszeitraum zugewiesen ist
-                            if (approvalPeriod.SupportConceptApprovalPeriod2Employee.Count == 0)
-                            {
-                                var hauptbetreuer = GetHauptbetreuer(hilfePlan.Customer).ToList();
-
-                                // Wenn der Klient keine Hauptbetreuer hat
-                                if (hauptbetreuer.Count == 0)
-                                {
-                                    decimal? soll = GetSollPerDay(hilfePlan.Customer, dateTimeSpan.StartDate, approvalPeriod, calc);
-                                    if (soll != null)
-                                        result.Dummies.Add(CreateFlexibleReportsDummyDC(dateTimeSpan, null, hilfePlan, c2s.CostBearer, approvalPeriod, soll.Value));
-                                }
-                                // Wenn der Klient ein oder mehr Hauptbetreuer hat
-                                else
-                                {
-                                    decimal? soll = GetSollPerDay(hilfePlan.Customer, dateTimeSpan.StartDate, approvalPeriod, calc);
-
-                                    if (soll.HasValue)
-                                    {
-                                        decimal sollAnteil = soll.Value / hauptbetreuer.Count;
-                                        foreach (var betreuer in hauptbetreuer)
-                                        {
-                                            result.Dummies.Add(CreateFlexibleReportsDummyDC(dateTimeSpan, betreuer, hilfePlan, c2s.CostBearer, approvalPeriod, sollAnteil));
-                                        }
-                                    }
-                                }
-                            }
-                            // Wenn ein oder mehr Mitarbeiter dem Bewilligungszeitraum zugewiesen ist/sind
-                            else
-                            {
-                                foreach (var scap2employee in approvalPeriod.SupportConceptApprovalPeriod2Employee)
-                                {
-                                    var employee = scap2employee.Employee;
-
-                                    decimal? soll = GetSollPerDay(hilfePlan.Customer, employee, approvalPeriod.StartDate.Value, approvalPeriod, calc);
-                                    if (soll != null)
-                                    {
-                                        result.Dummies.Add(CreateFlexibleReportsDummyDC(dateTimeSpan, employee, hilfePlan, c2s.CostBearer, approvalPeriod, soll.Value));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if(alleEmps.Count > 0)
-                {
-                    result.Employees = new Dictionary<long, string>();
-
-                    foreach (var employee in alleEmps)
-                    {
-                        result.Employees.Add(employee.Oid.Value, string.Format("{0}, {1}", employee.Person.LastName, employee.Person.FirstName));
-                    }
+                    result.Dummies = dummies.ToList();
                 }
             }
 
-            if(alleRec.Count > 0)
+            if (filter.AlleServiceBerichteAnzeigen)
             {
-                result.Entries = new List<FlexibleReportEntryDC>();
+                var alleRec = DAOFactory.SearchDAO.FindServiceRecordsInSpan(filterZeitraum, null);
 
-                foreach (var serviceRecordListEntry in alleRec)
+                if (alleRec.Count() > 0)
                 {
-                    var stundensatz = GetStundensatz(serviceRecordListEntry);
+                    var entries = GetFlexibleReportResult_Entries(alleRec, filter.IstAnzeigen, filter.BetragAnzeigen, filter.GefahreneKilometerAnzeigen);
 
-                    if (serviceRecordListEntry.CostBearer2SupportConcept == null)
-                        continue;
+                    result.Entries = entries.ToList();
+                }
+            }
 
-                    result.Entries.Add(new FlexibleReportEntryDC()
-                    {
-                        AnzahlMinuten = serviceRecordListEntry.RoundedDuration,
-                        AnzahlMinutenSoll =  0,
-                        Betrag = stundensatz.HasValue ? stundensatz * (serviceRecordListEntry.RoundedDuration / 60) : null,
-                        CustomerOid = serviceRecordListEntry.Customer?.Oid,
-                        CustomerString = serviceRecordListEntry.Customer != null ? string.Format("{0}, {1}", serviceRecordListEntry.Customer.Person.LastName, serviceRecordListEntry.Customer.Person.FirstName) : null,
-                        EmployeeOid = serviceRecordListEntry.Employee?.Oid,
-                        EmployeeString = serviceRecordListEntry.Employee != null ? string.Format("{0}, {1}", serviceRecordListEntry.Employee.Person.LastName, serviceRecordListEntry.Employee.Person.FirstName) : null,
-                        EndDatum = serviceRecordListEntry.End.Value,
-                        Kilometer = serviceRecordListEntry.DistanceInMeter,
-                        Leistung = serviceRecordListEntry.ServiceDescription.Name,
-                        Leistungskategorie = serviceRecordListEntry.ServiceDescription.ServiceCategory.Name,
-                        Organisation = serviceRecordListEntry.CostBearer2SupportConcept.CostBearer.Organisation.Name,
-                        StartDatum = serviceRecordListEntry.Start.Value,
-                        Stundensatz = stundensatz,
-                        SupportConceptOid = serviceRecordListEntry.SupportConcept?.Oid,
-                        SupportConceptString = serviceRecordListEntry.SupportConcept != null ? string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", serviceRecordListEntry.SupportConcept.StartDate, serviceRecordListEntry.SupportConcept.EndDate) : null,
-                        Team = serviceRecordListEntry.Customer != null ? GetTeamNameByTeam2CustomerList(serviceRecordListEntry.Customer.Team2CustomerList) : null,
-                        Type = FlexibleReportEntryType.ServiceRecordEntry
-                    });
+            if (filter.AlleKlientenAnzeigen)
+            {
+                var alleCos = DAOFactory.GenericDAO.GetAllActiveAndArchived<Customer>();
+
+                if (alleCos.Count > 0)
+                {
+                    var customers = GetFlexibleReportResult_Customers(alleCos);
+
+                    result.Customers = customers;
+                }
+            }
+
+            if (filter.AlleMitarbeiterAnzeigen)
+            {
+                var alleEmps = DAOFactory.GenericDAO.GetAllActiveAndArchived<Employee>();
+
+                if (alleEmps.Count > 0)
+                {
+                    var employees = GetFlexibleReportResult_Employees(alleEmps);
+
+                    result.Employees = employees;
                 }
             }
 
@@ -156,7 +87,8 @@ namespace BeWo.Service.Plugins
 
         protected virtual decimal? GetStundensatz(ServiceRecord sr)
         {
-            decimal? betrag = null;
+            if (categoryOid2Stundensatz == null)
+                BuildStundensatzDictionaries();
 
             if (sr.CostBearer2SupportConcept != null)
             {
@@ -167,43 +99,46 @@ namespace BeWo.Service.Plugins
                     var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sr.Start.Value);
                     if (cr != null && cr.CostRateValue.HasValue)
                     {
-                        betrag = cr.CostRateValue.Value;
+                        return cr.CostRateValue.Value;
                     }
                 }
 
-                if (betrag == null && categoryOid2Stundensatz.ContainsKey(sr.ServiceDescription.ServiceCategory.Oid.Value))
+                if (categoryOid2Stundensatz.ContainsKey(sr.ServiceDescription.ServiceCategory.Oid.Value))
                 {
                     var crList = categoryOid2Stundensatz[sr.ServiceDescription.ServiceCategory.Oid.Value];
 
                     var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sr.Start.Value);
                     if (cr != null && cr.CostRateValue.HasValue)
                     {
-                        betrag = cr.CostRateValue.Value;
+                        return cr.CostRateValue.Value;
                     }
                 }
 
-                if (betrag == null && costbearerOid2Stundensatz.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
+                if (costbearerOid2Stundensatz.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
                 {
                     var crList = costbearerOid2Stundensatz[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
 
                     var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, sr.Start.Value);
                     if (cr != null && cr.CostRateValue.HasValue)
                     {
-                        betrag = cr.CostRateValue.Value;
-                    }
-                    if (betrag != null  && costbearerOid2RateFactor.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
-                    {
-                        crList = costbearerOid2RateFactor[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
+                        var betrag = cr.CostRateValue.Value;
 
-                        cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, sr.Start.Value);
-                        if (cr != null && cr.CostRateValue.HasValue)
+                        if (costbearerOid2RateFactor.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
                         {
-                            betrag *= (100 + cr.CostRateValue.Value) / 100;
+                            crList = costbearerOid2RateFactor[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
+
+                            cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, sr.Start.Value);
+                            if (cr != null && cr.CostRateValue.HasValue)
+                            {
+                                betrag *= 1 + cr.CostRateValue.Value / 100;
+                            }
                         }
+
+                        return betrag;
                     }
                 }
             }
-            return betrag;
+            return null;
         }
 
         protected virtual void BuildStundensatzDictionaries()
@@ -257,21 +192,7 @@ namespace BeWo.Service.Plugins
             }
         }
 
-        protected virtual string GetTeamNameByTeam2CustomerList(IList<Team2Customer> team2Customers)
-        {
-            string name = "";
-
-            foreach (var t2c in team2Customers)
-            {
-                if (name.Length > 0)
-                    name += ", ";
-                name = t2c.Team.Name;
-            }
-
-            return name;
-        }
-
-        protected virtual decimal? GetSollPerDay(Customer customer, Employee employee, DateTime date, SupportConceptApprovalPeriod scap, Calculations calc)
+        protected virtual decimal? GetSollPerDayEmployee(Customer customer, Employee employee, DateTime date, SupportConceptApprovalPeriod scap, Calculations calc)
         {
             var scapDC = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(scap);
             var sollPerDay = calc.GetApprovedHoursPerDay(scapDC, new List<CostRatePeriodDC>()) * 60;
@@ -295,159 +216,180 @@ namespace BeWo.Service.Plugins
             return sollPerDay;
         }
 
-        protected virtual void CreateFlexibleReportSoll(FlexibleReportEntryDC entry, ServiceRecord item, DateTime datum, Calculations calc)
-        {
-            if (item.CostBearer2SupportConcept != null)
-            {
-                decimal? soll = null;
-                SupportConceptApprovalPeriod scap = null;
-                SupportConceptApprovalPeriodDC scapdc = null;
-
-                //Schritt 1: Prüfe Costbearer2SupportConcept.ApprovalPeriodList welcher im Zeitraum liegt und ob die ApprovalPeriod.Categoriy der item.ServiceDescription.Category entspricht.
-                foreach (var iscap in item.CostBearer2SupportConcept.ApprovalPeriodList)
-                {
-                    if (iscap.ServiceCategory != null && iscap.ServiceCategory.Oid == item.ServiceDescription.ServiceCategory.Oid)
-                    {
-                        if (item.Start >= iscap.StartDate && item.Start <= iscap.EndDate)
-                        {
-                            scap = iscap;
-                        }
-                    }
-                }
-
-                //Schritt 2: Prüfe Costbearer2SupportConcept.ApprovalPeriodList welcher im Zeitraum liegt und ob die ApprovalPeriod.Categoriy = null ist
-                if (scap == null)
-                {
-                    foreach (var iscap in item.CostBearer2SupportConcept.ApprovalPeriodList)
-                    {
-                        if (iscap.ServiceCategory == null)
-                        {
-                            if (item.Start >= iscap.StartDate && item.Start <= iscap.EndDate)
-                            {
-                                scap = iscap;
-                            }
-                        }
-                    }
-                }
-
-                if (scap != null)
-                {
-                    //Schritt 3: Soll liegt vor, prüfe Verteilung auf Mitarbeiter
-
-                    scapdc  = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(scap);
-                    var sollPerDay = calc.GetApprovedHoursPerDay(scapdc, new List<CostRatePeriodDC>()) * 60;
-                    // Keine Betreuerverteilung definiert
-                    if (scap.SupportConceptApprovalPeriod2Employee.Count == 0 && IstHauptbetreuer(item.Customer, item.Employee))
-                    {
-                        soll = sollPerDay; // Hauptbetreuer muss 100% leisten
-                    }
-                    else
-                    {
-                        //Prüfe ob item.Employee in scap.SupportConceptApprovalPeriod2Employee definiert ist und wenn ja berechne Anteil am sollPerDay
-                        //scap.SupportConceptApprovalPeriod2Employee[0]
-                        var sc2e = scap.SupportConceptApprovalPeriod2Employee.FirstOrDefault(x => x.Employee.Oid == item.Employee.Oid);
-                        if (sc2e != null)
-                        {
-                            soll = sc2e.IsAbsolut ? sc2e.Betreuungsschluessel : sollPerDay * sc2e.Betreuungsschluessel/100;
-                        }
-                    }
-                }
-
-                //if (item.CostBearer2SupportConcept != null && IstHauptbetreuer(item.Customer, item.Employee))
-                //{
-                //    var c2sDc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(item.CostBearer2SupportConcept);
-                //    var sollPerDay = calc.GetApprovedHoursPerDay(c2sDc, datum);
-
-                //    entry.AnzahlMinutenSoll = sollPerDay * 60;
-                //}
-
-                entry.AnzahlMinutenSoll = soll;
-            }
-        }
-
-        protected virtual bool IstHauptbetreuer(Customer c, Employee e)
+        // ToDo: Auslagern / generaliesieren
+        protected static IEnumerable<Employee> GetHauptbetreuer(Customer c)
         {
             foreach (Employee2Customer e2c in c.Employee2CustomerList)
             {
                 foreach (ValueListEntry2Object vle2o in e2c.ValueList)
                 {
                     var vle = vle2o.Entry;
-
-                    if (vle.SystemEntryID == SystemEntryID.EmployeeRoleMainAttendant && e2c.EmployeeOid.ToString() == vle.Value)
-                        return true;
-                    //if (vle.SystemEntryID != null && vle.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant && e2c.EmployeeOid == e.Oid.Value)
-                    //{
-                    //    return true;
-                    //}
-                }
-            }
-
-            return false;
-        }
-
-        protected IEnumerable<Employee> GetHauptbetreuer(Customer c)
-        {
-            foreach (Employee2Customer e2c in c.Employee2CustomerList)
-            {
-                foreach (ValueListEntry2Object vle2o in e2c.ValueList)
-                {
-                    var vle = vle2o.Entry;
-
-                    if (vle.SystemEntryID == SystemEntryID.EmployeeRoleMainAttendant && e2c.EmployeeOid.ToString() == vle.Value)
+                    if (vle.SystemEntryID == SystemEntryID.EmployeeRoleMainAttendant && e2c.CustomerOid == c.Oid)
                         yield return e2c.Employee;
                 }
             }
         }
 
-        protected virtual FlexibleReportDummyDC CreateFlexibleReportsDummyDC(DateTimeSpan span, Employee employee, SupportConcept supportConcept, CostBearer costBearer, SupportConceptApprovalPeriod approvalPeriod, decimal soll)
+        protected virtual IEnumerable<FlexibleReportEntryDC> GetFlexibleReportResult_Entries(IEnumerable<ServiceRecord> alleRec, bool zeigeIst, bool zeigeBetrag, bool zeigeKilometer)
         {
-            var dummy = new FlexibleReportDummyDC()
+            foreach (var serviceRecord in alleRec)
             {
-                CustomerOid = null,
-                CustomerString = null,
-                EmployeeOid = null,
-                EmployeeString = null,
-                EndDate = span.EndDate,
-                EntryType = FlexibleReportEntryType.SollEntry,
-                Leistungskategorie = null,
-                Organisation = null,
-                Soll = soll,
-                StartDate = span.StartDate,
-                SupportConceptOid = null,
-                SupportConceptString = null
-            };
+                var entry = new FlexibleReportEntryDC
+                {
+                    EndDatum = serviceRecord.End.Value,
+                    SollMinuten = null,
+                    StartDatum = serviceRecord.Start.Value,
+                    Leistung = serviceRecord.ServiceDescription.Name,
+                    Leistungskategorie = serviceRecord.ServiceDescription.ServiceCategory.Name,
+                    Type = FlexibleReportEntryType.ServiceRecordEntry
+                };
 
-            if (supportConcept != null)
-            {
-                dummy.SupportConceptOid = supportConcept.Oid;
-                dummy.SupportConceptString = string.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", supportConcept.StartDate, supportConcept.EndDate);
+                if (zeigeIst)
+                {
+                    entry.IstMinuten = serviceRecord.RoundedDuration;
+                }
 
-                dummy.CustomerOid = supportConcept.Oid;
-                dummy.CustomerString = string.Format("{0}, {1}", supportConcept.Customer.Person.LastName, supportConcept.Customer.Person.FirstName);
+                if (zeigeBetrag)
+                {
+                    entry.Stundensatz = GetStundensatz(serviceRecord);
+                    entry.Betrag = serviceRecord.RoundedDuration / 60 * entry.Stundensatz;
+                }
 
-                dummy.Organisation = costBearer.Organisation.Name;
-                dummy.Leistungskategorie = approvalPeriod.ServiceCategory?.Name;
+                if (zeigeKilometer)
+                {
+                    entry.Kilometer = serviceRecord.DistanceInMeter;
+                }
+
+                if (serviceRecord.Customer != null)
+                {
+                    entry.CustomerOid = serviceRecord.Customer.Oid;
+                    entry.CustomerString = serviceRecord.Customer.Person.LastNameFirstName;
+                    entry.Team = serviceRecord.Customer.TeamSimpleString;
+                }
+
+                if (serviceRecord.Employee != null)
+                {
+                    entry.EmployeeOid = serviceRecord.Employee.Oid;
+                    entry.EmployeeString = serviceRecord.Employee.Person.LastNameFirstName;
+                }
+
+                if (serviceRecord.SupportConcept != null)
+                {
+                    entry.SupportConceptOid = serviceRecord.SupportConcept.Oid;
+                    entry.SupportConceptString = serviceRecord.SupportConcept.TimeSpanString;
+                }
+
+                if (serviceRecord.CostBearer2SupportConcept != null)
+                {
+                    entry.Organisation = serviceRecord.CostBearer2SupportConcept.CostBearer.Organisation.Name;
+                }
+
+                yield return entry;
             }
+        }
+
+        protected virtual IEnumerable<FlexibleReportDummyDC> GetFlexibleReportResult_Dummies(IList<SupportConcept> alleHelp, DateTimeSpan filterZeitraum, Calculations calc, bool zeigeSoll)
+        {
+            foreach (var hilfePlan in alleHelp.Where(x => filterZeitraum.StartDate <= x.EndDate && filterZeitraum.EndDate >= x.StartDate))
+            {
+                foreach (var c2s in hilfePlan.CostBearer2SupportConceptList.Where(x => filterZeitraum.StartDate <= x.EndDate && filterZeitraum.EndDate >= x.StartDate))
+                {
+                    foreach (var approvalPeriod in c2s.ApprovalPeriodList.Where(x => filterZeitraum.StartDate <= x.EndDate && filterZeitraum.EndDate >= x.StartDate))
+                    {
+                        var start = filterZeitraum.StartDate > approvalPeriod.StartDate ? filterZeitraum.StartDate : approvalPeriod.StartDate.Value;
+                        var ende = filterZeitraum.EndDate < approvalPeriod.EndDate ? filterZeitraum.EndDate : approvalPeriod.EndDate.Value;
+                        var zeitraum = new DateTimeSpan(start, ende);
+
+                        // Wenn kein Mitarbeiter dem Bewilligungszeitraum zugewiesen ist
+                        if (approvalPeriod.SupportConceptApprovalPeriod2Employee.Count == 0)
+                        {
+                            var hauptbetreuer = GetHauptbetreuer(hilfePlan.Customer).ToList();
+                            var soll = zeigeSoll ? GetSollPerDay(hilfePlan.Customer, start, approvalPeriod, calc) : null;
+
+                            // Wenn der Klient keine Hauptbetreuer hat
+                            if (hauptbetreuer.Count == 0)
+                            {
+                                yield return GetFlexibleReportDummy(hilfePlan.Customer, null, zeitraum, hilfePlan, approvalPeriod, soll);
+                            }
+                            // Wenn der Klient ein oder mehr Hauptbetreuer hat
+                            else
+                            {
+                                decimal? sollAnteil = soll / hauptbetreuer.Count;
+
+                                foreach (var betreuer in hauptbetreuer)
+                                {
+                                    yield return GetFlexibleReportDummy(hilfePlan.Customer, betreuer, zeitraum, hilfePlan, approvalPeriod, sollAnteil);
+                                }
+                            }
+                        }
+                        // Wenn ein oder mehr Mitarbeiter dem Bewilligungszeitraum zugewiesen ist/sind
+                        else
+                        {
+                            foreach (var s2e in approvalPeriod.SupportConceptApprovalPeriod2Employee)
+                            {
+                                decimal? soll = zeigeSoll ? GetSollPerDayEmployee(hilfePlan.Customer, s2e.Employee, approvalPeriod.StartDate.Value, approvalPeriod, calc) : null;
+
+                                yield return GetFlexibleReportDummy(hilfePlan.Customer, s2e.Employee, zeitraum, hilfePlan, approvalPeriod, soll);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        protected virtual FlexibleReportDummyDC GetFlexibleReportDummy(Customer customer, Employee employee, DateTimeSpan timeSpan, SupportConcept supportConcept, SupportConceptApprovalPeriod approvalPeriod, decimal? soll)
+        {
+            var dummy = new FlexibleReportDummyDC
+            {
+                CustomerOid = customer.Oid,
+                CustomerString = customer.Person.LastNameFirstName,
+
+                SupportConceptOid = supportConcept.Oid,
+                SupportConceptString = supportConcept.TimeSpanString,
+
+                StartDate = timeSpan.StartDate.Date,
+                EndDate = timeSpan.EndDate.Date,
+
+                Soll = soll
+            };
 
             if (employee != null)
             {
                 dummy.EmployeeOid = employee.Oid;
-                dummy.EmployeeString = string.Format("{0}, {1}", employee.Person.LastName, employee.Person.FirstName);
+                dummy.EmployeeString = employee.Person.LastNameFirstName;
+            }
+
+            if (approvalPeriod != null)
+            {
+                dummy.Leistungskategorie = approvalPeriod.ServiceCategory?.Name;
+                dummy.Organisation = approvalPeriod.CostBearer2SupportConcept.CostBearer.Organisation.Name;
             }
 
             return dummy;
         }
 
-        protected virtual FlexibleReportDummyDC CreateFlexibleReportsDummyDC(DateTimeSpan span, Employee employee)
+        protected virtual Dictionary<long, string> GetFlexibleReportResult_Customers(IList<Customer> customers)
         {
-            return new FlexibleReportDummyDC()
+            var customerDic = new Dictionary<long, string>();
+
+            foreach (var customer in customers)
             {
-                EndDate = span.EndDate,
-                StartDate = span.StartDate,
-                EmployeeOid = employee.Oid,
-                EmployeeString = string.Format("{0}, {1}", employee.Person.LastName, employee.Person.FirstName),
-                EntryType = FlexibleReportEntryType.EmployeeNullEntry
-            };
+                customerDic.Add(customer.Oid.Value, string.Format("{0}, {1}", customer.Person.LastName, customer.Person.FirstName));
+            }
+
+            return customerDic;
+        }
+
+        protected virtual Dictionary<long, string> GetFlexibleReportResult_Employees(IList<Employee> employees)
+        {
+            var employeeDic = new Dictionary<long, string>();
+
+            foreach (var employee in employees)
+            {
+                employeeDic.Add(employee.Oid.Value, string.Format("{0}, {1}", employee.Person.LastName, employee.Person.FirstName));
+            }
+
+            return employeeDic;
         }
     }
 }
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index f7bb08e6a..d2a6008e4 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -1002,10 +1002,9 @@ namespace BS.Shared
 
 	public enum FlexibleReportEntryType
 	{
-		EmployeeNullEntry,
-		CustomerNullEntry,
-		CustomerEmployeeNullEntry,
-		ServiceRecordEntry,
-        SollEntry
+        EmployeeNullEntry,
+        CustomerNullEntry,
+        ServiceRecordEntry,
+        SupportConceptEntry
 	}
 }
\ No newline at end of file
diff --git a/Shared/Core/DateTimeSpan.cs b/Shared/Core/DateTimeSpan.cs
index 1534d92ac..e4bb96615 100644
--- a/Shared/Core/DateTimeSpan.cs
+++ b/Shared/Core/DateTimeSpan.cs
@@ -40,6 +40,17 @@ namespace BS.Shared.Core
 
         private bool _SynchEndDate;
 
+        public DateTimeSpan()
+        {
+
+        }
+
+        public DateTimeSpan(DateTime start, DateTime ende)
+        {
+            _StartDate = start;
+            _EndDate = ende;
+        }
+
         public DateTime EndDate
         {
             get { return _EndDate; }
diff --git a/Shared/DataContracts/FlexibleReportDummyDC.cs b/Shared/DataContracts/FlexibleReportDummyDC.cs
index 31ece64e5..a5fbfe4cb 100644
--- a/Shared/DataContracts/FlexibleReportDummyDC.cs
+++ b/Shared/DataContracts/FlexibleReportDummyDC.cs
@@ -40,11 +40,8 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public string Organisation { get; set; }
-
+        
         [DataMember]
-        public FlexibleReportEntryType EntryType { get; set; }
-
-        [DataMember]
-        public decimal Soll { get; set; }
+        public decimal? Soll { get; set; }
     }
 }
diff --git a/Shared/DataContracts/FlexibleReportEntryDC.cs b/Shared/DataContracts/FlexibleReportEntryDC.cs
index 933f2541c..d315c5441 100644
--- a/Shared/DataContracts/FlexibleReportEntryDC.cs
+++ b/Shared/DataContracts/FlexibleReportEntryDC.cs
@@ -40,10 +40,10 @@ namespace BS.Shared.DataContracts
         public string Leistung { get; set; }
 
         [DataMember]
-        public decimal AnzahlMinuten { get; set; }
+        public decimal? IstMinuten { get; set; }
 
         [DataMember]
-        public decimal? AnzahlMinutenSoll { get; set; }
+        public decimal? SollMinuten { get; set; }
 
         [DataMember]
         public decimal? Betrag { get; set; }
diff --git a/Shared/DataContracts/FlexibleReportFilterDC.cs b/Shared/DataContracts/FlexibleReportFilterDC.cs
index e00f8f4a6..209c4b4d7 100644
--- a/Shared/DataContracts/FlexibleReportFilterDC.cs
+++ b/Shared/DataContracts/FlexibleReportFilterDC.cs
@@ -25,5 +25,32 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public bool ReduzierteAnsicht { get; set; }
+
+
+
+        [DataMember]
+        public bool BetragAnzeigen { get; set; }
+        
+        [DataMember]
+        public bool IstAnzeigen { get; set; }
+
+        [DataMember]
+        public bool SollAnzeigen { get; set; }
+
+        [DataMember]
+        public bool GefahreneKilometerAnzeigen { get; set; }
+        
+        [DataMember]
+        public bool AlleServiceBerichteAnzeigen { get; set; }
+
+        [DataMember]
+        public bool AlleHilfeplaneAnzeigen { get; set; }
+
+        [DataMember]
+        public bool AlleMitarbeiterAnzeigen { get; set; }
+
+        [DataMember]
+        public bool AlleKlientenAnzeigen { get; set; }
+
     }
 }
diff --git a/Shared/DataContracts/FlexibleReportResultDC.cs b/Shared/DataContracts/FlexibleReportResultDC.cs
index cfd7eb875..b28c28944 100644
--- a/Shared/DataContracts/FlexibleReportResultDC.cs
+++ b/Shared/DataContracts/FlexibleReportResultDC.cs
@@ -29,5 +29,6 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public IList<FlexibleReportEntryDC> Entries { get; set; }
 
+        public int Length => Employees?.Count + Customers?.Count + Dummies?.Count + Entries?.Count ?? 0;
     }
 }

From 9a5b7cb449cd7ad9124e55e25e1b1b0ef27ad7ad Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Thu, 1 Aug 2019 11:27:28 +0200
Subject: [PATCH 2/3] CB Reports

---
 .gitignore                                    |    1 +
 BeWo/MainControl.xaml.cs                      |   29 +-
 Model/Changes_2019_07_31.txt                  |    2 +
 .../MitarbeiterstundenkontoBerechnung.cs      |    2 +-
 .../BeWoImFlow/SettlementReport.Designer.cs   |  135 +-
 ReportImp/BeWoImFlow/SettlementReport.resx    |   11 -
 .../ServiceInvoiceReport.cs                   |    2 +
 ...HEssenMitarbeiterstundenkontoBerechnung.cs |    2 +-
 ReportImp/Lori/SettlementReport.Designer.cs   |   74 +-
 ReportImp/Lori/SettlementReport.cs            |   22 +-
 .../PflegedienstWessel.csproj                 |    1 +
 .../Quittierungsbeleg.Designer.cs             |  219 +--
 .../PflegedienstWessel/Quittierungsbeleg.cs   |    7 +-
 .../PflegedienstWessel/Quittierungsbeleg.resx |    6 +-
 .../PflegedienstWessel/Service/UserService.cs |   52 +
 .../SHGSchwerte/SettlementReport.Designer.cs  |  242 +--
 ReportImp/SHGSchwerte/SettlementReport.cs     |   54 +-
 .../VkmRietberg/Properties/AssemblyInfo.cs    |   36 +
 .../VkmRietberg/Properties/licenses.licx      |    1 +
 .../VkmRietberg/Quittierungsbeleg.Designer.cs | 1299 +++++++++++++++++
 ReportImp/VkmRietberg/Quittierungsbeleg.cs    |  131 ++
 ReportImp/VkmRietberg/Quittierungsbeleg.resx  |  129 ++
 ReportImp/VkmRietberg/VkmRietberg.csproj      |   81 +
 Service/Plugins/EmployeeService.cs            |   20 +-
 Service/Plugins/PluginLoader.cs               |    8 +-
 Service/Plugins/UserService.cs                |   79 +
 Service/Service.csproj                        |    1 +
 .../EmployeeServiceImp.cs                     |   12 +-
 .../ServiceImplementations/UserServiceImp.cs  |   54 +-
 Shared/DataContracts/MandatorDC.cs            |    5 +-
 30 files changed, 2287 insertions(+), 430 deletions(-)
 create mode 100644 Model/Changes_2019_07_31.txt
 create mode 100644 ReportImp/PflegedienstWessel/Service/UserService.cs
 create mode 100644 ReportImp/VkmRietberg/Properties/AssemblyInfo.cs
 create mode 100644 ReportImp/VkmRietberg/Properties/licenses.licx
 create mode 100644 ReportImp/VkmRietberg/Quittierungsbeleg.Designer.cs
 create mode 100644 ReportImp/VkmRietberg/Quittierungsbeleg.cs
 create mode 100644 ReportImp/VkmRietberg/Quittierungsbeleg.resx
 create mode 100644 ReportImp/VkmRietberg/VkmRietberg.csproj
 create mode 100644 Service/Plugins/UserService.cs

diff --git a/.gitignore b/.gitignore
index d1d0e13ef..6a0adad09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -377,3 +377,4 @@
 /ReportImp/TabulaRasa/obj/Release
 /ReportImp/KirschbaumManz/obj/Debug
 /ReportImp/KirschbaumManz/obj/Release
+/ReportImp/VkmRietberg/obj/Debug
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index 396c5ed37..0a85838aa 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -1115,7 +1115,7 @@ namespace BeWo
 
 		private void button_Support_Click(object sender, RoutedEventArgs e)
 		{
-			var mailButton = new Button
+            var mailButton = new Button
 			{
 				Content = "*",
 				FontFamily = new FontFamily("Wingdings"),
@@ -1199,12 +1199,35 @@ namespace BeWo
 		    {
 		        Foreground = Brushes.Black,
 		        Margin = new Thickness(45, 5, 5, 5),
+                FontSize = 12
 		        
 		    };
-		    
+
+		    String linkText = "Teamviewer herunterladen";
+		    String url = "https://get.teamviewer.com/dj5y4zy";
+
+		    if (!String.IsNullOrWhiteSpace(BeWoApp.Mandator.SupportToolUrl))
+		    {
+		        url = BeWoApp.Mandator.SupportToolUrl;
+		        if (BeWoApp.Mandator.SupportToolUrl.Contains("<") && BeWoApp.Mandator.SupportToolUrl.Contains(">") && BeWoApp.Mandator.SupportToolUrl.IndexOf("<") > 0)
+		        {
+		            linkText = BeWoApp.Mandator.SupportToolUrl.Substring(0, BeWoApp.Mandator.SupportToolUrl.IndexOf("<"));
+                    url = BeWoApp.Mandator.SupportToolUrl.Substring(BeWoApp.Mandator.SupportToolUrl.IndexOf("<"));
+		            url = url.Replace("<", "").Replace(">", "");
+		        }
+
+		    }
+
 		    Hyperlink link = new Hyperlink();
-		    link.Inlines.Add("Teamviewer herunterladen");
+            link.NavigateUri = new Uri(url);
+		    link.TargetName = "newWindow";
+            link.Inlines.Add(linkText);
 		    supportToolLink.Inlines.Add(link);
+		    link.RequestNavigate += (s, e2) =>
+		    {
+		        System.Diagnostics.Process.Start(
+		            new System.Diagnostics.ProcessStartInfo((s as Hyperlink).NavigateUri.ToString()));
+		    };
 
             BeWoWindow bewoWindow = BeWoWpfUtils.CreateBeWoPopupWindow(300, 1000, true);
 
diff --git a/Model/Changes_2019_07_31.txt b/Model/Changes_2019_07_31.txt
new file mode 100644
index 000000000..aff7ef73b
--- /dev/null
+++ b/Model/Changes_2019_07_31.txt
@@ -0,0 +1,2 @@
+ALTER TABLE `supportconceptapprovalperiod`
+ADD COLUMN `BudgetOid` BIGINT(19) NULL DEFAULT NULL;
\ No newline at end of file
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
index c4c56534b..c27fe95e4 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
@@ -1275,7 +1275,7 @@ namespace BeWo.Report.ReportObjects
 
 			    if (minuten > 0)
 			    {
-			        dd.SpecialHours = (decimal)(Math.Round(minuten, 0) / 60);
+			        dd.SpecialHours += (decimal)(Math.Round(minuten, 0) / 60);
 			    }
 
                 //DateTime dtEnd = sr.Start.Value.AddMinutes((double)duration);
diff --git a/ReportImp/BeWoImFlow/SettlementReport.Designer.cs b/ReportImp/BeWoImFlow/SettlementReport.Designer.cs
index c0ed84e38..ad25e5410 100644
--- a/ReportImp/BeWoImFlow/SettlementReport.Designer.cs
+++ b/ReportImp/BeWoImFlow/SettlementReport.Designer.cs
@@ -38,10 +38,11 @@ namespace BeWoImFlow.Alt
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellGeleisteteStd = new DevExpress.XtraReports.UI.XRTableCell();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
@@ -49,16 +50,21 @@ namespace BeWoImFlow.Alt
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
             this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
             this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -79,19 +85,13 @@ namespace BeWoImFlow.Alt
             this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
-            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -177,12 +177,6 @@ namespace BeWoImFlow.Alt
             this.xrTableCell20.Text = "Bewilligte FLS";
             this.xrTableCell20.Weight = 0.27692307692307705D;
             // 
-            // ruleRateFactorNull
-            // 
-            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
-            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
-            // 
             // xrTableCell7
             // 
             this.xrTableCell7.Name = "xrTableCell7";
@@ -203,6 +197,16 @@ namespace BeWoImFlow.Alt
             this.xrTableRow11.Name = "xrTableRow11";
             this.xrTableRow11.Weight = 0.14999999999999997D;
             // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 2, 0, 0, 100F);
+            this.xrTableCell1.StylePriority.UseBorderColor = false;
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.Text = "Geleistete FLS";
+            this.xrTableCell1.Weight = 0.27692307692307694D;
+            // 
             // cellGeleisteteStd
             // 
             this.cellGeleisteteStd.Name = "cellGeleisteteStd";
@@ -212,6 +216,12 @@ namespace BeWoImFlow.Alt
             this.cellGeleisteteStd.StylePriority.UsePadding = false;
             this.cellGeleisteteStd.Weight = 0.30769230769230765D;
             // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
             // xrLabel6
             // 
             this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 207.6249F);
@@ -264,7 +274,7 @@ namespace BeWoImFlow.Alt
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrLabel10});
-            this.ReportFooter.HeightF = 150F;
+            this.ReportFooter.HeightF = 94.27084F;
             this.ReportFooter.KeepTogether = true;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
@@ -275,9 +285,10 @@ namespace BeWoImFlow.Alt
             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(675.33F, 150F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(675.33F, 94.27084F);
             this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.Text = resources.GetString("xrLabel10.Text");
+            this.xrLabel10.Text = "Ich bitte Sie, die Differenz in meiner nächsten Avis zu verrechnen. \r\n\r\nMit freun" +
+    "dlichen Grüßen\r\n\r\nAlexander Rieps";
             // 
             // topMarginBand1
             // 
@@ -288,6 +299,20 @@ namespace BeWoImFlow.Alt
             this.topMarginBand1.HeightF = 300F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrRichText2
+            // 
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(30F, 270F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(410.67F, 30F);
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(550.9999F, 42.95832F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(154.3335F, 200.3333F);
+            // 
             // xrPictureBox1
             // 
             this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
@@ -305,6 +330,13 @@ namespace BeWoImFlow.Alt
             this.bottomMarginBand1.HeightF = 120F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
+            // xrRichText3
+            // 
+            this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 20.00008F);
+            this.xrRichText3.Name = "xrRichText3";
+            this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
+            this.xrRichText3.SizeF = new System.Drawing.SizeF(650F, 80F);
+            // 
             // xrLine1
             // 
             this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 0F);
@@ -325,6 +357,16 @@ namespace BeWoImFlow.Alt
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
             // 
+            // lblAdresse
+            // 
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 0F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(410.6667F, 93.9167F);
+            this.lblAdresse.StylePriority.UseFont = false;
+            // 
             // DetailReport
             // 
             this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -390,6 +432,10 @@ namespace BeWoImFlow.Alt
             this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell23.Weight = 0.21685899000901443D;
             // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -587,51 +633,6 @@ namespace BeWoImFlow.Alt
             this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell58.Weight = 0.21685899000901443D;
             // 
-            // xrRichText1
-            // 
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(550.9999F, 42.95832F);
-            this.xrRichText1.Name = "xrRichText1";
-            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(154.3335F, 200.3333F);
-            // 
-            // xrRichText2
-            // 
-            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(30F, 270F);
-            this.xrRichText2.Name = "xrRichText2";
-            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
-            this.xrRichText2.SizeF = new System.Drawing.SizeF(410.67F, 30F);
-            // 
-            // lblAdresse
-            // 
-            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 0F);
-            this.lblAdresse.Multiline = true;
-            this.lblAdresse.Name = "lblAdresse";
-            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAdresse.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.lblAdresse.SizeF = new System.Drawing.SizeF(410.6667F, 93.9167F);
-            this.lblAdresse.StylePriority.UseFont = false;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 2, 0, 0, 100F);
-            this.xrTableCell1.StylePriority.UseBorderColor = false;
-            this.xrTableCell1.StylePriority.UseBorders = false;
-            this.xrTableCell1.StylePriority.UsePadding = false;
-            this.xrTableCell1.Text = "Geleistete FLS";
-            this.xrTableCell1.Weight = 0.27692307692307694D;
-            // 
-            // xrRichText3
-            // 
-            this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 20.00008F);
-            this.xrRichText3.Name = "xrRichText3";
-            this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
-            this.xrRichText3.SizeF = new System.Drawing.SizeF(650F, 80F);
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -653,12 +654,12 @@ namespace BeWoImFlow.Alt
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
             this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
diff --git a/ReportImp/BeWoImFlow/SettlementReport.resx b/ReportImp/BeWoImFlow/SettlementReport.resx
index 0c7884776..a74214004 100644
--- a/ReportImp/BeWoImFlow/SettlementReport.resx
+++ b/ReportImp/BeWoImFlow/SettlementReport.resx
@@ -120,17 +120,6 @@
   <data name="xrLabel6.Text" xml:space="preserve">
     <value>anbei sende ich Ihnen die unterzeichneten Quittierungsbelege über die im Rahmen des
 Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich hieraus:</value>
-  </data>
-  <data name="xrLabel10.Text" xml:space="preserve">
-    <value>Ich bitte Sie, die Differenz in meiner nächsten Avis zu verrechnen. 
-
-Mit freundlichen Grüßen
-
-Alexander Rieps
-
-
-- Da die Abrechnung ein automatisch erstelltes Schreiben ist, ist sie auch ohne Unterschrift gültig -
-</value>
   </data>
   <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFYAZQByAGQAYQBuAGEAOwB9AHsAXABmADMAIABBAHIAaQBhAGwAOwB9AH0AewBcAGMAbwBsAG8AcgB0AGIAbAAgADsAXAByAGUAZAAxADUAMwBcAGcAcgBlAGUAbgAxADUAMwBcAGIAbAB1AGUAMQA1ADMAIAA7AFwAcgBlAGQAMABcAGcAcgBlAGUAbgAwAFwAYgBsAHUAZQAwACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMgA1ADUAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABmADIAXABmAHMAMQA1AFwAYwBmADEAIABCAG8AZAB5ACAAVABlAHgAdAAgADIAOwB9AHsAXAAqAFwAYwBzADIAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAzAFwAcwBiAGEAcwBlAGQAbwBuADIAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADQAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADMAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANQBcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA2AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANQBcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGIAXABmADMAXABmAHMAMQA2AFwAYwBmADAAIABCAGUAVwBvAC0AaQBtAGYAbABvAHcAfQB7AFwAZgAzAFwAZgBzADEANgBcAGMAZgAwACAAIABcAHUAOQA2ADcAOQBcACcAMwBmAH0AewBcAGIAXABmADMAXABmAHMAMQA2AFwAYwBmADAAIABBAGQAYQBsAGIAZQByAHQAcwB0AHIALgAgADEAMQAtADEANQAgAFwAdQA5ADYANwA5AFwAJwAzAGYAIAA1ADEAMQAwADMAIAAgAEsAXAB1ADIANAA2AFwAJwBmADYAbABuAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAyAFwAcABhAHIAfQA=</value>
diff --git a/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs b/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs
index ee9f59753..fd62f09ac 100644
--- a/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs
+++ b/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs
@@ -97,6 +97,8 @@ www.landshuter-netzwerk.de";
             }
             else if (team == "Betreutes Wohnen Dingolfing-Landau")
             {
+                pRO.Notice = "Therapeutische Wohngemeinschaft";
+
                 lblNameStandort.Text = "Betreutes Wohnen Dingolfing-Landau";
                 lblAnschriftKurz.Text = "Landshuter Netzwerk e.V., Bahnhofstraße 1, 84130 Dingolfing";
                 lblKontaktdaten.Text = @"
diff --git a/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs b/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs
index 5aaab6d10..fd9318e45 100644
--- a/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/LebenshilfeEssenReports/LHEssenMitarbeiterstundenkontoBerechnung.cs
@@ -110,7 +110,7 @@ namespace BeWo.LebenshilfeEssenReports
 	        else
 	        {
 	            base.CalculateSpecialHours(dd, sr, duration);
-            }
+	        }
 	    }
 
 
diff --git a/ReportImp/Lori/SettlementReport.Designer.cs b/ReportImp/Lori/SettlementReport.Designer.cs
index e02f712d6..2d4ef3162 100644
--- a/ReportImp/Lori/SettlementReport.Designer.cs
+++ b/ReportImp/Lori/SettlementReport.Designer.cs
@@ -31,7 +31,7 @@ namespace Lori
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-            this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
+            this.xrLineFussnote = new DevExpress.XtraReports.UI.XRLine();
             this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
@@ -65,9 +65,9 @@ namespace Lori
             this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblFussnote = new DevExpress.XtraReports.UI.XRLabel();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
@@ -85,7 +85,7 @@ namespace Lori
             // Detail
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLine2,
+            this.xrLineFussnote,
             this.xrLine1,
             this.xrLabel16,
             this.xrLabel35,
@@ -95,9 +95,9 @@ namespace Lori
             this.xrTable2,
             this.xrLabel10,
             this.xrLabel7,
-            this.xrLabel14,
+            this.lblAktenzeichen,
             this.xrLabel15,
-            this.xrLabel17});
+            this.lblFussnote});
             this.Detail.Font = new System.Drawing.Font("Arial", 11F);
             this.Detail.HeightF = 583.0833F;
             this.Detail.Name = "Detail";
@@ -105,11 +105,11 @@ namespace Lori
             this.Detail.StylePriority.UseFont = false;
             this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
-            // xrLine2
+            // xrLineFussnote
             // 
-            this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 546.2501F);
-            this.xrLine2.Name = "xrLine2";
-            this.xrLine2.SizeF = new System.Drawing.SizeF(270F, 9.75F);
+            this.xrLineFussnote.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 546.2501F);
+            this.xrLineFussnote.Name = "xrLineFussnote";
+            this.xrLineFussnote.SizeF = new System.Drawing.SizeF(270F, 9.75F);
             // 
             // xrLine1
             // 
@@ -384,20 +384,20 @@ namespace Lori
             this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
             this.xrLabel7.WordWrap = false;
             // 
-            // xrLabel14
+            // lblAktenzeichen
             // 
-            this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel14.CanShrink = true;
-            this.xrLabel14.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 67.37493F);
-            this.xrLabel14.Multiline = true;
-            this.xrLabel14.Name = "xrLabel14";
-            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel14.StylePriority.UseBackColor = false;
-            this.xrLabel14.StylePriority.UseFont = false;
-            this.xrLabel14.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]";
-            this.xrLabel14.WordWrap = false;
+            this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
+            this.lblAktenzeichen.CanShrink = true;
+            this.lblAktenzeichen.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 67.37493F);
+            this.lblAktenzeichen.Multiline = true;
+            this.lblAktenzeichen.Name = "lblAktenzeichen";
+            this.lblAktenzeichen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.lblAktenzeichen.StylePriority.UseBackColor = false;
+            this.lblAktenzeichen.StylePriority.UseFont = false;
+            this.lblAktenzeichen.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]";
+            this.lblAktenzeichen.WordWrap = false;
             // 
             // xrLabel15
             // 
@@ -413,18 +413,18 @@ namespace Lori
             this.xrLabel15.Text = "für [Salutation2] [CustomerName], geb. [CustomerBirthdayString]";
             this.xrLabel15.WordWrap = false;
             // 
-            // xrLabel17
+            // lblFussnote
             // 
-            this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 556.0001F);
-            this.xrLabel17.Multiline = true;
-            this.xrLabel17.Name = "xrLabel17";
-            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel17.SizeF = new System.Drawing.SizeF(598.0811F, 27.08325F);
-            this.xrLabel17.StylePriority.UseBackColor = false;
-            this.xrLabel17.StylePriority.UseFont = false;
-            this.xrLabel17.Text = "¹vom LWL gesondert bewilligte Leistungen zur Deckung eines einmaligen Bedarfs";
+            this.lblFussnote.BackColor = System.Drawing.Color.Transparent;
+            this.lblFussnote.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblFussnote.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 556.0001F);
+            this.lblFussnote.Multiline = true;
+            this.lblFussnote.Name = "lblFussnote";
+            this.lblFussnote.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblFussnote.SizeF = new System.Drawing.SizeF(598.0811F, 27.08325F);
+            this.lblFussnote.StylePriority.UseBackColor = false;
+            this.lblFussnote.StylePriority.UseFont = false;
+            this.lblFussnote.Text = "¹vom LWL gesondert bewilligte Leistungen zur Deckung eines einmaligen Bedarfs";
             // 
             // ruleRateFactorNull
             // 
@@ -551,12 +551,12 @@ namespace Lori
         private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
         private DevExpress.XtraReports.UI.XRLabel lblAdresse;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel7;
-		private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+		private DevExpress.XtraReports.UI.XRLabel lblAktenzeichen;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel10;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel16;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel15;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel12;
-		private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+		private DevExpress.XtraReports.UI.XRLabel lblFussnote;
 		private DevExpress.XtraReports.UI.XRTable xrTable2;
 		private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
@@ -587,7 +587,7 @@ namespace Lori
         private DevExpress.XtraReports.UI.XRLabel xrLabel35;
         private DevExpress.XtraReports.UI.XRLabel lblAdresseLori;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel19;
-        private DevExpress.XtraReports.UI.XRLine xrLine2;
+        private DevExpress.XtraReports.UI.XRLine xrLineFussnote;
         private DevExpress.XtraReports.UI.XRLine xrLine1;
         private DevExpress.XtraReports.UI.XRLabel ortDatum;
 		private DevExpress.XtraReports.UI.XRCrossBandBox xrCrossBandBox1;
diff --git a/ReportImp/Lori/SettlementReport.cs b/ReportImp/Lori/SettlementReport.cs
index 11de355d5..70a905625 100644
--- a/ReportImp/Lori/SettlementReport.cs
+++ b/ReportImp/Lori/SettlementReport.cs
@@ -58,7 +58,14 @@ namespace Lori
 
             ErstelleRechnungspositionen(pRO, terminationDate);
 
-            
+            if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) &&
+                !pRO.RecipientOrganisation.ToLower().Contains("lwl"))
+            {
+                lblAktenzeichen.Text = String.Format("Aktenzeichen: {0}", pRO.CustomerReferenceNumber);
+                lblFussnote.Visible = false;
+                xrLineFussnote.Visible = false;
+            }
+        
 
             ortDatum.Text = string.Format("{0}", DateTime.Now.ToShortDateString());
 
@@ -67,7 +74,18 @@ namespace Lori
 
         private void ErstelleRechnungspositionen(SettlementRO pRO, DateTime? terminationDate)
         {
-            if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count > 0)
+            bool createStandardPostition = pRO.InvoiceItems == null || pRO.InvoiceItems.Count == 0;
+
+        
+            if (!createStandardPostition && pRO.InvoiceItems.Count == 1)
+            {
+                if (pRO.InvoiceItems[0].ItemDescription == "Spitzabrechnung" && (pRO.InvoiceItems[0].UnitCount == null || pRO.InvoiceItems[0].UnitCount.Value == 0))
+                {
+                    createStandardPostition = true;
+                }
+            }
+
+            if (!createStandardPostition)
             {
                 if (terminationDate.HasValue)
                 {
diff --git a/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj b/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj
index d8b297433..9558c3dbd 100644
--- a/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj
+++ b/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj
@@ -74,6 +74,7 @@
     <Compile Include="Quittierungsbeleg.Designer.cs">
       <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
     </Compile>
+    <Compile Include="Service\UserService.cs" />
     <Compile Include="Teamstundenkonto.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/ReportImp/PflegedienstWessel/Quittierungsbeleg.Designer.cs b/ReportImp/PflegedienstWessel/Quittierungsbeleg.Designer.cs
index 21c99f5db..f85f17f81 100644
--- a/ReportImp/PflegedienstWessel/Quittierungsbeleg.Designer.cs
+++ b/ReportImp/PflegedienstWessel/Quittierungsbeleg.Designer.cs
@@ -61,8 +61,8 @@ namespace PflegedienstWessel
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblHeader = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -70,7 +70,8 @@ namespace PflegedienstWessel
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
@@ -78,6 +79,9 @@ namespace PflegedienstWessel
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
             this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable();
@@ -112,19 +116,15 @@ namespace PflegedienstWessel
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.lblSeite = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -139,8 +139,7 @@ namespace PflegedienstWessel
             // 
             this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
             this.Detail1,
-            this.GroupHeader1,
-            this.GroupHeader2});
+            this.GroupHeader1});
             this.DetailReport.DataMember = "Services";
             this.DetailReport.DataSource = this.bindingSource1;
             this.DetailReport.Level = 0;
@@ -522,20 +521,27 @@ namespace PflegedienstWessel
             this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
             this.xrTableCell49.Weight = 0.44692737430167606D;
             // 
-            // formattingRuleStartDate
+            // bindingSource1
             // 
-            this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
-            this.formattingRuleStartDate.DataMember = "ServicesDouble";
-            this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-            this.formattingRuleStartDate.Name = "formattingRuleStartDate";
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
             // 
-            // xrPictureBox1
+            // xrLabel3
             // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(435.1389F, 0F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(299.8606F, 88.87501F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.xrLabel3.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(42.70833F, 155.4444F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseBorders = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UsePadding = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "Monat";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
             // xrLabel17
             // 
@@ -645,23 +651,20 @@ namespace PflegedienstWessel
             this.xrLabel4.Text = "Klientin, Klient";
             this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
-            // xrLabel3
+            // xrPictureBox1
             // 
-            this.xrLabel3.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(42.70833F, 155.4444F);
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
-            this.xrLabel3.StylePriority.UseBackColor = false;
-            this.xrLabel3.StylePriority.UseBorders = false;
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.StylePriority.UsePadding = false;
-            this.xrLabel3.StylePriority.UseTextAlignment = false;
-            this.xrLabel3.Text = "Monat";
-            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(435.1389F, 0F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(299.8606F, 88.87501F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
+            // formattingRuleStartDate
+            // 
+            this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
+            this.formattingRuleStartDate.DataMember = "ServicesDouble";
+            this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.formattingRuleStartDate.Name = "formattingRuleStartDate";
             // 
             // formattingRuleServiceDesc
             // 
@@ -737,6 +740,56 @@ namespace PflegedienstWessel
             this.GroupFooter1.KeepTogether = true;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+            this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(245.0002F, 20.00001F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel11.StylePriority.UseBackColor = false;
+            this.xrLabel11.StylePriority.UseBorders = false;
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UsePadding = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldStunden", "{0:0.00}")});
+            this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(330.0003F, 20.00001F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel14.StylePriority.UseBackColor = false;
+            this.xrLabel14.StylePriority.UseBorders = false;
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.StylePriority.UsePadding = false;
+            this.xrLabel14.StylePriority.UseTextAlignment = false;
+            this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrLabel16
+            // 
+            this.xrLabel16.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(415.0004F, 20.00001F);
+            this.xrLabel16.Name = "xrLabel16";
+            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel16.StylePriority.UseBackColor = false;
+            this.xrLabel16.StylePriority.UseBorders = false;
+            this.xrLabel16.StylePriority.UseFont = false;
+            this.xrLabel16.StylePriority.UsePadding = false;
+            this.xrLabel16.StylePriority.UseTextAlignment = false;
+            this.xrLabel16.Text = "Stunden";
+            this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // lblUnterschriftKlient
             // 
             this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
@@ -1136,70 +1189,25 @@ namespace PflegedienstWessel
             this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldKontaktArt.Name = "fieldKontaktArt";
             // 
-            // xrLabel11
-            // 
-            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(245.0002F, 20.00001F);
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(85F, 20F);
-            this.xrLabel11.StylePriority.UseBackColor = false;
-            this.xrLabel11.StylePriority.UseBorders = false;
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.StylePriority.UsePadding = false;
-            this.xrLabel11.StylePriority.UseTextAlignment = false;
-            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel14
-            // 
-            this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldStunden", "{0:0.00}")});
-            this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(330.0003F, 20.00001F);
-            this.xrLabel14.Name = "xrLabel14";
-            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel14.SizeF = new System.Drawing.SizeF(85F, 20F);
-            this.xrLabel14.StylePriority.UseBackColor = false;
-            this.xrLabel14.StylePriority.UseBorders = false;
-            this.xrLabel14.StylePriority.UseFont = false;
-            this.xrLabel14.StylePriority.UsePadding = false;
-            this.xrLabel14.StylePriority.UseTextAlignment = false;
-            this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            // 
-            // xrLabel16
-            // 
-            this.xrLabel16.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(415.0004F, 20.00001F);
-            this.xrLabel16.Name = "xrLabel16";
-            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel16.SizeF = new System.Drawing.SizeF(320F, 20F);
-            this.xrLabel16.StylePriority.UseBackColor = false;
-            this.xrLabel16.StylePriority.UseBorders = false;
-            this.xrLabel16.StylePriority.UseFont = false;
-            this.xrLabel16.StylePriority.UsePadding = false;
-            this.xrLabel16.StylePriority.UseTextAlignment = false;
-            this.xrLabel16.Text = "Stunden";
-            this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
             // fieldStunden
             // 
             this.fieldStunden.Expression = "[TotalFLMBillable] / 60";
             this.fieldStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
             this.fieldStunden.Name = "fieldStunden";
             // 
-            // bindingSource1
+            // lblSeite
             // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            this.lblSeite.LocationFloat = new DevExpress.Utils.PointFloat(42.71189F, 25F);
+            this.lblSeite.Name = "lblSeite";
+            this.lblSeite.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblSeite.SizeF = new System.Drawing.SizeF(372.288F, 25F);
+            this.lblSeite.StylePriority.UseFont = false;
+            this.lblSeite.PrintOnPage += new DevExpress.XtraReports.UI.PrintOnPageEventHandler(this.lblSeite_PrintOnPage);
             // 
-            // GroupHeader2
+            // GroupHeader3
             // 
-            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPageInfo1,
+            this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblSeite,
             this.xrLabel3,
             this.xrLabel17,
             this.lblHeader,
@@ -1209,17 +1217,9 @@ namespace PflegedienstWessel
             this.xrLabel5,
             this.xrLabel4,
             this.xrPictureBox1});
-            this.GroupHeader2.HeightF = 240F;
-            this.GroupHeader2.Level = 1;
-            this.GroupHeader2.Name = "GroupHeader2";
-            // 
-            // xrPageInfo1
-            // 
-            this.xrPageInfo1.Format = "Seite {0} von {1}";
-            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(42.70833F, 25F);
-            this.xrPageInfo1.Name = "xrPageInfo1";
-            this.xrPageInfo1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
-            this.xrPageInfo1.SizeF = new System.Drawing.SizeF(243.75F, 32.29166F);
+            this.GroupHeader3.HeightF = 240F;
+            this.GroupHeader3.Name = "GroupHeader3";
+            this.GroupHeader3.RepeatEveryPage = true;
             // 
             // Quittierungsbeleg
             // 
@@ -1228,7 +1228,8 @@ namespace PflegedienstWessel
             this.DetailReport,
             this.topMarginBand1,
             this.bottomMarginBand1,
-            this.GroupFooter1});
+            this.GroupFooter1,
+            this.GroupHeader3});
             this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
             this.fieldKontaktArt,
             this.fieldStunden});
@@ -1246,10 +1247,10 @@ namespace PflegedienstWessel
             this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1342,7 +1343,7 @@ namespace PflegedienstWessel
         private DevExpress.XtraReports.UI.XRLabel xrLabel14;
         private DevExpress.XtraReports.UI.XRLabel xrLabel16;
         private DevExpress.XtraReports.UI.CalculatedField fieldStunden;
-        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
-        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+        private DevExpress.XtraReports.UI.XRLabel lblSeite;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3;
     }
 }
diff --git a/ReportImp/PflegedienstWessel/Quittierungsbeleg.cs b/ReportImp/PflegedienstWessel/Quittierungsbeleg.cs
index 5ede09480..091304d4b 100644
--- a/ReportImp/PflegedienstWessel/Quittierungsbeleg.cs
+++ b/ReportImp/PflegedienstWessel/Quittierungsbeleg.cs
@@ -12,7 +12,7 @@ namespace PflegedienstWessel
         {
             InitializeComponent();
         }
-
+        
         public void SetReportDataSource(ServicesOverviewRO pRO)
         {
             var catDict = new Dictionary<string, string>();
@@ -108,5 +108,10 @@ namespace PflegedienstWessel
                 }
             }
         }
+        
+        private void lblSeite_PrintOnPage(object sender, DevExpress.XtraReports.UI.PrintOnPageEventArgs e)
+        {
+            lblSeite.Text = String.Format("Seite {0} von {1}", e.PageIndex + 1, e.PageCount);
+        }
     }
 }
diff --git a/ReportImp/PflegedienstWessel/Quittierungsbeleg.resx b/ReportImp/PflegedienstWessel/Quittierungsbeleg.resx
index eae162b4d..393f1a49e 100644
--- a/ReportImp/PflegedienstWessel/Quittierungsbeleg.resx
+++ b/ReportImp/PflegedienstWessel/Quittierungsbeleg.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>21, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -379,9 +382,6 @@
         AABaU6cBAACgNXUaAAAAWlOnAQAAoDV1GgAAAFr67W//fwQ0DpKntHgrAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 17</value>
-  </metadata>
   <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
   </data>
diff --git a/ReportImp/PflegedienstWessel/Service/UserService.cs b/ReportImp/PflegedienstWessel/Service/UserService.cs
new file mode 100644
index 000000000..5144305b5
--- /dev/null
+++ b/ReportImp/PflegedienstWessel/Service/UserService.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Core;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.MessageContracts;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using Utils = BS.Shared.Core.Utils;
+
+namespace PflegedienstWessel.Service
+{
+    public class CustomUserService : UserService
+    {
+        public override UserDC LoadUserByLoginName(string pUserName)
+        {
+            var user = base.LoadUserByLoginName(pUserName);
+
+            bool isTeamleiter = false;
+            foreach (var group in user.UserGroups)
+            {
+                if (group.Name.Contains("Teamleitung"))
+                {
+                    isTeamleiter = true;
+                }
+            }
+
+            if (isTeamleiter)
+            {
+                foreach (var toid in user.Employee.TeamOids)
+                {
+                    if (user.Employee.LeadingTeamOids == null)
+                    {
+                        user.Employee.LeadingTeamOids = new List<long>();
+                    }
+                    if (!user.Employee.LeadingTeamOids.Contains(toid))
+                    {
+                        user.Employee.LeadingTeamOids.Add(toid);
+                    }
+                }
+            }
+            return user;
+        }
+    }
+}
diff --git a/ReportImp/SHGSchwerte/SettlementReport.Designer.cs b/ReportImp/SHGSchwerte/SettlementReport.Designer.cs
index 117ed8e6c..474a7af8a 100644
--- a/ReportImp/SHGSchwerte/SettlementReport.Designer.cs
+++ b/ReportImp/SHGSchwerte/SettlementReport.Designer.cs
@@ -31,14 +31,18 @@ namespace BeWo.SHGSchwerte
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
             this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
-            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
             this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
-            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.tableRechnungspositionen = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -63,10 +67,6 @@ namespace BeWo.SHGSchwerte
             this.cellHourlyRate3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.cellFLS3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -78,45 +78,27 @@ namespace BeWo.SHGSchwerte
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.xrCrossBandBox1 = new DevExpress.XtraReports.UI.XRCrossBandBox();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            ((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLine2,
-            this.xrLine1,
             this.xrLabel16,
-            this.xrLabel35,
-            this.xrLabel12,
-            this.xrCheckBox2,
-            this.xrCheckBox1,
-            this.xrTable2,
             this.xrLabel10,
             this.xrLabel7,
             this.xrLabel14,
-            this.xrLabel15,
-            this.xrLabel17});
+            this.xrLabel15});
             this.Detail.Font = new System.Drawing.Font("Arial", 11F);
-            this.Detail.HeightF = 583.0834F;
+            this.Detail.HeightF = 165F;
             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;
             // 
-            // xrLine2
-            // 
-            this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 546.2501F);
-            this.xrLine2.Name = "xrLine2";
-            this.xrLine2.SizeF = new System.Drawing.SizeF(270F, 9.75F);
-            // 
-            // xrLine1
-            // 
-            this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 476.25F);
-            this.xrLine1.Name = "xrLine1";
-            this.xrLine1.SizeF = new System.Drawing.SizeF(309.5687F, 9.749969F);
-            // 
             // xrLabel16
             // 
             this.xrLabel16.BackColor = System.Drawing.Color.Transparent;
@@ -131,12 +113,80 @@ namespace BeWo.SHGSchwerte
             this.xrLabel16.Text = "Ambulant Betreutes Wohnen - Budgetnachweis";
             this.xrLabel16.WordWrap = false;
             // 
+            // xrLabel10
+            // 
+            this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 131.5828F);
+            this.xrLabel10.Multiline = true;
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(642F, 27.08333F);
+            this.xrLabel10.StylePriority.UseBackColor = false;
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.Text = "Im Bewilligungszeitraum tatsächlich geleistete Fachleistungsstunden (FLS)";
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.CanShrink = true;
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 87.37488F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
+            this.xrLabel7.WordWrap = false;
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel14.CanShrink = true;
+            this.xrLabel14.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 67.37493F);
+            this.xrLabel14.Multiline = true;
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel14.StylePriority.UseBackColor = false;
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]";
+            this.xrLabel14.WordWrap = false;
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel15.CanShrink = true;
+            this.xrLabel15.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 47.37492F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel15.StylePriority.UseBackColor = false;
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.Text = "für [Salutation2] [CustomerName], geb. [CustomerBirthdayString]";
+            this.xrLabel15.WordWrap = false;
+            // 
+            // xrLine2
+            // 
+            this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 274.3801F);
+            this.xrLine2.Name = "xrLine2";
+            this.xrLine2.SizeF = new System.Drawing.SizeF(270F, 9.75F);
+            // 
+            // xrLine1
+            // 
+            this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 204.38F);
+            this.xrLine1.Name = "xrLine1";
+            this.xrLine1.SizeF = new System.Drawing.SizeF(309.5687F, 9.749969F);
+            // 
             // xrLabel35
             // 
             this.xrLabel35.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrLabel35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 486F);
+            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 214.13F);
             this.xrLabel35.Multiline = true;
             this.xrLabel35.Name = "xrLabel35";
             this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -150,7 +200,7 @@ namespace BeWo.SHGSchwerte
             // xrLabel12
             // 
             this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 339.5832F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 67.71317F);
             this.xrLabel12.Multiline = true;
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -161,7 +211,7 @@ namespace BeWo.SHGSchwerte
             // 
             // xrCheckBox2
             // 
-            this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(424.5834F, 281.87F);
+            this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(424.5832F, 9.999974F);
             this.xrCheckBox2.Name = "xrCheckBox2";
             this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
             this.xrCheckBox2.StylePriority.UseFont = false;
@@ -169,29 +219,29 @@ namespace BeWo.SHGSchwerte
             // 
             // xrCheckBox1
             // 
-            this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 281.87F);
+            this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 9.999974F);
             this.xrCheckBox1.Name = "xrCheckBox1";
             this.xrCheckBox1.SizeF = new System.Drawing.SizeF(359.5833F, 21.875F);
             this.xrCheckBox1.StylePriority.UseFont = false;
             this.xrCheckBox1.Text = " Die Betreuung wurde am                  beendet.";
             // 
-            // xrTable2
+            // tableRechnungspositionen
             // 
-            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            this.tableRechnungspositionen.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 173.5417F);
-            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.tableRechnungspositionen.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 0F);
+            this.tableRechnungspositionen.Name = "tableRechnungspositionen";
+            this.tableRechnungspositionen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.tableRechnungspositionen.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2,
             this.xrTableRow5,
             this.xrTableRow6,
             this.xrTableRow8});
-            this.xrTable2.SizeF = new System.Drawing.SizeF(641.9999F, 96F);
-            this.xrTable2.StylePriority.UseBorders = false;
-            this.xrTable2.StylePriority.UseFont = false;
-            this.xrTable2.StylePriority.UsePadding = false;
+            this.tableRechnungspositionen.SizeF = new System.Drawing.SizeF(641.9999F, 96F);
+            this.tableRechnungspositionen.StylePriority.UseBorders = false;
+            this.tableRechnungspositionen.StylePriority.UseFont = false;
+            this.tableRechnungspositionen.StylePriority.UsePadding = false;
             // 
             // xrTableRow2
             // 
@@ -357,67 +407,11 @@ namespace BeWo.SHGSchwerte
             this.xrTableCell29.Name = "xrTableCell29";
             this.xrTableCell29.Weight = 0.663551203509769D;
             // 
-            // xrLabel10
-            // 
-            this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 131.5828F);
-            this.xrLabel10.Multiline = true;
-            this.xrLabel10.Name = "xrLabel10";
-            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(642F, 27.08333F);
-            this.xrLabel10.StylePriority.UseBackColor = false;
-            this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.Text = "Im Bewilligungszeitraum tatsächlich geleistete Fachleistungsstunden (FLS)";
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel7.CanShrink = true;
-            this.xrLabel7.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 87.37488F);
-            this.xrLabel7.Multiline = true;
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel7.StylePriority.UseBackColor = false;
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.Text = "Bewilligungszeitraum von [AccountingPeriod]";
-            this.xrLabel7.WordWrap = false;
-            // 
-            // xrLabel14
-            // 
-            this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel14.CanShrink = true;
-            this.xrLabel14.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 67.37493F);
-            this.xrLabel14.Multiline = true;
-            this.xrLabel14.Name = "xrLabel14";
-            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel14.StylePriority.UseBackColor = false;
-            this.xrLabel14.StylePriority.UseFont = false;
-            this.xrLabel14.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]";
-            this.xrLabel14.WordWrap = false;
-            // 
-            // xrLabel15
-            // 
-            this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel15.CanShrink = true;
-            this.xrLabel15.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
-            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(60.0001F, 47.37492F);
-            this.xrLabel15.Name = "xrLabel15";
-            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel15.StylePriority.UseBackColor = false;
-            this.xrLabel15.StylePriority.UseFont = false;
-            this.xrLabel15.Text = "für [Salutation2] [CustomerName], geb. [CustomerBirthdayString]";
-            this.xrLabel15.WordWrap = false;
-            // 
             // xrLabel17
             // 
             this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 556.0001F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(65.00015F, 284.1301F);
             this.xrLabel17.Multiline = true;
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -429,9 +423,6 @@ namespace BeWo.SHGSchwerte
             // ruleRateFactorNull
             // 
             this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
-            // 
-            // 
-            // 
             this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.ruleRateFactorNull.Name = "ruleRateFactorNull";
             // 
@@ -442,7 +433,7 @@ namespace BeWo.SHGSchwerte
             // 
             // bottomMarginBand1
             // 
-            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.HeightF = 90.33334F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // GroupHeader1
@@ -513,34 +504,61 @@ namespace BeWo.SHGSchwerte
             // 
             // xrCrossBandBox1
             // 
-            this.xrCrossBandBox1.BorderWidth = 1;
+            this.xrCrossBandBox1.BorderWidth = 1F;
             this.xrCrossBandBox1.EndBand = this.bottomMarginBand1;
-            this.xrCrossBandBox1.EndPointFloat = new DevExpress.Utils.PointFloat(0F, 21.87494F);
+            this.xrCrossBandBox1.EndPointFloat = new DevExpress.Utils.PointFloat(0F, 62.20828F);
             this.xrCrossBandBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.99999F);
             this.xrCrossBandBox1.Name = "xrCrossBandBox1";
             this.xrCrossBandBox1.StartBand = this.topMarginBand1;
             this.xrCrossBandBox1.StartPointFloat = new DevExpress.Utils.PointFloat(0F, 29.99999F);
             this.xrCrossBandBox1.WidthF = 766.6667F;
             // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.tableRechnungspositionen});
+            this.GroupFooter1.Font = new System.Drawing.Font("Arial", 11F);
+            this.GroupFooter1.HeightF = 96F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.StylePriority.UseFont = false;
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLine2,
+            this.xrLine1,
+            this.xrLabel35,
+            this.xrLabel12,
+            this.xrCheckBox2,
+            this.xrLabel17,
+            this.xrCheckBox1});
+            this.GroupFooter2.Font = new System.Drawing.Font("Arial", 11F);
+            this.GroupFooter2.HeightF = 311.2133F;
+            this.GroupFooter2.Level = 1;
+            this.GroupFooter2.Name = "GroupFooter2";
+            this.GroupFooter2.StylePriority.UseFont = false;
+            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
             this.Detail,
             this.topMarginBand1,
             this.bottomMarginBand1,
-            this.GroupHeader1});
+            this.GroupHeader1,
+            this.GroupFooter1,
+            this.GroupFooter2});
             this.CrossBandControls.AddRange(new DevExpress.XtraReports.UI.XRCrossBandControl[] {
             this.xrCrossBandBox1});
             this.DataSource = this.bindingSource1;
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
             this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(30, 30, 90, 50);
+            this.Margins = new System.Drawing.Printing.Margins(30, 30, 90, 90);
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.1";
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.tableRechnungspositionen)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
@@ -562,7 +580,7 @@ namespace BeWo.SHGSchwerte
 		private DevExpress.XtraReports.UI.XRLabel xrLabel15;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel12;
 		private DevExpress.XtraReports.UI.XRLabel xrLabel17;
-		private DevExpress.XtraReports.UI.XRTable xrTable2;
+		private DevExpress.XtraReports.UI.XRTable tableRechnungspositionen;
 		private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
 		private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
@@ -596,5 +614,7 @@ namespace BeWo.SHGSchwerte
         private DevExpress.XtraReports.UI.XRLine xrLine1;
         private DevExpress.XtraReports.UI.XRLabel ortDatum;
 		private DevExpress.XtraReports.UI.XRCrossBandBox xrCrossBandBox1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
     }
 }
diff --git a/ReportImp/SHGSchwerte/SettlementReport.cs b/ReportImp/SHGSchwerte/SettlementReport.cs
index dd386803d..bc5575bc7 100644
--- a/ReportImp/SHGSchwerte/SettlementReport.cs
+++ b/ReportImp/SHGSchwerte/SettlementReport.cs
@@ -64,28 +64,29 @@ namespace BeWo.SHGSchwerte
         {
             if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count > 0)
             {
-                if (terminationDate.HasValue)
+                int rowIndex = 0;
+                foreach (var ii in pRO.InvoiceItems)
                 {
-                    if (terminationDate < pRO.InvoiceItems[pRO.InvoiceItems.Count - 1].ItemPeriodEnd)
+                    if (ii.UnitCount.HasValue && ii.UnitCount.Value > 0)
                     {
-                        pRO.InvoiceItems[pRO.InvoiceItems.Count - 1].ItemPeriodEnd = terminationDate;
+                        AddRechnungsposition(ii, rowIndex++);
                     }
                 }
-                if (pRO.InvoiceItems.Count == 3)
-                {
-                    SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
-                    SetzeRechnungsTexte(pRO.InvoiceItems[1], cellStart2, cellEnd2, cellHourlyRate2, cellFLS2);
-                    SetzeRechnungsTexte(pRO.InvoiceItems[2], cellStart3, cellEnd3, cellHourlyRate3, cellFLS3);
-                }
-                else if (pRO.InvoiceItems.Count == 2)
-                {
-                    SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
-                    SetzeRechnungsTexte(pRO.InvoiceItems[1], cellStart2, cellEnd2, cellHourlyRate2, cellFLS2);
-                }
-                else
-                {
-                    SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
-                }
+                //if (pRO.InvoiceItems.Count == 3)
+                //{
+                //    SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
+                //    SetzeRechnungsTexte(pRO.InvoiceItems[1], cellStart2, cellEnd2, cellHourlyRate2, cellFLS2);
+                //    SetzeRechnungsTexte(pRO.InvoiceItems[2], cellStart3, cellEnd3, cellHourlyRate3, cellFLS3);
+                //}
+                //else if (pRO.InvoiceItems.Count == 2)
+                //{
+                //    SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
+                //    SetzeRechnungsTexte(pRO.InvoiceItems[1], cellStart2, cellEnd2, cellHourlyRate2, cellFLS2);
+                //}
+                //else
+                //{
+                //    SetzeRechnungsTexte(pRO.InvoiceItems[0], cellStart1, cellEnd1, cellHourlyRate1, cellFLS1);
+                //}
             }
             else
             {
@@ -93,6 +94,23 @@ namespace BeWo.SHGSchwerte
             }
         }
 
+        private void AddRechnungsposition(InvoiceItemDC ii, int rowIndex)
+        {
+            XRTableRow newRow = null;
+            if (rowIndex > 2)
+            {
+                newRow = tableRechnungspositionen.InsertRowBelow(tableRechnungspositionen.Rows[tableRechnungspositionen.Rows.Count - 1]);
+            }
+            else
+            {
+                newRow = tableRechnungspositionen.Rows[rowIndex + 1];
+            }
+            newRow.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", ii.ItemPeriodStart);
+            newRow.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", ii.ItemPeriodEnd);
+            newRow.Cells[2].Text = String.Format("{0:0.00}", ii.AmountPerUnit);
+            newRow.Cells[3].Text = String.Format("{0:0.00}", ii.UnitCount);
+        }
+
         private void SetzeRechnungsTexte(InvoiceItemDC ii, XRTableCell cellStart, XRTableCell cellEnd, XRTableCell cellHourlyRate, XRTableCell cellFLS)
         {
             cellStart.Text = String.Format("{0:dd.MM.yyyy}", ii.ItemPeriodStart);
diff --git a/ReportImp/VkmRietberg/Properties/AssemblyInfo.cs b/ReportImp/VkmRietberg/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..8f0f3e5bf
--- /dev/null
+++ b/ReportImp/VkmRietberg/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("VkmRietberg")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("VkmRietberg")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("a14ab74b-a788-492f-93c3-c992eb03abc1")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ReportImp/VkmRietberg/Properties/licenses.licx b/ReportImp/VkmRietberg/Properties/licenses.licx
new file mode 100644
index 000000000..c7fd819d5
--- /dev/null
+++ b/ReportImp/VkmRietberg/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/ReportImp/VkmRietberg/Quittierungsbeleg.Designer.cs b/ReportImp/VkmRietberg/Quittierungsbeleg.Designer.cs
new file mode 100644
index 000000000..414d33112
--- /dev/null
+++ b/ReportImp/VkmRietberg/Quittierungsbeleg.Designer.cs
@@ -0,0 +1,1299 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.Report.DefaultReports
+{
+    partial class Quittierungsbeleg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Quittierungsbeleg));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            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.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
+            this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblHatAbwesenheiten = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblHatGruppen = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
+            this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).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;
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupHeader1});
+            this.DetailReport.DataMember = "Services";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            this.DetailReport.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.DetailReport.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.Detail1.HeightF = 20F;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.BorderColor = System.Drawing.Color.Black;
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            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(735F, 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.xrTableCell14,
+            this.xrTableCell10,
+            this.xrTableCell2,
+            this.xrTableCell15,
+            this.xrTableCell12,
+            this.xrTableCell44,
+            this.xrTableCell50});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableRow6.Weight = 1D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")});
+            this.xrTableCell13.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.StylePriority.UseBorders = false;
+            this.xrTableCell13.StylePriority.UseFont = false;
+            this.xrTableCell13.StylePriority.UsePadding = false;
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "xrTableCell13";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.11994951833461227D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")});
+            this.xrTableCell14.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseBorders = false;
+            this.xrTableCell14.StylePriority.UseFont = false;
+            this.xrTableCell14.StylePriority.UsePadding = false;
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "xrTableCell14";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell14.Weight = 0.094696981389528381D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")});
+            this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseBorders = false;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            this.xrTableCell10.Text = "xrTableCell10";
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell10.Weight = 0.094696933224158855D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")});
+            this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseFont = false;
+            this.xrTableCell2.StylePriority.UsePadding = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell2.Weight = 0.05366162346946534D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount", "{0:0}")});
+            this.xrTableCell15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.StylePriority.UseBorders = false;
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UsePadding = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell15.Weight = 0.05366162346946534D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")});
+            this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.StylePriority.UseBorders = false;
+            this.xrTableCell12.StylePriority.UseFont = false;
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell12.Weight = 0.10732323052948757D;
+            // 
+            // xrTableCell44
+            // 
+            this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
+            this.xrTableCell44.Name = "xrTableCell44";
+            this.xrTableCell44.StylePriority.UseBorders = false;
+            this.xrTableCell44.StylePriority.UseFont = false;
+            this.xrTableCell44.StylePriority.UsePadding = false;
+            this.xrTableCell44.StylePriority.UseTextAlignment = false;
+            this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell44.Weight = 0.20202019104791347D;
+            // 
+            // xrTableCell50
+            // 
+            this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.picSignature});
+            this.xrTableCell50.Name = "xrTableCell50";
+            this.xrTableCell50.StylePriority.UseBorders = false;
+            this.xrTableCell50.StylePriority.UseFont = false;
+            this.xrTableCell50.StylePriority.UsePadding = false;
+            this.xrTableCell50.StylePriority.UseTextAlignment = false;
+            this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell50.Weight = 0.20202019042968572D;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableServiceRecords1});
+            this.GroupHeader1.HeightF = 70F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.RepeatEveryPage = true;
+            // 
+            // xrTableServiceRecords1
+            // 
+            this.xrTableServiceRecords1.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            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.xrTableRow1});
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(735F, 70F);
+            this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
+            this.xrTableServiceRecords1.StylePriority.UseBorders = false;
+            this.xrTableServiceRecords1.StylePriority.UseFont = false;
+            this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell4,
+            this.xrTableCell11,
+            this.xrTableCell9,
+            this.xrTableCell28,
+            this.xrTableCell48});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableRow2.Weight = 0.48945783132530124D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            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.BottomCenter;
+            this.xrTableCell3.Weight = 0.26536312849161997D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell4.Multiline = true;
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 0, 0, 100F);
+            this.xrTableCell4.StylePriority.UseBorders = false;
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UsePadding = false;
+            this.xrTableCell4.StylePriority.UseTextAlignment = false;
+            this.xrTableCell4.Text = "Uhrzeit";
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableCell4.Weight = 0.41899441340782145D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(12, 12, 0, 0, 100F);
+            this.xrTableCell11.StylePriority.UseBorders = false;
+            this.xrTableCell11.StylePriority.UseFont = false;
+            this.xrTableCell11.StylePriority.UsePadding = false;
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Angebot";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableCell11.Weight = 0.23743016759776542D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell9.Multiline = true;
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.StylePriority.UseTextAlignment = false;
+            this.xrTableCell9.Text = "FLS in";
+            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableCell9.Weight = 0.23743016759776536D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.StylePriority.UseBorders = false;
+            this.xrTableCell28.StylePriority.UseFont = false;
+            this.xrTableCell28.StylePriority.UseTextAlignment = false;
+            this.xrTableCell28.Text = "Betreuerin / Betreuer";
+            this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableCell28.Weight = 0.44692737430167595D;
+            // 
+            // xrTableCell48
+            // 
+            this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell48.Multiline = true;
+            this.xrTableCell48.Name = "xrTableCell48";
+            this.xrTableCell48.StylePriority.UseBorders = false;
+            this.xrTableCell48.StylePriority.UseFont = false;
+            this.xrTableCell48.StylePriority.UseTextAlignment = false;
+            this.xrTableCell48.Text = "Unterschrift";
+            this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+            this.xrTableCell48.Weight = 0.44692737430167606D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell8,
+            this.xrTableCell5,
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell43,
+            this.xrTableCell49});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1.223644578313253D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.Weight = 0.26536312849161997D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.StylePriority.UseBorders = false;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "von";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell8.Weight = 0.20949720670391073D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.StylePriority.UseBorders = false;
+            this.xrTableCell5.StylePriority.UseFont = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "bis";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell5.Weight = 0.2094972067039107D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "Art /\r\nAnzahl\r\nKlienten";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell6.Weight = 0.23743016759776545D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell7.Multiline = true;
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseBackColor = false;
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Minuten\r\n(ohne 1,2)";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell7.Weight = 0.23743016759776536D;
+            // 
+            // xrTableCell43
+            // 
+            this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell43.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell43.Name = "xrTableCell43";
+            this.xrTableCell43.StylePriority.UseBorders = false;
+            this.xrTableCell43.StylePriority.UseFont = false;
+            this.xrTableCell43.Weight = 0.44692737430167595D;
+            // 
+            // xrTableCell49
+            // 
+            this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell49.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrTableCell49.Multiline = true;
+            this.xrTableCell49.Name = "xrTableCell49";
+            this.xrTableCell49.StylePriority.UseBorders = false;
+            this.xrTableCell49.StylePriority.UseFont = false;
+            this.xrTableCell49.StylePriority.UseTextAlignment = false;
+            this.xrTableCell49.Text = "Klientin / Klient";
+            this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell49.Weight = 0.44692737430167606D;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
+            // 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.xrLabel14,
+            this.xrLabel16,
+            this.xrLabel7,
+            this.xrLabel8,
+            this.xrLabel6,
+            this.xrLabel5,
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLabel2});
+            this.ReportHeader.HeightF = 130F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F);
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
+            this.xrLabel14.StylePriority.UseBackColor = false;
+            this.xrLabel14.StylePriority.UseBorders = false;
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.StylePriority.UsePadding = false;
+            this.xrLabel14.StylePriority.UseTextAlignment = false;
+            this.xrLabel14.Text = "Bewilligte FLS wöchentlich";
+            this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel16
+            // 
+            this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
+            this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F);
+            this.xrLabel16.Name = "xrLabel16";
+            this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F);
+            this.xrLabel16.StylePriority.UseBackColor = false;
+            this.xrLabel16.StylePriority.UseBorders = false;
+            this.xrLabel16.StylePriority.UseFont = false;
+            this.xrLabel16.StylePriority.UsePadding = false;
+            this.xrLabel16.StylePriority.UseTextAlignment = false;
+            this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F);
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseBorders = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.StylePriority.UsePadding = false;
+            this.xrLabel7.StylePriority.UseTextAlignment = false;
+            this.xrLabel7.Text = "Aktenzeichen";
+            this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F);
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F);
+            this.xrLabel8.StylePriority.UseBackColor = false;
+            this.xrLabel8.StylePriority.UseBorders = false;
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.StylePriority.UsePadding = false;
+            this.xrLabel8.StylePriority.UseTextAlignment = false;
+            this.xrLabel8.Text = "[ReferenceNumber]";
+            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F);
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
+            this.xrLabel6.StylePriority.UseBackColor = false;
+            this.xrLabel6.StylePriority.UseBorders = false;
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.StylePriority.UsePadding = false;
+            this.xrLabel6.StylePriority.UseTextAlignment = false;
+            this.xrLabel6.Text = "[CustomerName]";
+            this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.11109F);
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F);
+            this.xrLabel5.StylePriority.UseBackColor = false;
+            this.xrLabel5.StylePriority.UseBorders = false;
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UsePadding = false;
+            this.xrLabel5.StylePriority.UseTextAlignment = false;
+            this.xrLabel5.Text = "[Month] [Year]";
+            this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F);
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseBorders = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.StylePriority.UsePadding = false;
+            this.xrLabel4.StylePriority.UseTextAlignment = false;
+            this.xrLabel4.Text = "Klientin, Klient";
+            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseBorders = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.StylePriority.UsePadding = false;
+            this.xrLabel3.StylePriority.UseTextAlignment = false;
+            this.xrLabel3.Text = "Monat";
+            this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(674.9998F, 25F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.StylePriority.UseTextAlignment = false;
+            this.xrLabel2.Text = "Quittierungsbeleg [Mandator.Name]";
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            // 
+            // 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.HeightF = 100F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblUnterschriftKlient,
+            this.lblUnterschriftMitarbeiter,
+            this.xrTableAbwesenheiten,
+            this.lblHatAbwesenheiten,
+            this.lblHatGruppen,
+            this.xrRichText2,
+            this.xrRichText1,
+            this.xrLabel15,
+            this.xrLabel13,
+            this.xrLabel12,
+            this.xrLabel11,
+            this.xrLabel10,
+            this.xrLabel9,
+            this.xrLabel1});
+            this.GroupFooter1.HeightF = 270F;
+            this.GroupFooter1.KeepTogether = true;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // lblUnterschriftKlient
+            // 
+            this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99999F, 250F);
+            this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
+            this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(271.8472F, 20F);
+            this.lblUnterschriftKlient.StylePriority.UseBackColor = false;
+            this.lblUnterschriftKlient.StylePriority.UseBorders = false;
+            this.lblUnterschriftKlient.StylePriority.UseFont = false;
+            this.lblUnterschriftKlient.StylePriority.UsePadding = false;
+            this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
+            this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in";
+            this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // lblUnterschriftMitarbeiter
+            // 
+            this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+            this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F);
+            this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
+            this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F);
+            this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false;
+            this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false;
+            this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
+            this.lblUnterschriftMitarbeiter.StylePriority.UsePadding = false;
+            this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false;
+            this.lblUnterschriftMitarbeiter.Text = "Datum, verantwortliche/r Mitarbeiter/in";
+            this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableAbwesenheiten
+            // 
+            this.xrTableAbwesenheiten.BorderColor = System.Drawing.Color.Black;
+            this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F);
+            this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
+            this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3,
+            this.xrTableRow4,
+            this.xrTableRow5,
+            this.xrTableRow7,
+            this.xrTableRow8});
+            this.xrTableAbwesenheiten.SizeF = new System.Drawing.SizeF(230F, 100F);
+            this.xrTableAbwesenheiten.StylePriority.UseBorders = false;
+            this.xrTableAbwesenheiten.StylePriority.UseFont = false;
+            this.xrTableAbwesenheiten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell18});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableRow3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.Text = "von";
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell16.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseBorders = false;
+            this.xrTableCell17.StylePriority.UseFont = false;
+            this.xrTableCell17.StylePriority.UsePadding = false;
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            this.xrTableCell17.Text = "bis";
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell17.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.StylePriority.UseBorders = false;
+            this.xrTableCell18.StylePriority.UseFont = false;
+            this.xrTableCell18.StylePriority.UsePadding = false;
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            this.xrTableCell18.Text = "Tage";
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell18.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell21});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.StylePriority.UseFont = false;
+            this.xrTableCell19.StylePriority.UseTextAlignment = false;
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell19.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell20.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell21.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow5
+            // 
+            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell24});
+            this.xrTableRow5.Name = "xrTableRow5";
+            this.xrTableRow5.Weight = 1D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell22.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell23.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseFont = false;
+            this.xrTableCell24.StylePriority.UseTextAlignment = false;
+            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell24.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow7
+            // 
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell25,
+            this.xrTableCell26,
+            this.xrTableCell27});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.Weight = 1D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseFont = false;
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell25.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseFont = false;
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell26.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.StylePriority.UseFont = false;
+            this.xrTableCell27.StylePriority.UseTextAlignment = false;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell27.Weight = 0.075757568269402914D;
+            // 
+            // xrTableRow8
+            // 
+            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell29,
+            this.xrTableCell30,
+            this.xrTableCell31});
+            this.xrTableRow8.Name = "xrTableRow8";
+            this.xrTableRow8.Weight = 1D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.StylePriority.UseFont = false;
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell29.Weight = 0.1073232364991462D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseFont = false;
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell30.Weight = 0.10732323432577288D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseFont = false;
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell31.Weight = 0.075757568269402914D;
+            // 
+            // lblHatAbwesenheiten
+            // 
+            this.lblHatAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F);
+            this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten";
+            this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F);
+            this.lblHatAbwesenheiten.StylePriority.UseBackColor = false;
+            this.lblHatAbwesenheiten.StylePriority.UseBorders = false;
+            this.lblHatAbwesenheiten.StylePriority.UseFont = false;
+            this.lblHatAbwesenheiten.StylePriority.UsePadding = false;
+            this.lblHatAbwesenheiten.StylePriority.UseTextAlignment = false;
+            this.lblHatAbwesenheiten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // lblHatGruppen
+            // 
+            this.lblHatGruppen.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F);
+            this.lblHatGruppen.Name = "lblHatGruppen";
+            this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F);
+            this.lblHatGruppen.StylePriority.UseBackColor = false;
+            this.lblHatGruppen.StylePriority.UseBorders = false;
+            this.lblHatGruppen.StylePriority.UseFont = false;
+            this.lblHatGruppen.StylePriority.UsePadding = false;
+            this.lblHatGruppen.StylePriority.UseTextAlignment = false;
+            this.lblHatGruppen.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrRichText2
+            // 
+            this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F);
+            this.xrRichText2.StylePriority.UseFont = false;
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
+            this.xrRichText1.StylePriority.UseFont = false;
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F);
+            this.xrLabel15.Multiline = true;
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(170F, 43.61115F);
+            this.xrLabel15.StylePriority.UseBackColor = false;
+            this.xrLabel15.StylePriority.UseBorders = false;
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.StylePriority.UsePadding = false;
+            this.xrLabel15.StylePriority.UseTextAlignment = false;
+            this.xrLabel15.Text = "Krankenhausaufenthalte/\r\nstat. Rehamaßnahmen:";
+            this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // xrLabel13
+            // 
+            this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F);
+            this.xrLabel13.Name = "xrLabel13";
+            this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel13.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel13.StylePriority.UseBackColor = false;
+            this.xrLabel13.StylePriority.UseBorders = false;
+            this.xrLabel13.StylePriority.UseFont = false;
+            this.xrLabel13.StylePriority.UsePadding = false;
+            this.xrLabel13.StylePriority.UseTextAlignment = false;
+            this.xrLabel13.Text = "GR = Gruppenangebot";
+            this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel12.StylePriority.UseBackColor = false;
+            this.xrLabel12.StylePriority.UseBorders = false;
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.StylePriority.UsePadding = false;
+            this.xrLabel12.StylePriority.UseTextAlignment = false;
+            this.xrLabel12.Text = "E    = ear to ear, face to face";
+            this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(415F, 19.99999F);
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel11.StylePriority.UseBackColor = false;
+            this.xrLabel11.StylePriority.UseBorders = false;
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UsePadding = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)";
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(415F, 0F);
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(320F, 20F);
+            this.xrLabel10.StylePriority.UseBackColor = false;
+            this.xrLabel10.StylePriority.UseBorders = false;
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.StylePriority.UsePadding = false;
+            this.xrLabel10.StylePriority.UseTextAlignment = false;
+            this.xrLabel10.Text = "Fachleistungen in Minuten";
+            this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+            this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(245F, 0F);
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel9.StylePriority.UseBackColor = false;
+            this.xrLabel9.StylePriority.UseBorders = false;
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UsePadding = false;
+            this.xrLabel9.StylePriority.UseTextAlignment = false;
+            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
+            this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(330F, 0F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel1.StylePriority.UseBackColor = false;
+            this.xrLabel1.StylePriority.UseBorders = false;
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UsePadding = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // fieldKontaktArt
+            // 
+            this.fieldKontaktArt.DataMember = "Services";
+            this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')";
+            this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
+            this.fieldKontaktArt.Name = "fieldKontaktArt";
+            // 
+            // picSignature
+            // 
+            this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
+            this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(1F, 1F);
+            this.picSignature.Name = "picSignature";
+            this.picSignature.SizeF = new System.Drawing.SizeF(158F, 18F);
+            this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.picSignature.StylePriority.UseBorders = false;
+            this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
+            // 
+            // Quittierungsbeleg
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.GroupFooter1});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldKontaktArt});
+            this.DataSource = this.bindingSource1;
+            this.Font = new System.Drawing.Font("Arial", 10F);
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.formattingRuleStartDate,
+            this.formattingRuleServiceDesc,
+            this.formattingRuleCostBearer,
+            this.formattingRuleEmployeeName});
+            this.Margins = new System.Drawing.Printing.Margins(50, 30, 100, 30);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel11;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel10;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel9;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRLabel lblHatAbwesenheiten;
+        private DevExpress.XtraReports.UI.XRLabel lblHatGruppen;
+        private DevExpress.XtraReports.UI.XRTable xrTableAbwesenheiten;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient;
+        private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+        private DevExpress.XtraReports.UI.XRPictureBox picSignature;
+    }
+}
diff --git a/ReportImp/VkmRietberg/Quittierungsbeleg.cs b/ReportImp/VkmRietberg/Quittierungsbeleg.cs
new file mode 100644
index 000000000..14b7c8016
--- /dev/null
+++ b/ReportImp/VkmRietberg/Quittierungsbeleg.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Text.RegularExpressions;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+using DevExpress.XtraReports.UI;
+
+namespace BeWo.Report.DefaultReports
+{
+    public partial class Quittierungsbeleg : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
+    {
+        public Quittierungsbeleg()
+        {
+            InitializeComponent();
+        }
+
+        public void SetReportDataSource(ServicesOverviewRO pRO)
+        {
+            bool hatGruppen = false;
+
+            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;
+                }
+            }
+        }
+
+        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)
+        {
+            Image returnImage = null;
+            MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
+            returnImage = Image.FromStream(ms);
+
+            return returnImage;
+        }
+    }
+}
diff --git a/ReportImp/VkmRietberg/Quittierungsbeleg.resx b/ReportImp/VkmRietberg/Quittierungsbeleg.resx
new file mode 100644
index 000000000..9f46badba
--- /dev/null
+++ b/ReportImp/VkmRietberg/Quittierungsbeleg.resx
@@ -0,0 +1,129 @@
+<?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>21, 17</value>
+  </metadata>
+  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ReportImp/VkmRietberg/VkmRietberg.csproj b/ReportImp/VkmRietberg/VkmRietberg.csproj
new file mode 100644
index 000000000..e76b2b6eb
--- /dev/null
+++ b/ReportImp/VkmRietberg/VkmRietberg.csproj
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A14AB74B-A788-492F-93C3-C992EB03ABC1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>VkmRietberg</RootNamespace>
+    <AssemblyName>3678599942_Reports</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Host\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Host\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Quittierungsbeleg.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Quittierungsbeleg.Designer.cs">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Quittierungsbeleg.resx">
+      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Report\Report.csproj">
+      <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
+      <Name>Report</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Service/Plugins/EmployeeService.cs b/Service/Plugins/EmployeeService.cs
index a4c14e0e3..b78664d54 100644
--- a/Service/Plugins/EmployeeService.cs
+++ b/Service/Plugins/EmployeeService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using BeWo.Data;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.Core;
@@ -13,7 +14,8 @@ using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
 using BS.Shared.Services;
-using Utils = BS.Shared.Core.Utils;
+using Utils = BeWo.Service.Core.Utils;
+
 
 namespace BeWo.Service.Plugins
 {
@@ -36,5 +38,21 @@ namespace BeWo.Service.Plugins
         {
             return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.GetAllActiveAndArchived<Employee>());
         }
+
+        public virtual List<CompactTeamDC> GetAllTeamsCompact()
+        {
+            if (Utils.UserHasRight(LoggedInUserOperationContextExt.Current.User, UserRightType.TeamView_ViewAll))
+            {
+                return MapperFactory.CompactTeamDC_Team.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Team>());
+            }
+
+            if (Utils.UserHasRight(LoggedInUserOperationContextExt.Current.User, UserRightType.TeamView_ViewMyTeams))
+            {
+                var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(LoggedInUserOperationContextExt.Current.User.Employee.Oid.Value);
+                return MapperFactory.CompactTeamDC_Team.MapToNewDCs(teams);
+            }
+
+            return new List<CompactTeamDC>();
+        }
     }
 }
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 0dab18100..cbbd9ff68 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -26,7 +26,7 @@ namespace BeWo.Service.Plugins
                 //t = "8562233401"; // Sozialwirkstatt Schmitz
                 //t = "1076891970"; // Assistenza
                 //t = "0216265667"; // LH Hannover
-                //t = "1774789565"; // LH Essen 
+                t = "1774789565"; // LH Essen 
                 //t = "9342168675"; // ABC Betreuungen
                 //t = "1193188501"; // Aids Hilfe Dortmund
                 //t = "7860351957"; // SKF Alsdorf
@@ -65,7 +65,7 @@ namespace BeWo.Service.Plugins
                 //t = "2028095630"; // Integra Heinsberg
                 //t = "5351926758"; // Viva a Vida
                 //t = "2215396183"; // Diakonie Remscheid Lennep
-                //t = "5157599087"; // SHG Schwerte
+                t = "5157599087"; // SHG Schwerte
                 //t = "4526293996"; // Fortis
                 //t = "3647969417"; // Caritas Bottrop
                 //t = "3963982016"; // Convoi
@@ -165,7 +165,7 @@ namespace BeWo.Service.Plugins
                 //t = "7803602698"; // Taubblindendienst
                 //t = "5518600303"; // Wetterleuchten e.V.
                 //t = "4096649015"; // AWO Dortmund
-                t = "3614251071"; // Pusteblume
+                //t = "3614251071"; // Pusteblume
                 //t = "7755740484"; // Sawo
                 //t = "8275654834"; // Twg Jonathan
                 //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
@@ -177,7 +177,7 @@ namespace BeWo.Service.Plugins
                 //t = "2331203795"; // BeWo für dich
                 //t = "5426234256"; // SKM Leverkusen
                 //t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe
-                //t = "5260936181"; // LORI
+                t = "5260936181"; // LORI
                 //t = "1931553444"; // HIBA
                 //t = "7185338722"; // BeWo Walz & Paiva
                 //t = "3196643272"; // Betreutes Wohnen Lisa Wöll
diff --git a/Service/Plugins/UserService.cs b/Service/Plugins/UserService.cs
new file mode 100644
index 000000000..8ec65dc87
--- /dev/null
+++ b/Service/Plugins/UserService.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using BeWo.Data;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Core;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.MessageContracts;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using Utils = BeWo.Service.Core.Utils;
+
+
+namespace BeWo.Service.Plugins
+{
+    public class UserService : AbstractIDSpecificDefaultClass<UserService>
+    {
+        public virtual UserDC LoadUserByLoginName(string pUserName)
+        {
+            UserDC userDC = null;
+
+            ApplicationUser user = DAOFactory.UserDAO.FindUserByLoginName(pUserName);
+            if (user != null)
+            {
+                userDC = MapperFactory.UserDC_User.MapToNewDC(user);
+
+                CompactEmployeeDC emp = userDC.Employee;
+                if (emp != null)
+                {
+                    //foreach (var item in user.Employee.Employee2CustomerList)
+                    //{
+                    //    if (emp.RelatedCustomerOIDList == null)
+                    //        emp.RelatedCustomerOIDList = new List<long>();
+                    //    emp.RelatedCustomerOIDList.Add(item.CustomerOid.Value);
+                    //}
+                    emp.AllTeamMemberOids = new List<long>();
+
+                    if (user.Employee.LeadingTeams.Count > 0)
+                    {
+                        emp.IsTeamLeader = true;
+
+                        List<long> oids = new List<long>();
+                        foreach (var item in user.Employee.LeadingTeams)
+                        {
+                            oids.Add(item.Oid.Value);
+
+                            foreach (var member in item.MemberList)
+                            {
+                                emp.AllTeamMemberOids.Add(member.Oid.Value);
+                            }
+                        }
+
+                        emp.LeadingTeamOids = oids;
+                    }
+
+                    var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(emp.EmployeeOid);
+                    emp.TeamOids = new List<long>();
+                    foreach (var t in teams)
+                    {
+                        emp.TeamOids.Add(t.Oid.Value);
+
+                        foreach (var member in t.MemberList)
+                        {
+                            emp.AllTeamMemberOids.Add(member.Oid.Value);
+                        }
+                    }
+                }
+            }
+
+            return userDC;
+        }
+    }
+}
diff --git a/Service/Service.csproj b/Service/Service.csproj
index e8fc4e73a..b542ab250 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -326,6 +326,7 @@
     <Compile Include="Multitenancy\MultitenancyEndpointBehavior.cs" />
     <Compile Include="Plugins\AccountingService.cs" />
     <Compile Include="Plugins\CustomerService.cs" />
+    <Compile Include="Plugins\UserService.cs" />
     <Compile Include="Plugins\FlexibleReportService.cs" />
     <Compile Include="Plugins\OperationService.cs" />
     <Compile Include="Plugins\QueryService.cs" />
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index 61eeedbdf..1e24c73fb 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -437,18 +437,10 @@ namespace BeWo.Service.ServiceImplementations
         {
             try
             {
-                if (Utils.UserHasRight(LoggedInUserOperationContextExt.Current.User, UserRightType.TeamView_ViewAll))
-                {
-                    return MapperFactory.CompactTeamDC_Team.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Team>());
-                }
+                var s = PluginLoader.FindClass<EmployeeService>();
 
-                if (Utils.UserHasRight(LoggedInUserOperationContextExt.Current.User, UserRightType.TeamView_ViewMyTeams))
-                {
-                    var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(LoggedInUserOperationContextExt.Current.User.Employee.Oid.Value);
-                    return MapperFactory.CompactTeamDC_Team.MapToNewDCs(teams);
-                }
+                return s.GetAllTeamsCompact();
 
-                return new List<CompactTeamDC>();
             }
             catch (Exception e)
             {
diff --git a/Service/ServiceImplementations/UserServiceImp.cs b/Service/ServiceImplementations/UserServiceImp.cs
index 331a46c49..ea8c15e58 100644
--- a/Service/ServiceImplementations/UserServiceImp.cs
+++ b/Service/ServiceImplementations/UserServiceImp.cs
@@ -23,6 +23,7 @@ using BS.Shared.Extensions;
 
 using MySql.Data.MySqlClient;
 using BeWo.Service.Configuration;
+using BeWo.Service.Plugins;
 
 namespace BeWo.Service.ServiceImplementations
 {
@@ -501,57 +502,10 @@ namespace BeWo.Service.ServiceImplementations
         {
             try
             {
-                UserDC userDC = null;
+                var s = PluginLoader.FindClass<UserService>();
 
-                ApplicationUser user = DAOFactory.UserDAO.FindUserByLoginName(pUserName);
-                if (user != null)
-                {
-                    userDC = MapperFactory.UserDC_User.MapToNewDC(user);
-
-                    CompactEmployeeDC emp = userDC.Employee;
-                    if (emp != null)
-                    {
-                        //foreach (var item in user.Employee.Employee2CustomerList)
-                        //{
-                        //    if (emp.RelatedCustomerOIDList == null)
-                        //        emp.RelatedCustomerOIDList = new List<long>();
-                        //    emp.RelatedCustomerOIDList.Add(item.CustomerOid.Value);
-                        //}
-                        emp.AllTeamMemberOids = new List<long>();
-
-                        if (user.Employee.LeadingTeams.Count > 0)
-                        {
-                            emp.IsTeamLeader = true;
-
-                            List<long> oids = new List<long>();
-                            foreach (var item in user.Employee.LeadingTeams)
-                            {
-                                oids.Add(item.Oid.Value);
-
-                                foreach (var member in item.MemberList)
-                                {
-                                    emp.AllTeamMemberOids.Add(member.Oid.Value);
-                                }
-                            }
-
-                            emp.LeadingTeamOids = oids;
-                        }
-
-                        var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(emp.EmployeeOid);
-                        emp.TeamOids = new List<long>();
-                        foreach (var t in teams)
-                        {
-                            emp.TeamOids.Add(t.Oid.Value);
-
-                            foreach (var member in t.MemberList)
-                            {
-                                emp.AllTeamMemberOids.Add(member.Oid.Value);
-                            }
-                        }	
-                    }
-                }
-
-                return userDC;
+                return s.LoadUserByLoginName(pUserName);
+                
             }
             catch (Exception e)
             {
diff --git a/Shared/DataContracts/MandatorDC.cs b/Shared/DataContracts/MandatorDC.cs
index 4442efec3..19a5821e5 100644
--- a/Shared/DataContracts/MandatorDC.cs
+++ b/Shared/DataContracts/MandatorDC.cs
@@ -41,7 +41,10 @@ namespace BS.Shared.DataContracts
 		[DataMember]
 		public string RssFeedUrl { get; set; }
 
-		[DataMember]
+        [DataMember]
+        public string SupportToolUrl { get; set; }
+
+        [DataMember]
 		public bool IsSchedulerAllowed { get; set; }
 
 		[DataMember]

From 1438fc73a921ebf8eab3c07b8ecf3f38c105df4d Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@beyondsoft.de>
Date: Tue, 6 Aug 2019 13:08:15 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Budget=20zum=20Hilfeplan=20hinzugef=C3=BCgt?=
 =?UTF-8?q?=20Pivot=20Grid=20Details=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/BeWo.csproj                              |   9 +
 BeWo/Converter/NullableBoolToBoolConverter.cs |  22 +
 .../View/Detail/DokumentationstypView.xaml.cs |   2 +-
 .../Report/FlexibleReportEntryDetail.xaml     |  59 ++
 .../Report/FlexibleReportEntryDetail.xaml.cs  |  50 ++
 .../Detail/Report/FlexibleReportView.xaml     | 322 +++++------
 .../Detail/Report/FlexibleReportView.xaml.cs  | 406 ++++++++------
 BeWo/View/Detail/SupportConceptView.xaml      | 158 ++++--
 BeWo/View/Detail/SupportConceptView.xaml.cs   | 520 +++++++++---------
 .../SupportConceptApprovalPeriodListVM.cs     |  16 +-
 .../SupportConceptCostBearerRelListVM.cs      |  16 +-
 .../SupportConceptApprovalPeriodVM.cs         | 252 +++++----
 .../SupportConceptCostBearerRelVM.cs          |  25 +-
 BeWo/ViewModel/SupportConceptVM.cs            |  16 +-
 BeWo/ViewModel/VMFactory.cs                   |  21 +-
 Data/Entities/SupportConceptApprovalPeriod.cs | 126 +++--
 .../SupportConceptApprovalPeriod.hbm.xml      |   5 +-
 ... beim Bewilligungszeitraum hinzugefügt.txt |  11 +
 ...alPeriodDC_SupportConceptApprovalPeriod.cs |  19 +-
 Service/Plugins/FlexibleReportService.cs      |  99 ++--
 Shared/BeWoEntityEnums.cs                     |  66 ++-
 Shared/Core/EnumTranslations.cs               |   4 +-
 Shared/DataContracts/BudgetDC.cs              |  22 +-
 Shared/DataContracts/FlexibleReportEntryDC.cs |  19 +-
 .../DataContracts/FlexibleReportFilterDC.cs   |  31 +-
 .../SupportConceptApprovalPeriodDC.cs         |   6 +
 26 files changed, 1396 insertions(+), 906 deletions(-)
 create mode 100644 BeWo/Converter/NullableBoolToBoolConverter.cs
 create mode 100644 BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml
 create mode 100644 BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml.cs
 create mode 100644 Model/Changes_2019_07_31 Bugdet beim Bewilligungszeitraum hinzugefügt.txt

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 5201a5c91..2ca56988c 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -102,6 +102,7 @@
     <Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Accordion.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Core.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Charts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Xpf.Docking.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -282,6 +283,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Detail\Report\FlexibleReportEntryDetail.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Detail\Report\FlexibleReportLayoutListControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -604,6 +609,7 @@
     <Compile Include="Converter\AssessmentSheetHeaderToForegroundConverter.cs" />
     <Compile Include="Converter\ClientType2VisibilityConverter.cs" />
     <Compile Include="Converter\BoolVisibilityMultiConverter.cs" />
+    <Compile Include="Converter\NullableBoolToBoolConverter.cs" />
     <Compile Include="Converter\ParticipationBrushConverter.cs" />
     <Compile Include="Converter\ReactivationRight2VisibilityConverter.cs" />
     <Compile Include="Converter\Rights2DefaultBooleanConverter.cs" />
@@ -820,6 +826,9 @@
     <Compile Include="View\Detail\BudgetView.xaml.cs">
       <DependentUpon>BudgetView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\Report\FlexibleReportEntryDetail.xaml.cs">
+      <DependentUpon>FlexibleReportEntryDetail.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\Report\PivotGridReport.cs">
       <SubType>Component</SubType>
     </Compile>
diff --git a/BeWo/Converter/NullableBoolToBoolConverter.cs b/BeWo/Converter/NullableBoolToBoolConverter.cs
new file mode 100644
index 000000000..41303415b
--- /dev/null
+++ b/BeWo/Converter/NullableBoolToBoolConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.Converter
+{
+    public class NullableBoolToBoolConverter : System.Windows.Data.IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return false;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/BeWo/View/Detail/DokumentationstypView.xaml.cs b/BeWo/View/Detail/DokumentationstypView.xaml.cs
index caf1a58ef..838a1f671 100644
--- a/BeWo/View/Detail/DokumentationstypView.xaml.cs
+++ b/BeWo/View/Detail/DokumentationstypView.xaml.cs
@@ -139,7 +139,7 @@ namespace BeWo.View.Detail
                 this.ViewModel.AddNewVMToList();
             }
             else {
-                MessageBox.Show("Es können maximal fünf Dokumentationstypen angelegt werden.", "Hinzufügen nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show("Es können maximal fünf Dokumentationsfelder angelegt werden.", "Hinzufügen nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
             }
 
             // grid.DataSource = null;
diff --git a/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml b/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml
new file mode 100644
index 000000000..5de402570
--- /dev/null
+++ b/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml
@@ -0,0 +1,59 @@
+<UserControl
+            xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+            xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+            Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch" Focusable="True"
+            xmlns:val="clr-namespace:BeWo.Validation"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+            x:Class="BeWo.View.Detail.Report.FlexibleReportEntryDetail"
+            d:DesignHeight="500" d:DesignWidth="1000"
+            mc:Ignorable="d">
+  <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <dxg:GridControl x:Name="DatagridRegions" Margin="10" Grid.Column="0" Grid.Row="0">
+      <dxg:GridControl.Columns>
+        <dxg:GridColumn FieldName="CustomerString" Header="Klient" Width="125" AllowEditing="False" />
+        <dxg:GridColumn FieldName="SupportConceptString" Header="Hilfeplan" Width="130" AllowEditing="False" />
+        <dxg:GridColumn FieldName="Organisation" Header="Kostenträger" Width="125" AllowEditing="False" />
+        <dxg:GridColumn x:Name="ColumnDauer" FieldName="IstStunden" Header="Dauer" Width="100" AllowEditing="False">
+            <dxg:GridColumn.EditSettings>
+                <dxe:DateEditSettings/>
+            </dxg:GridColumn.EditSettings>
+        </dxg:GridColumn>
+        <dxg:GridColumn FieldName="StartDatum" Header="Start" Width="125" AllowEditing="False">
+            <dxg:GridColumn.EditSettings>
+                <dxe:DateEditSettings DisplayFormat="dd.MM.yyyy HH:mm"/>
+            </dxg:GridColumn.EditSettings>
+        </dxg:GridColumn>
+        <dxg:GridColumn FieldName="EndDatum" Header="Ende" Width="125" AllowEditing="False" >
+            <dxg:GridColumn.EditSettings>
+                <dxe:DateEditSettings DisplayFormat="dd.MM.yyyy HH:mm"/>
+            </dxg:GridColumn.EditSettings>
+        </dxg:GridColumn>
+        <dxg:GridColumn FieldName="EmployeeString" Header="Mitarbeiter" Width="125" AllowEditing="False" />
+        <dxg:GridColumn FieldName="Team" Header="Team" Width="100" AllowEditing="False" />
+        <dxg:GridColumn x:Name="ColumnKilometer" FieldName="Kilometer" Header="Kilometer" Width="60" AllowEditing="False" >
+            <dxg:GridColumn.EditSettings>
+                <dxe:DateEditSettings/>
+            </dxg:GridColumn.EditSettings>
+        </dxg:GridColumn>
+        <dxg:GridColumn x:Name="ColumnNotice" FieldName="Notice" Visible="True" Header="Dokumentation" Width="200" AllowEditing="False" />
+        <dxg:GridColumn x:Name="ColumnNotice2" FieldName="Notice2" Visible="False" Width="75" AllowEditing="False" />
+        <dxg:GridColumn x:Name="ColumnNotice3" FieldName="Notice3" Visible="False" Width="75" AllowEditing="False" />
+        <dxg:GridColumn x:Name="ColumnNotice4" FieldName="Notice4" Visible="False" Width="50" AllowEditing="False" />
+        <dxg:GridColumn x:Name="ColumnNotice5" FieldName="Notice5" Visible="False" Width="50" AllowEditing="False" />
+      </dxg:GridControl.Columns>
+      <dxg:GridControl.View>
+        <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell"/>
+      </dxg:GridControl.View>
+    </dxg:GridControl>
+  </Grid>
+</UserControl>
diff --git a/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml.cs
new file mode 100644
index 000000000..caf0bd018
--- /dev/null
+++ b/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml.cs
@@ -0,0 +1,50 @@
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BS.Shared.Extensions;
+using DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using BS.Shared.DataContracts;
+using DevExpress.Data;
+using DevExpress.Xpf.Grid;
+using DevExpress.Xpf.Scheduler.UI;
+using static BeWo.View.Detail.Report.FlexibleReportView;
+
+namespace BeWo.View.Detail.Report
+{
+    public partial class FlexibleReportEntryDetail
+    {
+        #region Konstruktor
+
+        public FlexibleReportEntryDetail(List<FlexibleReportEntry> list, IReadOnlyList<ValueListEntryDC> docTypes)
+        {
+            InitializeComponent();
+            DatagridRegions.ItemsSource = list;
+
+            ColumnDauer.EditSettings.DisplayFormat = "{0:N2} Std.";
+            ColumnKilometer.EditSettings.DisplayFormat = "{0:N1} km";
+
+            var noticeColumns = new[] { ColumnNotice, ColumnNotice2, ColumnNotice3, ColumnNotice4, ColumnNotice5 };
+            
+            for (var i = 0; i < docTypes.Count && i < noticeColumns.Length; i++)
+            {
+                noticeColumns[i].Header = docTypes[i].TypeDescription;
+                noticeColumns[i].Visible = true;
+            }
+        }
+
+        #endregion
+
+        #region Propeties
+
+        public List<FlexibleReportEntry> Entries { get; set; }
+
+        #endregion
+    }
+}
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml b/BeWo/View/Detail/Report/FlexibleReportView.xaml
index 5ebdf2a00..d19724173 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml
@@ -13,164 +13,166 @@
                     x:Class="BeWo.View.Detail.Report.FlexibleReportView"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch" Focusable="True">
-  <Grid>
-    <GroupBox Header="Flexibler Bericht" Style="{StaticResource ObjectEditGroupBox}">
-      <Grid>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <!-- ############################################### Obere Zeile ###############################################-->
-        <Grid Grid.Row="0">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-          <Label Content="Startdatum:" Grid.Column="0" VerticalAlignment="Center" />
-          <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datePickerStartDate" Width="120" HorizontalAlignment="Left" Margin="3,0,0,0"/>
-          <Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" />
-          <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
-          <Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" />
-          <Button Content="Optionen anzeigen" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" />
-          <Button Content="Ansicht speichern" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
-          <Button Content="Ansicht bearbeiten" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
-          <Button Content="Ansicht laden" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
-          <Button Content="Ansicht drucken" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
-        </Grid>
-        <!-- ############################################### Mittlere Zeile ###############################################-->
-        <Grid Grid.Row="1">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-          <CheckBox Content="Reduzierte Ansicht" Margin="5,5,0,0" Grid.Column="4" x:Name="checkReduzierteAnsicht"/>
-          <CheckBox Content="Differenz Balken einblenden" Grid.Column="7" Margin="5,5,0,0" x:Name="checkBoxDataPer" Checked="CheckDataBarPerChanged" Unchecked="CheckDataBarPerChanged"/>
-          <CheckBox Content="Prozentuale Abweichung Balken einblenden" Grid.Column="8" Margin="5,5,0,0" x:Name="checkBoxData" Checked="CheckDataBarChanged" Unchecked="CheckDataBarChanged"/>
-          <CheckBox Content="Graph einblenden" Grid.Column="9" Margin="5,5,0,0" x:Name="checkBoxChart" Checked="CheckChartChanged" Unchecked="CheckChartChanged"/>
-        </Grid>
-        <!-- ############################################### Untere Zeile ###############################################-->
-        <Grid Grid.Row="2">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-          </Grid.ColumnDefinitions>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-          <CheckBox Content="Hilfepläne" Grid.Column="0" Margin="5,5,0,0" x:Name="checkHilepläne"/>
-          <CheckBox Content="Klienten" Grid.Column="1" Margin="5,5,0,0" x:Name="checkKlienten"/>
-          <CheckBox Content="Mitarbeiter" Grid.Column="2" Margin="5,5,0,0" x:Name="checkMitarbeiter"/>
-          <CheckBox Content="Records" Grid.Column="3" Margin="5,5,0,0" x:Name="checkRecords"/>
-          <CheckBox Content="Betrag" Grid.Column="4" Margin="5,5,0,0" x:Name="checkBetrag"/>
-          <CheckBox Content="Kilometer" Grid.Column="5" Margin="5,5,0,0" x:Name="checkKilometer"/>
-          <CheckBox Content="Ist" Grid.Column="6" Margin="5,5,0,0" x:Name="checkIst"/>
-          <CheckBox Content="Soll" Grid.Column="7" Margin="5,5,0,0" x:Name="checkSoll"/>
-        </Grid>
-        <!-- ############################################### PivotGridControl ###############################################-->
-        <Grid Grid.Row="3">
-          <Grid.Resources>
-          </Grid.Resources>
-          <dxlc:LayoutControl x:Name="mainLayout" AllowItemSizing="True" Padding="12" Orientation="Vertical">
-            <dxlc:LayoutGroup dxlc:LayoutControl.AllowVerticalSizing="True" Margin="0,0,0,4">
-              <dxpg:PivotGridControl  x:Name="myPivotGridControl" RowTreeWidth="225" Visibility="Visible" DataProcessingEngine="LegacyOptimized" Margin="0,10,0,0"  dx:ThemeManager.ThemeName="Office2010Black" CustomCellDisplayText="GridControl_CustomCellDisplayText" CustomFieldValueCells="GridControl_CustomFieldValueCells"
-      ChartProvideDataByColumns="False" ChartSelectionOnly="True" ChartProvideColumnGrandTotals="False" ChartProvideRowGrandTotals="True" ChartDataProvideMode="UseCustomSettings" CustomValueAppearance="MyPivotGridControl_CustomValueAppearance" CustomCellAppearance="MyPivotGridControl_CustomCellAppearance" CustomGroupInterval="MyPivotGridControl_CustomGroupInterval" CustomFieldSort="MyPivotGridControl_CustomFieldSort">
-                <dxpg:PivotGridControl.ExcelFieldListState>
-                  <dx:DefaultColumnChooserState Size="400,550" />
-                </dxpg:PivotGridControl.ExcelFieldListState>
-                <dxpg:PivotGridControl.Fields>
-                  <dxpg:PivotGridField x:Name="FlexibleJahr"                      FieldName="Datum"                       Area="ColumnArea"       Width="100"     Caption="Jahr"                  AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateYear"                                    />
-                  <dxpg:PivotGridField x:Name="FlexibleMonat"                     FieldName="Datum"                       Area="ColumnArea"       Width="80"      Caption="Monat"                 AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"                       GroupInterval="DateMonth"                                   />
-                  <dxpg:PivotGridField x:Name="FlexibleWeek"                      FieldName="Datum"                       Area="ColumnArea"       Width="80"      Caption="Woche"                 AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"                       GroupInterval="DateWeekOfYear" ValueFormat="KW {0}"         />
-                  <dxpg:PivotGridField x:Name="FlexibleDatum"                     FieldName="Datum"                       Area="FilterArea"       Width="100"     Caption="Datum"                 AllowedAreas="ColumnArea,FilterArea"   DisplayFolder="Spalten"    Visible="False"    GroupInterval="Custom"                                     />
-                  <dxpg:PivotGridField x:Name="FlexibleQuarter"                   FieldName="Datum"                       Area="FilterArea"       Width="100"     Caption="Quartal"               AllowedAreas="ColumnArea,FilterArea"   DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateQuarter"                                     />
-                  <dxpg:PivotGridField x:Name="FlexibleTag"                       FieldName="Datum"                       Area="FilterArea"       Width="40"      Caption="Tag"                   AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateDay"                                     />
-                  <dxpg:PivotGridField x:Name="FlexibleTagYear"                   FieldName="Datum"                       Area="FilterArea"       Width="40"      Caption="Tag Jahr"              AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateDayOfYear"                                     />
-                  <dxpg:PivotGridField x:Name="FlexibleKlient"                    FieldName="CustomerString"              Area="RowArea"          Width="200"     Caption="Klient"                AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"                        AreaIndex="2" Height="21" SortOrder="Ascending"             />
-                  <dxpg:PivotGridField x:Name="FlexibleSupportConcept"            FieldName="SupportConceptString"        Area="FilterArea"       Width="200"     Caption="Hilfeplan"             AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
-                  <dxpg:PivotGridField x:Name="FlexibleMitarbeiter"               FieldName="EmployeeString"              Area="RowArea"          Width="200"     Caption="Mitarbeiter"           AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"    AreaIndex="1"                                               />
-                  <dxpg:PivotGridField x:Name="FlexibleTeam"                      FieldName="Team"                        Area="FilterArea"       Width="200"     Caption="Team"                  AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
-                  <dxpg:PivotGridField x:Name="FlexibleLeistungskategorie"        FieldName="Leistungskategorie"          Area="FilterArea"       Width="200"     Caption="Leistungskategorie"    AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                       />
-                  <dxpg:PivotGridField x:Name="FlexibleLeistung"                  FieldName="Leistung"                    Area="FilterArea"       Width="200"     Caption="Leistung"              AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
-                  <dxpg:PivotGridField x:Name="FlexibleOrganisation"              FieldName="Organisation"                Area="FilterArea"       Width="200"     Caption="Kostenträger"          AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlMinIst"              FieldName="IstMinuten"                  Area="FilterArea"       Width="60"      Caption="Ist Min."              AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlStdIst"              FieldName="IstStunden"                  Area="DataArea"         Width="80"      Caption="Ist Std."              AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"                                                            />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlMinSoll"             FieldName="SollMinuten"                 Area="FilterArea"       Width="60"      Caption="Soll Min."             AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
-                  <dxpg:PivotGridField x:Name="FlexibleAnzahlStdSoll"             FieldName="SollStunden"                 Area="DataArea"         Width="80"      Caption="Soll Std."             AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"                                                             />
-                  <dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer"        FieldName="Kilometer"                   Area="FilterArea"       Width="200"     Caption="Gefahrene Kilometer"   AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
-                  <dxpg:PivotGridField x:Name="FlexibleBetrag"                    FieldName="Betrag"                      Area="FilterArea"       Width="80"      Caption="Betrag"                AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
-                  <dxpg:PivotGridField x:Name="FlexibleStundensatz"               FieldName="Stundensatz"                 Area="FilterArea"       Width="80"      Caption="Stundensatz"           AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
-                  <dxpg:PivotGridField x:Name="FlexibleRundungspotenzial"         FieldName="Rundungspotenzial"           Area="FilterArea"       Width="80"      Caption="Rundungspotenzial"     AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
-                  <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollMin"       FieldName="DifferenzIstSollMinuten"     Area="FilterArea"       Width="80"      Caption="Differenz Min."        AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"  HideEmptyVariationItems="True"                              />
-                  <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollStd"       FieldName="DifferenzIstSollStunden"     Area="DataArea"         Width="80"      Caption="Differenz Std."        AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"  HideEmptyVariationItems="True"                              />
-                  <dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichung"    UnboundFieldName="ProzAbweichung"       Area="DataArea"         Width="80"      Caption="Prozentual Abweichung" AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"/>
-                </dxpg:PivotGridControl.Fields>
-              </dxpg:PivotGridControl>
-            </dxlc:LayoutGroup>
-            <dxlc:LayoutGroup>
-              <dxc:ChartControl Name="ChartControl" DataSource="{Binding ElementName=myPivotGridControl, Path=ChartDataSource}" Visibility="Collapsed" dx:ThemeManager.ThemeName="Office2010Black" >
-                <dxc:ChartControl.CrosshairOptions>
-                  <dxc:CrosshairOptions ShowArgumentLine="False"/>
-                </dxc:ChartControl.CrosshairOptions>
-                <dxc:ChartControl.Legend>
-                  <dxc:Legend ReverseItems="True"/>
-                </dxc:ChartControl.Legend>
-                <dxc:XYDiagram2D>
-                  <dxc:XYDiagram2D.AxisY>
-                    <dxc:AxisY2D Visible="True"/>
-                  </dxc:XYDiagram2D.AxisY>
-                  <dxc:XYDiagram2D.AxisX>
-                    <dxc:AxisX2D Visible="True"/>
-                  </dxc:XYDiagram2D.AxisX>
-                </dxc:XYDiagram2D>
-              </dxc:ChartControl>
-            </dxlc:LayoutGroup>
-          </dxlc:LayoutControl>
-        </Grid>
-      </Grid>
-    </GroupBox>
-  </Grid>
+    <Grid>
+        <GroupBox Header="Flexibler Bericht" Style="{StaticResource ObjectEditGroupBox}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <!-- ############################################### Obere Zeile ###############################################-->
+                <Grid Grid.Row="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Label Content="Startdatum:" Grid.Column="0" VerticalAlignment="Center" />
+                    <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datePickerStartDate" Width="120" HorizontalAlignment="Left" Margin="3,0,0,0"/>
+                    <Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" />
+                    <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
+                    <Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" />
+                    <Button Content="Optionen anzeigen" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" />
+                    <Button Content="Ansicht speichern" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
+                    <Button Content="Ansicht bearbeiten" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
+                    <Button Content="Ansicht laden" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
+                    <Button Content="Ansicht drucken" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
+                </Grid>
+                <!-- ############################################### Mittlere Zeile ###############################################-->
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <CheckBox Content="Reduzierte Ansicht" Margin="5,5,0,0" Grid.Column="4" x:Name="checkReduzierteAnsicht"/>
+                    <CheckBox Content="Differenz Balken einblenden" Grid.Column="7" Margin="5,5,0,0" x:Name="checkBoxDataPer" Checked="CheckDataBarPerChanged" Unchecked="CheckDataBarPerChanged"/>
+                    <CheckBox Content="Prozentuale Abweichung Balken einblenden" Grid.Column="8" Margin="5,5,0,0" x:Name="checkBoxData" Checked="CheckDataBarChanged" Unchecked="CheckDataBarChanged"/>
+                    <CheckBox Content="Graph einblenden" Grid.Column="9" Margin="5,5,0,0" x:Name="checkBoxChart" Checked="CheckChartChanged" Unchecked="CheckChartChanged"/>
+                </Grid>
+                <!-- ############################################### Untere Zeile ###############################################-->
+                <Grid Grid.Row="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <CheckBox Content="Hilfepläne" Grid.Column="0" Margin="5,5,0,0" x:Name="checkHilepläne"/>
+                    <CheckBox Content="Klienten" Grid.Column="1" Margin="5,5,0,0" x:Name="checkKlienten"/>
+                    <CheckBox Content="Mitarbeiter" Grid.Column="2" Margin="5,5,0,0" x:Name="checkMitarbeiter"/>
+                    <CheckBox Content="Records" Grid.Column="3" Margin="5,5,0,0" x:Name="checkRecords"/>
+                    <CheckBox Content="Betrag" Grid.Column="4" Margin="5,5,0,0" x:Name="checkBetrag"/>
+                    <CheckBox Content="Kilometer" Grid.Column="5" Margin="5,5,0,0" x:Name="checkKilometer"/>
+                    <CheckBox Content="Ist" Grid.Column="6" Margin="5,5,0,0" x:Name="checkIst"/>
+                    <CheckBox Content="Soll" Grid.Column="7" Margin="5,5,0,0" x:Name="checkSoll"/>
+                </Grid>
+                <!-- ############################################### PivotGridControl ###############################################-->
+                <Grid Grid.Row="3">
+                    <Grid.Resources>
+                    </Grid.Resources>
+                    <dxlc:LayoutControl x:Name="mainLayout" AllowItemSizing="True" Padding="12" Orientation="Vertical">
+                        <dxlc:LayoutGroup x:Name="LayoutGroupPivotGrid"  dxlc:LayoutControl.AllowVerticalSizing="True" Margin="0,0,0,4">
+                            <dxpg:PivotGridControl  x:Name="myPivotGridControl" RowTreeWidth="225" Visibility="Visible" DataProcessingEngine="LegacyOptimized" Margin="0,10,0,0"  dx:ThemeManager.ThemeName="Office2010Black" CustomCellDisplayText="GridControl_CustomCellDisplayText" CustomFieldValueCells="GridControl_CustomFieldValueCells"
+                                                    ChartProvideDataByColumns="False" ChartSelectionOnly="True" ChartProvideColumnGrandTotals="False" ChartProvideRowGrandTotals="True" ChartDataProvideMode="UseCustomSettings" CustomValueAppearance="MyPivotGridControl_CustomValueAppearance" CustomCellAppearance="MyPivotGridControl_CustomCellAppearance" 
+                                                    CustomGroupInterval="MyPivotGridControl_CustomGroupInterval" CustomFieldSort="MyPivotGridControl_CustomFieldSort" CellDoubleClick="MyPivotGridControl_CellDoubleClick">
+                                <dxpg:PivotGridControl.ExcelFieldListState>
+                                    <dx:DefaultColumnChooserState Size="400,550" />
+                                </dxpg:PivotGridControl.ExcelFieldListState>
+                                <dxpg:PivotGridControl.Fields>
+                                    <dxpg:PivotGridField x:Name="FlexibleJahr"                      FieldName="StartDatum"                  Area="ColumnArea"       Width="100"     Caption="Jahr"                  AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateYear"                                    />
+                                    <dxpg:PivotGridField x:Name="FlexibleMonat"                     FieldName="StartDatum"                  Area="ColumnArea"       Width="80"      Caption="Monat"                 AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"                       GroupInterval="DateMonth"                                   />
+                                    <dxpg:PivotGridField x:Name="FlexibleWeek"                      FieldName="StartDatum"                  Area="ColumnArea"       Width="80"      Caption="Woche"                 AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"                       GroupInterval="DateWeekOfYear" ValueFormat="KW {0}"         />
+                                    <dxpg:PivotGridField x:Name="FlexibleDatum"                     FieldName="StartDatum"                  Area="FilterArea"       Width="100"     Caption="Datum"                 AllowedAreas="ColumnArea,FilterArea"   DisplayFolder="Spalten"    Visible="False"    GroupInterval="Custom"                                     />
+                                    <dxpg:PivotGridField x:Name="FlexibleQuarter"                   FieldName="StartDatum"                  Area="FilterArea"       Width="100"     Caption="Quartal"               AllowedAreas="ColumnArea,FilterArea"   DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateQuarter"                                     />
+                                    <dxpg:PivotGridField x:Name="FlexibleTag"                       FieldName="StartDatum"                  Area="FilterArea"       Width="40"      Caption="Tag"                   AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateDay"                                     />
+                                    <dxpg:PivotGridField x:Name="FlexibleTagYear"                   FieldName="StartDatum"                  Area="FilterArea"       Width="40"      Caption="Tag Jahr"              AllowedAreas="ColumnArea,FilterArea"    DisplayFolder="Spalten"    Visible="False"    GroupInterval="DateDayOfYear"                                     />
+                                    <dxpg:PivotGridField x:Name="FlexibleKlient"                    FieldName="CustomerString"              Area="RowArea"          Width="200"     Caption="Klient"                AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"                        AreaIndex="2" Height="21" SortOrder="Ascending"             />
+                                    <dxpg:PivotGridField x:Name="FlexibleSupportConcept"            FieldName="SupportConceptString"        Area="FilterArea"       Width="200"     Caption="Hilfeplan"             AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                                    <dxpg:PivotGridField x:Name="FlexibleMitarbeiter"               FieldName="EmployeeString"              Area="RowArea"          Width="200"     Caption="Mitarbeiter"           AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"    AreaIndex="1"                                               />
+                                    <dxpg:PivotGridField x:Name="FlexibleTeam"                      FieldName="Team"                        Area="FilterArea"       Width="200"     Caption="Team"                  AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                                    <dxpg:PivotGridField x:Name="FlexibleLeistungskategorie"        FieldName="Leistungskategorie"          Area="FilterArea"       Width="200"     Caption="Leistungskategorie"    AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                       />
+                                    <dxpg:PivotGridField x:Name="FlexibleLeistung"                  FieldName="Leistung"                    Area="FilterArea"       Width="200"     Caption="Leistung"              AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                                    <dxpg:PivotGridField x:Name="FlexibleOrganisation"              FieldName="Organisation"                Area="FilterArea"       Width="200"     Caption="Kostenträger"          AllowedAreas="RowArea,FilterArea"       DisplayFolder="Zeilen"     Visible="False"                                                        />
+                                    <dxpg:PivotGridField x:Name="FlexibleAnzahlMinIst"              FieldName="IstMinuten"                  Area="FilterArea"       Width="60"      Caption="Ist Min."              AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                                    <dxpg:PivotGridField x:Name="FlexibleAnzahlStdIst"              FieldName="IstStunden"                  Area="DataArea"         Width="80"      Caption="Ist Std."              AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"                                                            />
+                                    <dxpg:PivotGridField x:Name="FlexibleAnzahlMinSoll"             FieldName="SollMinuten"                 Area="FilterArea"       Width="60"      Caption="Soll Min."             AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                                    <dxpg:PivotGridField x:Name="FlexibleAnzahlStdSoll"             FieldName="SollStunden"                 Area="DataArea"         Width="80"      Caption="Soll Std."             AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"                                                             />
+                                    <dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer"        FieldName="Kilometer"                   Area="FilterArea"       Width="200"     Caption="Gefahrene Kilometer"   AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                                    <dxpg:PivotGridField x:Name="FlexibleBetrag"                    FieldName="Betrag"                      Area="FilterArea"       Width="80"      Caption="Betrag"                AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                                    <dxpg:PivotGridField x:Name="FlexibleStundensatz"               FieldName="Stundensatz"                 Area="FilterArea"       Width="80"      Caption="Stundensatz"           AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                                    <dxpg:PivotGridField x:Name="FlexibleRundungspotenzial"         FieldName="Rundungspotenzial"           Area="FilterArea"       Width="80"      Caption="Rundungspotenzial"     AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"                                                      />
+                                    <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollMin"       FieldName="DifferenzIstSollMinuten"     Area="FilterArea"       Width="80"      Caption="Differenz Min."        AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"  HideEmptyVariationItems="True"                              />
+                                    <dxpg:PivotGridField x:Name="FlexibleDifferenzIstSollStd"       FieldName="DifferenzIstSollStunden"     Area="DataArea"         Width="80"      Caption="Differenz Std."        AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"       Visible="False"  HideEmptyVariationItems="True"                              />
+                                    <dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichung"    UnboundFieldName="ProzAbweichung"       Area="DataArea"         Width="80"      Caption="Prozentual Abweichung" AllowedAreas="DataArea,FilterArea"      DisplayFolder="Data"/>
+                                </dxpg:PivotGridControl.Fields>
+                            </dxpg:PivotGridControl>
+                        </dxlc:LayoutGroup>
+                        <!-- ############################################### ChartControl ###############################################-->
+                        <dxlc:LayoutGroup x:Name="LayoutGroupPivotChart">
+                            <dxc:ChartControl Name="ChartControl" DataSource="{Binding ElementName=myPivotGridControl, Path=ChartDataSource}" Visibility="Collapsed" dx:ThemeManager.ThemeName="Office2010Black" >
+                                <dxc:ChartControl.CrosshairOptions>
+                                    <dxc:CrosshairOptions ShowArgumentLine="False"/>
+                                </dxc:ChartControl.CrosshairOptions>
+                                <dxc:ChartControl.Legend>
+                                    <dxc:Legend ReverseItems="True"/>
+                                </dxc:ChartControl.Legend>
+                                <dxc:XYDiagram2D>
+                                    <dxc:XYDiagram2D.AxisY>
+                                        <dxc:AxisY2D Visible="True"/>
+                                    </dxc:XYDiagram2D.AxisY>
+                                    <dxc:XYDiagram2D.AxisX>
+                                        <dxc:AxisX2D Visible="True"/>
+                                    </dxc:XYDiagram2D.AxisX>
+                                </dxc:XYDiagram2D>
+                            </dxc:ChartControl>
+                        </dxlc:LayoutGroup>
+                    </dxlc:LayoutControl>
+                </Grid>
+            </Grid>
+        </GroupBox>
+    </Grid>
 </localView:BeWoView>
\ No newline at end of file
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
index 65b177181..6e4d18ced 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
@@ -29,7 +29,9 @@ using BeWo.Data.Access;
 using DevExpress.XtraReports.UI;
 using DevExpress.Data.PivotGrid;
 using System.Windows.Media;
+using BeWo.Core.Service;
 using DevExpress.Utils.Gesture;
+using DevExpress.Xpf.Core.Native;
 
 namespace BeWo.View.Detail.Report
 {
@@ -72,7 +74,7 @@ namespace BeWo.View.Detail.Report
             UFlexibleProzentualeAbweichung.UnboundExpressionMode = FieldUnboundExpressionMode.UseAggregateFunctions;
             UFlexibleProzentualeAbweichung.UnboundType = FieldUnboundColumnType.Decimal;
             UFlexibleProzentualeAbweichung.CellFormat = "{0:P2}";
-            UFlexibleProzentualeAbweichung.UnboundExpression = string.Format("SUM([{0}]) / SUM([{1}])", FlexibleAnzahlStdIst.ExpressionFieldName, FlexibleAnzahlStdSoll.ExpressionFieldName);
+            UFlexibleProzentualeAbweichung.UnboundExpression = $"SUM([{FlexibleAnzahlStdIst.ExpressionFieldName}]) / SUM([{FlexibleAnzahlStdSoll.ExpressionFieldName}])";
             UFlexibleProzentualeAbweichung.SummaryType = FieldSummaryType.Average;
 
             FlexibleStundensatz.SummaryType = FieldSummaryType.Average;
@@ -84,7 +86,10 @@ namespace BeWo.View.Detail.Report
 
             var i = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
             datePickerStartDate.DateTime = i;
-            datePickerEndDate.DateTime =  i.AddMonths(1).AddDays(-1);
+            datePickerEndDate.DateTime = i.AddMonths(1).AddDays(-1);
+
+            datePickerStartDate.DateTime = new DateTime(2019, 7, 1);
+            datePickerEndDate.DateTime = new DateTime(2019, 8, 1).AddDays(-1);
 
             myPivotGridControl.PrintColumnHeaders = false;
             myPivotGridControl.PrintRowHeaders = false;
@@ -105,6 +110,13 @@ namespace BeWo.View.Detail.Report
             checkMitarbeiter.IsChecked = true;
             checkRecords.IsChecked = true;
             checkSoll.IsChecked = true;
+
+            LayoutGroupPivotChart.IsCollapsible = true;
+
+            LayoutGroupPivotChart.Visibility = Visibility.Collapsed;
+
+            DocTypes = Cache.GetInstance().GetAllValueListEntrysByTypeSync(ValueListEntryType.DocumentType);
+            DocTypes.Sort((a, b) => a.ValueListEntryOid.Value.CompareTo(b.ValueListEntryOid.Value));
         }
         #endregion
 
@@ -115,46 +127,39 @@ namespace BeWo.View.Detail.Report
             {
                 StartDatum = datePickerStartDate.DateTime,
                 EndDatum = datePickerEndDate.DateTime,
-                ReduzierteAnsicht = checkReduzierteAnsicht.IsChecked.Value,
-                AlleHilfeplaneAnzeigen = checkHilepläne.IsChecked.Value,
-                AlleKlientenAnzeigen = checkKlienten.IsChecked.Value,
-                AlleMitarbeiterAnzeigen = checkMitarbeiter.IsChecked.Value,
-                AlleServiceBerichteAnzeigen = checkRecords.IsChecked.Value,
-                BetragAnzeigen = checkBetrag.IsChecked.Value,
-                GefahreneKilometerAnzeigen = checkKilometer.IsChecked.Value,
-                IstAnzeigen = checkIst.IsChecked.Value,
-                SollAnzeigen = checkSoll.IsChecked.Value
+                ReduzierteAnsicht = checkReduzierteAnsicht.IsChecked,
+                AlleHilfeplaneAnzeigen = checkHilepläne.IsChecked,
+                AlleKlientenAnzeigen = checkKlienten.IsChecked,
+                AlleMitarbeiterAnzeigen = checkMitarbeiter.IsChecked,
+                AlleServiceBerichteAnzeigen = checkRecords.IsChecked,
+                BetragAnzeigen = checkBetrag.IsChecked,
+                GefahreneKilometerAnzeigen = checkKilometer.IsChecked,
+                IstAnzeigen = checkIst.IsChecked,
+                SollAnzeigen = checkSoll.IsChecked
             };
 
             ServiceFacade.DoOperationsServiceAsync(
                 s => s.GetFlexibleReportResult(filter),
-                r =>
+                r => this.Dispatch(delegate
                 {
-                    this.Dispatch(delegate
-                    {
-                        var liste = new List<FlexibleReportEntry>();
+                    var liste = new List<FlexibleReportEntry>();
 
-                        if (r.Entries != null)
-                            foreach (var item in r.Entries)
-                                liste.Add(FlexibleReportEntry.InitByFlexibleReportEntryDC(item));
+                    if (r.Entries != null) liste.AddRange(r.Entries.Select(FlexibleReportEntry.InitByFlexibleReportEntryDC));
 
-                        if (r.Dummies != null)
-                            foreach (var item in r.Dummies)
-                                liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDummyDC(item));
+                    if (r.Dummies != null)
+                        foreach (var item in r.Dummies)
+                            liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDummyDC(item));
 
-                        if (r.Employees != null)
-                            liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDictornary(r.Employees, filter.StartDatum, filter.EndDatum, filter.ReduzierteAnsicht, true));
+                    if (r.Employees != null)
+                        liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDictornary(r.Employees, filter.StartDatum, filter.EndDatum, filter.ReduzierteAnsicht.HasValue && filter.ReduzierteAnsicht.Value, true));
 
-                        if (r.Customers != null)
-                            liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDictornary(r.Customers, filter.StartDatum, filter.EndDatum, filter.ReduzierteAnsicht, false));
+                    if (r.Customers != null)
+                        liste.AddRange(FlexibleReportEntry.InitByFlexibleReportDictornary(r.Customers, filter.StartDatum, filter.EndDatum, filter.ReduzierteAnsicht.HasValue && filter.ReduzierteAnsicht.Value, false));
 
-                        myPivotGridControl.DataSource = liste;
+                    myPivotGridControl.DataSource = liste;
 
-                        var i = liste.Where(x => x.Datum.Year == 1);
-
-                        checkBoxChart.IsEnabled = true;
-                    });
-                });
+                    checkBoxChart.IsEnabled = true;
+                }));
         }
 
         private void GridControl_CustomCellDisplayText(object sender, PivotCellDisplayTextEventArgs e)
@@ -167,7 +172,7 @@ namespace BeWo.View.Detail.Report
                 }
             }
 
-            if (e.Value !=  null && decimal.TryParse(e.Value.ToString(), out decimal d) && d == 0)
+            if (e.Value != null && decimal.TryParse(e.Value.ToString(), out decimal d) && d == 0)
                 e.DisplayText = "";
             if (e.DisplayText == "Fehler")
                 e.DisplayText = "";
@@ -175,7 +180,7 @@ namespace BeWo.View.Detail.Report
 
         private void GridControl_CustomFieldValueCells(object sender, PivotCustomFieldValueCellsEventArgs e)
         {
-            PivotGridControl pivot = (PivotGridControl)sender;
+            var pivot = (PivotGridControl)sender;
 
             if (pivot.DataSource == null)
                 return;
@@ -204,30 +209,35 @@ namespace BeWo.View.Detail.Report
 
         private void CheckChartChanged(object sender, RoutedEventArgs e)
         {
-            if (myPivotGridControl.DataSource != null)
+            if (myPivotGridControl.DataSource == null) return;
+            if (!checkBoxChart.IsChecked.HasValue) return;
+
+            ChartControl.Visibility = checkBoxChart.IsChecked.Value ? Visibility.Visible : Visibility.Collapsed;
+            LayoutGroupPivotChart.Visibility = checkBoxChart.IsChecked.Value ? Visibility.Visible : Visibility.Collapsed;
+            if (ChartControl.Visibility == Visibility.Visible)
             {
-                ChartControl.Visibility = checkBoxChart.IsChecked.Value ? Visibility.Visible : Visibility.Collapsed;
-                if (ChartControl.Visibility == Visibility.Visible)
-                {
-                    InitChart();
-                }
+                InitChart();
+            }
+            else
+            {
+                LayoutGroupPivotGrid.Height = double.NaN;
             }
         }
 
         private void CheckDataBarChanged(object sender, RoutedEventArgs e)
         {
-            if (myPivotGridControl.DataSource != null)
-            {
-                var conditions = CreateDataBarConditions(_Columns, _Rows, _DataDiff, "GreenSolidDataBar");
+            if (!checkBoxData.IsChecked.HasValue) return;
+            if (myPivotGridControl.DataSource == null) return;
 
-                if (checkBoxData.IsChecked.Value)
-                {
-                    myPivotGridControl.FormatConditions.AddRange(conditions);
-                }
-                else
-                {
-                    myPivotGridControl.FormatConditions.RemoveRange(conditions);
-                }
+            var conditions = CreateDataBarConditions(_Columns, _Rows, _DataDiff, "GreenSolidDataBar");
+
+            if (checkBoxData.IsChecked.Value)
+            {
+                myPivotGridControl.FormatConditions.AddRange(conditions);
+            }
+            else
+            {
+                myPivotGridControl.FormatConditions.RemoveRange(conditions);
             }
         }
 
@@ -236,25 +246,20 @@ namespace BeWo.View.Detail.Report
             var control = new FlexibleReportLayoutSaveControl();
             var beWoWindow = new BeWoWindow();
 
-            control.CancelButtonClicked += delegate
-            {
-                beWoWindow.Close();
-            };
+            control.CancelButtonClicked += () => beWoWindow.Close();
+
             control.SaveButtonClicked += delegate
             {
                 var liste = new List<FlexibleReportLayout>();
                 ServiceFacade.DoOperationsServiceAsync(
                     s => s.GetFlexibleReportLayouts(),
-                    r =>
+                    r => this.Dispatch(delegate
                     {
-                        this.Dispatch(delegate
+                        foreach (var item in r)
                         {
-                            foreach (var item in r)
-                            {
-                                liste.Add(FlexibleReportLayout.InitByFlexibleReportLayoutDC(item));
-                            }
-                        });
-                    });
+                            liste.Add(FlexibleReportLayout.InitByFlexibleReportLayoutDC(item));
+                        }
+                    }));
 
                 if (string.IsNullOrWhiteSpace(control.LayoutName))
                 {
@@ -291,9 +296,17 @@ namespace BeWo.View.Detail.Report
         private void ButtonLayoutLoad_Click(object sender, RoutedEventArgs e)
         {
             var control = new FlexibleReportLayoutListControl();
-            var beWoWindow = new BeWoWindow();
+            var beWoWindow = new BeWoWindow
+            {
+                rootGroupBox = {Header = "Layout Laden"},
+                Height = 500,
+                Width = 500,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                GroupBoxContent = control,
+                Owner = BeWoApp.CurrentBeWo.MainWindow
+            };
+
 
-            beWoWindow.rootGroupBox.Header = "Layout Laden";
             control.DatagridRegions.Columns.Remove(control.LayoutDeleteColumn);
             control.LayoutNameColumn.ReadOnly = true;
             control.ActionButton.Content = "Laden";
@@ -309,10 +322,7 @@ namespace BeWo.View.Detail.Report
                 beWoWindow.Close();
             };
 
-            control.CancelButtonClicked += delegate
-            {
-                beWoWindow.Close();
-            };
+            control.CancelButtonClicked += () => beWoWindow.Close();
 
             control.MouseDoubleClick += delegate
             {
@@ -324,22 +334,24 @@ namespace BeWo.View.Detail.Report
                 LayoutString = control.SelectedLayout.LayoutString;
                 beWoWindow.Close();
             };
-
-            beWoWindow.Height = 500;
-            beWoWindow.Width = 500;
-            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-            beWoWindow.GroupBoxContent = control;
-            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
-
+            
             beWoWindow.ShowDialog();
         }
 
         private void ButtonLayoutEdit_Click(object sender, RoutedEventArgs e)
         {
             var control = new FlexibleReportLayoutListControl();
-            var beWoWindow = new BeWoWindow();
+            var beWoWindow = new BeWoWindow
+            {
+                rootGroupBox = {Header = "Layout(s) bearbeiten"},
+                Height = 500,
+                Width = 500,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                GroupBoxContent = control,
+                Owner = BeWoApp.CurrentBeWo.MainWindow
+            };
+
 
-            beWoWindow.rootGroupBox.Header = "Layout(s) bearbeiten";
             control.ActionButton.Content = "Speichern";
             control.ActionButtonClicked += delegate
             {
@@ -353,67 +365,59 @@ namespace BeWo.View.Detail.Report
 
             control.CancelButtonClicked += delegate
             {
-                if (control.IsDirty)
+                if (!control.IsDirty) return;
+
+                var result = MessageBox.Show("Möchten Sie die Änderung(en) verwerfen?", "BeWoPlaner", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
+                switch (result)
                 {
-                    var result = MessageBox.Show("Möchten Sie die Änderung(en) verwerfen?", "BeWoPlaner", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
-                    switch (result)
-                    {
-                        case MessageBoxResult.None:
-                            return;
-                        case MessageBoxResult.Cancel:
-                            return;
-                        case MessageBoxResult.Yes:
-                            control.Save();
-                            beWoWindow.Close();
-                            break;
-                        case MessageBoxResult.No:
-                            beWoWindow.Close();
-                            break;
-                        default:
-                            return;
-                    }
-                    return;
+                    case MessageBoxResult.None:
+                        return;
+                    case MessageBoxResult.Cancel:
+                        return;
+                    case MessageBoxResult.Yes:
+                        control.Save();
+                        beWoWindow.Close();
+                        break;
+                    case MessageBoxResult.No:
+                        beWoWindow.Close();
+                        break;
+                    case MessageBoxResult.OK:
+                        return;
+                    default:
+                        return;
                 }
             };
 
-            beWoWindow.Height = 500;
-            beWoWindow.Width = 500;
-            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-            beWoWindow.GroupBoxContent = control;
-            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
-
             beWoWindow.ShowDialog();
         }
 
         private void MyPivotGridControl_CustomCellAppearance(object sender, PivotCustomCellAppearanceEventArgs e)
         {
             if (e.ColumnValueType == FieldValueType.Total || e.RowValueType == FieldValueType.Total)
-                if (e.Selected)
-                    e.Background = new SolidColorBrush(Color.FromArgb(180, 193, 180, 120));
-                else
-                    e.Background = new SolidColorBrush(Color.FromArgb(60, 150, 150, 150));
+                e.Background = e.Selected
+                    ? new SolidColorBrush(Color.FromArgb(180, 193, 180, 120))
+                    : new SolidColorBrush(Color.FromArgb(60, 150, 150, 150));
 
             if (e.ColumnValueType == FieldValueType.GrandTotal || e.RowValueType == FieldValueType.GrandTotal)
-                if (e.Selected)
-                    e.Background = new SolidColorBrush(Color.FromArgb(180, 191, 168, 66));
-                else
-                    e.Background = new SolidColorBrush(Color.FromArgb(60, 120, 120, 120));
+                e.Background = e.Selected 
+                    ? new SolidColorBrush(Color.FromArgb(180, 191, 168, 66)) 
+                    : new SolidColorBrush(Color.FromArgb(60, 120, 120, 120));
         }
 
         private void CheckDataBarPerChanged(object sender, RoutedEventArgs e)
         {
-            if (myPivotGridControl.DataSource != null)
-            {
-                var conditions = CreateDataBarConditions(_Columns, _Rows, _DataPer, "BlueSolidDataBar", 0, 1);
+            if (myPivotGridControl.DataSource == null) return;
+            if (!checkBoxDataPer.IsChecked.HasValue) return;
 
-                if (checkBoxDataPer.IsChecked.Value)
-                {
-                    myPivotGridControl.FormatConditions.AddRange(conditions);
-                }
-                else
-                {
-                    myPivotGridControl.FormatConditions.RemoveRange(conditions);
-                }
+            var conditions = CreateDataBarConditions(_Columns, _Rows, _DataPer, "BlueSolidDataBar", 0, 1);
+
+            if (checkBoxDataPer.IsChecked.Value)
+            {
+                myPivotGridControl.FormatConditions.AddRange(conditions);
+            }
+            else
+            {
+                myPivotGridControl.FormatConditions.RemoveRange(conditions);
             }
         }
 
@@ -429,29 +433,60 @@ namespace BeWo.View.Detail.Report
 
         private void MyPivotGridControl_CustomFieldSort(object sender, PivotCustomFieldSortEventArgs e)
         {
-            if (e.Field == FlexibleDatum)
-            {
-                if (e.Value1 == null || e.Value2 == null)
-                    return;
-                e.Handled = true;
-                DateTime d1 = Convert.ToDateTime(e.Value1.ToString().Split(' ')[1]);
-                DateTime d2 = Convert.ToDateTime(e.Value2.ToString().Split(' ')[1]);
-                if (d1 > d2)
-                    e.Result = 1;
-                else if (d1 == d2)
-                    e.Result = 0;
-                else
-                    e.Result = -1;
-            }
+            if (e.Field != FlexibleDatum) return;
+            if (e.Value1 == null || e.Value2 == null)
+                return;
+
+            DateTime d1 = Convert.ToDateTime(e.Value1.ToString().Split(' ')[1]);
+            DateTime d2 = Convert.ToDateTime(e.Value2.ToString().Split(' ')[1]);
+            if (d1 > d2)
+                e.Result = 1;
+            else if (d1 == d2)
+                e.Result = 0;
+            else
+                e.Result = -1;
+
+            e.Handled = true;
         }
 
         private void ButtonShowOptions_Click(object sender, RoutedEventArgs e)
         {
             myPivotGridControl.IsFieldListVisible = true;
         }
+
+        private void MyPivotGridControl_CellDoubleClick(object sender, PivotCellEventArgs e)
+        {
+            var selectedEntries = e.CreateDrillDownDataSource()
+                .Cast<PivotDrillDownDataRow>()
+                .Select(row => ActualFlexibleReportEntries[row.ListSourceRowIndex])
+                .Where(item => item.Type == FlexibleReportEntryType.ServiceRecordEntry)
+                .ToList();
+
+            if(selectedEntries.Count > 0)
+            {
+                var beWoWindow = new BeWoWindow
+                {
+                    Height = 500,
+                    Width = 1500,
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    GroupBoxContent = new FlexibleReportEntryDetail(selectedEntries, DocTypes),
+                    Owner = BeWoApp.CurrentBeWo.MainWindow,
+                    rootGroupBox = {Header = "Eintrag Details"}
+                };
+
+                beWoWindow.ShowDialog();
+            }
+            else
+            {
+                MessageBox.Show("Hier befindet sich keine Zeiterfassung!", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Stop);
+            }
+        }
         #endregion
 
         #region Proterties
+
+        public List<ValueListEntryDC> DocTypes { get; set; }
+
         public string LayoutString
         {
             get
@@ -470,6 +505,9 @@ namespace BeWo.View.Detail.Report
                 }
             }
         }
+
+        public List<FlexibleReportEntry> ActualFlexibleReportEntries => myPivotGridControl?.DataSource as List<FlexibleReportEntry>;
+
         #endregion
 
         #region Methoden
@@ -561,6 +599,8 @@ namespace BeWo.View.Detail.Report
         #region Classes
         public class FlexibleReportEntry
         {
+            public long? ServiceRecordOid { get; set; }
+
             public long? CustomerOid { get; set; }
 
             public string CustomerString { get; set; }
@@ -583,11 +623,9 @@ namespace BeWo.View.Detail.Report
 
             public decimal? SollMinuten { get; set; }
 
-            public decimal? IstStunden { get { return IstMinuten / 60; } }
+            public DateTime StartDatum { get; set; }
 
-            public decimal? SollStunden { get { return SollMinuten / 60; } }
-
-            public DateTime Datum { get; set; }
+            public DateTime EndDatum { get; set; }
 
             public FlexibleReportEntryType Type { get; set; }
 
@@ -599,46 +637,56 @@ namespace BeWo.View.Detail.Report
 
             public decimal Rundungspotenzial { get; set; }
 
-            public decimal DifferenzIstSollMinuten { get { return (IstMinuten ?? 0) - (SollMinuten ?? 0); } }
-
-            public decimal DifferenzIstSollStunden { get { return DifferenzIstSollMinuten / 60; } }
-
             public string Organisation { get; set; }
 
+            public string Notice { get; set; }
+
+            public string Notice2 { get; set; }
+
+            public string Notice3 { get; set; }
+
+            public string Notice4 { get; set; }
+
+            public string Notice5 { get; set; }
+
+            public decimal? IstStunden => IstMinuten / 60;
+
+            public decimal? SollStunden => SollMinuten / 60;
+
+            public decimal DifferenzIstSollMinuten => (IstMinuten ?? 0) - (SollMinuten ?? 0);
+
+            public decimal DifferenzIstSollStunden => DifferenzIstSollMinuten / 60;
+
             public static FlexibleReportEntry InitByFlexibleReportEntryDC(FlexibleReportEntryDC entryDC)
             {
                 var entry = new FlexibleReportEntry()
                 {
+                    ServiceRecordOid = entryDC.ServiceRecordOid,
                     CustomerOid = entryDC.CustomerOid,
+                    CustomerString = entryDC.CustomerString ?? "<Nicht angegeben>",
                     EmployeeOid = entryDC.EmployeeOid,
+                    EmployeeString = entryDC.EmployeeString ?? "<Nicht angegeben>",
                     SupportConceptOid = entryDC.SupportConceptOid,
+                    SupportConceptString = entryDC.SupportConceptString ?? "<Nicht angegeben>",
                     IstMinuten = entryDC.IstMinuten,
-                    Datum = entryDC.StartDatum,
+                    StartDatum = entryDC.StartDatum,
+                    EndDatum = entryDC.EndDatum,
                     Leistung = entryDC.Leistung,
                     Leistungskategorie = entryDC.Leistungskategorie,
                     Team = entryDC.Team,
                     SollMinuten = entryDC.SollMinuten,
-                    Type = entryDC.Type,
+                    Type = FlexibleReportEntryType.ServiceRecordEntry,
                     Kilometer = entryDC.Kilometer,
                     Organisation = entryDC.Organisation,
                     Rundungspotenzial = (entryDC.IstMinuten ?? 0) - ((decimal)entryDC.EndDatum.Subtract(entryDC.StartDatum).TotalMinutes),
                     Betrag = entryDC.Betrag,
-                    Stundensatz = entryDC.Stundensatz
+                    Stundensatz = entryDC.Stundensatz,
+                    Notice = entryDC.Notice,
+                    Notice2 = entryDC.Notice2,
+                    Notice3 = entryDC.Notice3,
+                    Notice4 = entryDC.Notice4,
+                    Notice5 = entryDC.Notice5,
                 };
-
-                if (entryDC.Type == FlexibleReportEntryType.ServiceRecordEntry)
-                {
-                    entry.CustomerString = entryDC.CustomerString == null ? "<Nicht angegeben>" : entryDC.CustomerString;
-                    entry.EmployeeString = entryDC.EmployeeString == null ? "<Nicht angegeben>" : entryDC.EmployeeString;
-                    entry.SupportConceptString = entryDC.SupportConceptString == null ? "<Nicht angegeben>" : entryDC.SupportConceptString;
-                }
-                else
-                {
-                    entry.CustomerString = null;
-                    entry.EmployeeString = null;
-                    entry.SupportConceptString = null;
-                }
-
                 return entry;
             }
 
@@ -655,7 +703,8 @@ namespace BeWo.View.Detail.Report
                         Betrag = 0,
                         CustomerOid = dummyDC.CustomerOid,
                         CustomerString = dummyDC.CustomerString,
-                        Datum = date,
+                        StartDatum = date,
+                        EndDatum = dummyDC.EndDate,
                         EmployeeOid = dummyDC.EmployeeOid,
                         EmployeeString = dummyDC.EmployeeString,
                         Kilometer = null,
@@ -680,23 +729,27 @@ namespace BeWo.View.Detail.Report
 
                 foreach (var item in dic)
                 {
-                    for (DateTime date = start; date <= ende; date = date.AddDays(1))
+                    for (var date = start; date <= ende; date = date.AddDays(1))
                     {
+                        // isEmployee = true -> Employee
                         if (isEmployee)
                             flexibleReports.Add(new FlexibleReportEntry()
                             {
                                 EmployeeOid = item.Key,
                                 EmployeeString = item.Value,
                                 Type = FlexibleReportEntryType.EmployeeNullEntry,
-                                Datum = date
+                                StartDatum = date,
+                                EndDatum = date
                             });
+                        // isEmployee = false -> Customer
                         else
                             flexibleReports.Add(new FlexibleReportEntry()
                             {
                                 CustomerOid = item.Key,
                                 CustomerString = item.Value,
                                 Type = FlexibleReportEntryType.CustomerNullEntry,
-                                Datum = date
+                                StartDatum = date,
+                                EndDatum = date
                             });
                         if (reduziert)
                             break;
@@ -706,9 +759,10 @@ namespace BeWo.View.Detail.Report
                 return flexibleReports;
             }
 
+            // Wurde eig nur zum Testen verwendet, kann bei Bedarf überschrieben werden
             public override string ToString()
             {
-                return SollMinuten.ToStringNullCheck() + " [" + Datum.Day.ToString() + "]";
+                return StartDatum.ToShortTimeString();
             }
         }
 
@@ -767,18 +821,18 @@ namespace BeWo.View.Detail.Report
             {
                 Dictionary<Type, SeriesTypeDescriptor> seriesTypes = new Dictionary<Type, SeriesTypeDescriptor>();
                 seriesTypes.Add(typeof(AreaFullStackedSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Area Full-Stacked Series 2D" });
-                seriesTypes.Add(typeof(AreaSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText="Area Series 2D" });
-                seriesTypes.Add(typeof(AreaStackedSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText="Area Stacked Series 2D" });
-                seriesTypes.Add(typeof(BarFullStackedSeries2D), new SeriesTypeDescriptor { DiagramType =  XYDiagram2DType, DisplayText="Bar Full-Stacked Series 2D" });
-                seriesTypes.Add(typeof(BarStackedSeries2D), new SeriesTypeDescriptor { DiagramType =  XYDiagram2DType, DisplayText="Bar Stacked Series 2D" });
-                seriesTypes.Add(typeof(LineSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText="Line Series 2D" });
+                seriesTypes.Add(typeof(AreaSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Area Series 2D" });
+                seriesTypes.Add(typeof(AreaStackedSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Area Stacked Series 2D" });
+                seriesTypes.Add(typeof(BarFullStackedSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Bar Full-Stacked Series 2D" });
+                seriesTypes.Add(typeof(BarStackedSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Bar Stacked Series 2D" });
+                seriesTypes.Add(typeof(LineSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Line Series 2D" });
                 seriesTypes.Add(typeof(PointSeries2D), new SeriesTypeDescriptor { DiagramType = XYDiagram2DType, DisplayText = "Point Series 2D" });
-                seriesTypes.Add(typeof(AreaSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText="Area Series 3D" });
-                seriesTypes.Add(typeof(AreaStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText="Area Stacked Series 3D" });
-                seriesTypes.Add(typeof(AreaFullStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText="Area Full-Stacked Series 3D" });
-                seriesTypes.Add(typeof(BarSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText="Bar Series 3D" });
-                seriesTypes.Add(typeof(PointSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText="Point Series 3D" });
-                seriesTypes.Add(typeof(PieSeries3D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram3DType, DisplayText="Pie Series 3D" });
+                seriesTypes.Add(typeof(AreaSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Series 3D" });
+                seriesTypes.Add(typeof(AreaStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Stacked Series 3D" });
+                seriesTypes.Add(typeof(AreaFullStackedSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Area Full-Stacked Series 3D" });
+                seriesTypes.Add(typeof(BarSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Bar Series 3D" });
+                seriesTypes.Add(typeof(PointSeries3D), new SeriesTypeDescriptor { DiagramType = XYDiagram3DType, DisplayText = "Point Series 3D" });
+                seriesTypes.Add(typeof(PieSeries3D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram3DType, DisplayText = "Pie Series 3D" });
                 seriesTypes.Add(typeof(PieSeries2D), new SeriesTypeDescriptor { DiagramType = SimpleDiagram2DType, DisplayText = "Pie Series 2D" });
                 return seriesTypes;
             }
diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml
index 36daa2914..846638faa 100644
--- a/BeWo/View/Detail/SupportConceptView.xaml
+++ b/BeWo/View/Detail/SupportConceptView.xaml
@@ -16,6 +16,8 @@
                     xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
                     xmlns:viewModel="clr-namespace:BS.Shared.DataContracts;assembly=BS.Shared"
                     xmlns:drawing="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
 	<localView:BeWoView.Resources>
 		<ResourceDictionary>
@@ -25,6 +27,8 @@
 			<view:ValueListEntryTypeToColorConverter x:Key="ValueListEntryTypeToColorConverter" />
       <converter:CollectionCountToVisibilityConverter x:Key="CollectionCountToVisibilityConverter"/>
       <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"></converter:BoolVisibilityConverter>
+      <converter:NullableBoolToBoolConverter x:Key="NullableBoolToBoolConverter" />
+      
       <DataTemplate x:Key="DeleteBtnBetreuungsschluesselDataTemplate">
         <Button Content="r" Click="DeleteBetreuungsschluesselButton_Click" Tag="{Binding}" 
 		            FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center"
@@ -444,7 +448,7 @@
 																	</Button>
 																</Grid>
 															</GroupBox.Header>
-															<ListView Name="listViewCostBearer" Grid.Row="1"
+															<ListView x:Name="listViewCostBearer" Grid.Row="1"
                                                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                                                     ItemsSource="{Binding ApprovalPeriodList.VMList}"
                                                                     Background="Transparent" BorderBrush="Transparent"
@@ -462,7 +466,8 @@
 																			<Grid Margin="3" Loaded="ListItemGrid_OnLoaded">
 																				<Grid.ColumnDefinitions>
 																					<ColumnDefinition Width="Auto"/>
-																					<ColumnDefinition Width="Auto" MinWidth="100" />
+                                                                                    <ColumnDefinition Width="Auto"/>
+                                                                                    <ColumnDefinition Width="Auto" MinWidth="100" />
 																					<ColumnDefinition Width="Auto" />
 																					<ColumnDefinition Width="Auto" MinWidth="100" />
 																					<ColumnDefinition Width="Auto"/>
@@ -471,12 +476,14 @@
 																				<Grid.RowDefinitions>
 																					<RowDefinition Height="Auto" />
                                                                                     <RowDefinition Height="Auto" />
+                                                                                    <RowDefinition Height="10" />
                                                                                     <RowDefinition Height="Auto" />
                                                                                     <RowDefinition Height="Auto" />
                                                                                     <RowDefinition Height="Auto" />
-																					<RowDefinition Height="Auto" />
-																					<RowDefinition Height="Auto" />
-																					<RowDefinition Height="Auto" />
+                                                                                    <RowDefinition Height="Auto" />
+										                                            <RowDefinition Height="Auto" />
+										                                            <RowDefinition Height="Auto" />
+										                                            <RowDefinition Height="Auto" />
                                                                                     <RowDefinition Height="Auto" />
                                                                                     <RowDefinition Height="Auto" />
                                                                                     <RowDefinition Height="0" />
@@ -536,122 +543,161 @@
                                                                                             BorderThickness="0 0 0 1" />
 
 																				</Grid>
-																				<TextBlock VerticalAlignment="Center"
-                                                                                        Grid.Row="1" Grid.Column="0"
-																				           Margin="3"
-                                                                                        Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={markup:Translate \{0\} genehmigt}}" />
+                                                                                <RadioButton x:Name="RadioButtonBudget" 
+                                                                                             Tag="{Binding}"
+                                                                                             Grid.Row="1"
+                                                                                             Grid.Column="0"
+                                                                                             Content="Budget"
+                                                                                             Margin="3 8 0 0"
+                                                                                             Checked="RadioButton_Checked"
+                                                                                             IsChecked="{Binding Path=IsBudget, Mode=OneWay}" />
+                                                                                <!-- <ComboBox x:Name="Combo_Budget2"
+                                                                                      Margin="4" Grid.Row="1" Grid.ColumnSpan="4"
+                                                                                      Height="23"
+                                                                                      Grid.Column="1"
+                                                                                      Tag="Budget"
+                                                                                      IsEnabled="{Binding Path=IsBudget, Mode=OneWay}"/> -->
+                                                                                <uc:NullItemComboBox x:Name="Combo_Budget" 
+                                                                                              Margin="4" Grid.Row="1" Grid.ColumnSpan="4"
+                                                                                              Height="23"
+                                                                                      Grid.Column="1"
+                                                                                                   ItemsSource="{Binding Path=Budgets, UpdateSourceTrigger=PropertyChanged}" 
+                                                                                                   SelectedValue="{Binding BudgetDC, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" 
+                                                                                                   IsEnabled="{Binding Path=IsBudget, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+                                                                                                   />
+
+                                                                                <RadioButton  x:Name="RadioButtonDirekt"
+                                                                                          Tag="{Binding}"
+                                                                                          Grid.Row="3"
+                                                                                          Grid.Column="0"
+                                                                                          Content="Direkt"
+                                                                                          Checked="RadioButton_Checked"
+                                                                                          Margin="3 8 0 0"
+                                                                                          IsChecked="{Binding Path=IsDirekt, Mode=OneWay}"
+                                                                                          />
+
+                                                                                <TextBlock VerticalAlignment="Center"
+                                                                                        Grid.Row="3" Grid.Column="1" Margin="3"
+                                                                                        Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={markup:Translate \{0\} genehmigt}}"/>
 																				<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" 
-                                                                                        Grid.Row="1"
+                                                                                        Grid.Row="3"
                                                                                         AllowNullInput="True"
                                                                                         Name="textbox_newCostBearerApprovedHours"
                                                                                         EditValue="{Binding Path=ApprovedBEPerInterval, UpdateSourceTrigger=PropertyChanged}"
-                                                                                        Grid.Column="1"
+                                                                                        Grid.Column="2"
                                                                                         Margin="3"
-                                                                                        Height="23" />
+                                                                                        Height="23" 
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
 																				<TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Column="2" Text="pro"
-                                                                                        Grid.Row="1" />
+                                                                                        Grid.Column="3" Text="pro"
+                                                                                        Grid.Row="3"/>
 																				<ComboBox x:Name="combo_approvedIntervall"
-                                                                                        Margin="3" Grid.Row="1"
+                                                                                        Margin="4" Grid.Row="3"
                                                                                         ItemsSource="{x:Static core:EnumTranslations.SupportConceptApprovalInterval2Translations}"
                                                                                         SelectedValue="{Binding ApprovedBEInterval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                                         SelectedValuePath="Key"
                                                                                         DisplayMemberPath="Value"
                                                                                         Height="23"
-                                                                                        Grid.Column="3" />
+                                                                                        Grid.Column="4" 
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
 																				<TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Row="1"
-                                                                                        Grid.Column="4" Text="{markup:Translate Ãœbertragbar}" />
+                                                                                        Grid.Row="3"
+                                                                                        Grid.Column="5" Text="{markup:Translate Ãœbertragbar}"/>
 																				<CheckBox Height="23" Margin="3 8 0 0"
-                                                                                        Grid.Column="5"
-                                                                                        Grid.Row="1"
+                                                                                        Grid.Column="6"
+                                                                                        Grid.Row="3"
                                                                                         IsChecked="{Binding IsApprovedBEShifting, UpdateSourceTrigger=PropertyChanged}"
-                                                                                        ToolTip="{markup:Translate Übertragung von Reststunden in den nachfolgenden Bewilligungsabschnitt möglich}" />
+                                                                                        ToolTip="{markup:Translate Übertragung von Reststunden in den nachfolgenden Bewilligungsabschnitt möglich}" 
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}" />
 																				<TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Row="2"
-                                                                                        Grid.Column="0"
-                                                                                        Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={markup:Translate \{0\} Gesamt}}" />
+                                                                                        Grid.Row="4"
+                                                                                        Grid.Column="1"
+                                                                                        Text="{Binding TranslatedServiceUnitName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={markup:Translate \{0\} Gesamt}}"/>
 																				<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" 
-                                                                                              AllowNullInput="True"
-                                                                                        Grid.Row="2" Grid.Column="1"
+                                                                                        AllowNullInput="True"
+                                                                                        Grid.Row="4" Grid.Column="2"
                                                                                         Name="textbox_newCostBearerApprovedFLSTotal"
                                                                                         EditValue="{Binding Path=ApprovedBETotal, UpdateSourceTrigger=PropertyChanged}"
                                                                                         Margin="3"
-                                                                                        Height="23"/>
+                                                                                        Height="23" 
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
 																				<TextBlock VerticalAlignment="Center"
-                                                                                        Grid.Row="3" Grid.Column="0"
-																				           Margin="3"
-                                                                                        Text="{markup:Translate Betrag pauschal}" />
+                                                                                        Grid.Row="5" Grid.Column="1"
+																				        Margin="3"
+                                                                                        Text="{markup:Translate Betrag pauschal}"/>
 																				<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" 
                                                                                               AllowNullInput="True"
                                                                                         Name="textbox_newCostBearerApprovedAllowance"
-                                                                                        Grid.Row="3"
+                                                                                        Grid.Row="5"
                                                                                         EditValue="{Binding ApprovedFixedAmount, UpdateSourceTrigger=PropertyChanged}"
-                                                                                        Grid.Column="1"
+                                                                                        Grid.Column="2"
                                                                                         Margin="3"
-                                                                                        Height="23"/>
+                                                                                        Height="23"
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
 																				<TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Row="3"
-                                                                                        Grid.Column="2" Text="pro"
-                                                                                        />
+                                                                                        Grid.Row="5"
+                                                                                        Grid.Column="3" Text="pro"/>
 																				<ComboBox x:Name="combo_approvedAllowanceIntervall"
                                                                                         ItemsSource="{x:Static core:EnumTranslations.SupportConceptApprovalInterval2Translations}"
                                                                                         SelectedValuePath="Key"
                                                                                         SelectedValue="{Binding ApprovedFixedAmountInterval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                                         DisplayMemberPath="Value"
-                                                                                        Grid.Row="3" Margin="3" Height="23"
-                                                                                        Grid.Column="3" />
+                                                                                        Grid.Row="5" Margin="3" Height="23"
+                                                                                        Grid.Column="4" 
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
 																				<TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Row="3"
-                                                                                        Grid.Column="4" Text="{markup:Translate Ãœbertragbar}" />
+                                                                                        Grid.Row="5"
+                                                                                        Grid.Column="5" Text="{markup:Translate Ãœbertragbar}" />
 																				<CheckBox Height="23" Margin="3 8 0 0"
-                                                                                        Grid.Row="3" Grid.Column="5"
+                                                                                        Grid.Row="5" Grid.Column="6"
                                                                                         IsChecked="{Binding IsApprovedFixedAmountShifting, UpdateSourceTrigger=PropertyChanged}"
-                                                                                        ToolTip="{markup:Translate Übertragung von Rest Budget in den nachfolgenden Bewilligungsabschnitt möglich}" />
+                                                                                        ToolTip="{markup:Translate Übertragung von Rest Budget in den nachfolgenden Bewilligungsabschnitt möglich}"
+                                                                                        IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
 																				<TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
-                                                                                        Grid.Row="4"
-                                                                                        Grid.Column="0"
+                                                                                        Grid.Row="6"
+                                                                                        Grid.Column="1"
                                                                                         Text="{markup:Translate Monatlicher Abschlag}" />
                                                                                 <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" 
                                                                                               AllowNullInput="True"
-                                                                                            Grid.Row="4" Grid.Column="1"
+                                                                                            Grid.Row="6" Grid.Column="2"
                                                                                             Name="textbox_monthlyAmount"
                                                                                             EditValue="{Binding Path=MonthlyPayment, UpdateSourceTrigger=PropertyChanged}"
                                                                                             Margin="3"
-                                                                                            Height="23" />
+                                                                                            Height="23" 
+                                                                                            IsEnabled="{Binding Path=IsDirekt, Mode=OneWay}"/>
                                                                                 
 																				<TextBlock VerticalAlignment="Center"
-                                                                                           Grid.Column="0"
-                                                                                          Grid.Row="5"
+                                                                                           Grid.Column="1"
+                                                                                          Grid.Row="7"
                                                                                           Margin="3"
-                                                                                          Text="Max. Kontakte" x:Name="lblContactCountPerInterval" />
+                                                                                          Text="Max. Kontakte" x:Name="lblContactCountPerInterval" Tag="Direkt"/>
                                                                                 <dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True"
-                                                                                            Grid.Row="5"
+                                                                                            Grid.Row="7"
                                                                                             AllowNullInput="True"
                                                                                             Name="txtContactCountPerInterval"
                                                                                             EditValue="{Binding Path=ContactCountPerInterval, UpdateSourceTrigger=PropertyChanged}"
-                                                                                            Grid.Column="1"
+                                                                                            Grid.Column="2"
                                                                                             Margin="3"
-                                                                                            Height="23" />
+                                                                                            Height="23" Tag="Direkt"/>
                                                                                 <TextBlock VerticalAlignment="Center"
                                                                                         Margin="3"
                                                                                         Grid.Column="2" Text="pro"
-                                                                                        Grid.Row="5" x:Name="lblContactCountInterval" />
+                                                                                        Grid.Row="7" x:Name="lblContactCountInterval" Tag="Direkt"/>
 																				<ComboBox x:Name="cboContactCountInterval"
-                                                                                        Margin="3" Grid.Row="5"
+                                                                                        Margin="3" Grid.Row="7"
                                                                                         ItemsSource="{x:Static core:EnumTranslations.SupportConceptApprovalInterval2Translations}"
                                                                                         SelectedValue="{Binding ContactCountInterval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                                         SelectedValuePath="Key"
                                                                                         DisplayMemberPath="Value"
                                                                                         Height="23"
-                                                                                        Grid.Column="3" />
-                                                                                <Button Grid.Row="6" Grid.Column="0" Height="25"
+                                                                                        Grid.Column="4" Tag="Direkt"/>
+                                                                                <Button Grid.Row="7" Grid.Column="0" Height="25"
                                                                                         Grid.ColumnSpan="6"
                                                                                         Visibility="{Binding Path=SupportConceptApprovalEmployeeRelations.AddButtonVisibility}"
                                                                                         HorizontalAlignment="Left"
diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs
index a3d08b8e8..aec785167 100644
--- a/BeWo/View/Detail/SupportConceptView.xaml.cs
+++ b/BeWo/View/Detail/SupportConceptView.xaml.cs
@@ -40,7 +40,7 @@ namespace BeWo.View.Detail
         #region Constants and Fields
 
         private TreeViewItem _SelectedGoalTreeNode;
-        
+
         private PersonView _PersonModalPopUp;
 
         private List<ServiceRecordDC> _ServiceRecords;
@@ -49,69 +49,69 @@ namespace BeWo.View.Detail
 
         private bool employeeEditFlag;
 
-	    private bool isChangingCostbearer;
+        private bool isChangingCostbearer;
 
-	    private SupportConceptCostBearerRelVM supportConceptCostBearerRel2Change;
+        private SupportConceptCostBearerRelVM supportConceptCostBearerRel2Change;
 
         private readonly SchedulerAppointmentDC taskToEdit;
 
         #region Rechtebinding
         public static bool IsAllowedToChangeCostbeaerer
-	    {
-		    get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.CostbearerAllowChange); }
-	    }
+        {
+            get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.CostbearerAllowChange); }
+        }
 
-	    public static bool IsAllowedToEditCostbearers
-	    {
-		    get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit); }
-	    }
+        public static bool IsAllowedToEditCostbearers
+        {
+            get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit); }
+        }
 
-	    public static bool IsAllowedToEditGoals
-	    {
-			get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals); }
-	    }
-		#endregion
+        public static bool IsAllowedToEditGoals
+        {
+            get { return BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals); }
+        }
+        #endregion
 
-		#endregion
+        #endregion
 
-		#region Constructors and Destructors
+        #region Constructors and Destructors
 
-		public SupportConceptView(SupportConceptVM pViewModel)
+        public SupportConceptView(SupportConceptVM pViewModel)
         {
             InitializeComponent();
             ViewModel = pViewModel;
 
-			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving))
-			{
-				lblArchiviert.Visibility = Visibility.Hidden;
-				chkArchiviert.Visibility = Visibility.Hidden;
-			}
-			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsAllowViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.DokumenteHilfeplaene))
-			{
-				tabitem_documents.Visibility = Visibility.Collapsed;
-			}
-	        if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit))
-			{
-				grid_details.IsEnabled = false;
-				
-				button_addCostBearer.IsEnabled = false;
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving))
+            {
+                lblArchiviert.Visibility = Visibility.Hidden;
+                chkArchiviert.Visibility = Visibility.Hidden;
+            }
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsAllowViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.DokumenteHilfeplaene))
+            {
+                tabitem_documents.Visibility = Visibility.Collapsed;
+            }
+            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_Edit))
+            {                
+                grid_details.IsEnabled = false;
 
-				//tabitem_documents.IsEnabled = false;
+                button_addCostBearer.IsEnabled = false;
 
-				grid_serviceaccountings.IsEnabled = false;
+                //tabitem_documents.IsEnabled = false;
 
-				tabitem_grid_tasks.IsEnabled = false;
+                grid_serviceaccountings.IsEnabled = false;
 
-				if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditTasks))
-				{
-					tabitem_grid_tasks.IsEnabled = true;
-					tabitem_tasks.IsSelected     = true;
-				}
-		        if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals))
-		        {
-			        tabitem_goals.IsSelected = true;
-		        }
-	        }
+                tabitem_grid_tasks.IsEnabled = false;
+
+                if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditTasks))
+                {
+                    tabitem_grid_tasks.IsEnabled = true;
+                    tabitem_tasks.IsSelected = true;
+                }
+                if (BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals))
+                {
+                    tabitem_goals.IsSelected = true;
+                }
+            }
             if (pViewModel.VarFields == null || pViewModel.VarFields.VMList.Count == 0)
             {
                 tabitem_varFields.Visibility = Visibility.Collapsed;
@@ -284,7 +284,7 @@ namespace BeWo.View.Detail
 
                     if (isAbsolute)
                     {
-                        if (ap.ApprovedBEPerInterval.HasValue && summe > (ap.ApprovedBEPerInterval.Value*60))
+                        if (ap.ApprovedBEPerInterval.HasValue && summe > (ap.ApprovedBEPerInterval.Value * 60))
                         {
                             MessageBox.Show($"Die Summe der Anteile liegt bei über {(ap.ApprovedBEPerInterval.Value * 60):0} Minuten. Speichern nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
                             return;
@@ -322,7 +322,7 @@ namespace BeWo.View.Detail
                 {
                     var mbResult = MessageBox.Show(Translator.Translate("Es existiert mindestens eine Buchung außerhalb des Hilfeplanzeitraums.\nMöchten Sie trotzdem speichern?"), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning);
 
-                    if(mbResult.Equals(MessageBoxResult.No))
+                    if (mbResult.Equals(MessageBoxResult.No))
                     {
                         return;
                     }
@@ -380,7 +380,7 @@ namespace BeWo.View.Detail
 
         private void Button_Loaded(object sender, RoutedEventArgs e)
         {
-            var t = new DispatcherTimer(DispatcherPriority.Normal, Dispatcher) {Interval = TimeSpan.FromSeconds(.5)};
+            var t = new DispatcherTimer(DispatcherPriority.Normal, Dispatcher) { Interval = TimeSpan.FromSeconds(.5) };
             t.Tick += delegate
                       {
                           ((Button)sender).Click += add_edit_employee_Click;
@@ -399,40 +399,40 @@ namespace BeWo.View.Detail
                 return;
             }
 
-	        if (!isChangingCostbearer)
-	        {
-		        var newVm = ViewModel.CostBearerRelations.NewVM;
-		        newVm.CostBearer = e.Data;
+            if (!isChangingCostbearer)
+            {
+                var newVm = ViewModel.CostBearerRelations.NewVM;
+                newVm.CostBearer = e.Data;
 
-		        if (ViewModel.Customer != null && string.IsNullOrEmpty(newVm.CustomerReferenceNumber) &&
-		            ViewModel.Customer.CostBearerReferenceNumbers.ContainsKey(e.Data.CostBearerOid.Value))
-		        {
-			        newVm.CustomerReferenceNumber = ViewModel.Customer.CostBearerReferenceNumbers[e.Data.CostBearerOid.Value];
-		        }
+                if (ViewModel.Customer != null && string.IsNullOrEmpty(newVm.CustomerReferenceNumber) &&
+                    ViewModel.Customer.CostBearerReferenceNumbers.ContainsKey(e.Data.CostBearerOid.Value))
+                {
+                    newVm.CustomerReferenceNumber = ViewModel.Customer.CostBearerReferenceNumbers[e.Data.CostBearerOid.Value];
+                }
 
-		        ViewModel.CostBearerRelations.AddNewVMToList();
-		        tabcontrol_costbearers.SelectedIndex = tabcontrol_costbearers.Items.Count - 1;
+                ViewModel.CostBearerRelations.AddNewVMToList();
+                tabcontrol_costbearers.SelectedIndex = tabcontrol_costbearers.Items.Count - 1;
 
-		        AddNewApprovalPeriod(newVm);
-	        }
-	        else
-	        {
-		        supportConceptCostBearerRel2Change.CostBearer = e.Data;
+                AddNewApprovalPeriod(newVm);
+            }
+            else
+            {
+                supportConceptCostBearerRel2Change.CostBearer = e.Data;
 
-		        if (ViewModel.Customer != null && ViewModel.Customer.CostBearerReferenceNumbers.ContainsKey(e.Data.CostBearerOid.Value))
-		        {
-			        supportConceptCostBearerRel2Change.CustomerReferenceNumber = ViewModel.Customer.CostBearerReferenceNumbers[e.Data.CostBearerOid.Value];
-		        }
-		        else
-		        {
-			        supportConceptCostBearerRel2Change.CustomerReferenceNumber = null;
-		        }
+                if (ViewModel.Customer != null && ViewModel.Customer.CostBearerReferenceNumbers.ContainsKey(e.Data.CostBearerOid.Value))
+                {
+                    supportConceptCostBearerRel2Change.CustomerReferenceNumber = ViewModel.Customer.CostBearerReferenceNumbers[e.Data.CostBearerOid.Value];
+                }
+                else
+                {
+                    supportConceptCostBearerRel2Change.CustomerReferenceNumber = null;
+                }
 
-		        supportConceptCostBearerRel2Change.CostBearerContactPerson = null;
-	        }
+                supportConceptCostBearerRel2Change.CostBearerContactPerson = null;
+            }
 
-	        isChangingCostbearer               = false;
-	        supportConceptCostBearerRel2Change = null;
+            isChangingCostbearer = false;
+            supportConceptCostBearerRel2Change = null;
         }
 
         private void CustomerSearchView_CustomerSelected(object sender, EventArgs<CompactCustomerDC> e)
@@ -449,9 +449,9 @@ namespace BeWo.View.Detail
                     if (HasServiceRecords(ViewModel))
                     {
                         MessageBox.Show(Translator.Translate(
-                                        "Für diesen Klienten wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Klient wechseln können."), 
-                                        "Fehler", 
-                                        MessageBoxButton.OK, 
+                                        "Für diesen Klienten wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Klient wechseln können."),
+                                        "Fehler",
+                                        MessageBoxButton.OK,
                                         MessageBoxImage.Exclamation);
                         return;
                     }
@@ -473,11 +473,11 @@ namespace BeWo.View.Detail
             }
             else
             {
-                if(employeeEditFlag)
+                if (employeeEditFlag)
                 {
                     var data = grid_tasks.View.FocusedRowData;
 
-                    if(data?.RowHandle != null)
+                    if (data?.RowHandle != null)
                     {
                         var vm = grid_tasks.GetRow(data.RowHandle.Value) as SchedulerAppointmentVM;
 
@@ -487,7 +487,7 @@ namespace BeWo.View.Detail
                         }
                     }
                 }
-                else if(!ViewModel.Tasks.NewVM.EmployeeList.Exists(i => i.Employee.EmployeeOid.Equals(e.Data.EmployeeOid)))
+                else if (!ViewModel.Tasks.NewVM.EmployeeList.Exists(i => i.Employee.EmployeeOid.Equals(e.Data.EmployeeOid)))
                 {
                     ViewModel.Tasks.NewVM.EmployeeList.Add(new Employee2SchedulerAppointmentDC { Employee = e.Data });
                 }
@@ -500,8 +500,8 @@ namespace BeWo.View.Detail
         {
             if (_ServiceRecords == null && ViewModel.Customer != null)
             {
-                _ServiceRecords = ViewModel.IsArchived 
-                    ? ServiceFacade.DoOperationsServiceSync(s => s.GetCustomerServiceRecords(ViewModel.Customer.CustomerOid, true)) 
+                _ServiceRecords = ViewModel.IsArchived
+                    ? ServiceFacade.DoOperationsServiceSync(s => s.GetCustomerServiceRecords(ViewModel.Customer.CustomerOid, true))
                     : ServiceFacade.DoOperationsServiceSync(s => s.GetCustomerServiceRecords(ViewModel.Customer.CustomerOid, false));
             }
 
@@ -538,13 +538,13 @@ namespace BeWo.View.Detail
             var newTasks = ViewModel.Tasks.CopyToDCList(true).Where(w => !w.SchedulerAppointmentOid.HasValue).ToList();
             var updatedTasks = ViewModel.Tasks.VMList.Where(w => !w.IsNew && w.IsDirty).ToList();
             var updatedTaskDCs = new List<SchedulerAppointmentDC>();
-            
-            foreach(var t in updatedTasks)
+
+            foreach (var t in updatedTasks)
             {
                 t.CommitToDataContract();
                 updatedTaskDCs.Add(t.DataContract);
             }
-            
+
             ServiceFacade.DoResourceServiceAsync(s => s.DeleteSchedulerAppointments(_DeletedTasks.ToDictionary(d => d.SchedulerAppointmentOid.Value, d => d.NewSchedulerAppointmentVersion.Value)), () =>
             {
                 ServiceFacade.DoResourceServiceAsync(s2 => s2.UpdateSchedulerAppointments(updatedTaskDCs), cb2 =>
@@ -580,7 +580,7 @@ namespace BeWo.View.Detail
 
         private void add_edit_employee_Click(object sender, RoutedEventArgs e)
         {
-            employeeEditFlag      = true;
+            employeeEditFlag = true;
             popup_employee.IsOpen = true;
         }
 
@@ -605,9 +605,9 @@ namespace BeWo.View.Detail
             if (HasServiceRecords(cbRelVM))
             {
                 MessageBox.Show(Translator.Translate(
-                                "Für diesen Kostenträger wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Kostenträger entfernen können."), 
-                                "Löschen", 
-                                MessageBoxButton.OK, 
+                                "Für diesen Kostenträger wurden bereits Leistungen hinterlegt. Sie müssen diese Leistungen erst löschen bevor Sie den Kostenträger entfernen können."),
+                                "Löschen",
+                                MessageBoxButton.OK,
                                 MessageBoxImage.Exclamation);
                 return;
             }
@@ -623,37 +623,37 @@ namespace BeWo.View.Detail
         private static void AddNewApprovalPeriod(SupportConceptCostBearerRelVM vm)
         {
             //var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
-			//var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
+            //var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
 
-			//if (actual != null)
-			//{
-			//    vm.ApprovalPeriodList.NewVM.StartDate = vm.StartDate;
-			//    vm.ApprovalPeriodList.NewVM.EndDate = vm.EndDate;
-			//    vm.ApprovalPeriodList.NewVM.ApprovedBEInterval = actual.ApprovedBEInterval;
-			//    vm.ApprovalPeriodList.NewVM.ApprovedBEPerInterval = actual.ApprovedBEPerInterval;
-			//    vm.ApprovalPeriodList.NewVM.ApprovedBETotal = actual.ApprovedBETotal;
-			//    vm.ApprovalPeriodList.NewVM.ApprovedFixedAmount = actual.ApprovedFixedAmount;
-			//    vm.ApprovalPeriodList.NewVM.ApprovedFixedAmountInterval = actual.ApprovedFixedAmountInterval;
-			//    vm.ApprovalPeriodList.NewVM.IsApprovedBEShifting = actual.IsApprovedBEShifting;
-			//    vm.ApprovalPeriodList.NewVM.IsApprovedFixedAmountShifting = actual.IsApprovedFixedAmountShifting;
-			//    vm.ApprovalPeriodList.NewVM.MonthlyPayment = actual.MonthlyPayment;
-			//    vm.ApprovalPeriodList.NewVM.ServiceUnitName = actual.ServiceUnitName;
+            //if (actual != null)
+            //{
+            //    vm.ApprovalPeriodList.NewVM.StartDate = vm.StartDate;
+            //    vm.ApprovalPeriodList.NewVM.EndDate = vm.EndDate;
+            //    vm.ApprovalPeriodList.NewVM.ApprovedBEInterval = actual.ApprovedBEInterval;
+            //    vm.ApprovalPeriodList.NewVM.ApprovedBEPerInterval = actual.ApprovedBEPerInterval;
+            //    vm.ApprovalPeriodList.NewVM.ApprovedBETotal = actual.ApprovedBETotal;
+            //    vm.ApprovalPeriodList.NewVM.ApprovedFixedAmount = actual.ApprovedFixedAmount;
+            //    vm.ApprovalPeriodList.NewVM.ApprovedFixedAmountInterval = actual.ApprovedFixedAmountInterval;
+            //    vm.ApprovalPeriodList.NewVM.IsApprovedBEShifting = actual.IsApprovedBEShifting;
+            //    vm.ApprovalPeriodList.NewVM.IsApprovedFixedAmountShifting = actual.IsApprovedFixedAmountShifting;
+            //    vm.ApprovalPeriodList.NewVM.MonthlyPayment = actual.MonthlyPayment;
+            //    vm.ApprovalPeriodList.NewVM.ServiceUnitName = actual.ServiceUnitName;
 
-			//    //actual.StartDate = DateTime.Now.Date.AddDays(1);
-			//    //actual.EndDate = vm.ApprovedEndDate;
-			//}
-			//else
-			//{
-                vm.ApprovalPeriodList.NewVM.StartDate                     = vm.StartDate;
-                vm.ApprovalPeriodList.NewVM.EndDate                       = vm.EndDate;
-                vm.ApprovalPeriodList.NewVM.ApprovedBEInterval            = SupportConceptApprovalInterval.Weekly;
-                vm.ApprovalPeriodList.NewVM.IsApprovedBEShifting          = true;
-                vm.ApprovalPeriodList.NewVM.IsApprovedFixedAmountShifting = true;
+            //    //actual.StartDate = DateTime.Now.Date.AddDays(1);
+            //    //actual.EndDate = vm.ApprovedEndDate;
+            //}
+            //else
+            //{
+            vm.ApprovalPeriodList.NewVM.StartDate = vm.StartDate;
+            vm.ApprovalPeriodList.NewVM.EndDate = vm.EndDate;
+            vm.ApprovalPeriodList.NewVM.ApprovedBEInterval = SupportConceptApprovalInterval.Weekly;
+            vm.ApprovalPeriodList.NewVM.IsApprovedBEShifting = true;
+            vm.ApprovalPeriodList.NewVM.IsApprovedFixedAmountShifting = true;
 
-                if (vm.CostBearer != null)
-                {
-                    vm.ApprovalPeriodList.NewVM.ServiceUnitName = vm.CostBearer.ServiceUnitName;
-                }
+            if (vm.CostBearer != null)
+            {
+                vm.ApprovalPeriodList.NewVM.ServiceUnitName = vm.CostBearer.ServiceUnitName;
+            }
 
             //}
 
@@ -665,8 +665,6 @@ namespace BeWo.View.Detail
             popup_costbearer.IsOpen = true;
         }
 
-        
-        
         private void Button_AddTask_Click(object sender, RoutedEventArgs e)
         {
             if (ValidationTrigger.Validate(groupbox_newTask) && ViewModel.DataContract.SupportConceptOid.HasValue)
@@ -679,7 +677,7 @@ namespace BeWo.View.Detail
                         ViewModel.Tasks.NewVM.IsTask = true;
                         ViewModel.Tasks.NewVM.AllDay = true;
 
-                        if(ViewModel.Tasks.NewVM.DueDate == null)
+                        if (ViewModel.Tasks.NewVM.DueDate == null)
                         {
                             ViewModel.Tasks.NewVM.Start = DateTime.Today;
                             ViewModel.Tasks.NewVM.End = new DateTime(9999, 12, 31, 0, 0, 0);
@@ -703,12 +701,12 @@ namespace BeWo.View.Detail
         }
 
         private readonly List<SchedulerAppointmentDC> _DeletedTasks = new List<SchedulerAppointmentDC>();
-        
+
         private void Button_RemoveTask_Click(object sender, RoutedEventArgs e)
         {
             var test = grid_tasks.GetCurrentValue<SchedulerAppointmentVM>();
 
-            if(test.DataContract?.SchedulerAppointmentOid != null)
+            if (test.DataContract?.SchedulerAppointmentOid != null)
             {
                 _DeletedTasks.AddIfNotIn(test.CommitToDataContract());
             }
@@ -724,7 +722,7 @@ namespace BeWo.View.Detail
             if (data?.RowHandle != null)
             {
                 var vm = grid_tasks.GetRow(data.RowHandle.Value) as SchedulerAppointmentVM;
-                
+
                 vm?.EmployeeList.Remove((Employee2SchedulerAppointmentDC)((Button)sender).Tag);
             }
         }
@@ -734,7 +732,6 @@ namespace BeWo.View.Detail
             ViewModel.Tasks.NewVM.EmployeeList.Remove((Employee2SchedulerAppointmentDC)((Button)sender).Tag);
         }
 
-
         private void personsearchview_CostBearerContactPersonSelected(object sender, EventArgs<CompactPersonDC> e)
         {
             popup_person.IsOpen = false;
@@ -960,16 +957,16 @@ namespace BeWo.View.Detail
                 var twi = e.OriginalSource as MenuItem;
 
                 var selectedItem = treeview_Goals.SelectedItem as SupportConceptGoalTreeItem;
-                
+
                 if (twi.Header.Equals("Neues individuelles Ziel") || twi.Header.Equals("Neue individuelle Maßnahme"))
                 {
-					if (_SelectedGoalTreeNode != null)
-					{
-						_SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged += GoalTreeItemContainerGenerator_StatusChanged;
+                    if (_SelectedGoalTreeNode != null)
+                    {
+                        _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged += GoalTreeItemContainerGenerator_StatusChanged;
 
                         ViewModel.AddZielOrMassnahme(selectedItem, twi.Header.Equals("Neues individuelles Ziel"));
-					}
-	                //EditItem(selectedItem);
+                    }
+                    //EditItem(selectedItem);
                     //if (this._SelectedTreeNode != null)
                     //{
                     //    this._SelectedTreeNode.ItemContainerGenerator.StatusChanged +=
@@ -1014,12 +1011,12 @@ namespace BeWo.View.Detail
 
                 if (treeItem != null)
                 {
-                    var textBox             = BeWoWpfUtils.FindVisualChild<TextBox>(treeItem);
-                    textBox.IsReadOnly      = false;
-                    textBox.Padding         = new Thickness(1, 1, 1, 1);
+                    var textBox = BeWoWpfUtils.FindVisualChild<TextBox>(treeItem);
+                    textBox.IsReadOnly = false;
+                    textBox.Padding = new Thickness(1, 1, 1, 1);
                     textBox.BorderThickness = new Thickness(1);
-                    textBox.Background      = Brushes.White;
-                    textBox.Tag             = tv.SelectedItem;
+                    textBox.Background = Brushes.White;
+                    textBox.Tag = tv.SelectedItem;
 
                     textBox.Focus();
                     textBox.SelectAll();
@@ -1094,7 +1091,7 @@ namespace BeWo.View.Detail
                 Cache.GetInstance().GetServiceCategoryDescriptionDict(
                     cb => cbo.Dispatch(delegate
                     {
-                        cbo.ItemsSource = cb.Keys.Where(cat => cat.ScopeType == ScopeTypeId.Global).ToList();        
+                        cbo.ItemsSource = cb.Keys.Where(cat => cat.ScopeType == ScopeTypeId.Global).ToList();
                     }));
             }
         }
@@ -1102,7 +1099,7 @@ namespace BeWo.View.Detail
         private void ButtonInfo_OnClick(object sender, RoutedEventArgs e)
         {
             var btn = sender as Button;
-            var bc  = btn.TemplatedParent as ButtonContainer;
+            var bc = btn.TemplatedParent as ButtonContainer;
 
             if (bc != null)
             {
@@ -1130,7 +1127,7 @@ namespace BeWo.View.Detail
 
             VMFactory.CreateEmployeeVMAsync(ViewModel.Originator.EmployeeOid,
                 cb => this.Dispatch(
-                    () => BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, SupportConceptView>(cb, this, 
+                    () => BeWoUtils.OpenModalViewWindow<EmployeeVM, EmployeeDC, SupportConceptView>(cb, this,
                     () => this.Dispatch(() => BeWoUtils.UpdateAllViews(ViewModel.Originator)))));
         }
 
@@ -1144,7 +1141,7 @@ namespace BeWo.View.Detail
 
             VMFactory.CreateCustomerVMAsync(ViewModel.Customer.CustomerOid,
                 cb => this.Dispatch(
-                    () => BeWoUtils.OpenModalViewWindow<CustomerVM, CustomerDC, SupportConceptView>(cb, this, 
+                    () => BeWoUtils.OpenModalViewWindow<CustomerVM, CustomerDC, SupportConceptView>(cb, this,
                     () => this.Dispatch(() => BeWoUtils.UpdateAllViews(ViewModel.Customer)))));
         }
 
@@ -1159,7 +1156,7 @@ namespace BeWo.View.Detail
 
             VMFactory.CreatePersonVMAsync(contactPerson.PersonOid,
                 cb => this.Dispatch(
-                    () => BeWoUtils.OpenModalViewWindow<PersonVM, PersonDC, SupportConceptView>(cb, this, 
+                    () => BeWoUtils.OpenModalViewWindow<PersonVM, PersonDC, SupportConceptView>(cb, this,
                     () => this.Dispatch(() => BeWoUtils.UpdateAllViews(contactPerson)), personSavedOrUpdated: _PersonModalPopUp_PersonSavedOrUpdated)));
         }
 
@@ -1180,10 +1177,10 @@ namespace BeWo.View.Detail
 
         private void Control_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            var label       = sender as Label;
+            var label = sender as Label;
             var labelparent = label.Parent as StackPanel;
-            var btn         = labelparent.Children[0] as Button;
-            var Employee    = btn.Tag as CompactEmployeeDC;
+            var btn = labelparent.Children[0] as Button;
+            var Employee = btn.Tag as CompactEmployeeDC;
 
             VMFactory.CreateEmployeeVMAsync(Employee.EmployeeOid,
                 cb => this.Dispatch(
@@ -1191,58 +1188,58 @@ namespace BeWo.View.Detail
                     () => this.Dispatch(() => BeWoUtils.UpdateAllViews(Employee)))));
         }
 
-		private void ListItemGrid_OnLoaded(object sender, RoutedEventArgs e)
-		{
-			var grid = sender as Grid;
+        private void ListItemGrid_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            var grid = sender as Grid;
 
-			var vm = grid.DataContext as SupportConceptApprovalPeriodVM;
-		    
-			if (vm != null && !SupportConceptApprovalPeriodVM.ShowContactCountFields)
-			{
-				grid.Children[grid.Children.Count - 2].Visibility = Visibility.Collapsed;
-				grid.Children[grid.Children.Count - 3].Visibility = Visibility.Collapsed;
+            var vm = grid.DataContext as SupportConceptApprovalPeriodVM;
+
+            if (vm != null && !SupportConceptApprovalPeriodVM.ShowContactCountFields)
+            {
+                grid.Children[grid.Children.Count - 2].Visibility = Visibility.Collapsed;
+                grid.Children[grid.Children.Count - 3].Visibility = Visibility.Collapsed;
                 grid.Children[grid.Children.Count - 4].Visibility = Visibility.Collapsed;
-			    grid.Children[grid.Children.Count - 5].Visibility = Visibility.Collapsed;
-			}
-            
-		    var gridControl = new GridControl();
+                grid.Children[grid.Children.Count - 5].Visibility = Visibility.Collapsed;
+            }
+
+            var gridControl = new GridControl();
 
             Grid.SetRow(gridControl, 7);
             Grid.SetColumn(gridControl, 0);
             Grid.SetColumnSpan(gridControl, 6);
 
-		    gridControl.Margin = new Thickness(3d);
+            gridControl.Margin = new Thickness(3d);
 
             var itemsSourceBinding = new Binding("SupportConceptApprovalEmployeeRelations.VMList") { Source = grid.DataContext };
-		    gridControl.SetBinding(DataControlBase.ItemsSourceProperty, itemsSourceBinding);
+            gridControl.SetBinding(DataControlBase.ItemsSourceProperty, itemsSourceBinding);
 
             var gridControlVisibilityBinding = new Binding("SupportConceptApprovalEmployeeRelations.GridVisibility") { UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged, Source = grid.DataContext };
-		    gridControl.SetBinding(VisibilityProperty, gridControlVisibilityBinding);
+            gridControl.SetBinding(VisibilityProperty, gridControlVisibilityBinding);
             gridControl.IsVisibleChanged += GridControl_IsVisibleChanged;
-		    var deleteColumn = new GridColumn {Header = "", FixedWidth = true, Width = 24, ReadOnly = true, CellTemplate = (DataTemplate) Resources["DeleteBtnBetreuungsschluesselDataTemplate"]};
+            var deleteColumn = new GridColumn { Header = "", FixedWidth = true, Width = 24, ReadOnly = true, CellTemplate = (DataTemplate)Resources["DeleteBtnBetreuungsschluesselDataTemplate"] };
 
-		    gridControl.Columns.Add(deleteColumn);
+            gridControl.Columns.Add(deleteColumn);
 
-		    var employeeColumn = new GridColumn {Header = Translator.Translate("Mitarbeiter"), FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250};
+            var employeeColumn = new GridColumn { Header = Translator.Translate("Mitarbeiter"), FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250 };
 
             var allowEditingBetreuungsschluesselColumn = BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.EditAll, UserRightType.Betreuungsschluessel_Edit }) ? DefaultBoolean.True : DefaultBoolean.False;
             var betreuungsschluesselColumn = new GridColumn { Name = "ColumnBSProzent", Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
             //var betreuungsschluesselColumnAbsolut = new GridColumn { Name = "ColumnBSAbsolut", Header = "Betreuung in Minuten", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0" } };
-		    //betreuungsschluesselColumnAbsolut.Visible = false;
+            //betreuungsschluesselColumnAbsolut.Visible = false;
 
             gridControl.Columns.Add(employeeColumn);
             gridControl.Columns.Add(betreuungsschluesselColumn);
             //gridControl.Columns.Add(betreuungsschluesselColumnAbsolut);
 
-            gridControl.View = new TableView {AutoWidth = false, ShowGroupPanel = false, ShowGroupedColumns = false, ShowTotalSummary = false, NavigationStyle = GridViewNavigationStyle.Cell};
+            gridControl.View = new TableView { AutoWidth = false, ShowGroupPanel = false, ShowGroupedColumns = false, ShowTotalSummary = false, NavigationStyle = GridViewNavigationStyle.Cell };
 
 
-		    grid.Children.Add(gridControl);
-		}
+            grid.Children.Add(gridControl);
+        }
 
         private void GridControl_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            if ((bool) e.NewValue)
+            if ((bool)e.NewValue)
             {
                 GridControl gc = sender as GridControl;
 
@@ -1256,7 +1253,7 @@ namespace BeWo.View.Detail
                 if (isAbsolute)
                 {
                     gc.Columns[2].Header = "Betreuung in Minuten";
-                    ((TextEditSettings) gc.Columns[2].EditSettings).Mask = "########0";
+                    ((TextEditSettings)gc.Columns[2].EditSettings).Mask = "########0";
                 }
                 else
                 {
@@ -1267,22 +1264,22 @@ namespace BeWo.View.Detail
         }
 
         private void ChangeCostbearerBtn_Click(object sender, RoutedEventArgs e)
-	    {
-		    supportConceptCostBearerRel2Change = (SupportConceptCostBearerRelVM) ((Button) sender).Tag;
-		    isChangingCostbearer               = true;
+        {
+            supportConceptCostBearerRel2Change = (SupportConceptCostBearerRelVM)((Button)sender).Tag;
+            isChangingCostbearer = true;
 
-			popup_costbearer.IsOpen = true;
-	    }
+            popup_costbearer.IsOpen = true;
+        }
 
-	    private void button_checkAllGoals_Click(object sender, RoutedEventArgs e)
-	    {
-		    CheckAllGoalTreeItems(true);
-	    }
+        private void button_checkAllGoals_Click(object sender, RoutedEventArgs e)
+        {
+            CheckAllGoalTreeItems(true);
+        }
 
-		private void button_uncheckAllGoals_Click(object sender, RoutedEventArgs e)
-		{
-			CheckAllGoalTreeItems(false);
-		}
+        private void button_uncheckAllGoals_Click(object sender, RoutedEventArgs e)
+        {
+            CheckAllGoalTreeItems(false);
+        }
 
         private void button_aufklappenAllGoals_Click(object sender, RoutedEventArgs e)
         {
@@ -1293,7 +1290,7 @@ namespace BeWo.View.Detail
         {
             SwitchAllGoalTreeItems(false);
         }
-              
+
         private void button_checkAllLeistungen_Click(object sender, RoutedEventArgs e)
         {
             CheckAllLeistungTreeItems(true);
@@ -1325,14 +1322,14 @@ namespace BeWo.View.Detail
         }
 
         private void SwitchAllLeistungTreeItems(bool check)
-        {      
+        {
             Style stylee = new Style
             {
                 TargetType = typeof(TreeViewItem)
             };
 
-            stylee.Setters.Add(new Setter(TreeViewItem.IsExpandedProperty,check));
-            treeview_serviceAccountings.ItemContainerStyle = stylee; 
+            stylee.Setters.Add(new Setter(TreeViewItem.IsExpandedProperty, check));
+            treeview_serviceAccountings.ItemContainerStyle = stylee;
         }
 
         private void SwitchAllGoalTreeItems(bool check)
@@ -1346,48 +1343,45 @@ namespace BeWo.View.Detail
             treeview_Goals.ItemContainerStyle = stylee;
         }
 
-		private void CheckAllGoalTreeItems(bool check)
-		{
-			var allItems = treeview_Goals.ItemsSource as IList<SupportConceptGoalTreeItem>;
+        private void CheckAllGoalTreeItems(bool check)
+        {
+            var allItems = treeview_Goals.ItemsSource as IList<SupportConceptGoalTreeItem>;
 
-			foreach (var item in allItems)
-			{
-				item.IsChecked = check;
-			}
-		}
-
-
-        
+            foreach (var item in allItems)
+            {
+                item.IsChecked = check;
+            }
+        }
 
         private void button_openAddBetreuungsschluessel_Click(object sender, RoutedEventArgs e)
         {
             popup_newBetreuungsschluessel.IsOpen = true;
 
-            var btn                  = (Button) sender;
-            var grid                 = (Grid) btn.Parent;
-            var border               = (Border) grid.Parent;
-            var contentPresenter     = (ContentPresenter) border.TemplatedParent;
+            var btn = (Button)sender;
+            var grid = (Grid)btn.Parent;
+            var border = (Border)grid.Parent;
+            var contentPresenter = (ContentPresenter)border.TemplatedParent;
             SelectedApprovalPeriodVM = (SupportConceptApprovalPeriodVM)contentPresenter.Content;
 
-			if (SelectedApprovalPeriodVM != null)
-			{
-			    bool isabsolute = false;
+            if (SelectedApprovalPeriodVM != null)
+            {
+                bool isabsolute = false;
 
-			    if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Count == 0)
-			    {
-			        RadioAbsolPro.Visibility = Visibility.Visible;
-			        RadioProzent.IsChecked = true;
-			        SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100;
+                if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Count == 0)
+                {
+                    RadioAbsolPro.Visibility = Visibility.Visible;
+                    RadioProzent.IsChecked = true;
+                    SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100;
 
-			    }
-			    else 
-			    {
+                }
+                else
+                {
                     RadioAbsolPro.Visibility = Visibility.Collapsed;
-                    
+
                     if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Last().IsAbsolut)
                     {
                         isabsolute = true;
-                        
+
 
                         SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = true;
 
@@ -1399,21 +1393,21 @@ namespace BeWo.View.Detail
                         {
                             max = SelectedApprovalPeriodVM.ApprovedBEPerInterval.Value * 60;
                             editAbsolut.MaxValue = max;
-			            }
-			            
+                        }
 
-			            var alt =
-			                SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(
-			                    s => s.Betreuungsschluessel);
 
-			            if (alt > max)
-			                alt = max;
+                        var alt =
+                            SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(
+                                s => s.Betreuungsschluessel);
+
+                        if (alt > max)
+                            alt = max;
 
                         SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = (int)(max - alt);
 
-			        }
-			        else
-			        {
+                    }
+                    else
+                    {
                         SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
 
                         var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
@@ -1421,26 +1415,26 @@ namespace BeWo.View.Detail
                         if (alt > 100)
                             alt = 100;
                         SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100 - alt;
-			        }
-			    }
-			    if (isabsolute)
-			    {
-			        LabelProzentual.Visibility = Visibility.Collapsed;
-			        LabelAbsolut.Visibility = Visibility.Visible;
+                    }
+                }
+                if (isabsolute)
+                {
+                    LabelProzentual.Visibility = Visibility.Collapsed;
+                    LabelAbsolut.Visibility = Visibility.Visible;
 
-			        editProzentual.Visibility = Visibility.Collapsed;
-			        editAbsolut.Visibility = Visibility.Visible;
+                    editProzentual.Visibility = Visibility.Collapsed;
+                    editAbsolut.Visibility = Visibility.Visible;
 
-			    }
-			    else
-			    {
-			        LabelProzentual.Visibility = Visibility.Visible;
-			        LabelAbsolut.Visibility = Visibility.Collapsed;
+                }
+                else
+                {
+                    LabelProzentual.Visibility = Visibility.Visible;
+                    LabelAbsolut.Visibility = Visibility.Collapsed;
 
-			        editProzentual.Visibility = Visibility.Visible;
-			        editAbsolut.Visibility = Visibility.Collapsed;
-			    }
-			}
+                    editProzentual.Visibility = Visibility.Visible;
+                    editAbsolut.Visibility = Visibility.Collapsed;
+                }
+            }
         }
 
         private void button_addBetreuungsschluessel_Click(object sender, RoutedEventArgs e)
@@ -1470,9 +1464,9 @@ namespace BeWo.View.Detail
                     {
                         MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
                         return;
-                    }    
+                    }
                 }
-                
+
 
                 SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.AddNewVMToList();
             }
@@ -1496,8 +1490,8 @@ namespace BeWo.View.Detail
 
         private void Popupedit_betreuungsschluessel_OnPreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) || 
-                SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Employee == null || 
+            if (!BeWoUtils.CheckPopupEditClickableSpace((PopUpEdit)sender, e) ||
+                SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Employee == null ||
                 !BeWoApp.LoggedOnUser.HasRight(UserRightType.EmployeeView_View))
             {
                 return;
@@ -1534,8 +1528,8 @@ namespace BeWo.View.Detail
 
         private void DeleteBetreuungsschluesselButton_Click(object sender, RoutedEventArgs e)
         {
-            var btn = (Button) sender;
-            var currentObject = (SupportConceptApprovalPeriodEmployeeRelVM) ((EditGridCellData) btn.Tag).RowData.Row;
+            var btn = (Button)sender;
+            var currentObject = (SupportConceptApprovalPeriodEmployeeRelVM)((EditGridCellData)btn.Tag).RowData.Row;
 
             var supportConceptCostBearerRel = ViewModel.CostBearerRelations.VMList.FirstOrDefault(f => f.ApprovalPeriodList.VMList.Any(a => a.SupportConceptApprovalEmployeeRelations.VMList.Contains(currentObject)));
             var approvalPeriod = supportConceptCostBearerRel.ApprovalPeriodList.VMList.FirstOrDefault(f => f.SupportConceptApprovalEmployeeRelations.VMList.Contains(currentObject));
@@ -1560,17 +1554,13 @@ namespace BeWo.View.Detail
         {
             var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
 
-            var actual = SelectedApprovalPeriodVM;
-            if (actual == null)
-            {
-                actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
-            }
-            
+            var actual = SelectedApprovalPeriodVM ?? cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
+
 
             if (actual.ApprovedBEPerInterval.HasValue)
             {
                 editAbsolut.MaxValue = actual.ApprovedBEPerInterval * 60;
-                
+
             }
 
             SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = editAbsolut.MaxValue ?? 0;
@@ -1585,7 +1575,7 @@ namespace BeWo.View.Detail
 
         private void Tabitem_tasks_OnSelected(object sender, RoutedEventArgs e)
         {
-            if(ViewModel.IsNew)
+            if (ViewModel.IsNew)
             {
                 tabitem_grid_tasks.Visibility = Visibility.Collapsed;
 
@@ -1595,13 +1585,29 @@ namespace BeWo.View.Detail
 
             tabitem_grid_tasks.Visibility = Visibility.Visible;
         }
+
+        private void RadioButton_Checked(object sender, RoutedEventArgs e)
+        {
+            var check = (RadioButton)sender;
+            var selected = (SupportConceptApprovalPeriodVM)check.Tag;
+            
+            switch (check.Name)
+            {
+                case "RadioButtonBudget":
+                    selected.Bewilligungsart = Bewilligungsart.Budget;
+                    break;
+                case "RadioButtonDirekt":
+                    selected.Bewilligungsart = Bewilligungsart.Direkt;
+                    break;
+            }
+        }
     }
 
     public class ValueListEntryTypeToColorConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var type = (ValueListEntryType) value;
+            var type = (ValueListEntryType)value;
 
             if (type.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType) || type.Equals(ValueListEntryType.SupportConceptIndividualGoalType))
             {
diff --git a/BeWo/ViewModel/ListViewModel/SupportConceptApprovalPeriodListVM.cs b/BeWo/ViewModel/ListViewModel/SupportConceptApprovalPeriodListVM.cs
index 5ff592bdf..8651df0bd 100644
--- a/BeWo/ViewModel/ListViewModel/SupportConceptApprovalPeriodListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/SupportConceptApprovalPeriodListVM.cs
@@ -1,15 +1,27 @@
 using System.Collections.Generic;
-
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 
 namespace BeWo.ViewModel.ListViewModel
 {
     public class SupportConceptApprovalPeriodListVM : AbstractDCListMapperVM<SupportConceptApprovalPeriodDC, SupportConceptApprovalPeriodVM>
     {
+        private ObservableSortCollection<BudgetDC> _Budgets;
         #region Constructors and Destructors
 
-        public SupportConceptApprovalPeriodListVM(List<SupportConceptApprovalPeriodDC> pDCs) : base(pDCs) {}
+        public SupportConceptApprovalPeriodListVM(List<SupportConceptApprovalPeriodDC> pDCs, ObservableSortCollection<BudgetDC> budgets) : base(pDCs)
+        {
+            _Budgets = budgets;
+        }
 
+        protected override SupportConceptApprovalPeriodVM CreateVM(SupportConceptApprovalPeriodDC pDC)
+        {
+            var vm = base.CreateVM(pDC);
+
+            vm.Budgets = _Budgets;
+
+            return vm;
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/BeWo/ViewModel/ListViewModel/SupportConceptCostBearerRelListVM.cs b/BeWo/ViewModel/ListViewModel/SupportConceptCostBearerRelListVM.cs
index ded0f3688..85eba2dd0 100644
--- a/BeWo/ViewModel/ListViewModel/SupportConceptCostBearerRelListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/SupportConceptCostBearerRelListVM.cs
@@ -1,13 +1,25 @@
 using System.Collections.Generic;
-
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 
 namespace BeWo.ViewModel.ListViewModel
 {
     public class SupportConceptCostBearerRelListVM : AbstractDCListMapperVM<SupportConceptCostBearerRelDC, SupportConceptCostBearerRelVM>
     {
-        public SupportConceptCostBearerRelListVM(IEnumerable<SupportConceptCostBearerRelDC> pList) : base(pList)
+        private ObservableSortCollection<BudgetDC> _Budgets;
+
+        public SupportConceptCostBearerRelListVM(IEnumerable<SupportConceptCostBearerRelDC> pList, ObservableSortCollection<BudgetDC> budgets) : base(pList)
         {
+            _Budgets = budgets;
+        }
+
+        protected override SupportConceptCostBearerRelVM CreateVM(SupportConceptCostBearerRelDC pDC)
+        {
+            var vm = base.CreateVM(pDC);
+
+            vm.Budgets = _Budgets;
+
+            return vm;
         }
     }
 }
\ No newline at end of file
diff --git a/BeWo/ViewModel/SupportConceptApprovalPeriodVM.cs b/BeWo/ViewModel/SupportConceptApprovalPeriodVM.cs
index ee5ca7a2a..a352a6323 100644
--- a/BeWo/ViewModel/SupportConceptApprovalPeriodVM.cs
+++ b/BeWo/ViewModel/SupportConceptApprovalPeriodVM.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using BeWo.ViewModel.ListViewModel;
 
 using BS.Shared;
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 
 namespace BeWo.ViewModel
@@ -12,45 +13,50 @@ namespace BeWo.ViewModel
     {
         #region Constants and Fields
 
-        public static string PropertyName_ApprovedBEInterval                      = "ApprovedBEInterval";
-        public static string PropertyName_ApprovedBEPerInterval                   = "ApprovedBEPerInterval";
-		public static string PropertyName_ContactCountInterval                    = "ContactCountInterval";
-		public static string PropertyName_ContactCountPerInterval                 = "ContactCountPerInterval";
-        public static string PropertyName_ApprovedBETotal                         = "ApprovedBETotal";
-        public static string PropertyName_ApprovedFixedAmount                     = "ApprovedFixedAmount";
-        public static string PropertyName_ApprovedFixedAmountInterval             = "ApprovedFixedAmountInterval";
-        public static string PropertyName_EndDate                                 = "EndDate";
-        public static string PropertyName_IsApprovedBEShifting                    = "IsApprovedBEShifting";
-        public static string PropertyName_IsApprovedFixedAmountShifting           = "IsApprovedFixedAmountShifting";
-        public static string PropertyName_MonthlyPayment                          = "MonthlyPayment";
-        public static string PropertyName_ServiceUnitName                         = "ServiceUnitName";
-        public static string PropertyName_StartDate                               = "StartDate";
-        public static string PropertyName_Percentage                              = "Percentage";
-        public static string PropertyName_ServiceCategory                         = "ServiceCategory";
+        public static string PropertyName_ApprovedBEInterval = "ApprovedBEInterval";
+        public static string PropertyName_ApprovedBEPerInterval = "ApprovedBEPerInterval";
+        public static string PropertyName_ContactCountInterval = "ContactCountInterval";
+        public static string PropertyName_ContactCountPerInterval = "ContactCountPerInterval";
+        public static string PropertyName_ApprovedBETotal = "ApprovedBETotal";
+        public static string PropertyName_ApprovedFixedAmount = "ApprovedFixedAmount";
+        public static string PropertyName_ApprovedFixedAmountInterval = "ApprovedFixedAmountInterval";
+        public static string PropertyName_EndDate = "EndDate";
+        public static string PropertyName_IsApprovedBEShifting = "IsApprovedBEShifting";
+        public static string PropertyName_IsApprovedFixedAmountShifting = "IsApprovedFixedAmountShifting";
+        public static string PropertyName_MonthlyPayment = "MonthlyPayment";
+        public static string PropertyName_ServiceUnitName = "ServiceUnitName";
+        public static string PropertyName_StartDate = "StartDate";
+        public static string PropertyName_Percentage = "Percentage";
+        public static string PropertyName_ServiceCategory = "ServiceCategory";
         public static string PropertyName_SupportConceptApprovalEmployeeRelations = "SupportConceptApprovalEmployeeRelations";
 
-        private SupportConceptApprovalInterval?               _ApprovedBEInterval;
-        private decimal?                                      _ApprovedBEPerInterval;
-        private SupportConceptApprovalInterval?               _ContactCountInterval;
-        private decimal?                                      _ContactCountPerInterval;
-        private decimal?                                      _ApprovedBETotal;
-        private decimal?                                      _ApprovedFixedAmount;
-        private SupportConceptApprovalInterval?               _ApprovedFixedAmountInterval;
-        private DateTime?                                     _EndDate;
-        private bool                                          _IsApprovedBEShifting;
-        private bool                                          _IsApprovedFixedAmountShifting;
-        private decimal?                                      _MonthlyPayment;
-        private string                                        _ServiceUnitName;
-        private DateTime?                                     _StartDate;
-        private decimal?                                      _Percentage;
-        private ServiceCategoryDC                             _ServiceCategory;
+        private SupportConceptApprovalInterval? _ApprovedBEInterval;
+        private decimal? _ApprovedBEPerInterval;
+        private SupportConceptApprovalInterval? _ContactCountInterval;
+        private decimal? _ContactCountPerInterval;
+        private decimal? _ApprovedBETotal;
+        private decimal? _ApprovedFixedAmount;
+        private SupportConceptApprovalInterval? _ApprovedFixedAmountInterval;
+        private DateTime? _EndDate;
+        private bool _IsApprovedBEShifting;
+        private bool _IsApprovedFixedAmountShifting;
+        private decimal? _MonthlyPayment;
+        private string _ServiceUnitName;
+        private DateTime? _StartDate;
+        private decimal? _Percentage;
+        private ServiceCategoryDC _ServiceCategory;
         private SupportConceptApprovalPeriodEmployeeRelListVM _SupportConceptApprovalEmployeeRelations;
-
+        private BudgetDC _BudgetDC;
+        private Bewilligungsart _Bewilligungsart;
+        private ObservableSortCollection<BudgetDC> _Budgets;
         #endregion
 
         #region Constructors and Destructors
 
-        public SupportConceptApprovalPeriodVM(SupportConceptApprovalPeriodDC pdc) : base(pdc, !pdc.SupportConceptApprovalPeriodOid.HasValue) {}
+        public SupportConceptApprovalPeriodVM(SupportConceptApprovalPeriodDC pdc) : base(pdc, !pdc.SupportConceptApprovalPeriodOid.HasValue)
+        {
+
+        }
 
         #endregion
 
@@ -92,41 +98,41 @@ namespace BeWo.ViewModel
             }
         }
 
-		public SupportConceptApprovalInterval? ContactCountInterval
-		{
-			get
-			{
-				return this._ContactCountInterval;
-			}
+        public SupportConceptApprovalInterval? ContactCountInterval
+        {
+            get
+            {
+                return this._ContactCountInterval;
+            }
 
-			set
-			{
-				if (this.AreDifferent(this._ContactCountInterval, value))
-				{
-					this._ContactCountInterval = value;
-					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ContactCountInterval, value), PropertyName_ContactCountInterval);
-					this.FirePropertyChanged(PropertyName_ContactCountInterval);
-				}
-			}
-		}
+            set
+            {
+                if (this.AreDifferent(this._ContactCountInterval, value))
+                {
+                    this._ContactCountInterval = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ContactCountInterval, value), PropertyName_ContactCountInterval);
+                    this.FirePropertyChanged(PropertyName_ContactCountInterval);
+                }
+            }
+        }
 
-		public decimal? ContactCountPerInterval
-		{
-			get
-			{
-				return this._ContactCountPerInterval;
-			}
+        public decimal? ContactCountPerInterval
+        {
+            get
+            {
+                return this._ContactCountPerInterval;
+            }
 
-			set
-			{
-				if (this.AreDifferent(this._ContactCountPerInterval, value))
-				{
-					this._ContactCountPerInterval = value;
-					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ContactCountPerInterval, value), PropertyName_ContactCountPerInterval);
-					this.FirePropertyChanged(PropertyName_ContactCountPerInterval);
-				}
-			}
-		}
+            set
+            {
+                if (this.AreDifferent(this._ContactCountPerInterval, value))
+                {
+                    this._ContactCountPerInterval = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ContactCountPerInterval, value), PropertyName_ContactCountPerInterval);
+                    this.FirePropertyChanged(PropertyName_ContactCountPerInterval);
+                }
+            }
+        }
 
         public decimal? ApprovedBETotal
         {
@@ -330,13 +336,13 @@ namespace BeWo.ViewModel
             }
         }
 
-		public static bool ShowContactCountFields
-		{
-			get
-			{
-				return BeWoApp.Mandator.BeWoClientType == 11;
-			}
-		}
+        public static bool ShowContactCountFields
+        {
+            get
+            {
+                return BeWoApp.Mandator.BeWoClientType == 11;
+            }
+        }
 
         public SupportConceptApprovalPeriodEmployeeRelListVM SupportConceptApprovalEmployeeRelations
         {
@@ -349,51 +355,103 @@ namespace BeWo.ViewModel
             }
         }
 
+        public BudgetDC BudgetDC
+        {
+            get { return _BudgetDC; }
+
+            set
+            {
+                if (this.AreDifferent(this._BudgetDC, value))
+                {
+                    this._BudgetDC = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BudgetDC, value), nameof(BudgetDC));
+                    this.FirePropertyChanged(nameof(BudgetDC));
+                }
+            }
+        }
+
+        public Bewilligungsart Bewilligungsart
+        {
+            get { return _Bewilligungsart; }
+
+            set
+            {
+                if (this.AreDifferent(this._Bewilligungsart, value))
+                {
+                    this._Bewilligungsart = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Bewilligungsart, value), nameof(Bewilligungsart));
+                    this.FirePropertyChanged(nameof(Bewilligungsart));
+                    FirePropertyChanged(nameof(IsBudget));
+                    FirePropertyChanged(nameof(IsDirekt));
+                }
+            }
+        }
+
+        public bool IsBudget
+        {
+            get
+            {
+                bool b = Bewilligungsart == Bewilligungsart.Budget;
+                return b;
+            }
+        }
+
+        public bool IsDirekt
+        {
+            get { return Bewilligungsart == Bewilligungsart.Direkt; }
+        }
+
         public override bool IsDirty
         {
             get { return base.IsDirty || SupportConceptApprovalEmployeeRelations.IsDirty; }
         }
 
+        public ObservableSortCollection<BudgetDC> Budgets { get; internal set; }
+
         #endregion
 
         #region Methods
 
         protected override void InitByDataContract(SupportConceptApprovalPeriodDC pDataContract)
         {
-            _ApprovedBEInterval            = pDataContract.ApprovedBEInterval;
-            _ApprovedBETotal               = pDataContract.ApprovedBETotal;
-            _ApprovedBEPerInterval         = pDataContract.ApprovedBEPerInterval;
-            _ContactCountInterval          = pDataContract.ContactCountInterval;
-            _ContactCountPerInterval       = pDataContract.ContactCountPerInterval;
-            _ApprovedFixedAmount           = pDataContract.ApprovedFixedAmount;
-            _ApprovedFixedAmountInterval   = pDataContract.ApprovedFixedAmountInterval;
-            _EndDate                       = pDataContract.EndDate;
-            _IsApprovedBEShifting          = pDataContract.IsApprovedBEShifting;
+            _ApprovedBEInterval = pDataContract.ApprovedBEInterval;
+            _ApprovedBETotal = pDataContract.ApprovedBETotal;
+            _ApprovedBEPerInterval = pDataContract.ApprovedBEPerInterval;
+            _ContactCountInterval = pDataContract.ContactCountInterval;
+            _ContactCountPerInterval = pDataContract.ContactCountPerInterval;
+            _ApprovedFixedAmount = pDataContract.ApprovedFixedAmount;
+            _ApprovedFixedAmountInterval = pDataContract.ApprovedFixedAmountInterval;
+            _EndDate = pDataContract.EndDate;
+            _IsApprovedBEShifting = pDataContract.IsApprovedBEShifting;
             _IsApprovedFixedAmountShifting = pDataContract.IsApprovedFixedAmountShifting;
-            _MonthlyPayment                = pDataContract.MonthlyPayment;
-            _StartDate                     = pDataContract.StartDate;
-            _Percentage                    = pDataContract.Percentage;
-            _ServiceCategory               = pDataContract.ServiceCategory;
+            _MonthlyPayment = pDataContract.MonthlyPayment;
+            _StartDate = pDataContract.StartDate;
+            _Percentage = pDataContract.Percentage;
+            _ServiceCategory = pDataContract.ServiceCategory;
+            _BudgetDC = pDataContract.BudgetDC;
+            _Bewilligungsart = pDataContract.Bewilligungsart;
 
             SupportConceptApprovalEmployeeRelations = VMFactory.CreateSupportConceptApprovalPeriodEmployeeRelListVM(pDataContract.SupportConceptApprovalPeriodEmployeeRelations ?? (pDataContract.SupportConceptApprovalPeriodEmployeeRelations = new List<SupportConceptApprovalPeriodEmployeeRelDC>()));
         }
 
         protected override SupportConceptApprovalPeriodDC MapToDataContract(SupportConceptApprovalPeriodDC pDataContract, bool doCommit)
         {
-            pDataContract.ApprovedBEInterval            = _ApprovedBEInterval;
-            pDataContract.ApprovedBETotal               = _ApprovedBETotal;
-            pDataContract.ApprovedBEPerInterval         = _ApprovedBEPerInterval;
-            pDataContract.ContactCountInterval          = _ContactCountInterval;
-            pDataContract.ContactCountPerInterval       = _ContactCountPerInterval;
-            pDataContract.ApprovedFixedAmount           = _ApprovedFixedAmount;
-            pDataContract.ApprovedFixedAmountInterval   = _ApprovedFixedAmountInterval;
-            pDataContract.EndDate                       = _EndDate;
-            pDataContract.IsApprovedBEShifting          = _IsApprovedBEShifting;
+            pDataContract.ApprovedBEInterval = _ApprovedBEInterval;
+            pDataContract.ApprovedBETotal = _ApprovedBETotal;
+            pDataContract.ApprovedBEPerInterval = _ApprovedBEPerInterval;
+            pDataContract.ContactCountInterval = _ContactCountInterval;
+            pDataContract.ContactCountPerInterval = _ContactCountPerInterval;
+            pDataContract.ApprovedFixedAmount = _ApprovedFixedAmount;
+            pDataContract.ApprovedFixedAmountInterval = _ApprovedFixedAmountInterval;
+            pDataContract.EndDate = _EndDate;
+            pDataContract.IsApprovedBEShifting = _IsApprovedBEShifting;
             pDataContract.IsApprovedFixedAmountShifting = _IsApprovedFixedAmountShifting;
-            pDataContract.MonthlyPayment                = _MonthlyPayment;
-            pDataContract.StartDate                     = _StartDate;
-            pDataContract.Percentage                    = _Percentage;
-            pDataContract.ServiceCategory               = _ServiceCategory;
+            pDataContract.MonthlyPayment = _MonthlyPayment;
+            pDataContract.StartDate = _StartDate;
+            pDataContract.Percentage = _Percentage;
+            pDataContract.ServiceCategory = _ServiceCategory;
+            pDataContract.BudgetDC = _BudgetDC;
+            pDataContract.Bewilligungsart = _Bewilligungsart;
 
             pDataContract.SupportConceptApprovalPeriodEmployeeRelations = _SupportConceptApprovalEmployeeRelations.CopyToDCList(doCommit);
 
diff --git a/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs b/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs
index f9d61ad74..06dab8091 100644
--- a/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs
+++ b/BeWo/ViewModel/SupportConceptCostBearerRelVM.cs
@@ -1,10 +1,11 @@
 using System;
-
+using System.Collections.Generic;
 using BeWo.Core;
 using BeWo.Validation;
 using BeWo.ViewModel.ListViewModel;
 
 using BS.Shared;
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
@@ -72,13 +73,17 @@ namespace BeWo.ViewModel
 
         private DateTime? _RequestedStartDate;
 
+        private ObservableSortCollection<BudgetDC> _Budgets;
+        
         #endregion
 
         #region Constructors and Destructors
 
         public SupportConceptCostBearerRelVM(SupportConceptCostBearerRelDC pDC)
             : base(pDC, pDC.CostBearer2SupportConceptOid == null)
-        {}
+        {
+            //_Budgets = budgets;
+        }
 
         #endregion
 
@@ -472,6 +477,20 @@ namespace BeWo.ViewModel
             }
         }
 
+        public ObservableSortCollection<BudgetDC> Budgets
+        {
+            get { return _Budgets; }
+            set
+            {
+                _Budgets = value;
+                foreach (var item in ApprovalPeriodList.VMList)
+                {
+                    item.Budgets = value;
+
+                }
+            }
+        }
+
         #endregion
 
         #region Methods
@@ -540,7 +559,7 @@ namespace BeWo.ViewModel
 
         protected override void InitByDataContract(SupportConceptCostBearerRelDC pDataContract)
         {
-            this.ApprovalPeriodList = new SupportConceptApprovalPeriodListVM(pDataContract.ApprovalPeriodList);
+            this.ApprovalPeriodList = new SupportConceptApprovalPeriodListVM(pDataContract.ApprovalPeriodList, Budgets);
 
             //if (!this.IsNew)
             //{
diff --git a/BeWo/ViewModel/SupportConceptVM.cs b/BeWo/ViewModel/SupportConceptVM.cs
index e1b1c192a..60a42bf3c 100644
--- a/BeWo/ViewModel/SupportConceptVM.cs
+++ b/BeWo/ViewModel/SupportConceptVM.cs
@@ -71,18 +71,26 @@ namespace BeWo.ViewModel
         private List<ValueListEntryDC>                     Children2Delete;
         private List<ValueListEntryDC>                     selectedGoals;
 
+        private ObservableSortCollection<BudgetDC> _Budgets;
+
         public SupportConceptVM(
             SupportConceptDC pDataContract, 
             List<ValueListEntryDC> pAllGoalCategories, 
             List<ValueListEntryDC> pAllGoals, 
-            Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> serviceCategoryDict)
-
-            : base(pDataContract, pDataContract.SupportConceptOid == null)
+            Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> serviceCategoryDict,
+            List<BudgetDC> budgets)
         {
+            IsNew = pDataContract.SupportConceptOid == null;
+            DataContract = pDataContract;
+            _Budgets = budgets.ToObservableSortCollection();
+            InitByDataContract(DataContract);
+
             //InitGoalCategories(pAllGoalCategories, pAllGoals);
             checkedStateChangedGoals = new List<ValueListEntryVM>();
             InitServiceTrees(serviceCategoryDict);
             InitCombinedGoalTree();
+            
+
         }
 
         private void InitCombinedGoalTree()
@@ -893,7 +901,7 @@ namespace BeWo.ViewModel
                 }
             });
 
-            VMFactory.CreateSupportConceptCostBearerRelVMAsync(pDataContract.CostBearerRelations ?? (pDataContract.CostBearerRelations = new List<SupportConceptCostBearerRelDC>()), cb => _CostBearerRelations = cb);
+            VMFactory.CreateSupportConceptCostBearerRelVMAsync(pDataContract.CostBearerRelations ?? (pDataContract.CostBearerRelations = new List<SupportConceptCostBearerRelDC>()), _Budgets, cb => _CostBearerRelations = cb);
 
             _VarFields = new VarFieldListVM(pDataContract.VarFields);
         }
diff --git a/BeWo/ViewModel/VMFactory.cs b/BeWo/ViewModel/VMFactory.cs
index 4902a7753..77eab7597 100644
--- a/BeWo/ViewModel/VMFactory.cs
+++ b/BeWo/ViewModel/VMFactory.cs
@@ -561,9 +561,9 @@ namespace BeWo.ViewModel
             ServiceFacade.DoOperationsServiceAsync(s => s.GenerateInitialSettlementDC(pSupportConcept2CostBearerOid), r => pCallBack(new SettlementVM(r)));
         }
 
-        public static void CreateSupportConceptCostBearerRelVMAsync(List<SupportConceptCostBearerRelDC> pList, Action<SupportConceptCostBearerRelListVM> pCallBack)
+        public static void CreateSupportConceptCostBearerRelVMAsync(List<SupportConceptCostBearerRelDC> pList, ObservableSortCollection<BudgetDC> budgets, Action<SupportConceptCostBearerRelListVM> pCallBack)
         {
-            pCallBack(new SupportConceptCostBearerRelListVM(pList));
+            pCallBack(new SupportConceptCostBearerRelListVM(pList, budgets));
         }
 
         public static void CreateSupportConceptGoalListVMAsync(ValueListEntryType pType, ValueListEntryType pParentType, Action<SupportConceptGoalListVM> pCallBack)
@@ -589,16 +589,17 @@ namespace BeWo.ViewModel
 				r1 => Cache.GetInstance().GetAllValueListEntrysByTypeAsync(
                     ValueListEntryType.SupportConceptGoalType, 
                     r2 => Cache.GetInstance().GetServiceCategoryDescriptionDict(
-                        dict =>
-                        {
-                            var vm = new SupportConceptVM(dc, r1, r2, dict);
-                            if (initOriginator)
+                        dict => ServiceFacade.DoOperationsServiceAsync(s => s.GetAllBudgets(),
+                            r3 =>
                             {
-                                vm.Originator = BeWoApp.LoggedOnUser.Employee;
-                            }
+                                var vm = new SupportConceptVM(dc, r1, r2, dict, r3);
+                                if (initOriginator)
+                                {
+                                    vm.Originator = BeWoApp.LoggedOnUser.Employee;
+                                }
 
-                            pCallBack(vm);
-                        })));
+                                pCallBack(vm);
+                            }))));
         }
 
         public static void CreateTeamVMAsync(Action<TeamVM> pCallBack)
diff --git a/Data/Entities/SupportConceptApprovalPeriod.cs b/Data/Entities/SupportConceptApprovalPeriod.cs
index 6efbdb9ca..8300ea99b 100644
--- a/Data/Entities/SupportConceptApprovalPeriod.cs
+++ b/Data/Entities/SupportConceptApprovalPeriod.cs
@@ -7,19 +7,19 @@ namespace BeWo.Data.Entities
 {
     public class SupportConceptApprovalPeriod : BeWoEntityBase
     {
-        public static string PropertyName_ApprovedBEInterval            = "ApprovedBEInterval";
-        public static string PropertyName_ApprovedBEPerInterval         = "ApprovedBEPerInterval";
-        public static string PropertyName_ContactCountInterval          = "ContactCountInterval";
-        public static string PropertyName_ContactCountPerInterval       = "ContactCountPerInterval";
-        public static string PropertyName_ApprovedBETotal               = "ApprovedBETotal";
-        public static string PropertyName_ApprovedFixedAmount           = "ApprovedFixedAmount";
-        public static string PropertyName_ApprovedFixedAmountInterval   = "ApprovedFixedAmountInterval";
-        public static string PropertyName_CostBearer2SupportConcept     = "CostBearer2SupportConcept";
-        public static string PropertyName_EndDate                       = "EndDate";
-        public static string PropertyName_IsApprovedBEShifting          = "IsApprovedBEShifting";
+        public static string PropertyName_ApprovedBEInterval = "ApprovedBEInterval";
+        public static string PropertyName_ApprovedBEPerInterval = "ApprovedBEPerInterval";
+        public static string PropertyName_ContactCountInterval = "ContactCountInterval";
+        public static string PropertyName_ContactCountPerInterval = "ContactCountPerInterval";
+        public static string PropertyName_ApprovedBETotal = "ApprovedBETotal";
+        public static string PropertyName_ApprovedFixedAmount = "ApprovedFixedAmount";
+        public static string PropertyName_ApprovedFixedAmountInterval = "ApprovedFixedAmountInterval";
+        public static string PropertyName_CostBearer2SupportConcept = "CostBearer2SupportConcept";
+        public static string PropertyName_EndDate = "EndDate";
+        public static string PropertyName_IsApprovedBEShifting = "IsApprovedBEShifting";
         public static string PropertyName_IsApprovedFixedAmountShifting = "IsApprovedFixedAmountShifting";
-        public static string PropertyName_MonthlyPayment                = "MonthlyPayment";
-        public static string PropertyName_StartDate                     = "StartDate";
+        public static string PropertyName_MonthlyPayment = "MonthlyPayment";
+        public static string PropertyName_StartDate = "StartDate";
 
         private IList<SupportConceptApprovalPeriod2Employee> _SupportConceptApprovalPeriod2Employee;
 
@@ -27,9 +27,9 @@ namespace BeWo.Data.Entities
 
         private decimal? _ApprovedBEPerInterval;
 
-		private SupportConceptApprovalInterval? _ContactCountInterval;
+        private SupportConceptApprovalInterval? _ContactCountInterval;
 
-		private decimal? _ContactCountPerInterval;
+        private decimal? _ContactCountPerInterval;
 
         private decimal? _ApprovedBETotal;
 
@@ -49,6 +49,11 @@ namespace BeWo.Data.Entities
 
         private DateTime? _StartDate;
 
+        private Budget _Budget;
+
+        private Bewilligungsart _Bewilligungsart;
+
+
         public SupportConceptApprovalPeriod()
         {
             this._Tid = TableID.SupportConceptApprovalPeriod;
@@ -102,37 +107,37 @@ namespace BeWo.Data.Entities
             }
         }
 
-		public virtual SupportConceptApprovalInterval? ContactCountInterval
-		{
-			get
-			{
-				return this._ContactCountInterval;
-			}
+        public virtual SupportConceptApprovalInterval? ContactCountInterval
+        {
+            get
+            {
+                return this._ContactCountInterval;
+            }
 
-			set
-			{
-				if (this.AreDifferent(this._ContactCountInterval, value))
-				{
-					this._ContactCountInterval = value;
-				}
-			}
-		}
+            set
+            {
+                if (this.AreDifferent(this._ContactCountInterval, value))
+                {
+                    this._ContactCountInterval = value;
+                }
+            }
+        }
 
-		public virtual decimal? ContactCountPerInterval
-		{
-			get
-			{
-				return this._ContactCountPerInterval;
-			}
+        public virtual decimal? ContactCountPerInterval
+        {
+            get
+            {
+                return this._ContactCountPerInterval;
+            }
 
-			set
-			{
-				if (this.AreDifferent(this._ContactCountPerInterval, value))
-				{
-					this._ContactCountPerInterval = value;
-				}
-			}
-		}
+            set
+            {
+                if (this.AreDifferent(this._ContactCountPerInterval, value))
+                {
+                    this._ContactCountPerInterval = value;
+                }
+            }
+        }
 
         public virtual decimal? ApprovedFixedAmount
         {
@@ -262,13 +267,48 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual Budget Budget
+        {
+            get
+            {
+                return _Budget;
+            }
+
+            set
+            {
+                if (AreDifferent(_Budget, value))
+                {
+                    _Budget = value;
+                }
+            }
+        }
+
+        public virtual Bewilligungsart Bewilligungsart
+        {
+            get
+            {
+                return _Bewilligungsart;
+            }
+
+            set
+            {
+                if (AreDifferent(_Bewilligungsart, value))
+                {
+                    _Bewilligungsart = value;
+                }
+            }
+        }
+
         public virtual decimal? Percentage { get; set; }
 
         public virtual ServiceCategory ServiceCategory { get; set; }
 
         public virtual IList<SupportConceptApprovalPeriod2Employee> SupportConceptApprovalPeriod2Employee
         {
-            get { return _SupportConceptApprovalPeriod2Employee ?? (_SupportConceptApprovalPeriod2Employee = new List<SupportConceptApprovalPeriod2Employee>()); }
+            get
+            {
+                return _SupportConceptApprovalPeriod2Employee ?? (_SupportConceptApprovalPeriod2Employee = new List<SupportConceptApprovalPeriod2Employee>());
+            }
 
             set
             {
diff --git a/Data/Mappings/SupportConceptApprovalPeriod.hbm.xml b/Data/Mappings/SupportConceptApprovalPeriod.hbm.xml
index f21aa8fca..cae376912 100644
--- a/Data/Mappings/SupportConceptApprovalPeriod.hbm.xml
+++ b/Data/Mappings/SupportConceptApprovalPeriod.hbm.xml
@@ -25,10 +25,13 @@
         <property column="ApprovedBETotal" type="Decimal" name="ApprovedBETotal" />
         <property column="ApprovedFixedAmount" type="Decimal" name="ApprovedFixedAmount" />
         <property column="ApprovedFixedAmountInterval" type="BS.Shared.SupportConceptApprovalInterval, BS.Shared" name="ApprovedFixedAmountInterval" />
+        <property column="Bewilligungsart" type="BS.Shared.Bewilligungsart, BS.Shared" name="Bewilligungsart" />
         <property name="Percentage" type="System.Decimal"/>
+      
         <many-to-one name="CostBearer2SupportConcept" column="CostBearer2SupportConceptOid" class="BeWo.Data.Entities.CostBearer2SupportConcept, BeWo.Data" cascade="none" />
         <many-to-one name="ServiceCategory" column="ServiceCategoryOid" class="BeWo.Data.Entities.ServiceCategory, BeWo.Data" cascade="none" />
-
+        <many-to-one name="Budget" column="BudgetOid" class="BeWo.Data.Entities.Budget" cascade="none"/>
+      
         <bag name="SupportConceptApprovalPeriod2Employee" table="SupportConceptApprovalPeriod2Employee" generic="true" cascade="all-delete-orphan" batch-size="250">
             <key column="SupportConceptApprovalPeriodOid" />
             <one-to-many class="BeWo.Data.Entities.SupportConceptApprovalPeriod2Employee, BeWo.Data" />
diff --git a/Model/Changes_2019_07_31 Bugdet beim Bewilligungszeitraum hinzugefügt.txt b/Model/Changes_2019_07_31 Bugdet beim Bewilligungszeitraum hinzugefügt.txt
new file mode 100644
index 000000000..28ca469e4
--- /dev/null
+++ b/Model/Changes_2019_07_31 Bugdet beim Bewilligungszeitraum hinzugefügt.txt	
@@ -0,0 +1,11 @@
+ALTER TABLE `bewodemo`.`supportconceptapprovalperiod` 
+ADD COLUMN `BudgetOid` BIGINT(19) NULL DEFAULT NULL AFTER `ContactCountInterval`,
+ADD COLUMN `Bewilligungsart` INT(10) NOT NULL DEFAULT 0 AFTER `BudgetOid`,
+ADD INDEX `FK_Budget_idx` (`BudgetOid` ASC) VISIBLE;
+;
+ALTER TABLE `bewodemo`.`supportconceptapprovalperiod` 
+ADD CONSTRAINT `FK_Budget`
+  FOREIGN KEY (`BudgetOid`)
+  REFERENCES `bewodemo`.`budget` (`Oid`)
+  ON DELETE RESTRICT
+  ON UPDATE RESTRICT;
\ No newline at end of file
diff --git a/Service/DCEntityMapper/SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.cs b/Service/DCEntityMapper/SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.cs
index d14a747a2..ac79fa59f 100644
--- a/Service/DCEntityMapper/SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.cs
+++ b/Service/DCEntityMapper/SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.cs
@@ -7,7 +7,7 @@ using BS.Shared.DataContracts;
 namespace BeWo.Service.DCEntityMapper
 {
     public class SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod : AbstractIDCEntityMapper<SupportConceptApprovalPeriod, SupportConceptApprovalPeriodDC>
-    {
+    {      
         public override SupportConceptApprovalPeriodDC MergeWithDC(SupportConceptApprovalPeriod pEntity, SupportConceptApprovalPeriodDC pDataContract)
         {
             pDataContract.ApprovedBEInterval                  = pEntity.ApprovedBEInterval;
@@ -24,6 +24,8 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.ContactCountPerInterval             = pEntity.ContactCountPerInterval;
             pDataContract.ApprovedFixedAmount                 = pEntity.ApprovedFixedAmount;
             pDataContract.ApprovedFixedAmountInterval         = pEntity.ApprovedFixedAmountInterval;
+            pDataContract.Bewilligungsart                     = pEntity.Bewilligungsart;
+            ;
 
             pDataContract.SupportConceptApprovalPeriodEmployeeRelations = MapperFactory.SupportConceptApprovalPeriodEmployeeRelDC_SupportConceptApprovalPeriod2Employee.MapToNewDCs(pEntity.SupportConceptApprovalPeriod2Employee);
 
@@ -47,6 +49,11 @@ namespace BeWo.Service.DCEntityMapper
                 pDataContract.ServiceCategory = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDC(pEntity.ServiceCategory);
             }
 
+            if (pEntity.Budget != null)
+            {
+                pDataContract.BudgetDC                            = MapperFactory.BudgetDC_Budget.MapToNewDC(pEntity.Budget);
+            }
+
             return pDataContract;
         }
 
@@ -68,6 +75,16 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.Oid                           = pDataContract.SupportConceptApprovalPeriodOid;
             pEntity.Version                       = pDataContract.SupportConceptApprovalPeriodVersion;
             pEntity.StartDate                     = pDataContract.StartDate;
+            pEntity.Bewilligungsart               = pDataContract.Bewilligungsart;
+
+            if (pDataContract.BudgetDC == null)
+            {
+                pEntity.Budget = null;
+            }
+            else if (pDataContract.BudgetDC != null && pDataContract.BudgetDC.BudgetOid.HasValue)
+            {
+                pEntity.Budget = DAOFactory.GenericDAO.LoadByID<Budget>(pDataContract.BudgetDC.BudgetOid.Value);
+            }
 
             if (pDataContract.ServiceCategory == null)
             {
diff --git a/Service/Plugins/FlexibleReportService.cs b/Service/Plugins/FlexibleReportService.cs
index cead64a66..99e4f3daa 100644
--- a/Service/Plugins/FlexibleReportService.cs
+++ b/Service/Plugins/FlexibleReportService.cs
@@ -18,47 +18,55 @@ namespace BeWo.Service.Plugins
 {
     public class FlexibleReportService : AbstractIDSpecificDefaultClass<FlexibleReportService>
     {
-        private Dictionary<long, IList<CostRatePeriodDC>> categoryOid2Stundensatz;
-        private Dictionary<long, IList<CostRatePeriodDC>> leistungOid2Stundensatz;
-        private Dictionary<long, IList<CostRatePeriodDC>> costbearerOid2Stundensatz;
-        private Dictionary<long, IList<CostRatePeriodDC>> costbearerOid2RateFactor;
+        private Dictionary<long, IList<CostRatePeriodDC>> _CategoryOid2Stundensatz;
+        private Dictionary<long, IList<CostRatePeriodDC>> _LeistungOid2Stundensatz;
+        private Dictionary<long, IList<CostRatePeriodDC>> _CostbearerOid2Stundensatz;
+        private Dictionary<long, IList<CostRatePeriodDC>> _CostbearerOid2RateFactor;
 
         public virtual FlexibleReportResultDC GetAllFlexibleReportEntrys(FlexibleReportFilterDC filter)
         {
-            var result = new FlexibleReportResultDC();
-
-            result.StartDatum = filter.StartDatum;
-            result.EndDatum = filter.EndDatum;
+            var result = new FlexibleReportResultDC
+            {
+                StartDatum = filter.StartDatum,
+                EndDatum = filter.EndDatum
+            };
 
             var calc = PluginLoader.FindClass<Calculations>();
 
             var filterZeitraum = new DateTimeSpan() { StartDateTime = filter.StartDatum.Date, EndDateTime = filter.EndDatum.Date.AddDays(1).AddTicks(-1) };
 
-            if (filter.AlleHilfeplaneAnzeigen)
+            // Erstellt die FlexibleReportDummies
+            if (filter.AlleHilfeplaneAnzeigen.HasValue && filter.AlleHilfeplaneAnzeigen.Value)
             {
-                var alleHelp = DAOFactory.GenericDAO.GetAllActiveAndArchived<SupportConcept>();
+                var alleHelp = DAOFactory.GenericDAO.GetAllActiveAndArchived<SupportConcept>().ToArray();
 
-                if (alleHelp.Count > 0)
+                if (alleHelp.Length > 0)
                 {
-                    var dummies = GetFlexibleReportResult_Dummies(alleHelp, filterZeitraum, calc, filter.SollAnzeigen);
+                    var dummies = GetFlexibleReportResult_Dummies(alleHelp, filterZeitraum, calc, 
+                        filter.SollAnzeigen.HasValue && filter.SollAnzeigen.Value);
 
                     result.Dummies = dummies.ToList();
                 }
             }
 
-            if (filter.AlleServiceBerichteAnzeigen)
+            // Erstellt die FlexibleReportEntries
+            if (filter.AlleServiceBerichteAnzeigen.HasValue && filter.AlleServiceBerichteAnzeigen.Value)
             {
-                var alleRec = DAOFactory.SearchDAO.FindServiceRecordsInSpan(filterZeitraum, null);
+                var alleRec = DAOFactory.SearchDAO.FindServiceRecordsInSpan(filterZeitraum, null).ToArray();
 
-                if (alleRec.Count() > 0)
+                if (alleRec.Length > 0)
                 {
-                    var entries = GetFlexibleReportResult_Entries(alleRec, filter.IstAnzeigen, filter.BetragAnzeigen, filter.GefahreneKilometerAnzeigen);
+                    var entries = GetFlexibleReportResult_Entries(alleRec, 
+                        filter.IstAnzeigen.HasValue && filter.IstAnzeigen.Value, 
+                        filter.BetragAnzeigen.HasValue && filter.BetragAnzeigen.Value, 
+                        filter.GefahreneKilometerAnzeigen.HasValue && filter.GefahreneKilometerAnzeigen.Value);
 
                     result.Entries = entries.ToList();
                 }
             }
 
-            if (filter.AlleKlientenAnzeigen)
+            // Erstellt CustomerDic
+            if (filter.AlleKlientenAnzeigen.HasValue && filter.AlleKlientenAnzeigen.Value)
             {
                 var alleCos = DAOFactory.GenericDAO.GetAllActiveAndArchived<Customer>();
 
@@ -70,7 +78,8 @@ namespace BeWo.Service.Plugins
                 }
             }
 
-            if (filter.AlleMitarbeiterAnzeigen)
+            // Erstellt EmployeeDic
+            if (filter.AlleMitarbeiterAnzeigen.HasValue && filter.AlleMitarbeiterAnzeigen.Value)
             {
                 var alleEmps = DAOFactory.GenericDAO.GetAllActiveAndArchived<Employee>();
 
@@ -87,14 +96,14 @@ namespace BeWo.Service.Plugins
 
         protected virtual decimal? GetStundensatz(ServiceRecord sr)
         {
-            if (categoryOid2Stundensatz == null)
+            if (_CategoryOid2Stundensatz == null)
                 BuildStundensatzDictionaries();
 
             if (sr.CostBearer2SupportConcept != null)
             {
-                if (leistungOid2Stundensatz.ContainsKey(sr.ServiceDescription.Oid.Value))
+                if (_LeistungOid2Stundensatz.ContainsKey(sr.ServiceDescription.Oid.Value))
                 {
-                    var crList = leistungOid2Stundensatz[sr.ServiceDescription.Oid.Value];
+                    var crList = _LeistungOid2Stundensatz[sr.ServiceDescription.Oid.Value];
 
                     var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sr.Start.Value);
                     if (cr != null && cr.CostRateValue.HasValue)
@@ -103,9 +112,9 @@ namespace BeWo.Service.Plugins
                     }
                 }
 
-                if (categoryOid2Stundensatz.ContainsKey(sr.ServiceDescription.ServiceCategory.Oid.Value))
+                if (_CategoryOid2Stundensatz.ContainsKey(sr.ServiceDescription.ServiceCategory.Oid.Value))
                 {
-                    var crList = categoryOid2Stundensatz[sr.ServiceDescription.ServiceCategory.Oid.Value];
+                    var crList = _CategoryOid2Stundensatz[sr.ServiceDescription.ServiceCategory.Oid.Value];
 
                     var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sr.Start.Value);
                     if (cr != null && cr.CostRateValue.HasValue)
@@ -114,21 +123,21 @@ namespace BeWo.Service.Plugins
                     }
                 }
 
-                if (costbearerOid2Stundensatz.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
+                if (_CostbearerOid2Stundensatz.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
                 {
-                    var crList = costbearerOid2Stundensatz[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
+                    var crList = _CostbearerOid2Stundensatz[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
 
                     var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, sr.Start.Value);
-                    if (cr != null && cr.CostRateValue.HasValue)
+                    if (cr?.CostRateValue != null)
                     {
                         var betrag = cr.CostRateValue.Value;
 
-                        if (costbearerOid2RateFactor.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
+                        if (_CostbearerOid2RateFactor.ContainsKey(sr.CostBearer2SupportConcept.CostBearer.Oid.Value))
                         {
-                            crList = costbearerOid2RateFactor[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
+                            crList = _CostbearerOid2RateFactor[sr.CostBearer2SupportConcept.CostBearer.Oid.Value];
 
                             cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, sr.Start.Value);
-                            if (cr != null && cr.CostRateValue.HasValue)
+                            if (cr?.CostRateValue != null)
                             {
                                 betrag *= 1 + cr.CostRateValue.Value / 100;
                             }
@@ -143,10 +152,10 @@ namespace BeWo.Service.Plugins
 
         protected virtual void BuildStundensatzDictionaries()
         {
-            categoryOid2Stundensatz = new Dictionary<long, IList<CostRatePeriodDC>>();
-            leistungOid2Stundensatz = new Dictionary<long, IList<CostRatePeriodDC>>();
-            costbearerOid2Stundensatz = new Dictionary<long, IList<CostRatePeriodDC>>();
-            costbearerOid2RateFactor = new Dictionary<long, IList<CostRatePeriodDC>>();
+            _CategoryOid2Stundensatz = new Dictionary<long, IList<CostRatePeriodDC>>();
+            _LeistungOid2Stundensatz = new Dictionary<long, IList<CostRatePeriodDC>>();
+            _CostbearerOid2Stundensatz = new Dictionary<long, IList<CostRatePeriodDC>>();
+            _CostbearerOid2RateFactor = new Dictionary<long, IList<CostRatePeriodDC>>();
 
 
             var categories = DAOFactory.GenericDAO.GetAllActive<ServiceCategory>();
@@ -157,7 +166,7 @@ namespace BeWo.Service.Plugins
                     var hrCats = cat.CostRatePeriods.ToList();
                     if (hrCats.Count > 0)
                     {
-                        categoryOid2Stundensatz.Add(cat.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(hrCats));
+                        _CategoryOid2Stundensatz.Add(cat.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(hrCats));
                     }
                 }
             }
@@ -170,7 +179,7 @@ namespace BeWo.Service.Plugins
                     var hrCats = desc.CostRatePeriods.ToList();
                     if (hrCats.Count > 0)
                     {
-                        leistungOid2Stundensatz.Add(desc.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(hrCats));
+                        _LeistungOid2Stundensatz.Add(desc.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(hrCats));
                     }
                 }
             }
@@ -181,13 +190,13 @@ namespace BeWo.Service.Plugins
                 var hrCats = cb.CostRatePeriods.Where(c => c.CostRateType == CostRatePeriodType.HourlyRate).ToList();
                 if (hrCats.Count > 0)
                 {
-                    costbearerOid2Stundensatz.Add(cb.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(hrCats));
+                    _CostbearerOid2Stundensatz.Add(cb.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(hrCats));
                 }
 
                 var rfCats = cb.CostRatePeriods.Where(c => c.CostRateType == CostRatePeriodType.RateFactor).ToList();
                 if (rfCats.Count > 0)
                 {
-                    costbearerOid2RateFactor.Add(cb.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(rfCats));
+                    _CostbearerOid2RateFactor.Add(cb.Oid.Value, MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(rfCats));
                 }
             }
         }
@@ -234,14 +243,22 @@ namespace BeWo.Service.Plugins
         {
             foreach (var serviceRecord in alleRec)
             {
+                if (!serviceRecord.Start.HasValue || !serviceRecord.End.HasValue)
+                    continue;
+
                 var entry = new FlexibleReportEntryDC
                 {
+                    ServiceRecordOid = serviceRecord.Oid,
                     EndDatum = serviceRecord.End.Value,
+                    Notice = serviceRecord.Notice,
+                    Notice2 = serviceRecord.Notice2,
+                    Notice3 = serviceRecord.Notice3,
+                    Notice4 = serviceRecord.Notice4,
+                    Notice5 = serviceRecord.Notice5,
                     SollMinuten = null,
                     StartDatum = serviceRecord.Start.Value,
                     Leistung = serviceRecord.ServiceDescription.Name,
-                    Leistungskategorie = serviceRecord.ServiceDescription.ServiceCategory.Name,
-                    Type = FlexibleReportEntryType.ServiceRecordEntry
+                    Leistungskategorie = serviceRecord.ServiceDescription.ServiceCategory.Name
                 };
 
                 if (zeigeIst)
@@ -314,7 +331,7 @@ namespace BeWo.Service.Plugins
                             // Wenn der Klient ein oder mehr Hauptbetreuer hat
                             else
                             {
-                                decimal? sollAnteil = soll / hauptbetreuer.Count;
+                                var sollAnteil = soll / hauptbetreuer.Count;
 
                                 foreach (var betreuer in hauptbetreuer)
                                 {
@@ -327,7 +344,7 @@ namespace BeWo.Service.Plugins
                         {
                             foreach (var s2e in approvalPeriod.SupportConceptApprovalPeriod2Employee)
                             {
-                                decimal? soll = zeigeSoll ? GetSollPerDayEmployee(hilfePlan.Customer, s2e.Employee, approvalPeriod.StartDate.Value, approvalPeriod, calc) : null;
+                                var soll = zeigeSoll ? GetSollPerDayEmployee(hilfePlan.Customer, s2e.Employee, approvalPeriod.StartDate.Value, approvalPeriod, calc) : null;
 
                                 yield return GetFlexibleReportDummy(hilfePlan.Customer, s2e.Employee, zeitraum, hilfePlan, approvalPeriod, soll);
                             }
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index d2a6008e4..53e08ba03 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -550,36 +550,36 @@ namespace BS.Shared
 
     public enum ValueListEntryType
     {
-        EmploymentType, //0
-        DisabilityType,
-        AccountingTransactionType,
-        StaffRoleType,
-        StaffActivityFocusType,
-        StaffQualificationsType, //5
-        ResourceCategory,
-        EnvironmentPersonType,
-        CustomerCareType, //8
-        SupportConceptGoalCategoryType,
-        SupportConceptGoalType, //10
-        TitleType,
-        FunctionType,
-        PlacementObjectiveType,
-        TerminationReasonType,
-        PersonCategoryType, //15
-        CustomerCategoryType,
-        EnvironmentOrganisationType,
-        SupportConceptIndividualGoalType,
-		Auszahlungsart,
-        SupportConceptIndividualGoalCategoryType, // 20
-        DocumentType,
-        OrganisationFunctionType,
-        RoleInOrganisationType,
-        RoleInFamily,
-        Nationality,
-        Aufenthaltsstatus,
-        Migrationshintergrund,
-        ContractType,
-        QualifikationsBedarf
+        EmploymentType = 0,
+        DisabilityType = 1,     
+        AccountingTransactionType = 2,
+        StaffRoleType = 3,
+        StaffActivityFocusType = 4,
+        StaffQualificationsType = 5, 
+        ResourceCategory = 6,
+        EnvironmentPersonType = 7,
+        CustomerCareType = 8, 
+        SupportConceptGoalCategoryType = 9,
+        SupportConceptGoalType = 10, 
+        TitleType = 11,
+        FunctionType = 12,
+        PlacementObjectiveType = 13,
+        TerminationReasonType = 14,
+        PersonCategoryType = 15,
+        CustomerCategoryType = 16,
+        EnvironmentOrganisationType = 17,
+        SupportConceptIndividualGoalType = 18,
+		Auszahlungsart = 19,
+        SupportConceptIndividualGoalCategoryType = 20,
+        DocumentType = 21,
+        OrganisationFunctionType = 22,
+        RoleInOrganisationType = 23,
+        RoleInFamily = 24,
+        Nationality = 25,
+        Aufenthaltsstatus = 26,
+        Migrationshintergrund = 27,
+        ContractType = 28,
+        QualifikationsBedarf = 29
     }
 
     public enum ContactType
@@ -1007,4 +1007,10 @@ namespace BS.Shared
         ServiceRecordEntry,
         SupportConceptEntry
 	}
+
+    public enum Bewilligungsart
+    {
+        Direkt = 0,
+        Budget = 1,
+    }
 }
\ No newline at end of file
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 903f2e2a8..fab97828d 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -860,7 +860,7 @@ namespace BS.Shared.Core
                                                      ValueListEntryType.EnvironmentOrganisationType, "Rollen des Umfeldes (Organisationen)"
                                                      },
                                                  {
-                                                     ValueListEntryType.DocumentType, "Dokumentationstypen"
+                                                     ValueListEntryType.DocumentType, "Dokumentationsfelder"
                                                      },
                                                  {
                                                      ValueListEntryType.OrganisationFunctionType,"Funktionen (Organisationen)"
@@ -945,7 +945,7 @@ namespace BS.Shared.Core
                                                     ValueListEntryType.EnvironmentOrganisationType, "Rollen des Umfeldes (Organisationen)"
                                                     },
                                                 {
-                                                     ValueListEntryType.DocumentType, "Dokumentationstypen"
+                                                     ValueListEntryType.DocumentType, "Dokumentationsfelder"
                                                      },
                                                 {
                                                      ValueListEntryType.OrganisationFunctionType,"Funktionen (Organisationen)"
diff --git a/Shared/DataContracts/BudgetDC.cs b/Shared/DataContracts/BudgetDC.cs
index 3a68fdce5..078cbc7be 100644
--- a/Shared/DataContracts/BudgetDC.cs
+++ b/Shared/DataContracts/BudgetDC.cs
@@ -37,5 +37,25 @@ namespace BS.Shared.DataContracts
 
 		[DataMember]
 		public decimal? Betragshoehe { get; set; }
-	}
+
+        public override string ToString()
+        {
+            return Name + " (" + (Betragshoehe.HasValue ? Math.Round(Betragshoehe.Value, 2) : 0) + " Std)";
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is BudgetDC budget)
+            {
+                return BudgetOid == budget.BudgetOid;
+            }
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return GetType().Name.GetHashCode() ^ BudgetOid.GetHashCode();
+        }
+    }
 }
diff --git a/Shared/DataContracts/FlexibleReportEntryDC.cs b/Shared/DataContracts/FlexibleReportEntryDC.cs
index d315c5441..3cfff1503 100644
--- a/Shared/DataContracts/FlexibleReportEntryDC.cs
+++ b/Shared/DataContracts/FlexibleReportEntryDC.cs
@@ -12,6 +12,9 @@ namespace BS.Shared.DataContracts
     [DataContract]
     public class FlexibleReportEntryDC : IDataContract
     {
+        [DataMember]
+        public long? ServiceRecordOid { get; set; }
+
         [DataMember]
         public long? CustomerOid { get; set; }
 
@@ -61,9 +64,21 @@ namespace BS.Shared.DataContracts
         public DateTime EndDatum { get; set; }
 
         [DataMember]
-        public FlexibleReportEntryType Type { get; set; }
+        public string Organisation { get; set; }
 
         [DataMember]
-        public string Organisation { get; set; }
+        public string Notice { get; set; }
+
+        [DataMember]
+        public string Notice2 { get; set; }
+
+        [DataMember]
+        public string Notice3 { get; set; }
+
+        [DataMember]
+        public string Notice4 { get; set; }
+
+        [DataMember]
+        public string Notice5 { get; set; }
     }
 }
diff --git a/Shared/DataContracts/FlexibleReportFilterDC.cs b/Shared/DataContracts/FlexibleReportFilterDC.cs
index 209c4b4d7..b1ce0c45d 100644
--- a/Shared/DataContracts/FlexibleReportFilterDC.cs
+++ b/Shared/DataContracts/FlexibleReportFilterDC.cs
@@ -24,33 +24,30 @@ namespace BS.Shared.DataContracts
 		public IList<ServiceDescriptionDC> Leistungen { get; set; }
 
         [DataMember]
-        public bool ReduzierteAnsicht { get; set; }
-
-
-
-        [DataMember]
-        public bool BetragAnzeigen { get; set; }
+        public bool? ReduzierteAnsicht { get; set; }
         
         [DataMember]
-        public bool IstAnzeigen { get; set; }
-
-        [DataMember]
-        public bool SollAnzeigen { get; set; }
-
-        [DataMember]
-        public bool GefahreneKilometerAnzeigen { get; set; }
+        public bool? BetragAnzeigen { get; set; }
         
         [DataMember]
-        public bool AlleServiceBerichteAnzeigen { get; set; }
+        public bool? IstAnzeigen { get; set; }
 
         [DataMember]
-        public bool AlleHilfeplaneAnzeigen { get; set; }
+        public bool? SollAnzeigen { get; set; }
 
         [DataMember]
-        public bool AlleMitarbeiterAnzeigen { get; set; }
+        public bool? GefahreneKilometerAnzeigen { get; set; }
+        
+        [DataMember]
+        public bool? AlleServiceBerichteAnzeigen { get; set; }
 
         [DataMember]
-        public bool AlleKlientenAnzeigen { get; set; }
+        public bool? AlleHilfeplaneAnzeigen { get; set; }
 
+        [DataMember]
+        public bool? AlleMitarbeiterAnzeigen { get; set; }
+
+        [DataMember]
+        public bool? AlleKlientenAnzeigen { get; set; }
     }
 }
diff --git a/Shared/DataContracts/SupportConceptApprovalPeriodDC.cs b/Shared/DataContracts/SupportConceptApprovalPeriodDC.cs
index 1b194788c..c9cbba4bb 100644
--- a/Shared/DataContracts/SupportConceptApprovalPeriodDC.cs
+++ b/Shared/DataContracts/SupportConceptApprovalPeriodDC.cs
@@ -84,5 +84,11 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public List<SupportConceptApprovalPeriodEmployeeRelDC> SupportConceptApprovalPeriodEmployeeRelations { get; set; }
+
+        [DataMember]
+        public BudgetDC BudgetDC { get; set; }
+
+        [DataMember]
+        public Bewilligungsart Bewilligungsart { get; set; }
     }
 }
\ No newline at end of file