diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 309fe81dc..bb405cb8b 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -39,16 +39,16 @@
false
true
false
- https://app.ownsoft.de/test/
+ https://app.ownsoft.de/
de-DE
BeWoPlaner
ownSoft GmbH
- 2.0.1.238
+ 2.0.1.240
true
publish.htm
false
true
- 239
+ 241
2.0.1.%2a
false
true
@@ -2671,392 +2671,392 @@
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user
index 5b9016668..3eff8c8d2 100644
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -2,7 +2,7 @@
D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\
- https://app.ownsoft.de/test/|https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/
+ https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/
https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index d05d5b4f3..c4e0dbbd9 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -50,7 +50,7 @@ namespace BeWo
public static MainControl MainControl;
public static string ShortVersion = "3.20";
- public static string Version = "Version 3.20 (GKV Test)";
+ public static string Version = "Version 3.20.2";
public static int RenderTier = 0;
diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs
index c2a9751be..39df78623 100644
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
@@ -690,7 +690,7 @@ namespace BeWo
if (!isNet45OrNewer)
{
- if (!CheckStatusMessage(String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.Version)))
+ if (!CheckStatusMessage(String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion)))
{
return;
}
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index 1cc1b0f70..3b9606ac2 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -83,7 +83,7 @@ namespace BeWo
#if DEBUG
ButtonScheduling.Visibility = Visibility.Visible;
#else
- ButtonScheduling.Visibility = Visibility.Hidden;
+ ButtonScheduling.Visibility = Visibility.Collapsed;
#endif
diff --git a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
index c74557868..df4f6616d 100644
--- a/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -110,11 +110,23 @@ namespace SHKServiceSBD
}
foreach (var e2c in empDetail.Employee.Employee2CustomerList)
{
- if ((!e2c.StartDate.HasValue || e2c.StartDate.Value < berichtsEnde) && (!e2c.EndDate.HasValue || e2c.EndDate.Value >= berichtsAnfang))
+ var start = ersterVertragsStart;
+ var ende = letzerVertragsEnde;
+
+ if (e2c.StartDate.HasValue && e2c.StartDate > start)
+ {
+ start = e2c.StartDate.Value;
+ }
+ if (e2c.EndDate.HasValue && e2c.EndDate < ende)
+ {
+ ende = e2c.EndDate.Value;
+ }
+
+ if (start <= ende)
{
var kind = e2c.Customer;
- BerechneSollZeitenDictionary(kind.Arbeitszeiten, empDetail, ersterVertragsStart, letzerVertragsEnde);
+ BerechneSollZeitenDictionary(kind.Arbeitszeiten, empDetail, start, ende);
}
}
@@ -167,6 +179,10 @@ namespace SHKServiceSBD
DateTime dt = start;
while (dt <= ende)
{
+ if (dt == new DateTime(2024, 2, 19))
+ {
+ int test = 0;
+ }
String key = String.Format("{0}_{1:yyyyMMdd}", empDetail.Employee.Oid, dt);
if (!_SollStundenProTagDict.ContainsKey(key))
{
@@ -550,6 +566,11 @@ namespace SHKServiceSBD
return base.GetFeiertagsFaktor(start);
}
+ protected override bool StundenDurchAbwesenheitenDuerfenNegativSein()
+ {
+ return true;
+ }
+
public FerienDC GetFerienTag(DateTime start)
{
return vacationService.GetFerien(start, vacationService.Bundesland);