diff --git a/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs b/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs index ec496ccc5..bad96e0af 100644 --- a/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs +++ b/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs @@ -22,17 +22,23 @@ namespace LeWoAachen.Invoicing public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) { - if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Assistenz")) + if (!iServiceRecord.ServiceDescription.Name.Contains("Assistenz")) { return null; } return base.CreateInvoiceItem(iServiceRecord, scap, calc); } - //public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, + Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) + { + return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true); + } + + //public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, // Calculations calc) //{ // return itemList; //} - } + } } diff --git a/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs b/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs index b1c5caf38..f33cec1b1 100644 --- a/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs @@ -15,7 +15,7 @@ namespace LeWoAachen.Invoicing foreach (var sr in list) { - var sd = sr.ServiceDescription.Category; + var sd = sr.ServiceDescription; var ic = GetInvoiceCreatorForCategory(sd); if (ic != null) return ic; @@ -25,7 +25,7 @@ namespace LeWoAachen.Invoicing return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords); } - private InvoiceCreation GetInvoiceCreatorForCategory(ServiceCategoryDC sd) + private InvoiceCreation GetInvoiceCreatorForCategory(ServiceDescriptionDC sd) { if (sd != null && !String.IsNullOrEmpty(sd.Name)) { @@ -34,7 +34,6 @@ namespace LeWoAachen.Invoicing { return new CustomAssistenzInvoiceCreation(); } - } return null; } diff --git a/ReportImp/LeWoAachen/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/LeWoAachen/Invoicing/SettlementInvoiceCreation.cs index 8d55d5bdf..9cdf574c5 100644 --- a/ReportImp/LeWoAachen/Invoicing/SettlementInvoiceCreation.cs +++ b/ReportImp/LeWoAachen/Invoicing/SettlementInvoiceCreation.cs @@ -52,7 +52,7 @@ namespace LeWoAachen.Invoicing public override bool IsServiceRecordBillable(ServiceRecord iRecord) { - if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("Assistenz")) + if (iRecord.ServiceDescription.Name.Contains("Assistenz")) { return false; }