diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f1f8d99065..5078323737 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,41 @@
+2010-07-15  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions_html.php: added the function "print_select_groups" to
+	print the field select box for groups with tree style.
+	
+	* include/functions_db.php: in function "get_user_groups" added test to
+	false value in parameter $privilege for get all groups without ACL test.
+	Fixed in function "get_user_groups_tree" the call to "get_user_groups" with
+	the correct parameters.
+	
+	* operation/incidents/incident.php, operation/incidents/incident_detail.php,
+	operation/events/events.php, operation/agentes/status_monitor.php,
+	operation/agentes/estado_agente.php,
+	operation/agentes/alerts_status.functions.php,
+	operation/agentes/exportdata.php, operation/agentes/networkmap.php,
+	operation/messages/message.php, general/ui/agents_list.php,
+	godmode/groups/configure_group.php, godmode/groups/group_list.php,
+	godmode/agentes/massive_add_alerts.php, 
+	godmode/agentes/massive_delete_agents.php, 
+	godmode/agentes/massive_config.php, 
+	godmode/agentes/massive_delete_action_alerts.php, 
+	godmode/agentes/massive_delete_alerts.php, 
+	godmode/agentes/modificar_agente.php, 
+	godmode/agentes/massive_delete_modules.php, 
+	godmode/agentes/massive_add_action_alerts.php, 
+	godmode/agentes/planned_downtime.php, 
+	godmode/agentes/manage_config_remote.php, godmode/agentes/agent_manager.php,
+	godmode/servers/manage_recontask_form.php, 
+	godmode/alerts/configure_alert_compound.php, 
+	godmode/alerts/alert_compounds.php, 
+	godmode/alerts/configure_alert_template.php, 
+	godmode/alerts/configure_alert_action.php, godmode/setup/gis_step_2.php, 
+	godmode/users/configure_user.php, godmode/gis_maps/configure_gis_map.php, 
+	godmode/reporting/graph_builder.main.php, 
+	godmode/reporting/reporting_builder.main.php, 
+	godmode/reporting/visual_console_builder.data.php: changed the fields select
+	box of group to tree style select box for groups.
+
 2010-07-15  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions.php: added function "array_key_to_offset" to resolve
diff --git a/pandora_console/general/ui/agents_list.php b/pandora_console/general/ui/agents_list.php
index 58bea38625..fd52478922 100644
--- a/pandora_console/general/ui/agents_list.php
+++ b/pandora_console/general/ui/agents_list.php
@@ -66,7 +66,7 @@ if ($show_filter_form) {
 			$data = array ();
 		$data = array ();
 		$data[] = __('Group');
-		$data[] = print_select (get_user_groups (false, $access),
+		$data[] = print_select_groups(false, $access, true,
 			'id_group', '', '', '', '', true);
 		if (! $odd)
 			array_push ($table->data, $data);
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index a69c8abdc1..ff562e3b9b 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -137,8 +137,7 @@ $table->data[2][1] = print_input_text_extended ('id_parent', get_agent_name ($id
 $table->data[2][1] .= print_checkbox ("cascade_protection", 1, $cascade_protection, true).__('Cascade protection'). "&nbsp;" . print_help_icon("cascade_protection", true);
 
 $table->data[3][0] = __('Group');
-$groups = get_user_groups (false, "AR", false);
-$table->data[3][1] = print_select ($groups, 'grupo', $grupo, '', '', 0, true);
+$table->data[3][1] = print_select_groups(false, "AR", false, 'grupo', $grupo, '', '', 0, true);
 
 $table->data[4][0] = __('Interval');
 
diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php
index 345baa0fc7..5c9d62bcd1 100644
--- a/pandora_console/godmode/agentes/manage_config_remote.php
+++ b/pandora_console/godmode/agentes/manage_config_remote.php
@@ -104,7 +104,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
 		$group_select = get_user_groups ($config['id_user']);
 		$grouplist = implode (',', array_keys ($group_select));
 		
-		echo print_select ($group_select, 'id_group', $id_group, '', '', '', true);
+		echo print_select_groups($config['id_user'], "AR", true, 'id_group', $id_group, '', '', '', true);
 		echo '&nbsp;&nbsp;';
 		echo '<input type=submit name="update_group" class="sub upd"  value="'.__('Filter').'">';
 		echo '<br><br>';
diff --git a/pandora_console/godmode/agentes/massive_add_action_alerts.php b/pandora_console/godmode/agentes/massive_add_action_alerts.php
index 1755fdec5b..389d351ecf 100644
--- a/pandora_console/godmode/agentes/massive_add_action_alerts.php
+++ b/pandora_console/godmode/agentes/massive_add_action_alerts.php
@@ -92,7 +92,7 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'id_group', $id_group,
+$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
diff --git a/pandora_console/godmode/agentes/massive_add_alerts.php b/pandora_console/godmode/agentes/massive_add_alerts.php
index c13fa3aa07..60895e4122 100644
--- a/pandora_console/godmode/agentes/massive_add_alerts.php
+++ b/pandora_console/godmode/agentes/massive_add_alerts.php
@@ -101,7 +101,7 @@ $table->size[1] = '85%';
 $table->data = array ();
 	
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'id_group', $id_group,
+$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
 	'', 'Select', -1, true, false, true, '', false);
 
 $table->data[1][0] = __('Agent');
diff --git a/pandora_console/godmode/agentes/massive_config.php b/pandora_console/godmode/agentes/massive_config.php
index 93edd4ae16..c18755d4ba 100644
--- a/pandora_console/godmode/agentes/massive_config.php
+++ b/pandora_console/godmode/agentes/massive_config.php
@@ -58,7 +58,7 @@ $table->size[3] = '35%';
 /* Source selection */
 $table->id = 'source_table';
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'source_id_group', $source_id_group,
+$table->data[0][1] = print_select_groups(false, "AR", true, 'source_id_group', $source_id_group,
 	false, '', '', true);
 $table->data[0][2] = __('Agent');
 $table->data[0][2] .= ' <span id="source_agent_loading" class="invisible">';
diff --git a/pandora_console/godmode/agentes/massive_delete_action_alerts.php b/pandora_console/godmode/agentes/massive_delete_action_alerts.php
index 06580c52de..129c4bac96 100644
--- a/pandora_console/godmode/agentes/massive_delete_action_alerts.php
+++ b/pandora_console/godmode/agentes/massive_delete_action_alerts.php
@@ -92,7 +92,7 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'id_group', $id_group,
+$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
diff --git a/pandora_console/godmode/agentes/massive_delete_agents.php b/pandora_console/godmode/agentes/massive_delete_agents.php
index e1021c83ed..8bac48b5fd 100644
--- a/pandora_console/godmode/agentes/massive_delete_agents.php
+++ b/pandora_console/godmode/agentes/massive_delete_agents.php
@@ -82,7 +82,7 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'id_group', $id_group,
+$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
diff --git a/pandora_console/godmode/agentes/massive_delete_alerts.php b/pandora_console/godmode/agentes/massive_delete_alerts.php
index 53516bb87d..10c4131fed 100644
--- a/pandora_console/godmode/agentes/massive_delete_alerts.php
+++ b/pandora_console/godmode/agentes/massive_delete_alerts.php
@@ -100,7 +100,7 @@ $table->data[0][1] = print_select (index_array ($templates, 'id', 'name'),
 	'id_alert_template', $id_alert_template, false, __('Select'), 0, true);
 	
 $table->data[1][0] = __('Group');
-$table->data[1][1] = print_select ($groups, 'id_group', $id_group,
+$table->data[1][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
 	'', '', '', true, false, true, '', $id_alert_template == 0);
 
 $table->data[2][0] = __('Agent');
diff --git a/pandora_console/godmode/agentes/massive_delete_modules.php b/pandora_console/godmode/agentes/massive_delete_modules.php
index e3bff6f51e..132da98ba4 100644
--- a/pandora_console/godmode/agentes/massive_delete_modules.php
+++ b/pandora_console/godmode/agentes/massive_delete_modules.php
@@ -103,7 +103,7 @@ $table->data[0][1] = print_select (index_array ($modules, 'nombre', 'nombre'),
 	'module_name', $module_name, false, __('Select'), '', true);
 
 $table->data[1][0] = __('Group');
-$table->data[1][1] = print_select ($groups, 'id_group', $id_group,
+$table->data[1][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true, false, true, '', empty ($module_name));
 
 $table->data[2][0] = __('Agent');
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index fd4a109959..0f2399dee4 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -68,7 +68,7 @@ echo "<table cellpadding='4' cellspacing='4' class='databox' width='770'><tr>";
 echo "<td valign='top'>".__('Group')."</td>";
 echo "<td valign='top'>";
 
-print_select (get_user_groups(), "ag_group", $ag_group, 'this.form.submit();', '', 0);
+print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();', '', 0);
 
 echo "<td valign='top'>
 <noscript>
diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php
index 5e6c16e9a5..86652a8e46 100644
--- a/pandora_console/godmode/agentes/planned_downtime.php
+++ b/pandora_console/godmode/agentes/planned_downtime.php
@@ -158,7 +158,7 @@ if ($create_downtime || $update_downtime) {
 		$table->data[4][1] .= print_input_text ('time_to', $time_to, '', 7, 7, true);
 
 		$table->data[5][0] = __('Group');
-		$table->data[5][1] = print_select ($groups, 'id_group', $id_group, '', '', 0, true);
+		$table->data[5][1] = print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true);
 		echo '<form method="POST" action="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime">';
 
 		if ($id_downtime > 0){
@@ -206,7 +206,7 @@ if ($create_downtime || $update_downtime) {
 	
 		echo "<form method=post action='index.php?sec=gagente&sec2=godmode/agentes/planned_downtime&first_update=1&id_downtime=$id_downtime'>";
 
-		print_select ($groups, 'filter_group', $filter_group);	
+		print_select_groups(false, "AR", true, 'filter_group', $filter_group);	
 		echo "<br /><br />";
 		print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false);
 		echo "</form>";
diff --git a/pandora_console/godmode/alerts/alert_compounds.php b/pandora_console/godmode/alerts/alert_compounds.php
index d788d9ee5c..a503b0aa18 100644
--- a/pandora_console/godmode/alerts/alert_compounds.php
+++ b/pandora_console/godmode/alerts/alert_compounds.php
@@ -94,7 +94,7 @@ $table->size[2] = '15%';
 $table->size[3] = '35%';
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'id_group', $id_group, false, '',
+$table->data[0][1] = print_select_groups(0, "LM", true, 'id_group', $id_group, false, '',
 	'', true);
 $table->data[0][2] = __('Agent');
 $table->data[0][2] .= ' <span id="agent_loading" class="invisible">';
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 8d58b43353..9fa7046a75 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -60,7 +60,7 @@ $table->data[0][1] = print_input_text ('name', $name, '', 35, 255, true);
 $table->data[1][0] = __('Group');
 
 $groups = get_user_groups ();
-$table->data[1][1] = print_select ($groups, 'group', $group, '', '', 0, true);
+$table->data[1][1] = print_select_groups(false, "AR", true, 'group', $group, '', '', 0, true);
 
 $table->data[2][0] = __('Command');
 $table->data[2][1] = print_select_from_sql ('SELECT id, name FROM talert_commands',
diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php
index 30c7c810f4..b8d60de1cf 100644
--- a/pandora_console/godmode/alerts/configure_alert_compound.php
+++ b/pandora_console/godmode/alerts/configure_alert_compound.php
@@ -536,7 +536,7 @@ if ($step == 1) {
 	$table->size[3] = '40%';
 	
 	$table->data[0][0] = __('Group');
-	$table->data[0][1] = print_select ($groups, 'search_id_group', $id_group,
+	$table->data[0][1] = print_select_groups(false, "AR", true, 'search_id_group', $id_group,
 		false, '', '', true);
 	$table->data[0][2] = __('Agent');
 	$table->data[0][3] = print_select (get_group_agents ($id_group, false, "none"),
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index af95650fe4..fc988609dd 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -443,7 +443,7 @@ if ($step == 2) {
 
 	$table->data[0][1] .= "&nbsp;&nbsp;". __("Group");
 	$groups = get_user_groups ();
-	$table->data[0][1] .= "&nbsp;".print_select ($groups, 'id_group', $id_group, '', '', 0, true);
+	$table->data[0][1] .= "&nbsp;".print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true);
 
 	$table->data[1][0] = __('Description');
 	$table->data[1][1] =  print_textarea ('description', 10, 30,
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index a2a1b86547..5bfff6963c 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -335,7 +335,7 @@ $table->data[1][1] = "<table class='databox' border='0' id='map_connection'>
 </table>";
 
 $table->data[2][0] = __('Group') . print_help_tip (__('Group that owns the map'), true). ':';
-$table->data[2][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'map_group_id', $map_group_id, '', __('All'), '0', true);
+$table->data[2][1] = print_select_groups(false, false, false, 'map_group_id', $map_group_id, '', __('All'), '0', true);
 
 $table->data[3][0] = __('Default zoom') . print_help_tip (__('Default zoom level when opening the map'), true). ':';
 $table->data[3][1] = print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true) . print_input_hidden('map_levels_zoom', $map_levels_zoom, true);
@@ -383,7 +383,7 @@ $table->data[1][1] = '<div id="form_layer">
 			</tr>
 			<tr>
 				<td>' . __('Show agents from group') . ':</td>
-				<td colspan="3">' . print_select_from_sql('SELECT 0 as id_grupo, "'.__('All').'" as nombre FROM tgrupo UNION SELECT id_grupo, nombre FROM tgrupo', 'layer_group_form', '-1', '', __('None'), '-1', true) . '</td>
+				<td colspan="3">' . print_select_groups(false, false, true, 'layer_group_form', '-1', '', __('None'), '-1', true) . '</td>
 			</tr>
 			<tr>
 				<td colspan="4"><hr /></td>
diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index df3db80b30..ffef118999 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -78,7 +78,7 @@ $sql = 'SELECT id_grupo, nombre FROM tgrupo ';
 if ($id_group)
 	$sql .= sprintf ('WHERE id_grupo != %d', $id_group);
 $groups = get_user_groups();
-$table->data[2][1] = print_select($groups, 'id_parent', 0, '', '', '', true);
+$table->data[2][1] = print_select_groups(false, "AR", true, 'id_parent', 0, '', '', '', true);
 $table->data[2][1] .= ' <span id="parent_preview">';
 if ($id_parent) {
 	echo '<img src="images/groups_small/'.get_group_icon ($id_parent).'.png" />';
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index ebc3ba5926..0d07fa5899 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -159,7 +159,7 @@ $table->align = array ();
 $table->align[3] = 'center';
 $table->data = array ();
 
-$groups = get_user_groups_tree ($config['id_user'], "AR", false);
+$groups = get_user_groups_tree ($config['id_user'], "AR", true);
 $iterator = 0;
 
 foreach ($groups as $id_group => $group) {
diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php
index 3274dbfc6e..d760b21eb1 100644
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@@ -103,7 +103,7 @@ echo ">";
 
 $group_select = get_user_groups ($config['id_user']);
 echo "<td><b>".__('Group')."</b></td><td>" .
-	print_select ($group_select, 'graph_id_group', $id_group, '', '', '', true) .
+	print_select_groups($config['id_user'], "AR", true, 'graph_id_group', $id_group, '', '', '', true) .
 	"</td></tr>";
 echo "<tr>";
 echo "<td class='datos2'><b>".__('Description')."</b></td>";
diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php
index ed438f59d6..856a160eab 100644
--- a/pandora_console/godmode/reporting/reporting_builder.main.php
+++ b/pandora_console/godmode/reporting/reporting_builder.main.php
@@ -52,7 +52,7 @@ $table->data['name'][0] = __('Name');
 $table->data['name'][1] = print_input_text('name', $reportName, __('Name'), 20, 40, true);
 
 $table->data['group'][0] = __('Group');
-$table->data['group'][1] = print_select ($groups, 'id_group', $idGroupReport, false, '', '', true);
+$table->data['group'][1] = print_select_groups(false, "AR", true, 'id_group', $idGroupReport, false, '', '', true);
 
 $table->data['description'][0] = __('Description');
 $table->data['description'][1] = print_textarea('description', 5, 15, $description, '', true);
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index 3fc720870a..122544c3eb 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -48,7 +48,7 @@ $table->data[0][0] = __('Name:');
 $table->data[0][1] = print_input_text ('name', $visualConsoleName, '', 15, 50, true);
 $table->data[1][0] = __('Group:');
 $groups = get_user_groups ($config['id_user']);
-$table->data[1][1] = print_select ($groups, 'id_group', $idGroup, '', '', '', true);
+$table->data[1][1] = print_select_groups($config['id_user'], "AR", true, 'id_group', $idGroup, '', '', '', true);
 $backgrounds_list = list_files ('images/console/background/', "jpg", 1, 0);
 $backgrounds_list = array_merge ($backgrounds_list, list_files ('images/console/background/', "png", 1, 0));
 $table->data[2][0] = __('Background');
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 279ec69ccf..67e7ab1555 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -108,9 +108,7 @@ $table->data[6][1] .= '<a href="#" class="tip">&nbsp;<span>'.__('Ports defined l
 // Group
 $table->data[7][0] = "<b>".__('Group');
 $groups = get_user_groups (false, "AR", false);
-$table->data[7][1] = print_select ($groups, 'id_group', $id_group, '', '', 0, true);
-//$table->data[7][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo ORDER BY nombre', "id_group", $id_group, '', 'All', 0, true);
-
+$table->data[7][1] = print_select_groups(false, "AR", false, 'id_group', $id_group, '', '', 0, true);
 
 // Incident
 $values = array (0 => __('No'), 1 => __('Yes'));
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index aed844fb33..ae0be407fb 100755
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -150,7 +150,7 @@ $table->data[0][0] = __('Connection Name') .print_help_tip (__('Descriptive name
 $table->data[0][1] = print_input_text ('name', $mapConnection_name, '', 30, 60, true);
 
 $table->data[1][0] = __("Group") .print_help_tip (__('Group that owns the connection'), true) . ":";
-$table->data[1][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'group', $mapConnection_group, '', __('All'), '0', true);
+$table->data[1][1] = print_select_groups(false, false, false, 'group', $mapConnection_group, '', __('All'), '0', true);
 
 $table->data[2][0] = __('Number of zoom levels') . ":";
 $table->data[2][1] = print_input_text ('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true);
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index bde0a7504b..c8643d8d90 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -321,7 +321,7 @@ $data = array ();
 $data[0] = '<form method="post">';
 $data[0] .= print_select (get_profiles (), 'assign_profile', 0, '', __('None'),
 	0, true, false, false);
-$data[1] = print_select (get_user_groups ($config['id_user'], 'UM'),
+$data[1] = print_select_groups($config['id_user'], "UM", true,
 	'assign_group', -1, '', __('None'), -1, true, false, false);
 $data[2] = print_input_image ('add', 'images/add.png', 1, '', true);
 $data[2] .= print_input_hidden ('id', $id, true);
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index e6e8aecea9..dea28671b8 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1477,7 +1477,7 @@ function get_all_model_groups () {
  * Get all the groups a user has reading privileges.
  * 
  * @param string User id
- * @param string The privilege to evaluate
+ * @param string The privilege to evaluate, and it is false then no check ACL.
  * @param boolean $returnAllGroup Flag the return group, by default true.
  * @param boolean $returnAllColumns Flag to return all columns of groups.
  *
@@ -1507,7 +1507,15 @@ function get_user_groups ($id_user = false, $privilege = "AR", $returnAllGroup =
 	}
 	
 	foreach ($groups as $group) {
-		if (give_acl ($id_user, $group["id_grupo"], $privilege)) {
+		if ($privilege === false) {
+			if ($returnAllColumns) {
+				$user_groups[$group['id_grupo']] = $group;
+			}
+			else {
+				$user_groups[$group['id_grupo']] = $group['nombre'];
+			}
+		}
+		else if (give_acl ($id_user, $group["id_grupo"], $privilege)) {
 			if ($returnAllColumns) {
 				$user_groups[$group['id_grupo']] = $group;
 			}
@@ -1566,7 +1574,7 @@ function get_user_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
  * @return array A treefield list of the groups the user has certain privileges.
  */
 function get_user_groups_tree($id_user = false, $privilege = "AR", $returnAllGroup = true) {
-	$user_groups = get_user_groups (false, "AR", true, true);	
+	$user_groups = get_user_groups ($id_user, $privilege, $returnAllGroup, true);	
 	
 	$user_groups_tree = get_user_groups_tree_recursive($user_groups);
 	
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 225ef92b49..6ab5663a9f 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -139,6 +139,47 @@ function print_select_style ($fields, $name, $selected = '', $style='', $script
 	echo $output;
 }
 
+/**
+ * Prints the groups of user of fields in a popup menu of a form.
+ * 
+ * @param string User id
+ * @param string The privilege to evaluate
+ * @param boolean $returnAllGroup Flag the return group, by default true.
+ * @param boolean $returnAllColumns Flag to return all columns of groups.
+ * @param array Array with dropdown values. Example: $fields["value"] = "label"
+ * @param string Select form name
+ * @param variant Current selected value. Can be a single value or an
+ * array of selected values (in combination with multiple)
+ * @param string Javascript onChange code.
+ * @param string Label when nothing is selected.
+ * @param variant Value when nothing is selected
+ * @param bool Whether to return an output string or echo now (optional, echo by default).
+ * @param bool Set the input to allow multiple selections (optional, single selection by default).
+ * @param bool Whether to sort the options or not (optional, unsorted by default).
+ * @param string $style The string of style.
+ *
+ * @return string HTML code if return parameter is true.
+ */
+function print_select_groups($id_user = false, $privilege = "AR", $returnAllGroup = true,
+	$name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false, 
+	$multiple = false, $sort = true, $class = '', $disabled = false, $style = false, $option_style = false) {
+		
+	$user_groups = get_user_groups ($id_user, $privilege, $returnAllGroup, true);	
+	
+	$user_groups_tree = get_user_groups_tree_recursive($user_groups);
+	
+	$fields = array();
+	foreach ($user_groups_tree as $group) {
+		$fields[$group['id_grupo']] = str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;", $group['deep']) . $group['nombre'];
+	}
+	
+	$output = print_select ($fields, $name, $selected, $script, $nothing, $nothing_value,
+		$return, $multiple, false, $class, $disabled, $style, $option_style);
+		
+	if ($return) {
+		return $output;
+	}
+}
 
 /**
  * Prints an array of fields in a popup menu of a form.
diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php
index c2b7f9f130..130b665d7a 100755
--- a/pandora_console/operation/agentes/alerts_status.functions.php
+++ b/pandora_console/operation/agentes/alerts_status.functions.php
@@ -43,7 +43,7 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url) {
 	$table->style = array ();
 	
 	$table->data[0][0] = __('Group');
-	$table->data[0][1] = print_select (get_user_groups (), "ag_group", $id_group,
+	$table->data[0][1] = print_select_groups(false, "AR", true, "ag_group", $id_group,
 		'javascript:this.form.submit();', '', '', true);
 		
 	$alert_status_filter = array();
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 60b381d110..89e845be18 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -81,7 +81,7 @@ echo '<table cellpadding="4" cellspacing="4" class="databox" width="95%">';
 echo '<tr><td style="white-space:nowrap;">'.__('Group').': ';
 
 $groups = get_user_groups ();
-print_select ($groups, 'group_id', $group_id, 'this.form.submit()', '', '');
+print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '');
 
 echo '</td><td style="white-space:nowrap;">';
 
diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php
index 4d85f15552..a0092f2f85 100644
--- a/pandora_console/operation/agentes/exportdata.php
+++ b/pandora_console/operation/agentes/exportdata.php
@@ -273,7 +273,7 @@ $table->data[0][0] = '<b>'.__('Group').'</b>';
 	
 $groups = get_user_groups ($config['id_user'], "AR");
 	
-$table->data[0][1] = print_select ($groups, "group", $group, 'this.form.submit();', '', 0, true, false, true, 'w130', false);
+$table->data[0][1] = print_select_groups($config['id_user'], "AR", true, "group", $group, 'this.form.submit();', '', 0, true, false, true, 'w130', false);
 	
 //Agent selector
 $table->data[1][0] = '<b>'.__('Source agent').'</b>';
diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php
index 4de5279522..f58624439f 100644
--- a/pandora_console/operation/agentes/networkmap.php
+++ b/pandora_console/operation/agentes/networkmap.php
@@ -67,7 +67,7 @@ echo '<form action="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&a
 echo '<table cellpadding="4" cellspacing="4" class="databox" width="100%">';
 echo '<tr>';
 echo '<td valign="top">' . __('Group') . '<br />';
-print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo WHERE id_grupo > 0 ORDER BY nombre', 'group', $group, '', 'All', 0, false);
+print_select_groups(false, false, false, 'group', $group, '', 'All', 0, false);
 echo '</td>';
 echo '<td valign="top">' . __('Layout') . '<br />';
 print_select ($layout_array, 'layout', $layout, '', '', '');
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 21db516b6d..7a2b25c483 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -44,7 +44,7 @@ echo '<table cellspacing="4" cellpadding="4" width="750" class="databox">';
 echo '<tr><td valign="middle">'.__('Group').'</td>';
 echo '<td valign="middle">';
 
-print_select (get_user_groups (), "ag_group", $ag_group, 'this.form.submit();',
+print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();',
 	'', '0', false, false, false, 'w130', false, 'width:150px;');
 
 echo "</td>";
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 401dbbf456..185df97536 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -271,7 +271,7 @@ echo '<table style="float:left;" width="550" cellpadding="4" cellspacing="4" cla
 
 // Group combo
 echo "<td>".__('Group')."</td><td>";
-print_select ($groups, 'ev_group', $ev_group, '', '', 0, false, false, false, 'w130');
+print_select_groups($config["id_user"], "IR", true, 'ev_group', $ev_group, '', '', 0, false, false, false, 'w130');
 echo "</td>";
 
 // Event type
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index 5908c455ea..64c5317602 100644
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -209,7 +209,7 @@ print_select (get_users_info (), "usuario", $usuario, 'javascript:this.form.subm
 
 echo '</td></tr><tr><td colspan=3>';
 	
-print_select ($groups, "grupo", $grupo, 'javascript:this.form.submit();', '', '',false,false,false,'w155');
+print_select_groups($config["id_user"], "IR", true, "grupo", $grupo, 'javascript:this.form.submit();', '', '',false,false,false,'w155');
 
 echo "&nbsp;&nbsp;&nbsp;&nbsp;";
 
diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index a2eda47492..b4f729c241 100644
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -259,9 +259,9 @@ echo '</td><td class="datos2"><b>'.__('Group').'</b></td><td class="datos2">';
 
 // Group combo
 if ((give_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_user_groups ($config["id_user"], "IR"), "grupo_form", $id_grupo, '', '', '', false, false, false, 'w135');
+	print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, false, 'w135');
 } else {
-	print_select (get_user_groups ($config["id_user"], "IR"), "grupo_form", $id_grupo, '', '', '', false, false, true, 'w135', true);
+	print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, true, 'w135', true);
 }
 
 echo '</td></tr><tr><td class="datos"><b>'.__('Priority').'</b></td><td class="datos">';
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index 73fe2a22f8..9cf262163d 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -89,7 +89,7 @@ if (isset ($_GET["new_msg"])) { //create message
 		
 	print_select ($users, "dest_user", $dest_user, '', __('-Select user-'), false, false, false, '', false);
 	echo ' - '.__('OR').' - ';
-	print_select ($groups, "dest_group", $dest_group, '', __('-Select group-'), false, false, false, '', false);
+	print_select_groups($config["id_user"], "AR", true, "dest_group", $dest_group, '', __('-Select group-'), false, false, false, '', false);
 	
 	echo '</td></tr><tr><td class="datos">'.__('Subject').':</td><td class="datos">';
 	print_input_text ("subject", $subject, '', 50, 70, false);