From f1c6e176a0a11b97e85448296ed52e8fb989476a Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 24 Sep 2025 16:14:48 +0200 Subject: [PATCH] =?UTF-8?q?AwoWesel:=20In=20Sammelrechnungen=20in=20der=20?= =?UTF-8?q?Leistung-Spalte=20die=20Leistungskategorie=20aus=20dem=20HP=20a?= =?UTF-8?q?nzeigen=20(statt=20bisher=20fest=20Fachleistungsstunden),=20bei?= =?UTF-8?q?=20der=20Rechnungserstellung=20auch=20dann=20von=20Miutuen=20au?= =?UTF-8?q?f=20Stunden=20zur=C3=BCck=20rechnen,=20wenn=20beim=20KT=20kein?= =?UTF-8?q?=20pausch.=20Faktor=20hinterlegt=20=20ist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/DefaultInvoiceCreation.cs | 6 ++++-- ReportImp/AwoWesel/ServiceInvoiceReport.cs | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ReportImp/AwoWesel/Invoicing/DefaultInvoiceCreation.cs b/ReportImp/AwoWesel/Invoicing/DefaultInvoiceCreation.cs index 300f3ff96..9cf14ac3a 100644 --- a/ReportImp/AwoWesel/Invoicing/DefaultInvoiceCreation.cs +++ b/ReportImp/AwoWesel/Invoicing/DefaultInvoiceCreation.cs @@ -20,7 +20,7 @@ namespace AwoWesel.Invoicing public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) { return base.CreateInvoiceItem(iServiceRecord, scap, calc); - } + } public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth) { @@ -123,7 +123,6 @@ namespace AwoWesel.Invoicing invoiceItem.UnitCount = 0; } - if (invoiceItem.RateFactor.HasValue) { decimal stunden = invoiceItem.UnitCount.Value * ((invoiceItem.RateFactor.Value + 100) / 100); @@ -134,6 +133,9 @@ namespace AwoWesel.Invoicing } else { + decimal stunden = invoiceItem.UnitCount.Value / 60; + stunden = Math.Round(stunden, 2, MidpointRounding.AwayFromZero); + invoiceItem.UnitCount = stunden; invoiceItem.AmountTotal = Math.Round(invoiceItem.AmountPerUnit.Value * (invoiceItem.UnitCount.Value / 60), 2, MidpointRounding.AwayFromZero); } diff --git a/ReportImp/AwoWesel/ServiceInvoiceReport.cs b/ReportImp/AwoWesel/ServiceInvoiceReport.cs index fd5c91597..8da28cd5d 100644 --- a/ReportImp/AwoWesel/ServiceInvoiceReport.cs +++ b/ReportImp/AwoWesel/ServiceInvoiceReport.cs @@ -1,6 +1,5 @@ using System; using System.Text; -using BeWo.Data.Access; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; @@ -54,19 +53,27 @@ namespace AwoWesel else { lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); - } - + } + + var leistung = "Fachleistungsstunden"; if (pRO.ServiceInvoicePeriods != null) { foreach (var sip in pRO.ServiceInvoicePeriods) { - if (sip.ServiceInvoiceItems != null) - { + if (sip.ServiceInvoiceItems != null) + { + leistung = "Fachleistungsstunden"; + + if (sip.SupportConceptApprovalPeriod != null && sip.SupportConceptApprovalPeriod.ServiceCategory != null) + { + leistung = sip.SupportConceptApprovalPeriod.ServiceCategory.Name; + } + foreach (var ii in sip.ServiceInvoiceItems) { if (String.IsNullOrEmpty(ii.ServiceDescription) || !ii.ServiceDescription.StartsWith("Rechnungsdifferenz")) { - ii.ServiceDescription = "Fachleistungsstunden"; + ii.ServiceDescription = leistung; SetzeZeitraum(pRO, sip); }