ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LeWoAachen/Invoicing/AssistenzInvoiceCreation - aktiv geschaltet und auf Monatsebene umgestellt

Browse Source
This commit is contained in:
Alexandra
2024-07-24 16:22:59 +02:00
parent a198113008
commit 3034bb0f9d
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReportImp/LeWoAachen/Invoicing/AssistenzInvoiceCreation.cs
View File

@@ -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<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
{
return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
}
//public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
// Calculations calc)
//{
// return itemList;
//}
}
}
}

5
ReportImp/LeWoAachen/Invoicing/CustomInvoiceFactory.cs
View File

@@ -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;
}

2
ReportImp/LeWoAachen/Invoicing/SettlementInvoiceCreation.cs
View File

@@ -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;
}