espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix calendar

Browse Source
This commit is contained in:
Yuri Kuznetsov
2014-05-08 15:10:18 +03:00
parent b2aed61a91
commit af550bf688
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Services/Activities.php
+2 -2
View File
@@ -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