Fixes #324: Generalized moduleid lookup

modules/Settings/Picklist/models/Module.php

@@ -301,10 +301,11 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
 
 	public static function getPicklistSupportedModules() {
 		$db = PearDatabase::getInstance();
+		$unsupportedModuleIds = array(getTabId('Users'), getTabId('Emails'));
 		$query = "SELECT distinct vtiger_tab.tablabel, vtiger_tab.name as tabname
 				  FROM vtiger_tab
 						inner join vtiger_field on vtiger_tab.tabid=vtiger_field.tabid
-				  WHERE uitype IN (15,33,16,114) and vtiger_field.tabid NOT IN (29,10)  and vtiger_tab.presence != 1 and vtiger_field.presence in (0,2)
+				  WHERE uitype IN (15,33,16,114) and vtiger_field.tabid NOT IN (". implode(',', $unsupportedModuleIds) .")  and vtiger_tab.presence != 1 and vtiger_field.presence in (0,2)
 				  ORDER BY vtiger_tab.tabid ASC";
 		$result = $db->pquery($query, array());
 
@@ -559,4 +560,4 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
 		return true;
 	}
 
-}
\ No newline at end of file
+}