diff --git a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs index 879f77959..c8d7e6ca2 100644 --- a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs @@ -43,7 +43,6 @@ namespace AutismusKoelnBonn this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblText = new DevExpress.XtraReports.UI.XRLabel(); this.lbl2 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblBewilligungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -62,6 +61,8 @@ namespace AutismusKoelnBonn this.lblAddress = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -87,9 +88,8 @@ namespace AutismusKoelnBonn this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblBewilligungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblHeaderKoeln)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblTeamKoeln)).BeginInit(); @@ -118,10 +118,10 @@ namespace AutismusKoelnBonn // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblBewilligungszeitraum, this.xrTable5, this.lblText, this.lbl2, - this.lblBewilligungszeitraum, this.lblAnrede, this.xrLabel7, this.xrLabel9, @@ -139,13 +139,13 @@ namespace AutismusKoelnBonn this.xrPictureBox1, this.lblAddress}); this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportHeader.HeightF = 662.9581F; + this.ReportHeader.HeightF = 637.9581F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrTable5 // - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(31.90305F, 637.9581F); + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(31.90305F, 612.9581F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); @@ -266,7 +266,7 @@ namespace AutismusKoelnBonn // this.lblText.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.lblText.LocationFloat = new DevExpress.Utils.PointFloat(31.8476F, 581.9998F); + this.lblText.LocationFloat = new DevExpress.Utils.PointFloat(31.8476F, 558.9998F); this.lblText.Multiline = true; this.lblText.Name = "lblText"; this.lblText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -282,7 +282,7 @@ namespace AutismusKoelnBonn this.lbl2.CanShrink = true; this.lbl2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.lbl2.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 475.5415F); + this.lbl2.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 463.5415F); this.lbl2.Multiline = true; this.lbl2.Name = "lbl2"; this.lbl2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -294,25 +294,11 @@ namespace AutismusKoelnBonn this.lbl2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.lbl2.WordWrap = false; // - // lblBewilligungszeitraum - // - this.lblBewilligungszeitraum.BackColor = System.Drawing.Color.Transparent; - this.lblBewilligungszeitraum.CanShrink = true; - this.lblBewilligungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); - this.lblBewilligungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(32.94463F, 495.5414F); - this.lblBewilligungszeitraum.Name = "lblBewilligungszeitraum"; - this.lblBewilligungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBewilligungszeitraum.SizeF = new System.Drawing.SizeF(648.9584F, 20F); - this.lblBewilligungszeitraum.StylePriority.UseBackColor = false; - this.lblBewilligungszeitraum.StylePriority.UseFont = false; - this.lblBewilligungszeitraum.Text = "Bewilligungszeitraum: "; - this.lblBewilligungszeitraum.WordWrap = false; - // // lblAnrede // this.lblAnrede.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 548.4581F); + this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(32.94468F, 527.4581F); this.lblAnrede.Multiline = true; this.lblAnrede.Name = "lblAnrede"; this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -516,11 +502,34 @@ namespace AutismusKoelnBonn this.lblMfg, this.lblVerwaltung}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportFooter.HeightF = 283.1411F; + this.ReportFooter.HeightF = 285.183F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // lblNotice + // + this.lblNotice.CanShrink = true; + this.lblNotice.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Italic); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 37F); + this.lblNotice.Name = "lblNotice"; + this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 22F); + this.lblNotice.StylePriority.UseFont = false; + this.lblNotice.Text = "Abschließende Bemerkungen:"; + // + // xrLabel8 + // + this.xrLabel8.CanShrink = true; + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 59.45835F); + this.xrLabel8.Multiline = true; + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(653.1939F, 18.04168F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.Text = "[Notice]"; + // // xrTable2 // this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 0F); @@ -637,11 +646,11 @@ namespace AutismusKoelnBonn // this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 84.88008F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(31.90308F, 92.88007F); 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(671.097F, 75.75009F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(653.1386F, 75.75009F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.Text = "Bitte überweisen Sie den Rechnungsbetrag innerhalb von 14 Tagen unter Angabe der " + "Rechnungsnummer.\r\n\r\nWir weisen darauf hin, dass wir gemäß § 4 Nr. 18 UStG von de" + @@ -651,18 +660,18 @@ namespace AutismusKoelnBonn // this.lblMfg.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.lblMfg.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 184.7238F); + this.lblMfg.LocationFloat = new DevExpress.Utils.PointFloat(31.90308F, 190.7238F); this.lblMfg.Multiline = true; this.lblMfg.Name = "lblMfg"; this.lblMfg.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblMfg.SizeF = new System.Drawing.SizeF(671.097F, 72.00012F); + this.lblMfg.SizeF = new System.Drawing.SizeF(653.1387F, 72.00015F); this.lblMfg.StylePriority.UseFont = false; this.lblMfg.Text = "Mit freundlichen Grüßen\r\n\r\n\r\nWalter Krebs"; // // lblVerwaltung // this.lblVerwaltung.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.lblVerwaltung.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 256.7239F); + this.lblVerwaltung.LocationFloat = new DevExpress.Utils.PointFloat(31.90301F, 262.7239F); this.lblVerwaltung.Multiline = true; this.lblVerwaltung.Name = "lblVerwaltung"; this.lblVerwaltung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -874,32 +883,27 @@ namespace AutismusKoelnBonn this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell47.Weight = 0.39389530172875176D; // + // lblBewilligungszeitraum + // + this.lblBewilligungszeitraum.BackColor = System.Drawing.Color.Transparent; + this.lblBewilligungszeitraum.CanShrink = true; + this.lblBewilligungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.lblBewilligungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(32.94474F, 483.5415F); + this.lblBewilligungszeitraum.Multiline = true; + this.lblBewilligungszeitraum.Name = "lblBewilligungszeitraum"; + this.lblBewilligungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBewilligungszeitraum.SizeF = new System.Drawing.SizeF(648.9583F, 20F); + this.lblBewilligungszeitraum.StylePriority.UseBackColor = false; + this.lblBewilligungszeitraum.StylePriority.UseFont = false; + this.lblBewilligungszeitraum.StylePriority.UseTextAlignment = false; + this.lblBewilligungszeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblBewilligungszeitraum.WordWrap = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); // - // lblNotice - // - this.lblNotice.CanShrink = true; - this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 34F); - this.lblNotice.Name = "lblNotice"; - this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 22F); - this.lblNotice.StylePriority.UseFont = false; - this.lblNotice.Text = "Abschließende Bemerkungen:"; - // - // xrLabel8 - // - this.xrLabel8.CanShrink = true; - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(31.84764F, 56.45835F); - this.xrLabel8.Multiline = true; - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(653.1939F, 18.04168F); - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "[Notice]"; - // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -968,7 +972,6 @@ namespace AutismusKoelnBonn private DevExpress.XtraReports.UI.XRRichText lblBonnHZE; private DevExpress.XtraReports.UI.XRLabel lblText; private DevExpress.XtraReports.UI.XRLabel lbl2; - private DevExpress.XtraReports.UI.XRLabel lblBewilligungszeitraum; private DevExpress.XtraReports.UI.XRLabel lblAnrede; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; @@ -1000,5 +1003,6 @@ namespace AutismusKoelnBonn private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; private DevExpress.XtraReports.UI.XRLabel lblNotice; private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel lblBewilligungszeitraum; } } diff --git a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.cs b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.cs index 3dbbe5f1f..92d810aff 100644 --- a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.cs +++ b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.cs @@ -59,7 +59,7 @@ namespace AutismusKoelnBonn team = sc.Customer.Team2CustomerList[0].Team.Name; lvrBescheid = String.Format("gemäß Bescheid des LVR vom {0:dd.MM.yyyy}, ", sc.ApprovalDate); - lblBewilligungszeitraum.Text += String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", sc.StartDate, sc.EndDate); + lblBewilligungszeitraum.Text += String.Format("Bewillingszeitraum: {0:dd.MM.yyyy} - {1:dd.MM.yyyy}", sc.StartDate, sc.EndDate); pRO.CreatorFirstName = sc.Customer.DebitorNumber; } @@ -106,7 +106,12 @@ namespace AutismusKoelnBonn lblHeaderKoelnHZE.Visible = true; lblHeaderKoeln.Visible = false; lblTeamKoeln.Visible = false; - } + } + + if (String.IsNullOrEmpty(pRO.Notice)) + { + lblNotice.Visible = false; + } this.bindingSource1.DataSource = pRO; }