From ba80ffc29cdedcf50a3e4b91e209f22c9f45bebe Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 24 Feb 2026 15:13:06 +0100 Subject: [PATCH] =?UTF-8?q?KirschbaumManz:=20Auf=20Rechnungen=20GP-Nr.=20u?= =?UTF-8?q?nd=20Klienten-Geb.-Datum=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceInvoiceReport.Designer.cs | 53 ++++++++---- .../KirschbaumManz/ServiceInvoiceReport.resx | 3 - .../SettlementReport.Designer.cs | 84 +++++++++++------- .../SettlementReport2.Designer.cs | 85 ++++++++++++------- .../KirschbaumManz/SettlementReport2.resx | 3 - 5 files changed, 141 insertions(+), 87 deletions(-) diff --git a/ReportImp/KirschbaumManz/ServiceInvoiceReport.Designer.cs b/ReportImp/KirschbaumManz/ServiceInvoiceReport.Designer.cs index f1e484fc7..8fc9ce314 100644 --- a/ReportImp/KirschbaumManz/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/KirschbaumManz/ServiceInvoiceReport.Designer.cs @@ -75,6 +75,7 @@ namespace KirschbaumManz this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -90,7 +91,7 @@ namespace KirschbaumManz // // ReportHeader // - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 0F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -114,6 +115,7 @@ namespace KirschbaumManz // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGpNummer, this.xrLabel7, this.xrLabel4, this.xrLabel3, @@ -121,7 +123,7 @@ namespace KirschbaumManz this.xrLabel5, this.xrLabel8, this.lblAbrechnungszeitraum}); - this.Page1.Font = new System.Drawing.Font("Verdana", 10F); + this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.Page1.HeightF = 354.0833F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; @@ -141,12 +143,13 @@ namespace KirschbaumManz // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.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.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F); 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(650F, 20F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(317.0001F, 20F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumber]"; @@ -156,7 +159,8 @@ namespace KirschbaumManz // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -170,7 +174,8 @@ namespace KirschbaumManz // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.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.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -196,7 +201,7 @@ namespace KirschbaumManz this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(362.5F, 172F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(287.5F, 23F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -213,7 +218,7 @@ namespace KirschbaumManz // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.5833F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -223,7 +228,7 @@ namespace KirschbaumManz // // xrTable4 // - this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTable4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.75F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -265,7 +270,7 @@ namespace KirschbaumManz // this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189.5833F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -275,7 +280,7 @@ namespace KirschbaumManz // // xrLabel9 // - this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + 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); @@ -467,7 +472,8 @@ namespace KirschbaumManz // // xrTable6 // - this.xrTable6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable6.Font = new DevExpress.Drawing.DXFont("Verdana", 8.25F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable6.Name = "xrTable6"; this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -618,7 +624,7 @@ namespace KirschbaumManz // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold); + 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.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); @@ -633,6 +639,20 @@ namespace KirschbaumManz // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // lblGpNummer + // + this.lblGpNummer.CanShrink = true; + this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(317.0001F, 236F); + this.lblGpNummer.Name = "lblGpNummer"; + this.lblGpNummer.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.lblGpNummer.SizeF = new System.Drawing.SizeF(332.9999F, 18.99998F); + this.lblGpNummer.StylePriority.UseFont = false; + this.lblGpNummer.StylePriority.UsePadding = false; + this.lblGpNummer.StylePriority.UseTextAlignment = false; + this.lblGpNummer.Text = "[BusinessPartnerId]"; + this.lblGpNummer.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -644,14 +664,14 @@ namespace KirschbaumManz this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 220, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 220F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); @@ -707,5 +727,6 @@ namespace KirschbaumManz private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel lblGpNummer; } } diff --git a/ReportImp/KirschbaumManz/ServiceInvoiceReport.resx b/ReportImp/KirschbaumManz/ServiceInvoiceReport.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/KirschbaumManz/ServiceInvoiceReport.resx +++ b/ReportImp/KirschbaumManz/ServiceInvoiceReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/KirschbaumManz/SettlementReport.Designer.cs b/ReportImp/KirschbaumManz/SettlementReport.Designer.cs index cc9046e08..e3078acee 100644 --- a/ReportImp/KirschbaumManz/SettlementReport.Designer.cs +++ b/ReportImp/KirschbaumManz/SettlementReport.Designer.cs @@ -30,6 +30,7 @@ namespace KirschbaumManz.Alt { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + 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.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -38,11 +39,11 @@ namespace KirschbaumManz.Alt this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); @@ -72,13 +73,14 @@ namespace KirschbaumManz.Alt this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel7 = 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(); this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -101,8 +103,8 @@ namespace KirschbaumManz.Alt this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -137,10 +139,10 @@ namespace KirschbaumManz.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(367.0001F, 169F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(384.7084F, 169F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(265.2917F, 23F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -176,7 +178,7 @@ namespace KirschbaumManz.Alt this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseFont = false; this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:"; - this.xrTableCell19.Weight = 0.78314100999098568D; + this.xrTableCell19.Weight = 0.86487173227163472D; // // xrTableCell6 // @@ -192,13 +194,7 @@ namespace KirschbaumManz.Alt this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "[ApprovedFLS]"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell6.Weight = 0.21685899000901443D; - // - // ruleRateFactorNull - // - this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; - this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; - this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + this.xrTableCell6.Weight = 0.13512826772836539D; // // xrTableRow11 // @@ -238,13 +234,19 @@ namespace KirschbaumManz.Alt this.xrTableCell22.Text = "Erbrachte Leistungen:"; this.xrTableCell22.Weight = 1D; // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // // xrLabel6 // this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F); 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.9999F, 67F); this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); // @@ -261,12 +263,12 @@ namespace KirschbaumManz.Alt // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F); 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(650F, 17F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(384.7084F, 17.00002F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; @@ -276,21 +278,22 @@ namespace KirschbaumManz.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, 209F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" + + "irthdayString]"; this.xrLabel3.WordWrap = false; // // xrLabel2 // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -511,6 +514,7 @@ namespace KirschbaumManz.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel7, this.xrLabel1, this.xrLabel_RecipientContactPerson, this.xrLabel_RecipientDivision, @@ -528,9 +532,22 @@ namespace KirschbaumManz.Alt this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // - // bindingSource1 + // xrLabel7 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(384.7084F, 225F); + 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(265.2915F, 17.00002F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "[BusinessPartnerId]"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrLabel7.WordWrap = false; // // DetailReport // @@ -581,7 +598,7 @@ namespace KirschbaumManz.Alt this.xrTableCell17.StylePriority.UseBorders = false; this.xrTableCell17.StylePriority.UseFont = false; this.xrTableCell17.StylePriority.UsePadding = false; - this.xrTableCell17.Weight = 0.78314100999098546D; + this.xrTableCell17.Weight = 0.8648717322716345D; // // xrTableCell23 // @@ -600,7 +617,7 @@ namespace KirschbaumManz.Alt this.xrTableCell23.StylePriority.UseTextAlignment = false; this.xrTableCell23.Text = "xrTableCell23"; this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell23.Weight = 0.21685899000901443D; + this.xrTableCell23.Weight = 0.13512826772836539D; // // GroupFooter1 // @@ -662,7 +679,7 @@ namespace KirschbaumManz.Alt this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.8648717322716345D; // // xrTableCell50 // @@ -678,7 +695,7 @@ namespace KirschbaumManz.Alt this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "[AmountRecordedFLSString]"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.13512826772836539D; // // xrTableRow32 // @@ -713,7 +730,7 @@ namespace KirschbaumManz.Alt this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.86487173227163472D; // // xrTableCell53 // @@ -728,7 +745,7 @@ namespace KirschbaumManz.Alt this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "[AmountAdvancedPayments]"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; + this.xrTableCell53.Weight = 0.13512826772836539D; // // xrTableRow34 // @@ -746,7 +763,7 @@ namespace KirschbaumManz.Alt this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UsePadding = false; this.xrTableCell54.Text = "abzüglich Eigenanteil:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.86487173227163472D; // // xrTableCell55 // @@ -761,7 +778,7 @@ namespace KirschbaumManz.Alt this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell15"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.13512826772836539D; // // xrTableRow35 // @@ -799,7 +816,7 @@ namespace KirschbaumManz.Alt this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseFont = false; this.xrTableCell57.Text = "Restforderung:"; - this.xrTableCell57.Weight = 0.78314100999098568D; + this.xrTableCell57.Weight = 0.86487173227163472D; // // xrTableCell58 // @@ -815,7 +832,7 @@ namespace KirschbaumManz.Alt this.xrTableCell58.StylePriority.UseTextAlignment = false; this.xrTableCell58.Text = "[Claim]"; this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell58.Weight = 0.21685899000901443D; + this.xrTableCell58.Weight = 0.13512826772836539D; // // Spitzabrechnung // @@ -837,10 +854,12 @@ namespace KirschbaumManz.Alt 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.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -917,5 +936,6 @@ namespace KirschbaumManz.Alt private DevExpress.XtraReports.UI.XRTableRow xrTableRow36; private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/KirschbaumManz/SettlementReport2.Designer.cs b/ReportImp/KirschbaumManz/SettlementReport2.Designer.cs index 31de18049..69858a227 100644 --- a/ReportImp/KirschbaumManz/SettlementReport2.Designer.cs +++ b/ReportImp/KirschbaumManz/SettlementReport2.Designer.cs @@ -31,6 +31,7 @@ namespace KirschbaumManz { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + 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.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -96,6 +97,7 @@ namespace KirschbaumManz this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblGpNummer = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -114,7 +116,7 @@ namespace KirschbaumManz // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel9}); - this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportHeader.HeightF = 120F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -134,10 +136,10 @@ namespace KirschbaumManz // 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(367.0001F, 169F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(393.0417F, 169F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(283F, 23F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(256.9584F, 23F); this.xrLabel8.StylePriority.UseTextAlignment = false; this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -186,7 +188,7 @@ namespace KirschbaumManz 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.9999F, 67F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); @@ -204,12 +206,12 @@ namespace KirschbaumManz // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225F); 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(650F, 17F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(393.0417F, 17.00002F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; @@ -219,7 +221,7 @@ namespace KirschbaumManz // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -227,14 +229,14 @@ namespace KirschbaumManz this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" + - "stName]"; + "stName], geb. [CustomerBirthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -307,7 +309,7 @@ namespace KirschbaumManz this.xrLabel12, this.xrLabel11, this.lblNotice}); - this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 209F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -433,7 +435,7 @@ namespace KirschbaumManz // lblNotice // this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + 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); @@ -443,17 +445,16 @@ namespace KirschbaumManz // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGpNummer, this.xrLabel1, this.xrLabel_RecipientContactPerson, this.xrLabel_RecipientDivision, @@ -466,7 +467,7 @@ namespace KirschbaumManz this.xrLabel6, this.xrTable1, this.xrLabel8}); - this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.GroupHeader1.HeightF = 392.3333F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; @@ -490,7 +491,8 @@ namespace KirschbaumManz // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -525,7 +527,7 @@ namespace KirschbaumManz this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.86326913686899043D; // // xrTableCell53 // @@ -542,17 +544,14 @@ namespace KirschbaumManz this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "xrTableCell10"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + this.xrTableCell53.Weight = 0.13673086313100963D; // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.GroupFooter1.HeightF = 132F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -608,7 +607,7 @@ namespace KirschbaumManz this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.86326913686899021D; // // xrTableCell50 // @@ -624,7 +623,7 @@ namespace KirschbaumManz this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "xrTableCell9"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.13673086313100963D; // // xrTableRow32 // @@ -659,7 +658,7 @@ namespace KirschbaumManz this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.86326913686899043D; // // xrTableCell55 // @@ -676,7 +675,7 @@ namespace KirschbaumManz this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell10"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.13673086313100963D; // // xrTableRow35 // @@ -694,7 +693,7 @@ namespace KirschbaumManz this.xrTableCell56.StylePriority.UseBorders = false; this.xrTableCell56.StylePriority.UsePadding = false; this.xrTableCell56.Text = "abzüglich Eigenanteil:"; - this.xrTableCell56.Weight = 0.78314100999098568D; + this.xrTableCell56.Weight = 0.86326913686899043D; // // xrTableCell57 // @@ -709,7 +708,7 @@ namespace KirschbaumManz this.xrTableCell57.StylePriority.UseTextAlignment = false; this.xrTableCell57.Text = "xrTableCell15"; this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell57.Weight = 0.21685899000901443D; + this.xrTableCell57.Weight = 0.13673086313100963D; // // xrTableRow36 // @@ -747,7 +746,7 @@ namespace KirschbaumManz this.xrTableCell59.StylePriority.UseBorders = false; this.xrTableCell59.StylePriority.UseFont = false; this.xrTableCell59.Text = "Restforderung:"; - this.xrTableCell59.Weight = 0.78314100999098568D; + this.xrTableCell59.Weight = 0.86326913686899043D; // // xrTableCell60 // @@ -755,7 +754,7 @@ namespace KirschbaumManz | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrTableCell60.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell60.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell60.Name = "xrTableCell60"; this.xrTableCell60.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell60.StylePriority.UseBorderColor = false; @@ -764,7 +763,24 @@ namespace KirschbaumManz this.xrTableCell60.StylePriority.UseTextAlignment = false; this.xrTableCell60.Text = "xrTableCell17"; this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell60.Weight = 0.21685899000901443D; + this.xrTableCell60.Weight = 0.13673086313100963D; + // + // lblGpNummer + // + this.lblGpNummer.BackColor = System.Drawing.Color.Transparent; + this.lblGpNummer.CanShrink = true; + this.lblGpNummer.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblGpNummer.LocationFloat = new DevExpress.Utils.PointFloat(393.0417F, 225F); + this.lblGpNummer.Multiline = true; + this.lblGpNummer.Name = "lblGpNummer"; + this.lblGpNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGpNummer.SizeF = new System.Drawing.SizeF(256.9581F, 17.00002F); + this.lblGpNummer.StylePriority.UseBackColor = false; + this.lblGpNummer.StylePriority.UseFont = false; + this.lblGpNummer.StylePriority.UseTextAlignment = false; + this.lblGpNummer.Text = "[BusinessPartnerId]"; + this.lblGpNummer.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblGpNummer.WordWrap = false; // // Spitzabrechnung // @@ -783,11 +799,13 @@ namespace KirschbaumManz this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 100); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 100F, 100F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); @@ -864,5 +882,6 @@ namespace KirschbaumManz private DevExpress.XtraReports.UI.XRTableCell xrTableCell59; private DevExpress.XtraReports.UI.XRTableCell xrTableCell60; private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel lblGpNummer; } } diff --git a/ReportImp/KirschbaumManz/SettlementReport2.resx b/ReportImp/KirschbaumManz/SettlementReport2.resx index dac8c7ff8..4bb9b6c77 100644 --- a/ReportImp/KirschbaumManz/SettlementReport2.resx +++ b/ReportImp/KirschbaumManz/SettlementReport2.resx @@ -121,7 +121,4 @@ anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerFirstName] [CustomerLastName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: - - 17, 17 - \ No newline at end of file