From 43c842bd863593ba32339210dbd2ff0a64b45b76 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 17 Dec 2025 17:00:37 +0100 Subject: [PATCH] EndartFabrik - Formatanpassungen --- .../ServiceInvoiceReport.Designer.cs | 32 +++++++++----- .../SettlementReport2.Designer.cs | 42 ++++++++++++------- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/ReportImp/EndartFabrik/ServiceInvoiceReport.Designer.cs b/ReportImp/EndartFabrik/ServiceInvoiceReport.Designer.cs index b8886ae35..e4cd6cb97 100644 --- a/ReportImp/EndartFabrik/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/EndartFabrik/ServiceInvoiceReport.Designer.cs @@ -78,6 +78,7 @@ namespace EndartFabrik this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -107,6 +108,8 @@ namespace EndartFabrik // // topMarginBand1 // + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7}); this.topMarginBand1.HeightF = 202.2916F; this.topMarginBand1.Name = "topMarginBand1"; // @@ -127,7 +130,7 @@ namespace EndartFabrik this.xrLabel8, this.lblAbrechnungszeitraum}); this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.Page1.HeightF = 354.0833F; + this.Page1.HeightF = 420.75F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // @@ -136,7 +139,7 @@ namespace EndartFabrik this.xrLabel5.BackColor = System.Drawing.Color.Transparent; this.xrLabel5.CanShrink = true; this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 255F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.6667F); this.xrLabel5.Multiline = true; this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -148,7 +151,7 @@ namespace EndartFabrik // // lblAdresse // - this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 66.66666F); this.lblAdresse.Multiline = true; this.lblAdresse.Name = "lblAdresse"; this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -163,7 +166,7 @@ namespace EndartFabrik this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.6667F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -179,7 +182,7 @@ namespace EndartFabrik this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 281.6667F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(674.0001F, 20F); @@ -195,7 +198,7 @@ namespace EndartFabrik this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.6667F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(674.0001F, 20F); @@ -206,7 +209,7 @@ namespace EndartFabrik // // lblAnrede // - this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 364.1667F); this.lblAnrede.Name = "lblAnrede"; this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -217,7 +220,7 @@ namespace EndartFabrik // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(365.5F, 172F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(365.5F, 238.6667F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(308.5F, 23F); @@ -227,7 +230,7 @@ namespace EndartFabrik // // lblAbrechnungszeitraum // - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 389.1667F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -666,6 +669,14 @@ namespace EndartFabrik this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(193.0833F, 71.74992F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); @@ -750,6 +761,7 @@ namespace EndartFabrik private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/EndartFabrik/SettlementReport2.Designer.cs b/ReportImp/EndartFabrik/SettlementReport2.Designer.cs index fb2f35541..670bf325a 100644 --- a/ReportImp/EndartFabrik/SettlementReport2.Designer.cs +++ b/ReportImp/EndartFabrik/SettlementReport2.Designer.cs @@ -108,6 +108,7 @@ namespace EndartFabrik this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -134,7 +135,7 @@ namespace EndartFabrik // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 148.1667F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 212.7501F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); @@ -145,7 +146,7 @@ namespace EndartFabrik // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 369.0833F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 433.6666F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -200,7 +201,7 @@ namespace EndartFabrik // xrLabel6 // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 294.0833F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 358.6666F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -211,7 +212,7 @@ namespace EndartFabrik // // lblAnrede // - this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 261.0833F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325.6667F); this.lblAnrede.Name = "lblAnrede"; this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -223,7 +224,7 @@ namespace EndartFabrik this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 204.1667F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 268.75F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -238,7 +239,7 @@ namespace EndartFabrik this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.1667F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 252.75F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); @@ -253,7 +254,7 @@ namespace EndartFabrik this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 171.1667F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.7501F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(363.5417F, 17F); @@ -265,7 +266,7 @@ namespace EndartFabrik // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.00003F); + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 132.5834F); this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -276,7 +277,7 @@ namespace EndartFabrik // xrLabel_RecipientStreet // this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F); + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115.5834F); this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -287,7 +288,7 @@ namespace EndartFabrik // xrLabel_RecipientDivision // this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.58335F); this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -298,7 +299,7 @@ namespace EndartFabrik // xrLabel_RecipientContactPerson // this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00001F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.58334F); this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -309,7 +310,7 @@ namespace EndartFabrik // xrLabel1 // this.xrLabel1.CanShrink = true; - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 64.58334F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -481,6 +482,8 @@ namespace EndartFabrik // // topMarginBand1 // + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7}); this.topMarginBand1.HeightF = 206.25F; this.topMarginBand1.Name = "topMarginBand1"; // @@ -506,7 +509,7 @@ namespace EndartFabrik this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.GroupHeader1.HeightF = 386.0833F; + this.GroupHeader1.HeightF = 450.6666F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -515,7 +518,7 @@ namespace EndartFabrik this.xrLabel5.BackColor = System.Drawing.Color.Transparent; this.xrLabel5.CanShrink = true; this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.1667F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.7501F); this.xrLabel5.Multiline = true; this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -898,6 +901,14 @@ namespace EndartFabrik this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(133.3333F, 83.00001F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1011,6 +1022,7 @@ namespace EndartFabrik private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } \ No newline at end of file