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

MH: Input Fahrtkosten in InvoiceCreation

Browse Source
This commit is contained in:
Marcel Hirschle
2024-01-25 14:40:04 +01:00
parent b83bfd46ab
commit 26344ec65f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReportImp/InputFamilienhilfe/Invoicing/DefaultInvoiceCreation.cs
View File

@@ -101,9 +101,11 @@ namespace InputFamilienhilfe.Invoicing
{
var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
var fitems = CreateFahrtkostenItems(serviceRecordsInPeriod);
list.AddRange(fitems);
if (list.Count > 0)
{
var items = CreateFahrtkostenItems(serviceRecordsInPeriod);
list.AddRange(items);
}
var iilist = CreateSonstigeKosten(scap, calc, serviceRecordsInPeriod, invoicePeriod);
list.AddRange(iilist);
@@ -195,7 +197,7 @@ namespace InputFamilienhilfe.Invoicing
foreach (var sr in serviceRecords)
{
if (sr.DistanceInMeter.HasValue && sr.DistanceInMeter > 0)
if (sr.DistanceInMeter.HasValue && sr.DistanceInMeter > 0/* && !sr.AlreadyAccounted*/)
{
decimal fahrtkosten = 0;
@@ -229,6 +231,7 @@ namespace InputFamilienhilfe.Invoicing
}
ii.UnitCount += sr.DistanceInMeter;
sr.AlreadyAccounted = true;
}
}