HR-252 : limit activity types to NULL grouping

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 1a2630d3beebe313b587a8a3e9104c4d1ed4684f..321a6e85522fb73bea7e481c6b58906b71fa1116 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -626,6 +626,7 @@ class CRM_Core_PseudoConstant {
         $componentClause = " v.component_id IS NOT NULL";
       }
 
+      $groupingClause = " v.grouping IS NULL";
       $componentIds = array();
       $compInfo = CRM_Core_Component::getEnabledComponents();
 
@@ -654,7 +655,7 @@ class CRM_Core_PseudoConstant {
           $componentClause = " ( v.component_id IN ($componentIds ) )";
         }
       }
-      $condition = $condition . ' AND ' . $componentClause;
+      $condition = $condition . ' AND ' . $componentClause . ' AND ' . $groupingClause;
 
       self::$activityType[$index] = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, $condition, $returnColumn);
     }