From 985c6fb64b1d9f05539b68a5dbceb6fdc81ea7ae Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 13 Mar 2025 17:08:16 +0200 Subject: [PATCH 1/4] fix free busy service --- application/Espo/Modules/Crm/Tools/Calendar/Service.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/Espo/Modules/Crm/Tools/Calendar/Service.php b/application/Espo/Modules/Crm/Tools/Calendar/Service.php index b2ef0bb660..fe7ac47d6f 100644 --- a/application/Espo/Modules/Crm/Tools/Calendar/Service.php +++ b/application/Espo/Modules/Crm/Tools/Calendar/Service.php @@ -708,7 +708,7 @@ class Service private function fetchWorkingRangeListForTeams(array $teamIdList, FetchParams $fetchParams): array { $teamList = iterator_to_array( - $this->entityManager + $this->entityManager ->getRDBRepositoryByClass(Team::class) ->where([Attribute::ID => $teamIdList]) ->find() @@ -794,6 +794,13 @@ class Service ->withFrom($params->from) ->withTo($params->to); + if ($fetchParams->getScopeList() === null) { + $fetchParams = $fetchParams->withScopeList( + $this->config->get('busyRangesEntityList') ?? + [Meeting::ENTITY_TYPE, Call::ENTITY_TYPE] + ); + } + $eventList = $this->fetchInternal($user, $fetchParams->withSkipAcl(), !$params->accessCheck); $ignoreHash = (object) []; From 368c2fb866648e97150cabe3ff81ec8199cdd436 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 13 Mar 2025 17:08:24 +0200 Subject: [PATCH 2/4] 9.0.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cab16ee290..f9f425ff9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "espocrm", - "version": "9.0.4", + "version": "9.0.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "espocrm", - "version": "9.0.4", + "version": "9.0.5", "hasInstallScript": true, "license": "AGPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index b2dbd1fcea..e5cff27a8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "9.0.4", + "version": "9.0.5", "description": "Open-source CRM.", "repository": { "type": "git", From 92f67595917a59a5f43f79519afe651c1c0373e1 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 14 Mar 2025 12:42:08 +0200 Subject: [PATCH 3/4] fix task reminders handler --- client/modules/crm/src/handlers/task/reminders-handler.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/modules/crm/src/handlers/task/reminders-handler.js b/client/modules/crm/src/handlers/task/reminders-handler.js index cfff68e563..f711040707 100644 --- a/client/modules/crm/src/handlers/task/reminders-handler.js +++ b/client/modules/crm/src/handlers/task/reminders-handler.js @@ -53,7 +53,11 @@ class RemindersHandler { this.listenTo(this.model, 'change', () => { if ( !this.model.hasChanged('assignedUserId') && - !this.model.hasChanged('assignedUsersIds') + !this.model.hasChanged('assignedUsersIds') && + !this.model.hasChanged('assignedUsersIds') && + !this.model.hasChanged('dateEnd') && + !this.model.hasChanged('dateEndDate') && + !this.model.hasChanged('status') ) { return; } From 398743fe638648992bf4acd109c41434552ecbd4 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 14 Mar 2025 12:43:08 +0200 Subject: [PATCH 4/4] remove icon class --- client/src/views/admin/entity-manager/modals/select-icon.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/views/admin/entity-manager/modals/select-icon.js b/client/src/views/admin/entity-manager/modals/select-icon.js index caa5bb2506..fcad52889d 100644 --- a/client/src/views/admin/entity-manager/modals/select-icon.js +++ b/client/src/views/admin/entity-manager/modals/select-icon.js @@ -1421,7 +1421,6 @@ export default class extends ModalView { "fas fa-water", "fas fa-water-ladder", "fas fa-wave-square", - "fas fa-web-awesome", "fas fa-weight-hanging", "fas fa-weight-scale", "fas fa-wheat-awn",