diff --git a/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.Designer.cs b/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.Designer.cs index 9d18313da..d80504e92 100644 --- a/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.Designer.cs +++ b/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.Designer.cs @@ -56,8 +56,9 @@ namespace LebenshilfeCoburg this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblVersNr = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); @@ -87,13 +88,12 @@ namespace LebenshilfeCoburg this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblVersNr = new DevExpress.XtraReports.UI.XRLabel(); + 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.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -218,7 +218,7 @@ namespace LebenshilfeCoburg // this.xrLabel7.CanShrink = true; this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(350F, 36.70667F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(384.9167F, 34.00002F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -233,7 +233,7 @@ namespace LebenshilfeCoburg // this.xrTable3.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTable3.Font = new System.Drawing.Font("Arial", 9F); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(350F, 2.706655F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(386F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, @@ -341,10 +341,6 @@ namespace LebenshilfeCoburg this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell3.Weight = 0.25954848669364788D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -356,6 +352,40 @@ namespace LebenshilfeCoburg this.GroupHeader1.HeightF = 170F; this.GroupHeader1.Name = "GroupHeader1"; // + // lblVersNr + // + this.lblVersNr.BackColor = System.Drawing.Color.Transparent; + this.lblVersNr.CanShrink = true; + this.lblVersNr.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.lblVersNr.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4167F); + this.lblVersNr.Name = "lblVersNr"; + this.lblVersNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblVersNr.SizeF = new System.Drawing.SizeF(544.0405F, 20F); + this.lblVersNr.StylePriority.UseBackColor = false; + this.lblVersNr.StylePriority.UseBorders = false; + this.lblVersNr.StylePriority.UseFont = false; + this.lblVersNr.StylePriority.UseTextAlignment = false; + this.lblVersNr.Text = "Vers.-Nr.: "; + this.lblVersNr.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblVersNr.WordWrap = false; + // + // xrLabel1 + // + this.xrLabel1.BackColor = System.Drawing.Color.Transparent; + this.xrLabel1.CanShrink = true; + this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.41666F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(544.0405F, 20F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseBorders = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "[CustomerFirstName] [CustomerLastName], geb. am [CustomerBirthdate!dd.MM.yyyy]"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel1.WordWrap = false; + // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -390,7 +420,7 @@ namespace LebenshilfeCoburg this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); - this.xrTable5.SizeF = new System.Drawing.SizeF(680F, 20F); + this.xrTable5.SizeF = new System.Drawing.SizeF(716F, 20F); this.xrTable5.StylePriority.UseBorders = false; this.xrTable5.StylePriority.UseFont = false; // @@ -581,11 +611,11 @@ namespace LebenshilfeCoburg this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); this.xrLabel16.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(555F, 20F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(555F, 20.00001F); 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(123.25F, 21F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(160.9999F, 21F); this.xrLabel16.StylePriority.UseBorderDashStyle = false; this.xrLabel16.StylePriority.UseBorders = false; this.xrLabel16.StylePriority.UseBorderWidth = false; @@ -601,7 +631,7 @@ namespace LebenshilfeCoburg this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(350F, 19.99995F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(194.0405F, 20.72925F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(205F, 20.72925F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Rechnungsbetrag:"; @@ -615,7 +645,7 @@ namespace LebenshilfeCoburg 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(123.25F, 20F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(160.9999F, 20F); this.xrLabel11.StylePriority.UseBorders = false; this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.StylePriority.UseTextAlignment = false; @@ -646,7 +676,7 @@ namespace LebenshilfeCoburg this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow3}); - this.xrTable1.SizeF = new System.Drawing.SizeF(680F, 20F); + this.xrTable1.SizeF = new System.Drawing.SizeF(716F, 20F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; // @@ -739,39 +769,9 @@ namespace LebenshilfeCoburg this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell14.Weight = 0.59808607880510767D; // - // xrLabel1 + // bindingSource1 // - this.xrLabel1.BackColor = System.Drawing.Color.Transparent; - this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.41666F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(544.0405F, 20F); - this.xrLabel1.StylePriority.UseBackColor = false; - this.xrLabel1.StylePriority.UseBorders = false; - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "[CustomerFirstName] [CustomerLastName], geb. am [CustomerBirthdate!dd.MM.yyyy]"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrLabel1.WordWrap = false; - // - // lblVersNr - // - this.lblVersNr.BackColor = System.Drawing.Color.Transparent; - this.lblVersNr.CanShrink = true; - this.lblVersNr.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.lblVersNr.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4167F); - this.lblVersNr.Name = "lblVersNr"; - this.lblVersNr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblVersNr.SizeF = new System.Drawing.SizeF(544.0405F, 20F); - this.lblVersNr.StylePriority.UseBackColor = false; - this.lblVersNr.StylePriority.UseBorders = false; - this.lblVersNr.StylePriority.UseFont = false; - this.lblVersNr.StylePriority.UseTextAlignment = false; - this.lblVersNr.Text = "Vers.-Nr.: "; - this.lblVersNr.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.lblVersNr.WordWrap = false; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // // EntlastungsbetragRechnung // @@ -794,9 +794,9 @@ namespace LebenshilfeCoburg this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.cs b/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.cs index a65ba5dc8..27f160f21 100644 --- a/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.cs +++ b/ReportImp/LebenshilfeCoburg/EntlastungsbetragRechnung.cs @@ -20,7 +20,7 @@ namespace LebenshilfeCoburg public void SetReportDataSource(ServiceInvoiceRO pRO) { - if (pRO.CustomerOid.HasValue != null) + if (pRO.CustomerOid.HasValue) { var c = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(pRO.CustomerOid.Value)); lblVersNr.Text += c.InsuranceNumber;