Reports

2017-06-28 09:00:09 +02:00
parent 51532a205d
commit bce313c146
57 changed files with 4109 additions and 3018 deletions
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -317,11 +317,32 @@ namespace BeWo.Data.Access
            return lCriteria.List<ServiceRecord>();
        }

-		public IList<ServiceRecord> FindCustomerServiceRecords(long customerOid, DateTimeSpan pSpan, long? employeeOid, ServiceRecordTypeId? srTypeFilter)
+		public IList<ServiceRecord> FindCustomerServiceRecords(long customerOid, DateTimeSpan pSpan, long? employeeOid, ServiceRecordTypeId? srTypeFilter, bool includeEndDateInSearch)
        {
            var lCriteria = CreateCriteria<ServiceRecord>()
-                  .Add(Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime))
-                  .Add(Restrictions.Eq(ServiceRecord.PropertyName_CustomerOid, customerOid));
+                .Add(Restrictions.Eq(ServiceRecord.PropertyName_CustomerOid, customerOid));
+
+
+		    if (includeEndDateInSearch)
+		    {
+		        var orCriteria = Restrictions.Or(
+		            Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime),
+		            Restrictions.Between(ServiceRecord.PropertyName_End, pSpan.StartDateTime, pSpan.EndDateTime));
+
+                orCriteria = Restrictions.Or(orCriteria,
+                    Restrictions.And(
+                        Restrictions.Le(ServiceRecord.PropertyName_Start,pSpan.EndDateTime),
+                        Restrictions.Ge(ServiceRecord.PropertyName_End, pSpan.StartDateTime)));
+
+
+                lCriteria.Add(orCriteria);
+		    }
+		    else
+		    {
+		        lCriteria.Add(Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime));
+		    }
+                  
+                  

            if (employeeOid != null)
                lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, employeeOid.Value));
--- a/Host/Web.config
+++ b/Host/Web.config
@@ -190,11 +190,11 @@
  </system.webServer>
  <appSettings>
    <add key="SendMailOnError" value="false" />
-    <add key="SmptServer" value="smtp.udag.de" />
-    <add key="SmtpUser" value="beyondsoftde-0005" />
-    <add key="SmtpPassword" value="Y7Gvxn8cQhmn#mvK" />
-    <add key="Recipient" value="errortest@bewoplaner.de" />
-	<add key="SupportEMail" value="support@bewoplaner.de" />
+    <add key="SmptServer" value="mail.beyondsoft.de" />
+    <add key="SmtpUser" value="bewoplaner.support@beyondsoft.de" />
+    <add key="SmtpPassword" value="G57ojFhgZ" />
+    <add key="Recipient" value="error@bewoplaner.de" />
+  	<add key="SupportEMail" value="support@bewoplaner.de" />
    <add key="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
    <add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?k=[TENANT]" />
    <add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
@@ -104,14 +104,8 @@ namespace BeWo.Report.ReportObjects
 				decimal bu = 0;
                int anzWochentage = ANZ_WOCHENTAGE;

-                Contract c = emp.GetValidContractForDate(ro.ReportStartDate);
-
-				if (c == null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt.
-				{
-					var c2 = GetNextValidContractForDate(ro.ReportStartDate, emp);
-					if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < ro.ReportEndDate)
-						c = c2;
-				}
+			    var c = GetContractForDate(emp, ro.ReportStartDate, ro.ReportEndDate);
+                
 				if (c != null)
 				{
 					if (c.EntryDate.HasValue && c.EntryDate > monatsAnfang)
@@ -294,7 +288,10 @@ namespace BeWo.Report.ReportObjects
 				    }
 				    else
 				    {
-                        
+				        if (c != null && c.WeeklyFLS.HasValue)
+				        {
+				            
+				        }
                        if (c != null && c.WeeklyFLS.HasValue && c.WeeklyTotalHours.HasValue && c.WeeklyTotalHours.Value != 0)
                            flsSollImVertragsUndBerichtzeitraum *= c.WeeklyFLS.Value / c.WeeklyTotalHours.Value;
                    }
@@ -652,12 +649,68 @@ namespace BeWo.Report.ReportObjects
 	    }

 	    public virtual decimal? BerechneSollProMonat(Employee emp, DateTime start, DateTime ende)
-        {
+	    {
+	        Contract c = GetContractForDate(emp, start, ende);
+
+            
+            if (c != null  && c.MonthlyTotalHours.HasValue && c.MonthlyTotalHours.Value > 0)
+            {
+                return c.MonthlyTotalHours.Value;
+
+                DateTime monatsAnfang = start;
+                DateTime monatsEnde = ende;
+
+                if (c.EntryDate.HasValue && c.EntryDate > monatsAnfang)
+                {
+                    monatsAnfang = c.EntryDate.Value;
+                }
+                if (c.ContractEndDate.HasValue && c.ContractEndDate < monatsEnde)
+                {
+                    monatsEnde = c.ContractEndDate.Value.Date.AddDays(1);
+                }
+
+                if (monatsAnfang < monatsEnde)
+                {
+                    //if (monatsAnfang.Day == 1 && monatsEnde.Day == 1)
+                    //{
+                        return c.MonthlyTotalHours.Value;
+                    //}
+                }
+            }
+
            return null;
        }

        public virtual decimal? BerechneFlsSollProMonat(Employee emp, DateTime start, DateTime ende)
        {
+            Contract c = GetContractForDate(emp, start, ende);
+
+
+            if (c != null && c.MonthlyFLS.HasValue && c.MonthlyFLS.Value > 0)
+            {
+                return c.MonthlyFLS.Value;
+
+                DateTime monatsAnfang = start;
+                DateTime monatsEnde = ende;
+
+                if (c.EntryDate.HasValue && c.EntryDate > monatsAnfang)
+                {
+                    monatsAnfang = c.EntryDate.Value;
+                }
+                if (c.ContractEndDate.HasValue && c.ContractEndDate < monatsEnde)
+                {
+                    monatsEnde = c.ContractEndDate.Value.Date.AddDays(1);
+                }
+
+                if (monatsAnfang < monatsEnde)
+                {
+                    //if (monatsAnfang.Day == 1 && monatsEnde.Day == 1)
+                    //{
+                        return c.MonthlyFLS.Value;
+                    //}
+                }
+            }
+
            return null;
        }

@@ -1550,8 +1603,20 @@ namespace BeWo.Report.ReportObjects

 		}

-		//gibt 1 zurück wenn ganzer Feiertag und z.B. 0.5 bei halben etc.
-		public virtual decimal GetFeiertagsFaktor(DateTime start)
+        public virtual Contract GetContractForDate(Employee emp, DateTime start, DateTime ende)
+        {
+            Contract c = emp.GetValidContractForDate(start);
+            if (c == null) // Kein Vertrag vom 1. gefunden, gucken, ob es einen gibt, der mitten im Monat beginnt.
+            {
+                var c2 = GetNextValidContractForDate(start, emp);
+                if (c2 != null && c2.EntryDate.HasValue && c2.EntryDate.Value < ende)
+                    c = c2;
+            }
+            return c;
+        }
+
+        //gibt 1 zurück wenn ganzer Feiertag und z.B. 0.5 bei halben etc.
+        public virtual decimal GetFeiertagsFaktor(DateTime start)
 		{
 			if (IstFeiertag(start))
 			{
--- a/Report/ReportObjects/ServicesOverviewRO.cs
+++ b/Report/ReportObjects/ServicesOverviewRO.cs
@@ -169,7 +169,15 @@ namespace BeWo.Report.ReportObjects

        // private CostBearer2SupportConceptData CostBearer2SupportConceptData { get; set; }

-		public static List<ServicesOverviewRO> Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, int endDay, long? serviceCategoryOid = null, bool disableEmptySupportConcepts = true)
+        public static List<ServicesOverviewRO> Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay,
+            int endDay, long? serviceCategoryOid = null, bool disableEmptySupportConcepts = true)
+        {
+            return Create(pMonth, pYear, orgaOid, empOid, startDay, endDay, false, serviceCategoryOid,
+                disableEmptySupportConcepts);
+        }
+
+
+        public static List<ServicesOverviewRO> Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay, int endDay, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null, bool disableEmptySupportConcepts = true)
        {
            var roList = new List<ServicesOverviewRO>();

@@ -220,7 +228,7 @@ namespace BeWo.Report.ReportObjects
            // IList<Customer> customers = DAOFactory.SearchDAO.GetAllCustomerWithServiceRecordsInSpan(pSpan).OrderBy(ob => ob.Person.LastName + ", " + ob.Person.FirstName).ToList();
            foreach (Customer customer in customers)
            {
-                ServicesOverviewRO ro = Create(customer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, serviceCategoryOid);
+                ServicesOverviewRO ro = Create(customer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, searchServiceRecordsByEndDate, serviceCategoryOid);
                if (ro != null)
                {
                    roList.Add(ro);
@@ -232,8 +240,9 @@ namespace BeWo.Report.ReportObjects
            // sc => Create(sc.Customer.Oid.Value, pMonth, pYear, true)).ToList();
        }

-		
-		private static bool HasRight(ApplicationUser user, UserRightType right)
+        
+
+        private static bool HasRight(ApplicationUser user, UserRightType right)
 		{
 			return GetGrantedRights(user).Contains(right);
 		
@@ -254,6 +263,11 @@ namespace BeWo.Report.ReportObjects
 		}

        public static ServicesOverviewRO Create(long pCustomerOid, int pMonth, int pYear, bool disableEmptySupportConcepts, long orgaOid, long empOid, int start, int end, long? serviceCategoryOid = null)
+        {
+            return Create(pCustomerOid, pMonth, pYear, disableEmptySupportConcepts, orgaOid, empOid, start, end, false,
+                serviceCategoryOid);
+        }
+        public static ServicesOverviewRO Create(long pCustomerOid, int pMonth, int pYear, bool disableEmptySupportConcepts, long orgaOid, long empOid, int start, int end, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null)
        {
            var pSpan = new DateTimeSpan();
            if (start > end)
@@ -266,7 +280,7 @@ namespace BeWo.Report.ReportObjects
            pSpan.EndDateTime = pSpan.StartDateTime.AddDays(end - start + 1).AddTicks(-1);

            var lCustomer = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerOid);
-            return Create(lCustomer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, serviceCategoryOid);
+            return Create(lCustomer, pSpan, disableEmptySupportConcepts, orgaOid, empOid, searchServiceRecordsByEndDate, serviceCategoryOid);
        }

        public void CalculateFLSSollIst()
@@ -329,11 +343,11 @@ namespace BeWo.Report.ReportObjects
            }
        }

-        private static ServicesOverviewRO Create(Customer customer, DateTimeSpan span, bool disableEmptySupportConcepts, long orgaOid, long empOid, long? serviceCategoryOid = null)
+        private static ServicesOverviewRO Create(Customer customer, DateTimeSpan span, bool disableEmptySupportConcepts, long orgaOid, long empOid, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null)
        {
            // IList<ServiceRecord> lServiceRecords = pServiceRecords;
            // if (lServiceRecords == null)
-            IList<ServiceRecord> lServiceRecords = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, null);
+            IList<ServiceRecord> lServiceRecords = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, null, searchServiceRecordsByEndDate);

 			
            var lResult = new ServicesOverviewRO();
--- a/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx
+++ b/ReportImp/BAPBielefelderAmbulantePflege/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/BUGeVReports/SettlementReport2.Designer.cs
+++ b/ReportImp/BUGeVReports/SettlementReport2.Designer.cs
@@ -130,13 +130,12 @@ namespace BeWo.BUGeVReports
            // xrLabel8
            // 
            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")});
            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(435.4167F, 210F);
            this.xrLabel8.Name = "xrLabel8";
            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
            this.xrLabel8.SizeF = new System.Drawing.SizeF(191.6667F, 16.83345F);
            this.xrLabel8.StylePriority.UseTextAlignment = false;
-            this.xrLabel8.Text = "xrLabel8";
            this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
            // 
            // xrTable1
--- a/ReportImp/BeWoAlsdorf/Properties/licenses.licx
+++ b/ReportImp/BeWoAlsdorf/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/BetreuungsBueroScholzReport/Logos/BetreuungsbueroScholzLogo.png
+++ b/ReportImp/BetreuungsBueroScholzReport/Logos/BetreuungsbueroScholzLogo.png
--- a/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx
+++ b/ReportImp/BetreuungsBueroScholzReport/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.Designer.cs
@@ -38,7 +38,6 @@ namespace BetreuungsBueroScholz
            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
            this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -100,12 +99,13 @@ namespace BetreuungsBueroScholz
            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
            // 
            // Detail
@@ -193,10 +193,6 @@ namespace BetreuungsBueroScholz
            this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
            this.formattingRuleStartDate.Name = "formattingRuleStartDate";
            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
            // DetailReport1
            // 
            this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -808,6 +804,10 @@ namespace BetreuungsBueroScholz
            this.xrLabel2.Text = "Summe:";
            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
            // Stundenzettel
            // 
            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -827,13 +827,13 @@ namespace BetreuungsBueroScholz
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.1";
+            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

        }
--- a/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.resx
+++ b/ReportImp/BetreuungsBueroScholzReport/ServicesOverviewReport.resx
@@ -117,143 +117,109 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 17</value>
-  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        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
+        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
 </value>
  </data>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>21, 17</value>
+  </metadata>
 </root>
--- a/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj
+++ b/ReportImp/CaritasFrankfurt2Reports/CaritasFrankfurt2Reports.csproj
@@ -54,6 +54,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Calculation\CustomGroupDurationCalculator.cs" />
    <Compile Include="CollectiveBillingReport.cs">
      <SubType>Component</SubType>
    </Compile>
--- a/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj
+++ b/ReportImp/CaritasFrankfurtReports/CaritasFrankfurtReports.csproj
@@ -40,7 +40,6 @@
    <Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraPivotGrid.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    
    <Reference Include="DevExpress.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Utils.v13.2.UI, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -56,6 +55,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Calculation\CustomGroupDurationCalculator.cs" />
    <Compile Include="CustomerDataReport.cs">
      <SubType>Component</SubType>
    </Compile>
@@ -115,6 +115,10 @@
      <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
      <Name>Report</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Shared\Shared.csproj">
      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
      <Name>Shared</Name>
--- a/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj
+++ b/ReportImp/CaritasLeverkusen/CaritasLeverkusen.csproj
@@ -17,7 +17,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\Host\bin\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -80,10 +80,22 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\Data\Data.csproj">
+      <Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
+      <Name>Data</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Report\Report.csproj">
      <Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
      <Name>Report</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/ReportImp/CaritasLeverkusen/Properties/licenses.licx
+++ b/ReportImp/CaritasLeverkusen/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/CaritasLeverkusen/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/CaritasLeverkusen/ServicesOverviewReport.Designer.cs
--- a/ReportImp/CaritasLeverkusen/ServicesOverviewReport.cs
+++ b/ReportImp/CaritasLeverkusen/ServicesOverviewReport.cs
@@ -5,6 +5,9 @@ using System.Text;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
 using System.Collections.Generic;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared;
+using BS.Shared.Extensions;

 namespace BeWo.CaritasLeverkusen
 {
@@ -17,6 +20,7 @@ namespace BeWo.CaritasLeverkusen

        public void SetReportDataSource(ServicesOverviewRO pRO)
        {
+            SetRateFactorText(pRO);
 			if (pRO.Services != null)
 			{
 				List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -33,5 +37,28 @@ namespace BeWo.CaritasLeverkusen
 	        
            this.bindingSource1.DataSource = pRO;
        }
+
+        private void SetRateFactorText(ServicesOverviewRO pRo)
+        {
+            double factor = 1.2;
+
+            if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0)
+            {
+                var c2s = pRo.CostBearer2SupportConceptList[0];
+
+                var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
+
+                var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.RateFactor, pRo.StartDate);
+                if (cp != null && cp.CostRateValue.HasValue)
+                {
+                    factor = (100 + (double)cp.CostRateValue.Value)/100;
+                }
+            }
+          
+            lblTextFactor.Text = String.Format("2.Summer der mit dem LVR\r\nabzurechnenden Leistungen\r\n(= Summe 1 x {0:0.0})", factor);
+
+            
+            lblSummeFactor.Text = String.Format("{0:0.##}", pRo.TotalFLMBillable * factor);
+        }
    }
 }
--- a/ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs
--- a/ReportImp/DiakonieLennepReports/ServicesOverviewReport.cs
+++ b/ReportImp/DiakonieLennepReports/ServicesOverviewReport.cs
@@ -23,12 +23,16 @@ namespace BeWo.DiakonieLennepReports

            decimal stundensatz = GetStundensatz(pRO);

+            lblMonat1.Text = String.Format("{0} {1}", pRO.Month, pRO.Year);
+            lblMonat2.Text = lblMonat1.Text;
+
            lblStundensatz.Text = String.Format("FLS in Euro ({0:c})", stundensatz);

-            var abrechnung = Convert.ToDecimal(xrLabel36.Text);
-            var flsSumme = abrechnung * stundensatz;
+            var stunden = (decimal)(pRO.TotalFLMBillable/60)*1.2m;

-            lblBetrag.Text = String.Format("{0}",flsSumme);
+            var flsSumme = stunden * stundensatz;
+
+            lblBetrag.Text = String.Format("{0:c}",flsSumme);

            if (pRO.Services != null)
            {
--- a/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj
+++ b/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj
@@ -96,6 +96,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Calculation\CustomGroupDurationCalculator.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="ServicesOverviewReport.cs">
      <SubType>Component</SubType>
@@ -125,6 +126,14 @@
      <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
      <Name>Report</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Shared\Shared.csproj">
+      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
--- a/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
+++ b/ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
@@ -55,7 +55,25 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="CustomerDataReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomerDataReport.Designer.cs">
+      <DependentUpon>CustomerDataReport.cs</DependentUpon>
+    </Compile>
    <Compile Include="CustomReportCreator.cs" />
+    <Compile Include="FLSGroupReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="FLSGroupReport.Designer.cs">
+      <DependentUpon>FLSGroupReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FLSListReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="FLSListReport.Designer.cs">
+      <DependentUpon>FLSListReport.cs</DependentUpon>
+    </Compile>
    <Compile Include="ListeTherapieeinheitenJahr.cs">
      <SubType>Component</SubType>
    </Compile>
@@ -69,6 +87,12 @@
    <Compile Include="ListeTherapieeinheitenMonat.Designer.cs">
      <DependentUpon>ListeTherapieeinheitenMonat.cs</DependentUpon>
    </Compile>
+    <Compile Include="ServiceRecordListReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ServiceRecordListReport.Designer.cs">
+      <DependentUpon>ServiceRecordListReport.cs</DependentUpon>
+    </Compile>
    <Compile Include="ServicesOverviewReport.cs">
      <SubType>Component</SubType>
    </Compile>
@@ -77,6 +101,18 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
+    <EmbeddedResource Include="CustomerDataReport.resx">
+      <DependentUpon>CustomerDataReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FLSGroupReport.resx">
+      <DependentUpon>FLSGroupReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FLSListReport.resx">
+      <DependentUpon>FLSListReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
    <EmbeddedResource Include="ListeTherapieeinheitenJahr.resx">
      <DependentUpon>ListeTherapieeinheitenJahr.cs</DependentUpon>
    </EmbeddedResource>
@@ -84,6 +120,10 @@
    <EmbeddedResource Include="ListeTherapieeinheitenMonat.resx">
      <DependentUpon>ListeTherapieeinheitenMonat.cs</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="ServiceRecordListReport.resx">
+      <DependentUpon>ServiceRecordListReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
    <EmbeddedResource Include="ServicesOverviewReport.resx">
      <DependentUpon>ServicesOverviewReport.cs</DependentUpon>
    </EmbeddedResource>
--- a/ReportImp/HphBersenbrueckAtz/Properties/licenses.licx
+++ b/ReportImp/HphBersenbrueckAtz/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs
+++ b/ReportImp/HphBersenbrueckAtz/ServicesOverviewReport.cs
@@ -31,12 +31,36 @@ namespace BeWo.HphBersenbrueckAtz
 				{
 					if (s.IsBillable)
 					{
+					    double minuten = s.Minutes;
+					    double te = 0;
+
+                        if (s.ServiceCategory.Contains("Intern"))
+					    {
+                            
+                            te = (int)minuten / 45;
+
+                            var rest = minuten % 45;
+
+                            if (rest > 0)
+                            {
+                                var te2 = rest % 30 != 0 ? rest + (30 - (rest % 30)) : rest;
+
+                                te += te2 / 60;
+                            }
+
+                        }
+                        else
+                        {
+                            te = s.Minutes / 60;
+                        }
 					    if (s.ServiceDescription == "Mail" || s.ServiceDescription == "Telefonat")
 					    {
 					        s.ServiceDescription = "externe TE";
 					    }
-					    s.Minutes /= 60;
-					        gesamt += s.Minutes;
+					    
+					    s.Minutes = te;
+
+					    gesamt += s.Minutes;

 					        servicesBillable.Add(s);
 					    //}
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/AbrechnungsbogenReisen.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/AbrechnungsbogenReisen.cs
@@ -52,8 +52,8 @@ namespace HphBersenbrueckFreizeitUndReisen
            }
            lblMonat1.Text = String.Format("{0:MMM yy}", ro.StartDate);
            lblMonat2.Text = String.Format("{0:MMM yy}", ro.StartDate.AddMonths(1));
-            
-            
+
+
            if (ro.Services != null)
            {
                ErstelleTagesDict(ro.Services);
@@ -62,13 +62,13 @@ namespace HphBersenbrueckFreizeitUndReisen
                    AddDetailToTable(ro, s);
                }
            }
-            
+
            cellSumme11.Text = String.Format("{0:c}", totalVerhinderungspflege1);
            cellSumme21.Text = String.Format("{0:c}", totalVerhinderungspflege2);

            cellSumme12.Text = String.Format("{0:c}", totalZusatz1);
            cellSumme22.Text = String.Format("{0:c}", totalZusatz2);
-            
+
            cellSumme13.Text = String.Format("{0:c}", totalKurzzeit1);
            cellSumme23.Text = String.Format("{0:c}", totalKurzzeit2);

@@ -78,13 +78,13 @@ namespace HphBersenbrueckFreizeitUndReisen

            cellPreis1.Text = String.Format("{0:c}", totalVerhinderungspflege1 + totalZusatz1 + totalKurzzeit1 + totalSelbstzahler1);
            cellPreis2.Text = String.Format("{0:c}", totalVerhinderungspflege2 + totalZusatz2 + totalKurzzeit2 + totalSelbstzahler2);
-            
+
            cellPreisGesamt.Text = String.Format("{0:c}", totalVerhinderungspflege1 + totalZusatz1 + totalKurzzeit1 + totalSelbstzahler1 +
                totalVerhinderungspflege2 + totalZusatz2 + totalKurzzeit2 + totalSelbstzahler2);

            this.bindingSource1.DataSource = ro;
        }
-        
+

        private string CreateGesetzlVertreter(Customer c)
        {
@@ -106,12 +106,12 @@ namespace HphBersenbrueckFreizeitUndReisen
            if (ro.CostBearer2SupportConceptList != null && ro.CostBearer2SupportConceptList.Count > 0)
            {
                return ro.CostBearer2SupportConceptList[0].SupportConcept.Customer;
-                
+
            }

            return null;
        }
-    
+
        private decimal GetStundensatz(IList<ServiceCategory> cats, string categoryName, DateTime startDate)
        {
            decimal stundensatz = 0;
@@ -128,7 +128,7 @@ namespace HphBersenbrueckFreizeitUndReisen

                        if (cr != null && cr.CostRateValue.HasValue)
                        {
-                            stundensatz = cr.CostRateValue.Value;    
+                            stundensatz = cr.CostRateValue.Value;
                        }
                    }
                }
@@ -142,62 +142,91 @@ namespace HphBersenbrueckFreizeitUndReisen
            foreach (var sd in services)
            {
                String leistung = sd.ServiceCategory.ToLower().Trim();
+
+                
                if (!key2TagesDict.ContainsKey(leistung))
                {
                    key2TagesDict[leistung] = new Dictionary<String, bool>();
                }
-                String key = String.Format("{0:dd.MM.yyyy}", sd.StartDate);

-                if (!key2TagesDict[leistung].ContainsKey(key))
+                DateTime start = sd.StartDate;
+                DateTime end = sd.EndDate;
+
+                if (sd.ServiceDescription == "Kurzurlaub")
                {
-                    key2TagesDict[leistung].Add(key, true);
+                    while (start <= end)
+                    {
+                        String key = String.Format("{0:dd.MM.yyyy}", start);
+
+                        if (!key2TagesDict[leistung].ContainsKey(key))
+                        {
+                            key2TagesDict[leistung].Add(key, true);
+                        }
+                        start = start.AddDays(1);
+                    }
                }
            }
-            
+
        }
        private void AddDetailToTable(ServicesOverviewRO ro, ServicesOverviewRO.ServiceDetail sd)
        {
-           
+
            var table = xrTableMonat1;

-            if (sd.StartDate.Month == ro.StartDate.Month)
+            DateTime start = sd.StartDate;
+            DateTime end = sd.EndDate;
+
+            
+            while (start <= end)
            {
-                table = xrTableMonat1;
-            }
-            else if (sd.StartDate.Month == ro.StartDate.AddMonths(1).Month)
-            {
-                table = xrTableMonat2;
-            }
-            else
-            {
-                return;
+                bool cont = true;
+                if (start.Month == ro.StartDate.Month)
+                {
+                    table = xrTableMonat1;
+                }
+                else if (start.Month == ro.StartDate.AddMonths(1).Month)
+                {
+                    table = xrTableMonat2;
+                }
+                else
+                {
+                    cont = false;
+                }
+
+                if (cont)
+                {
+                    SetTableText(table, start, sd.ServiceCategory, sd.ServiceDescription);
+                }
+                start = start.AddDays(1);
            }

-            SetTableText(table, sd);
+            
        }

-        private void SetTableText(XRTable table, ServicesOverviewRO.ServiceDetail sd)
+        private void SetTableText(XRTable table, DateTime dt, String categorie, String serviceDescription)
        {
            XRTableCell cell = null;
-            int row = sd.StartDate.Day;
+
            int column = 1;
            String text = "";

-            
-            String leistung = sd.ServiceCategory.ToLower().Trim();
+
+            int row = dt.Day;
+
+            String leistung = categorie.ToLower().Trim();
            var key2Date = key2TagesDict[leistung];

            decimal preis = 0;

-            if (sd.ServiceDescription.Contains("Kurzurlaub"))
+            if (serviceDescription.Contains("Kurzurlaub"))
            {
-                preis = AbrechnungsInfo.GetPreisForKurzurlaub(pflegegrad, key2Date, sd.StartDate);
+                preis = AbrechnungsInfo.GetPreisForKurzurlaub(pflegegrad, key2Date, dt);
            }
            else
            {
-                preis = AbrechnungsInfo.GetPreisForReisen(pflegegrad, sd.StartDate);
+                preis = AbrechnungsInfo.GetPreisForReisen(pflegegrad, dt);
            }
-            
+

            if (leistung.Contains("verhinderungspflege"))
            {
@@ -209,7 +238,7 @@ namespace HphBersenbrueckFreizeitUndReisen
                {
                    totalVerhinderungspflege2 += preis;
                }
-                
+
                text = String.Format("{0:c}", AddToGesamtSumme(preis, table.Name, column, row));
            }
            else if (leistung.Contains("entlastung"))
@@ -253,7 +282,8 @@ namespace HphBersenbrueckFreizeitUndReisen
            }

            table.Rows[row].Cells[column].Text = text;
-            
+
+
        }

        private decimal AddToGesamtSumme(decimal preis, string name, int column, int row)
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Calculations/HphServiceRecordStatisticFactory.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Calculations/HphServiceRecordStatisticFactory.cs
@@ -19,6 +19,8 @@ namespace HphBersenbrueckFreizeitUndReisen.Calculations
 	{
 	    private Pflegegrad? pflegegrad = null;
        private Dictionary<long, decimal> oid2MonatAbschlag = new Dictionary<long, decimal>();
+        private Dictionary<string, Dictionary<String, bool>> key2TagesDict = new Dictionary<string, Dictionary<String, bool>>();
+

        public override ServiceRecordStatisticsInfoDC GetServiceRecordStatisticInfo(long costBearer2SupportConceptOid, DateTime statisticsDate)
        {
@@ -216,6 +218,39 @@ namespace HphBersenbrueckFreizeitUndReisen.Calculations
 	        return base.GetApprovedMinutesPerMonth(stats);
 	    }

+       
+	    protected override IEnumerable<ServiceRecord> GetServiceRecordsForStatistic(long costBearer2SupportConceptOid)
+	    {
+	        var srList = base.GetServiceRecordsForStatistic(costBearer2SupportConceptOid);
+
+	        foreach (var sr in srList)
+	        {
+                String leistung = sr.ServiceDescription.ServiceCategory.Name.ToLower().Trim();
+                if (!key2TagesDict.ContainsKey(leistung))
+                {
+                    key2TagesDict[leistung] = new Dictionary<String, bool>();
+                }
+
+	            if (sr.ServiceDescription.Name == "Kurzurlaub")
+	            {
+	                DateTime start = sr.Start.Value;
+	                DateTime end = sr.End.Value;
+
+	                while (start <= end)
+	                {
+	                    String key = String.Format("{0:dd.MM.yyyy}", start);
+
+	                    if (!key2TagesDict[leistung].ContainsKey(key))
+	                    {
+	                        key2TagesDict[leistung].Add(key, true);
+	                    }
+	                    start = start.AddDays(1);
+	                }
+	            }
+	        }
+	        return srList;
+	    }
+
 	    protected override void CalculateFixedAmountBudget(ServiceRecord sr, SupportConceptPeriodStatisticsDC periodStats, DateTime statisticsDate)
 	    {
 	        if (periodStats != null && periodStats.SupportConceptApprovalPeriod.ApprovedFixedAmount.HasValue)
@@ -240,7 +275,26 @@ namespace HphBersenbrueckFreizeitUndReisen.Calculations
 	            }
 	            else if (sdName.Contains("kurzurlaub") || sdName.Contains("reisen"))
 	            {
-	                preis = AbrechnungsInfo.GetPreisForReisen(pflegegrad, sr.Start.Value);
+	                DateTime start = sr.Start.Value;
+	                DateTime end = sr.End.Value;
+
+	                decimal summe = 0;
+
+	                while (start <= end)
+	                {
+	                    if (sdName.Contains("reisen"))
+	                    {
+	                        summe += AbrechnungsInfo.GetPreisForReisen(pflegegrad, start);
+	                    }
+	                    else
+	                    {
+                            var key2Date = key2TagesDict[sr.ServiceDescription.ServiceCategory.Name.ToLower().Trim()];
+                            summe += AbrechnungsInfo.GetPreisForKurzurlaub(pflegegrad, key2Date, start);
+                        }
+
+	                    start = start.AddDays(1);
+	                }
+	                preis = summe;
 	            }
 	            else if (sdName.Contains("freizeitangebote"))
 	            {
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/CustomReportCreator.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/CustomReportCreator.cs
@@ -105,7 +105,7 @@ namespace HphBersenbrueckFreizeitUndReisen

                endDay += startDay;
            }
-            List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
+            List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, true);

            if (lROs.Count > 0)
            {
@@ -179,7 +179,7 @@ namespace HphBersenbrueckFreizeitUndReisen
            }
            

-            var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
+            var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, true, serviceCategoryOid);
            
            return CreateServicesOverviewReportForRo(ro, null);

--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/CustomerDataReport.Designer.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/CustomerDataReport.Designer.cs
@@ -111,6 +111,42 @@ namespace HphBersenbrueckFreizeitUndReisen
            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.DetailReport5 = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.Detail6 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable10 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            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.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblPflegekasse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel36 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel37 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel39 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblVorname = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel41 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblNachname = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel43 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblStrasse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel45 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblPlz = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel47 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblOrt = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel49 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblTelefon = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel51 = new DevExpress.XtraReports.UI.XRLabel();
+            this.cbAbtretung = new DevExpress.XtraReports.UI.XRCheckBox();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -118,6 +154,8 @@ namespace HphBersenbrueckFreizeitUndReisen
            ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
            // 
            // Detail
@@ -125,6 +163,7 @@ namespace HphBersenbrueckFreizeitUndReisen
            this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
            this.xrLabel2,
            this.xrTable4});
+            this.Detail.Expanded = false;
            this.Detail.Font = new System.Drawing.Font("Arial", 10F);
            this.Detail.HeightF = 60.00001F;
            this.Detail.Name = "Detail";
@@ -774,13 +813,13 @@ namespace HphBersenbrueckFreizeitUndReisen
            // 
            this.Detail4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
            this.xrLabel4});
-            this.Detail4.HeightF = 60.00004F;
+            this.Detail4.HeightF = 42F;
            this.Detail4.Name = "Detail4";
            // 
            // xrLabel4
            // 
            this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35.00004F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F);
            this.xrLabel4.Multiline = true;
            this.xrLabel4.Name = "xrLabel4";
            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -867,6 +906,7 @@ namespace HphBersenbrueckFreizeitUndReisen
            this.GroupHeader2});
            this.DetailReport4.DataMember = "EnvironmentPersons";
            this.DetailReport4.DataSource = this.bindingSource1;
+            this.DetailReport4.Expanded = false;
            this.DetailReport4.Level = 4;
            this.DetailReport4.Name = "DetailReport4";
            // 
@@ -1002,6 +1042,398 @@ namespace HphBersenbrueckFreizeitUndReisen
            this.ReportHeader.HeightF = 280F;
            this.ReportHeader.Name = "ReportHeader";
            // 
+            // DetailReport5
+            // 
+            this.DetailReport5.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail6,
+            this.GroupHeader1});
+            this.DetailReport5.DataMember = "EnvironmentOrganisations";
+            this.DetailReport5.DataSource = this.bindingSource1;
+            this.DetailReport5.Expanded = false;
+            this.DetailReport5.Level = 5;
+            this.DetailReport5.Name = "DetailReport5";
+            // 
+            // Detail6
+            // 
+            this.Detail6.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable10});
+            this.Detail6.HeightF = 18F;
+            this.Detail6.Name = "Detail6";
+            // 
+            // xrTable10
+            // 
+            this.xrTable10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable10.Name = "xrTable10";
+            this.xrTable10.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable10.SizeF = new System.Drawing.SizeF(642F, 18F);
+            this.xrTable10.StylePriority.UseFont = false;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9,
+            this.xrTableCell10,
+            this.xrTableCell11,
+            this.xrTableCell12});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1.125D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Organisation.Name")});
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.Text = "Betreuer";
+            this.xrTableCell9.Weight = 0.17912772585669781D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.RelationRole.TypeDescription")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell10.StylePriority.UseBorders = false;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.Text = "Rolle";
+            this.xrTableCell10.Weight = 0.21806853582554517D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Organisation.ContactSummaryInfo")});
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell11.StylePriority.UseBorders = false;
+            this.xrTableCell11.StylePriority.UsePadding = false;
+            this.xrTableCell11.Text = "xrTableCell54";
+            this.xrTableCell11.Weight = 0.2180685358255452D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Customer2OrganisationNotice")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell12.StylePriority.UseBorders = false;
+            this.xrTableCell12.StylePriority.UseFont = false;
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.Text = "Notiz";
+            this.xrTableCell12.Weight = 0.38473520249221183D;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel35,
+            this.xrTable3});
+            this.GroupHeader1.HeightF = 60.00001F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            // 
+            // xrLabel35
+            // 
+            this.xrLabel35.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F);
+            this.xrLabel35.Multiline = true;
+            this.xrLabel35.Name = "xrLabel35";
+            this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel35.SizeF = new System.Drawing.SizeF(309.7083F, 25F);
+            this.xrLabel35.StylePriority.UseFont = false;
+            this.xrLabel35.Text = "Organisationen des Umfelds:";
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 42.00001F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(642F, 18F);
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell5,
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell8});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 1.0588235294117647D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UseBorders = false;
+            this.xrTableCell5.StylePriority.UseFont = false;
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.Text = "Name";
+            this.xrTableCell5.Weight = 0.17912772585669781D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UsePadding = false;
+            this.xrTableCell6.Text = "Rolle";
+            this.xrTableCell6.Weight = 0.21806853582554517D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell7.StylePriority.UseBorders = false;
+            this.xrTableCell7.StylePriority.UseFont = false;
+            this.xrTableCell7.StylePriority.UsePadding = false;
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Telefonnr.";
+            this.xrTableCell7.Weight = 0.2180685358255452D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell8.StylePriority.UseBorders = false;
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.StylePriority.UsePadding = false;
+            this.xrTableCell8.Text = "Notiz";
+            this.xrTableCell8.Weight = 0.38473520249221183D;
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.cbAbtretung,
+            this.xrLabel51,
+            this.xrLabel49,
+            this.lblTelefon,
+            this.xrLabel47,
+            this.lblOrt,
+            this.xrLabel45,
+            this.lblPlz,
+            this.xrLabel43,
+            this.lblStrasse,
+            this.xrLabel41,
+            this.lblNachname,
+            this.xrLabel39,
+            this.lblVorname,
+            this.xrLabel37,
+            this.lblAnrede,
+            this.lblPflegekasse,
+            this.xrLabel36,
+            this.xrLabel33});
+            this.GroupFooter1.HeightF = 305.5209F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            // 
+            // xrLabel33
+            // 
+            this.xrLabel33.Font = new System.Drawing.Font("Arial", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
+            this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0F, 76.37501F);
+            this.xrLabel33.Multiline = true;
+            this.xrLabel33.Name = "xrLabel33";
+            this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel33.SizeF = new System.Drawing.SizeF(192F, 25F);
+            this.xrLabel33.StylePriority.UseFont = false;
+            this.xrLabel33.Text = "Gesetzlicher Vertreter";
+            // 
+            // lblPflegekasse
+            // 
+            this.lblPflegekasse.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblPflegekasse.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 28.10415F);
+            this.lblPflegekasse.Name = "lblPflegekasse";
+            this.lblPflegekasse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblPflegekasse.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblPflegekasse.StylePriority.UseFont = false;
+            // 
+            // xrLabel36
+            // 
+            this.xrLabel36.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 28.10415F);
+            this.xrLabel36.Name = "xrLabel36";
+            this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel36.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel36.StylePriority.UseFont = false;
+            this.xrLabel36.Text = "Pflegekasse:";
+            // 
+            // xrLabel37
+            // 
+            this.xrLabel37.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.5208F);
+            this.xrLabel37.Name = "xrLabel37";
+            this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel37.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel37.StylePriority.UseFont = false;
+            this.xrLabel37.Text = "Anrede:";
+            // 
+            // lblAnrede
+            // 
+            this.lblAnrede.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 113.5208F);
+            this.lblAnrede.Name = "lblAnrede";
+            this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnrede.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblAnrede.StylePriority.UseFont = false;
+            // 
+            // xrLabel39
+            // 
+            this.xrLabel39.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(0F, 137.5208F);
+            this.xrLabel39.Name = "xrLabel39";
+            this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel39.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel39.StylePriority.UseFont = false;
+            this.xrLabel39.Text = "Vorname:";
+            // 
+            // lblVorname
+            // 
+            this.lblVorname.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblVorname.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 137.5209F);
+            this.lblVorname.Name = "lblVorname";
+            this.lblVorname.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblVorname.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblVorname.StylePriority.UseFont = false;
+            // 
+            // xrLabel41
+            // 
+            this.xrLabel41.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel41.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.5208F);
+            this.xrLabel41.Name = "xrLabel41";
+            this.xrLabel41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel41.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel41.StylePriority.UseFont = false;
+            this.xrLabel41.Text = "Nachname:";
+            // 
+            // lblNachname
+            // 
+            this.lblNachname.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblNachname.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 161.5209F);
+            this.lblNachname.Name = "lblNachname";
+            this.lblNachname.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblNachname.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblNachname.StylePriority.UseFont = false;
+            // 
+            // xrLabel43
+            // 
+            this.xrLabel43.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel43.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185.5208F);
+            this.xrLabel43.Name = "xrLabel43";
+            this.xrLabel43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel43.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel43.StylePriority.UseFont = false;
+            this.xrLabel43.Text = "Straße:";
+            // 
+            // lblStrasse
+            // 
+            this.lblStrasse.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblStrasse.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 185.5209F);
+            this.lblStrasse.Name = "lblStrasse";
+            this.lblStrasse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblStrasse.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblStrasse.StylePriority.UseFont = false;
+            // 
+            // xrLabel45
+            // 
+            this.xrLabel45.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel45.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.5208F);
+            this.xrLabel45.Name = "xrLabel45";
+            this.xrLabel45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel45.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel45.StylePriority.UseFont = false;
+            this.xrLabel45.Text = "PLZ:";
+            // 
+            // lblPlz
+            // 
+            this.lblPlz.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblPlz.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 209.5208F);
+            this.lblPlz.Name = "lblPlz";
+            this.lblPlz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblPlz.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblPlz.StylePriority.UseFont = false;
+            // 
+            // xrLabel47
+            // 
+            this.xrLabel47.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel47.LocationFloat = new DevExpress.Utils.PointFloat(0F, 233.5208F);
+            this.xrLabel47.Name = "xrLabel47";
+            this.xrLabel47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel47.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel47.StylePriority.UseFont = false;
+            this.xrLabel47.Text = "Ort:";
+            // 
+            // lblOrt
+            // 
+            this.lblOrt.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblOrt.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 233.5208F);
+            this.lblOrt.Name = "lblOrt";
+            this.lblOrt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblOrt.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblOrt.StylePriority.UseFont = false;
+            // 
+            // xrLabel49
+            // 
+            this.xrLabel49.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel49.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 257.5208F);
+            this.xrLabel49.Name = "xrLabel49";
+            this.xrLabel49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel49.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel49.StylePriority.UseFont = false;
+            this.xrLabel49.Text = "Telefonnr.:";
+            // 
+            // lblTelefon
+            // 
+            this.lblTelefon.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblTelefon.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 257.5208F);
+            this.lblTelefon.Name = "lblTelefon";
+            this.lblTelefon.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblTelefon.SizeF = new System.Drawing.SizeF(339.5449F, 24F);
+            this.lblTelefon.StylePriority.UseFont = false;
+            // 
+            // xrLabel51
+            // 
+            this.xrLabel51.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel51.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 281.5208F);
+            this.xrLabel51.Name = "xrLabel51";
+            this.xrLabel51.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel51.SizeF = new System.Drawing.SizeF(160F, 24F);
+            this.xrLabel51.StylePriority.UseFont = false;
+            this.xrLabel51.StylePriority.UseTextAlignment = false;
+            this.xrLabel51.Text = "Abtretungserklärung:";
+            // 
+            // cbAbtretung
+            // 
+            this.cbAbtretung.LocationFloat = new DevExpress.Utils.PointFloat(160F, 281.5208F);
+            this.cbAbtretung.Name = "cbAbtretung";
+            this.cbAbtretung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.cbAbtretung.SizeF = new System.Drawing.SizeF(73.74664F, 18F);
+            this.cbAbtretung.StylePriority.UseBorders = false;
+            this.cbAbtretung.StylePriority.UseFont = false;
+            this.cbAbtretung.StylePriority.UsePadding = false;
+            this.cbAbtretung.StylePriority.UseTextAlignment = false;
+            this.cbAbtretung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
            // Klientenstammblatt
            // 
            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1014,14 +1446,16 @@ namespace HphBersenbrueckFreizeitUndReisen
            this.DetailReport4,
            this.topMarginBand1,
            this.bottomMarginBand1,
-            this.ReportHeader});
+            this.ReportHeader,
+            this.DetailReport5,
+            this.GroupFooter1});
            this.DataSource = this.bindingSource1;
            this.Font = new System.Drawing.Font("Arial", 10F);
            this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 75);
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.1";
+            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -1029,6 +1463,8 @@ namespace HphBersenbrueckFreizeitUndReisen
            ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

        }
@@ -1116,5 +1552,41 @@ namespace HphBersenbrueckFreizeitUndReisen
        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
 		private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
 		private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport5;
+        private DevExpress.XtraReports.UI.DetailBand Detail6;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel35;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        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.XRTable xrTable10;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel51;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel49;
+        private DevExpress.XtraReports.UI.XRLabel lblTelefon;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel47;
+        private DevExpress.XtraReports.UI.XRLabel lblOrt;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel45;
+        private DevExpress.XtraReports.UI.XRLabel lblPlz;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel43;
+        private DevExpress.XtraReports.UI.XRLabel lblStrasse;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel41;
+        private DevExpress.XtraReports.UI.XRLabel lblNachname;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel39;
+        private DevExpress.XtraReports.UI.XRLabel lblVorname;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel37;
+        private DevExpress.XtraReports.UI.XRLabel lblAnrede;
+        private DevExpress.XtraReports.UI.XRLabel lblPflegekasse;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel36;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel33;
+        private DevExpress.XtraReports.UI.XRCheckBox cbAbtretung;
    }
 }
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/CustomerDataReport.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/CustomerDataReport.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Drawing;
 using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
 using BeWo.Report;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
+using BS.Shared.Core;

 namespace HphBersenbrueckFreizeitUndReisen
 {
@@ -17,6 +21,50 @@ namespace HphBersenbrueckFreizeitUndReisen

        public void SetReportDataSource(CustomerDataRO pRO)
        {
+            var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
+
+            String aufgabenKreis = null;
+            String aufgabenKreisCheck = "";
+            foreach (var vv in c.VarFieldValueList)
+            {
+                var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
+                if (varFieldValue != null)
+                {
+                    switch (vv.VarFieldDefOid)
+                    {
+                        case 1:
+                            lblPflegekasse.Text = varFieldValue.ToString();
+                            break;
+                        case 2:
+                            lblAnrede.Text = varFieldValue.ToString();
+                            break;
+                        case 3:
+                            lblVorname.Text = varFieldValue.ToString();
+                            break;
+                        case 4:
+                            lblNachname.Text = varFieldValue.ToString();
+                            break;
+                        case 5:
+                            lblStrasse.Text = varFieldValue.ToString();
+                            break;
+                        case 6:
+                            lblPlz.Text = varFieldValue.ToString();
+                            break;
+                        case 7:
+                            lblOrt.Text = varFieldValue.ToString();
+                            break;
+                        case 8:
+                            lblTelefon.Text = varFieldValue.ToString();
+                            break;
+                        case 9:
+                            cbAbtretung.Checked = (bool)varFieldValue;
+                            break;
+                       
+
+                    }
+                }
+            }
+
            this.bindingSource1.DataSource = pRO;
        }
    }
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj
@@ -88,12 +88,19 @@
    <Compile Include="FLSListReport.Designer.cs">
      <DependentUpon>FLSListReport.cs</DependentUpon>
    </Compile>
+    <Compile Include="AuswertungSelbstzahler.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AuswertungSelbstzahler.Designer.cs">
+      <DependentUpon>AuswertungSelbstzahler.cs</DependentUpon>
+    </Compile>
    <Compile Include="Helferentgelt.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="Helferentgelt.Designer.cs">
      <DependentUpon>Helferentgelt.cs</DependentUpon>
    </Compile>
+    <Compile Include="AuswertungSelbstzahlerRO.cs" />
    <Compile Include="HelferentgeltRO.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="AbrechnungsbogenReisen.cs">
@@ -155,6 +162,9 @@
      <DependentUpon>FLSListReport.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
+    <EmbeddedResource Include="AuswertungSelbstzahler.resx">
+      <DependentUpon>AuswertungSelbstzahler.cs</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="Helferentgelt.resx">
      <DependentUpon>Helferentgelt.cs</DependentUpon>
    </EmbeddedResource>
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Properties/licenses.licx
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Validation/ServiceRecordValidator.cs
+++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Validation/ServiceRecordValidator.cs
@@ -25,19 +25,19 @@ namespace HphBersenbrueckFreizeitUndReisen.Validation
 	            sdName.Contains("ausflüge"))
 	        {

-                //if (newServiceRecord.SupportConcept != null && newServiceRecord.SupportConcept.Customer != null)
-	            //{
-	            //    var c = DAOFactory.GenericDAO.LoadByID<Customer>(newServiceRecord.SupportConcept.Customer.Oid.Value);
-	            //    if (!c.Pflegegrad.HasValue)
-	            //    {
-	            //        list.Add(new ServiceRecordValidationResultDC
-	            //        {
-	            //            ResultType = ServiceRecordValidationResult.Custom,
-	            //            Message = "Bei dem Klient ist kein Pflegegrad hinterlegt, Preis nicht ermittelbar."
-	            //        });
-	            //    }
-	            //}
-	        }
+                if (newServiceRecord.SupportConcept != null && newServiceRecord.SupportConcept.Customer != null)
+                {
+                    var c = DAOFactory.GenericDAO.LoadByID<Customer>(newServiceRecord.SupportConcept.Customer.Oid.Value);
+                    if (!c.Pflegegrad.HasValue)
+                    {
+                        list.Add(new ServiceRecordValidationResultDC
+                        {
+                            ResultType = ServiceRecordValidationResult.Custom,
+                            Message = "Bei dem Klient ist kein Pflegegrad hinterlegt, Preis nicht ermittelbar."
+                        });
+                    }
+                }
+            }
 	        return list;
        }
 	}
--- a/ReportImp/KetteReports/Properties/licenses.licx
+++ b/ReportImp/KetteReports/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/KetteReports/QueryListReport.Designer.cs
+++ b/ReportImp/KetteReports/QueryListReport.Designer.cs
@@ -45,6 +45,7 @@ namespace KetteReports
            this.xrTableCell77 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell76 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell81 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell296 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell86 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell85 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -118,6 +119,7 @@ namespace KetteReports
            this.xrTableCell225 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell226 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell227 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell295 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell228 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell229 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell230 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -202,6 +204,7 @@ namespace KetteReports
            this.xrTableCell148 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell150 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell152 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell290 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell153 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell155 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell156 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -242,6 +245,7 @@ namespace KetteReports
            this.xrTableCell116 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell118 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell119 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell223 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell121 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell123 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell124 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -414,6 +418,7 @@ namespace KetteReports
            this.xrTableCell77,
            this.xrTableCell76,
            this.xrTableCell81,
+            this.xrTableCell296,
            this.xrTableCell82,
            this.xrTableCell86,
            this.xrTableCell85,
@@ -509,7 +514,7 @@ namespace KetteReports
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.Strasse")});
            this.xrTableCell77.Name = "xrTableCell77";
            this.xrTableCell77.StylePriority.UseBackColor = false;
-            this.xrTableCell77.Weight = 0.16303583302344149D;
+            this.xrTableCell77.Weight = 0.15397828677271414D;
            // 
            // xrTableCell76
            // 
@@ -517,7 +522,7 @@ namespace KetteReports
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.Hausnr")});
            this.xrTableCell76.Name = "xrTableCell76";
            this.xrTableCell76.StylePriority.UseBackColor = false;
-            this.xrTableCell76.Weight = 0.054345303050961836D;
+            this.xrTableCell76.Weight = 0.0543452754095243D;
            // 
            // xrTableCell81
            // 
@@ -528,13 +533,21 @@ namespace KetteReports
            this.xrTableCell81.Name = "xrTableCell81";
            this.xrTableCell81.StylePriority.UseBackColor = false;
            this.xrTableCell81.StylePriority.UseBorders = false;
-            this.xrTableCell81.Weight = 0.1358631942018157D;
+            this.xrTableCell81.Weight = 0.076989170993072731D;
+            // 
+            // xrTableCell296
+            // 
+            this.xrTableCell296.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.OhneFestenWohnsitz")});
+            this.xrTableCell296.Name = "xrTableCell296";
+            this.xrTableCell296.Text = "xrTableCell296";
+            this.xrTableCell296.Weight = 0.067931597100907848D;
            // 
            // xrTableCell82
            // 
            this.xrTableCell82.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell82.BorderWidth = 1;
+            this.xrTableCell82.BorderWidth = 1F;
            this.xrTableCell82.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.Deutsch")});
            this.xrTableCell82.Name = "xrTableCell82";
@@ -1107,6 +1120,7 @@ namespace KetteReports
            this.xrTableCell225,
            this.xrTableCell226,
            this.xrTableCell227,
+            this.xrTableCell295,
            this.xrTableCell228,
            this.xrTableCell229,
            this.xrTableCell230,
@@ -1193,13 +1207,13 @@ namespace KetteReports
            // 
            this.xrTableCell225.Name = "xrTableCell225";
            this.xrTableCell225.StylePriority.UseBackColor = false;
-            this.xrTableCell225.Weight = 0.16303583302344149D;
+            this.xrTableCell225.Weight = 0.15397828677271414D;
            // 
            // xrTableCell226
            // 
            this.xrTableCell226.Name = "xrTableCell226";
            this.xrTableCell226.StylePriority.UseBackColor = false;
-            this.xrTableCell226.Weight = 0.054345303050961836D;
+            this.xrTableCell226.Weight = 0.0543452754095243D;
            // 
            // xrTableCell227
            // 
@@ -1210,13 +1224,21 @@ namespace KetteReports
            this.xrTableCell227.Name = "xrTableCell227";
            this.xrTableCell227.StylePriority.UseBackColor = false;
            this.xrTableCell227.StylePriority.UseBorders = false;
-            this.xrTableCell227.Weight = 0.1358631942018157D;
+            this.xrTableCell227.Weight = 0.076989170993072731D;
+            // 
+            // xrTableCell295
+            // 
+            this.xrTableCell295.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "OhneFestenWohnsitzCount")});
+            this.xrTableCell295.Name = "xrTableCell295";
+            this.xrTableCell295.Text = "xrTableCell295";
+            this.xrTableCell295.Weight = 0.067931597100907848D;
            // 
            // xrTableCell228
            // 
            this.xrTableCell228.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell228.BorderWidth = 1;
+            this.xrTableCell228.BorderWidth = 1F;
            this.xrTableCell228.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "DeutschCount")});
            this.xrTableCell228.Name = "xrTableCell228";
@@ -1902,6 +1924,7 @@ namespace KetteReports
            this.xrTableCell148,
            this.xrTableCell150,
            this.xrTableCell152,
+            this.xrTableCell290,
            this.xrTableCell153,
            this.xrTableCell155,
            this.xrTableCell156,
@@ -1960,14 +1983,14 @@ namespace KetteReports
            this.xrTableCell148.BackColor = System.Drawing.Color.Gainsboro;
            this.xrTableCell148.Name = "xrTableCell148";
            this.xrTableCell148.StylePriority.UseBackColor = false;
-            this.xrTableCell148.Weight = 0.16328378245949921D;
+            this.xrTableCell148.Weight = 0.15421248739906454D;
            // 
            // xrTableCell150
            // 
            this.xrTableCell150.BackColor = System.Drawing.Color.Gainsboro;
            this.xrTableCell150.Name = "xrTableCell150";
            this.xrTableCell150.StylePriority.UseBackColor = false;
-            this.xrTableCell150.Weight = 0.054427962967492548D;
+            this.xrTableCell150.Weight = 0.054427935284012491D;
            // 
            // xrTableCell152
            // 
@@ -1976,7 +1999,14 @@ namespace KetteReports
            this.xrTableCell152.Name = "xrTableCell152";
            this.xrTableCell152.StylePriority.UseBackColor = false;
            this.xrTableCell152.Text = "Anzahl der Klienten";
-            this.xrTableCell152.Weight = 0.1360698438522259D;
+            this.xrTableCell152.Weight = 0.077106244670027677D;
+            // 
+            // xrTableCell290
+            // 
+            this.xrTableCell290.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrTableCell290.Name = "xrTableCell290";
+            this.xrTableCell290.StylePriority.UseBackColor = false;
+            this.xrTableCell290.Weight = 0.068034921926112948D;
            // 
            // xrTableCell153
            // 
@@ -2269,6 +2299,7 @@ namespace KetteReports
            this.xrTableCell116,
            this.xrTableCell118,
            this.xrTableCell119,
+            this.xrTableCell223,
            this.xrTableCell121,
            this.xrTableCell123,
            this.xrTableCell124,
@@ -2337,7 +2368,7 @@ namespace KetteReports
            this.xrTableCell116.StylePriority.UseBackColor = false;
            this.xrTableCell116.StylePriority.UseBorders = false;
            this.xrTableCell116.Text = "Straße";
-            this.xrTableCell116.Weight = 0.14396639396135141D;
+            this.xrTableCell116.Weight = 0.13596826098111425D;
            // 
            // xrTableCell118
            // 
@@ -2363,7 +2394,15 @@ namespace KetteReports
            this.xrTableCell119.StylePriority.UseBackColor = false;
            this.xrTableCell119.StylePriority.UseBorders = false;
            this.xrTableCell119.Text = "Wohnplatz";
-            this.xrTableCell119.Weight = 0.11997199553773784D;
+            this.xrTableCell119.Weight = 0.067984130749106086D;
+            // 
+            // xrTableCell223
+            // 
+            this.xrTableCell223.BackColor = System.Drawing.Color.LightGray;
+            this.xrTableCell223.Name = "xrTableCell223";
+            this.xrTableCell223.StylePriority.UseBackColor = false;
+            this.xrTableCell223.Text = "ohne festen Wohnsitz";
+            this.xrTableCell223.Weight = 0.059985997768868919D;
            // 
            // xrTableCell121
            // 
@@ -3469,7 +3508,7 @@ namespace KetteReports
            this.Title.BackColor = System.Drawing.Color.White;
            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.Title.BorderWidth = 1;
+            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";
@@ -3479,7 +3518,7 @@ namespace KetteReports
            this.FieldCaption.BackColor = System.Drawing.Color.White;
            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.FieldCaption.BorderWidth = 1;
+            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";
@@ -3489,7 +3528,7 @@ namespace KetteReports
            this.PageInfo.BackColor = System.Drawing.Color.White;
            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.PageInfo.BorderWidth = 1;
+            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";
@@ -3499,7 +3538,7 @@ namespace KetteReports
            this.DataField.BackColor = System.Drawing.Color.White;
            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.DataField.BorderWidth = 1;
+            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";
@@ -3555,7 +3594,7 @@ namespace KetteReports
            this.FieldCaption,
            this.PageInfo,
            this.DataField});
-            this.Version = "13.1";
+            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
@@ -3900,5 +3939,9 @@ namespace KetteReports
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell293;
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell291;
        private DevExpress.XtraReports.UI.CalculatedField fieldDifferenz;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell296;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell295;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell290;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell223;
    }
 }
--- a/ReportImp/KetteReports/QueryListReport.cs
+++ b/ReportImp/KetteReports/QueryListReport.cs
@@ -91,11 +91,8 @@ namespace KetteReports

                    result.WohnplatzCount++;
                }
-                else
-                {
-                    int test = 0;
-                }
                
+
                //ro.Strasse = c.Person.FirstNameLastName;
                foreach (var vv in c.VarFieldValueList)
                {
@@ -107,6 +104,7 @@ namespace KetteReports
                    SetzeLebensumfeld(result, ro, vv, varFieldValue);
                    SetzeErkrankung(result, ro, vv, varFieldValue);
                    SetzeZugang(result, ro, vv, varFieldValue);
+                    SetzeOhneWohnplatz(result, ro, vv, varFieldValue);
                }

                int sex = 0;
@@ -240,6 +238,7 @@ namespace KetteReports
                if (String.IsNullOrEmpty(ro.FahrdienstJa))
                {
                    ro.FahrdienstNein = "x";
+                    result.FahrdienstNeinCount++;
                }

                if (add)
@@ -250,6 +249,7 @@ namespace KetteReports
            return result;
        }

+        
        private Wohnplatz GetWohnplatz(Dictionary<string, Wohnplatz> dict, string strasse, string ort)
        {
            if (!String.IsNullOrWhiteSpace(ort))
@@ -469,6 +469,23 @@ namespace KetteReports
            
        }

+        private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+        {
+            if (vv.VarFieldDefOid == 17)
+            {
+                if (varFieldValue != null)
+                {
+                    String vvStr = varFieldValue.ToString();
+
+                    if (vvStr == "True")
+                    {
+                        result.OhneFestenWohnsitzCount++;
+                        ro.OhneFestenWohnsitz = "x";
+                    }
+                }
+            }
+        }
+
        private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
        {
            if (vv.VarFieldDefOid == 16)
@@ -608,8 +625,8 @@ namespace KetteReports
                }
                else
                {
-                    ro.FahrdienstNein = "x";
-                    reportRo.FahrdienstNeinCount++;
+                    //ro.FahrdienstNein = "x";
+                    //reportRo.FahrdienstNeinCount++;
                }
            }
            else if (vv.VarFieldDefOid == 4)
--- a/ReportImp/KetteReports/SozPsychErfassungBeratungRO.cs
+++ b/ReportImp/KetteReports/SozPsychErfassungBeratungRO.cs
@@ -18,6 +18,8 @@ namespace KetteReports

        public int WohnplatzCount { get; set; }

+        public int OhneFestenWohnsitzCount { get; set; }
+
        public int DeutschCount { get; set; }

        public int NationalitaetCount { get; set; }
@@ -161,6 +163,8 @@ namespace KetteReports

        public String Wohnplatz { get; set; }

+        public String OhneFestenWohnsitz { get; set; }
+
        public String Deutsch { get; set; }

        public String Nationalitaet { get; set; }
--- a/ReportImp/LebenshilfeAhrweiler/Properties/licenses.licx
+++ b/ReportImp/LebenshilfeAhrweiler/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/LebenshilfeAhrweiler/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/LebenshilfeAhrweiler/ServicesOverviewReport.Designer.cs
@@ -61,6 +61,7 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell71 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
@@ -142,7 +143,6 @@ namespace LebenshilfeAhrweiler
            this.fieldBillableX20Percent = new DevExpress.XtraReports.UI.CalculatedField();
            this.fieldZuLeistendeFls = new DevExpress.XtraReports.UI.CalculatedField();
            this.fieldUbertragStunden = new DevExpress.XtraReports.UI.CalculatedField();
-            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -401,11 +401,12 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM}")});
            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
            this.xrTableCell13.StylePriority.UseFont = false;
            this.xrTableCell13.StylePriority.UsePadding = false;
            this.xrTableCell13.StylePriority.UseTextAlignment = false;
            this.xrTableCell13.Text = "xrTableCell13";
-            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell13.Weight = 0.042826519106123326D;
            // 
            // xrTableCell17
@@ -413,9 +414,11 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")});
            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell17.StylePriority.UsePadding = false;
            this.xrTableCell17.StylePriority.UseTextAlignment = false;
            this.xrTableCell17.Text = "xrTableCell17";
-            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell17.Weight = 0.042826520298647287D;
            // 
            // xrTableCell18
@@ -423,9 +426,11 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")});
            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell18.StylePriority.UsePadding = false;
            this.xrTableCell18.StylePriority.UseTextAlignment = false;
            this.xrTableCell18.Text = "xrTableCell18";
-            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell18.Weight = 0.042826521264923541D;
            // 
            // xrTableCell19
@@ -434,9 +439,11 @@ namespace LebenshilfeAhrweiler
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")});
            this.xrTableCell19.Font = new System.Drawing.Font("Calibri", 12F);
            this.xrTableCell19.Name = "xrTableCell19";
+            this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
            this.xrTableCell19.StylePriority.UseFont = false;
+            this.xrTableCell19.StylePriority.UsePadding = false;
            this.xrTableCell19.StylePriority.UseTextAlignment = false;
-            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell19.Weight = 0.042826520427125016D;
            // 
            // xrTableCell20
@@ -445,23 +452,25 @@ namespace LebenshilfeAhrweiler
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")});
            this.xrTableCell20.Font = new System.Drawing.Font("Calibri", 12F);
            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UsePadding = false;
            this.xrTableCell20.StylePriority.UseTextAlignment = false;
-            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell20.Weight = 0.042826521602773046D;
            // 
            // xrTableCell14
            // 
            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:HH:mm}")});
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList", "{0:HH:mm}")});
            this.xrTableCell14.Multiline = true;
            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+            this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
            this.xrTableCell14.StylePriority.UseFont = false;
            this.xrTableCell14.StylePriority.UsePadding = false;
            this.xrTableCell14.StylePriority.UseTextAlignment = false;
            this.xrTableCell14.Text = "xrTableCell14";
-            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell14.Weight = 0.177753028081826D;
            // 
            // xrTableCell71
@@ -471,9 +480,23 @@ namespace LebenshilfeAhrweiler
            // 
            // xrTableCell72
            // 
+            this.xrTableCell72.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
            this.xrTableCell72.Name = "xrTableCell72";
+            this.xrTableCell72.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell72.StylePriority.UsePadding = false;
+            this.xrTableCell72.StylePriority.UseTextAlignment = false;
+            this.xrTableCell72.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
            this.xrTableCell72.Weight = 0.050655026112838439D;
            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableServiceRecords1});
+            this.GroupHeader1.HeightF = 64F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.RepeatEveryPage = true;
+            // 
            // bindingSource1
            // 
            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
@@ -875,7 +898,7 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell23.CanGrow = false;
            this.xrTableCell23.Font = new System.Drawing.Font("Calibri", 12F);
            this.xrTableCell23.Name = "xrTableCell23";
-            this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 2, 100F);
+            this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 2, 100F);
            this.xrTableCell23.StylePriority.UseBorders = false;
            this.xrTableCell23.StylePriority.UseFont = false;
            this.xrTableCell23.StylePriority.UsePadding = false;
@@ -930,7 +953,7 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell22.CanGrow = false;
            this.xrTableCell22.Font = new System.Drawing.Font("Calibri", 12F);
            this.xrTableCell22.Name = "xrTableCell22";
-            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 2, 100F);
+            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 2, 100F);
            this.xrTableCell22.StylePriority.UseBorders = false;
            this.xrTableCell22.StylePriority.UseFont = false;
            this.xrTableCell22.StylePriority.UsePadding = false;
@@ -945,7 +968,7 @@ namespace LebenshilfeAhrweiler
            this.xrTable11.Font = new System.Drawing.Font("Arial", 10F);
            this.xrTable11.LocationFloat = new DevExpress.Utils.PointFloat(185.9999F, 179F);
            this.xrTable11.Name = "xrTable11";
-            this.xrTable11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 2, 100F);
+            this.xrTable11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 2, 100F);
            this.xrTable11.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
            this.xrTableRow24});
            this.xrTable11.SizeF = new System.Drawing.SizeF(186F, 40F);
@@ -979,7 +1002,7 @@ namespace LebenshilfeAhrweiler
            this.xrTable10.Font = new System.Drawing.Font("Arial", 10F);
            this.xrTable10.LocationFloat = new DevExpress.Utils.PointFloat(185.9999F, 99F);
            this.xrTable10.Name = "xrTable10";
-            this.xrTable10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
            this.xrTable10.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
            this.xrTableRow27});
            this.xrTable10.SizeF = new System.Drawing.SizeF(186F, 80F);
@@ -1037,8 +1060,10 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.Left;
            this.xrTableCell16.Font = new System.Drawing.Font("Calibri", 12F);
            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 2, 100F);
            this.xrTableCell16.StylePriority.UseBorders = false;
            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
            this.xrTableCell16.Text = "Bewilligung vom:";
            this.xrTableCell16.Weight = 1.1983393155610753D;
            // 
@@ -1048,7 +1073,7 @@ namespace LebenshilfeAhrweiler
            this.xrTable7.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
            this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 99.00001F);
            this.xrTable7.Name = "xrTable7";
-            this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
            this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
            this.xrTableRow19});
            this.xrTable7.SizeF = new System.Drawing.SizeF(186F, 80F);
@@ -1072,7 +1097,7 @@ namespace LebenshilfeAhrweiler
            this.xrTableCell1.CanGrow = false;
            this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 12F);
            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
            this.xrTableCell1.StylePriority.UseBorders = false;
            this.xrTableCell1.StylePriority.UseFont = false;
            this.xrTableCell1.StylePriority.UsePadding = false;
@@ -1371,14 +1396,6 @@ namespace LebenshilfeAhrweiler
            this.fieldUbertragStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
            this.fieldUbertragStunden.Name = "fieldUbertragStunden";
            // 
-            // GroupHeader1
-            // 
-            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTableServiceRecords1});
-            this.GroupHeader1.HeightF = 64F;
-            this.GroupHeader1.Name = "GroupHeader1";
-            this.GroupHeader1.RepeatEveryPage = true;
-            // 
            // Stundenzettel
            // 
            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1406,7 +1423,7 @@ namespace LebenshilfeAhrweiler
            this.PageWidth = 1169;
            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
            this.SnapGridSize = 9F;
-            this.Version = "13.1";
+            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
--- a/ReportImp/LebenshilfeMannheimEV/Properties/licenses.licx
+++ b/ReportImp/LebenshilfeMannheimEV/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/LebenshilfeMannheimEV/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/LebenshilfeMannheimEV/ServicesOverviewReport.Designer.cs
@@ -50,6 +50,7 @@ namespace BeWo.LebenshilfeMannheimEV
            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -90,14 +91,13 @@ namespace BeWo.LebenshilfeMannheimEV
            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
            this.fieldFLSTotal = new DevExpress.XtraReports.UI.CalculatedField();
            this.MinutenInStunden = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tblFlsProArt)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tblFlsProArtHeader)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
            // 
            // Detail
@@ -328,6 +328,10 @@ namespace BeWo.LebenshilfeMannheimEV
            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
            this.xrTableCell2.Weight = 0.14219247009684527D;
            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
            // formattingRuleStartDate
            // 
            this.formattingRuleStartDate.DataMember = "ServicesDouble";
@@ -434,7 +438,7 @@ namespace BeWo.LebenshilfeMannheimEV
            this.xrTableCell25.Name = "xrTableCell25";
            this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
            this.xrTableCell25.StylePriority.UsePadding = false;
-            this.xrTableCell25.Text = "[ApprovedStartDate] - [ApprovedEndDate]";
+            this.xrTableCell25.Text = "[Month] [Year]";
            this.xrTableCell25.Weight = 0.5653751764001822D;
            // 
            // xrLabel1
@@ -747,10 +751,6 @@ namespace BeWo.LebenshilfeMannheimEV
            this.MinutenInStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Double;
            this.MinutenInStunden.Name = "MinutenInStunden";
            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
            // Stundenzettel
            // 
            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -783,11 +783,11 @@ namespace BeWo.LebenshilfeMannheimEV
            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tblFlsProArt)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tblFlsProArtHeader)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

        }
--- a/ReportImp/SKFAlsdorf/Properties/licenses.licx
+++ b/ReportImp/SKFAlsdorf/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/SKFAlsdorf/StundennachweisJAAlsdorf.designer.cs
+++ b/ReportImp/SKFAlsdorf/StundennachweisJAAlsdorf.designer.cs
--- a/ReportImp/SeWo/CustomerDataReport.Designer.cs
+++ b/ReportImp/SeWo/CustomerDataReport.Designer.cs
@@ -108,10 +108,17 @@ namespace BeWo.SeWo
            this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.lblAnmerkungen = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblPflegegrad = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblGradDerBehinderung = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblMedication = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel41 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel42 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel43 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
            this.lblBeginn = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel();
@@ -129,28 +136,21 @@ namespace BeWo.SeWo
            this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel();
            this.DetailReport6 = new DevExpress.XtraReports.UI.DetailReportBand();
            this.Detail7 = new DevExpress.XtraReports.UI.DetailBand();
-            this.GroupHeader4 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
-            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.xrTable10 = new DevExpress.XtraReports.UI.XRTable();
            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.lblGradDerBehinderung = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblMedication = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel41 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel42 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel43 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblAnmerkungen = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblPflegegrad = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupHeader4 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            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.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -160,8 +160,8 @@ namespace BeWo.SeWo
            ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
            // 
            // Detail
@@ -821,15 +821,13 @@ namespace BeWo.SeWo
            // 
            // Detail4
            // 
-            this.Detail4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel4});
-            this.Detail4.HeightF = 42F;
+            this.Detail4.HeightF = 0F;
            this.Detail4.Name = "Detail4";
            // 
            // xrLabel4
            // 
            this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F);
            this.xrLabel4.Multiline = true;
            this.xrLabel4.Name = "xrLabel4";
            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -839,7 +837,7 @@ namespace BeWo.SeWo
            // 
            // xrTable8
            // 
-            this.xrTable8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable8.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 42.00001F);
            this.xrTable8.Name = "xrTable8";
            this.xrTable8.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
            this.xrTableRow23});
@@ -998,14 +996,6 @@ namespace BeWo.SeWo
            this.xrTableCell52.Text = "Notiz";
            this.xrTableCell52.Weight = 0.38473520249221183D;
            // 
-            // GroupHeader2
-            // 
-            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable8});
-            this.GroupHeader2.HeightF = 18F;
-            this.GroupHeader2.Name = "GroupHeader2";
-            this.GroupHeader2.RepeatEveryPage = true;
-            // 
            // topMarginBand1
            // 
            this.topMarginBand1.HeightF = 75F;
@@ -1062,6 +1052,84 @@ namespace BeWo.SeWo
            this.ReportHeader.HeightF = 540F;
            this.ReportHeader.Name = "ReportHeader";
            // 
+            // lblAnmerkungen
+            // 
+            this.lblAnmerkungen.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblAnmerkungen.LocationFloat = new DevExpress.Utils.PointFloat(139.5798F, 448.3334F);
+            this.lblAnmerkungen.Multiline = true;
+            this.lblAnmerkungen.Name = "lblAnmerkungen";
+            this.lblAnmerkungen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAnmerkungen.SizeF = new System.Drawing.SizeF(534.4551F, 24F);
+            this.lblAnmerkungen.StylePriority.UseFont = false;
+            // 
+            // lblPflegegrad
+            // 
+            this.lblPflegegrad.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblPflegegrad.LocationFloat = new DevExpress.Utils.PointFloat(139.5801F, 496.3334F);
+            this.lblPflegegrad.Name = "lblPflegegrad";
+            this.lblPflegegrad.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblPflegegrad.SizeF = new System.Drawing.SizeF(236.67F, 23.99997F);
+            this.lblPflegegrad.StylePriority.UseFont = false;
+            // 
+            // lblGradDerBehinderung
+            // 
+            this.lblGradDerBehinderung.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblGradDerBehinderung.LocationFloat = new DevExpress.Utils.PointFloat(158.33F, 472.3334F);
+            this.lblGradDerBehinderung.Name = "lblGradDerBehinderung";
+            this.lblGradDerBehinderung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblGradDerBehinderung.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
+            this.lblGradDerBehinderung.StylePriority.UseFont = false;
+            // 
+            // lblMedication
+            // 
+            this.lblMedication.Font = new System.Drawing.Font("Arial", 10F);
+            this.lblMedication.LocationFloat = new DevExpress.Utils.PointFloat(139.5801F, 424.3333F);
+            this.lblMedication.Multiline = true;
+            this.lblMedication.Name = "lblMedication";
+            this.lblMedication.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblMedication.SizeF = new System.Drawing.SizeF(534.4551F, 24F);
+            this.lblMedication.StylePriority.UseFont = false;
+            // 
+            // xrLabel40
+            // 
+            this.xrLabel40.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(0F, 496.3334F);
+            this.xrLabel40.Name = "xrLabel40";
+            this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel40.SizeF = new System.Drawing.SizeF(139.58F, 23.99994F);
+            this.xrLabel40.StylePriority.UseFont = false;
+            this.xrLabel40.Text = "Pflegegrad:";
+            // 
+            // xrLabel41
+            // 
+            this.xrLabel41.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel41.LocationFloat = new DevExpress.Utils.PointFloat(0F, 472.3334F);
+            this.xrLabel41.Name = "xrLabel41";
+            this.xrLabel41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel41.SizeF = new System.Drawing.SizeF(158.33F, 24F);
+            this.xrLabel41.StylePriority.UseFont = false;
+            this.xrLabel41.Text = "Grad der Behinderung:";
+            // 
+            // xrLabel42
+            // 
+            this.xrLabel42.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(0F, 448.3334F);
+            this.xrLabel42.Name = "xrLabel42";
+            this.xrLabel42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel42.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel42.StylePriority.UseFont = false;
+            this.xrLabel42.Text = "Anmerkungen:";
+            // 
+            // xrLabel43
+            // 
+            this.xrLabel43.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel43.LocationFloat = new DevExpress.Utils.PointFloat(0F, 424.3334F);
+            this.xrLabel43.Name = "xrLabel43";
+            this.xrLabel43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel43.SizeF = new System.Drawing.SizeF(139.58F, 24F);
+            this.xrLabel43.StylePriority.UseFont = false;
+            this.xrLabel43.Text = "Medikation:";
+            // 
            // xrPictureBox1
            // 
            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 53.125F);
@@ -1226,6 +1294,78 @@ namespace BeWo.SeWo
            this.Detail7.HeightF = 18F;
            this.Detail7.Name = "Detail7";
            // 
+            // xrTable10
+            // 
+            this.xrTable10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable10.Name = "xrTable10";
+            this.xrTable10.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable10.SizeF = new System.Drawing.SizeF(642F, 18F);
+            this.xrTable10.StylePriority.UseFont = false;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell9,
+            this.xrTableCell10,
+            this.xrTableCell11,
+            this.xrTableCell12});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1.125D;
+            // 
+            // xrTableCell9
+            // 
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Organisation.Name")});
+            this.xrTableCell9.Name = "xrTableCell9";
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseBorders = false;
+            this.xrTableCell9.StylePriority.UseFont = false;
+            this.xrTableCell9.StylePriority.UsePadding = false;
+            this.xrTableCell9.Text = "Betreuer";
+            this.xrTableCell9.Weight = 0.17912772585669781D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.RelationRole.TypeDescription")});
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell10.StylePriority.UseBorders = false;
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.StylePriority.UsePadding = false;
+            this.xrTableCell10.Text = "Rolle";
+            this.xrTableCell10.Weight = 0.21806853582554517D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Organisation.ContactSummaryInfo")});
+            this.xrTableCell11.Multiline = true;
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell11.StylePriority.UseBorders = false;
+            this.xrTableCell11.StylePriority.UsePadding = false;
+            this.xrTableCell11.Text = "xrTableCell54";
+            this.xrTableCell11.Weight = 0.2180685358255452D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Customer2OrganisationNotice")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
+            this.xrTableCell12.StylePriority.UseBorders = false;
+            this.xrTableCell12.StylePriority.UseFont = false;
+            this.xrTableCell12.StylePriority.UsePadding = false;
+            this.xrTableCell12.Text = "Notiz";
+            this.xrTableCell12.Weight = 0.38473520249221183D;
+            // 
            // GroupHeader4
            // 
            this.GroupHeader4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1233,17 +1373,7 @@ namespace BeWo.SeWo
            this.xrLabel35});
            this.GroupHeader4.HeightF = 59.99994F;
            this.GroupHeader4.Name = "GroupHeader4";
-            // 
-            // xrLabel35
-            // 
-            this.xrLabel35.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(0F, 16.99994F);
-            this.xrLabel35.Multiline = true;
-            this.xrLabel35.Name = "xrLabel35";
-            this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel35.SizeF = new System.Drawing.SizeF(309.7083F, 25F);
-            this.xrLabel35.StylePriority.UseFont = false;
-            this.xrLabel35.Text = "Organisationen des Umfelds:";
+            this.GroupHeader4.RepeatEveryPage = true;
            // 
            // xrTable3
            // 
@@ -1317,155 +1447,25 @@ namespace BeWo.SeWo
            this.xrTableCell8.Text = "Notiz";
            this.xrTableCell8.Weight = 0.38473520249221183D;
            // 
-            // xrTable10
+            // xrLabel35
            // 
-            this.xrTable10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrTable10.Name = "xrTable10";
-            this.xrTable10.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow4});
-            this.xrTable10.SizeF = new System.Drawing.SizeF(642F, 18F);
-            this.xrTable10.StylePriority.UseFont = false;
+            this.xrLabel35.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(0F, 16.99994F);
+            this.xrLabel35.Multiline = true;
+            this.xrLabel35.Name = "xrLabel35";
+            this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel35.SizeF = new System.Drawing.SizeF(309.7083F, 25F);
+            this.xrLabel35.StylePriority.UseFont = false;
+            this.xrLabel35.Text = "Organisationen des Umfelds:";
            // 
-            // xrTableRow4
+            // GroupHeader2
            // 
-            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell9,
-            this.xrTableCell10,
-            this.xrTableCell11,
-            this.xrTableCell12});
-            this.xrTableRow4.Name = "xrTableRow4";
-            this.xrTableRow4.Weight = 1.125D;
-            // 
-            // xrTableCell9
-            // 
-            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Organisation.Name")});
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
-            this.xrTableCell9.StylePriority.UseBorders = false;
-            this.xrTableCell9.StylePriority.UseFont = false;
-            this.xrTableCell9.StylePriority.UsePadding = false;
-            this.xrTableCell9.Text = "Betreuer";
-            this.xrTableCell9.Weight = 0.17912772585669781D;
-            // 
-            // xrTableCell10
-            // 
-            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.RelationRole.TypeDescription")});
-            this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
-            this.xrTableCell10.StylePriority.UseBorders = false;
-            this.xrTableCell10.StylePriority.UseFont = false;
-            this.xrTableCell10.StylePriority.UsePadding = false;
-            this.xrTableCell10.Text = "Rolle";
-            this.xrTableCell10.Weight = 0.21806853582554517D;
-            // 
-            // xrTableCell11
-            // 
-            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Organisation.ContactSummaryInfo")});
-            this.xrTableCell11.Multiline = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
-            this.xrTableCell11.StylePriority.UseBorders = false;
-            this.xrTableCell11.StylePriority.UsePadding = false;
-            this.xrTableCell11.Text = "xrTableCell54";
-            this.xrTableCell11.Weight = 0.2180685358255452D;
-            // 
-            // xrTableCell12
-            // 
-            this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "EnvironmentOrganisations.Customer2OrganisationNotice")});
-            this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
-            this.xrTableCell12.StylePriority.UseBorders = false;
-            this.xrTableCell12.StylePriority.UseFont = false;
-            this.xrTableCell12.StylePriority.UsePadding = false;
-            this.xrTableCell12.Text = "Notiz";
-            this.xrTableCell12.Weight = 0.38473520249221183D;
-            // 
-            // lblGradDerBehinderung
-            // 
-            this.lblGradDerBehinderung.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblGradDerBehinderung.LocationFloat = new DevExpress.Utils.PointFloat(158.33F, 472.3334F);
-            this.lblGradDerBehinderung.Name = "lblGradDerBehinderung";
-            this.lblGradDerBehinderung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblGradDerBehinderung.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
-            this.lblGradDerBehinderung.StylePriority.UseFont = false;
-            // 
-            // lblMedication
-            // 
-            this.lblMedication.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblMedication.LocationFloat = new DevExpress.Utils.PointFloat(139.5801F, 424.3333F);
-            this.lblMedication.Multiline = true;
-            this.lblMedication.Name = "lblMedication";
-            this.lblMedication.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblMedication.SizeF = new System.Drawing.SizeF(534.4551F, 24F);
-            this.lblMedication.StylePriority.UseFont = false;
-            // 
-            // xrLabel40
-            // 
-            this.xrLabel40.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(0F, 496.3334F);
-            this.xrLabel40.Name = "xrLabel40";
-            this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel40.SizeF = new System.Drawing.SizeF(139.58F, 23.99994F);
-            this.xrLabel40.StylePriority.UseFont = false;
-            this.xrLabel40.Text = "Pflegegrad:";
-            // 
-            // xrLabel41
-            // 
-            this.xrLabel41.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel41.LocationFloat = new DevExpress.Utils.PointFloat(0F, 472.3334F);
-            this.xrLabel41.Name = "xrLabel41";
-            this.xrLabel41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel41.SizeF = new System.Drawing.SizeF(158.33F, 24F);
-            this.xrLabel41.StylePriority.UseFont = false;
-            this.xrLabel41.Text = "Grad der Behinderung:";
-            // 
-            // xrLabel42
-            // 
-            this.xrLabel42.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(0F, 448.3334F);
-            this.xrLabel42.Name = "xrLabel42";
-            this.xrLabel42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel42.SizeF = new System.Drawing.SizeF(139.58F, 24F);
-            this.xrLabel42.StylePriority.UseFont = false;
-            this.xrLabel42.Text = "Anmerkungen:";
-            // 
-            // xrLabel43
-            // 
-            this.xrLabel43.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel43.LocationFloat = new DevExpress.Utils.PointFloat(0F, 424.3334F);
-            this.xrLabel43.Name = "xrLabel43";
-            this.xrLabel43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel43.SizeF = new System.Drawing.SizeF(139.58F, 24F);
-            this.xrLabel43.StylePriority.UseFont = false;
-            this.xrLabel43.Text = "Medikation:";
-            // 
-            // lblAnmerkungen
-            // 
-            this.lblAnmerkungen.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblAnmerkungen.LocationFloat = new DevExpress.Utils.PointFloat(139.5798F, 448.3334F);
-            this.lblAnmerkungen.Multiline = true;
-            this.lblAnmerkungen.Name = "lblAnmerkungen";
-            this.lblAnmerkungen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAnmerkungen.SizeF = new System.Drawing.SizeF(534.4551F, 24F);
-            this.lblAnmerkungen.StylePriority.UseFont = false;
-            // 
-            // lblPflegegrad
-            // 
-            this.lblPflegegrad.Font = new System.Drawing.Font("Arial", 10F);
-            this.lblPflegegrad.LocationFloat = new DevExpress.Utils.PointFloat(139.5801F, 496.3334F);
-            this.lblPflegegrad.Name = "lblPflegegrad";
-            this.lblPflegegrad.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblPflegegrad.SizeF = new System.Drawing.SizeF(236.67F, 23.99997F);
-            this.lblPflegegrad.StylePriority.UseFont = false;
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable8,
+            this.xrLabel4});
+            this.GroupHeader2.HeightF = 60.00001F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
            // 
            // Klientenstammblatt
            // 
@@ -1488,7 +1488,7 @@ namespace BeWo.SeWo
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.1";
+            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -1498,8 +1498,8 @@ namespace BeWo.SeWo
            ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

        }
@@ -1586,7 +1586,6 @@ namespace BeWo.SeWo
        private DevExpress.XtraReports.UI.XRLabel xrLabel13;
        private DevExpress.XtraReports.UI.XRLabel xrLabel12;
 		private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
-		private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
        private DevExpress.XtraReports.UI.DetailReportBand DetailReport5;
        private DevExpress.XtraReports.UI.DetailBand Detail6;
@@ -1627,5 +1626,6 @@ namespace BeWo.SeWo
        private DevExpress.XtraReports.UI.XRLabel xrLabel43;
        private DevExpress.XtraReports.UI.XRLabel lblAnmerkungen;
        private DevExpress.XtraReports.UI.XRLabel lblPflegegrad;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
    }
 }
--- a/ReportImp/SeWo/FLSGroupReport.cs
+++ b/ReportImp/SeWo/FLSGroupReport.cs
@@ -47,6 +47,7 @@ namespace BeWo.SeWo
                                if (srDb.ServiceDescription.ServiceCategory.Percentage != 100)
                                {
                                    minuten *= (srDb.ServiceDescription.ServiceCategory.Percentage)/100;
+                                    sr.RoundedDuration = minuten;

                                }
                                sr.Notice2 = srDb.Notice2;
--- a/ReportImp/SeWo/FLSListReport.cs
+++ b/ReportImp/SeWo/FLSListReport.cs
@@ -42,6 +42,7 @@ namespace BeWo.SeWo
                            if (srDb.ServiceDescription.ServiceCategory.Percentage != 100)
                            {
                                minuten *= (srDb.ServiceDescription.ServiceCategory.Percentage)/100;
+                                sr.RoundedDuration = minuten;
                            }
                            sr.Notice2 = srDb.Notice2;
                            sr.Notice3 = srDb.Notice3;
--- a/ReportImp/SeWo/Properties/licenses.licx
+++ b/ReportImp/SeWo/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/SeWo/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/SeWo/ServicesOverviewReport.Designer.cs
@@ -48,6 +48,8 @@ namespace BeWo.SeWo
            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -86,14 +88,12 @@ namespace BeWo.SeWo
            this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
            this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
            this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
            // 
            // Detail
@@ -280,6 +280,20 @@ namespace BeWo.SeWo
            this.xrTableCell17.Text = "xrTableCell17";
            this.xrTableCell17.Weight = 0.29545429524916933D;
            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTableServiceRecords1});
+            this.GroupHeader2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Bold);
+            this.GroupHeader2.HeightF = 45F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
+            this.GroupHeader2.StylePriority.UseFont = false;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+            // 
            // formattingRuleStartDate
            // 
            this.formattingRuleStartDate.Condition = "[StartDate2]  < [StartDate]";
@@ -331,7 +345,7 @@ namespace BeWo.SeWo
            this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0.007120768F, 25F);
            this.lblHeader.Name = "lblHeader";
            this.lblHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblHeader.SizeF = new System.Drawing.SizeF(356.3716F, 25F);
+            this.lblHeader.SizeF = new System.Drawing.SizeF(573.0382F, 25F);
            this.lblHeader.StylePriority.UseFont = false;
            this.lblHeader.Text = "Quittungsbeleg über Fachleistungsstunden";
            // 
@@ -679,10 +693,6 @@ namespace BeWo.SeWo
            this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
            this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
-            // 
            // GroupHeader1
            // 
            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -701,16 +711,6 @@ namespace BeWo.SeWo
            this.GroupHeader1.RepeatEveryPage = true;
            this.GroupHeader1.StylePriority.UseFont = false;
            // 
-            // GroupHeader2
-            // 
-            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTableServiceRecords1});
-            this.GroupHeader2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Bold);
-            this.GroupHeader2.HeightF = 45F;
-            this.GroupHeader2.Name = "GroupHeader2";
-            this.GroupHeader2.RepeatEveryPage = true;
-            this.GroupHeader2.StylePriority.UseFont = false;
-            // 
            // Stundenzettel
            // 
            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -735,12 +735,12 @@ namespace BeWo.SeWo
            this.PageWidth = 827;
            this.PaperKind = System.Drawing.Printing.PaperKind.A4;
            this.SnapGridSize = 9F;
-            this.Version = "13.1";
+            this.Version = "13.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

        }
--- a/ReportImp/SynpraxReports/SynpraxReports.csproj
+++ b/ReportImp/SynpraxReports/SynpraxReports.csproj
@@ -67,6 +67,7 @@
    <Compile Include="SettlementReport.Designer.cs">
      <DependentUpon>SettlementReport.cs</DependentUpon>
    </Compile>
+    <Compile Include="CustomSupportConceptAnalysisCreator.cs" />
    <Compile Include="SynpraxReportCreator.cs" />
  </ItemGroup>
  <ItemGroup>
@@ -90,6 +91,10 @@
      <Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
      <Name>Report</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Service\Service.csproj">
+      <Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
+      <Name>Service</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Shared\Shared.csproj">
      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
      <Name>Shared</Name>
--- a/ReportImp/TagwerkReports/Properties/licenses.licx
+++ b/ReportImp/TagwerkReports/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/ReportImp/TagwerkReports/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/TagwerkReports/ServicesOverviewReport.Designer.cs
--- a/ReportImp/VereinLebensgestaltung/Properties/licenses.licx
+++ b/ReportImp/VereinLebensgestaltung/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/Service/Core/Utils.cs
+++ b/Service/Core/Utils.cs
@@ -87,18 +87,24 @@ namespace BeWo.Service.Core
            if (senderEMail == null)
 				senderEMail = "bewoapp@bewoplaner.de";

-			if (to.Equals("support@bewoplaner.de"))
-			{
-				var body2 = "Kunde: " + MultitenancyOperationContextExt.Current.Tenant;
+		    bool sendAsync = true;
+		    if (to.Equals("support@bewoplaner.de"))
+		    {
+		        sendAsync = false;
+		    }
+		    var body2 = "Kunde: " + MultitenancyOperationContextExt.Current.Tenant;
 				//body2 += "\r\nIP: " + GetClientIP();
 				body += "\n\n" + body2;
-			}
+			//}

-			return SendMail(senderEMail, senderName, to, subject, body, server, user, pass);
+            
+            //if (to.Equals())
+
+			return SendMail(senderEMail, senderName, to, subject, body, server, user, pass, sendAsync);

 		}

-        public static bool SendMail(string fromEMail, string fromName, string to, string subject, string body, string smtpServer, string smtpUser, string smtpPassword)
+        public static bool SendMail(string fromEMail, string fromName, string to, string subject, string body, string smtpServer, string smtpUser, string smtpPassword, bool sendAsync)
        {
            try
            {
@@ -143,7 +149,15 @@ namespace BeWo.Service.Core

                var mailClient = new SmtpClient(smtpServer, 587) { Credentials = new NetworkCredential(smtpUser, smtpPassword) };
 	            mailClient.EnableSsl = true;
-                mailClient.SendAsync(message, null);
+
+                if (sendAsync)
+                {
+                    mailClient.SendAsync(message, null);
+                }
+                else
+                {
+                    mailClient.Send(message);
+                }

                return true;
            }
--- a/Service/Invoicing/SettlementInvoiceCreation.cs
+++ b/Service/Invoicing/SettlementInvoiceCreation.cs
@@ -526,6 +526,14 @@ namespace BeWo.Service.Invoicing

 			var accountingPeriods = calc.GetAccountingPeriods(relDC, recordDCS, span);

+		    foreach (var ap in accountingPeriods)
+		    {
+		        
+		        if (ap.SupportConceptApprovalPeriod != null && !ap.SupportConceptApprovalPeriod.ApprovedBETotal.HasValue)
+		        {
+		            ap.SupportConceptApprovalPeriod.ApprovedBETotal = si.ApprovedFLS;
+		        }
+		    }
 			si.InvoiceItems = CreateInvoiceItemsForAccountingPeriods(accountingPeriods, relDC.CostBearer.CostRatePeriods, calc);

 			//CalculateMaxApprovedAmounts(accountingPeriods, relDC.CostBearer.CostRatePeriods, calc);
--- a/Service/Plugins/GroupDurationCalculator.cs
+++ b/Service/Plugins/GroupDurationCalculator.cs
@@ -58,7 +58,7 @@ namespace BeWo.Service.Plugins
                }
                else
                {
-                    durationForSingleRecord = durationForGroup/group.CustomerCount;
+                    durationForSingleRecord = Math.Round(durationForGroup /group.CustomerCount, MidpointRounding.AwayFromZero);
                }

                foreach (var sr in group.ServiceRecordList)
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -23,7 +23,7 @@ namespace BeWo.Service.Plugins
                //t = "5620636022"; // GPZ Biberach
                //t = "8562233401"; // Sozialwirkstatt Schmitz
                //t = "1076891970"; // Assistenza
-                t = "0216265667"; // LH Hannover
+                //t = "0216265667"; // LH Hannover
                //t = "1774789565"; // LH Essen 
                //t = "9342168675"; // ABC Betreuungen
                //t = "1193188501"; // Aids Hilfe Dortmund
@@ -61,7 +61,7 @@ namespace BeWo.Service.Plugins
                //t = "3886054624"; // Brücke ABW
                //t = "2028095630"; // Integra Heinsberg
                //t = "5351926758"; // Viva a Vida
-                //t = "2215396183"; // Diakonie Remscheid Lennep
+                t = "2215396183"; // Diakonie Remscheid Lennep
                //t = "5157599087"; // SHG Schwerte
                //t = "4526293996"; // Fortis
                //t = "3647969417"; // Caritas Bottrop
@@ -156,6 +156,7 @@ namespace BeWo.Service.Plugins
 			    //t = "9800364930"; // BeWo Leverkusen
 			    //t = "4439874912"; //BeWo Sahin
 			    //t = "1873138856"; // BUG e.V.
+			    //t = "6463422907"; // Caritas Leverkusen

                return t;
 #else
--- a/Service/Plugins/ServiceRecordStatisticFactory.cs
+++ b/Service/Plugins/ServiceRecordStatisticFactory.cs
@@ -146,7 +146,8 @@ namespace BeWo.Service.Plugins



-            var serviceRecords = DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDays(costBearer2SupportConceptOid, null);
+            var serviceRecords = GetServiceRecordsForStatistic(costBearer2SupportConceptOid);
+

            var serviceRecordsProcessed = new Dictionary<long, bool>();
            if (ignoreServiceRecordOid.HasValue)
@@ -271,6 +272,11 @@ namespace BeWo.Service.Plugins
            return stats;
        }

+        protected virtual IEnumerable<ServiceRecord> GetServiceRecordsForStatistic(long costBearer2SupportConceptOid)
+        {
+            return DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDays(costBearer2SupportConceptOid, null);
+        }
+
        protected virtual void ProcessServiceRecord(ServiceRecord sr, CostBearer2SupportConcept cb2sc, SupportConceptStatisticsDC stats, DateTime statisticsDate, Calculations calc)
        {
            decimal minutesProvided = 0;
--- a/Service/ServiceImplementations/AnalysisServiceImp.cs
+++ b/Service/ServiceImplementations/AnalysisServiceImp.cs
@@ -870,7 +870,7 @@ namespace BeWo.Service.ServiceImplementations
                var span = new DateTimeSpan();
                span.StartDateTime = config.StartDate.Value;
                span.EndDateTime = config.EndDate.Value;
-				serviceRecordes = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, config.ShowOnlyMarker ? ServiceRecordTypeId.Content : (ServiceRecordTypeId?)null);
+				serviceRecordes = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, config.ShowOnlyMarker ? ServiceRecordTypeId.Content : (ServiceRecordTypeId?)null, false);
            }
            else
            {
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -1647,7 +1647,6 @@ namespace BeWo.Service.ServiceImplementations
            try
            {
                ServiceRecordGroup group = MapperFactory.ServiceRecordGroupDC_ServiceRecordGroup.MapToNewEntity(pServiceRecordGroup);
-
                var lServiceRecords = new List<ServiceRecord>();

                if (pServiceRecordGroup.ServiceRecordList != null && pServiceRecordGroup.ServiceRecordList.Count > 0)
@@ -1656,12 +1655,60 @@ namespace BeWo.Service.ServiceImplementations

                    foreach (ServiceRecord iServiceRecord in lServiceRecords)
                    {
-                        
+                        if (!group.StartDate.HasValue && group.EndDate.HasValue)
+                        {
+                            group.StartDate =
+                                group.EndDate.Value.AddMinutes((double)group.RoundedDuration*-1);
+                            
+                            
+                        }
+
+                        if (group.StartDate.HasValue && group.EndDate.HasValue)
+                        {
+                            //Korrigieren
+                            if (group.StartDate.Value == group.EndDate.Value)
+                            {
+                                if (iServiceRecord.RoundedDuration > 0)
+                                {
+                                    group.EndDate =
+                                        group.StartDate.Value.AddMinutes(
+                                            (double) iServiceRecord.RoundedDuration);
+                                }
+                            }
+                        }
+                        if (group.StartDate.HasValue)
+                        {
+                            iServiceRecord.Start = group.StartDate;
+                        }
+                        if (group.EndDate.HasValue)
+                        {
+                            iServiceRecord.End = group.EndDate;
+                        }
+
+
+                        if (group.RoundedDuration == 0)
+                        {
+                            if (group.EndDate.HasValue && group.StartDate.HasValue)
+                            {
+                                var minutes =
+                                    group.EndDate.Value.Subtract(group.StartDate.Value)
+                                        .TotalMinutes;
+
+                                group.RoundedDuration = (decimal)minutes;
+                            }
+                        }
+
+                        if (!iServiceRecord.GroupRoundedDuration.HasValue ||
+                            iServiceRecord.GroupRoundedDuration.Value == 0)
+                        {
+                            iServiceRecord.GroupRoundedDuration = group.RoundedDuration;
+                        }
+
                        iServiceRecord.IP = Utils.GetClientIP();

                        // iServiceRecord.Group = group;
                    }
-
+                    
                    group.ServiceRecordList = lServiceRecords;

                    
@@ -2146,8 +2193,54 @@ namespace BeWo.Service.ServiceImplementations
            {
                var lOriginal = DAOFactory.GenericDAO.LoadByID<ServiceRecordGroup>(pServiceRecordGroup.ServiceRecordGroupOid.Value);

-                MapperFactory.ServiceRecordGroupDC_ServiceRecordGroup.MergeWithEntity(pServiceRecordGroup, lOriginal);
+                var originalStart = lOriginal.StartDate;
+                var originalEnde = lOriginal.EndDate;

+                if (originalStart.HasValue && originalEnde.HasValue && pServiceRecordGroup.StartDate.HasValue &&
+                    pServiceRecordGroup.EndDate.HasValue)
+                {
+                    var minutesOrg = originalEnde.Value.Subtract(originalStart.Value).TotalMinutes;
+                    var minutesNew = pServiceRecordGroup.EndDate.Value.Subtract(pServiceRecordGroup.StartDate.Value).TotalMinutes;
+
+                    //Start und Ende korrigieren
+
+                    if (Math.Abs(minutesNew - minutesOrg) < 0.1 && pServiceRecordGroup.StartDate.Value.Hour == 0 && pServiceRecordGroup.StartDate.Value.Minute == 0 &&
+                        pServiceRecordGroup.StartDate.Value.Second == 0)
+                    {
+                        //prüfen ob korrigiert werden muss
+                        if (originalStart.Value.Hour != 0 ||
+                            originalStart.Value.Minute != 0)
+                        {
+                            pServiceRecordGroup.StartDate = originalStart;
+                            pServiceRecordGroup.EndDate = originalEnde;
+                            pServiceRecordGroup.RoundedDuration = (decimal) originalEnde.Value.Subtract(originalStart.Value).TotalMinutes;
+                            foreach (var srdc in pServiceRecordGroup.ServiceRecordList)
+                            {
+                                srdc.Start = originalStart;
+                                srdc.End = originalEnde;
+                                srdc.GroupRoundedDuration = pServiceRecordGroup.RoundedDuration;
+                            }
+                        }
+                    }
+
+                    
+                }
+                if (!pServiceRecordGroup.StartDate.HasValue && pServiceRecordGroup.EndDate.HasValue)
+                {
+                    pServiceRecordGroup.StartDate =
+                        pServiceRecordGroup.EndDate.Value.AddMinutes((double)pServiceRecordGroup.RoundedDuration * -1);
+
+
+                }
+                pServiceRecordGroup.RoundedDuration = (decimal)pServiceRecordGroup.EndDate.Value.Subtract(pServiceRecordGroup.StartDate.Value).TotalMinutes;
+                foreach (var srdc in pServiceRecordGroup.ServiceRecordList)
+                {
+                    srdc.GroupRoundedDuration = pServiceRecordGroup.RoundedDuration;
+                }
+
+
+                MapperFactory.ServiceRecordGroupDC_ServiceRecordGroup.MergeWithEntity(pServiceRecordGroup, lOriginal);
+               
                var lServiceRecords = new List<ServiceRecord>();

                // update servicerecords
@@ -2160,7 +2253,12 @@ namespace BeWo.Service.ServiceImplementations
                    iServiceRecord.GroupOid = lOriginal.Oid;
                    lServiceRecords.Add(iServiceRecord);
                }
+                var gdc = PluginLoader.FindClass<GroupDurationCalculator>();

+                if (gdc != null)
+                {
+                    gdc.CalculateGroupDuration(lOriginal);
+                }
                DAOFactory.GenericDAO.Update(lOriginal);
                MakeServiceRecordHistoryEntry(lServiceRecords, null, StatementType.Update);

@@ -2185,17 +2283,73 @@ namespace BeWo.Service.ServiceImplementations
                    DAOFactory.GenericDAO.LoadByIDs<ServiceRecord>(
                        pServiceRecords.Select(sr => sr.ServiceRecordOid.Value));

+                if (lOriginals.Count == 1 && pServiceRecords.Count == 1)
+                {
+                    var srDc = pServiceRecords[0];
+                    var srOrg = lOriginals[0];
+
+                    var originalStart = srOrg.Start;
+                    var originalEnde = srOrg.End;
+
+                    if (originalStart.HasValue && originalEnde.HasValue && srDc.Start.HasValue && srDc.End.HasValue)
+                    {
+                        var minutesOrg = originalEnde.Value.Subtract(originalStart.Value).TotalMinutes;
+                        var minutesNew = srDc.End.Value.Subtract(srDc.Start.Value).TotalMinutes;
+
+
+                        //Start und Ende korrigieren
+                        if (Math.Abs(minutesNew - minutesOrg) < 0.1 && srDc.Start.Value.Hour == 0 && srDc.Start.Value.Minute == 0 && srDc.Start.Value.Second == 0)
+                        {
+                            //prüfen ob korrigiert werden muss
+                            if (originalStart.Value.Hour != 0 ||
+                                originalStart.Value.Minute != 0)
+                            {
+                                srDc.Start = originalStart;
+                                srDc.End = originalEnde;
+                                //pServiceRecordGroup.RoundedDuration = (decimal)originalEnde.Value.Subtract(originalStart.Value).TotalMinutes;
+                                
+                            }
+                        }
+
+
+                    }
+                }
+                
+
                MapperFactory.ServiceRecordDC_ServiceRecord.MergeWithEntitys(pServiceRecords, lOriginals);

                var srdc = PluginLoader.FindClass<ServiceRecordDurationCalculator>();
-                if (srdc != null)
+                var gdc = PluginLoader.FindClass<GroupDurationCalculator>();
+                
+                foreach (var serviceRecord in lOriginals)
                {
-                    foreach (var serviceRecord in lOriginals)
+                    if (srdc != null)
                    {
                        srdc.CalculateRoundedDuration(serviceRecord);
                    }
+                    if (serviceRecord.GroupOid.HasValue && serviceRecord.GroupPersonCount.HasValue && serviceRecord.GroupEmployeeCount.HasValue && gdc != null)
+                    {
+                        var gc = gdc.CalculateGroupDuration(serviceRecord.GroupPersonCount.Value,
+                            serviceRecord.GroupEmployeeCount.Value, serviceRecord.RoundedDuration);
+
+                        var singleduration = serviceRecord.RoundedDuration/serviceRecord.GroupPersonCount.Value;
+
+                        if (gc != null)
+                        {
+                            singleduration = gc.SingleDuration;
+                        }
+
+                        serviceRecord.RoundedDuration = singleduration;
+                    }
+
                }

+
+                if (srdc != null)
+                {
+                    
+                }
+                
                var si = PluginLoader.FindClass<SaveInterceptor>();
 	            if (si != null)
 	            {
				`@@ -0,0 +1 @@`
				`DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`