diff --git a/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs b/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs index e034813da..bad96e0af 100644 --- a/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs +++ b/ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs @@ -32,7 +32,7 @@ namespace LeWoAachen.Invoicing public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) { - return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, false, true); + return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true); } //public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, diff --git a/ReportImp/LeWoAachen/Invoicing/CustomInvoiceCreation.cs b/ReportImp/LeWoAachen/Invoicing/CustomInvoiceCreation.cs new file mode 100644 index 000000000..dce09fcd5 --- /dev/null +++ b/ReportImp/LeWoAachen/Invoicing/CustomInvoiceCreation.cs @@ -0,0 +1,23 @@ +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.Services; + +namespace LeWoAachen.Invoicing +{ + + public class CustomInvoiceCreation : InvoiceCreation + { + 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); + } + } +} diff --git a/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs b/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs index f33cec1b1..8e944d71d 100644 --- a/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs @@ -22,8 +22,8 @@ namespace LeWoAachen.Invoicing } } - return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords); - } + return new CustomInvoiceCreation(); + } private InvoiceCreation GetInvoiceCreatorForCategory(ServiceDescriptionDC sd) { @@ -35,7 +35,7 @@ namespace LeWoAachen.Invoicing return new CustomAssistenzInvoiceCreation(); } } - return null; + return new CustomInvoiceCreation(); } } } diff --git a/ReportImp/LeWoAachen/LeWoAachen.csproj b/ReportImp/LeWoAachen/LeWoAachen.csproj index 0a17d821b..4c1730bdc 100644 --- a/ReportImp/LeWoAachen/LeWoAachen.csproj +++ b/ReportImp/LeWoAachen/LeWoAachen.csproj @@ -73,6 +73,7 @@ InvoiceCustomerReport.cs +