diff --git a/modules/Vtiger/models/RelationListView.php b/modules/Vtiger/models/RelationListView.php index 1e329b299c35f4a0862fdc900c3feca4d2c44bed..74e829bec76437437709147fcc5797b477078712 100644 --- a/modules/Vtiger/models/RelationListView.php +++ b/modules/Vtiger/models/RelationListView.php @@ -250,6 +250,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { public function getEntries($pagingModel) { $db = PearDatabase::getInstance(); $parentModule = $this->getParentRecordModel()->getModule(); + $parentModuleName = $parentModule->get('name'); $relationModule = $this->getRelationModel()->getRelationModuleModel(); $relationModuleName = $relationModule->get('name'); $relatedColumnFields = $relationModule->getConfigureRelatedListFields(); @@ -288,7 +289,12 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { } } $whereQuerySplit = split("WHERE", $queryGenerator->getWhereClause()); - $query.=" AND " . $whereQuerySplit[1]; + if($parentModuleName == 'Accounts' && $relationModuleName == 'Calendar' && (stripos($query, "GROUP BY") !== false)) { + $splitQuery = split('GROUP BY', $query); + $query = $splitQuery[0]." AND ".$whereQuerySplit[1].' GROUP BY '.$splitQuery[1]; + } else { + $query.=" AND " . $whereQuerySplit[1]; + } } $startIndex = $pagingModel->getStartIndex();