diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 7594f0e5a6..49c3e5e184 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/reporting/reporting_builder.php: Fixed error updating 
+	report items (agent and module were lost if you update item report).
+	
+	Merged bugfix from branches.
+
 2012-05-31  Vanessa Gil <vanessa.gil@artica.es>
 
 	* godmode/agentes/agent_template.php: Fixed bug: adding
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 06d35f1fa6..2b17078d64 100644
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -428,12 +428,15 @@ switch ($action) {
 						$values['id_agent'] = get_parameter('id_agent');
 						$values['id_gs'] = get_parameter('id_custom_graph');
 						$values['id_agent_module'] = '';
-						if (isset($type)) {
-							if (($type == 'alert_report_agent') or ($type == 'event_report_agent'))
+						if (isset($values['type'])) {
+							if (($values['type'] == 'alert_report_agent') or ($values['type'] == 'event_report_agent'))
 								$values['id_agent_module'] = '';
 							else
 								$values['id_agent_module'] = get_parameter('id_agent_module');
 						}
+						else
+							$values['id_agent_module'] = get_parameter('id_agent_module');
+
 						$values['only_display_wrong'] = get_parameter('checkbox_only_display_wrong');
 						$values['monday'] = get_parameter('monday', 0);
 						$values['tuesday'] = get_parameter('tuesday', 0);