From 8e7b8bdcee627b663d32d058eba2aeb8d739baae Mon Sep 17 00:00:00 2001 From: HirschleM Date: Tue, 30 Sep 2025 15:11:11 +0200 Subject: [PATCH] MH: Nova Bankdaten --- .../ServiceInvoiceReport.Designer.cs | 42 +++++--- .../SettlementReport2.Designer.cs | 98 +++++++++---------- .../SettlementReport2.cs | 5 - 3 files changed, 79 insertions(+), 66 deletions(-) diff --git a/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs b/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs index 216ca4ac5..8769bc8c8 100644 --- a/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/NovaSelbstbestimmtLebenUG/ServiceInvoiceReport.Designer.cs @@ -30,10 +30,12 @@ namespace BeWo.Report.DefaultReports { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); + 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.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); @@ -93,7 +95,7 @@ namespace BeWo.Report.DefaultReports this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -128,6 +130,14 @@ namespace BeWo.Report.DefaultReports this.topMarginBand1.HeightF = 157.5F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrPictureBox3 + // + this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource")); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(535.4167F, 39.79166F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(114.5833F, 117.7084F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // bottomMarginBand1 // this.bottomMarginBand1.HeightF = 50F; @@ -402,7 +412,7 @@ namespace BeWo.Report.DefaultReports // xrLabel15 // this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.6667F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -412,7 +422,7 @@ namespace BeWo.Report.DefaultReports // xrTable4 // this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.8334F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow10, @@ -454,7 +464,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 244.6667F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -464,7 +474,7 @@ namespace BeWo.Report.DefaultReports // xrLabel9 // this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.75F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.83336F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F); @@ -795,12 +805,13 @@ namespace BeWo.Report.DefaultReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel5, this.xrLabel1, this.xrLabel9, this.xrTable4, this.xrLabel14, this.xrLabel15}); - this.GroupFooter1.HeightF = 206.5833F; + this.GroupFooter1.HeightF = 261.6667F; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel1 @@ -822,13 +833,17 @@ namespace BeWo.Report.DefaultReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrPictureBox3 + // xrLabel5 // - this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource")); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(535.4167F, 39.79166F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(114.5833F, 117.7084F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 41.20833F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(677.0001F, 39.91668F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "Bitte überweisen Sie den offenen Betrag an unser Konto mit der IBAN:\r\nDE52 2805 0" + + "100 0095 9964 27"; // // ServiceInvoiceReport // @@ -849,6 +864,8 @@ namespace BeWo.Report.DefaultReports 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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); @@ -923,5 +940,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; } } diff --git a/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs b/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs index fbd3a3d39..640f787e5 100644 --- a/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs +++ b/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.Designer.cs @@ -30,10 +30,12 @@ namespace BeWo.Report.DefaultReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); 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.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -85,9 +87,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); @@ -106,7 +106,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow10 = 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.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -125,14 +124,15 @@ namespace BeWo.Report.DefaultReports this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel5 = 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.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -152,6 +152,14 @@ namespace BeWo.Report.DefaultReports this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrPictureBox3 + // + this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource")); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(535.4164F, 2.291648F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(114.5833F, 117.7084F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // xrLabel9 // this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(193F, 51.5F); @@ -237,7 +245,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(642F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(649.9998F, 67F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); @@ -516,18 +524,16 @@ namespace BeWo.Report.DefaultReports this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel10, this.xrTable3, - this.xrLabel12, - this.xrLabel11, - this.lblNotice}); + this.xrLabel11}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 186.7084F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 133F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 124.4584F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -536,7 +542,7 @@ namespace BeWo.Report.DefaultReports // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 10.00001F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, @@ -558,6 +564,7 @@ namespace BeWo.Report.DefaultReports // // xrTableCell16 // + this.xrTableCell16.CanShrink = true; this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); this.xrTableCell16.Name = "xrTableCell16"; @@ -589,6 +596,7 @@ namespace BeWo.Report.DefaultReports // // xrTableCell6 // + this.xrTableCell6.CanShrink = true; this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); this.xrTableCell6.Name = "xrTableCell6"; @@ -617,6 +625,7 @@ namespace BeWo.Report.DefaultReports // // xrTableCell29 // + this.xrTableCell29.CanShrink = true; this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); this.xrTableCell29.Name = "xrTableCell29"; @@ -646,6 +655,7 @@ namespace BeWo.Report.DefaultReports // // xrTableCell31 // + this.xrTableCell31.CanShrink = true; this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); this.xrTableCell31.Name = "xrTableCell31"; @@ -654,18 +664,9 @@ namespace BeWo.Report.DefaultReports this.xrTableCell31.Text = "xrTableCell8"; this.xrTableCell31.Weight = 3D; // - // xrLabel12 - // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorName]"; - // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9997F, 158.4584F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); @@ -674,25 +675,18 @@ namespace BeWo.Report.DefaultReports this.xrLabel11.Text = "Anlage"; this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // 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(0F, 7.999992F); - this.lblNotice.Name = "lblNotice"; - this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); - this.lblNotice.StylePriority.UseFont = false; - this.lblNotice.Text = "Abschließende Bemerkungen:"; - // // topMarginBand1 // this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 43F; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel5}); + this.bottomMarginBand1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.bottomMarginBand1.HeightF = 90.4583F; this.bottomMarginBand1.Name = "bottomMarginBand1"; + this.bottomMarginBand1.StylePriority.UseFont = false; // // GroupHeader1 // @@ -888,10 +882,6 @@ namespace BeWo.Report.DefaultReports 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[] { @@ -1092,13 +1082,22 @@ namespace BeWo.Report.DefaultReports this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.16397432767427886D; // - // xrPictureBox3 + // xrLabel5 // - this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource")); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(535.4164F, 2.291648F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(114.5833F, 117.7084F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 9F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 31.79156F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(678F, 17F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "[Mandator.BankAccount.BankName] • [Mandator.BankAccount.IBAN] • [Mandator.BankAcc" + + "ount.Bic]"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // // Spitzabrechnung // @@ -1117,18 +1116,20 @@ namespace BeWo.Report.DefaultReports this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 43F); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 90.4583F); this.PageHeight = 1169; 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.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1164,8 +1165,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; @@ -1229,5 +1228,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; } } \ No newline at end of file diff --git a/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.cs b/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.cs index 858c2aa0d..315a9c1c4 100644 --- a/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.cs +++ b/ReportImp/NovaSelbstbestimmtLebenUG/SettlementReport2.cs @@ -19,11 +19,6 @@ namespace BeWo.Report.DefaultReports public void SetReportDataSource(Settlement2RO pRO) { - if (String.IsNullOrEmpty(pRO.Notice)) - { - lblNotice.Visible = false; - } - decimal rateFactor = 1; foreach (var ii in pRO.InvoiceItems)