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

Fehlkontakt-Erkennung für Spitzabrechung funktioniert jetzt auch richtig, wenn KT keinen pauschalen Faktor hat

Browse Source
This commit is contained in:
Kojo
2024-06-03 20:24:22 +02:00
parent b44d9d2ac4
commit cbffa02600
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Service/Invoicing/SettlementInvoiceCreation.cs
View File

@@ -908,10 +908,10 @@ namespace BeWo.Service.Invoicing
maxApprovedFls -= unitCountBudget;
if (unitCountBudget < ii.UnitCount)
{
ii.UnitCount = unitCountBudget;
}
//if (unitCountBudget < ii.UnitCount)
//{
// ii.UnitCount = unitCountBudget;
//}
if (ii.AmountPerUnit.HasValue)
{
if (!String.IsNullOrEmpty(ii.ItemDescription) && ii.ItemDescription == "Fehlkontakte" && ii.ProzentAbrechenbar.HasValue)

3
Shared/Services/AccountingPeriod.cs
View File

@@ -55,7 +55,8 @@ namespace BS.Shared.Services
ap.PeriodEnd == this.PeriodEnd &&
ap.Amount == this.Amount &&
ap.RateFactor == this.RateFactor &&
ap.AccountingInterval == this.AccountingInterval)
ap.AccountingInterval == this.AccountingInterval &&
ap.Notice == this.Notice)
{
if (ap.ServiceCategory == null && this.ServiceCategory == null)
return true;

2
Shared/Services/Calculations.cs
View File

@@ -1787,7 +1787,7 @@ namespace BS.Shared.Services
}
CalculateApprovedAmounts(ap, scap);
if (sr.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (sr.ServiceDescription.ProzentAbrechnung.HasValue && sr.ServiceDescription.ProzentAbrechnung.Value < 100))
if (sr.ServiceDescription.Category.Name.ToLower().Contains("fehlkontakt") || sr.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (sr.ServiceDescription.ProzentAbrechnung.HasValue && sr.ServiceDescription.ProzentAbrechnung.Value < 100))
{
ap.Notice = "Fehlkontakte";
ap.RateFactor = 0;