From 46fd0ebcb002f26523d86a370a54951eef99b2ea Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Wed, 19 Jun 2024 16:56:08 +0200
Subject: [PATCH] =?UTF-8?q?Merge=20Conflict=20SKM=20Aachen=20gel=C3=B6st?=
 =?UTF-8?q?=20und=20=C3=84nderungen=20InvoiceNumberGenerator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs     | 2 +-
 ReportImp/SKMAachen/SKMAachen.csproj                        | 3 ---
 Service/Plugins/InvoiceNumberGenerator.cs                   | 6 +++---
 Service/ServiceImplementations/AccountingServiceImp.cs      | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs b/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs
index ff81c3bcd..59b9686b1 100644
--- a/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs
+++ b/ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs
@@ -96,7 +96,7 @@ namespace SKMAachen.Invoicing
 			return null;
 		}
 
-		public override void IncreaseInvoiceNumber(int count, List<ServiceInvoice> newInvoices)
+		public override void IncreaseInvoiceNumberForServiceInvoices(int count, List<ServiceInvoice> newInvoices)
 		{
 			if (count != 0)
 			{
diff --git a/ReportImp/SKMAachen/SKMAachen.csproj b/ReportImp/SKMAachen/SKMAachen.csproj
index 1bf64bd49..385bcfc58 100644
--- a/ReportImp/SKMAachen/SKMAachen.csproj
+++ b/ReportImp/SKMAachen/SKMAachen.csproj
@@ -61,10 +61,7 @@
     <Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
     <Compile Include="Invoicing\CustomBeWo67InvoiceCreation.cs" />
     <Compile Include="Invoicing\CustomInvoiceFactory.cs" />
-<<<<<<< HEAD
-=======
     <Compile Include="Invoicing\CustomInvoiceNumberGenerator.cs" />
->>>>>>> master
     <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
     <Compile Include="Mitarbeiterarbeitszeitkonto.cs">
       <SubType>Component</SubType>
diff --git a/Service/Plugins/InvoiceNumberGenerator.cs b/Service/Plugins/InvoiceNumberGenerator.cs
index 516584a4d..a1fdd8400 100644
--- a/Service/Plugins/InvoiceNumberGenerator.cs
+++ b/Service/Plugins/InvoiceNumberGenerator.cs
@@ -49,17 +49,17 @@ namespace BeWo.Service.Plugins
         {
             List<ServiceInvoice> newInvoices = null;
 
-            IncreaseInvoiceNumber(count, newInvoices);
+			IncreaseInvoiceNumberForServiceInvoices(count, newInvoices);
         }
 
         internal void IncreaseInvoiceNumber(int count, List<InvoiceBase> invoiceBaseList)
         {
             List<ServiceInvoice> newInvoices = null;
 
-            IncreaseInvoiceNumber(count, newInvoices);
+			IncreaseInvoiceNumberForServiceInvoices(count, newInvoices);
         }
 
-		public virtual void IncreaseInvoiceNumber(int count, List<ServiceInvoice> newInvoices)
+		public virtual void IncreaseInvoiceNumberForServiceInvoices(int count, List<ServiceInvoice> newInvoices)
         {
             if (count != 0)
             {
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index 501005de2..a1423d37d 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -452,7 +452,7 @@ namespace BeWo.Service.ServiceImplementations
 
                     DAOFactory.GenericDAO.Insert(newInvoices);
 
-                    inc.IncreaseInvoiceNumber(count, newInvoices);
+                    inc.IncreaseInvoiceNumberForServiceInvoices(count, newInvoices);
                 }
                 return newInvoices.Select(i => i.Oid.Value).ToList();
             }