MH: Assistenza viel diverses

2024-08-23 14:55:59 +02:00
parent c1c28365b6
commit e8e6b59747
14 changed files with 409 additions and 6204 deletions
--- a/ReportImp/AssistenzaReports/AssistenzaReports.csproj
+++ b/ReportImp/AssistenzaReports/AssistenzaReports.csproj
@@ -132,6 +132,7 @@
    <Compile Include="Quittierungsbeleg.designer.cs">
      <DependentUpon>Quittierungsbeleg.cs</DependentUpon>
    </Compile>
+    <Compile Include="Service\CustomVacationService.cs" />
    <Compile Include="SettlementReport2.cs">
      <SubType>Component</SubType>
    </Compile>
@@ -203,6 +204,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/AssistenzaReports/CustomReportCreator.cs
+++ b/ReportImp/AssistenzaReports/CustomReportCreator.cs
@@ -1,20 +1,20 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using BeWo.Data.Access;
-using BeWo.Data.Entities;
-using BeWo.Report;
-using BeWo.Report.ReportObjects;
-using DevExpress.XtraReports.UI;
-
-namespace AssistenzaReports
-{
-	public class CustomReportCreator : DefaultReportCreator
-	{
-		public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
-		{
-			List<ServicesOverviewRO> lROs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using DevExpress.XtraReports.UI;
+
+namespace AssistenzaReports
+{
+	public class CustomReportCreator : DefaultReportCreator
+	{
+		public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+		{
+			List<ServicesOverviewRO> lROs;

 			if (empOid > 0)
 			{
@@ -30,22 +30,22 @@ namespace AssistenzaReports
 				lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
 			}

-			if (lROs.Count > 0)
-		    {
+			if (lROs.Count > 0)
+		    {
 				var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid);
 				rootReport.CreateDocument();

-		        for (int i = 1; i < lROs.Count; i++)
+		        for (int i = 1; i < lROs.Count; i++)
 		        {
 					var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid);
 					lNext.CreateDocument();
 					rootReport.Pages.AddRange(lNext.Pages);
 				}

-				return rootReport;
-	        }
-
-	        return new XtraReport();
+				return rootReport;
+	        }
+
+	        return new XtraReport();
        }

 		public override XtraReport CreateServiceOverviewReportForCustomers(IList<long> customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
@@ -94,41 +94,41 @@ namespace AssistenzaReports

 			return new XtraReport();
 		}
-
-
-		public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
-		{
-			ServicesOverviewRO ro;

-			if (empOid > 0)
-		    {
-		        ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, 0, startDay, endDay, serviceCategoryOid);
-
-		        var e = DAOFactory.GenericDAO.LoadByID<Employee>(empOid);
-		        ro.MainAttendant = e.Person.FirstNameLastName;
-            }
+
+		public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+		{
+			ServicesOverviewRO ro;
+
+			if (empOid > 0)
+		    {
+		        ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, 0, startDay, endDay, serviceCategoryOid);
+
+		        var e = DAOFactory.GenericDAO.LoadByID<Employee>(empOid);
+		        ro.MainAttendant = e.Person.FirstNameLastName;
+            }
 			else
            {
 				ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
-			}
-			
+			}
+			
 			return CreateServicesOverviewReportForRo(ro, serviceCategoryOid);
 		}

-		private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
-		{
+		private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
+		{
 			IBeWoReport<ServicesOverviewRO> report = null;

 			// Bei Startdatum ab 1.1.24 Quittierungsbeleg, vorher Stundenzettel (ServicesOverviewReport)
-			if (ro.StartDate.Date >= new DateTime(2024, 01, 01))
-				report = new Quittierungsbeleg();
-			else
-				report = new Stundenzettel();
-
-			report.SetReportDataSource(ro);
-
-			return report as XtraReport;
+			if (ro.StartDate.Date >= new DateTime(2024, 01, 01))
+				report = new Quittierungsbeleg();
+			else
+				report = new Stundenzettel();
+
+			report.SetReportDataSource(ro);
+
+			return report as XtraReport;
 		}
 	}

-}
+}
--- a/ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs
+++ b/ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs
@@ -30,6 +30,7 @@ namespace BeWo.AssistenzaReports
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -56,13 +57,14 @@ namespace BeWo.AssistenzaReports
            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
            this.xrTableRow2 = 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.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
@@ -81,8 +83,9 @@ namespace BeWo.AssistenzaReports
            this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField();
            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblAufteilungLeistungen = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -102,25 +105,25 @@ namespace BeWo.AssistenzaReports
            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
            this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.Name", "{0:dd/MM/yyyy}")});
-            this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrTableCell1.Name = "xrTableCell1";
            this.xrTableCell1.StylePriority.UseBorderColor = false;
            this.xrTableCell1.StylePriority.UseBorders = false;
            this.xrTableCell1.StylePriority.UseFont = false;
            this.xrTableCell1.Text = "xrTableCell1";
-            this.xrTableCell1.Weight = 6.9183673469387754;
+            this.xrTableCell1.Weight = 6.9183673469387754D;
            // 
            // xrTableRow1
            // 
            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
            this.xrTableCell1});
            this.xrTableRow1.Name = "xrTableRow1";
-            this.xrTableRow1.Weight = 1;
+            this.xrTableRow1.Weight = 1D;
            // 
            // xrTable1
            // 
-            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
-                        | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F);
            this.xrTable1.Name = "xrTable1";
            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -137,7 +140,8 @@ namespace BeWo.AssistenzaReports
            this.xrLabel11,
            this.xrLabel10,
            this.xrTable1});
-            this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.Detail1.HeightF = 92F;
            this.Detail1.Name = "Detail1";
            this.Detail1.StylePriority.UseFont = false;
@@ -146,7 +150,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.TotalFLM", "{0:0.##}")});
-            this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(110F, 58F);
            this.xrLabel13.Name = "xrLabel13";
            this.xrLabel13.SizeF = new System.Drawing.SizeF(50F, 25F);
@@ -158,7 +162,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel12
            // 
-            this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58F);
            this.xrLabel12.Name = "xrLabel12";
            this.xrLabel12.SizeF = new System.Drawing.SizeF(110F, 25F);
@@ -170,7 +174,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldGroupFLS", "{0:0.00} FLS")});
-            this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(230F, 58F);
            this.xrLabel11.Name = "xrLabel11";
            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -180,7 +184,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel10
            // 
-            this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(160F, 58F);
            this.xrLabel10.Name = "xrLabel10";
            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -214,12 +218,14 @@ namespace BeWo.AssistenzaReports
            // Detail2
            // 
            this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel14,
+            this.lblAufteilungLeistungen,
            this.xrLabel8,
            this.xrLabel9,
            this.xrLabel6,
            this.xrLabel7,
            this.xrTable3});
-            this.Detail2.HeightF = 77F;
+            this.Detail2.HeightF = 101.6666F;
            this.Detail2.KeepTogether = true;
            this.Detail2.KeepTogetherWithDetailReports = true;
            this.Detail2.Name = "Detail2";
@@ -228,7 +234,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.fieldFLS", "{0:0.00} FLS")});
-            this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(230F, 50F);
            this.xrLabel8.Name = "xrLabel8";
            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -238,7 +244,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel9
            // 
-            this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(160F, 50F);
            this.xrLabel9.Name = "xrLabel9";
            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -252,7 +258,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.TotalFLM", "{0:0.##}")});
-            this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(110F, 50F);
            this.xrLabel6.Name = "xrLabel6";
            this.xrLabel6.SizeF = new System.Drawing.SizeF(50F, 25F);
@@ -264,7 +270,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel7
            // 
-            this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F);
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
            this.xrLabel7.Name = "xrLabel7";
            this.xrLabel7.SizeF = new System.Drawing.SizeF(110F, 25F);
@@ -274,8 +280,8 @@ namespace BeWo.AssistenzaReports
            // 
            // xrTable3
            // 
-            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
-                        | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
            this.xrTable3.Name = "xrTable3";
            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -289,19 +295,19 @@ namespace BeWo.AssistenzaReports
            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
            this.xrTableCell2});
            this.xrTableRow3.Name = "xrTableRow3";
-            this.xrTableRow3.Weight = 1;
+            this.xrTableRow3.Weight = 1D;
            // 
            // xrTableCell2
            // 
            this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.Name", "{0:dd/MM/yyyy}")});
-            this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrTableCell2.Name = "xrTableCell2";
            this.xrTableCell2.StylePriority.UseBorders = false;
            this.xrTableCell2.StylePriority.UseFont = false;
            this.xrTableCell2.Text = "xrTableCell2";
-            this.xrTableCell2.Weight = 6.9183673469387754;
+            this.xrTableCell2.Weight = 6.9183673469387754D;
            // 
            // DetailReport2
            // 
@@ -322,8 +328,8 @@ namespace BeWo.AssistenzaReports
            // 
            // xrTable4
            // 
-            this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
-                        | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
            this.xrTable4.Name = "xrTable4";
            this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
@@ -341,33 +347,33 @@ namespace BeWo.AssistenzaReports
            this.xrTableCell9,
            this.xrTableCell10});
            this.xrTableRow4.Name = "xrTableRow4";
-            this.xrTableRow4.Weight = 1;
+            this.xrTableRow4.Weight = 1D;
            // 
            // xrTableCell3
            // 
            this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.Start", "{0:dd/MM/yyyy}")});
-            this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F);
+            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
            this.xrTableCell3.Name = "xrTableCell3";
            this.xrTableCell3.StylePriority.UseFont = false;
            this.xrTableCell3.Text = "xrTableCell3";
-            this.xrTableCell3.Weight = 1.2281125568515343;
+            this.xrTableCell3.Weight = 1.2281125568515343D;
            // 
            // xrTableCell4
            // 
            this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.TimeRange")});
-            this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
            this.xrTableCell4.Name = "xrTableCell4";
            this.xrTableCell4.StylePriority.UseFont = false;
            this.xrTableCell4.Text = "xrTableCell4";
-            this.xrTableCell4.Weight = 1.5351406935500007;
+            this.xrTableCell4.Weight = 1.5351406935500007D;
            // 
            // xrTableCell9
            // 
            this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.RoundedDuration", "{0:0.##}")});
-            this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
+            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
            this.xrTableCell9.Name = "xrTableCell9";
            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
            this.xrTableCell9.StylePriority.UseFont = false;
@@ -375,7 +381,16 @@ namespace BeWo.AssistenzaReports
            this.xrTableCell9.StylePriority.UseTextAlignment = false;
            this.xrTableCell9.Text = "xrTableCell9";
            this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell9.Weight = 1.2281126927809249;
+            this.xrTableCell9.Weight = 1.2281126927809249D;
+            // 
+            // xrTableCell10
+            // 
+            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.Notice")});
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
+            this.xrTableCell10.Name = "xrTableCell10";
+            this.xrTableCell10.StylePriority.UseFont = false;
+            this.xrTableCell10.Weight = 2.611872390484109D;
            // 
            // GroupHeader1
            // 
@@ -386,10 +401,10 @@ namespace BeWo.AssistenzaReports
            // 
            // xrTable2
            // 
-            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
-                        | DevExpress.XtraPrinting.BorderSide.Right)
-                        | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
            this.xrTable2.Name = "xrTable2";
            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
@@ -408,19 +423,19 @@ namespace BeWo.AssistenzaReports
            this.xrTableCell7,
            this.xrTableCell8});
            this.xrTableRow2.Name = "xrTableRow2";
-            this.xrTableRow2.Weight = 1;
+            this.xrTableRow2.Weight = 1D;
            // 
            // xrTableCell5
            // 
            this.xrTableCell5.Name = "xrTableCell5";
            this.xrTableCell5.Text = "Datum";
-            this.xrTableCell5.Weight = 2.0385611404632673;
+            this.xrTableCell5.Weight = 2.0385611404632673D;
            // 
            // xrTableCell6
            // 
            this.xrTableCell6.Name = "xrTableCell6";
            this.xrTableCell6.Text = "Uhrzeit";
-            this.xrTableCell6.Weight = 2.5482014884439645;
+            this.xrTableCell6.Weight = 2.5482014884439645D;
            // 
            // xrTableCell7
            // 
@@ -430,11 +445,15 @@ namespace BeWo.AssistenzaReports
            this.xrTableCell7.StylePriority.UseTextAlignment = false;
            this.xrTableCell7.Text = "Minuten";
            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell7.Weight = 2.0385611475733261;
+            this.xrTableCell7.Weight = 2.0385611475733261D;
            // 
-            // bindingSource1
+            // xrTableCell8
            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.StylePriority.UseFont = false;
+            this.xrTableCell8.Text = "Dokumentation";
+            this.xrTableCell8.Weight = 4.3354816285192186D;
            // 
            // GroupFooter1
            // 
@@ -455,7 +474,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel5
            // 
-            this.xrLabel5.Font = new System.Drawing.Font("Arial", 12F);
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(184F, 25F);
            this.xrLabel5.Name = "xrLabel5";
            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -469,7 +488,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")});
-            this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F);
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(201F, 25F);
            this.xrLabel4.Name = "xrLabel4";
            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -481,7 +500,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")});
-            this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F);
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(92F, 25F);
            this.xrLabel3.Name = "xrLabel3";
            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -493,7 +512,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel2
            // 
-            this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
            this.xrLabel2.Name = "xrLabel2";
            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -503,7 +522,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel1
            // 
-            this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F);
            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
            this.xrLabel1.Multiline = true;
            this.xrLabel1.Name = "xrLabel1";
@@ -522,18 +541,18 @@ namespace BeWo.AssistenzaReports
            // 
            // xrPageInfo2
            // 
-            this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
-            this.xrPageInfo2.Format = "Seite {0} von {1}";
+            this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(492.0001F, 25F);
            this.xrPageInfo2.Name = "xrPageInfo2";
            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(184F, 23.00002F);
            this.xrPageInfo2.StyleName = "PageInfo";
            this.xrPageInfo2.StylePriority.UseFont = false;
            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
            // 
            // xrPageInfo1
            // 
-            this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+            this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F);
            this.xrPageInfo1.Name = "xrPageInfo1";
            this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
@@ -546,8 +565,8 @@ namespace BeWo.AssistenzaReports
            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.Font = new System.Drawing.Font("Times New Roman", 24F);
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
            this.Title.ForeColor = System.Drawing.Color.Black;
            this.Title.Name = "Title";
            // 
@@ -556,8 +575,8 @@ namespace BeWo.AssistenzaReports
            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.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
            this.FieldCaption.Name = "FieldCaption";
            // 
@@ -566,8 +585,8 @@ namespace BeWo.AssistenzaReports
            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.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
            this.PageInfo.ForeColor = System.Drawing.Color.Black;
            this.PageInfo.Name = "PageInfo";
            // 
@@ -576,15 +595,14 @@ namespace BeWo.AssistenzaReports
            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.Font = new System.Drawing.Font("Times New Roman", 8F);
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
            this.DataField.Name = "DataField";
            // 
            // fieldFLS
            // 
            this.fieldFLS.DataMember = "FLSReportGroups.FLSReportDetails";
-            this.fieldFLS.DataSource = this.bindingSource1;
            this.fieldFLS.Expression = "[TotalFLM] / 60\r\n";
            this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
            this.fieldFLS.Name = "fieldFLS";
@@ -592,7 +610,6 @@ namespace BeWo.AssistenzaReports
            // fieldGroupFLS
            // 
            this.fieldGroupFLS.DataMember = "FLSReportGroups";
-            this.fieldGroupFLS.DataSource = this.bindingSource1;
            this.fieldGroupFLS.Expression = "[TotalFLM]/60";
            this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
            this.fieldGroupFLS.Name = "fieldGroupFLS";
@@ -607,22 +624,35 @@ namespace BeWo.AssistenzaReports
            this.bottomMarginBand1.HeightF = 50F;
            this.bottomMarginBand1.Name = "bottomMarginBand1";
            // 
-            // xrTableCell8
+            // lblAufteilungLeistungen
            // 
-            this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.StylePriority.UseFont = false;
-            this.xrTableCell8.Text = "Dokumentation";
-            this.xrTableCell8.Weight = 4.3354816285192186;
+            this.lblAufteilungLeistungen.CanShrink = true;
+            this.lblAufteilungLeistungen.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.CustomValue1")});
+            this.lblAufteilungLeistungen.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblAufteilungLeistungen.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F);
+            this.lblAufteilungLeistungen.Multiline = true;
+            this.lblAufteilungLeistungen.Name = "lblAufteilungLeistungen";
+            this.lblAufteilungLeistungen.SizeF = new System.Drawing.SizeF(160F, 25F);
+            this.lblAufteilungLeistungen.StylePriority.UseFont = false;
+            this.lblAufteilungLeistungen.StylePriority.UsePadding = false;
            // 
-            // xrTableCell10
+            // bindingSource1
            // 
-            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.ServiceRecords.Notice")});
-            this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F);
-            this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.StylePriority.UseFont = false;
-            this.xrTableCell10.Weight = 2.611872390484109;
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
+            // 
+            // xrLabel14
+            // 
+            this.xrLabel14.CanShrink = true;
+            this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.CustomValue2")});
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(160F, 75F);
+            this.xrLabel14.Multiline = true;
+            this.xrLabel14.Name = "xrLabel14";
+            this.xrLabel14.SizeF = new System.Drawing.SizeF(160F, 25F);
+            this.xrLabel14.StylePriority.UseFont = false;
+            this.xrLabel14.StylePriority.UsePadding = false;
            // 
            // FLSAuswertung
            // 
@@ -637,7 +667,7 @@ namespace BeWo.AssistenzaReports
            this.fieldFLS,
            this.fieldGroupFLS});
            this.DataSource = this.bindingSource1;
-            this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -646,7 +676,9 @@ namespace BeWo.AssistenzaReports
            this.FieldCaption,
            this.PageInfo,
            this.DataField});
-            this.Version = "9.3";
+            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
@@ -711,5 +743,7 @@ namespace BeWo.AssistenzaReports
        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRLabel lblAufteilungLeistungen;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel14;
    }
 }
--- a/ReportImp/AssistenzaReports/FLSGroupReport.cs
+++ b/ReportImp/AssistenzaReports/FLSGroupReport.cs
@@ -18,6 +18,8 @@ namespace BeWo.AssistenzaReports
            {
                foreach (var group in pRO.FLSReportGroups)
                {
+                    Dictionary<string, decimal> leistungenZuMinuten = new Dictionary<string, decimal>();
+
                    FLSReportRO.FLSReportDetail sonstigesAlt = null;
                    FLSReportRO.FLSReportDetail fahrzeiten = null;
                    FLSReportRO.FLSReportDetail buerozeiten = null;
@@ -27,9 +29,33 @@ namespace BeWo.AssistenzaReports
                    {
                        foreach (var detail in group.FLSReportDetails)
                        {
+                            if (detail.ServiceRecords != null)
+                            {
+                                foreach (var sr in detail.ServiceRecords)
+                                {
+                                    if (!leistungenZuMinuten.ContainsKey(sr.ServiceDescription))
+                                        leistungenZuMinuten.Add(sr.ServiceDescription, 0m);
+
+                                    leistungenZuMinuten[sr.ServiceDescription] += sr.Duration;
+                                }
+                            }
+
+                            if (leistungenZuMinuten.Count > 0)
+                            {
+                                // Hier DictValues rein
+                                detail.CustomValue1 = "";
+
+                                foreach (var item in leistungenZuMinuten)
+                                {
+                                    detail.CustomValue1 += string.Format("{0}\n", item.Key);
+                                    detail.CustomValue2 += string.Format("{0:0.00}\n", item.Value);
+                                }
+                            }
+
                            if (detail.Name == "Sonstiges")
                            {
-                                sonstigesAlt = detail;
+                                detail.Name = "Mittelbare Leistungen";
+                                //sonstigesAlt = detail;
                            }
                            else 
                            {
@@ -44,6 +70,7 @@ namespace BeWo.AssistenzaReports
                            }
                        }
                    }
+
                    if (sonstigesAlt != null)
                    {
                        group.FLSReportDetails.Remove(sonstigesAlt);
--- a/ReportImp/AssistenzaReports/FLSGroupReport.resx
+++ b/ReportImp/AssistenzaReports/FLSGroupReport.resx
@@ -112,174 +112,9 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="Detail.Name" xml:space="preserve">
-    <value>Detail</value>
-  </metadata>
-  <metadata name="xrTableCell1.Name" xml:space="preserve">
-    <value>xrTableCell1</value>
-  </metadata>
-  <metadata name="xrTableRow1.Name" xml:space="preserve">
-    <value>xrTableRow1</value>
-  </metadata>
-  <metadata name="xrTable1.Name" xml:space="preserve">
-    <value>xrTable1</value>
-  </metadata>
-  <metadata name="Detail1.Name" xml:space="preserve">
-    <value>Detail1</value>
-  </metadata>
-  <metadata name="xrLabel13.Name" xml:space="preserve">
-    <value>xrLabel13</value>
-  </metadata>
-  <metadata name="xrLabel12.Name" xml:space="preserve">
-    <value>xrLabel12</value>
-  </metadata>
-  <metadata name="xrLabel11.Name" xml:space="preserve">
-    <value>xrLabel11</value>
-  </metadata>
-  <metadata name="xrLabel10.Name" xml:space="preserve">
-    <value>xrLabel10</value>
-  </metadata>
-  <metadata name="DetailReport.Name" xml:space="preserve">
-    <value>DetailReport</value>
-  </metadata>
-  <metadata name="DetailReport1.Name" xml:space="preserve">
-    <value>DetailReport1</value>
-  </metadata>
-  <metadata name="Detail2.Name" xml:space="preserve">
-    <value>Detail2</value>
-  </metadata>
-  <metadata name="xrLabel8.Name" xml:space="preserve">
-    <value>xrLabel8</value>
-  </metadata>
-  <metadata name="xrLabel9.Name" xml:space="preserve">
-    <value>xrLabel9</value>
-  </metadata>
-  <metadata name="xrLabel6.Name" xml:space="preserve">
-    <value>xrLabel6</value>
-  </metadata>
-  <metadata name="xrLabel7.Name" xml:space="preserve">
-    <value>xrLabel7</value>
-  </metadata>
-  <metadata name="xrTable3.Name" xml:space="preserve">
-    <value>xrTable3</value>
-  </metadata>
-  <metadata name="xrTableRow3.Name" xml:space="preserve">
-    <value>xrTableRow3</value>
-  </metadata>
-  <metadata name="xrTableCell2.Name" xml:space="preserve">
-    <value>xrTableCell2</value>
-  </metadata>
-  <metadata name="DetailReport2.Name" xml:space="preserve">
-    <value>DetailReport2</value>
-  </metadata>
-  <metadata name="Detail3.Name" xml:space="preserve">
-    <value>Detail3</value>
-  </metadata>
-  <metadata name="xrTable4.Name" xml:space="preserve">
-    <value>xrTable4</value>
-  </metadata>
-  <metadata name="xrTableRow4.Name" xml:space="preserve">
-    <value>xrTableRow4</value>
-  </metadata>
-  <metadata name="xrTableCell3.Name" xml:space="preserve">
-    <value>xrTableCell3</value>
-  </metadata>
-  <metadata name="xrTableCell4.Name" xml:space="preserve">
-    <value>xrTableCell4</value>
-  </metadata>
-  <metadata name="xrTableCell9.Name" xml:space="preserve">
-    <value>xrTableCell9</value>
-  </metadata>
-  <metadata name="xrTableCell10.Name" xml:space="preserve">
-    <value>xrTableCell10</value>
-  </metadata>
-  <metadata name="GroupHeader1.Name" xml:space="preserve">
-    <value>GroupHeader1</value>
-  </metadata>
-  <metadata name="xrTable2.Name" xml:space="preserve">
-    <value>xrTable2</value>
-  </metadata>
-  <metadata name="xrTableRow2.Name" xml:space="preserve">
-    <value>xrTableRow2</value>
-  </metadata>
-  <metadata name="xrTableCell5.Name" xml:space="preserve">
-    <value>xrTableCell5</value>
-  </metadata>
-  <metadata name="xrTableCell6.Name" xml:space="preserve">
-    <value>xrTableCell6</value>
-  </metadata>
-  <metadata name="xrTableCell7.Name" xml:space="preserve">
-    <value>xrTableCell7</value>
-  </metadata>
-  <metadata name="xrTableCell8.Name" xml:space="preserve">
-    <value>xrTableCell8</value>
-  </metadata>
-  <metadata name="bindingSource1.Name" xml:space="preserve">
-    <value>bindingSource1</value>
-  </metadata>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="GroupFooter1.Name" xml:space="preserve">
-    <value>GroupFooter1</value>
-  </metadata>
-  <metadata name="ReportHeader.Name" xml:space="preserve">
-    <value>ReportHeader</value>
-  </metadata>
-  <metadata name="xrLabel5.Name" xml:space="preserve">
-    <value>xrLabel5</value>
-  </metadata>
-  <metadata name="xrLabel4.Name" xml:space="preserve">
-    <value>xrLabel4</value>
-  </metadata>
-  <metadata name="xrLabel3.Name" xml:space="preserve">
-    <value>xrLabel3</value>
-  </metadata>
-  <metadata name="xrLabel2.Name" xml:space="preserve">
-    <value>xrLabel2</value>
-  </metadata>
-  <metadata name="xrLabel1.Name" xml:space="preserve">
-    <value>xrLabel1</value>
-  </metadata>
-  <metadata name="pageFooterBand1.Name" xml:space="preserve">
-    <value>pageFooterBand1</value>
-  </metadata>
-  <metadata name="xrPageInfo2.Name" xml:space="preserve">
-    <value>xrPageInfo2</value>
-  </metadata>
-  <metadata name="xrPageInfo1.Name" xml:space="preserve">
-    <value>xrPageInfo1</value>
-  </metadata>
-  <metadata name="Title.Name" xml:space="preserve">
-    <value>Title</value>
-  </metadata>
-  <metadata name="FieldCaption.Name" xml:space="preserve">
-    <value>FieldCaption</value>
-  </metadata>
-  <metadata name="PageInfo.Name" xml:space="preserve">
-    <value>PageInfo</value>
-  </metadata>
-  <metadata name="DataField.Name" xml:space="preserve">
-    <value>DataField</value>
-  </metadata>
-  <metadata name="fieldFLS.Name" xml:space="preserve">
-    <value>fieldFLS</value>
-  </metadata>
-  <metadata name="fieldGroupFLS.Name" xml:space="preserve">
-    <value>fieldGroupFLS</value>
-  </metadata>
-  <metadata name="topMarginBand1.Name" xml:space="preserve">
-    <value>topMarginBand1</value>
-  </metadata>
-  <metadata name="bottomMarginBand1.Name" xml:space="preserve">
-    <value>bottomMarginBand1</value>
-  </metadata>
-  <metadata name="$this.Name" xml:space="preserve">
-    <value>FLSAuswertung</value>
-  </metadata>
 </root>
--- a/ReportImp/AssistenzaReports/Quittierungsbeleg.designer.cs
+++ b/ReportImp/AssistenzaReports/Quittierungsbeleg.designer.cs
@@ -124,7 +124,8 @@ namespace AssistenzaReports
            this.xrTableCell2,
            this.xrTableCell9,
            this.xrTableCell12});
-            this.xrTableRow2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableRow2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableRow2.Name = "xrTableRow2";
            this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
            this.xrTableRow2.StylePriority.UseFont = false;
@@ -291,7 +292,8 @@ namespace AssistenzaReports
            // xrLabel5
            // 
            this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(267.6249F, 104.7916F);
            this.xrLabel5.Multiline = true;
            this.xrLabel5.Name = "xrLabel5";
@@ -305,7 +307,8 @@ namespace AssistenzaReports
            // 
            // xrLabel1
            // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 20F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 20F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.6875F);
            this.xrLabel1.Multiline = true;
            this.xrLabel1.Name = "xrLabel1";
@@ -318,7 +321,8 @@ namespace AssistenzaReports
            // 
            // xrLabel9
            // 
-            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4.999987F);
            this.xrLabel9.Multiline = true;
            this.xrLabel9.Name = "xrLabel9";
@@ -360,7 +364,7 @@ namespace AssistenzaReports
            // 
            // xrPictureBox2
            // 
-            this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
+            this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(481.6676F, 40.29171F);
            this.xrPictureBox2.Name = "xrPictureBox2";
            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(210.3326F, 107.7083F);
@@ -374,7 +378,8 @@ namespace AssistenzaReports
            // xrLabel4
            // 
            this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.9166F);
            this.xrLabel4.Multiline = true;
            this.xrLabel4.Name = "xrLabel4";
@@ -389,7 +394,8 @@ namespace AssistenzaReports
            // xrLabel3
            // 
            this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104.7916F);
            this.xrLabel3.Multiline = true;
            this.xrLabel3.Name = "xrLabel3";
@@ -404,7 +410,8 @@ namespace AssistenzaReports
            // xrLabel2
            // 
            this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(267.6249F, 196.9166F);
            this.xrLabel2.Multiline = true;
            this.xrLabel2.Name = "xrLabel2";
@@ -513,7 +520,8 @@ namespace AssistenzaReports
            // xrTableCell1
            // 
            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Right;
-            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell1.Name = "xrTableCell1";
            this.xrTableCell1.StylePriority.UseBorders = false;
            this.xrTableCell1.StylePriority.UseFont = false;
@@ -527,7 +535,8 @@ namespace AssistenzaReports
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte")});
-            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell5.Name = "xrTableCell5";
            this.xrTableCell5.StylePriority.UseBorders = false;
            this.xrTableCell5.StylePriority.UseFont = false;
@@ -539,7 +548,8 @@ namespace AssistenzaReports
            // 
            // xrTableCell6
            // 
-            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell6.Name = "xrTableCell6";
            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
            this.xrTableCell6.StylePriority.UseFont = false;
@@ -561,7 +571,8 @@ namespace AssistenzaReports
            // xrTableCell8
            // 
            this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Right;
-            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell8.Name = "xrTableCell8";
            this.xrTableCell8.StylePriority.UseBorders = false;
            this.xrTableCell8.StylePriority.UseFont = false;
@@ -575,7 +586,8 @@ namespace AssistenzaReports
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")});
-            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell10.Name = "xrTableCell10";
            this.xrTableCell10.StylePriority.UseBorders = false;
            this.xrTableCell10.StylePriority.UseFont = false;
@@ -586,7 +598,8 @@ namespace AssistenzaReports
            // 
            // xrTableCell11
            // 
-            this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell11.Name = "xrTableCell11";
            this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
            this.xrTableCell11.StylePriority.UseFont = false;
@@ -598,7 +611,8 @@ namespace AssistenzaReports
            // 
            // xrLabel7
            // 
-            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F);
            this.xrLabel7.Multiline = true;
            this.xrLabel7.Name = "xrLabel7";
@@ -611,7 +625,8 @@ namespace AssistenzaReports
            // 
            // xrLabel8
            // 
-            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F);
            this.xrLabel8.Multiline = true;
            this.xrLabel8.Name = "xrLabel8";
@@ -624,7 +639,8 @@ namespace AssistenzaReports
            // 
            // lblMonat
            // 
-            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 15F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 15F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(120.8333F, 0F);
            this.lblMonat.Multiline = true;
            this.lblMonat.Name = "lblMonat";
@@ -638,7 +654,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
-            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(120.8333F, 39.99999F);
            this.xrLabel12.Multiline = true;
            this.xrLabel12.Name = "xrLabel12";
@@ -653,7 +670,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
-            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(120.8333F, 75F);
            this.xrLabel11.Multiline = true;
            this.xrLabel11.Name = "xrLabel11";
@@ -666,7 +684,8 @@ namespace AssistenzaReports
            // 
            // xrLabel13
            // 
-            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(320.0002F, 4.999987F);
            this.xrLabel13.Multiline = true;
            this.xrLabel13.Name = "xrLabel13";
@@ -679,7 +698,8 @@ namespace AssistenzaReports
            // 
            // xrLabel14
            // 
-            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(320.0002F, 39.99999F);
            this.xrLabel14.Multiline = true;
            this.xrLabel14.Name = "xrLabel14";
@@ -687,12 +707,13 @@ namespace AssistenzaReports
            this.xrLabel14.SizeF = new System.Drawing.SizeF(158.3333F, 25F);
            this.xrLabel14.StylePriority.UseFont = false;
            this.xrLabel14.StylePriority.UseTextAlignment = false;
-            this.xrLabel14.Text = "Aktenzeichen:";
+            this.xrLabel14.Text = "GP-Nummer:";
            this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
            // 
            // xrLabel15
            // 
-            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(320.0002F, 75F);
            this.xrLabel15.Multiline = true;
            this.xrLabel15.Name = "xrLabel15";
@@ -707,7 +728,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.00}")});
-            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(510.2081F, 4.999987F);
            this.xrLabel16.Multiline = true;
            this.xrLabel16.Name = "xrLabel16";
@@ -721,7 +743,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")});
-            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(510.2081F, 39.99999F);
            this.xrLabel17.Multiline = true;
            this.xrLabel17.Name = "xrLabel17";
@@ -734,7 +757,8 @@ namespace AssistenzaReports
            // 
            // xrLabel18
            // 
-            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(510.2081F, 75F);
            this.xrLabel18.Multiline = true;
            this.xrLabel18.Name = "xrLabel18";
@@ -788,17 +812,18 @@ namespace AssistenzaReports
            this.GroupHeader1,
            this.GroupFooter2});
            this.DataSource = this.bindingSource1;
-            this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
            this.formattingRuleStartDate,
            this.formattingRuleServiceDesc,
            this.formattingRuleCostBearer,
            this.formattingRuleEmployeeName});
-            this.Margins = new DevExpress.Drawing.DXMargins(75, 40, 148, 40);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 40F, 148F, 40F);
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
+            this.Version = "23.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
--- a/ReportImp/AssistenzaReports/Quittierungsbeleg.resx
+++ b/ReportImp/AssistenzaReports/Quittierungsbeleg.resx
--- a/ReportImp/AssistenzaReports/Service/CustomVacationService.cs
+++ b/ReportImp/AssistenzaReports/Service/CustomVacationService.cs
@@ -0,0 +1,29 @@
+using BeWo.Service.Plugins;
+using BS.Shared.DataContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AssistenzaReports.Service
+{
+    public class CustomVacationService : VacationService
+    {
+        public override DateTime GetExpirationDate(int year)
+        {
+            return new DateTime(year, 12, 31);
+        }
+
+        public override List<FeiertagDC> GetFeiertage(int year, string bundesland)
+        {
+            var feiertage = base.GetFeiertage(year, bundesland);
+
+            var weihnachten = feiertage.FirstOrDefault(f => f.Name == "Heilig Abend");
+            if (weihnachten != null)
+                feiertage.Remove(weihnachten);
+
+            return feiertage;
+        }
+    }
+}
--- a/ReportImp/AssistenzaReports/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/AssistenzaReports/ServicesOverviewReport.Designer.cs
@@ -114,7 +114,8 @@ namespace AssistenzaReports
            this.xrTableCell4,
            this.xrTableCell9,
            this.xrTableCell12});
-            this.xrTableRow2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableRow2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableRow2.Name = "xrTableRow2";
            this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
            this.xrTableRow2.StylePriority.UseFont = false;
@@ -264,7 +265,8 @@ namespace AssistenzaReports
            // xrLabel5
            // 
            this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(267.6249F, 104.7916F);
            this.xrLabel5.Multiline = true;
            this.xrLabel5.Name = "xrLabel5";
@@ -278,7 +280,8 @@ namespace AssistenzaReports
            // 
            // xrLabel1
            // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 20F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 20F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.6875F);
            this.xrLabel1.Multiline = true;
            this.xrLabel1.Name = "xrLabel1";
@@ -291,7 +294,8 @@ namespace AssistenzaReports
            // 
            // xrLabel9
            // 
-            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4.999987F);
            this.xrLabel9.Multiline = true;
            this.xrLabel9.Name = "xrLabel9";
@@ -333,7 +337,7 @@ namespace AssistenzaReports
            // 
            // xrPictureBox2
            // 
-            this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
+            this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(481.6676F, 40.29171F);
            this.xrPictureBox2.Name = "xrPictureBox2";
            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(210.3326F, 107.7083F);
@@ -347,7 +351,8 @@ namespace AssistenzaReports
            // xrLabel4
            // 
            this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.9166F);
            this.xrLabel4.Multiline = true;
            this.xrLabel4.Name = "xrLabel4";
@@ -362,7 +367,8 @@ namespace AssistenzaReports
            // xrLabel3
            // 
            this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104.7916F);
            this.xrLabel3.Multiline = true;
            this.xrLabel3.Name = "xrLabel3";
@@ -377,7 +383,8 @@ namespace AssistenzaReports
            // xrLabel2
            // 
            this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(267.6249F, 196.9166F);
            this.xrLabel2.Multiline = true;
            this.xrLabel2.Name = "xrLabel2";
@@ -437,7 +444,8 @@ namespace AssistenzaReports
            // xrTableCell1
            // 
            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Right;
-            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell1.Name = "xrTableCell1";
            this.xrTableCell1.StylePriority.UseBorders = false;
            this.xrTableCell1.StylePriority.UseFont = false;
@@ -451,7 +459,8 @@ namespace AssistenzaReports
            | DevExpress.XtraPrinting.BorderSide.Bottom)));
            this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable")});
-            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell5.Name = "xrTableCell5";
            this.xrTableCell5.StylePriority.UseBorders = false;
            this.xrTableCell5.StylePriority.UseFont = false;
@@ -463,7 +472,8 @@ namespace AssistenzaReports
            // 
            // xrTableCell6
            // 
-            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrTableCell6.Name = "xrTableCell6";
            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
            this.xrTableCell6.StylePriority.UseFont = false;
@@ -475,7 +485,8 @@ namespace AssistenzaReports
            // 
            // xrLabel7
            // 
-            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F);
            this.xrLabel7.Multiline = true;
            this.xrLabel7.Name = "xrLabel7";
@@ -488,7 +499,8 @@ namespace AssistenzaReports
            // 
            // xrLabel8
            // 
-            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F);
            this.xrLabel8.Multiline = true;
            this.xrLabel8.Name = "xrLabel8";
@@ -501,7 +513,8 @@ namespace AssistenzaReports
            // 
            // lblMonat
            // 
-            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 15F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 15F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(120.8333F, 0F);
            this.lblMonat.Multiline = true;
            this.lblMonat.Name = "lblMonat";
@@ -515,7 +528,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
-            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(120.8333F, 39.99999F);
            this.xrLabel12.Multiline = true;
            this.xrLabel12.Name = "xrLabel12";
@@ -530,7 +544,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
-            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(120.8333F, 75F);
            this.xrLabel11.Multiline = true;
            this.xrLabel11.Name = "xrLabel11";
@@ -543,7 +558,8 @@ namespace AssistenzaReports
            // 
            // xrLabel13
            // 
-            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(320.0002F, 4.999987F);
            this.xrLabel13.Multiline = true;
            this.xrLabel13.Name = "xrLabel13";
@@ -556,7 +572,8 @@ namespace AssistenzaReports
            // 
            // xrLabel14
            // 
-            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(320.0002F, 39.99999F);
            this.xrLabel14.Multiline = true;
            this.xrLabel14.Name = "xrLabel14";
@@ -564,12 +581,13 @@ namespace AssistenzaReports
            this.xrLabel14.SizeF = new System.Drawing.SizeF(158.3333F, 25F);
            this.xrLabel14.StylePriority.UseFont = false;
            this.xrLabel14.StylePriority.UseTextAlignment = false;
-            this.xrLabel14.Text = "Aktenzeichen:";
+            this.xrLabel14.Text = "GP-Nummer:";
            this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
            // 
            // xrLabel15
            // 
-            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(320.0002F, 75F);
            this.xrLabel15.Multiline = true;
            this.xrLabel15.Name = "xrLabel15";
@@ -584,7 +602,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.00}")});
-            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(510.2081F, 4.999987F);
            this.xrLabel16.Multiline = true;
            this.xrLabel16.Name = "xrLabel16";
@@ -598,7 +617,8 @@ namespace AssistenzaReports
            // 
            this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")});
-            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(510.2081F, 39.99999F);
            this.xrLabel17.Multiline = true;
            this.xrLabel17.Name = "xrLabel17";
@@ -611,7 +631,8 @@ namespace AssistenzaReports
            // 
            // xrLabel18
            // 
-            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(510.2081F, 75F);
            this.xrLabel18.Multiline = true;
            this.xrLabel18.Name = "xrLabel18";
@@ -665,17 +686,18 @@ namespace AssistenzaReports
            this.GroupHeader1,
            this.GroupFooter2});
            this.DataSource = this.bindingSource1;
-            this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
            this.formattingRuleStartDate,
            this.formattingRuleServiceDesc,
            this.formattingRuleCostBearer,
            this.formattingRuleEmployeeName});
-            this.Margins = new DevExpress.Drawing.DXMargins(75, 40, 148, 40);
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 40F, 148F, 40F);
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
+            this.Version = "23.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
--- a/ReportImp/AssistenzaReports/ServicesOverviewReport.resx
+++ b/ReportImp/AssistenzaReports/ServicesOverviewReport.resx
--- a/ReportImp/AssistenzaReports/SettlementReport.Designer.cs
+++ b/ReportImp/AssistenzaReports/SettlementReport.Designer.cs
@@ -150,14 +150,14 @@ namespace BeWo.AssistenzaReports.Alt
            this.xrLabel5,
            this.xrLabel3,
            this.xrRichText2});
-            this.ReportHeader.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.ReportHeader.HeightF = 779.7709F;
            this.ReportHeader.Name = "ReportHeader";
            this.ReportHeader.StylePriority.UseFont = false;
            // 
            // xrRichText1
            // 
-            this.xrRichText1.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(507.0798F, 0F);
            this.xrRichText1.Name = "xrRichText1";
            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -177,7 +177,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
-            this.xrLabel9.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(486.0008F, 525.8959F);
            this.xrLabel9.Name = "xrLabel9";
            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -231,7 +231,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel6
            // 
-            this.xrLabel6.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(94.99987F, 407.5209F);
            this.xrLabel6.Multiline = true;
            this.xrLabel6.Name = "xrLabel6";
@@ -256,19 +256,19 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
            this.xrLabel3.CanShrink = true;
-            this.xrLabel3.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 292.9375F);
            this.xrLabel3.Name = "xrLabel3";
            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
            this.xrLabel3.SizeF = new System.Drawing.SizeF(630.875F, 22F);
            this.xrLabel3.StylePriority.UseBackColor = false;
            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "Spitzabrechnung AZ [CustomerReferenceNumber] [Salutation1] [CustomerName]";
+            this.xrLabel3.Text = "Spitzabrechnung GP-Nummer [CustomerReferenceNumber] [Salutation1] [CustomerName]";
            this.xrLabel3.WordWrap = false;
            // 
            // xrRichText2
            // 
-            this.xrRichText2.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(95F, 0F);
            this.xrRichText2.Name = "xrRichText2";
            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -289,7 +289,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrPictureBox2
            // 
-            this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image")));
+            this.xrPictureBox2.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox2.ImageSource"));
            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(560F, 80F);
            this.xrPictureBox2.Name = "xrPictureBox2";
            this.xrPictureBox2.SizeF = new System.Drawing.SizeF(198.9861F, 75.01047F);
@@ -307,7 +307,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrRichText4
            // 
-            this.xrRichText4.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrRichText4.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(503F, 47.91667F);
            this.xrRichText4.Name = "xrRichText4";
            this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
@@ -315,7 +315,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrRichText3
            // 
-            this.xrRichText3.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(259.54F, 47.91667F);
            this.xrRichText3.Name = "xrRichText3";
            this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
@@ -323,7 +323,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrPictureBox3
            // 
-            this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(100F, 41F);
            this.xrPictureBox3.Name = "xrPictureBox3";
            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(79.17771F, 79.17771F);
@@ -331,7 +331,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrPictureBox1
            // 
-            this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(40F, 0F);
            this.xrPictureBox1.Name = "xrPictureBox1";
            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(731.3521F, 40.63067F);
@@ -362,7 +362,7 @@ namespace BeWo.AssistenzaReports.Alt
            this.xrLabel16,
            this.xrLabel15,
            this.panel2});
-            this.GroupHeader1.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.GroupHeader1.HeightF = 720.5017F;
            this.GroupHeader1.KeepTogether = true;
            this.GroupHeader1.Name = "GroupHeader1";
@@ -371,7 +371,7 @@ namespace BeWo.AssistenzaReports.Alt
            // lblBemerkungHeader
            // 
            this.lblBemerkungHeader.CanShrink = true;
-            this.lblBemerkungHeader.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.lblBemerkungHeader.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.lblBemerkungHeader.LocationFloat = new DevExpress.Utils.PointFloat(94.99918F, 510F);
            this.lblBemerkungHeader.Multiline = true;
            this.lblBemerkungHeader.Name = "lblBemerkungHeader";
@@ -409,7 +409,7 @@ namespace BeWo.AssistenzaReports.Alt
            // xrLabel70
            // 
            this.xrLabel70.CanShrink = true;
-            this.xrLabel70.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel70.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel70.LocationFloat = new DevExpress.Utils.PointFloat(94.99918F, 445.9997F);
            this.xrLabel70.Multiline = true;
            this.xrLabel70.Name = "xrLabel70";
@@ -461,7 +461,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel68.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteFLSMitStundensatzAktuell", "{0:0.00}")});
-            this.xrLabel68.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrLabel68.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrLabel68.LocationFloat = new DevExpress.Utils.PointFloat(246.2927F, 96.49982F);
            this.xrLabel68.Name = "xrLabel68";
            this.xrLabel68.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -497,7 +497,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel65.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountTotalWithNewHourlyRate", "{0:c}")});
-            this.xrLabel65.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel65.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel65.LocationFloat = new DevExpress.Utils.PointFloat(500.001F, 96.49969F);
            this.xrLabel65.Name = "xrLabel65";
            this.xrLabel65.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -553,7 +553,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteFLSMitStundensatzAlt", "{0:0.00}")});
-            this.xrLabel39.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrLabel39.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(246.2917F, 74.49995F);
            this.xrLabel39.Name = "xrLabel39";
            this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -589,7 +589,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteFLSMitStundensatz3", "{0:0.00}")});
-            this.xrLabel56.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrLabel56.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrLabel56.LocationFloat = new DevExpress.Utils.PointFloat(246.2917F, 52.49996F);
            this.xrLabel56.Name = "xrLabel56";
            this.xrLabel56.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -613,7 +613,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
-            this.xrLabel58.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel58.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel58.LocationFloat = new DevExpress.Utils.PointFloat(500F, 128F);
            this.xrLabel58.Name = "xrLabel58";
            this.xrLabel58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -637,7 +637,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLS")});
-            this.xrLabel60.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel60.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel60.LocationFloat = new DevExpress.Utils.PointFloat(400F, 0F);
            this.xrLabel60.Name = "xrLabel60";
            this.xrLabel60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -647,7 +647,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel61
            // 
-            this.xrLabel61.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel61.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel61.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
            this.xrLabel61.Multiline = true;
            this.xrLabel61.Name = "xrLabel61";
@@ -670,7 +670,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel63.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountTotalWithHourlyRate3", "{0:c}")});
-            this.xrLabel63.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel63.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel63.LocationFloat = new DevExpress.Utils.PointFloat(500F, 52.49994F);
            this.xrLabel63.Name = "xrLabel63";
            this.xrLabel63.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -684,7 +684,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel64.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountTotalWithOldHourlyRate", "{0:c}")});
-            this.xrLabel64.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel64.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel64.LocationFloat = new DevExpress.Utils.PointFloat(500F, 74.49982F);
            this.xrLabel64.Name = "xrLabel64";
            this.xrLabel64.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -717,7 +717,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
-            this.xrLabel29.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(500F, 62.5F);
            this.xrLabel29.Name = "xrLabel29";
            this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -731,7 +731,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
-            this.xrLabel27.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(500F, 87.5F);
            this.xrLabel27.Name = "xrLabel27";
            this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -745,7 +745,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLS")});
-            this.xrLabel30.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrLabel30.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(257.7499F, 62.5F);
            this.xrLabel30.Name = "xrLabel30";
            this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -789,7 +789,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLS")});
-            this.xrLabel21.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(400F, 0F);
            this.xrLabel21.Name = "xrLabel21";
            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -799,7 +799,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel20
            // 
-            this.xrLabel20.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
            this.xrLabel20.Multiline = true;
            this.xrLabel20.Name = "xrLabel20";
@@ -842,7 +842,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments")});
-            this.xrLabel34.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel34.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(509.6214F, 342.2501F);
            this.xrLabel34.Name = "xrLabel34";
            this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -864,7 +864,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
-            this.xrLabel26.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(509.6214F, 298.2499F);
            this.xrLabel26.Name = "xrLabel26";
            this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -874,7 +874,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel28
            // 
-            this.xrLabel28.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 402.0001F);
            this.xrLabel28.Multiline = true;
            this.xrLabel28.Name = "xrLabel28";
@@ -905,7 +905,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel23
            // 
-            this.xrLabel23.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 298.2499F);
            this.xrLabel23.Multiline = true;
            this.xrLabel23.Name = "xrLabel23";
@@ -918,7 +918,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "WeeksInAccountingPeriod", "{0:0} Wochen")});
-            this.xrLabel7.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(458.9999F, 83.54168F);
            this.xrLabel7.Name = "xrLabel7";
            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -940,7 +940,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLS")});
-            this.xrLabel19.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(439.7916F, 61.54168F);
            this.xrLabel19.Name = "xrLabel19";
            this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -970,7 +970,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel16
            // 
-            this.xrLabel16.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 39.54169F);
            this.xrLabel16.Multiline = true;
            this.xrLabel16.Name = "xrLabel16";
@@ -981,7 +981,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel15
            // 
-            this.xrLabel15.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(94.99995F, 0F);
            this.xrLabel15.Multiline = true;
            this.xrLabel15.Name = "xrLabel15";
@@ -1047,7 +1047,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteFLSMitStundensatzAktuell", "{0:0.00}")});
-            this.xrLabel51.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrLabel51.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrLabel51.LocationFloat = new DevExpress.Utils.PointFloat(257.7499F, 74.49982F);
            this.xrLabel51.Name = "xrLabel51";
            this.xrLabel51.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1081,7 +1081,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "GeleisteteFLSMitStundensatzAlt", "{0:0.00}")});
-            this.xrLabel47.Font = new System.Drawing.Font("Book Antiqua", 12F);
+            this.xrLabel47.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
            this.xrLabel47.LocationFloat = new DevExpress.Utils.PointFloat(257.7499F, 52.49977F);
            this.xrLabel47.Name = "xrLabel47";
            this.xrLabel47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1105,7 +1105,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
-            this.xrLabel36.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel36.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(500F, 114.4583F);
            this.xrLabel36.Name = "xrLabel36";
            this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1129,7 +1129,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLS")});
-            this.xrLabel41.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel41.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel41.LocationFloat = new DevExpress.Utils.PointFloat(400F, 0F);
            this.xrLabel41.Name = "xrLabel41";
            this.xrLabel41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1139,7 +1139,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            // xrLabel42
            // 
-            this.xrLabel42.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel42.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
            this.xrLabel42.Multiline = true;
            this.xrLabel42.Name = "xrLabel42";
@@ -1162,7 +1162,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountTotalWithOldHourlyRate", "{0:c}")});
-            this.xrLabel43.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel43.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel43.LocationFloat = new DevExpress.Utils.PointFloat(500F, 52.49994F);
            this.xrLabel43.Name = "xrLabel43";
            this.xrLabel43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1176,7 +1176,7 @@ namespace BeWo.AssistenzaReports.Alt
            // 
            this.xrLabel45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountTotalWithNewHourlyRate", "{0:c}")});
-            this.xrLabel45.Font = new System.Drawing.Font("Book Antiqua", 12F, System.Drawing.FontStyle.Bold);
+            this.xrLabel45.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
            this.xrLabel45.LocationFloat = new DevExpress.Utils.PointFloat(500F, 74.49982F);
            this.xrLabel45.Name = "xrLabel45";
            this.xrLabel45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1202,11 +1202,11 @@ namespace BeWo.AssistenzaReports.Alt
            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
            this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(20, 34, 175, 140);
+            this.Margins = new DevExpress.Drawing.DXMargins(20F, 34F, 175F, 140F);
            this.PageHeight = 1169;
            this.PageWidth = 827;
            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
+            this.Version = "23.2";
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
--- a/ReportImp/AssistenzaReports/SettlementReport.resx
+++ b/ReportImp/AssistenzaReports/SettlementReport.resx
--- a/ReportImp/AssistenzaReports/SettlementReport2.designer.cs
+++ b/ReportImp/AssistenzaReports/SettlementReport2.designer.cs
@@ -74,6 +74,7 @@ namespace BeWo.AssistenzaReports
            this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
            this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
@@ -88,7 +89,7 @@ namespace BeWo.AssistenzaReports
            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel70 = new DevExpress.XtraReports.UI.XRLabel();
            this.xrLabel71 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
@@ -238,8 +239,8 @@ namespace BeWo.AssistenzaReports
            this.xrLabel3.SizeF = new System.Drawing.SizeF(628.75F, 22F);
            this.xrLabel3.StylePriority.UseBackColor = false;
            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "Spitzabrechnung AZ [CustomerReferenceNumber] [Salutation1] [CustomerFirstName] [C" +
-    "ustomerLastName]";
+            this.xrLabel3.Text = "Spitzabrechnung GP-Nummer [CustomerReferenceNumber] [Salutation1] [CustomerFirstN" +
+    "ame] [CustomerLastName]";
            this.xrLabel3.WordWrap = false;
            // 
            // ruleRateFactorNull
@@ -547,9 +548,13 @@ namespace BeWo.AssistenzaReports
            this.GroupFooter2.Name = "GroupFooter2";
            this.GroupFooter2.StylePriority.UseFont = false;
            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            // 
            // xrLabel22
            // 
-            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(95.04191F, 257.3752F);
+            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(95.00089F, 301.0415F);
            this.xrLabel22.Multiline = true;
            this.xrLabel22.Name = "xrLabel22";
            this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -636,6 +641,7 @@ namespace BeWo.AssistenzaReports
            // GroupFooter3
            // 
            this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel21,
            this.lblBemerkungHeader,
            this.xrLabel27,
            this.xrLabel8,
@@ -650,7 +656,7 @@ namespace BeWo.AssistenzaReports
            this.xrLabel34,
            this.xrLabel22});
            this.GroupFooter3.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F);
-            this.GroupFooter3.HeightF = 399.2919F;
+            this.GroupFooter3.HeightF = 431.0832F;
            this.GroupFooter3.Name = "GroupFooter3";
            this.GroupFooter3.StylePriority.UseFont = false;
            // 
@@ -658,7 +664,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.lblBemerkungHeader.CanShrink = true;
            this.lblBemerkungHeader.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.lblBemerkungHeader.LocationFloat = new DevExpress.Utils.PointFloat(95.04F, 200F);
+            this.lblBemerkungHeader.LocationFloat = new DevExpress.Utils.PointFloat(94.99898F, 243.6663F);
            this.lblBemerkungHeader.Multiline = true;
            this.lblBemerkungHeader.Name = "lblBemerkungHeader";
            this.lblBemerkungHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -671,7 +677,7 @@ namespace BeWo.AssistenzaReports
            this.xrLabel27.CanShrink = true;
            this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
-            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(95.04F, 222F);
+            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(94.99898F, 265.6663F);
            this.xrLabel27.Multiline = true;
            this.xrLabel27.Name = "xrLabel27";
            this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -681,7 +687,7 @@ namespace BeWo.AssistenzaReports
            // 
            // xrLabel8
            // 
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(95.04089F, 345.0002F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(94.99987F, 388.6665F);
            this.xrLabel8.Multiline = true;
            this.xrLabel8.Name = "xrLabel8";
            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -693,7 +699,7 @@ namespace BeWo.AssistenzaReports
            // 
            this.xrLabel70.CanShrink = true;
            this.xrLabel70.Font = new DevExpress.Drawing.DXFont("Book Antiqua", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel70.LocationFloat = new DevExpress.Utils.PointFloat(95.04F, 140F);
+            this.xrLabel70.LocationFloat = new DevExpress.Utils.PointFloat(94.99898F, 183.6664F);
            this.xrLabel70.Multiline = true;
            this.xrLabel70.Name = "xrLabel70";
            this.xrLabel70.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -706,7 +712,7 @@ namespace BeWo.AssistenzaReports
            this.xrLabel71.CanShrink = true;
            this.xrLabel71.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
            new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
-            this.xrLabel71.LocationFloat = new DevExpress.Utils.PointFloat(95.03962F, 162F);
+            this.xrLabel71.LocationFloat = new DevExpress.Utils.PointFloat(94.9986F, 205.6664F);
            this.xrLabel71.Multiline = true;
            this.xrLabel71.Name = "xrLabel71";
            this.xrLabel71.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -714,9 +720,17 @@ namespace BeWo.AssistenzaReports
            this.xrLabel71.StylePriority.UseFont = false;
            this.xrLabel71.Text = "Bewilligte Anzahl von Fachleistungsstunden: ";
            // 
-            // bindingSource1
+            // xrLabel21
            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+            this.xrLabel21.CanShrink = true;
+            this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
+            this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(94.9986F, 140.0829F);
+            this.xrLabel21.Multiline = true;
+            this.xrLabel21.Name = "xrLabel21";
+            this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrLabel21.SizeF = new System.Drawing.SizeF(663.9875F, 23F);
+            this.xrLabel21.Text = "xrLabel21";
            // 
            // Spitzabrechnung
            // 
@@ -807,5 +821,6 @@ namespace BeWo.AssistenzaReports
        private DevExpress.XtraReports.UI.XRLabel xrLabel71;
        private DevExpress.XtraReports.UI.XRLabel lblBemerkungHeader;
        private DevExpress.XtraReports.UI.XRLabel xrLabel27;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel21;
    }
 }
--- a/ReportImp/AssistenzaReports/SettlementReport2.resx
+++ b/ReportImp/AssistenzaReports/SettlementReport2.resx