From 75c49db5c8edebce808897592b72ff57283e2571 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 18 Sep 2023 12:35:23 +0200 Subject: [PATCH] MH: VSD Hamm Spitzabrechnung wegen Briefpapier --- .../SettlementReport.Designer.cs | 26 +++++++++---------- .../SettlementReport2.Designer.cs | 24 ++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ReportImp/VSDHammReports/SettlementReport.Designer.cs b/ReportImp/VSDHammReports/SettlementReport.Designer.cs index 49b537507..480f43401 100644 --- a/ReportImp/VSDHammReports/SettlementReport.Designer.cs +++ b/ReportImp/VSDHammReports/SettlementReport.Designer.cs @@ -105,6 +105,7 @@ namespace VSDHammReports.Alt this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -114,15 +115,14 @@ namespace VSDHammReports.Alt this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -339,18 +339,18 @@ namespace VSDHammReports.Alt // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0.0001733953F, 232.9034F); + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215.9034F); this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); + this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(337.8333F, 17F); this.RecipientPostCodeAndTown.StylePriority.UseFont = false; this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; // // xrLabel_RecipientStreet // this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0.0001733953F, 215.9034F); + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.9034F); 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; @@ -361,7 +361,7 @@ namespace VSDHammReports.Alt // xrLabel_RecipientDivision // this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0.0001733953F, 198.9034F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 181.9034F); 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; @@ -372,7 +372,7 @@ namespace VSDHammReports.Alt // xrLabel_RecipientContactPerson // this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 181.9034F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0.000268985F, 164.9034F); 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; @@ -383,7 +383,7 @@ namespace VSDHammReports.Alt // xrLabel1 // this.xrLabel1.CanShrink = true; - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 164.9034F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.9034F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -999,6 +999,10 @@ namespace VSDHammReports.Alt this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell16.Weight = 0.21685899000901443D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1096,10 +1100,6 @@ namespace VSDHammReports.Alt this.xrLabel6.Text = "Fehlkontakte"; this.xrLabel6.WordWrap = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1124,9 +1124,9 @@ namespace VSDHammReports.Alt ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/VSDHammReports/SettlementReport2.Designer.cs b/ReportImp/VSDHammReports/SettlementReport2.Designer.cs index bc5c5ae2b..39adf0fe9 100644 --- a/ReportImp/VSDHammReports/SettlementReport2.Designer.cs +++ b/ReportImp/VSDHammReports/SettlementReport2.Designer.cs @@ -103,6 +103,7 @@ namespace VSDHammReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -123,7 +124,6 @@ namespace VSDHammReports this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -131,8 +131,8 @@ namespace VSDHammReports ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -163,7 +163,7 @@ namespace VSDHammReports // RecipientPostCodeAndTown // this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(7.479798E-05F, 231.2157F); + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(7.947286E-05F, 213.2157F); this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -174,7 +174,7 @@ namespace VSDHammReports // xrLabel_RecipientStreet // this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(7.479798E-05F, 214.2157F); + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.2157F); 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; @@ -185,7 +185,7 @@ namespace VSDHammReports // xrLabel_RecipientDivision // this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(7.479798E-05F, 196.2157F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(7.947286E-05F, 179.2157F); 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; @@ -196,7 +196,7 @@ namespace VSDHammReports // xrLabel_RecipientContactPerson // this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(7.479798E-05F, 179.2157F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.2157F); 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; @@ -207,7 +207,7 @@ namespace VSDHammReports // xrLabel1 // this.xrLabel1.CanShrink = true; - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(7.479798E-05F, 162.2157F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 145.2157F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -988,6 +988,10 @@ namespace VSDHammReports this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1206,10 +1210,6 @@ namespace VSDHammReports this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.21685899000901443D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1238,8 +1238,8 @@ namespace VSDHammReports ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }