ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Conflict SKM Aachen gelöst und Änderungen InvoiceNumberGenerator

Browse Source
This commit is contained in:
Alexandra
2024-06-19 16:56:08 +02:00
parent 4b06ea0183
commit 46fd0ebcb0
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReportImp/SKMAachen/Invoicing/CustomInvoiceNumberGenerator.cs
View File

@@ -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)
{

3
ReportImp/SKMAachen/SKMAachen.csproj
View File

@@ -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>

6
Service/Plugins/InvoiceNumberGenerator.cs
View File

@@ -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)
{

2
Service/ServiceImplementations/AccountingServiceImp.cs
View File

@@ -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();
}