From af550bf688dca7329e50482fdf81f04a05ba0cdc Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 8 May 2014 15:10:18 +0300 Subject: [PATCH] fix calendar --- application/Espo/Modules/Crm/Services/Activities.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php index 9924ffc5b3..8dfb47aaa6 100644 --- a/application/Espo/Modules/Crm/Services/Activities.php +++ b/application/Espo/Modules/Crm/Services/Activities.php @@ -361,7 +361,7 @@ class Activities extends \Espo\Core\Services\Base $sql = " SELECT 'Meeting' AS scope, meeting.id AS id, meeting.name AS name, meeting.date_start AS dateStart, meeting.date_end AS dateEnd, meeting.status AS status FROM `meeting` - JOIN meeting_user ON meeting_user.meeting_id = meeting.id + JOIN meeting_user ON meeting_user.meeting_id = meeting.id AND meeting_user.deleted = 0 WHERE meeting.deleted = 0 AND meeting.date_start >= ".$pdo->quote($from)." AND @@ -370,7 +370,7 @@ class Activities extends \Espo\Core\Services\Base UNION SELECT 'Call' AS scope, call.id AS id, call.name AS name, call.date_start AS dateStart, call.date_end AS dateEnd, call.status AS status FROM `call` - JOIN call_user ON call_user.call_id = call.id + JOIN call_user ON call_user.call_id = call.id AND call_user.deleted = 0 WHERE call.deleted = 0 AND call.date_start >= ".$pdo->quote($from)." AND