From e5228a08ae3379de53e51bd74b5ffb0b7a3558ae Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 25 Sep 2024 09:41:27 +0200 Subject: [PATCH] AWOMuensterlandRecklinghausen/SbdRechnung2024.cs - Anpassung Text bei Differenzrechnung --- .../SbdRechnung2024.cs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs b/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs index e28bde9cd..bb995a588 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs +++ b/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs @@ -27,12 +27,10 @@ namespace AWOMuensterlandRecklinghausen public void SetReportDataSource(ServiceInvoiceRO pRO) { - //CreateAbrechnungsItems(pRO); SetzeEmpfaengerAdresse(pRO); SetzeBetraege(pRO); this.bindingSource1.DataSource = pRO; - } private void SetzeBetraege(ServiceInvoiceRO pRO) @@ -87,17 +85,10 @@ namespace AWOMuensterlandRecklinghausen { if (!String.IsNullOrEmpty(ii.ServiceDescription) && ii.ServiceDescription.StartsWith("Rechnungsdifferenz") && pRO.InvoiceBase.SupportConceptOid.HasValue) - { - var sc = DAOFactory.GenericDAO.GetByID(pRO.InvoiceBase.SupportConceptOid.Value); - if (sc != null) + { + if (!pRO.Notice.IsNullOrEmpty()) { - var cb2sc = sc.CostBearer2SupportConceptList.Where(s => s.SupportConcept.Oid == pRO.InvoiceBase.SupportConceptOid.Value).FirstOrDefault(); - var scap = cb2sc.ApprovalPeriodList.Where(ap => ap.ServiceCategory != null && ap.ServiceCategory.Name.Contains("Interne") && - ap.StartDate < pRO.AccountingPeriodEnd && ap.EndDate > pRO.AccountingPeriodStart).FirstOrDefault(); - if (!scap.Notice.IsNullOrEmpty()) - { - lblEndtext.Text = scap.Notice + "\n \n" + lblEndtext.Text; - } + lblEndtext.Text = pRO.Notice + "\n \n" + lblEndtext.Text; } } }