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

2023-12-04 12:15:24 +01:00
parent 71ceacb951 9cbfac1290
commit ea89e06703
80 changed files with 26984 additions and 1532 deletions
--- a/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs
+++ b/ReportImp/DomizielAnsbach/Service/CustomOperationService.cs
@@ -109,7 +109,7 @@ namespace DomizielAnsbach.Service
        {
            foreach (var ap in c2s.ApprovalPeriodList)
            {
-                if (ap.ServiceCategory.Name == "Zuverdienst - Arbeitszeit")
+                if (ap.ServiceCategory != null && ap.ServiceCategory.Name == "Zuverdienst - Arbeitszeit")
                {
                    var desc = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(ap.ServiceCategory.Oid.Value);