InputFamilienhilfe/Invoicing/SgaInvoiceCreation mit Pauschalen
This commit is contained in:
@@ -55,15 +55,10 @@ namespace InputFamilienhilfe.Invoicing
|
||||
if (sr.ServiceDescription.Category.Name.Contains("(SGA)"))
|
||||
{
|
||||
return new SgaInvoiceCreation();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return new DefaultInvoiceCreation();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,8 +35,13 @@ namespace InputFamilienhilfe.Invoicing
|
||||
Calculations calc = PluginLoader.FindClass<Calculations>(_SpecificID) ??
|
||||
Calculations.GetInstance(_SpecificID);
|
||||
|
||||
|
||||
List<ServiceRecordDC> serviceRecordsInPeriod = serviceRecords.Where(
|
||||
if (ShouldCreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc))
|
||||
{
|
||||
CreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc);
|
||||
}
|
||||
else
|
||||
{
|
||||
List<ServiceRecordDC> serviceRecordsInPeriod = serviceRecords.Where(
|
||||
i =>
|
||||
{
|
||||
bool valid = i.Start.Value.InBetween(serviceInvoicePeriod.Start.Value,
|
||||
@@ -49,10 +54,19 @@ namespace InputFamilienhilfe.Invoicing
|
||||
return valid;
|
||||
}).ToList();
|
||||
|
||||
var itemList = CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod,
|
||||
serviceInvoicePeriod.SupportConceptApprovalPeriod, calc);
|
||||
serviceInvoicePeriod.InvoiceItemList.AddRange(itemList);
|
||||
var itemList = CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod,
|
||||
serviceInvoicePeriod.SupportConceptApprovalPeriod, calc);
|
||||
serviceInvoicePeriod.InvoiceItemList.AddRange(itemList);
|
||||
}
|
||||
}
|
||||
|
||||
public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc)
|
||||
{
|
||||
base.CreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc);
|
||||
foreach (var ii in serviceInvoicePeriod.InvoiceItemList)
|
||||
{
|
||||
ii.ItemDescription = "SGA-Pauschale";
|
||||
}
|
||||
}
|
||||
|
||||
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
|
||||
|
||||
Reference in New Issue
Block a user