From f735fafb01867e747c76ad353d2126df972bba6d Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 30 May 2025 13:49:20 +0200 Subject: [PATCH] SKFLeverkusenJuHi/ServiceInvoiceReport.cs - Finetuning nach Umstellung von Sammelrg --- .../SKFLeverkusenJuHi/ServiceInvoiceReport.Designer.cs | 4 +--- ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.cs | 10 +++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.Designer.cs b/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.Designer.cs index a85743ef7..7c76a629e 100644 --- a/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.Designer.cs @@ -824,9 +824,7 @@ namespace SKFLeverkusenJuHi this.xrLabel19.StylePriority.UseBackColor = false; this.xrLabel19.StylePriority.UseFont = false; this.xrLabel19.StylePriority.UseTextAlignment = false; - this.xrLabel19.Text = "[RecipientContactPerson] [CostBearer2SupportConcept.CostBearerContactPerson.First" + - "Name] [CostBearer2SupportConcept.CostBearerContactPerson.LastName][OrganisationC" + - "ostCenter]"; + this.xrLabel19.Text = "[RecipientContactPerson][OrganisationCostCenter]"; this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrLabel19.WordWrap = false; // diff --git a/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.cs b/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.cs index c154ac25a..c9398376d 100644 --- a/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.cs +++ b/ReportImp/SKFLeverkusenJuHi/ServiceInvoiceReport.cs @@ -83,13 +83,17 @@ namespace SKFLeverkusenJuHi string region = ""; foreach (var sip in pRO.ServiceInvoicePeriods) { - var cb2scListItem = sip.CostBearer2SupportConcept.SupportConcept.Customer.Customer2CostBearerList.Where(i => i.Oid == sip.CostBearer2SupportConcept.Oid).FirstOrDefault(); + var cb2scListItem = sip.CostBearer2SupportConcept.SupportConcept.Customer.Customer2CostBearerList.Where(i => i.Oid == sip.CostBearer2SupportConcept.Oid || i.CostBearer.Oid == sip.CostBearer2SupportConcept.CostBearer.Oid).FirstOrDefault(); if (cb2scListItem != null) { region = cb2scListItem.Notice; - pRO.OrganisationCostCenter = ", " + region; + if (!String.IsNullOrEmpty(region)) + pRO.OrganisationCostCenter = ", " + region; + } + if (String.IsNullOrEmpty(pRO.RecipientContactPerson) && sip.CostBearer2SupportConcept.CostBearerContactPerson != null) // falls bei Rechnungsstellung Fallführung noch nicht gesetzt war + { + pRO.RecipientContactPerson = sip.CostBearer2SupportConcept.CostBearerContactPerson.FirstNameLastName; } - } } }