diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 7317f8d536..a13d59355b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-18  Vanessa Gil  <vanessa.gil@artica.es>
+
+	* operation/reporting/reporting_viewer.php: Check that the date range
+	entered is correct.
+
 2012-01-18  Vanessa Gil  <vanessa.gil@artica.es>
 
 	* include/functions_agents.php
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 4e3e314afe..7244c91785 100644
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -77,6 +77,12 @@ if ($config["pure"] == 0) {
 
 ui_print_page_header (__('Reporting'). " &raquo;  ". __('Custom reporting'). " - ".$report["name"], "images/reporting.png", false, "", false, $options);
 
+if ($enable_init_date) {
+	if ($datetime_init > $datetime) {
+		ui_print_error_message ("Invalid date selected. Initial date must be before end date.");
+	}
+}
+
 $table->width = '99%';
 $table->class = 'databox';
 $table->style = array ();
@@ -186,7 +192,9 @@ foreach ($contents as $content) {
 	
 	// Calculate new inteval for all reports
 	if ($enable_init_date){
-		$datetime_init = strtotime ($date_init.' '.$time_init);
+		if ($datetime_init >= $datetime) {
+			$datetime_init = $date_init_less;
+		}
 		$new_interval = $report['datetime'] - $datetime_init; 		
 		$content['period'] = $new_interval;
 	}