From a737152c3a4106d221f70bde3d3a0bbe1942491d Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 16 May 2025 11:41:06 +0200 Subject: [PATCH] DiakonischesWerkWesel/QuittierungsbelegMitDatum - Datum Einzelunterschrift IMMER anzeigen --- .../QuittierungsbelegMitDatum.Designer.cs | 41 +------------------ .../QuittierungsbelegMitDatum.cs | 5 --- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.Designer.cs b/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.Designer.cs index 85b2bbaa9..99881bb33 100644 --- a/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.Designer.cs +++ b/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.Designer.cs @@ -62,8 +62,6 @@ namespace DiakonischesWerkWesel this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); @@ -544,49 +542,16 @@ namespace DiakonischesWerkWesel // this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell43.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel17, - this.xrLabel18}); this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell43.Multiline = true; this.xrTableCell43.Name = "xrTableCell43"; this.xrTableCell43.StylePriority.UseBorders = false; this.xrTableCell43.StylePriority.UseFont = false; this.xrTableCell43.StylePriority.UseTextAlignment = false; + this.xrTableCell43.Text = "Klientin / Klient"; + this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell43.Weight = 0.44692737430167595D; // - // xrLabel17 - // - this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(159F, 20F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseBorders = false; - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.StylePriority.UsePadding = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.Text = "Klientin / Klient"; - this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // - // xrLabel18 - // - this.xrLabel18.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 6F); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(159F, 20F); - this.xrLabel18.StylePriority.UseBackColor = false; - this.xrLabel18.StylePriority.UseBorders = false; - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.StylePriority.UsePadding = false; - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.Text = "(falls abweichend zur ersten Spalte)"; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // // xrTableCell49 // this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) @@ -1513,8 +1478,6 @@ namespace DiakonischesWerkWesel private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; - private DevExpress.XtraReports.UI.XRLabel xrLabel17; - private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel4; diff --git a/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.cs b/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.cs index e7c31e323..be0d68149 100644 --- a/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.cs +++ b/ReportImp/DiakonischesWerkWesel/QuittierungsbelegMitDatum.cs @@ -30,11 +30,6 @@ namespace DiakonischesWerkWesel if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) { ServicesOverviewRO.CreateSignatureString(sd); - if (sd.SignatureDate.HasValue && sd.SignatureDate.Value.Date == sd.StartDate.Date) - { - sd.SignatureDate = null; - } - sd.Notice5 = "E"; if (sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt"))