diff --git a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.Designer.cs b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.Designer.cs index bd72302e6..ff8998884 100644 --- a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.Designer.cs @@ -74,7 +74,7 @@ namespace LebenshilfeBadKreuznachFUD this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.rowIKZeichen = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -101,11 +101,7 @@ namespace LebenshilfeBadKreuznachFUD this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblIk = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -149,6 +145,7 @@ namespace LebenshilfeBadKreuznachFUD // this.Page1.BorderWidth = 2F; this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblIk, this.lblVers, this.xrLabel11, this.xrTable4, @@ -433,10 +430,8 @@ namespace LebenshilfeBadKreuznachFUD this.xrTableRow2, this.xrTableRow5, this.xrTableRow1, - this.xrTableRow10, - this.rowIKZeichen, - this.xrTableRow12}); - this.xrTable3.SizeF = new System.Drawing.SizeF(261.7049F, 153F); + this.xrTableRow11}); + this.xrTable3.SizeF = new System.Drawing.SizeF(261.7049F, 134F); this.xrTable3.StylePriority.UseBorderColor = false; this.xrTable3.StylePriority.UseBorders = false; this.xrTable3.StylePriority.UseFont = false; @@ -773,12 +768,12 @@ namespace LebenshilfeBadKreuznachFUD this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell2.Weight = 0.39287399134179252D; // - // rowIKZeichen + // xrTableRow11 // - this.rowIKZeichen.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3}); - this.rowIKZeichen.Name = "rowIKZeichen"; - this.rowIKZeichen.Weight = 0.68D; + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 0.68D; // // xrTableCell3 // @@ -787,7 +782,6 @@ namespace LebenshilfeBadKreuznachFUD this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell3.BorderWidth = 2F; - this.xrTableCell3.CanShrink = true; this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -798,9 +792,8 @@ namespace LebenshilfeBadKreuznachFUD this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "IK-Zeichen: [BusinessPartnerId]"; + this.xrTableCell3.Text = "Bitte bei allen Rückfragen angeben!"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Visible = false; this.xrTableCell3.Weight = 0.78575907572128534D; // // ReportFooter @@ -1145,84 +1138,22 @@ namespace LebenshilfeBadKreuznachFUD // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrTableRow10 + // lblIk // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5, - this.xrTableCell7}); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.080000000000000071D; - // - // xrTableCell5 - // - this.xrTableCell5.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell5.BorderColor = System.Drawing.Color.Silver; - this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.Left; - this.xrTableCell5.BorderWidth = 2F; - this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrTableCell5.Multiline = true; - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell5.StylePriority.UseBackColor = false; - this.xrTableCell5.StylePriority.UseBorderColor = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseBorderWidth = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "xrTableCell5"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.39288508437949277D; - // - // xrTableCell7 - // - this.xrTableCell7.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell7.BorderColor = System.Drawing.Color.Silver; - this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrTableCell7.BorderWidth = 2F; - this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell7.StylePriority.UseBackColor = false; - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseBorderWidth = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "xrTableCell7"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell7.Weight = 0.39287399134179252D; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.68D; - // - // xrTableCell8 - // - this.xrTableCell8.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell8.BorderColor = System.Drawing.Color.Silver; - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.BorderWidth = 2F; - this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell8.StylePriority.UseBackColor = false; - this.xrTableCell8.StylePriority.UseBorderColor = false; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseBorderWidth = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "Bitte bei allen Rückfragen angeben!"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.78575907572128534D; + this.lblIk.BackColor = System.Drawing.Color.Transparent; + this.lblIk.CanShrink = true; + this.lblIk.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.lblIk.LocationFloat = new DevExpress.Utils.PointFloat(421.2952F, 170.9583F); + this.lblIk.Name = "lblIk"; + this.lblIk.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblIk.SizeF = new System.Drawing.SizeF(261.7048F, 17.00002F); + this.lblIk.StylePriority.UseBackColor = false; + this.lblIk.StylePriority.UseFont = false; + this.lblIk.StylePriority.UseTextAlignment = false; + this.lblIk.Text = "IK-Zeichen: 500713239"; + this.lblIk.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.lblIk.Visible = false; + this.lblIk.WordWrap = false; // // Rechnung // @@ -1302,7 +1233,7 @@ namespace LebenshilfeBadKreuznachFUD private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRTableRow rowIKZeichen; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; @@ -1327,10 +1258,6 @@ namespace LebenshilfeBadKreuznachFUD private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell lblMail; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRLabel lblIk; } } diff --git a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs index 00fcd1c54..810c08c7e 100644 --- a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs +++ b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs @@ -42,7 +42,8 @@ namespace LebenshilfeBadKreuznachFUD if (entlastung) { lblZahlziel.Visible = true; - lblZahlziel.Text = String.Format("(bis {0:dd.MM.yyyy})", pRO.InvoiceDateTime.Value.AddDays(30)); + lblIk.Visible = true; + lblZahlziel.Text = String.Format("(bis {0:dd.MM.yyyy})", pRO.InvoiceDateTime.Value.AddDays(30)); lblZahlzeit.Text = "30 Tage"; } else @@ -55,7 +56,6 @@ namespace LebenshilfeBadKreuznachFUD lblBearbeiter.Text = "Kirmse"; lblTel.Text = "0671/483269-118"; lblMail.Text = "andrea.kirmse@\nlebenshilfe-kreuznach.de"; - rowIKZeichen.Visible = true; } SetzeAdresse(pRO);