[Alba-desarrollo] SVN Alba r4894 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions

Mie Ago 1 21:26:19 CEST 2007

Author: sabino
Date: 2007-08-01 16:26:00 -0300 (Wed, 01 Aug 2007)
New Revision: 4894

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php
Log:
Resolucion de conflicto


Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php	2007-08-01 19:25:34 UTC (rev 4893)
+++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php	2007-08-01 19:26:00 UTC (rev 4894)
@@ -175,11 +175,11 @@
             $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id);
         }
         if($turnos_id) {
-            $criteria->add(HorarioescolarPeer::FK_TURNOS_ID, $turnos_id);
+            $criteria->add(HorarioescolarPeer::FK_TURNO_ID, $turnos_id);
         }
 
         if($orden) {
-            $criteria->addAscendingOrderByColumn(HorarioescolarPeer::FK_TURNOS_ID);
+            $criteria->addAscendingOrderByColumn(HorarioescolarPeer::FK_TURNO_ID);
         } 
 
         $horarioescolares = HorarioescolarPeer::doSelect($criteria);


