From 6ddecbb49fc9448c2eb236956b6513be2fa07540 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Tue, 17 Dec 2024 11:38:51 +0100 Subject: [PATCH] MH: PaS Unterschreiber ab 2025 --- .../SettlementReport.Designer.cs | 20 +++++++++---------- .../PaSMoenchengladbach/SettlementReport.cs | 5 ++++- .../SettlementReport2.Designer.cs | 20 +++++++++---------- .../PaSMoenchengladbach/SettlementReport2.cs | 3 +++ 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs b/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs index 4925dde66..a854b1236 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport.Designer.cs @@ -61,7 +61,7 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterschreiber = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -362,7 +362,7 @@ namespace PaSMoenchengladbach.Alt this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel10, this.xrTable3, - this.xrLabel12, + this.lblUnterschreiber, this.lblNotice}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); this.ReportFooter.HeightF = 191.2917F; @@ -438,14 +438,14 @@ namespace PaSMoenchengladbach.Alt this.xrTableCell31.Text = "xrTableCell8"; this.xrTableCell31.Weight = 3D; // - // xrLabel12 + // lblUnterschreiber // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 174.2917F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Ralf Lexen"; + this.lblUnterschreiber.LocationFloat = new DevExpress.Utils.PointFloat(0F, 174.2917F); + this.lblUnterschreiber.Name = "lblUnterschreiber"; + this.lblUnterschreiber.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterschreiber.SizeF = new System.Drawing.SizeF(225F, 17F); + this.lblUnterschreiber.StylePriority.UseFont = false; + this.lblUnterschreiber.Text = "Ralf Lexen"; // // lblNotice // @@ -847,7 +847,7 @@ namespace PaSMoenchengladbach.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel lblUnterschreiber; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport.cs b/ReportImp/PaSMoenchengladbach/SettlementReport.cs index 6818a6685..ad3e7b71a 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport.cs @@ -81,7 +81,10 @@ namespace PaSMoenchengladbach.Alt if (pRO.SettlementDC.Claim < 0) pRO.FinalSentence = ""; - this.bindingSource1.DataSource = pRO; + if (pRO.InvoiceDateTime >= new DateTime(2025, 01, 01)) + lblUnterschreiber.Text = "Hörath/Spieles"; + + this.bindingSource1.DataSource = pRO; } private String GetCustomerId(SettlementRO pRO) diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs b/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs index e4721533d..4f98dc88e 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs @@ -44,7 +44,7 @@ namespace PaSMoenchengladbach this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterschreiber = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -249,7 +249,7 @@ namespace PaSMoenchengladbach // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel13, + this.lblUnterschreiber, this.xrLabel10, this.xrTable3, this.lblNotice}); @@ -259,14 +259,14 @@ namespace PaSMoenchengladbach this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel13 + // lblUnterschreiber // - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175.4585F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "Ralf Lexen"; + this.lblUnterschreiber.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175.4585F); + this.lblUnterschreiber.Name = "lblUnterschreiber"; + this.lblUnterschreiber.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterschreiber.SizeF = new System.Drawing.SizeF(225F, 17F); + this.lblUnterschreiber.StylePriority.UseFont = false; + this.lblUnterschreiber.Text = "Ralf Lexen"; // // xrLabel10 // @@ -1021,7 +1021,7 @@ namespace PaSMoenchengladbach private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel lblUnterschreiber; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport2.cs b/ReportImp/PaSMoenchengladbach/SettlementReport2.cs index 3eee88c94..32d532ed8 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport2.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport2.cs @@ -67,6 +67,9 @@ namespace PaSMoenchengladbach if (pRO.Claim < 0) pRO.FinalSentence = ""; + if (pRO.InvoiceDate >= new DateTime(2025, 01, 01)) + lblUnterschreiber.Text = "Hörath/Spieles"; + this.bindingSource1.DataSource = pRO; } }