diff --git a/ReportImp/DiakonischesWerkRegensburg/DiakonischesWerkRegensburg.csproj b/ReportImp/DiakonischesWerkRegensburg/DiakonischesWerkRegensburg.csproj
index cd205dad8..e6a4be389 100644
--- a/ReportImp/DiakonischesWerkRegensburg/DiakonischesWerkRegensburg.csproj
+++ b/ReportImp/DiakonischesWerkRegensburg/DiakonischesWerkRegensburg.csproj
@@ -82,6 +82,7 @@
     <Compile Include="Sammelrechnung.Designer.cs">
       <DependentUpon>Sammelrechnung.cs</DependentUpon>
     </Compile>
+    <Compile Include="Service\CustomAccountingService.cs" />
     <Compile Include="Service\CustomVacationService.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.Designer.cs b/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.Designer.cs
index 1a1f628bd..18cbce32e 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.Designer.cs
+++ b/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.Designer.cs
@@ -33,6 +33,7 @@ namespace DiakonischesWerkRegensburg
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -48,27 +49,26 @@ namespace DiakonischesWerkRegensburg
             this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // Detail
@@ -93,6 +93,21 @@ namespace DiakonischesWerkRegensburg
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // xrLabel8
+            // 
+            this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel8.CanShrink = true;
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 300.7083F);
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(555.56F, 27.76F);
+            this.xrLabel8.StylePriority.UseBackColor = false;
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.Text = "[CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy], Akte" +
+    "nzeichen: [CustomerReferenceNumber]";
+            this.xrLabel8.WordWrap = false;
+            // 
             // xrLabel3
             // 
             this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
@@ -171,7 +186,7 @@ namespace DiakonischesWerkRegensburg
             // 
             // lblAdresse
             // 
-            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
             this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23F);
             this.lblAdresse.Multiline = true;
             this.lblAdresse.Name = "lblAdresse";
@@ -211,7 +226,7 @@ namespace DiakonischesWerkRegensburg
             // 
             this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable6});
-            this.Detail1.HeightF = 25F;
+            this.Detail1.HeightF = 20F;
             this.Detail1.Name = "Detail1";
             this.Detail1.StylePriority.UseFont = false;
             // 
@@ -225,7 +240,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow25});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(540F, 25F);
+            this.xrTable6.SizeF = new System.Drawing.SizeF(420F, 20F);
             this.xrTable6.StylePriority.UseBorders = false;
             this.xrTable6.StylePriority.UseFont = false;
             this.xrTable6.StylePriority.UsePadding = false;
@@ -238,55 +253,78 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell45,
             this.xrTableCell3});
             this.xrTableRow25.Name = "xrTableRow25";
-            this.xrTableRow25.Weight = 0.99999999999999989D;
+            this.xrTableRow25.Weight = 0.79999999999999993D;
             // 
             // xrTableCell9
             // 
+            this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodEnd")});
             this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
+            this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell9.StylePriority.UseBorders = false;
             this.xrTableCell9.StylePriority.UseFont = false;
             this.xrTableCell9.StylePriority.UsePadding = false;
             this.xrTableCell9.StylePriority.UseTextAlignment = false;
             this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
             this.xrTableCell9.TextFormatString = "{0:dd.MM.yyyy}";
-            this.xrTableCell9.Weight = 0.68322841128249778D;
+            this.xrTableCell9.Weight = 0.39854985252728192D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")});
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
+            this.xrTableCell6.StylePriority.UsePadding = false;
+            this.xrTableCell6.StylePriority.UseTextAlignment = false;
+            this.xrTableCell6.Text = "xrTableCell6";
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell6.TextFormatString = "{0:dd.MM.yyyy}";
+            this.xrTableCell6.Weight = 0.39854985252728192D;
             // 
             // xrTableCell45
             // 
+            this.xrTableCell45.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")});
             this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell45.Name = "xrTableCell45";
-            this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
+            this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableCell45.StylePriority.UseBorderColor = false;
             this.xrTableCell45.StylePriority.UseBorders = false;
             this.xrTableCell45.StylePriority.UseFont = false;
             this.xrTableCell45.StylePriority.UsePadding = false;
             this.xrTableCell45.StylePriority.UseTextAlignment = false;
-            this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell45.Weight = 0.283096864018934D;
+            this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell45.Weight = 0.39855006255865155D;
             // 
             // xrTableCell3
             // 
+            this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
             this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell3.Name = "xrTableCell3";
-            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
             this.xrTableCell3.StylePriority.UseFont = false;
             this.xrTableCell3.StylePriority.UsePadding = false;
             this.xrTableCell3.StylePriority.UseTextAlignment = false;
-            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell3.Weight = 0.400131519444102D;
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell3.Weight = 0.3985498370752536D;
             // 
             // GroupHeader3
             // 
             this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable5});
-            this.GroupHeader3.HeightF = 25F;
+            this.GroupHeader3.HeightF = 20F;
             this.GroupHeader3.Name = "GroupHeader3";
             // 
             // xrTable5
@@ -299,7 +337,7 @@ namespace DiakonischesWerkRegensburg
             this.xrTable5.Name = "xrTable5";
             this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow1});
-            this.xrTable5.SizeF = new System.Drawing.SizeF(540F, 25F);
+            this.xrTable5.SizeF = new System.Drawing.SizeF(420F, 20F);
             this.xrTable5.StylePriority.UseBackColor = false;
             this.xrTable5.StylePriority.UseBorders = false;
             // 
@@ -313,132 +351,109 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell1});
             this.xrTableRow1.Name = "xrTableRow1";
             this.xrTableRow1.StylePriority.UseBackColor = false;
-            this.xrTableRow1.Weight = 0.99999999999999989D;
+            this.xrTableRow1.Weight = 0.79999999999999993D;
             // 
             // xrTableCell2
             // 
             this.xrTableCell2.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableCell2.StylePriority.UseBackColor = false;
+            this.xrTableCell2.StylePriority.UseBorders = false;
             this.xrTableCell2.StylePriority.UseFont = false;
             this.xrTableCell2.StylePriority.UsePadding = false;
             this.xrTableCell2.StylePriority.UseTextAlignment = false;
             this.xrTableCell2.Text = "von";
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell2.Weight = 0.68322852603339645D;
+            this.xrTableCell2.Weight = 0.39854991494744452D;
+            // 
+            // xrTableCell5
+            // 
+            this.xrTableCell5.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
+            this.xrTableCell5.Multiline = true;
+            this.xrTableCell5.Name = "xrTableCell5";
+            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.xrTableCell5.StylePriority.UseBackColor = false;
+            this.xrTableCell5.StylePriority.UseBorders = false;
+            this.xrTableCell5.StylePriority.UseFont = false;
+            this.xrTableCell5.StylePriority.UsePadding = false;
+            this.xrTableCell5.StylePriority.UseTextAlignment = false;
+            this.xrTableCell5.Text = "bis";
+            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell5.Weight = 0.39854997286544447D;
             // 
             // xrTableCell4
             // 
             this.xrTableCell4.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableCell4.StylePriority.UseBackColor = false;
+            this.xrTableCell4.StylePriority.UseBorders = false;
             this.xrTableCell4.StylePriority.UseFont = false;
             this.xrTableCell4.StylePriority.UsePadding = false;
             this.xrTableCell4.StylePriority.UseTextAlignment = false;
             this.xrTableCell4.Text = "Stunden:";
-            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell4.Weight = 0.28309692864294422D;
+            this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell4.Weight = 0.39854997465172465D;
             // 
             // xrTableCell1
             // 
             this.xrTableCell1.BackColor = System.Drawing.Color.Transparent;
+            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
             this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableCell1.StylePriority.UseBackColor = false;
+            this.xrTableCell1.StylePriority.UseBorders = false;
             this.xrTableCell1.StylePriority.UseFont = false;
             this.xrTableCell1.StylePriority.UsePadding = false;
             this.xrTableCell1.StylePriority.UseTextAlignment = false;
             this.xrTableCell1.Text = "Satz";
-            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell1.Weight = 0.40013160209951731D;
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            this.xrTableCell1.Weight = 0.39855003527591759D;
             // 
             // ReportHeader1
             // 
             this.ReportHeader1.HeightF = 0F;
             this.ReportHeader1.Name = "ReportHeader1";
-            this.ReportHeader1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
-            // 
-            // xrLabel8
-            // 
-            this.xrLabel8.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel8.CanShrink = true;
-            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 300.7083F);
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(555.5619F, 17F);
-            this.xrLabel8.StylePriority.UseBackColor = false;
-            this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.Text = "[CustomerFirstName] [CustomerLastName], geb. [CustomerBirthdate!dd.MM.yyyy]";
-            this.xrLabel8.WordWrap = false;
             // 
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrRichText2,
             this.xrLabel1});
-            this.ReportFooter.HeightF = 404.4731F;
+            this.ReportFooter.HeightF = 384.4732F;
             this.ReportFooter.Name = "ReportFooter";
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 256.5563F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5629F, 147.9168F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = "Mit freundlichen Grüßen\r\n\r\n\r\n\r\nSandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsl" +
-    "eitung\r\n";
             // 
             // xrRichText2
             // 
-            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(10.0009F, 10.00001F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
             this.xrRichText2.SizeF = new System.Drawing.SizeF(555.5628F, 220.9166F);
             this.xrRichText2.StylePriority.UseFont = false;
             // 
-            // xrTableCell5
+            // xrLabel1
             // 
-            this.xrTableCell5.BackColor = System.Drawing.Color.Transparent;
-            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 11F);
-            this.xrTableCell5.Multiline = true;
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
-            this.xrTableCell5.StylePriority.UseBackColor = false;
-            this.xrTableCell5.StylePriority.UseFont = false;
-            this.xrTableCell5.StylePriority.UsePadding = false;
-            this.xrTableCell5.StylePriority.UseTextAlignment = false;
-            this.xrTableCell5.Text = "bis";
-            this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell5.Weight = 0.68322852603339645D;
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(9.997749F, 246.5564F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.563F, 137.9168F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "Mit freundlichen Grüßen\r\n\r\n\r\n\r\nSandra Jörg\r\nDipl. Sozialpädagogin (FH)\r\nBereichsl" +
+    "eitung\r\n";
             // 
-            // xrTableCell6
+            // bindingSource1
             // 
-            this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart")});
-            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
-            this.xrTableCell6.Multiline = true;
-            this.xrTableCell6.Name = "xrTableCell6";
-            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
-            this.xrTableCell6.StylePriority.UseFont = false;
-            this.xrTableCell6.StylePriority.UsePadding = false;
-            this.xrTableCell6.StylePriority.UseTextAlignment = false;
-            this.xrTableCell6.Text = "xrTableCell6";
-            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            this.xrTableCell6.TextFormatString = "{0:dd.MM.yyyy}";
-            this.xrTableCell6.Weight = 0.68322841128249778D;
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
             // Einzelrechnung
             // 
@@ -465,8 +480,8 @@ namespace DiakonischesWerkRegensburg
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
diff --git a/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.cs b/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.cs
index 59c65d626..e3246ce9b 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.cs
+++ b/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.cs
@@ -94,10 +94,10 @@ namespace DiakonischesWerkRegensburg
             {
                 sb.AppendLine(pRO.RecipientOrganisation);
             }
-            if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
-            {
-                sb.AppendLine(pRO.RecipientContactPerson);
-            }
+            //if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+            //{
+            //    sb.AppendLine(pRO.RecipientContactPerson);
+            //}
             if (!String.IsNullOrEmpty(pRO.RecipientDivision))
             {
                 sb.AppendLine(pRO.RecipientDivision);
diff --git a/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.resx b/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.resx
index 154e4ee7a..d6b9f0a62 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.resx
+++ b/ReportImp/DiakonischesWerkRegensburg/Einzelrechnung.resx
@@ -121,6 +121,6 @@
     <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADIAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABmAHMAMgAyACAATgBvACAAUwBwAGEAYwBpAG4AZwA7AH0AewBcACoAXABjAHMAMgBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAcwAyADIAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAGYAcwAyADIAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgAyAFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgBzADIAMgBcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAGEAbgBiAGUAaQAgAFwAdQAyADUAMgBcACcAZgBjAGIAZQByAHMAZQBuAGQAZQBuACAAdwBpAHIAIABJAGgAbgBlAG4AIABkAGkAZQAgAEEAYgByAGUAYwBoAG4AdQBuAGcAIABkAGUAcgAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAARgBhAGMAaABsAGUAaQBzAHQAdQBuAGcAcwBzAHQAdQBuAGQAZQBuACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAQQBtAGIAdQBsAGEAbgB0ACAAdQBuAHQAZQByAHMAdABcAHUAMgA1ADIAXAAnAGYAYwB0AHoAdABlAHMAIABXAG8AaABuAGUAbgAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAFAAZQByAGkAbwBkAFMAdABhAHIAdAAhAE0ATQBNAE0AIAB5AHkAeQB5AF0ALgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAH0A</value>
   </data>
   <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADIAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABmAHMAMgAyACAATgBvACAAUwBwAGEAYwBpAG4AZwA7AH0AewBcACoAXABjAHMAMgBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAcwAyADIAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAGYAcwAyADIAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgAyAFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgBzADIAMgBcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAEQAZQBuACAAQgBlAHQAcgBhAGcAIABpAG4AIABIAFwAdQAyADQANgBcACcAZgA2AGgAZQAgAHYAbwBuACAAfQB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABiAFwAYwBmADEAIABbAEcAcgBvAHMAcwBDAGwAYQBpAG0AXQB9AHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAIABiAGkAdAB0AGUAbgAgAHcAaQByACAAYQB1AGYAIAB1AG4AcwBlAHIAIABLAG8AbgB0AG8AOgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABmAGkANwAyADAAXABsAGkANwAyADAAXABsAGkAbgA3ADIAMABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAASAB5AHAAbwBWAGUAcgBlAGkAbgBzAGIAYQBuAGsAIABSAGUAZwBlAG4AcwBiAHUAcgBnAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAH0AewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxACAASQBCAEEATgA6ACAARABFADgAMAAgADcANQAwADIAIAAwADAANwAzACAANgA3ADAAMAAgADIANAA5ADMAIAA4ADUAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAEIASQBDADoAIABIAFkAVgBFAEQARQBNAE0ANAA0ADcAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAFwAdABhAGIAIABcAHQAYQBiACAAVgBlAHIAdwBlAG4AZAB1AG4AZwBzAHoAdwBlAGMAawA6ACAAWwBJAG4AdgBvAGkAYwBlAE4AdQBtAGIAZQByAF0AIAAtAFsAQQBjAGMAbwB1AG4AdABpAG4AZwBQAGUAcgBpAG8AZABTAHQAYQByAHQAIQBNAE0ATQBNACAAeQB5AHkAeQBdAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIAB6AHUAIABcAHUAMgA1ADIAXAAnAGYAYwBiAGUAcgB3AGUAaQBzAGUAbgAuAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGIAXABjAGYAMQAgAEIAaQB0AHQAZQAgAGIAZQBhAGMAaAB0AGUAbgAgAFMAaQBlACAAZABpAGUAIABvAGIAZQBuACAAYQB1AGYAZwBlAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAHQAZQAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwAuACAAIAB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAH0A</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADIAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABmAHMAMgAyACAATgBvACAAUwBwAGEAYwBpAG4AZwA7AH0AewBcACoAXABjAHMAMgBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAcwAyADIAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAGYAcwAyADIAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgAyAFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgBzADIAMgBcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAEQAZQBuACAAQgBlAHQAcgBhAGcAIABpAG4AIABIAFwAdQAyADQANgBcACcAZgA2AGgAZQAgAHYAbwBuACAAfQB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABiAFwAYwBmADEAIABbAEcAcgBvAHMAcwBDAGwAYQBpAG0AXQB9AHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAIABiAGkAdAB0AGUAbgAgAHcAaQByACAAYQB1AGYAIAB1AG4AcwBlAHIAIABLAG8AbgB0AG8AOgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABmAGkANwAyADAAXABsAGkANwAyADAAXABsAGkAbgA3ADIAMABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAASAB5AHAAbwBWAGUAcgBlAGkAbgBzAGIAYQBuAGsAIABSAGUAZwBlAG4AcwBiAHUAcgBnAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAH0AewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxACAASQBCAEEATgA6ACAARABFADgAMAAgADcANQAwADIAIAAwADAANwAzACAANgA3ADAAMAAgADIANAA5ADMAIAA4ADUAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAEIASQBDADoAIABIAFkAVgBFAEQARQBNAE0ANAA0ADcAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAFwAdABhAGIAIABcAHQAYQBiACAAVgBlAHIAdwBlAG4AZAB1AG4AZwBzAHoAdwBlAGMAawA6ACAAWwBJAG4AdgBvAGkAYwBlAE4AdQBtAGIAZQByAF0AIAAtAFsAQQBjAGMAbwB1AG4AdABpAG4AZwBQAGUAcgBpAG8AZABTAHQAYQByAHQAIQBNAE0ATQBNACAAeQB5AHkAeQBdAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIAB6AHUAIABcAHUAMgA1ADIAXAAnAGYAYwBiAGUAcgB3AGUAaQBzAGUAbgAuAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGIAXABjAGYAMQAgAEIAaQB0AHQAZQAgAGIAZQBhAGMAaAB0AGUAbgAgAFMAaQBlACAAZABpAGUAIABvAGIAZQBuACAAYQB1AGYAZwBlAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAHQAZQAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwAuAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAfQA=</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceCreationTagespauschale.cs b/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceCreationTagespauschale.cs
index 3ad3cb142..643b291b3 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceCreationTagespauschale.cs
+++ b/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceCreationTagespauschale.cs
@@ -12,157 +12,102 @@ using BS.Shared.Services;
 
 namespace DiakonischesWerkRegensburg.Invoicing
 {
-	public class CustomInvoiceCreationTagespauschale : InvoiceCreation
+	public class CustomInvoiceCreation : InvoiceCreation
 	{
 		private DateTime? accountingPeriodStart = null;
 		private DateTime? accountingPeriodEnd = null;
 
-		//public override void CheckMaxApprovedAmount(ServiceInvoice invoice, ServiceInvoicePeriod sip, SupportConceptApprovalPeriodDC scap,
-		//	CostBearer2SupportConcept costBearer2SupportConcept, DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
+		public override ServiceInvoicePeriod CreateServiceInvoicePeriod(SupportConceptApprovalPeriodDC approvalPeriodDC, DateTimeSpan invoiceAccountingPeriodSpan)
+		{
+			var sip = new ServiceInvoicePeriod
+			{
+				Start = invoiceAccountingPeriodSpan.StartDateTime,
+				End = invoiceAccountingPeriodSpan.EndDateTime,
+			};
+
+			return sip;
+		}
+
+		//public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
+		//	IList<CompactSupportConceptDC> supportConceptList)
 		//{
-		//	// do nothing base.CheckMaxApprovedAmount(invoice, sip, scap, costBearer2SupportConcept, invoicePeriod, serviceRecords);
+		//	if (invoicePeriod != null)
+		//	{
+		//		accountingPeriodStart = invoicePeriod.StartDate;
+		//		accountingPeriodEnd = invoicePeriod.EndDate;
+		//	}
+		//	base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
 		//}
 
-		public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
-			IList<CompactSupportConceptDC> supportConceptList)
-		{
-			if (invoicePeriod != null)
-			{
-				accountingPeriodStart = invoicePeriod.StartDate;
-				accountingPeriodEnd = invoicePeriod.EndDate;
-			}
-			base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
-		}
+		//public override void SetSingleInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer,
+		//	DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept)
+		//{
+		//	base.SetSingleInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConcept);
 
-		public override void SetSingleInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer,
-			DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept)
-		{
-			base.SetSingleInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConcept);
+		//	Person p = invoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.Person;
+		//	invoice.InvoiceBase.InvoiceTitle = String.Format("{0}, {1}, {2}", invoice.InvoiceBase.RecipientOrganisation, p.LastName, p.FirstName);
+		//}
 
-			Person p = invoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer.Person;
-			invoice.InvoiceBase.InvoiceTitle = String.Format("{0}, {1}, {2}", invoice.InvoiceBase.RecipientOrganisation, p.LastName, p.FirstName);
-		}
+		//   public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod,
+		//       SupportConceptApprovalPeriodDC scap, CostBearer2SupportConcept cb2sc,
+		//       DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
+		//   {
+		//       serviceInvoicePeriod.ApprovedFixedAmount = null;
+		//          //base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
+		//          Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
+		//          serviceInvoicePeriod.InvoiceItemList.Add(CreateInvoiceItem(scap, calc, cb2sc));
 
-	    public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod,
-	        SupportConceptApprovalPeriodDC scap, CostBearer2SupportConcept cb2sc,
-	        DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
-	    {
-	        serviceInvoicePeriod.ApprovedFixedAmount = null;
-            //base.SetInvoiceItems(invoice, serviceInvoicePeriod, scap, cb2sc, invoicePeriod, serviceRecords);
-            Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ?? Calculations.GetInstance(_SpecificID);
-            serviceInvoicePeriod.InvoiceItemList.Add(CreateInvoiceItem(scap, calc, cb2sc));
-	        
-            serviceInvoicePeriod.Claim = serviceInvoicePeriod.InvoiceItemList.Sum(i => i.GrossAmountTotal);
-	    }
+		//          serviceInvoicePeriod.Claim = serviceInvoicePeriod.InvoiceItemList.Sum(i => i.GrossAmountTotal);
+		//   }
 
-	    public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
-	        Calculations calc)
-	    {
-            
-	        return new List<InvoiceItem>();
-	    }
+		//   public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
+		//       Calculations calc)
+		//   {
 
-	    private InvoiceItem CreateInvoiceItem(SupportConceptApprovalPeriodDC scap, Calculations calc, CostBearer2SupportConcept cb2sc)
-		{
-			var invoiceItem = new InvoiceItem();
-            
-		    DateTime start = accountingPeriodStart.Value;
-		    DateTime end = accountingPeriodEnd.Value;
+		//       return new List<InvoiceItem>();
+		//   }
 
-		    if (scap.StartDate.HasValue && scap.StartDate > start)
-		    {
-		        start = scap.StartDate.Value;
-		    }
+		//   private InvoiceItem CreateInvoiceItem(SupportConceptApprovalPeriodDC scap, Calculations calc, CostBearer2SupportConcept cb2sc)
+		//{
+		//	var invoiceItem = new InvoiceItem();
 
-		    if (scap.EndDate.HasValue && scap.EndDate < end)
-		    {
-		        end = scap.EndDate.Value;
-		    }
+		//    DateTime start = accountingPeriodStart.Value;
+		//    DateTime end = accountingPeriodEnd.Value;
 
-		    
-		    int days = BerechneAbrechenbareTage(start, end, cb2sc.SupportConcept.Customer);
-		    
-		    invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount ?? 0;
-		    if (scap.ApprovedFixedAmount.HasValue && scap.ApprovedFixedAmountInterval.HasValue &&
-		        scap.ApprovedFixedAmountInterval.Value == SupportConceptApprovalInterval.Daily)
-		    {
-		        invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount.Value;
-		    }
-		    invoiceItem.UnitCount = days;
-		    invoiceItem.AmountTotal = invoiceItem.UnitCount * invoiceItem.AmountPerUnit;
-		    invoiceItem.ItemPeriodStart = start;
-		    invoiceItem.ItemPeriodEnd = end;
-		    invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
-		    
-            invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
-            
-		    return invoiceItem;
-		}
+		//    if (scap.StartDate.HasValue && scap.StartDate > start)
+		//    {
+		//        start = scap.StartDate.Value;
+		//    }
 
-	    private int BerechneAbrechenbareTage(DateTime start, DateTime end, Customer customer)
-	    {
-	        int days = (int)end.Subtract(start).TotalDays + 1;
+		//    if (scap.EndDate.HasValue && scap.EndDate < end)
+		//    {
+		//        end = scap.EndDate.Value;
+		//    }
 
-	        //var abs = customer.AbsenceTimes;
 
-	        //foreach (var at in abs)
-	        //{
-	        //    if (at.Start <= end && (!at.End.HasValue || at.End.Value >= start))
-	        //    {
-	        //        int abwesenheitStart = (int)start.Subtract(at.Start.Value).TotalDays + 1;
+		//    int days = BerechneAbrechenbareTage(start, end, cb2sc.SupportConcept.Customer);
 
-	        //        DateTime abwStart = start;
-	        //        DateTime abwEnd = end;
+		//    invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount ?? 0;
+		//    if (scap.ApprovedFixedAmount.HasValue && scap.ApprovedFixedAmountInterval.HasValue &&
+		//        scap.ApprovedFixedAmountInterval.Value == SupportConceptApprovalInterval.Daily)
+		//    {
+		//        invoiceItem.AmountPerUnit = scap.ApprovedFixedAmount.Value;
+		//    }
+		//    invoiceItem.UnitCount = days;
+		//    invoiceItem.AmountTotal = invoiceItem.UnitCount * invoiceItem.AmountPerUnit;
+		//    invoiceItem.ItemPeriodStart = start;
+		//    invoiceItem.ItemPeriodEnd = end;
+		//    invoiceItem.GrossAmountTotal = invoiceItem.AmountTotal;
 
-	        //        if (at.Start.Value > abwStart)
-	        //        {
-	        //            abwStart = at.Start.Value;
-	        //        }
+		//          invoiceItem.SupportConceptApprovalPeriodOid = scap.SupportConceptApprovalPeriodOid;
 
-	        //        if (at.End.HasValue && at.End.Value < abwEnd)
-	        //        {
-	        //            abwEnd = at.End.Value;
-	        //        }
+		//    return invoiceItem;
+		//}
 
-	        //        int daysAbwesenheit = (int)abwEnd.Subtract(abwStart).TotalDays + 1;
-
-	        //        int letzterTag = abwesenheitStart + daysAbwesenheit - 1;
-
-	        //        if (letzterTag > 30)
-	        //        {
-	        //            if (letzterTag <= 56)
-	        //            {
-	        //                if (abwesenheitStart > 30)
-	        //                {
-	        //                    days -= (letzterTag - abwesenheitStart);
-	        //                }
-	        //                else
-	        //                {
-	        //                    days -= (letzterTag - 30);
-	        //                }
-	        //            }
-	        //            else
-	        //            {
-	        //                int tageAbzug = 56 - abwesenheitStart;
-
-	        //                if (tageAbzug > 0)
-	        //                {
-	        //                    days -= tageAbzug;
-	        //                }
-	        //            }
-	                    
-	        //        }
-                    
-	        //    }
-                
-	        //}
-	        //if (days < 0)
-	        //{
-	        //    days = 0;
-	        //}
-            return days;
-
-	    }
-        
-    }
+		//   private int BerechneAbrechenbareTage(DateTime start, DateTime end, Customer customer)
+		//   {
+		//       int days = (int)end.Subtract(start).TotalDays + 1;
+		//          return days;
+		//   }
+	}
 }
diff --git a/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceFactory.cs b/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceFactory.cs
index 90b5a898a..108a611ec 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceFactory.cs
+++ b/ReportImp/DiakonischesWerkRegensburg/Invoicing/CustomInvoiceFactory.cs
@@ -11,12 +11,10 @@ namespace DiakonischesWerkRegensburg.Invoicing
 {
 	public class CustomInvoiceFactory : InvoiceFactory
 	{
-		
-		//public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
-		//{
-		//	return new CustomInvoiceCreation();
-	
-		//}
-        
-	}
+
+        public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+        {
+            return new CustomInvoiceCreation();
+        }
+    }
 }
diff --git a/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.Designer.cs b/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.Designer.cs
index eb8bd3050..8fffe5120 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.Designer.cs
+++ b/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.Designer.cs
@@ -29,10 +29,13 @@ namespace DiakonischesWerkRegensburg
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Sammelrechnung));
+            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
@@ -67,13 +70,11 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -103,6 +104,31 @@ namespace DiakonischesWerkRegensburg
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // xrLabel3
+            // 
+            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel3.CanShrink = true;
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.334F, 325.7084F);
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
+            this.xrLabel3.StylePriority.UseBackColor = false;
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "[InvoiceNumber] - [AccountingPeriodStart!MMMM yyyy]";
+            this.xrLabel3.WordWrap = false;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 691.5561F);
+            this.xrLabel1.Multiline = true;
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5628F, 230.2084F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
+            // 
             // xrRichText1
             // 
             this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 414.3894F);
@@ -167,7 +193,7 @@ namespace DiakonischesWerkRegensburg
             // 
             // lblAdresse
             // 
-            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
             this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23F);
             this.lblAdresse.Multiline = true;
             this.lblAdresse.Name = "lblAdresse";
@@ -240,6 +266,8 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell42
             // 
+            this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell42.Name = "xrTableCell42";
             this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
@@ -254,11 +282,14 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell9
             // 
+            this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.NotBillableString")});
             this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
+            this.xrTableCell9.StylePriority.UseBorders = false;
             this.xrTableCell9.StylePriority.UseFont = false;
             this.xrTableCell9.StylePriority.UsePadding = false;
             this.xrTableCell9.StylePriority.UseTextAlignment = false;
@@ -267,6 +298,8 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell45
             // 
+            this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.##}")});
             this.xrTableCell45.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
@@ -282,11 +315,14 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell3
             // 
+            this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
             this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell3.Name = "xrTableCell3";
             this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
             this.xrTableCell3.StylePriority.UseFont = false;
             this.xrTableCell3.StylePriority.UsePadding = false;
             this.xrTableCell3.StylePriority.UseTextAlignment = false;
@@ -295,11 +331,14 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell10
             // 
+            this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.NetAmount", "{0:c}")});
             this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10.5F);
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell10.StylePriority.UseBorders = false;
             this.xrTableCell10.StylePriority.UseFont = false;
             this.xrTableCell10.StylePriority.UsePadding = false;
             this.xrTableCell10.StylePriority.UseTextAlignment = false;
@@ -445,6 +484,8 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell11
             // 
+            this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
@@ -459,8 +500,11 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell12
             // 
+            this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("arial", 10.5F);
             this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.StylePriority.UseBorders = false;
             this.xrTableCell12.StylePriority.UseFont = false;
             this.xrTableCell12.StylePriority.UseTextAlignment = false;
             this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
@@ -468,10 +512,13 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell13
             // 
+            this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount")});
             this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.StylePriority.UseBorders = false;
             this.xrTableCell13.StylePriority.UseFont = false;
             this.xrTableCell13.StylePriority.UseTextAlignment = false;
             xrSummary1.FormatString = "{0:0.##}";
@@ -482,8 +529,11 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell7
             // 
+            this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("arial", 10.5F);
             this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseBorders = false;
             this.xrTableCell7.StylePriority.UseFont = false;
             this.xrTableCell7.StylePriority.UseTextAlignment = false;
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
@@ -491,11 +541,14 @@ namespace DiakonischesWerkRegensburg
             // 
             // xrTableCell14
             // 
+            this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")});
             this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("arial", 10.5F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell14.Name = "xrTableCell14";
             this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
+            this.xrTableCell14.StylePriority.UseBorders = false;
             this.xrTableCell14.StylePriority.UseFont = false;
             this.xrTableCell14.StylePriority.UsePadding = false;
             this.xrTableCell14.StylePriority.UseTextAlignment = false;
@@ -503,21 +556,6 @@ namespace DiakonischesWerkRegensburg
             this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
             this.xrTableCell14.Weight = 0.69076967431961256D;
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 691.5561F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(555.5628F, 230.2084F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
-            // 
             // ReportHeader1
             // 
             this.ReportHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -528,34 +566,20 @@ namespace DiakonischesWerkRegensburg
             this.ReportHeader1.Name = "ReportHeader1";
             this.ReportHeader1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
             // 
-            // xrLabel3
+            // xrLabel7
             // 
-            this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel3.CanShrink = true;
-            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(178.334F, 325.7084F);
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(387.2294F, 17F);
-            this.xrLabel3.StylePriority.UseBackColor = false;
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "[InvoiceNumber] - [AccountingPeriodStart!MMMM yyyy]";
-            this.xrLabel3.WordWrap = false;
-            // 
-            // xrLabel4
-            // 
-            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel4.CanShrink = true;
-            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
-            this.xrLabel4.Multiline = true;
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(555.5629F, 29.87499F);
-            this.xrLabel4.StylePriority.UseBackColor = false;
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
-            this.xrLabel4.WordWrap = false;
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.CanShrink = true;
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 72.16663F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(555.5629F, 24.66666F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "Abrechnungszeitraum: [AccountingPeriod]";
+            this.xrLabel7.WordWrap = false;
             // 
             // xrLabel6
             // 
@@ -572,20 +596,24 @@ namespace DiakonischesWerkRegensburg
             this.xrLabel6.Text = "Einzelaufstellung erstellt am [InvoiceDate]";
             this.xrLabel6.WordWrap = false;
             // 
-            // xrLabel7
+            // xrLabel4
             // 
-            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel7.CanShrink = true;
-            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 72.16663F);
-            this.xrLabel7.Multiline = true;
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(555.5629F, 24.66666F);
-            this.xrLabel7.StylePriority.UseBackColor = false;
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.Text = "Abrechnungszeitraum: [AccountingPeriod]";
-            this.xrLabel7.WordWrap = false;
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.CanShrink = true;
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(10.00074F, 0F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(555.5629F, 29.87499F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.Text = "Abrechnung Fachleistungsstunden Ambulant unterstütztes Wohnen";
+            this.xrLabel4.WordWrap = false;
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
             // 
             // Sammelrechnung
             // 
@@ -606,6 +634,8 @@ namespace DiakonischesWerkRegensburg
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
diff --git a/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.cs b/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.cs
index 20ae9a253..436b62208 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.cs
+++ b/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.cs
@@ -28,26 +28,6 @@ namespace DiakonischesWerkRegensburg
             pRO.ServiceInvoicePeriods.Sort((a, b) => a.Customer.LastName.CompareTo(b.Customer.LastName));
             foreach (var sip in pRO.ServiceInvoicePeriods)
             {
-                if (sip.Customer != null)
-                {
-                    String anrede = "";
-                    if (sip.Customer.Sex.HasValue && sip.Customer.Sex.Value == Sex.Male)
-                    {
-                        anrede = "Herr";
-                    }
-                    else
-                    {
-                        anrede = "Frau";
-                    }
-
-                    String name = String.Format("{0} {1} {2}", anrede, sip.Customer.FirstName, sip.Customer.LastName);
-
-                    if (!sb.ToString().Contains("name"))
-                    {
-                        sb.AppendLine(name);
-                    }
-                }
-
                 if (sip.ServiceInvoiceItems != null)
                 {
                     foreach (var ii in sip.ServiceInvoiceItems)
@@ -77,10 +57,10 @@ namespace DiakonischesWerkRegensburg
 
 
             }
-            if (pRO.RecipientOrganisation.Contains("TWG"))
-            {
-                lblBetreff.Text = "Therapeutische Wohngemeinschaft";
-            }
+            //if (pRO.RecipientOrganisation.Contains("TWG"))
+            //{
+            //    lblBetreff.Text = "Therapeutische Wohngemeinschaft";
+            //}
 
             this.bindingSource1.DataSource = pRO;
         }
@@ -95,10 +75,10 @@ namespace DiakonischesWerkRegensburg
             {
                 sb.AppendLine(pRO.RecipientOrganisation);
             }
-            if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
-            {
-                sb.AppendLine(pRO.RecipientContactPerson);
-            }
+            //if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
+            //{
+            //    sb.AppendLine(pRO.RecipientContactPerson);
+            //}
             if (!String.IsNullOrEmpty(pRO.RecipientDivision))
             {
                 sb.AppendLine(pRO.RecipientDivision);
diff --git a/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.resx b/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.resx
index 5a4381760..afdd4b1be 100644
--- a/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.resx
+++ b/ReportImp/DiakonischesWerkRegensburg/Sammelrechnung.resx
@@ -133,6 +133,6 @@ Bereichsleitung
 </value>
   </data>
   <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADIAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABmAHMAMgAyACAATgBvACAAUwBwAGEAYwBpAG4AZwA7AH0AewBcACoAXABjAHMAMgBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAcwAyADIAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAGYAcwAyADIAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgAyAFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgBzADIAMgBcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAGEAbgBiAGUAaQAgAFwAdQAyADUAMgBcACcAZgBjAGIAZQByAHMAZQBuAGQAZQBuACAAdwBpAHIAIABJAGgAbgBlAG4AIABkAGkAZQAgAEEAYgByAGUAYwBoAG4AdQBuAGcAIABkAGUAcgAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAARgBhAGMAaABsAGUAaQBzAHQAdQBuAGcAcwBzAHQAdQBuAGQAZQBuACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAQQBtAGIAdQBsAGEAbgB0ACAAdQBuAHQAZQByAHMAdABcAHUAMgA1ADIAXAAnAGYAYwB0AHoAdABlAHMAIABXAG8AaABuAGUAbgAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAFAAZQByAGkAbwBkAFMAdABhAHIAdAAhAE0ATQBNAE0AIAB5AHkAeQB5AF0ALgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAEQAZQBuACAAQgBlAHQAcgBhAGcAIABpAG4AIABIAFwAdQAyADQANgBcACcAZgA2AGgAZQAgAHYAbwBuACAAWwBHAHIAbwBzAHMAQwBsAGEAaQBtAF0AIABiAGkAdAB0AGUAbgAgAHcAaQByACAAYQB1AGYAIAB1AG4AcwBlAHIAIABLAG8AbgB0AG8AOgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABmAGkANwAyADAAXABsAGkANwAyADAAXABsAGkAbgA3ADIAMABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAASAB5AHAAbwBWAGUAcgBlAGkAbgBzAGIAYQBuAGsAIABSAGUAZwBlAG4AcwBiAHUAcgBnAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAH0AewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxACAASQBCAEEATgA6ACAARABFADgAMAAgADcANQAwADIAIAAwADAANwAzACAANgA3ADAAMAAgADIANAA5ADMAIAA4ADUAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAEIASQBDADoAIABIAFkAVgBFAEQARQBNAE0ANAA0ADcAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAFwAdABhAGIAIABcAHQAYQBiACAAVgBlAHIAdwBlAG4AZAB1AG4AZwBzAHoAdwBlAGMAawA6ACAAfQB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAFsASQBuAHYAbwBpAGMAZQBOAHUAbQBiAGUAcgBdACAALQB9AHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAFAAZQByAGkAbwBkAFMAdABhAHIAdAAhAE0ATQBNAE0AIAB5AHkAeQB5AF0AfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAHoAdQAgAFwAdQAyADUAMgBcACcAZgBjAGIAZQByAHcAZQBpAHMAZQBuAC4AfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxACAAQgBpAHQAdABlACAAYgBlAGEAYwBoAHQAZQBuACAAUwBpAGUAIABkAGkAZQAgAG8AYgBlAG4AIABhAHUAZgBnAGUAZgBcAHUAMgA1ADIAXAAnAGYAYwBoAHIAdABlACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnAC4AIAAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAfQA=</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADIAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAcwAyADIAIABOAG8AcgBtAGEAbAA7AH0AewBcAHMAMQBcAHMAYgBhAHMAZQBkAG8AbgAwAFwAcwBuAGUAeAB0ADEAXABxAGwAXABmAHMAMgAyACAATgBvACAAUwBwAGEAYwBpAG4AZwA7AH0AewBcACoAXABjAHMAMgBcAGYAMQBcAGYAcwAyADIAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAcwAyADIAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAGYAcwAyADIAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgAyAFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgBzADIAMgBcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAGEAbgBiAGUAaQAgAFwAdQAyADUAMgBcACcAZgBjAGIAZQByAHMAZQBuAGQAZQBuACAAdwBpAHIAIABJAGgAbgBlAG4AIABkAGkAZQAgAEEAYgByAGUAYwBoAG4AdQBuAGcAIABkAGUAcgAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAARgBhAGMAaABsAGUAaQBzAHQAdQBuAGcAcwBzAHQAdQBuAGQAZQBuACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAQQBtAGIAdQBsAGEAbgB0ACAAdQBuAHQAZQByAHMAdABcAHUAMgA1ADIAXAAnAGYAYwB0AHoAdABlAHMAIABXAG8AaABuAGUAbgAgAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAFAAZQByAGkAbwBkAFMAdABhAHIAdAAhAE0ATQBNAE0AIAB5AHkAeQB5AF0ALgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAEQAZQBuACAAQgBlAHQAcgBhAGcAIABpAG4AIABIAFwAdQAyADQANgBcACcAZgA2AGgAZQAgAHYAbwBuACAAfQB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABiAFwAYwBmADEAIABbAEcAcgBvAHMAcwBDAGwAYQBpAG0AXQB9AHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAAIABiAGkAdAB0AGUAbgAgAHcAaQByACAAYQB1AGYAIAB1AG4AcwBlAHIAIABLAG8AbgB0AG8AOgB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXABmAGkANwAyADAAXABsAGkANwAyADAAXABsAGkAbgA3ADIAMABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxACAASAB5AHAAbwBWAGUAcgBlAGkAbgBzAGIAYQBuAGsAIABSAGUAZwBlAG4AcwBiAHUAcgBnAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAH0AewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxACAASQBCAEEATgA6ACAARABFADgAMAAgADcANQAwADIAIAAwADAANwAzACAANgA3ADAAMAAgADIANAA5ADMAIAA4ADUAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIABcAHQAYQBiACAAXAB0AGEAYgAgAEIASQBDADoAIABIAFkAVgBFAEQARQBNAE0ANAA0ADcAfQBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABzADEAXABxAGwAXAB3AGkAZABjAHQAbABwAGEAcgB7AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQAgAFwAdABhAGIAIABcAHQAYQBiACAAVgBlAHIAdwBlAG4AZAB1AG4AZwBzAHoAdwBlAGMAawA6ACAAWwBJAG4AdgBvAGkAYwBlAE4AdQBtAGIAZQByAF0AIAAtAFsAQQBjAGMAbwB1AG4AdABpAG4AZwBQAGUAcgBpAG8AZABTAHQAYQByAHQAIQBNAE0ATQBNACAAeQB5AHkAeQBdAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcwAxAFwAcQBsAFwAdwBpAGQAYwB0AGwAcABhAHIAewBcAGYAMgBcAGYAcwAyADQAXABsAGEAbgBnAG4AcAAxADAAMwAxAFwAbABhAG4AZwBmAGUAbgBwADEAMAAzADEAXABuAG8AcAByAG8AbwBmAFwAYwBmADEAIAB6AHUAIABcAHUAMgA1ADIAXAAnAGYAYwBiAGUAcgB3AGUAaQBzAGUAbgAuAH0AXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAbABcAHcAaQBkAGMAdABsAHAAYQByAHsAXABmADIAXABmAHMAMgA0AFwAbABhAG4AZwBuAHAAMQAwADMAMQBcAGwAYQBuAGcAZgBlAG4AcAAxADAAMwAxAFwAbgBvAHAAcgBvAG8AZgBcAGIAXABjAGYAMQAgAEIAaQB0AHQAZQAgAGIAZQBhAGMAaAB0AGUAbgAgAFMAaQBlACAAZABpAGUAIABvAGIAZQBuACAAYQB1AGYAZwBlAGYAXAB1ADIANQAyAFwAJwBmAGMAaAByAHQAZQAgAEIAYQBuAGsAdgBlAHIAYgBpAG4AZAB1AG4AZwAuACAAIAB9AFwAZgAyAFwAZgBzADIANABcAGwAYQBuAGcAbgBwADEAMAAzADEAXABsAGEAbgBnAGYAZQBuAHAAMQAwADMAMQBcAG4AbwBwAHIAbwBvAGYAXABjAGYAMQBcAHAAYQByAH0A</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/ReportImp/DiakonischesWerkRegensburg/Service/CustomAccountingService.cs b/ReportImp/DiakonischesWerkRegensburg/Service/CustomAccountingService.cs
new file mode 100644
index 000000000..e6f7be41d
--- /dev/null
+++ b/ReportImp/DiakonischesWerkRegensburg/Service/CustomAccountingService.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Windows;
+using BeWo.Data;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Invoicing;
+using BeWo.Service.Plugins;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+
+namespace DiakonischesWerkRegensburg.Service
+{
+	public class CustomAccountingService : AccountingService
+    {
+		// entspricht dem Original, außer dass die Bewilligung des Hilfeplans abgelaufen sein kann bzw. kein Enddate hat
+		public override List<ServiceInvoiceDC> GenerateInitialServiceInvoices(long costBearerOid, long? supportConceptOid, DateTimeSpan invoicePeriod)
+		{
+			var cs = PluginLoader.FindClass<CustomerService>();
+			IEnumerable<CompactSupportConceptDC> supportConcepts;
+			// GetAllActiveSupportConceptCostbearer returns a "Flat" SupportConcept List, one for each CostBearer2SupportConcept!
+			if (!supportConceptOid.HasValue)
+			{
+				supportConcepts = cs.GetAllActiveSupportConceptCostbearer(false, true, 0)
+					.Where(i => i.CostBearerOids2CostBearerRelOids.ContainsKey(costBearerOid));
+			}
+			else
+			{
+				supportConcepts = cs.GetCompactSupportConcepts(supportConceptOid.Value, null)
+					.Where(i => i.CostBearerOids2CostBearerRelOids.ContainsKey(costBearerOid));
+			}
+
+			DateTimeSpan newSpan = null;
+			if (invoicePeriod != null)
+			{
+				//invoicePeriod.StartDateTime = invoicePeriod.StartDateTime.Date;
+				//invoicePeriod.EndDateTime = invoicePeriod.EndDateTime.Date;
+				newSpan = new DateTimeSpan();
+				newSpan.StartDateTime = invoicePeriod.StartDateTime.Date;
+				newSpan.EndDateTime = invoicePeriod.EndDateTime.Date.AddDays(1).AddTicks(-1);
+     //           if (!supportConceptOid.HasValue)
+     //           {
+					//supportConcepts =
+					//	supportConcepts.Where(sc => sc.StartDate < newSpan.EndDateTime); //&& sc.EndDate >= newSpan.StartDate);
+     //           }
+            }
+			var supportConcepts2ServiceRecords = supportConcepts.ToDictionary(
+														i => i,
+														i => MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(
+																													DAOFactory.SearchDAO.FindServiceRecordsInSpan(i.CostBearerRelOids[0], newSpan)));
+			var cb = DAOFactory.GenericDAO.LoadByID<CostBearer>(costBearerOid);
+			String tenant = PluginLoader.Tenant;
+			var factory = PluginLoader.FindClass<InvoiceFactory>(cb.ID);
+			if (factory == null)
+			{
+				factory = InvoiceFactory.GetInstance(cb.ID, tenant);
+			}
+
+			var creator = factory.CreateInvoiceCreator(cb.ID, tenant, supportConcepts2ServiceRecords);
+			var newInvoices = creator.GenerateServiceInvoices(costBearerOid, invoicePeriod, supportConcepts2ServiceRecords);
+
+
+			//Prüfe ob Rechnungen neu sind oder Diff vorhanden
+			var differenzRechnungChecks = GetNewInvoices(newInvoices, invoicePeriod?.StartDate, invoicePeriod?.EndDate);
+			var resultList = ErstelleNeueRechnungen(differenzRechnungChecks);
+
+
+			return resultList;
+		}
+	}
+}
\ No newline at end of file