From 8fe9637a70acb97a18da93ef5535929682a232be Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 31 Jul 2024 10:04:17 +0200 Subject: [PATCH] MH: AlphaEV Spitzabrechnung --- .../AlphaEv/SettlementReport.Designer.cs | 49 ++++++++++--------- .../AlphaEv/SettlementReport2.Designer.cs | 32 ++++++------ .../SettlementReportWuppertal.Designer.cs | 46 ++++++++--------- 3 files changed, 65 insertions(+), 62 deletions(-) diff --git a/ReportImp/AlphaEv/SettlementReport.Designer.cs b/ReportImp/AlphaEv/SettlementReport.Designer.cs index b4c0bbe5b..6be479ec4 100644 --- a/ReportImp/AlphaEv/SettlementReport.Designer.cs +++ b/ReportImp/AlphaEv/SettlementReport.Designer.cs @@ -31,6 +31,7 @@ namespace AlphaEv.Alt this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); 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.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); @@ -80,7 +81,6 @@ namespace AlphaEv.Alt this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -105,6 +105,7 @@ namespace AlphaEv.Alt this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.fieldMittelbareStunden = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -112,8 +113,8 @@ namespace AlphaEv.Alt ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((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 @@ -145,16 +146,16 @@ namespace AlphaEv.Alt // this.xrLabel4.CanGrow = false; this.xrLabel4.CanShrink = true; - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 144.375F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(551.3336F, 144.375F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(170.6665F, 137.5F); this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.StylePriority.UseForeColor = false; this.xrLabel4.StylePriority.UsePadding = false; - this.xrLabel4.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " + - "72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de"; + this.xrLabel4.Text = "Ihr Ansprechpartner:\r\n[SenderContactPerson]\r\n[SenderContactPersonPhone]\r\n[SenderC" + + "ontactPersonFax]\r\n[SenderContactPersonMail]\r\nwww.alphaev.de"; // // xrLabel7 // @@ -163,11 +164,11 @@ namespace AlphaEv.Alt this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 338.4165F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(551.3336F, 338.4165F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(93.88F, 18F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(104.2967F, 18F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.StylePriority.UseForeColor = false; this.xrLabel7.StylePriority.UsePadding = false; @@ -191,11 +192,11 @@ namespace AlphaEv.Alt this.xrLabel1.CanGrow = false; this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 356.4258F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(551.3336F, 356.4258F); 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(153.2499F, 19.24997F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(163.6665F, 19.24997F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.Text = "[InvoiceNumber]"; // @@ -215,11 +216,11 @@ namespace AlphaEv.Alt this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Calibri", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 281.875F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(551.3336F, 281.875F); 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(153.2499F, 38.5416F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(163.6665F, 38.5416F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.StylePriority.UseForeColor = false; this.xrLabel11.StylePriority.UseTextAlignment = false; @@ -233,11 +234,11 @@ namespace AlphaEv.Alt this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 320.4166F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(551.3336F, 320.4166F); this.xrLabel5.Multiline = true; this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(93.88F, 18F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(104.2967F, 18F); this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.StylePriority.UseForeColor = false; this.xrLabel5.StylePriority.UsePadding = false; @@ -259,10 +260,10 @@ namespace AlphaEv.Alt // // xrRichText1 // - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 48.95833F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(551.3336F, 48.95833F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F); + this.xrRichText1.SizeF = new System.Drawing.SizeF(163.6665F, 77.41667F); // // xrLabel17 // @@ -281,10 +282,10 @@ namespace AlphaEv.Alt new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 385F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(551.3334F, 385F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(153.2499F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(163.6665F, 23F); this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; @@ -693,10 +694,6 @@ namespace AlphaEv.Alt this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomRight; this.xrTableCell23.Weight = 0.12307685514543144D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -971,6 +968,10 @@ namespace AlphaEv.Alt this.fieldMittelbareStunden.Expression = "([UnitCount] * [RateFactor]) -[UnitCount]"; this.fieldMittelbareStunden.Name = "fieldMittelbareStunden"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -995,6 +996,8 @@ namespace AlphaEv.Alt 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.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); @@ -1002,8 +1005,8 @@ namespace AlphaEv.Alt ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((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(); } diff --git a/ReportImp/AlphaEv/SettlementReport2.Designer.cs b/ReportImp/AlphaEv/SettlementReport2.Designer.cs index 79de25f1d..d0df3fa52 100644 --- a/ReportImp/AlphaEv/SettlementReport2.Designer.cs +++ b/ReportImp/AlphaEv/SettlementReport2.Designer.cs @@ -503,10 +503,10 @@ namespace AlphaEv new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(546.7501F, 343.3333F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(530.0836F, 343.3333F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(153.2499F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(169.9164F, 23F); this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; @@ -515,10 +515,10 @@ namespace AlphaEv // // xrRichText1 // - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(546.7502F, 1.041698F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(530.0836F, 1.041698F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F); + this.xrRichText1.SizeF = new System.Drawing.SizeF(169.9164F, 77.41667F); // // xrLabel1 // @@ -527,11 +527,11 @@ namespace AlphaEv this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(546.7502F, 272.5F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(530.0836F, 272.5F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(93.88F, 18F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(110.5466F, 18F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseForeColor = false; this.xrLabel1.StylePriority.UsePadding = false; @@ -542,11 +542,11 @@ namespace AlphaEv this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(546.7502F, 233.9584F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(530.0836F, 233.9584F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(169.9164F, 38.5416F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.StylePriority.UseForeColor = false; this.xrLabel7.StylePriority.UseTextAlignment = false; @@ -558,11 +558,11 @@ namespace AlphaEv this.xrLabel9.CanGrow = false; this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(546.7501F, 308.5F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(530.0836F, 308.5F); this.xrLabel9.Multiline = true; this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(169.9164F, 19.24997F); this.xrLabel9.StylePriority.UseFont = false; this.xrLabel9.Text = "[InvoiceNumber]"; // @@ -586,11 +586,11 @@ namespace AlphaEv this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(547.3804F, 290.5F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(530.7138F, 290.5F); this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(93.88F, 18F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(110.5466F, 18F); this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.StylePriority.UseForeColor = false; this.xrLabel14.StylePriority.UsePadding = false; @@ -601,16 +601,16 @@ namespace AlphaEv this.xrLabel15.CanGrow = false; this.xrLabel15.CanShrink = true; this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(546.7502F, 96.45837F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(530.0836F, 96.45837F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(176.9164F, 137.5F); this.xrLabel15.StylePriority.UseFont = false; this.xrLabel15.StylePriority.UseForeColor = false; this.xrLabel15.StylePriority.UsePadding = false; - this.xrLabel15.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " + - "72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de"; + this.xrLabel15.Text = "Ihr Ansprechpartner:\r\n[SenderContactPerson]\r\n[SenderContactPersonPhone]\r\n[SenderC" + + "ontactPersonFax]\r\n[SenderContactPersonMail]\r\nwww.alphaev.de"; // // xrLabel17 // diff --git a/ReportImp/AlphaEv/SettlementReportWuppertal.Designer.cs b/ReportImp/AlphaEv/SettlementReportWuppertal.Designer.cs index c3fffa910..48236c5b5 100644 --- a/ReportImp/AlphaEv/SettlementReportWuppertal.Designer.cs +++ b/ReportImp/AlphaEv/SettlementReportWuppertal.Designer.cs @@ -86,7 +86,6 @@ namespace AlphaEv this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -111,13 +110,14 @@ namespace AlphaEv this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).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 @@ -417,10 +417,10 @@ namespace AlphaEv new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(517.7502F, 323.0168F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 323.0168F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(153.2499F, 23F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(165.7499F, 23F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.StylePriority.UseTextAlignment = false; this.xrLabel7.Text = "xrLabel8"; @@ -432,16 +432,16 @@ namespace AlphaEv this.xrLabel9.CanGrow = false; this.xrLabel9.CanShrink = true; this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(517.7501F, 95.42003F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 95.42004F); this.xrLabel9.Multiline = true; this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(160.2498F, 124.7685F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(172.7498F, 124.7685F); this.xrLabel9.StylePriority.UseFont = false; this.xrLabel9.StylePriority.UseForeColor = false; this.xrLabel9.StylePriority.UsePadding = false; - this.xrLabel9.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " + - "72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de"; + this.xrLabel9.Text = "Ihr Ansprechpartner:\r\n[SenderContactPerson]\r\n[SenderContactPersonPhone]\r\n[SenderC" + + "ontactPersonFax]\r\n[SenderContactPersonMail]\r\nwww.alphaev.de"; // // xrLabel13 // @@ -450,11 +450,11 @@ namespace AlphaEv this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(517.7502F, 276.7301F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 276.7301F); this.xrLabel13.Multiline = true; this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(93.88F, 18F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(106.38F, 18F); this.xrLabel13.StylePriority.UseFont = false; this.xrLabel13.StylePriority.UseForeColor = false; this.xrLabel13.StylePriority.UsePadding = false; @@ -478,11 +478,11 @@ namespace AlphaEv this.xrLabel15.CanGrow = false; this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(517.7502F, 294.7393F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 294.7393F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(165.7499F, 19.24997F); this.xrLabel15.StylePriority.UseFont = false; this.xrLabel15.Text = "[InvoiceNumber]"; // @@ -491,11 +491,11 @@ namespace AlphaEv this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Calibri", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(517.7502F, 220.1885F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 220.1885F); this.xrLabel16.Multiline = true; this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(165.7499F, 38.54161F); this.xrLabel16.StylePriority.UseFont = false; this.xrLabel16.StylePriority.UseForeColor = false; this.xrLabel16.StylePriority.UseTextAlignment = false; @@ -509,11 +509,11 @@ namespace AlphaEv this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(517.7502F, 258.7301F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 258.7301F); this.xrLabel17.Multiline = true; this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(57.86957F, 18F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(70.36957F, 18F); this.xrLabel17.StylePriority.UseFont = false; this.xrLabel17.StylePriority.UseForeColor = false; this.xrLabel17.StylePriority.UsePadding = false; @@ -521,10 +521,10 @@ namespace AlphaEv // // xrRichText2 // - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(517.7502F, 0F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(505.2502F, 0F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F); + this.xrRichText2.SizeF = new System.Drawing.SizeF(165.7498F, 77.41667F); // // fieldApprovedFLSWithFactor // @@ -730,10 +730,6 @@ namespace AlphaEv this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.Weight = 3D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1030,6 +1026,10 @@ namespace AlphaEv this.xrTableCell32.TextFormatString = "{0:C}"; this.xrTableCell32.Weight = 0.1461538938457071D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // SettlementReportWuppertal // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1059,8 +1059,8 @@ namespace AlphaEv ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }