From c710776fd19dc4ce1627c715183329a7a602d241 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 12 Nov 2025 17:00:03 +0100 Subject: [PATCH] =?UTF-8?q?DiakonieMuelheim=20Erg=C3=A4nzen=20der=20Rechnu?= =?UTF-8?q?ngsnummern=20auf=20Vorlagen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceInvoiceReport.Designer.cs | 36 +++++++---- .../SettlementReport.Designer.cs | 64 +++++++++++++------ .../SettlementReport2.Designer.cs | 40 +++++++++--- 3 files changed, 101 insertions(+), 39 deletions(-) diff --git a/ReportImp/DiakonieMuelheim/ServiceInvoiceReport.Designer.cs b/ReportImp/DiakonieMuelheim/ServiceInvoiceReport.Designer.cs index 7ca765561..33dfeb59a 100644 --- a/ReportImp/DiakonieMuelheim/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/DiakonieMuelheim/ServiceInvoiceReport.Designer.cs @@ -39,6 +39,7 @@ namespace DiakonieMuelheim this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.tableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -80,7 +81,7 @@ namespace DiakonieMuelheim this.lblAbrechnungstext3 = new DevExpress.XtraReports.UI.XRLabel(); this.lblBemerkung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.tableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -144,6 +145,7 @@ namespace DiakonieMuelheim // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, this.xrLabel1, this.tableHeader, this.lblNettoStunden, @@ -164,6 +166,18 @@ namespace DiakonieMuelheim this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(404.5408F, 260F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(245.4592F, 16F); + this.xrLabel1.Text = "xrLabel1"; + this.xrLabel1.TextFormatString = "GP-Nr.: {0}"; + // // tableHeader // this.tableHeader.LocationFloat = new DevExpress.Utils.PointFloat(69.16669F, 369.5F); @@ -692,17 +706,16 @@ namespace DiakonieMuelheim this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Unterschrift und Stempel des Anbieters"; // - // xrLabel1 + // xrLabel6 // - this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(404.5408F, 260F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(245.4592F, 16F); - this.xrLabel1.Text = "xrLabel1"; - this.xrLabel1.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(404.5408F, 218F); + 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(245.4592F, 16F); + this.xrLabel6.TextFormatString = "Re-Nr.: {0}"; // // ServiceInvoiceReport // @@ -786,5 +799,6 @@ namespace DiakonieMuelheim private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext2; private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext3; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; } } diff --git a/ReportImp/DiakonieMuelheim/SettlementReport.Designer.cs b/ReportImp/DiakonieMuelheim/SettlementReport.Designer.cs index b4ce2cbd4..b1c788f04 100644 --- a/ReportImp/DiakonieMuelheim/SettlementReport.Designer.cs +++ b/ReportImp/DiakonieMuelheim/SettlementReport.Designer.cs @@ -30,6 +30,7 @@ namespace BeWo.Report.DefaultReports.Alt { this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); @@ -48,6 +49,7 @@ namespace BeWo.Report.DefaultReports.Alt this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); @@ -57,7 +59,6 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); @@ -84,10 +85,11 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + this.xrLabel12 = 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)).BeginInit(); // // Detail @@ -268,6 +270,7 @@ namespace BeWo.Report.DefaultReports.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel12, this.xrLabel11, this.xrLabel19, this.xrLabel17, @@ -286,6 +289,20 @@ namespace BeWo.Report.DefaultReports.Alt this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel11 + // + this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10.125F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(404.5424F, 148.7083F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(245.4592F, 16F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "xrLabel1"; + this.xrLabel11.TextFormatString = "GP-Nr.: {0}"; + // // xrLabel19 // this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { @@ -389,10 +406,6 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "für unsere/n Betreute/n:"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -675,19 +688,27 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // xrLabel11 + // xrLabel12 // - this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10.125F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(404.5424F, 148.7083F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(245.4592F, 16F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "xrLabel1"; - this.xrLabel11.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(404.5409F, 67.00004F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(124.67F, 23F); + this.xrLabel12.StylePriority.UseBorders = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel12.TextFormatString = "Re-Nr.: {0}"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // // Spitzabrechnung // @@ -711,9 +732,11 @@ namespace BeWo.Report.DefaultReports.Alt this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + 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)).EndInit(); } @@ -775,5 +798,6 @@ namespace BeWo.Report.DefaultReports.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel20; private DevExpress.XtraReports.UI.XRTableCell cellStundenGesamt; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; } } diff --git a/ReportImp/DiakonieMuelheim/SettlementReport2.Designer.cs b/ReportImp/DiakonieMuelheim/SettlementReport2.Designer.cs index 1a27831d4..e4e74c1b2 100644 --- a/ReportImp/DiakonieMuelheim/SettlementReport2.Designer.cs +++ b/ReportImp/DiakonieMuelheim/SettlementReport2.Designer.cs @@ -30,6 +30,7 @@ namespace BeWo.Report.DefaultReports { this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); @@ -67,7 +68,6 @@ namespace BeWo.Report.DefaultReports this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -86,9 +86,11 @@ namespace BeWo.Report.DefaultReports this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -268,6 +270,7 @@ namespace BeWo.Report.DefaultReports // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel12, this.xrLabel11, this.xrLabel19, this.xrLabel17, @@ -506,10 +509,6 @@ namespace BeWo.Report.DefaultReports this.GroupHeader2.HeightF = 0F; this.GroupHeader2.Name = "GroupHeader2"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -701,6 +700,28 @@ namespace BeWo.Report.DefaultReports this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // + // xrLabel12 + // + this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("arial", 10F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(404.5409F, 67.00004F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(124.67F, 23F); + this.xrLabel12.StylePriority.UseBorders = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel12.TextFormatString = "Re-Nr.: {0}"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -718,14 +739,16 @@ namespace BeWo.Report.DefaultReports new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new DevExpress.Drawing.DXMargins(79F, 60F, 112F, 65F); + this.Margins = new DevExpress.Drawing.DXMargins(79F, 59F, 112F, 65F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -788,5 +811,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell cellStundenGesamt; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; } }