From b3f01a97a6a1523972df8b40ef7ee5aec5b23fe9 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Tue, 20 Jun 2023 00:33:56 +0200
Subject: [PATCH] =?UTF-8?q?Todos=20f=C3=BCr=20Release+=20HPH=20Bersenbr?=
 =?UTF-8?q?=C3=BCck=20ATZ=20Soll=20Ist=20Auswertung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 BeWo/ServiceProxy/Generated.cs                |  50 +-
 .../Detail/Accounting/InvoiceOverview.xaml    |  13 +-
 .../Detail/Accounting/InvoiceOverview.xaml.cs |   4 +-
 .../Detail/AccountingTransactionView.xaml     |   2 +-
 .../BeWoDatabaseTerminator.csproj             |   4 +-
 BeWoPlanerMobil/BeWoPlanerMobil.csproj        |   2 +-
 BeWoPlanerMobil/Controllers/MainController.cs |   4 +
 Data/Access/SearchDAO.cs                      |  26 +-
 Model/Changes_alle_fuer_neue_db.txt           |   5 +
 .../Quittierungsbeleg.Designer.cs             |  68 +-
 Report/DefaultReports/Quittierungsbeleg.cs    |   4 +-
 .../QuittierungsbelegMitDatum.cs              |   4 +-
 .../SettlementReport2.Designer.cs             |   2 +-
 Report/DefaultReports/SettlementReport2.cs    |  13 +-
 .../MitarbeiterstundenkontoBerechnung.cs      |  13 +-
 Report/ReportObjects/ServicesOverviewRO.cs    |  24 +-
 Report/ReportObjects/Settlement2RO.cs         |   2 +-
 ReportImp/AsbRuhr/Export/FibuNetExporter.cs   |  12 +-
 ReportImp/Bewolonia/Bewolonia.csproj          |   3 +
 .../DiePerspektive/Export/FibuNetExporter.cs  |  12 +-
 .../HphBersenbrueckAtz.csproj                 |  11 +
 .../ListeTherapieeinheitenSollIst.Designer.cs | 950 ++++++++++++++++++
 .../ListeTherapieeinheitenSollIst.cs          | 314 ++++++
 .../ListeTherapieeinheitenSollIst.resx        | 205 ++++
 .../CustomServiceRecordStatisticFactory.cs    | 167 +++
 .../Rechnung.cs                               |   6 +-
 ...eiterstundenkontoBerechnungTagesansicht.cs |   7 +-
 ReportImp/KetteReports/SettlementReport2.cs   |  12 +-
 .../SettlementReport2.designer.cs             | 210 ++--
 .../Quittierungsbeleg.Designer.cs             | 126 ++-
 ReportImp/SehtMuenster/Quittierungsbeleg.cs   |   8 +-
 .../ahaEV/Mitarbeiterarbeitszeitkonto.cs      |   5 +-
 Service/Plugins/EmployeeService.cs            |  11 +-
 Service/Plugins/HomeContentGenerator.cs       |  17 +-
 Service/Plugins/PluginLoader.cs               |   7 +-
 .../AccountingServiceImp.cs                   |   2 +-
 37 files changed, 2084 insertions(+), 242 deletions(-)
 create mode 100644 ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.Designer.cs
 create mode 100644 ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.cs
 create mode 100644 ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.resx
 create mode 100644 ReportImp/HphBersenbrueckAtz/Statistics/CustomServiceRecordStatisticFactory.cs

diff --git a/.gitignore b/.gitignore
index 38bbc6ca1..a5a13d40e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -636,3 +636,4 @@ obj
 /BeWoPlanerMobil/node_modules/.bin/pegjs
 /BeWoPlanerMobil/node_modules/.bin/pegjs.cmd
 /BeWoPlanerMobil/node_modules/.bin/pegjs.ps1
+/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 26162173d..db334954b 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -342,6 +342,15 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAbsenceOverviewBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.EmployeeDC> GetAbsenceOverview(BS.Shared.DataContracts.AbsenceOverviewFilterDC filter);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/LoadCompactTeamsByOid", ReplyAction="http://tempuri.org/IEmployeeService/LoadCompactTeamsByOidResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/LoadCompactTeamsByOidBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> LoadCompactTeamsByOid(System.Collections.Generic.List<long> teamOids);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/FindLeadingCompactTeamsOfEmployee", ReplyAction="http://tempuri.org/IEmployeeService/FindLeadingCompactTeamsOfEmployeeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/FindLeadingCompactTeamsOfEmployeeBeWoFaultFau" +
+            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> FindLeadingCompactTeamsOfEmployee(long employeeOid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void ArchiveEmployee(long pOid, long pVersion);
@@ -935,6 +944,16 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetAbsenceOverview(filter);
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> LoadCompactTeamsByOid(System.Collections.Generic.List<long> teamOids)
+        {
+            return base.Channel.LoadCompactTeamsByOid(teamOids);
+        }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTeamDC> FindLeadingCompactTeamsOfEmployee(long employeeOid)
+        {
+            return base.Channel.FindLeadingCompactTeamsOfEmployee(employeeOid);
+        }
+        
         public void ArchiveEmployee(long pOid, long pVersion)
         {
             base.Channel.ArchiveEmployee(pOid, pVersion);
@@ -1400,8 +1419,8 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, string>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<long>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, BS.Shared.ValueListEntryType>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<byte[]>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<byte[]>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, long>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.Nullable<long>, decimal>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))]
@@ -1878,6 +1897,11 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersonsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetAllAuthorizedCompactPersons();
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetActiveMedListByTypeForCustomer", ReplyAction="http://tempuri.org/ICustomerService/GetActiveMedListByTypeForCustomerResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetActiveMedListByTypeForCustomerBeWoFaultFau" +
+            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Nullable<long> GetActiveMedListByTypeForCustomer(long customerOid, bool isBedarfsmedikation);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers();
@@ -2721,6 +2745,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetAllAuthorizedCompactPersons();
         }
         
+        public System.Nullable<long> GetActiveMedListByTypeForCustomer(long customerOid, bool isBedarfsmedikation)
+        {
+            return base.Channel.GetActiveMedListByTypeForCustomer(customerOid, isBedarfsmedikation);
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers()
         {
             return base.Channel.GetAllActiveCustomers();
@@ -5484,6 +5513,11 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetRootAppointmentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BS.Shared.DataContracts.SchedulerAppointmentDC GetRootAppointment(string recurrenceId);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetDiagiosisStringsForICD10Codes", ReplyAction="http://tempuri.org/IOperationsService/GetDiagiosisStringsForICD10CodesResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDiagiosisStringsForICD10CodesBeWoFaultFa" +
+            "ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.Dictionary<string, string> GetDiagiosisStringsForICD10Codes(System.Collections.Generic.List<string> icd10Codes);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlich", ReplyAction="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlichResp" +
             "onse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/VertretungsMitarbeiterListeWoechentlichBeWo" +
@@ -6929,6 +6963,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetRootAppointment(recurrenceId);
         }
         
+        public System.Collections.Generic.Dictionary<string, string> GetDiagiosisStringsForICD10Codes(System.Collections.Generic.List<string> icd10Codes)
+        {
+            return base.Channel.GetDiagiosisStringsForICD10Codes(icd10Codes);
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC> VertretungsMitarbeiterListeWoechentlich(System.DateTime start, System.DateTime ende)
         {
             return base.Channel.VertretungsMitarbeiterListeWoechentlich(start, ende);
@@ -8581,6 +8620,10 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetInvoiceBasesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC> GetInvoiceBases(System.Nullable<System.DateTime> startDate, System.Nullable<System.DateTime> endDate);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetInvoiceBases2", ReplyAction="http://tempuri.org/IAccountingService/GetInvoiceBases2Response")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetInvoiceBases2BeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC> GetInvoiceBases2(System.Nullable<System.DateTime> startDate, System.Nullable<System.DateTime> endDate, bool filterByInvoiceDate);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetGeneralInvoiceBasesForCustomer", ReplyAction="http://tempuri.org/IAccountingService/GetGeneralInvoiceBasesForCustomerResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetGeneralInvoiceBasesForCustomerBeWoFaultF" +
             "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -8750,6 +8793,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetInvoiceBases(startDate, endDate);
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC> GetInvoiceBases2(System.Nullable<System.DateTime> startDate, System.Nullable<System.DateTime> endDate, bool filterByInvoiceDate)
+        {
+            return base.Channel.GetInvoiceBases2(startDate, endDate, filterByInvoiceDate);
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceBaseDC> GetGeneralInvoiceBasesForCustomer(long customerOid)
         {
             return base.Channel.GetGeneralInvoiceBasesForCustomer(customerOid);
diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
index d83f3e489..62f2b2b70 100644
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml
@@ -3,23 +3,24 @@
 	<Grid>
 		<GroupBox x:Name="groupbox_editArea" Grid.Row="0" Header="Rechnungsübersicht" Style="{DynamicResource ObjectEditGroupBox}">
 
-			<Grid Grid.IsSharedSizeScope="True">
+			<Grid Grid.IsSharedSizeScope="True" Margin="0,3,0,0">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="*" />
 				</Grid.RowDefinitions>
 
-				<localView:YearMonthFilter Margin="3 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
-                <StackPanel Orientation="Vertical" Grid.Column="1" Margin="8,0,0,0">
+				<localView:YearMonthFilter Margin="3 0 0 3" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
+                <StackPanel Orientation="Vertical" Grid.Column="1" Margin="12,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
                     <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Rechnungsdatum filtern" IsChecked="True"/>
                     <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" />
                 </StackPanel>
-				<Button x:Name="button_reload" Grid.Column="2" Content="Aktualisieren" Margin="8,0,0,0" Click="ReloadButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="80" />
+                
+				<Button x:Name="button_reload" Grid.Column="2" Content="Aktualisieren" Margin="12,0,0,0" Click="ReloadButton_OnClick" Height="24" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="80" />
                 
 				
 				<dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_invoices" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
@@ -73,7 +74,7 @@
 					</dxg:GridControl.View>
 				</dxg:GridControl>
 
-				<Grid Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,2,5,0">
+				<Grid Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,2,5,0">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="Auto" />
diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
index 832e87b52..dbb167e6e 100644
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
@@ -109,7 +109,9 @@ namespace BeWo.View.Detail.Accounting
 				start = ViewModel.DateTimeSpanFilter.StartDate;
 				end = ViewModel.DateTimeSpanFilter.EndDate;
 			}
-			ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases(start, end), UpdateInvoiceList);
+            bool filterByInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
+            
+			ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases2(start, end, filterByInvoiceDate), UpdateInvoiceList);
         }
 
         private void UpdateInvoiceList(IList<InvoiceBaseDC> dcList)
diff --git a/BeWo/View/Detail/AccountingTransactionView.xaml b/BeWo/View/Detail/AccountingTransactionView.xaml
index 35d78481a..4e4a5138d 100644
--- a/BeWo/View/Detail/AccountingTransactionView.xaml
+++ b/BeWo/View/Detail/AccountingTransactionView.xaml
@@ -44,7 +44,7 @@
                         
                     </Grid>
 				
-				<Grid Grid.Row="1" Grid.RowSpan="2" Grid.Column="0" Margin="0 5 8 0">
+				<Grid Grid.Row="1" Grid.RowSpan="2" Grid.Column="0" Margin="0 8 8 0">
                     <Grid.RowDefinitions>
                         <RowDefinition  Height="Auto"/>
                         <RowDefinition  Height="*"/>
diff --git a/BeWoDatabaseTerminator/BeWoDatabaseTerminator/BeWoDatabaseTerminator.csproj b/BeWoDatabaseTerminator/BeWoDatabaseTerminator/BeWoDatabaseTerminator.csproj
index cb8a05244..706261a46 100644
--- a/BeWoDatabaseTerminator/BeWoDatabaseTerminator/BeWoDatabaseTerminator.csproj
+++ b/BeWoDatabaseTerminator/BeWoDatabaseTerminator/BeWoDatabaseTerminator.csproj
@@ -37,7 +37,9 @@
     <ApplicationIcon>bdt.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MySql.Data, Version=8.0.27.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
+    <Reference Include="MySql.Data">
+      <HintPath>..\..\Lib\MySql.Data.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index c61d26303..d2323abb6 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -5092,7 +5092,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
+          <UseIIS>False</UseIIS>
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>8808</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 5778db8f6..e3dca6b32 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -97,6 +97,10 @@ namespace BeWoPlanerMobil.Controllers
                     Model.Mandator = GetMandator();
 
                     var mokSessionTimeout = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.MoKSessionTimeout);
+                    if (mokSessionTimeout <= 0)
+                    {
+                        mokSessionTimeout = 20;
+                    }
                     Session.Timeout = mokSessionTimeout;
                 }
 
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 58d7ebe10..186100ce2 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -541,29 +541,9 @@ namespace BeWo.Data.Access
                 .CreateAlias(SupportConcept.PropertyName_Customer, "c", JoinType.InnerJoin)
                 .CreateAlias("c.Employee2CustomerList", "e2c", JoinType.InnerJoin)
                 .Add(Restrictions.Eq("e2c." + Employee2Customer.PropertyName_EmployeeOid, employeeOid.Value))
-                .Add(Restrictions.Or(
-                    Restrictions.Between("cb2sc." + CostBearer2SupportConcept.PropertyName_ApprovedEndDate, minDate, expiredUntil),
-                    Restrictions.And(Restrictions.IsNotNull("c.TerminationDate"), Restrictions.Between("c.TerminationDate", minDate, expiredUntil))))
-                .List<SupportConcept>().Distinct().ToList();
-        }
-        public IEnumerable<SupportConcept> FindExpiringNotApprovedSupportConcepts(long? employeeOid, DateTime minDate, DateTime expiredUntil)
-        {
-            var c = CreateCriteriaIsActive<SupportConcept>();
-            if (employeeOid == null)
-            {
-                return c
-                    .CreateCriteria(SupportConcept.PropertyName_CostBearer2SupportConceptList, JoinType.InnerJoin)
-                    .Add(Restrictions.Between(CostBearer2SupportConcept.PropertyName_RequestedEndDate, minDate, expiredUntil))
-                    .List<SupportConcept>();
-            }
-
-            return c
-                .CreateAlias(SupportConcept.PropertyName_CostBearer2SupportConceptList, "cb2sc", JoinType.InnerJoin)
-                .CreateAlias(SupportConcept.PropertyName_Customer, "c", JoinType.InnerJoin)
-                .CreateAlias("c.Employee2CustomerList", "e2c", JoinType.InnerJoin)
-                .Add(Restrictions.Eq("e2c." + Employee2Customer.PropertyName_EmployeeOid, employeeOid.Value))
-                .Add(Restrictions.Or(
-                    Restrictions.Between("cb2sc." + CostBearer2SupportConcept.PropertyName_RequestedEndDate, minDate, expiredUntil),
+                .Add(Restrictions.Or(Restrictions.Or(
+                        Restrictions.Between("cb2sc." + CostBearer2SupportConcept.PropertyName_ApprovedEndDate, minDate, expiredUntil),
+                        Restrictions.Between("cb2sc." + CostBearer2SupportConcept.PropertyName_RequestedEndDate, minDate, expiredUntil)),
                     Restrictions.And(Restrictions.IsNotNull("c.TerminationDate"), Restrictions.Between("c.TerminationDate", minDate, expiredUntil))))
                 .List<SupportConcept>().Distinct().ToList();
         }
diff --git a/Model/Changes_alle_fuer_neue_db.txt b/Model/Changes_alle_fuer_neue_db.txt
index a386c67cf..5a8856b5d 100644
--- a/Model/Changes_alle_fuer_neue_db.txt
+++ b/Model/Changes_alle_fuer_neue_db.txt
@@ -919,3 +919,8 @@ ADD COLUMN `BemerkungenSbd` MEDIUMTEXT NULL;
 
 ALTER TABLE `employee` 
 ADD COLUMN `BemerkungenSbd` MEDIUMTEXT NULL;
+
+ALTER TABLE `customer` 
+ADD COLUMN `HealthInsurance` VARCHAR(45) NULL DEFAULT NULL AFTER `BemerkungenSbd`,
+ADD COLUMN `InsuranceNumber` VARCHAR(45) NULL DEFAULT NULL AFTER `HealthInsurance`;
+
diff --git a/Report/DefaultReports/Quittierungsbeleg.Designer.cs b/Report/DefaultReports/Quittierungsbeleg.Designer.cs
index ff8dfef22..5462aed1b 100644
--- a/Report/DefaultReports/Quittierungsbeleg.Designer.cs
+++ b/Report/DefaultReports/Quittierungsbeleg.Designer.cs
@@ -80,6 +80,8 @@ namespace BeWo.Report.DefaultReports
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
@@ -123,8 +125,6 @@ namespace BeWo.Report.DefaultReports
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -785,6 +785,37 @@ namespace BeWo.Report.DefaultReports
             this.GroupFooter1.KeepTogether = true;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
+            // xrLabel22
+            // 
+            this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+            this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 20.00001F);
+            this.xrLabel22.Name = "xrLabel22";
+            this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel22.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel22.StylePriority.UseBackColor = false;
+            this.xrLabel22.StylePriority.UseBorders = false;
+            this.xrLabel22.StylePriority.UseFont = false;
+            this.xrLabel22.StylePriority.UsePadding = false;
+            this.xrLabel22.StylePriority.UseTextAlignment = false;
+            this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel23
+            // 
+            this.xrLabel23.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel23.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(329.9998F, 20.00001F);
+            this.xrLabel23.Name = "xrLabel23";
+            this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel23.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel23.StylePriority.UseBackColor = false;
+            this.xrLabel23.StylePriority.UseBorders = false;
+            this.xrLabel23.StylePriority.UseFont = false;
+            this.xrLabel23.StylePriority.UsePadding = false;
+            this.xrLabel23.StylePriority.UseTextAlignment = false;
+            this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
             // xrLabel19
             // 
             this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Right;
@@ -838,7 +869,7 @@ namespace BeWo.Report.DefaultReports
             // lblFehlkontakt
             // 
             this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F);
+            this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00005F);
             this.lblFehlkontakt.Name = "lblFehlkontakt";
             this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F);
@@ -1308,37 +1339,6 @@ namespace BeWo.Report.DefaultReports
             this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldKontaktArt.Name = "fieldKontaktArt";
             // 
-            // xrLabel22
-            // 
-            this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Right;
-            this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 20.00001F);
-            this.xrLabel22.Name = "xrLabel22";
-            this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel22.SizeF = new System.Drawing.SizeF(85F, 20F);
-            this.xrLabel22.StylePriority.UseBackColor = false;
-            this.xrLabel22.StylePriority.UseBorders = false;
-            this.xrLabel22.StylePriority.UseFont = false;
-            this.xrLabel22.StylePriority.UsePadding = false;
-            this.xrLabel22.StylePriority.UseTextAlignment = false;
-            this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel23
-            // 
-            this.xrLabel23.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel23.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(329.9998F, 20.00001F);
-            this.xrLabel23.Name = "xrLabel23";
-            this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel23.SizeF = new System.Drawing.SizeF(85F, 20F);
-            this.xrLabel23.StylePriority.UseBackColor = false;
-            this.xrLabel23.StylePriority.UseBorders = false;
-            this.xrLabel23.StylePriority.UseFont = false;
-            this.xrLabel23.StylePriority.UsePadding = false;
-            this.xrLabel23.StylePriority.UseTextAlignment = false;
-            this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            // 
             // Quittierungsbeleg
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/Report/DefaultReports/Quittierungsbeleg.cs b/Report/DefaultReports/Quittierungsbeleg.cs
index 63e1a42ee..e9b7d74d5 100644
--- a/Report/DefaultReports/Quittierungsbeleg.cs
+++ b/Report/DefaultReports/Quittierungsbeleg.cs
@@ -34,7 +34,7 @@ namespace BeWo.Report.DefaultReports
 
                 foreach (var sd in pRO.Services)
                 {
-                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
                     {
                         ServicesOverviewRO.CreateSignatureString(sd);
                         sd.Notice5 = "E";
@@ -44,7 +44,7 @@ namespace BeWo.Report.DefaultReports
                             sd.Notice5 = "GR";
                             hatGruppen = true;
                         }
-                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
                         {
                             sd.Notice5 = "F";
                         }
diff --git a/Report/DefaultReports/QuittierungsbelegMitDatum.cs b/Report/DefaultReports/QuittierungsbelegMitDatum.cs
index 0ed20aef0..18d4d528a 100644
--- a/Report/DefaultReports/QuittierungsbelegMitDatum.cs
+++ b/Report/DefaultReports/QuittierungsbelegMitDatum.cs
@@ -28,9 +28,9 @@ namespace BeWo.Report.DefaultReports
 
                 foreach (var sd in pRO.Services)
                 {
-                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
                     {
-                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
                             sd.Notice5 = "F";
                         else if (sd.IsGroup)
                             sd.Notice5 = "GR";
diff --git a/Report/DefaultReports/SettlementReport2.Designer.cs b/Report/DefaultReports/SettlementReport2.Designer.cs
index dcd0e3b6b..f6489cf0d 100644
--- a/Report/DefaultReports/SettlementReport2.Designer.cs
+++ b/Report/DefaultReports/SettlementReport2.Designer.cs
@@ -724,7 +724,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell52.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AbrechnungsText")});
             this.xrTableCell52.Name = "xrTableCell52";
             this.xrTableCell52.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrTableCell52.StylePriority.UseBorderColor = false;
diff --git a/Report/DefaultReports/SettlementReport2.cs b/Report/DefaultReports/SettlementReport2.cs
index 92490df53..12862aa3a 100644
--- a/Report/DefaultReports/SettlementReport2.cs
+++ b/Report/DefaultReports/SettlementReport2.cs
@@ -36,12 +36,17 @@ namespace BeWo.Report.DefaultReports
 				if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
                 {				
 					Zwischensumme.Visible = true;
-					if (!ii.ItemDescription.IsNullOrEmpty())
-					{
-						ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
-					}
+					//if (!ii.ItemDescription.IsNullOrEmpty())
+					//{
+					//ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
+					//}
+					ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std.");
 					ii.ItemDescription = "Fehlkontakte";
 				}
+				else if (ii.ItemDescription.IsNullOrEmpty())
+                {
+					ii.ItemDescription = "Fachleistungsstunden";
+				}
 			}
 			pRO.RateFactor = (double)rateFactor;
 
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
index c7e0c4e39..e579aeee9 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
@@ -764,7 +764,14 @@ namespace BeWo.Report.ReportObjects
 	        return false;
 	    }
 
-	    protected virtual decimal? GetSollNachArbeitszeiten(Employee emp, DateTime start, DateTime ende)
+		protected virtual bool SchneideZuvieleAbwesenheitsstundenAb()
+		{
+			return true;
+		}
+
+		
+
+		protected virtual decimal? GetSollNachArbeitszeiten(Employee emp, DateTime start, DateTime ende)
 	    {
 			if (BerechneSollNurBisZumAktuellenTag())
             {
@@ -1827,7 +1834,7 @@ namespace BeWo.Report.ReportObjects
 							{
 								var ts = span.EndDate.Subtract(span.StartDate);
 								abwesenheitsDauer = (decimal)ts.TotalHours;
-								if (abwesenheitsDauer > sollDiesenTag)
+								if (SchneideZuvieleAbwesenheitsstundenAb() && abwesenheitsDauer > sollDiesenTag)
 								{
 									abwesenheitsDauer = sollDiesenTag;
 								}
@@ -2906,7 +2913,7 @@ namespace BeWo.Report.ReportObjects
 
                                             var sollAmTag = AktuellBearbeitetesEmployeeDetail.SollProTag;
 
-                                            if (hours > sollAmTag)
+											if (SchneideZuvieleAbwesenheitsstundenAb() && hours > sollAmTag)
                                             {
                                                 hours = sollAmTag;
                                             }
diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs
index b15faf54f..11c2ec6b5 100644
--- a/Report/ReportObjects/ServicesOverviewRO.cs
+++ b/Report/ReportObjects/ServicesOverviewRO.cs
@@ -387,10 +387,10 @@ namespace BeWo.Report.ReportObjects
                                 {
                                     if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
                                     {
-                                        decimal prozent = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
-                                        if (item.ServiceDescription.ProzentAbrechnung.HasValue)
+                                        decimal prozent = item.ServiceDescription.ServiceCategory.ProzentBudget ?? 100;
+                                        if (item.ServiceDescription.ProzentBudget.HasValue)
                                         {
-                                            prozent = item.ServiceDescription.ProzentAbrechnung.Value;
+                                            prozent = item.ServiceDescription.ProzentBudget.Value;
 
                                         }
                                         minutenIst += (item.RoundedDuration * prozent) / 100;
@@ -463,10 +463,10 @@ namespace BeWo.Report.ReportObjects
                                     item.ServiceDescription.ServiceCategory != null &&
                                     item.ServiceDescription.ServiceCategory.IsBillable)
                                 {
-                                    decimal prozent = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
-                                    if (item.ServiceDescription.ProzentAbrechnung.HasValue)
+                                    decimal prozent = item.ServiceDescription.ServiceCategory.ProzentBudget ?? 100;
+                                    if (item.ServiceDescription.ProzentBudget.HasValue)
                                     {
-                                        prozent = item.ServiceDescription.ProzentAbrechnung.Value;
+                                        prozent = item.ServiceDescription.ProzentBudget.Value;
 
                                     }
                                     minutenIst += (item.RoundedDuration * prozent) / 100;
@@ -549,10 +549,10 @@ namespace BeWo.Report.ReportObjects
                             {
                                 if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable)
                                 {
-                                    decimal prozent = item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
-                                    if (item.ServiceDescription.ProzentAbrechnung.HasValue)
+                                    decimal prozent = item.ServiceDescription.ServiceCategory.ProzentBudget ?? 100;
+                                    if (item.ServiceDescription.ProzentBudget.HasValue)
                                     {
-                                        prozent = item.ServiceDescription.ProzentAbrechnung.Value;
+                                        prozent = item.ServiceDescription.ProzentBudget.Value;
 
                                     }
                                     
@@ -874,10 +874,14 @@ namespace BeWo.Report.ReportObjects
 
                     decimal roundedDur = iSr.RoundedDuration;
                     decimal prozent = iSr.ServiceDescription.ServiceCategory.ProzentAbrechnung;
+                    if (iSr.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iSr.ServiceDescription.ProzentAbrechnung.HasValue && iSr.ServiceDescription.ProzentAbrechnung.Value < 100))
+                    {
+                        prozent = 100; // Keine 
+                    }
                     //if (iSr.ServiceDescription.ProzentAbrechnung.HasValue)
                     //{
                     //    prozent = iSr.ServiceDescription.ProzentAbrechnung.Value;
-                        
+
                     //}
                     roundedDur *= (prozent / 100);
 
diff --git a/Report/ReportObjects/Settlement2RO.cs b/Report/ReportObjects/Settlement2RO.cs
index b2eef023d..ad31f6942 100644
--- a/Report/ReportObjects/Settlement2RO.cs
+++ b/Report/ReportObjects/Settlement2RO.cs
@@ -414,7 +414,7 @@ namespace BeWo.Report.ReportObjects
                     }
 
                     iiRo.AbrechnungsText = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
-                        iiRo.PeriodStartDate, iiRo.PeriodEndDate, iiRo.UnitCount, !iiRo.RateFactor.HasValue ? "" : String.Format("x {0:0.00} ", (iiRo.RateFactor + 100) /100), iiRo.AmountPerUnit);
+                        iiRo.PeriodStartDate, iiRo.PeriodEndDate, iiRo.UnitCount, (!iiRo.RateFactor.HasValue || iiRo.RateFactor.Value == 0) ? "" : String.Format("x {0:0.00} ", (iiRo.RateFactor + 100) /100), iiRo.AmountPerUnit);
 
                     lResult.InvoiceItems.Add(iiRo);
                 }
diff --git a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
index 90916d475..c6686d858 100644
--- a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
+++ b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
@@ -353,9 +353,9 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
             sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
             sb.Append(";");
             sb.Append(ds.Erloeskonto); // HabenKonto
-            sb.Append(";;0;"); // 
+            sb.Append(";;0;\""); // 
             sb.Append(ds.Buchungstext); // Buchungstext
-            sb.Append(";0;;;;0");
+            sb.Append("\";0;;;;0");
             //sb.Append(";0;;;;05;;;;;;");
             //sb.Append(ds.Kostenstelle); // Kostenstelle
             //sb.Append(";");
@@ -375,9 +375,9 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
             sb.Append(ds.Belegnr); // Belegnummer
             sb.Append(";;");
             sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
-            sb.Append(";;");
+            sb.Append(";;\"");
             sb.Append(ds.Buchungstext); // Buchungstext
-            sb.Append(";;;0");
+            sb.Append("\";;;0");
         }
 
         private static void Erstelle1120Satz(StringBuilder sb, FibuNetDatensatz ds)
@@ -395,9 +395,9 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
             sb.Append(ds.Belegnr); // Belegnummer
             sb.Append(";;");
             sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
-            sb.Append(";");
+            sb.Append(";\"");
             sb.Append(ds.Buchungstext); // Buchungstext
-            sb.Append(";0;1");
+            sb.Append("\";0;1");
         }
 
         //private static void Erstelle1110Satz(StringBuilder sb, DataRow row, DateTime date, int rowIndex)
diff --git a/ReportImp/Bewolonia/Bewolonia.csproj b/ReportImp/Bewolonia/Bewolonia.csproj
index 9a0dd3019..fe179a82e 100644
--- a/ReportImp/Bewolonia/Bewolonia.csproj
+++ b/ReportImp/Bewolonia/Bewolonia.csproj
@@ -32,6 +32,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevExpress.Data.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">
+      <Private>False</Private>
+    </Reference>
     <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" />
diff --git a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
index c2030311d..77529f10f 100644
--- a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
+++ b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
@@ -353,9 +353,9 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
             sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
             sb.Append(";");
             sb.Append(ds.Erloeskonto); // HabenKonto
-            sb.Append(";;0;"); // 
+            sb.Append(";;0;\""); // 
             sb.Append(ds.Buchungstext); // Buchungstext
-            sb.Append(";0;;;;0");
+            sb.Append("\";0;;;;0");
             //sb.Append(";0;;;;05;;;;;;");
             //sb.Append(ds.Kostenstelle); // Kostenstelle
             //sb.Append(";");
@@ -375,9 +375,9 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
             sb.Append(ds.Belegnr); // Belegnummer
             sb.Append(";;");
             sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
-            sb.Append(";;");
+            sb.Append(";;\"");
             sb.Append(ds.Buchungstext); // Buchungstext
-            sb.Append(";;;0");
+            sb.Append("\";;;0");
         }
 
         private static void Erstelle1120Satz(StringBuilder sb, FibuNetDatensatz ds)
@@ -395,9 +395,9 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
             sb.Append(ds.Belegnr); // Belegnummer
             sb.Append(";;");
             sb.Append(String.Format("{0:ddMMyyyy}", ds.Belegdatum)); // Belegdatum
-            sb.Append(";");
+            sb.Append(";\"");
             sb.Append(ds.Buchungstext); // Buchungstext
-            sb.Append(";0;1");
+            sb.Append("\";0;1");
         }
 
         //private static void Erstelle1110Satz(StringBuilder sb, DataRow row, DateTime date, int rowIndex)
diff --git a/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj b/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
index db05f337a..63d4cd415 100644
--- a/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
+++ b/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
@@ -82,6 +82,12 @@
     <Compile Include="FLSListReport.Designer.cs">
       <DependentUpon>FLSListReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="ListeTherapieeinheitenSollIst.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ListeTherapieeinheitenSollIst.Designer.cs">
+      <DependentUpon>ListeTherapieeinheitenSollIst.cs</DependentUpon>
+    </Compile>
     <Compile Include="ListeTherapieeinheitenJahr.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -107,6 +113,7 @@
     <Compile Include="ServicesOverviewReport.Designer.cs">
       <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Statistics\CustomServiceRecordStatisticFactory.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CustomerDataReport.resx">
@@ -121,6 +128,9 @@
       <DependentUpon>FLSListReport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ListeTherapieeinheitenSollIst.resx">
+      <DependentUpon>ListeTherapieeinheitenSollIst.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ListeTherapieeinheitenJahr.resx">
       <DependentUpon>ListeTherapieeinheitenJahr.cs</DependentUpon>
     </EmbeddedResource>
@@ -157,6 +167,7 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.Designer.cs b/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.Designer.cs
new file mode 100644
index 000000000..ddfa27253
--- /dev/null
+++ b/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.Designer.cs
@@ -0,0 +1,950 @@
+using BeWo.Report.ReportObjects;
+namespace BeWo.HphBersenbrueckAtz
+{
+    partial class ListeTherapieeinheitenSollIst
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRChart Chart1;
+            DevExpress.XtraCharts.Series series1 = new DevExpress.XtraCharts.Series();
+            DevExpress.XtraCharts.PieSeriesLabel pieSeriesLabel1 = new DevExpress.XtraCharts.PieSeriesLabel();
+            DevExpress.XtraCharts.PieSeriesView pieSeriesView1 = new DevExpress.XtraCharts.PieSeriesView();
+            DevExpress.XtraCharts.PieSeriesLabel pieSeriesLabel2 = new DevExpress.XtraCharts.PieSeriesLabel();
+            DevExpress.XtraCharts.PieSeriesView pieSeriesView2 = new DevExpress.XtraCharts.PieSeriesView();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ListeTherapieeinheitenSollIst));
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.cellMitarbeiterIn = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTable7 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell223 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.cellUeberschrift = new DevExpress.XtraReports.UI.XRTableCell();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell4 = 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.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.tblMonate = new DevExpress.XtraReports.UI.XRTable();
+            this.tblRowSoll = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.tblRowIst = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.tblRowDiff = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
+            Chart1 = new DevExpress.XtraReports.UI.XRChart();
+            ((System.ComponentModel.ISupportInitialize)(Chart1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(series1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesLabel1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesLabel2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tblMonate)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Chart1
+            // 
+            Chart1.AppearanceNameSerializable = "Chameleon";
+            Chart1.BorderColor = System.Drawing.Color.Black;
+            Chart1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            Chart1.DataSource = this.bindingSource1;
+            Chart1.Legend.Name = "Default Legend";
+            Chart1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
+            Chart1.LocationFloat = new DevExpress.Utils.PointFloat(172.8611F, 0F);
+            Chart1.Name = "Chart1";
+            Chart1.PaletteName = "Chameleon";
+            Chart1.PivotGridDataSourceOptions.AutoBindingSettingsEnabled = false;
+            Chart1.PivotGridDataSourceOptions.AutoLayoutSettingsEnabled = false;
+            Chart1.SeriesNameTemplate.BeginText = "anz";
+            series1.ArgumentDataMember = "Name";
+            series1.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.Qualitative;
+            pieSeriesLabel1.LineLength = 7;
+            pieSeriesLabel1.LineVisibility = DevExpress.Utils.DefaultBoolean.True;
+            pieSeriesLabel1.Position = DevExpress.XtraCharts.PieSeriesLabelPosition.Inside;
+            series1.Label = pieSeriesLabel1;
+            series1.Name = "Anzahl";
+            series1.TopNOptions.Count = 7;
+            series1.TopNOptions.Enabled = true;
+            series1.ValueDataMembersSerializable = "Anzahl";
+            series1.View = pieSeriesView1;
+            Chart1.SeriesSerializable = new DevExpress.XtraCharts.Series[] {
+        series1};
+            Chart1.SeriesTemplate.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.Qualitative;
+            pieSeriesLabel2.LineVisibility = DevExpress.Utils.DefaultBoolean.True;
+            Chart1.SeriesTemplate.Label = pieSeriesLabel2;
+            Chart1.SeriesTemplate.ShowInLegend = false;
+            Chart1.SeriesTemplate.View = pieSeriesView2;
+            Chart1.SeriesTemplate.Visible = false;
+            Chart1.SizeF = new System.Drawing.SizeF(691.4447F, 216.6667F);
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO);
+            // 
+            // Detail
+            // 
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox1,
+            this.xrTable6,
+            this.xrTable7,
+            this.xrTable2});
+            this.ReportHeader.HeightF = 90F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(917.1667F, 0F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(120.0001F, 79.06249F);
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTable6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.41667F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 3, 100F);
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow6});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(442.7083F, 28.64583F);
+            this.xrTable6.StylePriority.UseBorders = false;
+            this.xrTable6.StylePriority.UseFont = false;
+            this.xrTable6.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow6
+            // 
+            this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.cellMitarbeiterIn});
+            this.xrTableRow6.Name = "xrTableRow6";
+            this.xrTableRow6.Weight = 1D;
+            // 
+            // cellMitarbeiterIn
+            // 
+            this.cellMitarbeiterIn.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.cellMitarbeiterIn.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.cellMitarbeiterIn.Name = "cellMitarbeiterIn";
+            this.cellMitarbeiterIn.StylePriority.UseBorders = false;
+            this.cellMitarbeiterIn.StylePriority.UseFont = false;
+            this.cellMitarbeiterIn.StylePriority.UseTextAlignment = false;
+            this.cellMitarbeiterIn.Text = "Mitarbeiter/in:";
+            this.cellMitarbeiterIn.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.cellMitarbeiterIn.Weight = 1D;
+            // 
+            // xrTable7
+            // 
+            this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(636.3334F, 0F);
+            this.xrTable7.Name = "xrTable7";
+            this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 3, 100F);
+            this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow7});
+            this.xrTable7.SizeF = new System.Drawing.SizeF(242.6189F, 28.64583F);
+            this.xrTable7.StylePriority.UseBorders = false;
+            this.xrTable7.StylePriority.UseFont = false;
+            this.xrTable7.StylePriority.UsePadding = false;
+            this.xrTable7.StylePriority.UseTextAlignment = false;
+            this.xrTable7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow7
+            // 
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell223});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.Weight = 1D;
+            // 
+            // xrTableCell223
+            // 
+            this.xrTableCell223.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell223.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell223.Name = "xrTableCell223";
+            this.xrTableCell223.StylePriority.UseBorders = false;
+            this.xrTableCell223.StylePriority.UseFont = false;
+            this.xrTableCell223.StylePriority.UseTextAlignment = false;
+            this.xrTableCell223.Text = "Autismus Theraphie Zentrum";
+            this.xrTableCell223.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell223.Weight = 1D;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 3, 100F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(442.7083F, 28.64583F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.cellUeberschrift});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // cellUeberschrift
+            // 
+            this.cellUeberschrift.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.cellUeberschrift.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.cellUeberschrift.Name = "cellUeberschrift";
+            this.cellUeberschrift.StylePriority.UseBorders = false;
+            this.cellUeberschrift.StylePriority.UseFont = false;
+            this.cellUeberschrift.StylePriority.UseTextAlignment = false;
+            this.cellUeberschrift.Text = "Therapieeinheiten Soll/Ist";
+            this.cellUeberschrift.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.cellUeberschrift.Weight = 1D;
+            // 
+            // Title
+            // 
+            this.Title.BackColor = System.Drawing.Color.White;
+            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+            this.Title.ForeColor = System.Drawing.Color.Black;
+            this.Title.Name = "Title";
+            // 
+            // FieldCaption
+            // 
+            this.FieldCaption.BackColor = System.Drawing.Color.White;
+            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+            this.FieldCaption.Name = "FieldCaption";
+            // 
+            // PageInfo
+            // 
+            this.PageInfo.BackColor = System.Drawing.Color.White;
+            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.PageInfo.ForeColor = System.Drawing.Color.Black;
+            this.PageInfo.Name = "PageInfo";
+            // 
+            // DataField
+            // 
+            this.DataField.BackColor = System.Drawing.Color.White;
+            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // fieldFLS
+            // 
+            this.fieldFLS.DataMember = "FLSReportGroups";
+            this.fieldFLS.Expression = "[TotalFLM] / 60";
+            this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldFLS.Name = "fieldFLS";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 50F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.GroupHeader2.HeightF = 23F;
+            this.GroupHeader2.Level = 1;
+            this.GroupHeader2.Name = "GroupHeader2";
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(1029.965F, 23F);
+            this.xrTable3.StylePriority.UseBorders = false;
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UsePadding = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell49,
+            this.xrTableCell3,
+            this.xrTableCell4,
+            this.xrTableCell5,
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell8,
+            this.xrTableCell10,
+            this.xrTableCell13,
+            this.xrTableCell9,
+            this.xrTableCell11,
+            this.xrTableCell12,
+            this.xrTableCell14});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.StylePriority.UseFont = false;
+            this.xrTableRow3.Weight = 0.80290918001034051D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            this.xrTableCell3.StylePriority.UseFont = false;
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "Jan";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell3.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.Text = "Feb";
+            this.xrTableCell4.Weight = 0.24730142981201819D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Text = "Mär";
+            this.xrTableCell5.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "Apr";
+            this.xrTableCell6.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Text = "Mai";
+            this.xrTableCell7.Weight = 0.24730142981201814D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Text = "Jun";
+            this.xrTableCell8.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Text = "Jul";
+            this.xrTableCell10.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Text = "Aug";
+            this.xrTableCell13.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Text = "Sept";
+            this.xrTableCell9.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Text = "Okt";
+            this.xrTableCell11.Weight = 0.24730142981201841D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Text = "Nov";
+            this.xrTableCell12.Weight = 0.24730142981201825D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.Text = "Dez";
+            this.xrTableCell14.Weight = 0.2473014298120183D;
+            // 
+            // GroupHeader3
+            // 
+            this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.tblMonate});
+            this.GroupHeader3.Font = new System.Drawing.Font("Arial", 9F);
+            this.GroupHeader3.HeightF = 69F;
+            this.GroupHeader3.Name = "GroupHeader3";
+            this.GroupHeader3.StylePriority.UseFont = false;
+            // 
+            // tblMonate
+            // 
+            this.tblMonate.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.tblMonate.Font = new System.Drawing.Font("Arial", 10F);
+            this.tblMonate.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.tblMonate.Name = "tblMonate";
+            this.tblMonate.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
+            this.tblMonate.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.tblRowSoll,
+            this.tblRowIst,
+            this.tblRowDiff});
+            this.tblMonate.SizeF = new System.Drawing.SizeF(1029.965F, 69F);
+            this.tblMonate.StylePriority.UseBorders = false;
+            this.tblMonate.StylePriority.UseFont = false;
+            this.tblMonate.StylePriority.UsePadding = false;
+            this.tblMonate.StylePriority.UseTextAlignment = false;
+            this.tblMonate.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            // 
+            // tblRowSoll
+            // 
+            this.tblRowSoll.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell50,
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell17,
+            this.xrTableCell18,
+            this.xrTableCell19,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell24,
+            this.xrTableCell25,
+            this.xrTableCell26});
+            this.tblRowSoll.Name = "tblRowSoll";
+            this.tblRowSoll.StylePriority.UseFont = false;
+            this.tblRowSoll.Weight = 0.80290918001034051D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.StylePriority.UseBorders = false;
+            this.xrTableCell15.StylePriority.UseFont = false;
+            this.xrTableCell15.StylePriority.UseTextAlignment = false;
+            this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell15.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.Weight = 0.24730142981201819D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell19
+            // 
+            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Weight = 0.24730142981201814D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.Weight = 0.24730142981201841D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.Weight = 0.24730142981201825D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.Weight = 0.2473014298120183D;
+            // 
+            // tblRowIst
+            // 
+            this.tblRowIst.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell51,
+            this.xrTableCell1,
+            this.xrTableCell2,
+            this.xrTableCell27,
+            this.xrTableCell28,
+            this.xrTableCell29,
+            this.xrTableCell30,
+            this.xrTableCell31,
+            this.xrTableCell32,
+            this.xrTableCell33,
+            this.xrTableCell34,
+            this.xrTableCell35,
+            this.xrTableCell36});
+            this.tblRowIst.Name = "tblRowIst";
+            this.tblRowIst.Weight = 0.80290918001034051D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell1.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Text = "xrTableCell2";
+            this.xrTableCell2.Weight = 0.24730142981201819D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.Text = "xrTableCell27";
+            this.xrTableCell27.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Text = "xrTableCell28";
+            this.xrTableCell28.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.Text = "xrTableCell29";
+            this.xrTableCell29.Weight = 0.24730142981201814D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.Text = "xrTableCell30";
+            this.xrTableCell30.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.Text = "xrTableCell31";
+            this.xrTableCell31.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.Text = "xrTableCell32";
+            this.xrTableCell32.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell33
+            // 
+            this.xrTableCell33.Name = "xrTableCell33";
+            this.xrTableCell33.Text = "xrTableCell33";
+            this.xrTableCell33.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell34
+            // 
+            this.xrTableCell34.Name = "xrTableCell34";
+            this.xrTableCell34.Text = "xrTableCell34";
+            this.xrTableCell34.Weight = 0.24730142981201841D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.Text = "xrTableCell35";
+            this.xrTableCell35.Weight = 0.24730142981201825D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.Text = "xrTableCell36";
+            this.xrTableCell36.Weight = 0.2473014298120183D;
+            // 
+            // tblRowDiff
+            // 
+            this.tblRowDiff.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell52,
+            this.xrTableCell37,
+            this.xrTableCell38,
+            this.xrTableCell39,
+            this.xrTableCell40,
+            this.xrTableCell41,
+            this.xrTableCell42,
+            this.xrTableCell43,
+            this.xrTableCell44,
+            this.xrTableCell45,
+            this.xrTableCell46,
+            this.xrTableCell47,
+            this.xrTableCell48});
+            this.tblRowDiff.Name = "tblRowDiff";
+            this.tblRowDiff.Weight = 0.80290918001034051D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell37.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell38
+            // 
+            this.xrTableCell38.Name = "xrTableCell38";
+            this.xrTableCell38.Text = "xrTableCell38";
+            this.xrTableCell38.Weight = 0.24730142981201819D;
+            // 
+            // xrTableCell39
+            // 
+            this.xrTableCell39.Name = "xrTableCell39";
+            this.xrTableCell39.Text = "xrTableCell39";
+            this.xrTableCell39.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell40
+            // 
+            this.xrTableCell40.Name = "xrTableCell40";
+            this.xrTableCell40.Text = "xrTableCell40";
+            this.xrTableCell40.Weight = 0.24730142981201816D;
+            // 
+            // xrTableCell41
+            // 
+            this.xrTableCell41.Name = "xrTableCell41";
+            this.xrTableCell41.Text = "xrTableCell41";
+            this.xrTableCell41.Weight = 0.24730142981201814D;
+            // 
+            // xrTableCell42
+            // 
+            this.xrTableCell42.Name = "xrTableCell42";
+            this.xrTableCell42.Text = "xrTableCell42";
+            this.xrTableCell42.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell43
+            // 
+            this.xrTableCell43.Name = "xrTableCell43";
+            this.xrTableCell43.Text = "xrTableCell43";
+            this.xrTableCell43.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell44
+            // 
+            this.xrTableCell44.Name = "xrTableCell44";
+            this.xrTableCell44.Text = "xrTableCell44";
+            this.xrTableCell44.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell45
+            // 
+            this.xrTableCell45.Name = "xrTableCell45";
+            this.xrTableCell45.Text = "xrTableCell45";
+            this.xrTableCell45.Weight = 0.2473014298120183D;
+            // 
+            // xrTableCell46
+            // 
+            this.xrTableCell46.Name = "xrTableCell46";
+            this.xrTableCell46.Text = "xrTableCell46";
+            this.xrTableCell46.Weight = 0.24730142981201841D;
+            // 
+            // xrTableCell47
+            // 
+            this.xrTableCell47.Name = "xrTableCell47";
+            this.xrTableCell47.Text = "xrTableCell47";
+            this.xrTableCell47.Weight = 0.24730142981201825D;
+            // 
+            // xrTableCell48
+            // 
+            this.xrTableCell48.Name = "xrTableCell48";
+            this.xrTableCell48.Text = "xrTableCell48";
+            this.xrTableCell48.Weight = 0.2473014298120183D;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            Chart1});
+            this.GroupHeader1.HeightF = 216.6667F;
+            this.GroupHeader1.Level = 2;
+            this.GroupHeader1.Name = "GroupHeader1";
+            // 
+            // xrTableCell49
+            // 
+            this.xrTableCell49.Name = "xrTableCell49";
+            this.xrTableCell49.StylePriority.UseTextAlignment = false;
+            this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell49.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell50
+            // 
+            this.xrTableCell50.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell50.Name = "xrTableCell50";
+            this.xrTableCell50.StylePriority.UseFont = false;
+            this.xrTableCell50.StylePriority.UseTextAlignment = false;
+            this.xrTableCell50.Text = "Ist";
+            this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell50.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell51
+            // 
+            this.xrTableCell51.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell51.Name = "xrTableCell51";
+            this.xrTableCell51.StylePriority.UseFont = false;
+            this.xrTableCell51.StylePriority.UseTextAlignment = false;
+            this.xrTableCell51.Text = "Soll";
+            this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell51.Weight = 0.24730142981201836D;
+            // 
+            // xrTableCell52
+            // 
+            this.xrTableCell52.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell52.Name = "xrTableCell52";
+            this.xrTableCell52.StylePriority.UseFont = false;
+            this.xrTableCell52.StylePriority.UseTextAlignment = false;
+            this.xrTableCell52.Text = "Differenz";
+            this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight;
+            this.xrTableCell52.Weight = 0.24730142981201836D;
+            // 
+            // ListeTherapieeinheitenSollIst
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.GroupHeader2,
+            this.GroupHeader3,
+            this.GroupHeader1});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.fieldFLS});
+            this.DataSource = this.bindingSource1;
+            this.Landscape = true;
+            this.Margins = new System.Drawing.Printing.Margins(50, 50, 50, 50);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "17.1";
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesLabel1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(series1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesLabel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(pieSeriesView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(Chart1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tblMonate)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell cellUeberschrift;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRTable xrTable6;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+        private DevExpress.XtraReports.UI.XRTableCell cellMitarbeiterIn;
+        private DevExpress.XtraReports.UI.XRTable xrTable7;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell223;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTable tblMonate;
+        private DevExpress.XtraReports.UI.XRTableRow tblRowSoll;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableRow tblRowIst;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.XRTableRow tblRowDiff;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
+    }
+}
diff --git a/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.cs b/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.cs
new file mode 100644
index 000000000..2c67a7a3e
--- /dev/null
+++ b/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.cs
@@ -0,0 +1,314 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using DevExpress.XtraReports.UI;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.Plugins;
+using BS.Shared.Core;
+using DevExpress.XtraPrinting;
+using DevExpress.XtraReports.Native;
+
+namespace BeWo.HphBersenbrueckAtz
+{
+    public partial class ListeTherapieeinheitenSollIst : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
+    {
+        private VacationService vacationService;
+        public ListeTherapieeinheitenSollIst()
+        {
+            InitializeComponent();
+
+        }
+
+        public VacationService VacationService
+        {
+            get
+            {
+                if (vacationService == null)
+                {
+                    vacationService = PluginLoader.FindClass<VacationService>();
+                }
+                return vacationService;
+            }
+        }
+
+        public void SetReportDataSource(QueryRO pRO)
+        {
+            CreateData(pRO);
+            this.bindingSource1.DataSource = pRO;
+        }
+
+        private void CreateData(QueryRO ro)
+        {
+            DateTime abfrageMonat = DateTime.Now;
+
+            long employeeOid = 0;
+
+
+            if (ro.Rows != null && ro.Rows.Count > 0)
+            {
+                if (ro.Rows[0].Field1 != null)
+                {
+                    DateTime dtTemp = DateTime.Now;
+
+                    if (DateTime.TryParse(ro.Rows[0].Field1.ToString(), out dtTemp))
+                    {
+                        abfrageMonat = dtTemp;
+                    }
+                }
+                if (ro.Rows[0].Field2 != null)
+                {
+                    long oid = 0;
+                    if (Int64.TryParse(ro.Rows[0].Field2.ToString(), out oid))
+                    {
+                        if (oid > 0)
+                        {
+                            employeeOid = oid;
+                        }
+                    }
+                }
+            }
+
+            if (employeeOid > 0)
+            {
+                Employee emp = DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid);
+                
+                CreateTabelle(emp, abfrageMonat);
+
+                cellMitarbeiterIn.Text = String.Format("Mitarbeiter/in: {0}", emp.Person.FirstNameLastName);
+                cellUeberschrift.Text = String.Format("Therapieeinheiten Soll/Ist Stand {0:MMMM yyyy}", abfrageMonat);
+            }
+        }
+
+        private void CreateTabelle(Employee emp, DateTime abfrageMonat)
+        {
+            DateTimeSpan span = new DateTimeSpan();
+            span.StartDateTime = abfrageMonat;
+            span.EndDateTime = abfrageMonat.AddYears(1).AddTicks(-1);
+            var srList = DAOFactory.SearchDAO.FindEmployeeServiceRecords(emp.Oid.Value, span, null, null);
+
+            var daten = new TherapieEinheitenSollIst();
+
+            FillIst(daten);
+
+            CreateXrTable(emp, datenListe, abfrageMonat);
+
+            CreateSummen(emp, datenListe, abfrageMonat);
+        }
+
+        private void CreateXrTable(Employee emp, IList<TherapieEinheitenDatenJahr> datenListe, DateTime abfrageMonat)
+        {
+            foreach (var thd in datenListe.OrderBy(d => d.Klient))
+            {
+                CreateCustomerRow(thd, abfrageMonat);
+            }
+            
+        }
+
+        private void CreateSummen(Employee emp, IList<TherapieEinheitenDatenJahr> datenListe, DateTime abfrageMonat)
+        {
+            CreateIstSummen(datenListe, abfrageMonat);
+            var sollEinheiten = CreateSollSummen(emp, datenListe, abfrageMonat);
+
+            CreateDiffSummen(datenListe, sollEinheiten);
+
+
+
+            //var rowSumme = xrTableRowSumme;
+            //var rowWSumme = xrTableRowWochensumme;
+
+            //int days = DateTime.DaysInMonth(abfrageMonat.Year, abfrageMonat.Month);
+
+            //decimal summeWoche = 0;
+            //decimal summeGesamt = 0;
+
+            //for (int i = 0; i < days; i++)
+            //{
+            //    int day = i + 1;
+            //    DateTime dt = new DateTime(abfrageMonat.Year, abfrageMonat.Month, day);
+
+            //    SetBackground(rowSumme.Cells[day], dt, true, true, emp);
+
+            //    decimal summe = 0;
+
+            //    foreach (var daten in datenListe)
+            //    {
+            //        summe += daten.IstProTag[i];
+            //    }
+            //    summeWoche += summe;
+
+            //    if (dt.DayOfWeek == DayOfWeek.Sunday)
+            //    {
+            //        rowWSumme.Cells[i + 1].BackColor = Color.FromArgb(204, 255, 153);
+            //        rowWSumme.Cells[i + 1].Text = String.Format("{0:0.0#}", summeWoche / 60);
+            //        summeWoche = 0;
+            //    }
+            //    else
+            //    {
+            //        rowWSumme.Cells[i + 1].BackColor = Color.Transparent;
+            //    }
+            //    rowSumme.Cells[i + 1].Text = String.Format("{0:0.0#}", summe / 60);
+
+            //    summeGesamt += summe;
+            //}
+            //rowSumme.Cells[rowSumme.Cells.Count - 1].Text = String.Format("{0:0.0#}", summeGesamt / 60);
+            //cellEinheitenIstMonat.Text = String.Format("{0:0.0#}", summeGesamt / 60);
+        }
+
+        private void CreateDiffSummen(IList<TherapieEinheitenDatenJahr> datenListe, TherapieEinheitenSoll sollEinheiten)
+        {
+            decimal summeIst = 0;
+            decimal summeSoll = 0;
+
+            for (int i = 0; i < 12; i++)
+            {
+                var soll = sollEinheiten.SollProMonat[i];
+                decimal ist = 0;
+                foreach (var d in datenListe)
+                {
+                    ist += d.IstProMonat[i] / 60;
+                }
+
+                var diff = ist - soll;
+
+                rowIstMinusSollSumme.Cells[i].Text = String.Format("{0:0.0#}", diff);
+
+                summeIst += ist;
+                summeSoll += soll;
+                
+
+                rowIstMinusSollSummeKumuliert.Cells[i].Text = String.Format("{0:0.0#}", summeIst - summeSoll);
+            }
+
+            cellGesamtIstMinusSoll.Text = String.Format("{0:0.0#}", summeIst - summeSoll);
+        }
+
+
+        private void InsertIstDaten(IList<ServiceRecord> srList, TherapieEinheitenSollIst daten)
+        {
+            foreach (var sr in srList)
+            {
+                if (sr.CustomerOid.HasValue)
+                {
+                    long oid = sr.CustomerOid.Value;
+
+                    daten.IstProMonat[sr.Start.Value.Month - 1] += sr.RoundedDuration;
+                }
+            }
+        }
+
+        private void InsertSollDaten(Employee emp, DateTime abfrageMonat, TherapieEinheitenSollIst daten)
+        {
+            
+            decimal summe = 0;
+
+            for (int i = 0; i < 12; i++)
+            {
+                var mb = new MitarbeiterstundenkontoBerechnung();
+
+                var ro = new MitarbeiterstundenkontoRO();
+                ro.ReportStartDate = new DateTime(abfrageMonat.Year, i + 1, 1);
+                ro.ReportEndDate = ro.ReportStartDate.AddMonths(1);
+
+                var empDetail = new MitarbeiterstundenkontoRO.EmployeeDetail();
+                empDetail.Employee = emp;
+                ro.EmployeeDetailList.Add(empDetail);
+
+                mb.CreateReport(ro);
+
+                daten.SollProMonat[i] = empDetail.FlsSoll;
+
+                rowSollSumme.Cells[i].Text = String.Format("{0:0.0#}", empDetail.FlsSoll);
+
+                summe += empDetail.FlsSoll;
+
+                rowSollSummeKumuliert.Cells[i].Text = String.Format("{0:0.0#}", summe);
+            }
+
+            cellGesamtSummeSoll.Text = String.Format("{0:0.0#}", summe);
+            return solleinheiten;
+        }
+
+        private void CreateIstSummen(IList<TherapieEinheitenDatenJahr> datenListe, DateTime abfrageMonat)
+        {
+            decimal summe = 0;
+
+
+            for (int i = 0; i < 12; i++)
+            {
+                decimal summeMonat = 0;
+                foreach (var d in datenListe)
+                {
+                    summeMonat += d.IstProMonat[i];
+                }
+                rowIstSumme.Cells[i].Text = String.Format("{0:0.0#}", summeMonat / 60);
+
+                summe += summeMonat;
+                rowIstSummeKumuliert.Cells[i].Text = String.Format("{0:0.0#}", summe / 60);
+            }
+
+            cellGesamtSummeIst.Text = String.Format("{0:0.0#}", summe / 60);
+        }
+
+
+        private void CreateCustomerRow(TherapieEinheitenDatenJahr thd, DateTime abfrageMonat)
+        {
+            
+            var newCustomerRow = tblCustomer.InsertRowBelow(tblCustomer.Rows[tblCustomer.Rows.Count - 1]);
+            newCustomerRow.Cells[0].Text = thd.Klient;
+            newCustomerRow.Cells[0].CanGrow = false;
+
+            var newMonatsRow = tblMonate.InsertRowBelow(tblMonate.Rows[tblMonate.Rows.Count - 1]);
+            
+            decimal summe = 0;
+
+            for (int i = 0; i <= 11; i++)
+            {
+                
+                if (thd.IstProMonat[i] > 0)
+                {
+                    newMonatsRow.Cells[i].Text = String.Format("{0:0.0#}", thd.IstProMonat[i]/60);
+
+                    summe += thd.IstProMonat[i];
+                }
+                
+            }
+            
+            var newSummeRow = tblSummeCustomer.InsertRowBelow(tblSummeCustomer.Rows[tblSummeCustomer.Rows.Count - 1]);
+            newSummeRow.Cells[0].Text = String.Format("{0:0.0#}", summe / 60);
+
+            tblCustomer.Rows[0].Visible = false;
+            tblMonate.Rows[0].Visible = false;
+            tblSummeCustomer.Rows[0].Visible = false;
+
+        }
+
+        
+    }
+
+    class TherapieEinheitenSollIst
+    {
+        public TherapieEinheitenSollIst()
+        {
+            SollProMonat = new decimal[12];
+            IstProMonat = new decimal[12];
+        }
+        public decimal[] SollProMonat { get; set; }
+
+        public decimal[] IstProMonat { get; set; }
+
+        public decimal GetDiff(int monat)
+        {
+            return SollProMonat[monat - 1] - IstProMonat(monat);
+        }
+
+
+
+    }
+
+
+}
diff --git a/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.resx b/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.resx
new file mode 100644
index 000000000..65da193a3
--- /dev/null
+++ b/ReportImp/HphBersenbrueckAtz/ListeTherapieeinheitenSollIst.resx
@@ -0,0 +1,205 @@
+<?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="Chart1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 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>
+        iVBORw0KGgoAAAANSUhEUgAAAEQAAAA+CAIAAAAdyCpCAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAEMBJREFUaEPNWgdcVFe+vjFrYmLiJptkk7zE+OK+TVzfGt1dk92oscdeUowajRUQ
+        hjJ0ARHEiGAEK2KiERUUBaRKb6KIdKV3ATEgHekMbe5+556Zy3AHmJHEt+//+3443nvO/9zvnn89MwzL
+        Sn8FZNLV3V3woDrwdubBSxFbHTxm6R19b4Pt2MWGzy42LK2q54YIJj4VjI6MTB7WNJ4LubPe7vyfNts9
+        u8iQ+ViTmbGd+UTruSVGkzbu+1jkvGbP2ZqmFm6sQMNTwZOSoQ8mDU3MAYc3vrBiPtNl/qnFfKr96urd
+        C01O7nULCUrILnpY09rRKRtMRKDkaeGJyOCP9HJU6j9FzswCA2aeHvOZaOznRvONTrgG3JKbk0AEGp4u
+        1CRDJCo1f5beEWau3pjFYpB5fonxxv3n4zNL6F25CCb+n0IdMmxDc5vmYc8xCw3GLBKPW2YCPkvNXO9k
+        l9LH50Qw5T+DkckQib1b+OfN++EbE1aZY0PeWGv5c3ACvaU0/j+MEcgQOeEbRyPsK2t2gw/MrLCiht5S
+        Gv+kUBTBrVFiODJETE/7w8VfXGH6+9WEyaYDF7okPdwdweBRgEhqfnlsemFrO417ggGjwZBkiIiOejGz
+        dV5eZU6Z6By5Sq8rDR4Nmts611qffWahmJmv//7GfQnZ938TzcpkiBif8gMTOMkrayzABEmdXlcaPDqw
+        R71jmU805W9K9KnuEamUXFcaqQ54GYqMs1cMM0eElQiTBfrzxMd7envp6N8IrKNnJAoFMCFk5un9Y9dh
+        aX//ky8hk8bHGf39ElwRkGEjUvKeWWAwfoXZK6t3j1tq8scvrSpqGrkpisNGDZnAzBaZuHBpVxfhMTw5
+        j7ssGDwcZNLT21pe4XMjYb1X4Ls1dbdwRZEMW9PYMvEbGyR1MCHvbK6eR2QKN5EfMwoMSJeku6m1vf5x
+        awc+dffcyb4fd6+oraOLuymYNRyItLaV5OQfDo2Z6xU40ef6ZPxNzTDD9UFkvrN3Z+bqIgqDyTMLDT43
+        PcXN5Qc8MaTS/qr6x2FJuYc8o3Y4XsJuTN1m//paywkrzT/ScNxs737S72ZuWRW3CkQ4XRnVtXGJabr+
+        oX/FbvgGfxgQ9hHgFzIlJHpOX18nT4aNSM5j5unD6cEEf59dJJaXKgO6RoRAyMW+/v7Kuqb88kcllbW/
+        1DZVNTwuqayLvVu0+6fAF5ebUjN77nOjdbbnyh818LNGQGKa6NK13/uH/i+lIcc0n6DJTc3ZMjJ9fX2f
+        6DijWqFOiQ94i+po50CkS1KLrcdrKyh27e1t464N3FWWs8EJiMtY6+WV5qD0zjrrjOJfuDu8WmWwj5uz
+        sSHYmcFkPsJGlT7wpGRY7xt3YWCUCQBvcY9IVqWagu3t7ZB0N0bdXOnp90fvwEmefq/HJ2/v7+9WGqkI
+        1i00ETtDl6Nhc+p2e1UJlMjNxM3wEwEZ76D/vptlzZGRSueKj/PbgpT/5ld7ahvVaarYRzUxhSWn6xtT
+        rwa8TfXitfkEvd/SWjT8dLa6oXnyJjtES7oi4YM3OFsHrcTwsyjYkrIL2AeeBoVv8AdxCRtAhk3OK/vd
+        YkPqLcAzi8TLdp9WpRQgpuUXOvVhVXB3z+PA8BnUKa/4vxUeu7CnZ7h3wSIkfKx9GAGGRhoezEKDVZY/
+        DTOLB9vcku8X8heBpcGLQqPnEDIk3w+2sb3nglUpBdjM3APu3i9WVUfhc31D8s0734bFzr+dvLO5pUBh
+        uuIHNiw59/1v98GoYFr8ihRjlxjN0DrUryJ7sn19XeGxi/hQpoDpDALOtJ0OY5cY80phymgnR9QIsD09
+        zSFRs7wD34tLWN8lqePGDyFYWyrtw5SOrm7UFm99tYecFszXRyXOr0iBZ5ihCTIYDBEsx4NIfNJWZbfx
+        D53G3K+sfX6pMS2TAC4oG964V8jNEihSBIukC9/A+7h2/U/Y4rtZe0vLL1dWR1Y+inhYeR2fM3L2p2da
+        1dbdlkpRDUlRE9U2tTS2tBdU1JwLSUQ9hu6IZwLAaeWZDSJYThFsWoa5d9AkAZnA8L8xfrcyYFe8RrAa
+        t9Q4Nf+BSo3FpXDEiZyi6Uhb2CL8F2sgsOCDh8/46FurGxrTB+sZkN7evu/sL6J0otUGgMcwdfXnbvLj
+        hwQxbyynyMQvZCoclbFxC+ZDJCXzwlKTtALVZPKLXORkBgG+iJWy83/gNEAEE3mwLW0d735j88Jy0i8R
+        MvMNkLhHnELBZuU5eA9e+lrwn+OTtjFf2fw8RsF8YWaoze7kqGwwWCRHZTL+YdPApLCEBiWIYJYA7Lp9
+        56ixPbfEeMo2e5Rs6syCSQt2BvktK9eegc+9sHwg3k/AG1pgEJSQpUopW1bhJXg9sDfQw0rcXIhgijJY
+        LacrqKFIkpkjOnyFREWlMQIQSUwVce46sDSyQkVlIPPml3t476eA7R7zieVmCRQpgm1oSsfmIobwGhEu
+        Q2PmDa5lRgZL+01EoPc22KKgVmMiGRATvxZL8+viGZA0W9vuM3yuHCAzX3+bI20tBYoUAQ9ux6P7hkzh
+        lWJbYHuqJvJgu3t6pm4/CCbYlp+Cbqs3ke3sqg6K+Ac8nl8XTCJuLEHMHILMc0uNsUZ3j8rukk3LtOTd
+        BinZN+RDlK6qZvFg7xVVoKLBu/tMfIzLlYIBQ4JFjkbA5JkAXgHvIiTgFvPaGksBH/wX1Y0ahwzI+ilI
+        XnB6aESJERz5L0m3+mf+7AH3cGaW9vhlJln3K9Wfhdyl6P3kJQZ/0NxCwiAzZcsBepikCARrvePeaizA
+        3krcQt8TyKBD6u5pVmMWwPb29U3XPMR8rOHid1O9KQAsszk46lOsxZNBZktI0aAamKXmrr/73EhABp0T
+        un900XTQ8CAlGQILXg+MOChiJgxa1RQKNjw5l5mxfdOBi+qNp0DJfFGxZIbr+1x/v75R1tszRi6+KPsE
+        ZLjzS5H+CR86aESQ4sIr4B2oxnY3NN1VYwrAztI/OmWTXVun+gcAJOSExS7AKnIyJBMkpxvwGpgLYUmK
+        JTMFUs1LK8y+s3dXJwxIJA0h0bOvXf8fqC4uPa9qPMBGpxVMWGGGFlqNwTzYvKIT3FubTskgkAaGT2/v
+        eMgrYTKKH6Ldn7BKRmPCanPY2I5Dl139b2k7X/lmnxs3FKKoVwC2ppYUnfBL1P+qBqPi7FtjdSYi5cmO
+        l+DicBWFiDwNxJC4FZUwnZLuSRttxy2TFQGoAMYsFLuFJBqc8GH+tgPdn8PlSG4CFV67AKhuTl/xfxPL
+        dCi8qqHARqfm+8bdG3GMAIgWHWjLubKfbsv0qwH/RY+XFEeS5myz/UV6tkAxfoXZH9ZYYL2/7nRA9/f8
+        EmOPiBTXgPgH1SMcoBBJz7S46DVu5LyJfFKh3kGMHESS0vU5v5cxgT3fuL0OnRJ3c2AwIRMQn6lYOBPv
+        n6XzkYbjrYziiettnl9mgtITCWHaDgfudHNg8mCwaMJuJW1F/9zXJxEsMxgj3BKAyL1sGxpgKBMYc0Tc
+        Enk7OGg8IdPZ1f3hlgOoW8EEGROYa3gcXeFBj4iJG2zRM8EIxy42/HLvWVXxAH2lJCZ+jbxqFtx9UhAN
+        6VlWHBNaAZI9iYxb2tn5iN4VAGTwD3vIMwoFEqrX8StM3/lm792CBygxmJkaML/FZqdQnGPr3vzK6nRA
+        PKcFMkiLAkg7nZFt29VVO+KwkUFE0t2YkLJTgck0+ElcwgaJZNgiQ0amsbkNfRI9+8FWbHXw+MEzao6O
+        01Hv2GNeMZciU1Za/ohgAOBW/WNaF0MG6ZKDHGl3dlYpXVcTRGrqbofFLJAXftMRheEzaZkWfeS0HyKY
+        IgMlA7DHr93A5lC3QZ6xdQvBPpBO/TPdd9fv/TEw/vuLYa9/Ycn8fcfkb+2uRKdxSqkMqJODiuCiakil
+        /S2tRcnpYk/f1y77vgb3AJ+r/m/DD8sqVH/bxZORwh9mkuMsMQIA3AZB7NnFhnCkV9ZYwGfodnmEJ+Mv
+        qDIzdy4ycYlKpUdKVAaUjhpwuV+qQvKKTpaUud8vv8zhEkqYtvYy2SJKUxQxQAYDk/PK4OgIzSQSyIMb
+        D1Q9b6+ztjoTdDYoAdEclTXzieZs/aPuEcmNzbSv4oXXOQoMJ4JhQ0CRDMB9pzVbR0CDggsPZogEkzfZ
+        mbr6wwjxl8SG2ToTVpqv2+cGViW/1MpP8RRFplxBBlaUC39lZCiK8KKADLmx3s4NVabg7JQHKKFlQJSD
+        /3xte87eI9z5aozeMe9/6R154wurV1dbfLDlwHKLHw1OXHO6GuMRmcKVkkRzbV1dVk5uTl5eezu2Ubbc
+        /dKyrNzcouJi7uxPdnEENDQ0QEl2bl5LKyp62cWy8gfZeXl5BQVDkGnvlMB4mLl6yieoinh5lfmYRYbw
+        MeQixDrjU37IS46XIi3PBGkfufrt9xfW7jmzbt85eR/BXg8N36op0tATFxYX0ytY7sAh5227dC1t93d1
+        qfMFOht9I26rlmiHSD8ji7a0RJyOu+zUNdAzNlMmA7B1j1v/rvUDx0fIQRkvrTRDR4SogGjx1tfW0zQc
+        FxifXGt99mtbty0OHrWyn2ixYZHRu/SN9Ex2F9+nPSxEevjYSW2xsd3BQxIJrU2GE9mDxcXf3mVgJDIy
+        xebQG5CTp8/oGpuZWu0dkgzA1ja1kp/9yIO1msB2oegGK0RCmCJI8r92AhltA2N9090lpQM/ugEZHUMT
+        nkxHR0dpWRlMsaOjPTe/4HZiEj739vK/pCBkQB6PnjOYjJ6J+QhkALa1o+trm5+Z2SK8e/4QVX2QgnWt
+        ZbmsPB0gU1peTq9AnAaTSUlL19A1MDS33Lvfftsu0Xca2tgH+x+cK6tk33vyZECVXoG4/HhWJRmAiO35
+        EDQ89OczgscdGcpkdMTGJpbWjs7Hjrqc5uBqYWMnNrPgyWTn5sKExOaW3zsejoq9ERoRZW5tq6VvePDw
+        ke5uctgJMjpiE2OLPQ5OR+RKTlvt+97Y0lolGYAIkuNUhOA55Hc06m/RkGSwpIHpbjgrBbhhH3gyOXn5
+        eOu6RqYFRfSLN/ayl4/I0ERkKLtCyRAlZha8EnDDFXXIUBCTszwT+PJKM0QFWJ3guYfEkGaGh0hOS6+u
+        qeVQ4+B0FFshIIPn48lExsTCroCEJPIdKzUzGFX8nUS5klrnE6dgveqTAYjklT/a7njppeWmzFxdvjkd
+        DsP5TPkD+hUDEURVRZ/hyeQX0i+IZGSwpYkp5AiGkhGRATK2EDV9RhlEcsuqkFUmbbBFNYCQBVaCY0SK
+        4cgIQrMyGZhZabmsGPO44kXMzMi0hJvFBwBBaB4dGQoiTS3tV2LSNu4/P2kjaeCwV0g1iMUvLDeFHYIe
+        YvSrT04G24KQcPaCO9JiTNxNPKKmnhgb2Mv9GOlpkKGQSVNre+zdQofLkRv2n5+p7YROG0yQarBpiIGl
+        VbKvO4NCwrdo6iDyFgyqAJwQgi1tZBUAJWO2xwZevk1LtEVTW0vP0MH5WF2dLFmhAtiipbNDR29QBXDM
+        ZadIHwx/DRkeCiKVNjS3FVZUowCPTM0PTczp6CI/ngJqamvxBFk5OW3t6O1kc7FLmdnZcHf6vSwxMyMz
+        xLf4hDt3kpIjomPuZWYpJE1pfX09lGRm57S0DNRmyLOZOTlIr78JGUUMKcq3lMeTz5QMNkcxSHCiPB4i
+        vPibk/k1QNLM09AVb9fWlUczwQAV+P9FBmU8kkZ4VExLa6vSXVVgpf8G8GeiFFI1UfUAAAAASUVORK5C
+        YII=
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ReportImp/HphBersenbrueckAtz/Statistics/CustomServiceRecordStatisticFactory.cs b/ReportImp/HphBersenbrueckAtz/Statistics/CustomServiceRecordStatisticFactory.cs
new file mode 100644
index 000000000..260210140
--- /dev/null
+++ b/ReportImp/HphBersenbrueckAtz/Statistics/CustomServiceRecordStatisticFactory.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+
+namespace HphBersenbrueckAtz.Statistics
+{
+	public class CustomServiceRecordStatisticFactory : ServiceRecordStatisticFactory
+	{
+		public override ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, DateTime statisticsDate)
+		{
+		    
+		    var stats = CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate);
+
+            var dc = new ServiceRecordStatisticsInfoDC();
+            dc.Header = new string[5];
+            dc.Header[0] = "Bewilligungszeitraum:";
+            dc.Header[1] = "Geleistet diese Woche/Gesamt:";
+            dc.Header[2] = "Bewilligt pro Woche/Gesamt:";
+            dc.Header[3] = "Frei pro Woche(Ø)/Gesamt:";
+            dc.Header[4] = "Berichterstellung bis:";
+
+
+            dc.ForegroundColor = new string[5];
+            dc.ForegroundColor[0] = "#FF2B508B";
+            dc.ForegroundColor[1] = "#FF2B508B";
+            dc.ForegroundColor[2] = "#FF2B508B";
+            dc.ForegroundColor[3] = "#FF2B508B";
+            dc.ForegroundColor[4] = "#FFFF0000";
+
+            dc.PeriodStatisticInfos = new List<ServiceRecordPeriodStatisticsInfoDC>();
+
+
+            if (stats != null)
+            {
+                
+                foreach (var pdc in stats.PeriodStatistics)
+                {
+                    bool showOutOfPeriod = stats.PeriodStatistics.Count == 1;
+                    dc.PeriodStatisticInfos.Add(CreateServiceRecordPeriodStatisticsInfo(stats, pdc, showOutOfPeriod, costBearer2SupportConceptOid));
+                }
+            }
+            return dc;
+        }
+
+        //private bool IsMonatsBewilligung(long costBearer2SupportConceptOid)
+        //{
+        //	var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(costBearer2SupportConceptOid);
+
+        //	foreach (var ap in c2s.ApprovalPeriodList)
+        //	{
+        //		if (ap.ApprovedBEInterval.HasValue && ap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly)
+        //		{
+        //			return true;
+        //		}
+        //	}
+        //	return false;
+        //}
+
+        //public ServiceRecordPeriodStatisticsInfoDC CreateTotalStatistics(SupportConceptStatisticsDC stats)
+        //{
+        //	var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(4);
+        //	dc.LeftValues[0] = "Gesamt";
+
+        //	dc.LeftValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedThisMonth / 60);
+        //	dc.RightValues[1] = String.Format("{0:0.00}", stats.MinutesProvidedTotalRounded / 60);
+
+        //	dc.LeftValues[2] = String.Format("{0:0.00}", stats.MinutesApprovedPerMonth / 60);
+        //	dc.RightValues[2] = String.Format("{0:0.00}", stats.MinutesApprovedTotal / 60);
+
+
+        //	dc.LeftValues[3] = String.Format("{0:0.00}", (stats.SollTotalUntilThisMonth - stats.IstTotalUntilThisMonth) / 60);
+
+        //	return dc;
+        //}
+
+        public ServiceRecordPeriodStatisticsInfoDC CreateServiceRecordPeriodStatisticsInfo(SupportConceptStatisticsDC stats, SupportConceptPeriodStatisticsDC periodStats, bool showOutOfPeriod, long costBearer2SupportConceptOid)
+        {
+            DateTime? berichterstellung = null;
+
+            var dc = CreateDefaultServiceRecordPeriodStatisticsInfo(5);
+
+            if (periodStats.SupportConceptApprovalPeriod != null)
+            {
+                if (periodStats.SupportConceptApprovalPeriod.ServiceCategory != null)
+                {
+                    if (periodStats.SupportConceptApprovalPeriod.StartDate.HasValue && periodStats.SupportConceptApprovalPeriod.EndDate.HasValue &&
+                        periodStats.SupportConceptApprovalPeriod.StartDate.Value.Date == stats.StatisticsStartDate.Date &&
+                        periodStats.SupportConceptApprovalPeriod.EndDate.Value.Date == stats.StatisticsEndDate.Date)
+                    {
+                        dc.LeftValues[0] = periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name;
+                    }
+                    else
+                    {
+                        dc.LeftValues[0] = String.Format("{0}: {1:dd.MM.yy} - {2:dd.MM.yy}",
+                                                       periodStats.SupportConceptApprovalPeriod.ServiceCategory.Name,
+                                                       periodStats.SupportConceptApprovalPeriod.StartDate,
+                                                       periodStats.SupportConceptApprovalPeriod.EndDate);
+                    }
+                }
+                else
+                {
+                    dc.LeftValues[0] = String.Format("{0:dd.MM.yy} - {1:dd.MM.yy}",
+                                                   periodStats.SupportConceptApprovalPeriod.StartDate,
+                                                   periodStats.SupportConceptApprovalPeriod.EndDate);
+                }
+                var c2s = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(costBearer2SupportConceptOid);
+                foreach (var vv in c2s.SupportConcept.VarFieldValueList)
+                {
+                    var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
+
+                    if (varFieldValue != null && vv.VarFieldDefOid == 2)
+                    {
+                        berichterstellung = DateTime.Parse(varFieldValue.ToString());
+
+                    }
+
+                }
+            }
+            dc.LeftValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedThisWeek / 60);
+            dc.RightValues[1] = String.Format("{0:0.00}", periodStats.MinutesProvidedTotalRounded / 60);
+
+            dc.LeftValues[2] = String.Format("{0:0.00}", periodStats.MinutesApprovedPerWeek / 60);
+            dc.RightValues[2] = String.Format("{0:0.00}", periodStats.MinutesApprovedTotal / 60);
+
+            dc.LeftValues[3] = String.Format("{0:0.00}", periodStats.MinutesFreePerWeek / 60);
+
+            var freeTotal = (periodStats.MinutesApprovedTotal - periodStats.MinutesProvidedTotalRounded);
+
+            dc.RightValueColors[3] = "#FF008000";
+            if (periodStats.MinutesApprovedTotal > 0)
+            {
+                var percent = (freeTotal / periodStats.MinutesApprovedTotal);
+                if (percent < 0.2m)
+                {
+                    dc.RightValueColors[3] = "#FFFF0000";
+                }
+            }
+
+            dc.RightValues[3] = String.Format("{0:0.00}", freeTotal / 60);
+
+            if (berichterstellung.HasValue)
+            {
+                dc.LeftValues[4] = String.Format("{0:dd.MM.yyyy}", berichterstellung);
+                dc.LeftValueColors[4] = "#FFFF0000";
+            }
+
+            return dc;
+        }
+
+        //public override SupportConceptStatisticsDC CreateSupportConceptStatistics(long costBearer2SupportConceptOid, DateTime statisticsDate)
+        //{
+        //	if (IsMonatsBewilligung(costBearer2SupportConceptOid))
+        //	{
+        //		return null;
+        //	}
+        //	return base.CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate);
+        //}
+    }
+}
diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs
index c559893f3..49b018830 100644
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs
@@ -66,7 +66,11 @@ namespace HphBersenbrueckFreizeitUndReisen
 									satz = "Es handelt sich hierbei um ein Betreuungsangebot der Verhinderungspflege nach § 39 SGB XI.";
 								}
 							}
-							
+							if (i.ServiceDescription.Contains("Betreuungskosten Kurzurlaub"))
+                            {
+								i.ServiceDescription = i.ServiceDescription.Replace("Betreuungskosten Kurzurlaub", "Betreuungskosten");
+
+							}
 							//if (i.HourlyRate.HasValue)
 							//{
 							//	hourlyRate = i.HourlyRate.Value;
diff --git a/ReportImp/KetteReports/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs b/ReportImp/KetteReports/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs
index d17704dc9..1b2bb642a 100644
--- a/ReportImp/KetteReports/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs
+++ b/ReportImp/KetteReports/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs
@@ -179,7 +179,12 @@ namespace KetteReports
 			return true;
 		}
 
-	    public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
+        protected override bool SchneideZuvieleAbwesenheitsstundenAb()
+        {
+            return false;
+        }
+
+        public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
 	    {
 	        var dd = base.CreateDayDetail(date, ed);
 	        dd.MaxHoursUntilBreak = null;
diff --git a/ReportImp/KetteReports/SettlementReport2.cs b/ReportImp/KetteReports/SettlementReport2.cs
index 8abdd5037..27da98268 100644
--- a/ReportImp/KetteReports/SettlementReport2.cs
+++ b/ReportImp/KetteReports/SettlementReport2.cs
@@ -74,10 +74,14 @@ namespace BeWo.KetteReports.Neu
             {
                 foreach (var ii in pRO.InvoiceItems)
                 {
-                    ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
-                        ii.PeriodStartDate, ii.PeriodEndDate,
-                        ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ",
-                        ii.AmountPerUnit);
+                    if (ii.RateFactor.HasValue && ii.RateFactor.Value > 0)
+                    {
+                        ii.DetailDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}", ii.PeriodStartDate, ii.PeriodEndDate, ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ", ii.AmountPerUnit);
+                    }
+                    else
+                    {
+                        ii.DetailDescription = String.Format("Fehlkontakte {0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} Std. x {3:c}", ii.PeriodStartDate, ii.PeriodEndDate, ii.UnitCount, ii.AmountPerUnit);
+                    }
 
                     if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
                     {
diff --git a/ReportImp/KetteReports/SettlementReport2.designer.cs b/ReportImp/KetteReports/SettlementReport2.designer.cs
index 6d80dd2f9..925a10af9 100644
--- a/ReportImp/KetteReports/SettlementReport2.designer.cs
+++ b/ReportImp/KetteReports/SettlementReport2.designer.cs
@@ -81,6 +81,15 @@ namespace BeWo.KetteReports.Neu
             this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = 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.xrTableRow41 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -101,23 +110,14 @@ namespace BeWo.KetteReports.Neu
             this.xrTableRow47 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -597,7 +597,7 @@ namespace BeWo.KetteReports.Neu
             this.xrTableCell35.BorderColor = System.Drawing.SystemColors.ControlLight;
             this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")});
             this.xrTableCell35.Name = "xrTableCell35";
             this.xrTableCell35.StylePriority.UseBorderColor = false;
             this.xrTableCell35.StylePriority.UseBorders = false;
@@ -618,6 +618,97 @@ namespace BeWo.KetteReports.Neu
             this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell36.Weight = 0.23076923076923078D;
             // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)});
+            this.GroupHeader1.HeightF = 0F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            // 
+            // Zwischensumme
+            // 
+            this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable6});
+            this.Zwischensumme.HeightF = 34F;
+            this.Zwischensumme.Name = "Zwischensumme";
+            this.Zwischensumme.Visible = false;
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow12,
+            this.xrTableRow1});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F);
+            this.xrTable6.StylePriority.UseFont = false;
+            // 
+            // xrTableRow12
+            // 
+            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9,
+            this.xrTableCell10});
+            this.xrTableRow12.Name = "xrTableRow12";
+            this.xrTableRow12.Weight = 0.40476190476190466D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseBorderColor = false;
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:";
+            this.xrTableCell9.Weight = 2.3076923076923079D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell10.StylePriority.UseBorderColor = false;
+            this.xrTableCell10.StylePriority.UseBorders = false;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:c}";
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell10.Summary = xrSummary1;
+            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell10.Weight = 0.69230769230769229D;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 0.40476190476190466D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.StylePriority.UseBorderColor = false;
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.Weight = 3D;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -838,97 +929,6 @@ namespace BeWo.KetteReports.Neu
             this.xrTableCell74.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
             this.xrTableCell74.Weight = 0.23076923076923078D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
-            // 
-            // GroupHeader1
-            // 
-            this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
-            new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)});
-            this.GroupHeader1.HeightF = 0F;
-            this.GroupHeader1.Name = "GroupHeader1";
-            // 
-            // Zwischensumme
-            // 
-            this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable6});
-            this.Zwischensumme.HeightF = 34F;
-            this.Zwischensumme.Name = "Zwischensumme";
-            this.Zwischensumme.Visible = false;
-            // 
-            // xrTable6
-            // 
-            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrTable6.Name = "xrTable6";
-            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow12,
-            this.xrTableRow1});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F);
-            this.xrTable6.StylePriority.UseFont = false;
-            // 
-            // xrTableRow12
-            // 
-            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell9,
-            this.xrTableCell10});
-            this.xrTableRow12.Name = "xrTableRow12";
-            this.xrTableRow12.Weight = 0.40476190476190466D;
-            // 
-            // xrTableCell9
-            // 
-            this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell9.StylePriority.UseBorderColor = false;
-            this.xrTableCell9.StylePriority.UseBorders = false;
-            this.xrTableCell9.StylePriority.UseFont = false;
-            this.xrTableCell9.StylePriority.UsePadding = false;
-            this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:";
-            this.xrTableCell9.Weight = 2.3076923076923079D;
-            // 
-            // xrTableCell10
-            // 
-            this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
-            this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell10.StylePriority.UseBorderColor = false;
-            this.xrTableCell10.StylePriority.UseBorders = false;
-            this.xrTableCell10.StylePriority.UseFont = false;
-            this.xrTableCell10.StylePriority.UsePadding = false;
-            this.xrTableCell10.StylePriority.UseTextAlignment = false;
-            xrSummary1.FormatString = "{0:c}";
-            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell10.Summary = xrSummary1;
-            this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell10.Weight = 0.69230769230769229D;
-            // 
-            // xrTableRow1
-            // 
-            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1});
-            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.Weight = 0.40476190476190466D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell1.StylePriority.UseBorderColor = false;
-            this.xrTableCell1.StylePriority.UseBorders = false;
-            this.xrTableCell1.StylePriority.UseFont = false;
-            this.xrTableCell1.StylePriority.UsePadding = false;
-            this.xrTableCell1.Weight = 3D;
-            // 
             // Spitzabrechnung
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -954,9 +954,9 @@ namespace BeWo.KetteReports.Neu
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
diff --git a/ReportImp/SehtMuenster/Quittierungsbeleg.Designer.cs b/ReportImp/SehtMuenster/Quittierungsbeleg.Designer.cs
index a4e22907c..1190989c2 100644
--- a/ReportImp/SehtMuenster/Quittierungsbeleg.Designer.cs
+++ b/ReportImp/SehtMuenster/Quittierungsbeleg.Designer.cs
@@ -111,6 +111,11 @@ namespace SehtMuenster
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
+            this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -223,7 +228,7 @@ namespace SehtMuenster
             // xrTableCell2
             // 
             this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
             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;
@@ -686,6 +691,11 @@ namespace SehtMuenster
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel17,
+            this.xrLabel21,
+            this.xrLabel20,
+            this.xrLabel18,
+            this.lblFehlkontakt,
             this.lblUnterschriftKlient,
             this.lblUnterschriftMitarbeiter,
             this.xrTableAbwesenheiten,
@@ -700,7 +710,7 @@ namespace SehtMuenster
             this.xrLabel10,
             this.xrLabel9,
             this.xrLabel1});
-            this.GroupFooter1.HeightF = 270F;
+            this.GroupFooter1.HeightF = 279.1667F;
             this.GroupFooter1.KeepTogether = true;
             this.GroupFooter1.Name = "GroupFooter1";
             // 
@@ -708,7 +718,7 @@ namespace SehtMuenster
             // 
             this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(0F, 250F);
+            this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(0F, 259.1667F);
             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);
@@ -724,7 +734,7 @@ namespace SehtMuenster
             // 
             this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
             this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(329.9995F, 250F);
+            this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(329.9996F, 259.1667F);
             this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
             this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(271.69F, 20F);
@@ -743,7 +753,7 @@ namespace SehtMuenster
             | 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.LocationFloat = new DevExpress.Utils.PointFloat(170F, 89.16662F);
             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[] {
@@ -954,7 +964,7 @@ namespace SehtMuenster
             | 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.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 139.1667F);
             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);
@@ -971,7 +981,7 @@ namespace SehtMuenster
             | 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.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 89.16662F);
             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);
@@ -985,7 +995,7 @@ namespace SehtMuenster
             // xrRichText2
             // 
             this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.472F, 130F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.472F, 139.1667F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
             this.xrRichText2.SizeF = new System.Drawing.SizeF(200.528F, 68.05556F);
@@ -994,7 +1004,7 @@ namespace SehtMuenster
             // xrRichText1
             // 
             this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.472F, 79.99998F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.472F, 89.16666F);
             this.xrRichText1.Name = "xrRichText1";
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
             this.xrRichText1.SizeF = new System.Drawing.SizeF(200.5281F, 50F);
@@ -1003,7 +1013,7 @@ namespace SehtMuenster
             // 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.LocationFloat = new DevExpress.Utils.PointFloat(0F, 89.16662F);
             this.xrLabel15.Multiline = true;
             this.xrLabel15.Name = "xrLabel15";
             this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1019,10 +1029,10 @@ namespace SehtMuenster
             // xrLabel13
             // 
             this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F);
+            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20F);
             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.SizeF = new System.Drawing.SizeF(245F, 20F);
             this.xrLabel13.StylePriority.UseBackColor = false;
             this.xrLabel13.StylePriority.UseBorders = false;
             this.xrLabel13.StylePriority.UseFont = false;
@@ -1034,10 +1044,10 @@ namespace SehtMuenster
             // xrLabel12
             // 
             this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F);
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             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.SizeF = new System.Drawing.SizeF(245F, 20F);
             this.xrLabel12.StylePriority.UseBackColor = false;
             this.xrLabel12.StylePriority.UseBorders = false;
             this.xrLabel12.StylePriority.UseFont = false;
@@ -1048,6 +1058,7 @@ namespace SehtMuenster
             // 
             // xrLabel11
             // 
+            this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right;
             this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F);
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(329.9998F, 20.00001F);
             this.xrLabel11.Name = "xrLabel11";
@@ -1097,7 +1108,7 @@ namespace SehtMuenster
             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.##}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte", "{0:0.##}")});
             this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(330F, 0F);
             this.xrLabel1.Name = "xrLabel1";
@@ -1117,6 +1128,86 @@ namespace SehtMuenster
             this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldKontaktArt.Name = "fieldKontaktArt";
             // 
+            // lblFehlkontakt
+            // 
+            this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40F);
+            this.lblFehlkontakt.Name = "lblFehlkontakt";
+            this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F);
+            this.lblFehlkontakt.StylePriority.UseBackColor = false;
+            this.lblFehlkontakt.StylePriority.UseBorders = false;
+            this.lblFehlkontakt.StylePriority.UseFont = false;
+            this.lblFehlkontakt.StylePriority.UsePadding = false;
+            this.lblFehlkontakt.StylePriority.UseTextAlignment = false;
+            this.lblFehlkontakt.Text = "F    = Fehlkontakt";
+            this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel18
+            // 
+            this.xrLabel18.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+            this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(245F, 20F);
+            this.xrLabel18.Name = "xrLabel18";
+            this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel18.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel18.StylePriority.UseBackColor = false;
+            this.xrLabel18.StylePriority.UseBorders = false;
+            this.xrLabel18.StylePriority.UseFont = false;
+            this.xrLabel18.StylePriority.UsePadding = false;
+            this.xrLabel18.StylePriority.UseTextAlignment = false;
+            this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel20
+            // 
+            this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Right;
+            this.xrLabel20.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 40F);
+            this.xrLabel20.Name = "xrLabel20";
+            this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel20.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel20.StylePriority.UseBackColor = false;
+            this.xrLabel20.StylePriority.UseBorders = false;
+            this.xrLabel20.StylePriority.UseFont = false;
+            this.xrLabel20.StylePriority.UsePadding = false;
+            this.xrLabel20.StylePriority.UseTextAlignment = false;
+            this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")});
+            this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(330F, 40F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(85F, 20F);
+            this.xrLabel17.StylePriority.UseBackColor = false;
+            this.xrLabel17.StylePriority.UseBorders = false;
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.StylePriority.UsePadding = false;
+            this.xrLabel17.StylePriority.UseTextAlignment = false;
+            this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrLabel21
+            // 
+            this.xrLabel21.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel21.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(415F, 40F);
+            this.xrLabel21.Name = "xrLabel21";
+            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel21.SizeF = new System.Drawing.SizeF(229.6399F, 20F);
+            this.xrLabel21.StylePriority.UseBackColor = false;
+            this.xrLabel21.StylePriority.UseBorders = false;
+            this.xrLabel21.StylePriority.UseFont = false;
+            this.xrLabel21.StylePriority.UsePadding = false;
+            this.xrLabel21.StylePriority.UseTextAlignment = false;
+            this.xrLabel21.Text = "Fehlkontakte in Minuten";
+            this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // Quittierungsbeleg
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1235,5 +1326,10 @@ namespace SehtMuenster
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
         private DevExpress.XtraReports.UI.XRLabel xrLabel14;
         private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+        private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel20;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel18;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel21;
     }
 }
diff --git a/ReportImp/SehtMuenster/Quittierungsbeleg.cs b/ReportImp/SehtMuenster/Quittierungsbeleg.cs
index 1515307ab..021fac017 100644
--- a/ReportImp/SehtMuenster/Quittierungsbeleg.cs
+++ b/ReportImp/SehtMuenster/Quittierungsbeleg.cs
@@ -27,14 +27,20 @@ namespace SehtMuenster
 
                 foreach (var sd in pRO.Services)
                 {
-                    if (sd.IsBillable)
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
                     {
                         ServicesOverviewRO.CreateSignatureString(sd);
+                        sd.Notice5 = "E";
                         if (sd.IsGroup)
                         {
                             //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+                            sd.Notice5 = "GR";
                             hatGruppen = true;
                         }
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))
+                        {
+                            sd.Notice5 = "F";
+                        }
                         servicesBillable.Add(sd);
                     }
                 }
diff --git a/ReportImp/ahaEV/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/ahaEV/Mitarbeiterarbeitszeitkonto.cs
index c2e4897bd..b9e5d192e 100644
--- a/ReportImp/ahaEV/Mitarbeiterarbeitszeitkonto.cs
+++ b/ReportImp/ahaEV/Mitarbeiterarbeitszeitkonto.cs
@@ -45,7 +45,10 @@ namespace ahaEV
                 {
 					stunden += day.MinutesTotal / 60;
                 }
-				stunden += ed.SollProTag * ed.UrlaubUndKrankheit.Value;
+				if (ed.UrlaubUndKrankheit.HasValue)
+				{
+					stunden += ed.SollProTag * ed.UrlaubUndKrankheit.Value;
+				}
 				ed.Custom15 = stunden;
 		    }
 
diff --git a/Service/Plugins/EmployeeService.cs b/Service/Plugins/EmployeeService.cs
index 1efc64b23..75d92efc5 100644
--- a/Service/Plugins/EmployeeService.cs
+++ b/Service/Plugins/EmployeeService.cs
@@ -23,8 +23,13 @@ namespace BeWo.Service.Plugins
     {
         public virtual EmployeeDC LoadEmployee(long eOid)
         {
+            var test = DAOFactory.GenericDAO.LoadByID<Employee>(eOid);
+            if (test.Tid == TableID.Customer)
+            {
+                int test2 = 0;
+            }
             SettingsLogic.AddToUsersHistory<Employee>(eOid);
-            var dc = MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(eOid));
+            var dc = MapperFactory.EmployeeDC_Employee.MapToNewDC(test);
 
             return dc;
 
@@ -55,7 +60,9 @@ namespace BeWo.Service.Plugins
 
             if (Utils.UserHasRight(GetLoggedInUser(), UserRightType.TeamView_ViewMyTeams))
             {
-                var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(LoggedInUserOperationContextExt.Current.User.Employee.Oid.Value);
+                var user = LoggedInUserOperationContextExt.Current?.User != null ? LoggedInUserOperationContextExt.Current.User : SessionFacade.LoggedInUser;
+                
+                var teams = DAOFactory.SearchDAO.FindAllActiveTeamsOfEmployee(user.Employee.Oid.Value);
                 return MapperFactory.CompactTeamDC_Team.MapToNewDCs(teams);
             }
 
diff --git a/Service/Plugins/HomeContentGenerator.cs b/Service/Plugins/HomeContentGenerator.cs
index c3e6a222d..6447c078c 100644
--- a/Service/Plugins/HomeContentGenerator.cs
+++ b/Service/Plugins/HomeContentGenerator.cs
@@ -28,13 +28,20 @@ namespace BeWo.Service.Plugins
         public virtual List<CompactSupportConceptDC> GetExpiringSupportConcepts(long? employeeOid,
             DateTime expiredUntil)
         {
-            var list = MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDCs(
-                DAOFactory.SearchDAO.FindExpiringSupportConcepts(employeeOid, DateTime.Now.Date, expiredUntil));
+            var result = new List<CompactSupportConceptDC>();
+            var list = DAOFactory.SearchDAO.FindExpiringSupportConcepts(employeeOid, DateTime.Now.Date, expiredUntil);
 
-            list.AddRange(MapperFactory.CompactSupportConceptDC_SupportConcept.MapToNewDCs(
-                DAOFactory.SearchDAO.FindExpiringNotApprovedSupportConcepts(employeeOid, DateTime.Now.Date, expiredUntil)));
+            var cs = new CustomerService();
 
-            return list.Where(s => s.StartDate.HasValue && s.EndDate.HasValue).ToList();
+            foreach (var sc in list)
+            {
+                foreach (var c2s in sc.CostBearer2SupportConceptList)
+                {
+                    result.Add(cs.CreateFlatSupportConcept(sc, c2s));
+                }
+            }
+
+            return result.OrderBy(s => s.EndDate).ToList();
         }
 
         public virtual List<TaskDC> GetTasksForEmployee(long employeeOid)
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 0b1e85f26..4087830e7 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -97,7 +97,7 @@ namespace BeWo.Service.Plugins
                 //t = "3830114427"; // FiZ Familie im Zentrum Hof
                 //t = "7138297573"; // Tagwerk betreutes wohnen
                 //t = "1008896531"; // BeWo Auxilio
-                t = "9383760246"; // Die Kette
+                //t = "9383760246"; // Die Kette
                 //t = "5915565037"; // Lebenshilfe Remscheid
                 //t = "3350425974"; // BeWo Rückenwind
                 //t = "9447917179"; // LH Rodenkirchen
@@ -150,7 +150,7 @@ namespace BeWo.Service.Plugins
                 //t = "7381352241"; // Ressource e.V.
                 //t = "3607551608"; // Betreuungsbüro Scholz
                 //t = "3104936392"; // B.A.P. Bielefelder Ambulante Pflege
-                //t = "1106039294"; // Hph Bersenbrück ATZ
+                t = "1106039294"; // Hph Bersenbrück ATZ
                 //t = "5562845955"; // Praunheimer Werkstätten
                 //t = "4801617798"; // Severin
                 //t = "1172092025"; // Flingern
@@ -347,7 +347,8 @@ namespace BeWo.Service.Plugins
                 //t = "3522103738"; // AWO Münsterland-Recklinghausen
                 //t = "5592509446"; // Kontakt Verein für psychosoziale Hilfen e.V
                 //t = "5344902949"; // SHK Service GmbH SBD
-                t = "1422963536"; // Malteser-Johanniter-Johanneshaus gGmbH
+                //t = "1422963536"; // Malteser-Johanniter-Johanneshaus gGmbH
+                //t = "5433105975"; // aha e.V.
 
                 return t;
 #else
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index 823415045..b8b7111ad 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -181,7 +181,7 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var s = PluginLoader.FindClass<AccountingService>();
 
-                return s.GetInvoiceBases(startDate, endDate);
+                return s.GetInvoiceBases(startDate, endDate, filterByInvoiceDate);
 
             }
             catch (Exception e)