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

KetteReports - Anpassungen für Selbstzahler

Browse Source
This commit is contained in:
Alexandra
2025-08-14 13:23:11 +02:00
parent 855e6a5746
commit 1a10f5e124
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReportImp/KetteReports/Invoicing/DefaultInvoiceCreation.cs
View File

@@ -41,5 +41,15 @@ namespace KetteReports.Invoicing
serviceInvoice.InvoiceBase.RecipientOrganisation = name;
}
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
if (iServiceRecord != null)
{
ii.UnitDescription = iServiceRecord.ServiceDescription.CategoryName;
}
return ii;
}
}
}

8
ReportImp/KetteReports/ServiceInvoiceReport.cs
View File

@@ -56,10 +56,12 @@ namespace KetteReports
jugend = true;
}
else if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0
&& pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems != null && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems.Count > 0
&& cats.Any(c => pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription.Contains(c)))
&& pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems != null && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems.Count > 0)
{
jugend = true;
if (pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription != null && cats.Any(c => pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription.Contains(c)))
{
jugend = true;
}
}
if (jugend && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].UnitDescription != null)
{