diff --git a/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CustomInvoiceNumberGenerator.cs b/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CustomInvoiceNumberGenerator.cs
new file mode 100644
index 000000000..f67e82e73
--- /dev/null
+++ b/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/CustomInvoiceNumberGenerator.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
+using System.Linq;
+using System.Text;
+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.Services;
+using DevExpress.XtraPrinting.BarCode;
+
+namespace MalteserJohanniterJohanneshaus.Invoicing
+{
+    internal class CustomInvoiceNumberGenerator : InvoiceNumberGenerator
+    {
+
+        public override void IncreaseInvoiceNumber(int count, List<SettlementInvoice> settlementList)
+        {
+            List<ServiceInvoice> newInvoices = null;
+            if (settlementList != null && settlementList.Count > 0)
+            {
+                foreach (var i in settlementList)
+                {
+                    i.InvoiceBase.InvoiceTypeText = "KSt.60-Spitzabrg";
+                }
+            }
+            IncreaseInvoiceNumberForServiceInvoices(count, newInvoices);
+        }
+    }
+}
diff --git a/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/SettlementInvoiceCreation.cs
index f5d69deaa..76621d07e 100644
--- a/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/SettlementInvoiceCreation.cs
+++ b/ReportImp/MalteserJohanniterJohanneshaus/Invoicing/SettlementInvoiceCreation.cs
@@ -1,4 +1,5 @@
-using BeWo.Data.Entities;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
 using BeWo.Service.Invoicing;
 using BS.Shared.DataContracts;
 using BS.Shared.Services;
@@ -14,21 +15,5 @@ namespace MalteserJohanniterJohanneshaus
 		{
 			return false;
 		}
-
-
-		//public override Settlement2DC GenerateSettlementInvoice(CostBearer2SupportConcept c2s, DateTime? periodStart, DateTime? periodEnd)
-		//{
-		//	Settlement2DC settlementInvoice = new Settlement2DC();
-		//	settlementInvoice = base.GenerateSettlementInvoice(c2s, periodStart, periodEnd);
-
-		//	if (settlementInvoice.InvoiceItems == null || settlementInvoice.InvoiceItems.Count == 0)
-		//	{
-		//		foreach (var ii in settlementInvoice.InvoiceItems)
-		//		{
-		//			ii.ItemDescription = "KSt.60-Spitzabr.";
-		//		}
-		//	}
-		//	return settlementInvoice;
-		//}
-	}
+    }
 }
diff --git a/ReportImp/MalteserJohanniterJohanneshaus/MalteserJohanniterJohanneshaus.csproj b/ReportImp/MalteserJohanniterJohanneshaus/MalteserJohanniterJohanneshaus.csproj
index ed5e020df..903d997e4 100644
--- a/ReportImp/MalteserJohanniterJohanneshaus/MalteserJohanniterJohanneshaus.csproj
+++ b/ReportImp/MalteserJohanniterJohanneshaus/MalteserJohanniterJohanneshaus.csproj
@@ -100,6 +100,7 @@
     <Compile Include="Invoicing\CollectiveInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
+    <Compile Include="Invoicing\CustomInvoiceNumberGenerator.cs" />
     <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
     <Compile Include="Invoicing\SoziotherapieInvoiceCreation.cs" />
     <Compile Include="Mitarbeiterarbeitszeitkonto.cs">