diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ccd0eb3136..a569b94437 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+
+2007-08-06  Sancho Lerena  <slerena@gmail.com>
+
+        * pandoradb.sql, alert_manager.php: Alert time support uses TIME format 
+	instead numeric (changes requested by esanchezm).
+
 2007-08-06  Sancho Lerena  <slerena@artica.es>
 
         * include/functions_db.php: Fixed unsorted render (E.Ross).
diff --git a/pandora_console/godmode/agentes/alert_manager.php b/pandora_console/godmode/agentes/alert_manager.php
index 40f0a535cf..72ea9125db 100644
--- a/pandora_console/godmode/agentes/alert_manager.php
+++ b/pandora_console/godmode/agentes/alert_manager.php
@@ -95,13 +95,13 @@ $result=mysql_query($sql1);
 					$string = $string."<td class='$tdcolor'>".$mymin."</td>";
 					$string = $string."<td class='$tdcolor'>".$mymax."</td>";
 				}
-				$mytimefrom =$row3["time_from"];
-				$mytimeto =$row3["time_to"];
+				$time_from_table =$row3["time_from"];
+				$time_to_table =$row3["time_to"];
 				$string = $string."<td class='$tdcolor'>";
-				if ($mytimeto == $mytimefrom)
+				if ($time_to_table == $time_from_table)
 					$string .= $lang_label["N/A"];
 				else
-					$string .= render_time($mytimefrom)." - ".render_time($mytimeto);
+					$string .= substr($time_from_table,0,5)." - ".substr($time_to_table,0,5);
 				
 				$string = $string."</td><td class='$tdcolor'>".salida_limpia($row3["descripcion"]);
 				$string = $string."</td><td class='$tdcolor'>";
@@ -150,6 +150,7 @@ $result=mysql_query($sql1);
 echo '<form name="agente" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.$id_agente.'">';
 if (! isset($update_alert))
 	$update_alert = -1;
+	
 if ($update_alert != 1) {
 	echo '<input type="hidden" name="insert_alert" value=1>';
 } else {
@@ -247,12 +248,12 @@ _data_<br>
 echo "<tr><td class='datos2'>".$lang_label["time_from"];	
 echo "<td class='datos2'><select name='time_from'>";
 if ($time_from != ""){
-	echo "<option value='$time_from'>".render_time($time_from);
+	echo "<option value='$time_from'>".substr($time_from,0,5);
 }
 
 for ($a=0; $a < 48; $a++){
 	echo "<option value='";
-	echo $a;
+	echo render_time ($a);
 	echo "'>";
 	echo render_time ($a);
 }
@@ -261,12 +262,12 @@ echo "</select>";
 echo "<td class='datos2'>".$lang_label["time_to"];
 echo "<td class='datos2'><select name='time_to'>";
 if ($time_from != ""){
-	echo "<option value='$time_to'>".render_time($time_to);
+	echo "<option value='$time_to'>".substr($time_to,0,5);
 }
 
 for ($a=0; $a < 48; $a++){
 	echo "<option value='";
-	echo $a;
+	echo render_time ($a);
 	echo "'>";
 	echo render_time ($a);
 }
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0f64e68f07..bd8e4ca100 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -181,8 +181,8 @@ CREATE TABLE `talerta_agente_modulo` (
   `internal_counter` int(4) default '0',
   `alert_text` varchar(255) default '',
   `disable` int(4) default '0',
-  `time_from` int(8) default '0',
-  `time_to` int(8) default '0',
+  `time_from` TIME default '00:00:00',
+  `time_to` TIME default '00:00:00',
   PRIMARY KEY  (`id_aam`)
 ) ENGINE=InnoDB;