From f88ea6bdbf26f10779b23936efbe57628779fe2c Mon Sep 17 00:00:00 2001 From: HirschleM Date: Wed, 2 Jul 2025 14:27:41 +0200 Subject: [PATCH] =?UTF-8?q?MH:=20W=C3=B6ll=20Fahrtkostenpauschalen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/JugendamtInvoiceCreation.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ReportImp/BetreutesWohnenWoellReports/Invoicing/JugendamtInvoiceCreation.cs b/ReportImp/BetreutesWohnenWoellReports/Invoicing/JugendamtInvoiceCreation.cs index 56f24b893..ab1229869 100644 --- a/ReportImp/BetreutesWohnenWoellReports/Invoicing/JugendamtInvoiceCreation.cs +++ b/ReportImp/BetreutesWohnenWoellReports/Invoicing/JugendamtInvoiceCreation.cs @@ -4,6 +4,7 @@ using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; using BS.Shared.Services; using System; using System.Collections.Generic; @@ -35,10 +36,11 @@ namespace BetreutesWohnenWoellReports.Invoicing InvoiceItem invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc); invoiceItem.Notice = iServiceRecord.ServiceDescription.CategoryName; if (invoiceItem != null) - { + { + var function = scap.CostBearer2SupportConcept.CostBearer.Organisation.Function; list.Add(invoiceItem); if (iServiceRecord.DistanceInMeter.HasValue && iServiceRecord.DistanceInMeter.Value > 0) - list.Add(CreateFahrtkostenItem(invoiceItem)); + list.Add(CreateFahrtkostenItem(invoiceItem, function)); } iServiceRecord.AlreadyAccounted = true; } @@ -53,11 +55,19 @@ namespace BetreutesWohnenWoellReports.Invoicing //return CreateSummaryInvoiceItems(list, invoicePeriod, scap, calc); } - private InvoiceItem CreateFahrtkostenItem(InvoiceItem item) + private InvoiceItem CreateFahrtkostenItem(InvoiceItem item, ValueListEntry function) { - InvoiceItem fahrtkostenItem = new InvoiceItem(); var preis = GetPreis("Fahrkosten", item.ServiceRecord.Start.Value); + if (function != null && function.Value.IsNotNullOrEmpty()) + { + if (function.Value == "Pflegekassen") + preis = GetPreis("Fahrtkosten Pflegekasse", item.ServiceRecord.Start.Value); + else if (function.Value == "Jugendamt") + preis = GetPreis("Fahrtkosten Jugendamt", item.ServiceRecord.Start.Value); + } + InvoiceItem fahrtkostenItem = new InvoiceItem(); + fahrtkostenItem.AmountPerUnit = preis; fahrtkostenItem.AmountTotal = preis * item.ServiceRecord.DistanceInMeter; fahrtkostenItem.GrossAmountTotal = fahrtkostenItem.AmountTotal;