From 9b1593c88af73300e86dc8d172cca6f618e54765 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 12 Nov 2025 17:04:24 +0100 Subject: [PATCH] Neustart/SettlementReport - nochmal Anpassung Text --- ReportImp/Neustart/SettlementReport.Designer.cs | 13 +++++++------ ReportImp/Neustart/SettlementReport.resx | 4 ---- ReportImp/Neustart/SettlementReport2.Designer.cs | 11 ++++++----- ReportImp/Neustart/SettlementReport2.resx | 4 ---- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/ReportImp/Neustart/SettlementReport.Designer.cs b/ReportImp/Neustart/SettlementReport.Designer.cs index d3fd1ff7b..a4d788d5b 100644 --- a/ReportImp/Neustart/SettlementReport.Designer.cs +++ b/ReportImp/Neustart/SettlementReport.Designer.cs @@ -29,7 +29,6 @@ namespace Neustart.Alt private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -164,7 +163,7 @@ namespace Neustart.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.3333F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 352.7501F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -295,13 +294,15 @@ namespace Neustart.Alt // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 302.4167F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 50.33334F); this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); + this.xrLabel6.Text = "folgend erhalten Sie für den Betreuungszeitraum [AccountingPeriod] die Abrechnung" + + " der Leistungen im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName]" + + ":\r\n"; // // xrLabel5 // @@ -690,7 +691,7 @@ namespace Neustart.Alt this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.GroupHeader1.HeightF = 443.3333F; + this.GroupHeader1.HeightF = 420.7501F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // diff --git a/ReportImp/Neustart/SettlementReport.resx b/ReportImp/Neustart/SettlementReport.resx index cf31bd3c7..1af7de150 100644 --- a/ReportImp/Neustart/SettlementReport.resx +++ b/ReportImp/Neustart/SettlementReport.resx @@ -117,8 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - folgend erhalten Sie die Abrechnung der Leistungen im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: - - \ No newline at end of file diff --git a/ReportImp/Neustart/SettlementReport2.Designer.cs b/ReportImp/Neustart/SettlementReport2.Designer.cs index 5793d18ae..584a00424 100644 --- a/ReportImp/Neustart/SettlementReport2.Designer.cs +++ b/ReportImp/Neustart/SettlementReport2.Designer.cs @@ -30,7 +30,6 @@ namespace Neustart private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -156,7 +155,7 @@ namespace Neustart // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.3333F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 356.9167F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -197,10 +196,12 @@ namespace Neustart this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 56.58334F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); + this.xrLabel6.Text = "folgend erhalten Sie für den Betreuungszeitraum [AccountingPeriod] die Abrechnung" + + " der Leistungen im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirst" + + "Name] [CustomerLastName]:\r\n"; // // xrLabel5 // @@ -575,7 +576,7 @@ namespace Neustart this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.GroupHeader1.HeightF = 392.3333F; + this.GroupHeader1.HeightF = 373.9167F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // diff --git a/ReportImp/Neustart/SettlementReport2.resx b/ReportImp/Neustart/SettlementReport2.resx index 27087fb1a..d58980a38 100644 --- a/ReportImp/Neustart/SettlementReport2.resx +++ b/ReportImp/Neustart/SettlementReport2.resx @@ -117,8 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - folgend erhalten Sie die Abrechnung der Leistungen im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName]. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: - - \ No newline at end of file