From 8c1fc0a63b9071bcfbefff2c9472e0537d5d6589 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2025 12:01:20 +0200 Subject: [PATCH] DiakonieMuelheim/ServiceInvoiceReport78 - Klientendaten (PLZ) erweitert --- .../ServiceInvoiceReport78.Designer.cs | 138 +++++++++--------- .../ServiceInvoiceReport78.resx | 2 +- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.Designer.cs b/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.Designer.cs index 088a87e14..e9762f896 100644 --- a/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.Designer.cs +++ b/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.Designer.cs @@ -40,6 +40,8 @@ namespace DiakonieMuelheim this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbrechnungTitel = new DevExpress.XtraReports.UI.XRLabel(); @@ -50,15 +52,16 @@ namespace DiakonieMuelheim this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); - this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); this.cellStundenGesamt = new DevExpress.XtraReports.UI.XRTableCell(); @@ -76,12 +79,9 @@ namespace DiakonieMuelheim this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -154,6 +154,35 @@ namespace DiakonieMuelheim this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel6 + // + this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(404.5409F, 67.00004F); + 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(124.6669F, 16.99998F); + this.xrLabel6.StylePriority.UseBorders = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrLabel6.TextFormatString = "Re-Nr.: {0}"; + // + // xrLabel2 + // + this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")}); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(163.8751F, 358.2916F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(319.2083F, 17F); + this.xrLabel2.Text = "xrLabel2"; + // // xrLabel1 // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -273,24 +302,19 @@ namespace DiakonieMuelheim this.Detail2.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { new DevExpress.XtraReports.UI.GroupField("HourlyRate", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); // - // ReportFooter + // xrLabel3 // - this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, - this.xrTable4}); - this.ReportFooter.HeightF = 209.309F; - this.ReportFooter.Name = "ReportFooter"; - // - // xrLabel2 - // - this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")}); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(163.8751F, 358.2916F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(319.2083F, 17F); - this.xrLabel2.Text = "xrLabel2"; + this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")}); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(460.4578F, 0F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(87.50006F, 25F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "xrLabel20"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrTable5 // @@ -365,19 +389,27 @@ namespace DiakonieMuelheim this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrLabel22.TextFormatString = "{0:0.00 €}"; // - // xrLabel3 + // bindingSource1 // - this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.RateFactor")}); - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(460.4578F, 0F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(87.50006F, 25F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "xrLabel20"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel10, + this.xrTable4}); + this.ReportFooter.HeightF = 209.309F; + this.ReportFooter.Name = "ReportFooter"; + // + // xrLabel10 + // + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.7257F); + this.xrLabel10.Multiline = true; + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(676.9999F, 31.58331F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Unterschrift und Stempel des Anbieters"; // // xrTable4 // @@ -564,38 +596,6 @@ namespace DiakonieMuelheim this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.18235716542350336D; // - // xrLabel6 - // - this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(404.5409F, 67.00004F); - 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(124.6669F, 16.99998F); - this.xrLabel6.StylePriority.UseBorders = false; - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrLabel6.TextFormatString = "Re-Nr.: {0}"; - // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.7257F); - this.xrLabel10.Multiline = true; - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(676.9999F, 31.58331F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Unterschrift und Stempel des Anbieters"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // ServiceInvoiceReport78 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -621,8 +621,8 @@ namespace DiakonieMuelheim xrWatermark1.Id = "Watermark1"; this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.resx b/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.resx index 2e4a00df1..d269f8d85 100644 --- a/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.resx +++ b/ReportImp/DiakonieMuelheim/ServiceInvoiceReport78.resx @@ -121,7 +121,7 @@ Sehr geehrte Damen und Herren, für unsere/n Betreute/n: [CustomerLastName], [CustomerFirstName], geb. am: [CustomerBirthdate!dd.MM.yyyy] -wohnhaft: [CustomerStreet] [CustomerTown] +wohnhaft: [CustomerStreet], [CustomerPostalCode] [CustomerTown] senden wir Ihnen folgende Rechnung: