From 97ac02bef144444173b8ff68b3f941b97e4eedc9 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 13 Jan 2025 20:57:28 +0100 Subject: [PATCH] BehindertNaUnd: Geb.-Datum Klient und Gp-Nr. (aus DB) dazugebastelt --- .../AssistenzRechung.Designer.cs | 35 +++++++++++++---- .../InvoiceCustomerReport.Designer.cs | 30 +++++++++++--- .../ServiceInvoiceReport.Designer.cs | 36 +++++++++++++---- .../SettlementReport.Designer.cs | 38 ++++++++++++++---- .../SettlementReport2.Designer.cs | 39 ++++++++++++++----- 5 files changed, 141 insertions(+), 37 deletions(-) diff --git a/ReportImp/BehindertNaUnd/AssistenzRechung.Designer.cs b/ReportImp/BehindertNaUnd/AssistenzRechung.Designer.cs index 3c04b9c23..b880f2bf7 100644 --- a/ReportImp/BehindertNaUnd/AssistenzRechung.Designer.cs +++ b/ReportImp/BehindertNaUnd/AssistenzRechung.Designer.cs @@ -65,6 +65,7 @@ namespace BehindertNaUnd this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); @@ -102,6 +103,7 @@ namespace BehindertNaUnd // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel9, this.lblAbrechnungstext, this.xrLabel1, this.xrLabel6, @@ -156,10 +158,10 @@ namespace BehindertNaUnd // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(453.125F, 345.9623F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(550.0005F, 345.9623F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(196.8754F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(99.99988F, 23F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrLabel8.TextFormatString = "{0:dd.MM.yyyy}"; @@ -228,7 +230,7 @@ namespace BehindertNaUnd this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(453.125F, 17F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(292.0003F, 17F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumber]"; @@ -242,10 +244,11 @@ namespace BehindertNaUnd this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 319.5457F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(453.125F, 16F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(650.0004F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Assistenzleistungen für [CustomerSalutation] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Assistenzleistungen für [CustomerSalutation] [CustomerName], geb. [Cus" + + "tomerBirthdate!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -267,7 +270,7 @@ namespace BehindertNaUnd this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 392.7092F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(292.0003F, 17F); this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; // @@ -399,6 +402,23 @@ namespace BehindertNaUnd // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel9 + // + this.xrLabel9.BackColor = System.Drawing.Color.Transparent; + this.xrLabel9.CanShrink = true; + this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(292.0003F, 335.5456F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(233.1251F, 17.00003F); + this.xrLabel9.StylePriority.UseBackColor = false; + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel9.WordWrap = false; + // // Rechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -461,6 +481,7 @@ namespace BehindertNaUnd private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel18; - private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext; + private DevExpress.XtraReports.UI.XRLabel lblAbrechnungstext; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; } } diff --git a/ReportImp/BehindertNaUnd/InvoiceCustomerReport.Designer.cs b/ReportImp/BehindertNaUnd/InvoiceCustomerReport.Designer.cs index 049c2d5e7..4450c736b 100644 --- a/ReportImp/BehindertNaUnd/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/BehindertNaUnd/InvoiceCustomerReport.Designer.cs @@ -71,6 +71,7 @@ namespace BeWo.Report.DefaultReports this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -198,6 +199,7 @@ namespace BeWo.Report.DefaultReports // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrLabel1, this.lblAddress, this.xrTable3, @@ -215,10 +217,10 @@ namespace BeWo.Report.DefaultReports // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(449.9181F, 346.875F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(507.0016F, 346.875F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(217.0818F, 16F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(159.9983F, 16F); this.xrLabel1.StylePriority.UseTextAlignment = false; this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -369,7 +371,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(449.9181F, 17F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(273.8764F, 17F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumber]"; @@ -384,7 +386,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 346.875F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(449.9181F, 16F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(507.0014F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Abrechnung über Betreuungsleistungen"; @@ -529,6 +531,23 @@ namespace BeWo.Report.DefaultReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(273.8763F, 362.875F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(233.1251F, 17.00003F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel7.WordWrap = false; + // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -599,6 +618,7 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.XRLabel lblAddress; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/BehindertNaUnd/ServiceInvoiceReport.Designer.cs b/ReportImp/BehindertNaUnd/ServiceInvoiceReport.Designer.cs index 74b582e5c..bf0aaba3c 100644 --- a/ReportImp/BehindertNaUnd/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/BehindertNaUnd/ServiceInvoiceReport.Designer.cs @@ -76,6 +76,7 @@ namespace BehindertNaUnd this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -116,6 +117,7 @@ namespace BehindertNaUnd // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, this.xrLabel7, this.xrLabel4, this.xrLabel3, @@ -149,7 +151,7 @@ namespace BehindertNaUnd this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(450.7083F, 20F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(294.0001F, 20F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumber]"; @@ -159,15 +161,15 @@ namespace BehindertNaUnd // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 286.875F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(450.7083F, 20F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName], geb. [Cu" + + "stomerBirthdate!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -190,7 +192,7 @@ namespace BehindertNaUnd this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 361.0416F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(294.0001F, 17F); this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; // @@ -198,10 +200,10 @@ namespace BehindertNaUnd // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 286.875F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(510.0834F, 306.875F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(199.2917F, 19.99994F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(139.9166F, 19.99997F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -657,6 +659,23 @@ namespace BehindertNaUnd this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // + // xrLabel6 + // + this.xrLabel6.BackColor = System.Drawing.Color.Transparent; + this.xrLabel6.CanShrink = true; + this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(294.0001F, 306.875F); + 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(216.0833F, 17.00003F); + this.xrLabel6.StylePriority.UseBackColor = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel6.WordWrap = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); @@ -738,5 +757,6 @@ namespace BehindertNaUnd private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; } } diff --git a/ReportImp/BehindertNaUnd/SettlementReport.Designer.cs b/ReportImp/BehindertNaUnd/SettlementReport.Designer.cs index 583984d6c..ec657739b 100644 --- a/ReportImp/BehindertNaUnd/SettlementReport.Designer.cs +++ b/ReportImp/BehindertNaUnd/SettlementReport.Designer.cs @@ -102,6 +102,7 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -141,10 +142,10 @@ namespace BeWo.Report.DefaultReports.Alt // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(451.0415F, 259.375F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(509.0416F, 259.375F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(198.9585F, 16.99997F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(140.9584F, 16.99997F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -309,7 +310,7 @@ namespace BeWo.Report.DefaultReports.Alt this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(451.0417F, 17.00002F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(316.9999F, 17.00003F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; @@ -319,14 +320,16 @@ namespace BeWo.Report.DefaultReports.Alt // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 243.375F); this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(649.9999F, 16.00002F); + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(664F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; + this.xrLabel3.StylePriority.UsePadding = false; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" + + "irthdayString]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -554,6 +557,7 @@ namespace BeWo.Report.DefaultReports.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrLabel1, this.xrLabel_RecipientContactPerson, this.xrLabel_RecipientDivision, @@ -856,6 +860,23 @@ namespace BeWo.Report.DefaultReports.Alt this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(316.9999F, 259.375F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(192.0417F, 17.00003F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel7.WordWrap = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); @@ -967,6 +988,7 @@ namespace BeWo.Report.DefaultReports.Alt private DevExpress.XtraReports.UI.XRTableCell xrTableCell56; private DevExpress.XtraReports.UI.XRTableRow xrTableRow36; private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/BehindertNaUnd/SettlementReport2.Designer.cs b/ReportImp/BehindertNaUnd/SettlementReport2.Designer.cs index ee996f88c..2a3ea66ac 100644 --- a/ReportImp/BehindertNaUnd/SettlementReport2.Designer.cs +++ b/ReportImp/BehindertNaUnd/SettlementReport2.Designer.cs @@ -96,6 +96,7 @@ 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.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -135,10 +136,10 @@ namespace BeWo.Report.DefaultReports // this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")}); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(451.0417F, 262.4166F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(509.0417F, 262.4166F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(198.9585F, 16.00005F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(140.9584F, 16.00006F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -197,7 +198,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 293.2917F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(291.9999F, 17F); this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; // @@ -210,7 +211,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(451.0417F, 17.00002F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(291.9999F, 17.00003F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; @@ -220,15 +221,16 @@ namespace BeWo.Report.DefaultReports // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245.4167F); this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16.00002F); + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(664F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UsePadding = false; this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" + - "stName]"; + "stName], geb. [CustomerBirthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -453,6 +455,7 @@ namespace BeWo.Report.DefaultReports // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrLabel1, this.xrLabel_RecipientContactPerson, this.xrLabel_RecipientDivision, @@ -763,6 +766,23 @@ namespace BeWo.Report.DefaultReports this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.21685899000901443D; // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(292.9583F, 261.4167F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(216.0833F, 17.00003F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.TextFormatString = "GP-Nr.: {0}"; + this.xrLabel7.WordWrap = false; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); @@ -868,6 +888,7 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow37; private DevExpress.XtraReports.UI.XRTableCell xrTableCell59; private DevExpress.XtraReports.UI.XRTableCell xrTableCell60; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } }