From cfbf50241d5edae6076655d433649d71d9ffb15a Mon Sep 17 00:00:00 2001
From: yashodha <yashodha.chaku@webaccess.co.in>
Date: Wed, 22 Jan 2014 12:29:08 +0530
Subject: [PATCH] HR-252 : limit activity types to NULL grouping

---
 CRM/Core/PseudoConstant.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 1a2630d3be..321a6e8552 100644
--- 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);
     }
-- 
2.25.1