From db06272eee4ae8d9012c77b14c786df194995510 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 15 Jul 2025 15:24:12 +0200 Subject: [PATCH] =?UTF-8?q?DomizielAnsbach/ZVBerichtBezirk=20-=20Bugfixes?= =?UTF-8?q?=20f=C3=BCr=20Sonderf=C3=A4lle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs b/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs index b65298451..9e6884904 100644 --- a/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs +++ b/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs @@ -70,7 +70,7 @@ namespace DomizielAnsbach { if (at.Start.HasValue && at.End.HasValue && ((at.Start.Value >= monthStart && at.Start.Value <= monthEnd) || (at.End.Value >= monthStart && at.Start.Value <= monthStart)) - && (!at.Reason.Description.Contains("Feiertag") && !at.Reason.Description.Contains("Urlaub"))) + && (!at.Reason.Description.Contains("Feiertag") && !at.Reason.Description.Contains("Urlaub") && !at.Reason.Description.Contains("mit AU"))) { periodEnd = at.Start.Value.AddDays(-1); krankEnd = at.End.Value; @@ -81,7 +81,7 @@ namespace DomizielAnsbach var ro = new FinanceRO.SupportConceptFinanceRO(); ro.CustomerName = sc.CustomerName; - if (ro.CustomerName.Contains("Rohloff")) + if (ro.CustomerName.Contains("Wolfram")) { int tuao = 1; } @@ -115,6 +115,8 @@ namespace DomizielAnsbach { if (periodEnd == DateTime.MinValue) periodEnd = monthEnd; + if (sc.Costbearer2Supportconcept.EndDate.HasValue && sc.Costbearer2Supportconcept.EndDate > monthStart && periodEnd > sc.Costbearer2Supportconcept.EndDate) // falls direkt im ersten Monat wieder beendet wird + periodEnd = sc.Costbearer2Supportconcept.EndDate.Value; ro.Custom2 = String.Format("{0:dd.MM.yyyy}", periodEnd); } else @@ -160,6 +162,7 @@ namespace DomizielAnsbach { monthStart = new DateTime(monthStart.Year, monthStart.AddMonths(1).Month, 1); periodEnd = DateTime.MinValue; + m = 0; } } }