Merge branch 'master' into Feature/InstitutionContract/print-api

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -1330,8 +1330,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                         .Any(y=>y.Services.ContractInPerson)??true,
-                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops
-                        .Any(y=>y.Price == 0)??true
+                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
+                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
+                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
                 };
             }).ToList()
         };