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

MH: Lebenswert neue Pauschale

Browse Source
This commit is contained in:
Marcel Hirschle
2024-06-04 12:12:56 +02:00
parent 54307c3217
commit 44e2139fb4
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReportImp/LebensWert/Invoicing/CustomInvoiceCreationHA.cs
View File

@@ -100,14 +100,17 @@ namespace LebensWert.Invoicing
private InvoiceItem CreateKontaktpauschalenItem(decimal? unitCount, DateTime? itemPeriodStart, DateTime? itemPeriodEnd)
{
return new InvoiceItem()
var pauschale = itemPeriodStart.Value.Year < 2023 ? PauschalenHelper.HANNOVER_AMOUNT_BEFORE_2023 : PauschalenHelper.HANNOVER_AMOUNT_SINCE_2023;
if (itemPeriodStart >= new DateTime(2024, 03, 01))
pauschale = PauschalenHelper.AMOUNT_FOR_ALL_SINCE_03_2024;
return new InvoiceItem()
{
UnitCount = unitCount,
ItemDescription = "Kontaktpauschale",
UnitDescription = "Pauschale pro direktem Kontakt",
AmountPerUnit = itemPeriodStart.Value.Year < 2023 ? PauschalenHelper.HANNOVER_AMOUNT_BEFORE_2023 : PauschalenHelper.HANNOVER_AMOUNT_SINCE_2023,
AmountTotal = itemPeriodStart.Value.Year < 2023 ? PauschalenHelper.HANNOVER_AMOUNT_BEFORE_2023 * unitCount : PauschalenHelper.HANNOVER_AMOUNT_SINCE_2023 * unitCount,
GrossAmountTotal = itemPeriodStart.Value.Year < 2023 ? PauschalenHelper.HANNOVER_AMOUNT_BEFORE_2023 * unitCount : PauschalenHelper.HANNOVER_AMOUNT_SINCE_2023 * unitCount,
AmountPerUnit = pauschale,
AmountTotal = pauschale * unitCount,
GrossAmountTotal = pauschale * unitCount,
ItemPeriodStart = itemPeriodStart,
ItemPeriodEnd = itemPeriodEnd
};

10
ReportImp/LebensWert/Invoicing/CustomInvoiceCreationHI.cs
View File

@@ -231,14 +231,18 @@ namespace LebensWert.Invoicing
}
private InvoiceItem CreateKontaktpauschalenItem(decimal? unitCount, DateTime? itemPeriodStart, DateTime? itemPeriodEnd)
{
var pauschale = PauschalenHelper.HILDESHEIM_AMOUNT_SINCE_2023;
if (itemPeriodStart >= new DateTime(2024, 03, 01))
pauschale = PauschalenHelper.AMOUNT_FOR_ALL_SINCE_03_2024;
var ii = new InvoiceItem()
{
UnitCount = unitCount,
ItemDescription = "Kontaktpauschale",
UnitDescription = "Pauschale pro direktem Kontakt",
AmountPerUnit = PauschalenHelper.HILDESHEIM_AMOUNT_SINCE_2023,
AmountTotal = PauschalenHelper.HILDESHEIM_AMOUNT_SINCE_2023 * unitCount,
GrossAmountTotal = PauschalenHelper.HILDESHEIM_AMOUNT_SINCE_2023 * unitCount,
AmountPerUnit = pauschale,
AmountTotal = pauschale * unitCount,
GrossAmountTotal = pauschale * unitCount,
ItemPeriodStart = itemPeriodStart,
ItemPeriodEnd = itemPeriodEnd
};

10
ReportImp/LebensWert/Invoicing/CustomInvoiceCreationNI.cs
View File

@@ -125,14 +125,18 @@ namespace LebensWert.Invoicing
private InvoiceItem CreateKontaktpauschalenItem(decimal? unitCount, DateTime? itemPeriodStart, DateTime? itemPeriodEnd)
{
var pauschale = PauschalenHelper.NIENBURG_AMOUNT_SINCE_2023;
if (itemPeriodStart >= new DateTime(2024, 03, 01))
pauschale = PauschalenHelper.AMOUNT_FOR_ALL_SINCE_03_2024;
var ii = new InvoiceItem()
{
UnitCount = unitCount,
ItemDescription = "Kontaktpauschale",
UnitDescription = "Pauschale pro direktem Kontakt",
AmountPerUnit = PauschalenHelper.NIENBURG_AMOUNT_SINCE_2023,
AmountTotal = PauschalenHelper.NIENBURG_AMOUNT_SINCE_2023 * unitCount,
GrossAmountTotal = PauschalenHelper.NIENBURG_AMOUNT_SINCE_2023 * unitCount,
AmountPerUnit = pauschale,
AmountTotal = pauschale * unitCount,
GrossAmountTotal = pauschale * unitCount,
ItemPeriodStart = itemPeriodStart,
ItemPeriodEnd = itemPeriodEnd
};

2
ReportImp/LebensWert/Invoicing/CustomSettlementInvoiceCreation.cs
View File

@@ -118,6 +118,8 @@ namespace LebensWert.Invoicing
if (unitCount > 0)
{
decimal pauschale = 0;
if (accountingPeriod.PeriodStart >= new DateTime(2024, 03, 01))
pauschale = PauschalenHelper.AMOUNT_FOR_ALL_SINCE_03_2024;
if (recipientOrganisation.ToLower().Contains("hannover"))
pauschale = PauschalenHelper.HANNOVER_AMOUNT_SINCE_2023;
else if (recipientOrganisation.ToLower().Contains("hildesheim"))

2
ReportImp/LebensWert/Invoicing/PauschalenHelper.cs
View File

@@ -14,5 +14,7 @@ namespace LebensWert.Invoicing
public const decimal NIENBURG_AMOUNT_SINCE_2023 = 15.56m;
public const decimal HILDESHEIM_AMOUNT_SINCE_2023 = 16.14m;
public const decimal AMOUNT_FOR_ALL_SINCE_03_2024 = 17.11m;
}
}