From 1525688c7f03f0ded5fa1779b6cd704f2c1ada26 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Jun 2026 15:58:02 +0200 Subject: [PATCH] PflegedienstRahnFreitag/Invoicing/CollectiveInvoiceCreation - Rundung auf Std * LG PflegedienstRahnFreitag/Reporting/ServiceInvoiceReport - Format ReNr SupportOID=164753 --- .../Invoicing/CollectiveInvoiceCreation.cs | 4 ++-- .../Reporting/ServiceInvoiceReport.Designer.cs | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ReportImp/PflegedienstRahnFreitag/Invoicing/CollectiveInvoiceCreation.cs b/ReportImp/PflegedienstRahnFreitag/Invoicing/CollectiveInvoiceCreation.cs index f0161c709..40f9af609 100644 --- a/ReportImp/PflegedienstRahnFreitag/Invoicing/CollectiveInvoiceCreation.cs +++ b/ReportImp/PflegedienstRahnFreitag/Invoicing/CollectiveInvoiceCreation.cs @@ -94,7 +94,7 @@ namespace PflegedienstRahnFreitag.Invoicing if (supportConceptApprovalPeriod.ApprovedBEPerInterval.HasValue) { ii.Notice = String.Format("{0:n0}", supportConceptApprovalPeriod.ApprovedBEPerInterval.Value); - if (supportConceptApprovalPeriod.ServiceCategory.Name.Contains("Fahrzeit")) + if (supportConceptApprovalPeriod.ServiceCategory.Name.Contains("Fahrtzeit")) { if (supportConceptApprovalPeriod.ServiceCategory.Name.ToLower().Contains("ka")) { @@ -127,7 +127,7 @@ namespace PflegedienstRahnFreitag.Invoicing if (data.Count > 0 && data[0].AmountTotal != null) { ii.AmountPerUnit = (decimal)Math.Round((double)data[0].AmountTotal * Math.Round((double)LG / 60, 2, MidpointRounding.AwayFromZero), 2, MidpointRounding.AwayFromZero); - //ii.AmountPerUnit = LG * (decimal)Math.Round((double)data[0].AmountTotal / 60, 4, MidpointRounding.AwayFromZero); + ii.AmountPerUnit = Math.Round(data[0].AmountTotal.Value * LG / 60m, 2, MidpointRounding.AwayFromZero); } ii.ItemDescription = "QA "; ii.ItemDescription += "LG " + GetLeistungsgruppennummer(LG); diff --git a/ReportImp/PflegedienstRahnFreitag/Reporting/ServiceInvoiceReport.Designer.cs b/ReportImp/PflegedienstRahnFreitag/Reporting/ServiceInvoiceReport.Designer.cs index fe4b0e9e6..46f49f93f 100644 --- a/ReportImp/PflegedienstRahnFreitag/Reporting/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/PflegedienstRahnFreitag/Reporting/ServiceInvoiceReport.Designer.cs @@ -87,10 +87,10 @@ namespace PflegedienstRahnFreitag this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -211,7 +211,6 @@ namespace PflegedienstRahnFreitag // this.xrLabel11.BackColor = System.Drawing.Color.Transparent; this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel11.CanShrink = true; this.xrLabel11.Font = new DevExpress.Drawing.DXFont("arial", 10F); this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(67.70834F, 241.7914F); this.xrLabel11.Name = "xrLabel11"; @@ -814,6 +813,10 @@ namespace PflegedienstRahnFreitag this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrLabel29.TextFormatString = "{0:c2}"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -851,10 +854,6 @@ namespace PflegedienstRahnFreitag this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Fälliger Betrag:"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {