diff --git a/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs b/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs index bc0e3f010..b73eef621 100644 --- a/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs @@ -50,7 +50,7 @@ namespace ZukunftLeben this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBemerkung = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -76,6 +76,7 @@ namespace ZukunftLeben this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.lblSteuerbefreiung = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -218,7 +219,7 @@ namespace ZukunftLeben // 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, 139.5833F); 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); @@ -228,7 +229,7 @@ namespace ZukunftLeben // 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, 93.75F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow10, @@ -270,22 +271,23 @@ namespace ZukunftLeben 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, 210.5833F); 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); this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.Text = "[CreatorName]"; // - // xrLabel9 + // lblBemerkung // - 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.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(250F, 17F); - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.Text = "Abschließende Bemerkungen:"; + this.lblBemerkung.CanShrink = true; + this.lblBemerkung.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); + this.lblBemerkung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); + this.lblBemerkung.Name = "lblBemerkung"; + this.lblBemerkung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBemerkung.SizeF = new System.Drawing.SizeF(250F, 17F); + this.lblBemerkung.StylePriority.UseFont = false; + this.lblBemerkung.Text = "Abschließende Bemerkungen:"; // // DetailReport // @@ -612,12 +614,13 @@ namespace ZukunftLeben // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblSteuerbefreiung, this.xrLabel1, - this.xrLabel9, + this.lblBemerkung, this.xrTable4, this.xrLabel14, this.xrLabel15}); - this.GroupFooter1.HeightF = 206.5833F; + this.GroupFooter1.HeightF = 227.5833F; this.GroupFooter1.Name = "GroupFooter1"; // // xrLabel1 @@ -625,19 +628,26 @@ namespace ZukunftLeben this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(450.7081F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(226.1249F, 25F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UsePadding = false; this.xrLabel1.StylePriority.UseTextAlignment = false; this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // bindingSource1 + // lblSteuerbefreiung // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + this.lblSteuerbefreiung.CanShrink = true; + this.lblSteuerbefreiung.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.lblSteuerbefreiung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35.74991F); + this.lblSteuerbefreiung.Name = "lblSteuerbefreiung"; + this.lblSteuerbefreiung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSteuerbefreiung.SizeF = new System.Drawing.SizeF(510.0833F, 16.99999F); + this.lblSteuerbefreiung.StylePriority.UseFont = false; + this.lblSteuerbefreiung.Text = "Die Leistungen sind steuerbefreit nach § 4 Nr. 16 und Nr. 18 USTG."; // // ServiceInvoiceReport // @@ -655,7 +665,7 @@ namespace ZukunftLeben this.ruleRateFactorNull}); this.Margins = new DevExpress.Drawing.DXMargins(91.66666F, 55F, 212.7083F, 50F); this.PageHeight = 1169; - this.PageWidth = 827; + this.PageWidth = 826; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; xrWatermark1.Id = "Watermark1"; @@ -689,7 +699,7 @@ namespace ZukunftLeben private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel lblBemerkung; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.XRTable xrTable5; @@ -714,6 +724,7 @@ namespace ZukunftLeben private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel lblSteuerbefreiung; } } diff --git a/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs b/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs index 6cf34fd7c..c28f4384d 100644 --- a/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs +++ b/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs @@ -40,6 +40,12 @@ namespace ZukunftLeben SetzeAdresse(pRO); + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation.ToLower() != "selbstzahler") + lblSteuerbefreiung.Visible = false; + + if (String.IsNullOrEmpty(pRO.Notice)) + lblBemerkung.Visible = false; + this.bindingSource1.DataSource = pRO; }