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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
HirschleM
2025-01-23 13:45:26 +01:00
parent 71cad84e03 d43e05f682
commit e7cccc58ff
3 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReportImp/AachenerLaienhelfer/AachenerLaienhelfer.csproj
View File

@@ -55,7 +55,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="RechnungEigenanteil.cs">
<SubType>Component</SubType>

18
ReportImp/AachenerLaienhelfer/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -1,18 +0,0 @@
using System;
using BeWo.Report.ReportObjects;
namespace AachenerLaienhelfer
{
public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
{
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (start.Month == 12 && (start.Day == 24 || start.Day == 31))
{
return 0.5m;
}
return base.GetFeiertagsFaktor(start);
}
}
}

5
Service/Plugins/CustomerService.cs
View File

@@ -210,7 +210,10 @@ namespace BeWo.Service.Plugins
foreach (ValueListEntry2Object vle2o in e2c.ValueList)
{
ValueListEntry vle = vle2o.Entry;
if (vle.SystemEntryID != null && vle.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant && e2c.EmployeeOid != currentEmployeeOid.Value)
if (vle.SystemEntryID != null && vle.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant
&& e2c.EmployeeOid != currentEmployeeOid.Value
&& (!e2c.EndDate.HasValue || e2c.EndDate.Value >= DateTime.Now.Date)
&& (!e2c.StartDate.HasValue || e2c.StartDate <= DateTime.Now.Date))
{
string empName = e2c.Employee.Person.FirstName + " " + e2c.Employee.Person.LastName;
if (String.IsNullOrEmpty(dc.MainAttendant))