diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index de274a66b1..916adc18a8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-07 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* godmode/modules/manage_network_components_form_common.php: fixed
+	the show types of module.
+	
+	MERGED FROM THE PANDORA_4
+
 2013-02-07 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* godmode/users/user_list.php, godmode/users/profile_list.php,
diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index ed00821cb5..d4db6e8ff6 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.php
@@ -72,11 +72,13 @@ $sql = sprintf ('SELECT id_tipo, descripcion
 	implode (',', $categories));
 $table->data[1][1] = html_print_select_from_sql ($sql, 'type',
 	$type, ($id_component_type == 2 ? 'type_change()' : ''), '', '', true,
-	false, false);
+	false, false, false, true, false, false, false, 0);
 
 $table->data[1][2] = __('Module group');
-$table->data[1][3] = html_print_select_from_sql ('SELECT id_mg, name FROM tmodule_group ORDER BY name',
-	'id_module_group', $id_module_group, '', '', '', true, false, false);
+$table->data[1][3] = html_print_select_from_sql ('SELECT id_mg, name
+	FROM tmodule_group ORDER BY name',
+	'id_module_group', $id_module_group, '', '', '', true, false, false,
+	false, true, false, false, false, 0);
 
 $table->data[2][0] = __('Group');
 $table->data[2][1] = html_print_select (network_components_get_groups (),