From c0e46d5cbd0c22602ccc389d8759449ba635086f Mon Sep 17 00:00:00 2001 From: Kojo Date: Thu, 5 Feb 2026 20:32:31 +0100 Subject: [PATCH] =?UTF-8?q?SKFAlsdorf:=20Auf=20Spitzabrechnung=20GP-Nr.=20?= =?UTF-8?q?+=20Lientengeburtsdatum=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SKFAlsdorf/SettlementReport.Designer.cs | 45 ++++++++++++++----- .../SKFAlsdorf/SettlementReport2.Designer.cs | 31 +++++++++++-- 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs b/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs index 9bd149b71..af7f87a50 100644 --- a/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs +++ b/ReportImp/SKFAlsdorf/SettlementReport.Designer.cs @@ -42,7 +42,6 @@ namespace BeWo.SKFAlsdorf.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(); @@ -74,6 +73,7 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = 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(); @@ -123,6 +123,8 @@ namespace BeWo.SKFAlsdorf.Alt this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -283,12 +285,6 @@ namespace BeWo.SKFAlsdorf.Alt 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"; - // // xrTableRow11 // this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -638,6 +634,12 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell17.Weight = 0.21685899000901443D; // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // // xrLabel6 // this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); @@ -685,7 +687,8 @@ namespace BeWo.SKFAlsdorf.Alt this.xrLabel3.SizeF = new System.Drawing.SizeF(621.9999F, 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 @@ -714,8 +717,9 @@ namespace BeWo.SKFAlsdorf.Alt this.xrTableRow3, this.xrTableRow1, this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 134F); + this.xrTableRow8, + this.xrTableRow10}); + this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 151F); this.xrTable2.StylePriority.UseFont = false; // // xrTableRow2 @@ -1134,6 +1138,25 @@ namespace BeWo.SKFAlsdorf.Alt // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.StylePriority.UseTextAlignment = false; + this.xrTableRow10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableRow10.Weight = 0.11258278145695365D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.TextFormatString = "GP-Nr.: {0}"; + this.xrTableCell7.Weight = 1D; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1256,5 +1279,7 @@ namespace BeWo.SKFAlsdorf.Alt private DevExpress.XtraReports.UI.XRTableRow xrTableRow16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; } } diff --git a/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs b/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs index e37e090f3..fd96cf1b9 100644 --- a/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs +++ b/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs @@ -123,6 +123,8 @@ namespace BeWo.SKFAlsdorf this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell83 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -278,7 +280,7 @@ namespace BeWo.SKFAlsdorf 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 @@ -307,8 +309,9 @@ namespace BeWo.SKFAlsdorf this.xrTableRow3, this.xrTableRow1, this.xrTableRow6, - this.xrTableRow8}); - this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 134F); + this.xrTableRow8, + this.xrTableRow7}); + this.xrTable2.SizeF = new System.Drawing.SizeF(255F, 151F); this.xrTable2.StylePriority.UseFont = false; // // xrTableRow2 @@ -1115,6 +1118,26 @@ namespace BeWo.SKFAlsdorf // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.11258278145695365D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "BusinessPartnerId")}); + this.xrTableCell3.Multiline = true; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell3.TextFormatString = "GP-Nr.: {0}"; + this.xrTableCell3.Weight = 1D; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1240,5 +1263,7 @@ namespace BeWo.SKFAlsdorf private DevExpress.XtraReports.UI.XRTableRow xrTableRow51; private DevExpress.XtraReports.UI.XRTableCell xrTableCell82; private DevExpress.XtraReports.UI.XRTableCell xrTableCell83; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; } }