diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj b/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj
index efc98e838..a8c9cd6ed 100644
--- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj
+++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj
@@ -58,6 +58,7 @@
     <Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
     <Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
     <Compile Include="CustomReportCreator.cs" />
+    <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
     <Compile Include="Invoicing\CustomSettlementInvoiceCreation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -84,6 +85,7 @@
     <Compile Include="SettlementReport2.Designer.cs">
       <DependentUpon>SettlementReport2.cs</DependentUpon>
     </Compile>
+    <Compile Include="Validation\CustomServiceRecordValidator.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Data\Data.csproj">
diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceCreation.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceCreation.cs
new file mode 100644
index 000000000..acfba48e3
--- /dev/null
+++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceCreation.cs
@@ -0,0 +1,24 @@
+using BeWo.Data.Entities;
+using BeWo.Service.Invoicing;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HwHilfswerkInklusionUndTeilhabe.Invoicing
+{
+    public class CustomInvoiceCreation : InvoiceCreation
+    {
+        public override string GetSummaryItemKey(SupportConceptApprovalPeriod scap, InvoiceItem iitem, bool summaryPerMonth)
+        {
+            String key = String.Format("{0:0.0000}_{1}_{2}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemDescription);
+            if (summaryPerMonth)
+            {
+                key = String.Format("{0:0.0000}_{1}_{2:yyyyMM}_{3}", iitem.AmountPerUnit, iitem.RateFactor, iitem.ItemPeriodStart, iitem.ItemDescription);
+            }
+
+            return key;
+        }
+    }
+}
diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceFactory.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceFactory.cs
index 1a1db3c8e..7429acb3f 100644
--- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceFactory.cs
+++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Invoicing/CustomInvoiceFactory.cs
@@ -1,5 +1,7 @@
 using BeWo.Data.Entities;
 using BeWo.Service.Invoicing;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,6 +12,10 @@ namespace HwHilfswerkInklusionUndTeilhabe.Invoicing
 {
     public class CustomInvoiceFactory : InvoiceFactory
     {
+        public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
+        {
+            return new CustomInvoiceCreation();
+        }
         public override SettlementInvoiceCreation CreateSettlementInvoiceCreator(string costbearerId, string tenant, CostBearer2SupportConcept lCb2Sc)
         {
             return new CustomSettlementInvoiceCreation();
diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/Validation/CustomServiceRecordValidator.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Validation/CustomServiceRecordValidator.cs
new file mode 100644
index 000000000..b02408806
--- /dev/null
+++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Validation/CustomServiceRecordValidator.cs
@@ -0,0 +1,17 @@
+using BeWo.Service.Plugins;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HwHilfswerkInklusionUndTeilhabe.Validation
+{
+    public class CustomServiceRecordValidator : ServiceRecordValidator
+    {
+        public override bool CheckZukunft()
+        {
+            return false;
+        }
+    }
+}