diff --git a/ReportImp/BetreuwoWesel/Invoicing/CustomInvoiceFactory.cs b/ReportImp/BetreuwoWesel/Invoicing/CustomInvoiceFactory.cs index 4d7669a0c..602ad0c89 100644 --- a/ReportImp/BetreuwoWesel/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/BetreuwoWesel/Invoicing/CustomInvoiceFactory.cs @@ -1,14 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using BeWo.Data.Access; -using BeWo.Data.Entities; using BeWo.Service.Invoicing; -using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; -using DevExpress.Utils; namespace BetreuWoWesel.Invoicing { @@ -32,38 +26,32 @@ namespace BetreuWoWesel.Invoicing } if (sr.CostBearer != null) { - if (sr.CostBearer.Name.Contains("Selbstzahler")) + var cbName = sr.CostBearer.Name; + if (cbName.Contains("Selbstzahler")) { return new SelbstzahlerInvoiceCreation(); } - if (sr.CostBearer.Name.Contains("LVR HD")) - { - return new HdInvoiceCreation(); - } - if (sr.CostBearer.Name.Contains("LWL HD")) + if (cbName.Contains("LVR HD") || cbName.Contains("LWL HD") || cbName.Contains("LWV Hessen HD")) { return new HdInvoiceCreation(); } } } - } foreach (var key in supportConcepts2ServiceRecords.Keys) - { - if (!String.IsNullOrEmpty(key.CostBearer) && key.CostBearer.Contains("LVR HD")) - { - return new HdInvoiceCreation(); - } - if (!String.IsNullOrEmpty(key.CostBearer) && key.CostBearer.Contains("LWL HD")) - { - return new HdInvoiceCreation(); - } + { + if (!String.IsNullOrEmpty(key.CostBearer)) + { + var cbName = key.CostBearer; + if (cbName.Contains("LVR HD") || cbName.Contains("LWL HD") || cbName.Contains("LWV Hessen HD")) + { + return new HdInvoiceCreation(); + } + } } return new DefaultInvoiceCreation(); - } - } } diff --git a/ReportImp/BetreuwoWesel/Properties/licenses.licx b/ReportImp/BetreuwoWesel/Properties/licenses.licx index e69de29bb..f98ef57fd 100644 --- a/ReportImp/BetreuwoWesel/Properties/licenses.licx +++ b/ReportImp/BetreuwoWesel/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a