From 4f99a66fae40fffa3097746e49948504b56454b0 Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 27 Sep 2024 09:23:49 +0200 Subject: [PATCH] ZukunftLeben: Fehlkontakt-Leistungen in Sammelrechnung kenntlich machen --- .../ZukunftLeben/ServiceInvoiceReport.Designer.cs | 2 ++ ReportImp/ZukunftLeben/ServiceInvoiceReport.cs | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs b/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs index 50e78aa44..bc0e3f010 100644 --- a/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/ZukunftLeben/ServiceInvoiceReport.Designer.cs @@ -514,6 +514,8 @@ namespace ZukunftLeben this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); this.xrTableCell42.Name = "xrTableCell42"; this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell42.StylePriority.UseBorderColor = false; diff --git a/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs b/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs index a5b38d768..6cf34fd7c 100644 --- a/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs +++ b/ReportImp/ZukunftLeben/ServiceInvoiceReport.cs @@ -27,6 +27,17 @@ namespace ZukunftLeben lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); } + foreach (var sip in pRO.ServiceInvoicePeriods) + { + foreach (var item in sip.ServiceInvoiceItems) + { + if (item.ServiceDescription != "Fehlkontakt") + { + item.ServiceDescription = "Fachleistungsstunde"; + } + } + } + SetzeAdresse(pRO); this.bindingSource1.DataSource = pRO;