diff --git a/ReportImp/ChristopherusHausFamilienhilfe/ChristopherusHausFamilienhilfe.csproj b/ReportImp/ChristopherusHausFamilienhilfe/ChristopherusHausFamilienhilfe.csproj
index 41e42e64c..c828528b3 100644
--- a/ReportImp/ChristopherusHausFamilienhilfe/ChristopherusHausFamilienhilfe.csproj
+++ b/ReportImp/ChristopherusHausFamilienhilfe/ChristopherusHausFamilienhilfe.csproj
@@ -71,6 +71,8 @@
     </Compile>
     <Compile Include="Export\CustomDataExporter.cs" />
     <Compile Include="Export\SimbaExporter.cs" />
+    <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
+    <Compile Include="Invoicing\DefaultInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceInvoiceReport.cs">
       <SubType>Component</SubType>
diff --git a/ReportImp/ChristopherusHausFamilienhilfe/Export/SimbaExporter.cs b/ReportImp/ChristopherusHausFamilienhilfe/Export/SimbaExporter.cs
index 702c7340d..0d210ca68 100644
--- a/ReportImp/ChristopherusHausFamilienhilfe/Export/SimbaExporter.cs
+++ b/ReportImp/ChristopherusHausFamilienhilfe/Export/SimbaExporter.cs
@@ -53,6 +53,9 @@ namespace ChristopherusHausFamilienhilfe.Export
                 {
                     sb.AppendLine();
                 }
+                DateTime lastDate = new DateTime(date.Year, date.Month, 1);
+                lastDate = lastDate.AddMonths(1).AddDays(-1);
+
                 sb.Append(String.Format("\"{0}\"", row[0]));
                 sb.Append(";");
                 sb.Append(String.Format("{0:0.00}", row[1]));
@@ -61,7 +64,8 @@ namespace ChristopherusHausFamilienhilfe.Export
                 sb.Append(";");
                 sb.Append(String.Format("{0}", row[3]));
                 sb.Append(";;");
-                sb.Append(String.Format("{0:ddMMyyyy}", row[4]));
+                sb.Append(String.Format("{0:dd.MM.yyyy}", lastDate)); //Simba nimmt nur Buchungen an, ReDatum = Abrechnungszeitraum
+                //sb.Append(String.Format("{0:ddMMyyyy}", row[4]));
                 sb.Append(";;");
                 sb.Append(String.Format("{0}", row[5]));
                 sb.Append(";");
diff --git a/ReportImp/ChristopherusHausFamilienhilfe/Invoicing/CustomInvoiceFactory.cs b/ReportImp/ChristopherusHausFamilienhilfe/Invoicing/CustomInvoiceFactory.cs
new file mode 100644
index 000000000..70a72bbb7
--- /dev/null
+++ b/ReportImp/ChristopherusHausFamilienhilfe/Invoicing/CustomInvoiceFactory.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using BeWo.Service.Invoicing;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+
+namespace ChristopherusHausFamilienhilfe.Invoicing
+{
+	public class CustomInvoiceFactory : InvoiceFactory
+	{
+		public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+		{
+			return new DefaultInvoiceCreation();
+		}
+	}
+}
diff --git a/ReportImp/ChristopherusHausFamilienhilfe/Invoicing/DefaultInvoiceCreation.cs b/ReportImp/ChristopherusHausFamilienhilfe/Invoicing/DefaultInvoiceCreation.cs
new file mode 100644
index 000000000..98ea6b012
--- /dev/null
+++ b/ReportImp/ChristopherusHausFamilienhilfe/Invoicing/DefaultInvoiceCreation.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+
+namespace ChristopherusHausFamilienhilfe.Invoicing
+{
+	public class DefaultInvoiceCreation : InvoiceCreation
+	{
+		public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, IList<CompactSupportConceptDC> supportConceptList)
+		{
+			base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
+			invoice.InvoiceBase.InvoiceDate = invoice.InvoiceBase.AccountingPeriodEnd;
+		}
+	}
+}