SVN Alba r4181 - in prosistem/alba/trunk/alba: apps/principal/lib/helper apps/principal/modules/alumno/config apps/principal/modules/informes/actions apps/principal/modules/informes/config apps/principal/modules/informes/templates config data/sql lib/model/map lib/model/om web/css - Alba-desarrollo

12 Feb 2007

Author: josx
Date: 2007-02-12 16:41:32 -0300 (Mon, 12 Feb 2007)
New Revision: 4181

Added:
   prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml
   prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaFormularioSuccess.php
   prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaListadoSuccess.php
   prosistem/alba/trunk/alba/web/css/informes.css
Modified:
   prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php
   prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml
   prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/constanciaAlumnoRegularListadoSuccess.php
   prosistem/alba/trunk/alba/config/schema.xml
   prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql
   prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql
   prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php
   prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php
   prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php
   prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php
   prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php
   prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php
   prosistem/alba/trunk/alba/lib/model/om/BasePais.php
   prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php
   prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php
Log:
Se agrego el Certificado de terminacion de estudios primarios. Se agregue css especifico para los informes. Se agrego nacionalidad y lugar de nacimiento la tabla y abm de alumnos.

Modified: prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -23,8 +23,8 @@
  * MiscHelper Funciones generales
  *
  * @package    alba
- * @author     Jos� Luis Di Biase <[email protected]>
- * @author     H�ctor Sanchez <[email protected]>
+ * @author     José Luis Di Biase <[email protected]>
+ * @author     Héctor Sanchez <[email protected]>
  * @author     Fernando Toledo <[email protected]>
  * @version    SVN: $Id$
  * @filesource
@@ -54,6 +54,7 @@
         return $aColor;
     }
 
+
     function Meses() {
         $aMeses = array( 1 => 'Enero', 2 => 'Febrero', 3 => 'Marzo', 4 => 'Abril', 5 => 'Mayo', 6 => 'Junio', 7 => 'Julio', 8 => 'Agosto', 9 => 'Septiembre', 10 => 'Octubre', 11 => 'Noviembre', 12 => 'Diciembre');
         return  $aMeses;

Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml	2007-02-12 19:41:32 UTC (rev 4181)
@@ -26,6 +26,8 @@
             activo: { name: ¿Está activo? }
             nombre_apellido: { name: Nombre }
             division: { name: División }
+            fk_pais_id: { name: Nacionalidad}
+            lugar_nacimiento: { name: Lugar de Nacimiento}
 
       list:
             title: Listado de Alumnos
@@ -49,7 +51,7 @@
                 fk_cuenta_id:   { params: include_custom=>>Seleccione un Cuenta<<}
                 fk_provincia_id:   { params: include_custom=>>Seleccione una Provincia<<}
             display:
-                "Informacion general":  [apellido, nombre, _sexo, fk_tipodocumento_id, nro_documento, fecha_nacimiento, email, activo ]
+                "Informacion general":  [apellido, nombre, _sexo, fk_tipodocumento_id, nro_documento, lugar_nacimiento, fecha_nacimiento, fk_pais_id, email, activo ]
                 "Donde vive": [direccion, ciudad, fk_provincia_id, codigo_postal, telefono]
                 "Prioridades": [ distancia_escuela, hermanos_escuela, hijo_maestro_escuela ]
                 "Otros": [ certificado_medico, _fk_cuenta_id ]

Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -190,5 +190,93 @@
         $this->vista = "imprimir";
     }
 
+
+
+    public function executeCertificadoPrimariaFormulario() {
+        
+        // inicializando variables
+        $optionsDivision = array();
+        $aAlumno  = array();        
+
+        // tomando los datos del formulario
+        $division_id = $this->getRequestParameter('division_id');
+        $txt = $this->getRequestParameter('txt');
+
+        // llenando el combo de division segun establecimiento
+        $establecimiento_id = $this->getUser()->getAttribute('fk_establecimiento_id');
+        $criteria = new Criteria();
+        $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id);
+        $divisiones = DivisionPeer::doSelectJoinAnio($criteria);
+        $optionsDivision[]  = "";
+        foreach($divisiones as $division) {
+            $optionsDivision[$division->getId()] = $division->getAnio()->getDescripcion()." ".$division->getDescripcion();
+        }
+        asort($optionsDivision);
+       
+        if ($this->getRequest()->getMethod() == sfRequest::POST) {
+            // buscando alumnos
+            $criteria = new Criteria();
+            if($division_id) {
+                $criteria->add(DivisionPeer::ID, $division_id);
+            }
+            $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID);
+            $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID);
+            $criteria->addJoin(DivisionPeer::FK_ANIO_ID, AnioPeer::ID);
+        
+            if($txt) {
+                $cton1 = $criteria->getNewCriterion(AlumnoPeer::NOMBRE, "%$txt%", Criteria::LIKE);
+                $cton2 = $criteria->getNewCriterion(AlumnoPeer::APELLIDO, "%$txt%", Criteria::LIKE);
+                $cton1->addOr($cton2);
+                $criteria->add($cton1);
+            }
+
+            $criteria->addAsColumn("alumno_id", AlumnoPeer::ID);
+            $criteria->addAsColumn("alumno_nombre", AlumnoPeer::NOMBRE);
+            $criteria->addAsColumn("alumno_apellido", AlumnoPeer::APELLIDO);
+            $criteria->addAsColumn("division_id", DivisionPeer::ID);
+            $criteria->addAsColumn("division_descripcion", DivisionPeer::DESCRIPCION);
+            $criteria->addAsColumn("anio_descripcion", AnioPeer::DESCRIPCION);
+
+            $alumnos = BasePeer::doSelect($criteria);
+            foreach($alumnos as $alumno) {
+                $aAlumno[] = (object) array( 'alumno_id' => $alumno[0],'alumno_nombre' => $alumno[1], 'alumno_apellido' => $alumno[2], 'division_id' => $alumno[3], 'division_nombre' => $alumno[4], 'anio_descripcion' => $alumno[5] );
+            }
+    
+        }
+
+        // asignando variables para ser usadas en el template
+        $this->optionsDivision = $optionsDivision;
+        $this->division_id = $division_id;
+        $this->txt = $txt;
+        $this->aAlumno = $aAlumno;
+        $this->vista = "imprimir";
+
+
+    }
+
+    // no valida que realmente ha terminado septimo grado
+    public function executeCertificadoPrimariaListado() {
+
+        // tomando los datos del formulario
+        $alumno_id = $this->getRequestParameter('alumno_id');
+        $establecimiento_id = $this->getUser()->getAttribute('fk_establecimiento_id');
+        $ciclolectivo_id = $this->getUser()->getAttribute('fk_ciclolectivo_id');
+
+        $alumno = AlumnoPeer::retrieveByPK($alumno_id);
+        $establecimiento = EstablecimientoPeer::retrieveByPK($establecimiento_id);
+
+        // asignando variables para ser usadas en el template
+        $this->alumno = $alumno;
+        $this->establecimiento = $establecimiento;
+        $this->vista = "imprimir";
+
+        Misc::use_helper('Misc');
+        $aMeses = meses();
+
+        $this->anio = date("Y");
+        $this->mes = $aMeses[date("n")];
+        $this->dia = date("d");
+    }
+
 }
 ?>
\ No newline at end of file

Added: prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml	2007-02-12 19:41:32 UTC (rev 4181)
@@ -0,0 +1,2 @@
+default:
+  stylesheets:    [ informes ] 


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml
___________________________________________________________________
Name: svn:keywords
   + Id Date Author Rev URL

Added: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaFormularioSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaFormularioSuccess.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaFormularioSuccess.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -0,0 +1,62 @@
+<h1>Informe: Certificado de Terminación de Estudios Primarios</h1>
+
+<?php echo form_tag('informes/certificadoPrimariaFormulario', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?>
+
+<fieldset id="sf_fieldset_none" class="">
+    <div class="form-row">
+        <?php echo label_for('Buscar', __('Buscar Alumnos:')) ?>
+        <?php echo input_tag('txt', $txt) ?>   
+    </div>
+
+    <div class="form-row">
+        <?php echo label_for('division', __('Division:')) ?>
+        <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id)) ?>
+    </div>
+</fieldset>
+
+ <ul class="sf_admin_actions">
+  <li><?php echo submit_tag(__('Buscar'), array (
+  'name' => 'Mostrar',
+  'class' => 'sf_admin_action_save',
+)) ?></li>
+</ul>
+
+</form>
+
+
+<? if (count($aAlumno) > 0) {
+    if ($txt) { ?>
+    Ustde busco -<?=$txt?>-
+    <? } ?>
+<h1>Alumnos</h1>
+<table cellspacing="0" class="sf_admin_list">
+  <thead>
+  <tr>
+    <th id="sf_admin_list_th_alumno"> Alumno</th>
+    <th id="sf_admin_list_th_sf_actions">Ver Informe</th>
+  </tr>
+  </thead>
+
+  <tbody>
+<?
+    $i = 0;
+    foreach($aAlumno as $alumno){
+?>
+  <tr class="sf_admin_row_0">
+    <td><?echo $alumno->alumno_apellido." ".$alumno->alumno_nombre; ?> ( <?=$alumno->anio_descripcion?> - <?=$alumno->division_nombre?> ) </td>
+    <td>
+    <ul class="sf_admin_td_actions">
+     <li><?php echo link_to(image_tag('/sf/images/sf_admin/edit_icon.png', array('alt' => 'editar', 'title' => 'Editar')) , 'informes?action=certificadoPrimariaListado&alumno_id='.$alumno->alumno_id); ?></li>
+    </ul>
+    </td>
+  </tr>
+  <? } ?>
+  </tbody>
+</table>
+
+<? } else {
+    if ($txt) { ?>
+        Su búsqueda por -<?=$txt?>- no ha encontrado alumnos.
+    <? } 
+} 
+?>
\ No newline at end of file


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaFormularioSuccess.php
___________________________________________________________________
Name: svn:keywords
   + Id Date Author Rev URL

Added: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaListadoSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaListadoSuccess.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaListadoSuccess.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -0,0 +1,44 @@
+<?
+    use_helper('Misc');
+    $meses = Meses();
+?>
+<div style="text-align: center;"><?=image_tag('small/escudo_bsas_chico.jpg')?></div>
+<div style="text-align: center;" class="titulo">REPÚBLICA ARGENTINA<br><br>
+<span style="font-weight: bold;" class="titulo">GOBIERNO DE LA CIUDAD DE BUENOS AIRES</span><br style="font-weight: bold;">
+<span style="font-weight: bold;" class="titulo">SECRETARíA DE EDUCACION</span><br>
+<br>
+<span class="subtitulo">CERTIFICADO DE TERMINACIÓN <br>DE ESTUDIOS PRIMARIOS</span><br>
+</div>
+<br>
+<br>
+
+<div class="texto">
+Certifico que <?=$alumno->getApellido()?>, <?=$alumno->getNombre()?>  quien acredita identidad con <?=$alumno->getTipoDocumento()->getDescripcion()?> <br> N° <?=$alumno->getNroDocumento()?> nacido  <?=($alumno->getLugarNacimiento())?" en ".$alumno->getLugarNacimiento():""?> el <?=date("d",strtotime($alumno->getFechaNacimiento()))?> de <?=$meses[date("n",strtotime($alumno->getFechaNacimiento()))]?> de  <?=date("Y",strtotime($alumno->getFechaNacimiento()))?> aprobó el séptimo grado, como alumno <br> 
+regular en <?=strtoupper($establecimiento->getNombre())?> en el año <?=$anio?><br>
+<br>
+Se extiende el presente <span style="font-weight: bold;">CERTIFICADO DE TERMINACIÓN DE ESTUDIOS PRIMARIOS</span>, <br>
+en Buenos Aires, a los <?=$dia?> días del mes de <?=$mes?> del año  <?=$anio?> <br>
+</div>
+
+<br>
+<br>
+<br>
+
+
+<table style="text-align: left; width: 100%;" border="0" cellpadding="2" cellspacing="2">
+  <tbody>
+    <tr>
+      <td style="text-align: center;">..................................................<br>
+Firma del Maestro de Grado</td>
+      <td></td>
+      <td style="text-align: center;">..................................................<br>
+Firma del Director de la Escuela</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td style="text-align: center;">..................................................<br>
+Firma del Supervisor</td>
+      <td></td>
+    </tr>
+  </tbody>
+</table>


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoPrimariaListadoSuccess.php
___________________________________________________________________
Name: svn:keywords
   + Id Date Author Rev URL

Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/constanciaAlumnoRegularListadoSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/constanciaAlumnoRegularListadoSuccess.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/constanciaAlumnoRegularListadoSuccess.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -1,31 +1,4 @@
-<style>
 
-.titulo
-{
-  color: #000;
-  font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
-  font-size: 20px;
-  font-weight: bold
-}
-
-.subtitulo
-{
-  color: #000;
-  font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
-  font-size: 18px;
-  font-weight: bold
-}
-
-.texto
-{
-  color: #000;
-  font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
-  font-size: 17px;
-}
-
-</style>
-
-
 <div style="text-align: center;">
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
   <tbody>

Modified: prosistem/alba/trunk/alba/config/schema.xml
===================================================================
--- prosistem/alba/trunk/alba/config/schema.xml	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/config/schema.xml	2007-02-12 19:41:32 UTC (rev 4181)
@@ -234,6 +234,7 @@
     <column name="codigo_postal" type="VARCHAR" size="20" required="true" default=""/>
     <column name="fk_provincia_id" type="INTEGER" required="true" default="0"/>
     <column name="telefono" type="VARCHAR" size="20" required="false" default=""/>
+    <column name="lugar_nacimiento" type="VARCHAR" size="128" required="false" default=""/>
     <column name="fk_tipodocumento_id" type="integer" size="11" required="true" default="0"/>
     <column name="nro_documento" type="varchar" size="16" required="true" default=""/>
     <column name="sexo" type="CHAR" size="1" required="true" default=""/>
@@ -246,6 +247,7 @@
     <column name="certificado_medico" type="boolean" required="true" default="0"/>
     <column name="activo" type="boolean" required="true" default="true"/>
     <column name="fk_conceptobaja_id" type="INTEGER" required="true" default="0"/>
+    <column name="fk_pais_id" type="INTEGER" required="true" default="0"/>
     <foreign-key foreignTable="tipodocumento">         
         <reference local="fk_tipodocumento_id" foreign="id"/>       
     </foreign-key>
@@ -261,6 +263,9 @@
     <foreign-key foreignTable="conceptobaja">         
       <reference local="fk_conceptobaja_id" foreign="id"/>       
     </foreign-key>
+    <foreign-key foreignTable="pais">         
+      <reference local="fk_pais_id" foreign="id"/>       
+    </foreign-key>
   </table>  
   <table name="responsable" idMethod="native">
     <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/>

Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql
===================================================================
--- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql	2007-02-12 19:41:32 UTC (rev 4181)
@@ -13,6 +13,9 @@
 -- Dumping data for table `menu`
 --
 DELETE FROM menu;
-INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'General','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacios','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Administración','#','',1,0,''),(11,'Preferencias Generales','preferencia','preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'Usuario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','modulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento','establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoescolar','distrito',83,30,''),(21,'Definir Provincias','provincia','provincia',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'Definir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Administrar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','responsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas','escalanota','escalanota',84,30,''),(32,'Definir Categorías del Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar Alumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos de entrada al legajo pedagógico','legajocategoria','legajocategoria',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'Administrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','tipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Definir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/Año','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feriado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(47,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario escolar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendario de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busquedaDocente','',50,0,''),(52,'...sección/división','calendario/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion',87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constancia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=imprimir','informes',9,0,'_blank'),(60,'Constancia Egreso 7mo','#','',9,0,''),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,''),(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,''),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/','',65,0,''),(69,'Generar Horario por sección/división','calendario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,10,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,''),(73,'Asistencia por Sección/División','asistencia','asistencia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasistencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'Asignar Alumno a Sección/División','relAlumnoDivision/create','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relActividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/listConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','boletinnotas',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',71,20,'
'),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71,40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','alumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,40,''),(90,'Alumnos por división','informes/alumnosPorDivisionFormulario?vista=imprimir','informes',9,0,'_blank');
+INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'General','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacios','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Administración','#','',1,0,''),(11,'Preferencias Generales','preferencia','preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'Usuario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','modulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento','establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoescolar','distrito',83,30,''),(21,'Definir Provincias','provincia','provincia',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'Definir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Administrar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','responsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas','escalanota','escalanota',84,30,''),(32,'Definir Categorías del Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar Alumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos de entrada al legajo pedagógico','legajocategoria','legajocategoria',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'Administrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','tipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Definir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/Año','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feriado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(47,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario escolar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendario de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busquedaDocente','',50,0,''),(52,'...sección/división','calendario/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion',87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constancia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=imprimir','informes',9,0,'_blank'),(60, 'Constancia Egreso 7mo', 'informes/certificadoPrimariaFormulario?vista=imprimir', 'informes', 9, 0, '_blank'),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,''),(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,''),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/','',65,0,''),(69,'Generar Horario por sección/división','calendario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,10,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,''),(73,'Asistencia por Sección/División','asistencia','asistencia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasistencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'Asignar Alumno a Sección/División','relAlumnoDivision/create','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relActividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/listConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','boletinnotas
',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',71,20,''),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71,40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','alumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,40,''),(90,'Alumnos por división','informes/alumnosPorDivisionFormulario?vista=imprimir','informes',9,0,'_blank');
 
-ALTER TABLE locacion ADD `principal` TINYINT(1) NOT NULL DEFAULT '0';
\ No newline at end of file
+ALTER TABLE locacion ADD `principal` TINYINT(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `alumno` ADD `lugar_nacimiento` VARCHAR( 128 ) NOT NULL AFTER `id` ,
+ADD `fk_pais_id` INT NOT NULL AFTER `lugar_nacimiento` ;

Modified: prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql
===================================================================
--- prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql	2007-02-12 19:41:32 UTC (rev 4181)
@@ -167,7 +167,7 @@
 -- 
 
 
-INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'General','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacios','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Administración','#','',1,0,''),(11,'Preferencias Generales','preferencia','preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'Usuario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','modulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento','establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoescolar','distrito',83,30,''),(21,'Definir Provincias','provincia','provincia',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'Definir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Administrar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','responsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas','escalanota','escalanota',84,30,''),(32,'Definir Categorías del Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar Alumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos de entrada al legajo pedagógico','legajocategoria','legajocategoria',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'Administrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','tipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Definir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/Año','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feriado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(47,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario escolar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendario de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busquedaDocente','',50,0,''),(52,'...sección/división','calendario/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion',87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constancia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=imprimir','informes',9,0,'_blank'),(60,'Constancia Egreso 7mo','#','',9,0,''),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,''),(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,''),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/','',65,0,''),(69,'Generar Horario por sección/división','calendario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,10,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,''),(73,'Asistencia por Sección/División','asistencia','asistencia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasistencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'Asignar Alumno a Sección/División','relAlumnoDivision/create','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relActividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/listConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','boletinnotas',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',71,20,'
'),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71,40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','alumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,40,''),(90,'Alumnos por división','informes/alumnosPorDivisionFormulario?vista=imprimir','informes',9,0,'_blank');
+INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'General','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacios','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Administración','#','',1,0,''),(11,'Preferencias Generales','preferencia','preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'Usuario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','modulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento','establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoescolar','distrito',83,30,''),(21,'Definir Provincias','provincia','provincia',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'Definir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Administrar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','responsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas','escalanota','escalanota',84,30,''),(32,'Definir Categorías del Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar Alumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos de entrada al legajo pedagógico','legajocategoria','legajocategoria',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'Administrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','tipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Definir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/Año','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feriado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(47,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario escolar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendario de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busquedaDocente','',50,0,''),(52,'...sección/división','calendario/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion',87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constancia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=imprimir','informes',9,0,'_blank'),(60, 'Constancia Egreso 7mo', 'informes/certificadoPrimariaFormulario?vista=imprimir', 'informes', 9, 0, '_blank'),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,''),(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,''),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/','',65,0,''),(69,'Generar Horario por sección/división','calendario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,10,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,''),(73,'Asistencia por Sección/División','asistencia','asistencia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasistencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'Asignar Alumno a Sección/División','relAlumnoDivision/create','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relActividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/listConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','boletinnotas
',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',71,20,''),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71,40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','alumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,40,''),(90,'Alumnos por división','informes/alumnosPorDivisionFormulario?vista=imprimir','informes',9,0,'_blank');
 
 
 -- 

Modified: prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -82,6 +82,8 @@
 
 		$tMap->addColumn('TELEFONO', 'Telefono', 'string', CreoleTypes::VARCHAR, false);
 
+		$tMap->addColumn('LUGAR_NACIMIENTO', 'LugarNacimiento', 'string', CreoleTypes::VARCHAR, false);
+
 		$tMap->addForeignKey('FK_TIPODOCUMENTO_ID', 'FkTipodocumentoId', 'int', CreoleTypes::INTEGER, 'tipodocumento', 'ID', true, 11);
 
 		$tMap->addColumn('NRO_DOCUMENTO', 'NroDocumento', 'string', CreoleTypes::VARCHAR, true);
@@ -105,6 +107,8 @@
 		$tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true);
 
 		$tMap->addForeignKey('FK_CONCEPTOBAJA_ID', 'FkConceptobajaId', 'int', CreoleTypes::INTEGER, 'conceptobaja', 'ID', true, null);
+
+		$tMap->addForeignKey('FK_PAIS_ID', 'FkPaisId', 'int', CreoleTypes::INTEGER, 'pais', 'ID', true, null);
 				
     } // doBuild()
 

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -92,6 +92,13 @@
 
 
 	/**
+	 * The value for the lugar_nacimiento field.
+	 * @var string
+	 */
+	protected $lugar_nacimiento = '';
+
+
+	/**
 	 * The value for the fk_tipodocumento_id field.
 	 * @var int
 	 */
@@ -174,7 +181,14 @@
 	 */
 	protected $fk_conceptobaja_id = 0;
 
+
 	/**
+	 * The value for the fk_pais_id field.
+	 * @var int
+	 */
+	protected $fk_pais_id = 0;
+
+	/**
 	 * @var Tipodocumento
 	 */
 	protected $aTipodocumento;
@@ -200,6 +214,11 @@
 	protected $aConceptobaja;
 
 	/**
+	 * @var Pais
+	 */
+	protected $aPais;
+
+	/**
 	 * Collection to store aggregation of collRelCalendariovacunacionAlumnos.
 	 * @var array
 	 */
@@ -417,6 +436,17 @@
 	}
 
 	/**
+	 * Get the [lugar_nacimiento] column value.
+	 * 
+	 * @return string
+	 */
+	public function getLugarNacimiento()
+	{
+
+		return $this->lugar_nacimiento;
+	}
+
+	/**
 	 * Get the [fk_tipodocumento_id] column value.
 	 * 
 	 * @return int
@@ -549,6 +579,17 @@
 	}
 
 	/**
+	 * Get the [fk_pais_id] column value.
+	 * 
+	 * @return int
+	 */
+	public function getFkPaisId()
+	{
+
+		return $this->fk_pais_id;
+	}
+
+	/**
 	 * Set the value of [id] column.
 	 * 
 	 * @param int $v new value
@@ -705,6 +746,22 @@
 	} // setTelefono()
 
 	/**
+	 * Set the value of [lugar_nacimiento] column.
+	 * 
+	 * @param string $v new value
+	 * @return void
+	 */
+	public function setLugarNacimiento($v)
+	{
+
+		if ($this->lugar_nacimiento !== $v || $v === '') {
+			$this->lugar_nacimiento = $v;
+			$this->modifiedColumns[] = AlumnoPeer::LUGAR_NACIMIENTO;
+		}
+
+	} // setLugarNacimiento()
+
+	/**
 	 * Set the value of [fk_tipodocumento_id] column.
 	 * 
 	 * @param int $v new value
@@ -913,6 +970,26 @@
 	} // setFkConceptobajaId()
 
 	/**
+	 * Set the value of [fk_pais_id] column.
+	 * 
+	 * @param int $v new value
+	 * @return void
+	 */
+	public function setFkPaisId($v)
+	{
+
+		if ($this->fk_pais_id !== $v || $v === 0) {
+			$this->fk_pais_id = $v;
+			$this->modifiedColumns[] = AlumnoPeer::FK_PAIS_ID;
+		}
+
+		if ($this->aPais !== null && $this->aPais->getId() !== $v) {
+			$this->aPais = null;
+		}
+
+	} // setFkPaisId()
+
+	/**
 	 * Hydrates (populates) the object variables with values from the database resultset.
 	 *
 	 * An offset (1-based "start column") is specified so that objects can be hydrated
@@ -947,36 +1024,40 @@
 
 			$this->telefono = $rs->getString($startcol + 8);
 
-			$this->fk_tipodocumento_id = $rs->getInt($startcol + 9);
+			$this->lugar_nacimiento = $rs->getString($startcol + 9);
 
-			$this->nro_documento = $rs->getString($startcol + 10);
+			$this->fk_tipodocumento_id = $rs->getInt($startcol + 10);
 
-			$this->sexo = $rs->getString($startcol + 11);
+			$this->nro_documento = $rs->getString($startcol + 11);
 
-			$this->email = $rs->getString($startcol + 12);
+			$this->sexo = $rs->getString($startcol + 12);
 
-			$this->distancia_escuela = $rs->getInt($startcol + 13);
+			$this->email = $rs->getString($startcol + 13);
 
-			$this->hermanos_escuela = $rs->getBoolean($startcol + 14);
+			$this->distancia_escuela = $rs->getInt($startcol + 14);
 
-			$this->hijo_maestro_escuela = $rs->getBoolean($startcol + 15);
+			$this->hermanos_escuela = $rs->getBoolean($startcol + 15);
 
-			$this->fk_establecimiento_id = $rs->getInt($startcol + 16);
+			$this->hijo_maestro_escuela = $rs->getBoolean($startcol + 16);
 
-			$this->fk_cuenta_id = $rs->getInt($startcol + 17);
+			$this->fk_establecimiento_id = $rs->getInt($startcol + 17);
 
-			$this->certificado_medico = $rs->getBoolean($startcol + 18);
+			$this->fk_cuenta_id = $rs->getInt($startcol + 18);
 
-			$this->activo = $rs->getBoolean($startcol + 19);
+			$this->certificado_medico = $rs->getBoolean($startcol + 19);
 
-			$this->fk_conceptobaja_id = $rs->getInt($startcol + 20);
+			$this->activo = $rs->getBoolean($startcol + 20);
 
+			$this->fk_conceptobaja_id = $rs->getInt($startcol + 21);
+
+			$this->fk_pais_id = $rs->getInt($startcol + 22);
+
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 21; // 21 = AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 23; // 23 = AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating Alumno object", $e);
@@ -1102,7 +1183,14 @@
 				$this->setConceptobaja($this->aConceptobaja);
 			}
 
+			if ($this->aPais !== null) {
+				if ($this->aPais->isModified()) {
+					$affectedRows += $this->aPais->save($con);
+				}
+				$this->setPais($this->aPais);
+			}
 
+
 			// If this object has been modified, then save it to the database.
 			if ($this->isModified()) {
 				if ($this->isNew()) {
@@ -1276,7 +1364,13 @@
 				}
 			}
 
+			if ($this->aPais !== null) {
+				if (!$this->aPais->validate($columns)) {
+					$failureMap = array_merge($failureMap, $this->aPais->getValidationFailures());
+				}
+			}
 
+
 			if (($retval = AlumnoPeer::doValidate($this, $columns)) !== true) {
 				$failureMap = array_merge($failureMap, $retval);
 			}
@@ -1398,41 +1492,47 @@
 				return $this->getTelefono();
 				break;
 			case 9:
+				return $this->getLugarNacimiento();
+				break;
+			case 10:
 				return $this->getFkTipodocumentoId();
 				break;
-			case 10:
+			case 11:
 				return $this->getNroDocumento();
 				break;
-			case 11:
+			case 12:
 				return $this->getSexo();
 				break;
-			case 12:
+			case 13:
 				return $this->getEmail();
 				break;
-			case 13:
+			case 14:
 				return $this->getDistanciaEscuela();
 				break;
-			case 14:
+			case 15:
 				return $this->getHermanosEscuela();
 				break;
-			case 15:
+			case 16:
 				return $this->getHijoMaestroEscuela();
 				break;
-			case 16:
+			case 17:
 				return $this->getFkEstablecimientoId();
 				break;
-			case 17:
+			case 18:
 				return $this->getFkCuentaId();
 				break;
-			case 18:
+			case 19:
 				return $this->getCertificadoMedico();
 				break;
-			case 19:
+			case 20:
 				return $this->getActivo();
 				break;
-			case 20:
+			case 21:
 				return $this->getFkConceptobajaId();
 				break;
+			case 22:
+				return $this->getFkPaisId();
+				break;
 			default:
 				return null;
 				break;
@@ -1462,18 +1562,20 @@
 			$keys[6] => $this->getCodigoPostal(),
 			$keys[7] => $this->getFkProvinciaId(),
 			$keys[8] => $this->getTelefono(),
-			$keys[9] => $this->getFkTipodocumentoId(),
-			$keys[10] => $this->getNroDocumento(),
-			$keys[11] => $this->getSexo(),
-			$keys[12] => $this->getEmail(),
-			$keys[13] => $this->getDistanciaEscuela(),
-			$keys[14] => $this->getHermanosEscuela(),
-			$keys[15] => $this->getHijoMaestroEscuela(),
-			$keys[16] => $this->getFkEstablecimientoId(),
-			$keys[17] => $this->getFkCuentaId(),
-			$keys[18] => $this->getCertificadoMedico(),
-			$keys[19] => $this->getActivo(),
-			$keys[20] => $this->getFkConceptobajaId(),
+			$keys[9] => $this->getLugarNacimiento(),
+			$keys[10] => $this->getFkTipodocumentoId(),
+			$keys[11] => $this->getNroDocumento(),
+			$keys[12] => $this->getSexo(),
+			$keys[13] => $this->getEmail(),
+			$keys[14] => $this->getDistanciaEscuela(),
+			$keys[15] => $this->getHermanosEscuela(),
+			$keys[16] => $this->getHijoMaestroEscuela(),
+			$keys[17] => $this->getFkEstablecimientoId(),
+			$keys[18] => $this->getFkCuentaId(),
+			$keys[19] => $this->getCertificadoMedico(),
+			$keys[20] => $this->getActivo(),
+			$keys[21] => $this->getFkConceptobajaId(),
+			$keys[22] => $this->getFkPaisId(),
 		);
 		return $result;
 	}
@@ -1533,41 +1635,47 @@
 				$this->setTelefono($value);
 				break;
 			case 9:
+				$this->setLugarNacimiento($value);
+				break;
+			case 10:
 				$this->setFkTipodocumentoId($value);
 				break;
-			case 10:
+			case 11:
 				$this->setNroDocumento($value);
 				break;
-			case 11:
+			case 12:
 				$this->setSexo($value);
 				break;
-			case 12:
+			case 13:
 				$this->setEmail($value);
 				break;
-			case 13:
+			case 14:
 				$this->setDistanciaEscuela($value);
 				break;
-			case 14:
+			case 15:
 				$this->setHermanosEscuela($value);
 				break;
-			case 15:
+			case 16:
 				$this->setHijoMaestroEscuela($value);
 				break;
-			case 16:
+			case 17:
 				$this->setFkEstablecimientoId($value);
 				break;
-			case 17:
+			case 18:
 				$this->setFkCuentaId($value);
 				break;
-			case 18:
+			case 19:
 				$this->setCertificadoMedico($value);
 				break;
-			case 19:
+			case 20:
 				$this->setActivo($value);
 				break;
-			case 20:
+			case 21:
 				$this->setFkConceptobajaId($value);
 				break;
+			case 22:
+				$this->setFkPaisId($value);
+				break;
 		} // switch()
 	}
 
@@ -1600,18 +1708,20 @@
 		if (array_key_exists($keys[6], $arr)) $this->setCodigoPostal($arr[$keys[6]]);
 		if (array_key_exists($keys[7], $arr)) $this->setFkProvinciaId($arr[$keys[7]]);
 		if (array_key_exists($keys[8], $arr)) $this->setTelefono($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setFkTipodocumentoId($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setNroDocumento($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setSexo($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setEmail($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setDistanciaEscuela($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setHermanosEscuela($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setHijoMaestroEscuela($arr[$keys[15]]);
-		if (array_key_exists($keys[16], $arr)) $this->setFkEstablecimientoId($arr[$keys[16]]);
-		if (array_key_exists($keys[17], $arr)) $this->setFkCuentaId($arr[$keys[17]]);
-		if (array_key_exists($keys[18], $arr)) $this->setCertificadoMedico($arr[$keys[18]]);
-		if (array_key_exists($keys[19], $arr)) $this->setActivo($arr[$keys[19]]);
-		if (array_key_exists($keys[20], $arr)) $this->setFkConceptobajaId($arr[$keys[20]]);
+		if (array_key_exists($keys[9], $arr)) $this->setLugarNacimiento($arr[$keys[9]]);
+		if (array_key_exists($keys[10], $arr)) $this->setFkTipodocumentoId($arr[$keys[10]]);
+		if (array_key_exists($keys[11], $arr)) $this->setNroDocumento($arr[$keys[11]]);
+		if (array_key_exists($keys[12], $arr)) $this->setSexo($arr[$keys[12]]);
+		if (array_key_exists($keys[13], $arr)) $this->setEmail($arr[$keys[13]]);
+		if (array_key_exists($keys[14], $arr)) $this->setDistanciaEscuela($arr[$keys[14]]);
+		if (array_key_exists($keys[15], $arr)) $this->setHermanosEscuela($arr[$keys[15]]);
+		if (array_key_exists($keys[16], $arr)) $this->setHijoMaestroEscuela($arr[$keys[16]]);
+		if (array_key_exists($keys[17], $arr)) $this->setFkEstablecimientoId($arr[$keys[17]]);
+		if (array_key_exists($keys[18], $arr)) $this->setFkCuentaId($arr[$keys[18]]);
+		if (array_key_exists($keys[19], $arr)) $this->setCertificadoMedico($arr[$keys[19]]);
+		if (array_key_exists($keys[20], $arr)) $this->setActivo($arr[$keys[20]]);
+		if (array_key_exists($keys[21], $arr)) $this->setFkConceptobajaId($arr[$keys[21]]);
+		if (array_key_exists($keys[22], $arr)) $this->setFkPaisId($arr[$keys[22]]);
 	}
 
 	/**
@@ -1632,6 +1742,7 @@
 		if ($this->isColumnModified(AlumnoPeer::CODIGO_POSTAL)) $criteria->add(AlumnoPeer::CODIGO_POSTAL, $this->codigo_postal);
 		if ($this->isColumnModified(AlumnoPeer::FK_PROVINCIA_ID)) $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->fk_provincia_id);
 		if ($this->isColumnModified(AlumnoPeer::TELEFONO)) $criteria->add(AlumnoPeer::TELEFONO, $this->telefono);
+		if ($this->isColumnModified(AlumnoPeer::LUGAR_NACIMIENTO)) $criteria->add(AlumnoPeer::LUGAR_NACIMIENTO, $this->lugar_nacimiento);
 		if ($this->isColumnModified(AlumnoPeer::FK_TIPODOCUMENTO_ID)) $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->fk_tipodocumento_id);
 		if ($this->isColumnModified(AlumnoPeer::NRO_DOCUMENTO)) $criteria->add(AlumnoPeer::NRO_DOCUMENTO, $this->nro_documento);
 		if ($this->isColumnModified(AlumnoPeer::SEXO)) $criteria->add(AlumnoPeer::SEXO, $this->sexo);
@@ -1644,6 +1755,7 @@
 		if ($this->isColumnModified(AlumnoPeer::CERTIFICADO_MEDICO)) $criteria->add(AlumnoPeer::CERTIFICADO_MEDICO, $this->certificado_medico);
 		if ($this->isColumnModified(AlumnoPeer::ACTIVO)) $criteria->add(AlumnoPeer::ACTIVO, $this->activo);
 		if ($this->isColumnModified(AlumnoPeer::FK_CONCEPTOBAJA_ID)) $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->fk_conceptobaja_id);
+		if ($this->isColumnModified(AlumnoPeer::FK_PAIS_ID)) $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->fk_pais_id);
 
 		return $criteria;
 	}
@@ -1714,6 +1826,8 @@
 
 		$copyObj->setTelefono($this->telefono);
 
+		$copyObj->setLugarNacimiento($this->lugar_nacimiento);
+
 		$copyObj->setFkTipodocumentoId($this->fk_tipodocumento_id);
 
 		$copyObj->setNroDocumento($this->nro_documento);
@@ -1738,7 +1852,9 @@
 
 		$copyObj->setFkConceptobajaId($this->fk_conceptobaja_id);
 
+		$copyObj->setFkPaisId($this->fk_pais_id);
 
+
 		if ($deepCopy) {
 			// important: temporarily setNew(false) because this affects the behavior of
 			// the getter/setter methods for fkey referrer objects.
@@ -2075,6 +2191,57 @@
 	}
 
 	/**
+	 * Declares an association between this object and a Pais object.
+	 *
+	 * @param Pais $v
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function setPais($v)
+	{
+
+
+		if ($v === null) {
+			$this->setFkPaisId('0');
+		} else {
+			$this->setFkPaisId($v->getId());
+		}
+
+
+		$this->aPais = $v;
+	}
+
+
+	/**
+	 * Get the associated Pais object
+	 *
+	 * @param Connection Optional Connection object.
+	 * @return Pais The associated Pais object.
+	 * @throws PropelException
+	 */
+	public function getPais($con = null)
+	{
+		// include the related Peer class
+		include_once 'model/om/BasePaisPeer.php';
+
+		if ($this->aPais === null && ($this->fk_pais_id !== null)) {
+
+			$this->aPais = PaisPeer::retrieveByPK($this->fk_pais_id, $con);
+
+			/* The following can be used instead of the line above to
+			   guarantee the related object contains a reference
+			   to this object, but this level of coupling
+			   may be undesirable in many circumstances.
+			   As it can lead to a db query with many results that may
+			   never be used.
+			   $obj = PaisPeer::retrieveByPK($this->fk_pais_id, $con);
+			   $obj->addPaiss($this);
+			 */
+		}
+		return $this->aPais;
+	}
+
+	/**
 	 * Temporary storage of collRelCalendariovacunacionAlumnos to save a possible db hit in
 	 * the event objects are add to the collection, but the
 	 * complete collection is never requested.

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -24,7 +24,7 @@
 	const CLASS_DEFAULT = 'model.Alumno';
 
 	/** The total number of columns. */
-	const NUM_COLUMNS = 21;
+	const NUM_COLUMNS = 23;
 
 	/** The number of lazy-loaded columns. */
 	const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -57,6 +57,9 @@
 	/** the column name for the TELEFONO field */
 	const TELEFONO = 'alumno.TELEFONO';
 
+	/** the column name for the LUGAR_NACIMIENTO field */
+	const LUGAR_NACIMIENTO = 'alumno.LUGAR_NACIMIENTO';
+
 	/** the column name for the FK_TIPODOCUMENTO_ID field */
 	const FK_TIPODOCUMENTO_ID = 'alumno.FK_TIPODOCUMENTO_ID';
 
@@ -93,6 +96,9 @@
 	/** the column name for the FK_CONCEPTOBAJA_ID field */
 	const FK_CONCEPTOBAJA_ID = 'alumno.FK_CONCEPTOBAJA_ID';
 
+	/** the column name for the FK_PAIS_ID field */
+	const FK_PAIS_ID = 'alumno.FK_PAIS_ID';
+
 	/** The PHP to DB Name Mapping */
 	private static $phpNameMap = null;
 
@@ -104,10 +110,10 @@
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('Id', 'Nombre', 'Apellido', 'FechaNacimiento', 'Direccion', 'Ciudad', 'CodigoPostal', 'FkProvinciaId', 'Telefono', 'FkTipodocumentoId', 'NroDocumento', 'Sexo', 'Email', 'DistanciaEscuela', 'HermanosEscuela', 'HijoMaestroEscuela', 'FkEstablecimientoId', 'FkCuentaId', 'CertificadoMedico', 'Activo', 'FkConceptobajaId', ),
-		BasePeer::TYPE_COLNAME => array (AlumnoPeer::ID, AlumnoPeer::NOMBRE, AlumnoPeer::APELLIDO, AlumnoPeer::FECHA_NACIMIENTO, AlumnoPeer::DIRECCION, AlumnoPeer::CIUDAD, AlumnoPeer::CODIGO_POSTAL, AlumnoPeer::FK_PROVINCIA_ID, AlumnoPeer::TELEFONO, AlumnoPeer::FK_TIPODOCUMENTO_ID, AlumnoPeer::NRO_DOCUMENTO, AlumnoPeer::SEXO, AlumnoPeer::EMAIL, AlumnoPeer::DISTANCIA_ESCUELA, AlumnoPeer::HERMANOS_ESCUELA, AlumnoPeer::HIJO_MAESTRO_ESCUELA, AlumnoPeer::FK_ESTABLECIMIENTO_ID, AlumnoPeer::FK_CUENTA_ID, AlumnoPeer::CERTIFICADO_MEDICO, AlumnoPeer::ACTIVO, AlumnoPeer::FK_CONCEPTOBAJA_ID, ),
-		BasePeer::TYPE_FIELDNAME => array ('id', 'nombre', 'apellido', 'fecha_nacimiento', 'direccion', 'ciudad', 'codigo_postal', 'fk_provincia_id', 'telefono', 'fk_tipodocumento_id', 'nro_documento', 'sexo', 'email', 'distancia_escuela', 'hermanos_escuela', 'hijo_maestro_escuela', 'fk_establecimiento_id', 'fk_cuenta_id', 'certificado_medico', 'activo', 'fk_conceptobaja_id', ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
+		BasePeer::TYPE_PHPNAME => array ('Id', 'Nombre', 'Apellido', 'FechaNacimiento', 'Direccion', 'Ciudad', 'CodigoPostal', 'FkProvinciaId', 'Telefono', 'LugarNacimiento', 'FkTipodocumentoId', 'NroDocumento', 'Sexo', 'Email', 'DistanciaEscuela', 'HermanosEscuela', 'HijoMaestroEscuela', 'FkEstablecimientoId', 'FkCuentaId', 'CertificadoMedico', 'Activo', 'FkConceptobajaId', 'FkPaisId', ),
+		BasePeer::TYPE_COLNAME => array (AlumnoPeer::ID, AlumnoPeer::NOMBRE, AlumnoPeer::APELLIDO, AlumnoPeer::FECHA_NACIMIENTO, AlumnoPeer::DIRECCION, AlumnoPeer::CIUDAD, AlumnoPeer::CODIGO_POSTAL, AlumnoPeer::FK_PROVINCIA_ID, AlumnoPeer::TELEFONO, AlumnoPeer::LUGAR_NACIMIENTO, AlumnoPeer::FK_TIPODOCUMENTO_ID, AlumnoPeer::NRO_DOCUMENTO, AlumnoPeer::SEXO, AlumnoPeer::EMAIL, AlumnoPeer::DISTANCIA_ESCUELA, AlumnoPeer::HERMANOS_ESCUELA, AlumnoPeer::HIJO_MAESTRO_ESCUELA, AlumnoPeer::FK_ESTABLECIMIENTO_ID, AlumnoPeer::FK_CUENTA_ID, AlumnoPeer::CERTIFICADO_MEDICO, AlumnoPeer::ACTIVO, AlumnoPeer::FK_CONCEPTOBAJA_ID, AlumnoPeer::FK_PAIS_ID, ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'nombre', 'apellido', 'fecha_nacimiento', 'direccion', 'ciudad', 'codigo_postal', 'fk_provincia_id', 'telefono', 'lugar_nacimiento', 'fk_tipodocumento_id', 'nro_documento', 'sexo', 'email', 'distancia_escuela', 'hermanos_escuela', 'hijo_maestro_escuela', 'fk_establecimiento_id', 'fk_cuenta_id', 'certificado_medico', 'activo', 'fk_conceptobaja_id', 'fk_pais_id', ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
 	);
 
 	/**
@@ -117,10 +123,10 @@
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Nombre' => 1, 'Apellido' => 2, 'FechaNacimiento' => 3, 'Direccion' => 4, 'Ciudad' => 5, 'CodigoPostal' => 6, 'FkProvinciaId' => 7, 'Telefono' => 8, 'FkTipodocumentoId' => 9, 'NroDocumento' => 10, 'Sexo' => 11, 'Email' => 12, 'DistanciaEscuela' => 13, 'HermanosEscuela' => 14, 'HijoMaestroEscuela' => 15, 'FkEstablecimientoId' => 16, 'FkCuentaId' => 17, 'CertificadoMedico' => 18, 'Activo' => 19, 'FkConceptobajaId' => 20, ),
-		BasePeer::TYPE_COLNAME => array (AlumnoPeer::ID => 0, AlumnoPeer::NOMBRE => 1, AlumnoPeer::APELLIDO => 2, AlumnoPeer::FECHA_NACIMIENTO => 3, AlumnoPeer::DIRECCION => 4, AlumnoPeer::CIUDAD => 5, AlumnoPeer::CODIGO_POSTAL => 6, AlumnoPeer::FK_PROVINCIA_ID => 7, AlumnoPeer::TELEFONO => 8, AlumnoPeer::FK_TIPODOCUMENTO_ID => 9, AlumnoPeer::NRO_DOCUMENTO => 10, AlumnoPeer::SEXO => 11, AlumnoPeer::EMAIL => 12, AlumnoPeer::DISTANCIA_ESCUELA => 13, AlumnoPeer::HERMANOS_ESCUELA => 14, AlumnoPeer::HIJO_MAESTRO_ESCUELA => 15, AlumnoPeer::FK_ESTABLECIMIENTO_ID => 16, AlumnoPeer::FK_CUENTA_ID => 17, AlumnoPeer::CERTIFICADO_MEDICO => 18, AlumnoPeer::ACTIVO => 19, AlumnoPeer::FK_CONCEPTOBAJA_ID => 20, ),
-		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'nombre' => 1, 'apellido' => 2, 'fecha_nacimiento' => 3, 'direccion' => 4, 'ciudad' => 5, 'codigo_postal' => 6, 'fk_provincia_id' => 7, 'telefono' => 8, 'fk_tipodocumento_id' => 9, 'nro_documento' => 10, 'sexo' => 11, 'email' => 12, 'distancia_escuela' => 13, 'hermanos_escuela' => 14, 'hijo_maestro_escuela' => 15, 'fk_establecimiento_id' => 16, 'fk_cuenta_id' => 17, 'certificado_medico' => 18, 'activo' => 19, 'fk_conceptobaja_id' => 20, ),
-		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
+		BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Nombre' => 1, 'Apellido' => 2, 'FechaNacimiento' => 3, 'Direccion' => 4, 'Ciudad' => 5, 'CodigoPostal' => 6, 'FkProvinciaId' => 7, 'Telefono' => 8, 'LugarNacimiento' => 9, 'FkTipodocumentoId' => 10, 'NroDocumento' => 11, 'Sexo' => 12, 'Email' => 13, 'DistanciaEscuela' => 14, 'HermanosEscuela' => 15, 'HijoMaestroEscuela' => 16, 'FkEstablecimientoId' => 17, 'FkCuentaId' => 18, 'CertificadoMedico' => 19, 'Activo' => 20, 'FkConceptobajaId' => 21, 'FkPaisId' => 22, ),
+		BasePeer::TYPE_COLNAME => array (AlumnoPeer::ID => 0, AlumnoPeer::NOMBRE => 1, AlumnoPeer::APELLIDO => 2, AlumnoPeer::FECHA_NACIMIENTO => 3, AlumnoPeer::DIRECCION => 4, AlumnoPeer::CIUDAD => 5, AlumnoPeer::CODIGO_POSTAL => 6, AlumnoPeer::FK_PROVINCIA_ID => 7, AlumnoPeer::TELEFONO => 8, AlumnoPeer::LUGAR_NACIMIENTO => 9, AlumnoPeer::FK_TIPODOCUMENTO_ID => 10, AlumnoPeer::NRO_DOCUMENTO => 11, AlumnoPeer::SEXO => 12, AlumnoPeer::EMAIL => 13, AlumnoPeer::DISTANCIA_ESCUELA => 14, AlumnoPeer::HERMANOS_ESCUELA => 15, AlumnoPeer::HIJO_MAESTRO_ESCUELA => 16, AlumnoPeer::FK_ESTABLECIMIENTO_ID => 17, AlumnoPeer::FK_CUENTA_ID => 18, AlumnoPeer::CERTIFICADO_MEDICO => 19, AlumnoPeer::ACTIVO => 20, AlumnoPeer::FK_CONCEPTOBAJA_ID => 21, AlumnoPeer::FK_PAIS_ID => 22, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'nombre' => 1, 'apellido' => 2, 'fecha_nacimiento' => 3, 'direccion' => 4, 'ciudad' => 5, 'codigo_postal' => 6, 'fk_provincia_id' => 7, 'telefono' => 8, 'lugar_nacimiento' => 9, 'fk_tipodocumento_id' => 10, 'nro_documento' => 11, 'sexo' => 12, 'email' => 13, 'distancia_escuela' => 14, 'hermanos_escuela' => 15, 'hijo_maestro_escuela' => 16, 'fk_establecimiento_id' => 17, 'fk_cuenta_id' => 18, 'certificado_medico' => 19, 'activo' => 20, 'fk_conceptobaja_id' => 21, 'fk_pais_id' => 22, ),
+		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
 	);
 
 	/**
@@ -239,6 +245,8 @@
 
 		$criteria->addSelectColumn(AlumnoPeer::TELEFONO);
 
+		$criteria->addSelectColumn(AlumnoPeer::LUGAR_NACIMIENTO);
+
 		$criteria->addSelectColumn(AlumnoPeer::FK_TIPODOCUMENTO_ID);
 
 		$criteria->addSelectColumn(AlumnoPeer::NRO_DOCUMENTO);
@@ -263,6 +271,8 @@
 
 		$criteria->addSelectColumn(AlumnoPeer::FK_CONCEPTOBAJA_ID);
 
+		$criteria->addSelectColumn(AlumnoPeer::FK_PAIS_ID);
+
 	}
 
 	const COUNT = 'COUNT(alumno.ID)';
@@ -588,6 +598,45 @@
 
 
 	/**
+	 * Returns the number of rows matching criteria, joining the related Pais table
+	 *
+	 * @param Criteria $c
+	 * @param boolean $distinct Whether to select only distinct columns (You can also set DISTINCT modifier in Criteria).
+	 * @param Connection $con
+	 * @return int Number of matching rows.
+	 */
+	public static function doCountJoinPais(Criteria $criteria, $distinct = false, $con = null)
+	{
+		// we're going to modify criteria, so copy it first
+		$criteria = clone $criteria;
+		
+		// clear out anything that might confuse the ORDER BY clause
+		$criteria->clearSelectColumns()->clearOrderByColumns();
+		if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+			$criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT);
+		} else {
+			$criteria->addSelectColumn(AlumnoPeer::COUNT);
+		}
+		
+		// just in case we're grouping: add those columns to the select statement
+		foreach($criteria->getGroupByColumns() as $column)
+		{
+			$criteria->addSelectColumn($column);
+		}
+
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
+		$rs = AlumnoPeer::doSelectRS($criteria, $con);
+		if ($rs->next()) {
+			return $rs->getInt(1);
+		} else {
+			// no rows returned; we infer that means 0 matches.
+			return 0;
+		}
+	}
+
+
+	/**
 	 * Selects a collection of Alumno objects pre-filled with their Tipodocumento objects.
 	 *
 	 * @return array Array of Alumno objects.
@@ -878,6 +927,64 @@
 
 
 	/**
+	 * Selects a collection of Alumno objects pre-filled with their Pais objects.
+	 *
+	 * @return array Array of Alumno objects.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doSelectJoinPais(Criteria $c, $con = null)
+	{
+		$c = clone $c;
+
+		// Set the correct dbName if it has not been overridden
+		if ($c->getDbName() == Propel::getDefaultDB()) {
+			$c->setDbName(self::DATABASE_NAME);
+		}
+
+		AlumnoPeer::addSelectColumns($c);
+		$startcol = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1;
+		PaisPeer::addSelectColumns($c);
+
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+		$rs = BasePeer::doSelect($c, $con);
+		$results = array();
+
+		while($rs->next()) {
+
+			$omClass = AlumnoPeer::getOMClass();
+
+			$cls = Propel::import($omClass);
+			$obj1 = new $cls();
+			$obj1->hydrate($rs);
+
+			$omClass = PaisPeer::getOMClass();
+
+			$cls = Propel::import($omClass);
+			$obj2 = new $cls();
+			$obj2->hydrate($rs, $startcol);
+
+			$newObject = true;
+			foreach($results as $temp_obj1) {
+				$temp_obj2 = $temp_obj1->getPais(); //CHECKME
+				if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) {
+					$newObject = false;
+					// e.g. $author->addBookRelatedByBookId()
+					$temp_obj2->addAlumno($obj1); //CHECKME
+					break;
+				}
+			}
+			if ($newObject) {
+				$obj2->initAlumnos();
+				$obj2->addAlumno($obj1); //CHECKME
+			}
+			$results[] = $obj1;
+		}
+		return $results;
+	}
+
+
+	/**
 	 * Returns the number of rows matching criteria, joining all related tables
 	 *
 	 * @param Criteria $c
@@ -913,6 +1020,8 @@
 
 		$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = AlumnoPeer::doSelectRS($criteria, $con);
 		if ($rs->next()) {
 			return $rs->getInt(1);
@@ -957,6 +1066,9 @@
 		ConceptobajaPeer::addSelectColumns($c);
 		$startcol7 = $startcol6 + ConceptobajaPeer::NUM_COLUMNS;
 
+		PaisPeer::addSelectColumns($c);
+		$startcol8 = $startcol7 + PaisPeer::NUM_COLUMNS;
+
 		$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
 
 		$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -967,6 +1079,8 @@
 
 		$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = BasePeer::doSelect($c, $con);
 		$results = array();
 		
@@ -1109,6 +1223,32 @@
 				$obj6->addAlumno($obj1);
 			}
 
+				
+				// Add objects for joined Pais rows
+	
+			$omClass = PaisPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj7 = new $cls();
+			$obj7->hydrate($rs, $startcol7);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj7 = $temp_obj1->getPais(); // CHECKME
+				if ($temp_obj7->getPrimaryKey() === $obj7->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj7->addAlumno($obj1); // CHECKME
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj7->initAlumnos();
+				$obj7->addAlumno($obj1);
+			}
+
 			$results[] = $obj1;
 		}
 		return $results;
@@ -1150,6 +1290,8 @@
 
 		$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = AlumnoPeer::doSelectRS($criteria, $con);
 		if ($rs->next()) {
 			return $rs->getInt(1);
@@ -1195,6 +1337,8 @@
 
 		$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = AlumnoPeer::doSelectRS($criteria, $con);
 		if ($rs->next()) {
 			return $rs->getInt(1);
@@ -1240,6 +1384,8 @@
 
 		$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = AlumnoPeer::doSelectRS($criteria, $con);
 		if ($rs->next()) {
 			return $rs->getInt(1);
@@ -1285,6 +1431,8 @@
 
 		$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = AlumnoPeer::doSelectRS($criteria, $con);
 		if ($rs->next()) {
 			return $rs->getInt(1);
@@ -1330,6 +1478,8 @@
 
 		$criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
 
+		$criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
 		$rs = AlumnoPeer::doSelectRS($criteria, $con);
 		if ($rs->next()) {
 			return $rs->getInt(1);
@@ -1341,6 +1491,53 @@
 
 
 	/**
+	 * Returns the number of rows matching criteria, joining the related Pais table
+	 *
+	 * @param Criteria $c
+	 * @param boolean $distinct Whether to select only distinct columns (You can also set DISTINCT modifier in Criteria).
+	 * @param Connection $con
+	 * @return int Number of matching rows.
+	 */
+	public static function doCountJoinAllExceptPais(Criteria $criteria, $distinct = false, $con = null)
+	{
+		// we're going to modify criteria, so copy it first
+		$criteria = clone $criteria;
+		
+		// clear out anything that might confuse the ORDER BY clause
+		$criteria->clearSelectColumns()->clearOrderByColumns();
+		if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+			$criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT);
+		} else {
+			$criteria->addSelectColumn(AlumnoPeer::COUNT);
+		}
+		
+		// just in case we're grouping: add those columns to the select statement
+		foreach($criteria->getGroupByColumns() as $column)
+		{
+			$criteria->addSelectColumn($column);
+		}
+
+		$criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
+
+		$criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
+
+		$criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID);
+
+		$criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
+
+		$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
+
+		$rs = AlumnoPeer::doSelectRS($criteria, $con);
+		if ($rs->next()) {
+			return $rs->getInt(1);
+		} else {
+			// no rows returned; we infer that means 0 matches.
+			return 0;
+		}
+	}
+
+
+	/**
 	 * Selects a collection of Alumno objects pre-filled with all related objects except Tipodocumento.
 	 *
 	 * @return array Array of Alumno objects.
@@ -1373,6 +1570,9 @@
 		ConceptobajaPeer::addSelectColumns($c);
 		$startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
 
+		PaisPeer::addSelectColumns($c);
+		$startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS;
+
 		$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
 
 		$c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID);
@@ -1381,7 +1581,9 @@
 
 		$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
 
+
 		$rs = BasePeer::doSelect($c, $con);
 		$results = array();
 		
@@ -1485,6 +1687,29 @@
 				$obj5->addAlumno($obj1);
 			}
 
+			$omClass = PaisPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj6  = new $cls();
+			$obj6->hydrate($rs, $startcol6);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj6 = $temp_obj1->getPais(); //CHECKME
+				if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj6->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj6->initAlumnos();
+				$obj6->addAlumno($obj1);
+			}
+
 			$results[] = $obj1;
 		}
 		return $results;
@@ -1524,6 +1749,9 @@
 		ConceptobajaPeer::addSelectColumns($c);
 		$startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
 
+		PaisPeer::addSelectColumns($c);
+		$startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS;
+
 		$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
 
 		$c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID);
@@ -1532,7 +1760,9 @@
 
 		$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
 
+
 		$rs = BasePeer::doSelect($c, $con);
 		$results = array();
 		
@@ -1636,6 +1866,29 @@
 				$obj5->addAlumno($obj1);
 			}
 
+			$omClass = PaisPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj6  = new $cls();
+			$obj6->hydrate($rs, $startcol6);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj6 = $temp_obj1->getPais(); //CHECKME
+				if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj6->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj6->initAlumnos();
+				$obj6->addAlumno($obj1);
+			}
+
 			$results[] = $obj1;
 		}
 		return $results;
@@ -1675,6 +1928,9 @@
 		ConceptobajaPeer::addSelectColumns($c);
 		$startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
 
+		PaisPeer::addSelectColumns($c);
+		$startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS;
+
 		$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
 
 		$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -1683,7 +1939,9 @@
 
 		$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
 
+
 		$rs = BasePeer::doSelect($c, $con);
 		$results = array();
 		
@@ -1787,6 +2045,29 @@
 				$obj5->addAlumno($obj1);
 			}
 
+			$omClass = PaisPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj6  = new $cls();
+			$obj6->hydrate($rs, $startcol6);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj6 = $temp_obj1->getPais(); //CHECKME
+				if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj6->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj6->initAlumnos();
+				$obj6->addAlumno($obj1);
+			}
+
 			$results[] = $obj1;
 		}
 		return $results;
@@ -1826,6 +2107,9 @@
 		ConceptobajaPeer::addSelectColumns($c);
 		$startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
 
+		PaisPeer::addSelectColumns($c);
+		$startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS;
+
 		$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
 
 		$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -1834,7 +2118,9 @@
 
 		$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
 
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
 
+
 		$rs = BasePeer::doSelect($c, $con);
 		$results = array();
 		
@@ -1938,6 +2224,29 @@
 				$obj5->addAlumno($obj1);
 			}
 
+			$omClass = PaisPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj6  = new $cls();
+			$obj6->hydrate($rs, $startcol6);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj6 = $temp_obj1->getPais(); //CHECKME
+				if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj6->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj6->initAlumnos();
+				$obj6->addAlumno($obj1);
+			}
+
 			$results[] = $obj1;
 		}
 		return $results;
@@ -1977,6 +2286,9 @@
 		ProvinciaPeer::addSelectColumns($c);
 		$startcol6 = $startcol5 + ProvinciaPeer::NUM_COLUMNS;
 
+		PaisPeer::addSelectColumns($c);
+		$startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS;
+
 		$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
 
 		$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -1985,7 +2297,9 @@
 
 		$c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
 
+		$c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
 
+
 		$rs = BasePeer::doSelect($c, $con);
 		$results = array();
 		
@@ -2089,12 +2403,214 @@
 				$obj5->addAlumno($obj1);
 			}
 
+			$omClass = PaisPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj6  = new $cls();
+			$obj6->hydrate($rs, $startcol6);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj6 = $temp_obj1->getPais(); //CHECKME
+				if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj6->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj6->initAlumnos();
+				$obj6->addAlumno($obj1);
+			}
+
 			$results[] = $obj1;
 		}
 		return $results;
 	}
 
+
 	/**
+	 * Selects a collection of Alumno objects pre-filled with all related objects except Pais.
+	 *
+	 * @return array Array of Alumno objects.
+	 * @throws PropelException Any exceptions caught during processing will be
+	 *		 rethrown wrapped into a PropelException.
+	 */
+	public static function doSelectJoinAllExceptPais(Criteria $c, $con = null)
+	{
+		$c = clone $c;
+
+		// Set the correct dbName if it has not been overridden
+		// $c->getDbName() will return the same object if not set to another value
+		// so == check is okay and faster
+		if ($c->getDbName() == Propel::getDefaultDB()) {
+			$c->setDbName(self::DATABASE_NAME);
+		}
+
+		AlumnoPeer::addSelectColumns($c);
+		$startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1;
+
+		TipodocumentoPeer::addSelectColumns($c);
+		$startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS;
+
+		CuentaPeer::addSelectColumns($c);
+		$startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS;
+
+		EstablecimientoPeer::addSelectColumns($c);
+		$startcol5 = $startcol4 + EstablecimientoPeer::NUM_COLUMNS;
+
+		ProvinciaPeer::addSelectColumns($c);
+		$startcol6 = $startcol5 + ProvinciaPeer::NUM_COLUMNS;
+
+		ConceptobajaPeer::addSelectColumns($c);
+		$startcol7 = $startcol6 + ConceptobajaPeer::NUM_COLUMNS;
+
+		$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
+
+		$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
+
+		$c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID);
+
+		$c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
+
+		$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
+
+
+		$rs = BasePeer::doSelect($c, $con);
+		$results = array();
+		
+		while($rs->next()) {
+
+			$omClass = AlumnoPeer::getOMClass();
+
+			$cls = Propel::import($omClass);
+			$obj1 = new $cls();
+			$obj1->hydrate($rs);		
+
+			$omClass = TipodocumentoPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj2  = new $cls();
+			$obj2->hydrate($rs, $startcol2);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj2 = $temp_obj1->getTipodocumento(); //CHECKME
+				if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj2->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj2->initAlumnos();
+				$obj2->addAlumno($obj1);
+			}
+
+			$omClass = CuentaPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj3  = new $cls();
+			$obj3->hydrate($rs, $startcol3);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj3 = $temp_obj1->getCuenta(); //CHECKME
+				if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj3->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj3->initAlumnos();
+				$obj3->addAlumno($obj1);
+			}
+
+			$omClass = EstablecimientoPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj4  = new $cls();
+			$obj4->hydrate($rs, $startcol4);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj4 = $temp_obj1->getEstablecimiento(); //CHECKME
+				if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj4->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj4->initAlumnos();
+				$obj4->addAlumno($obj1);
+			}
+
+			$omClass = ProvinciaPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj5  = new $cls();
+			$obj5->hydrate($rs, $startcol5);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj5 = $temp_obj1->getProvincia(); //CHECKME
+				if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj5->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj5->initAlumnos();
+				$obj5->addAlumno($obj1);
+			}
+
+			$omClass = ConceptobajaPeer::getOMClass();
+
+	
+			$cls = Propel::import($omClass);
+			$obj6  = new $cls();
+			$obj6->hydrate($rs, $startcol6);
+			
+			$newObject = true;
+			for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
+				$temp_obj1 = $results[$j];
+				$temp_obj6 = $temp_obj1->getConceptobaja(); //CHECKME
+				if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
+					$newObject = false;
+					$temp_obj6->addAlumno($obj1);
+					break;
+				}
+			}
+			
+			if ($newObject) {
+				$obj6->initAlumnos();
+				$obj6->addAlumno($obj1);
+			}
+
+			$results[] = $obj1;
+		}
+		return $results;
+	}
+
+	/**
 	 * Returns the TableMap related to this peer.
 	 * This method is not needed for general use but a specific application could have a need.
 	 * @return TableMap

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -934,4 +934,53 @@
 		return $this->collAlumnos;
 	}
 
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Conceptobaja is new, it will return
+	 * an empty collection; or if this Conceptobaja has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Conceptobaja.
+	 */
+	public function getAlumnosJoinPais($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
 } // BaseConceptobaja

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -1453,7 +1453,56 @@
 		return $this->collAlumnos;
 	}
 
+
 	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Cuenta is new, it will return
+	 * an empty collection; or if this Cuenta has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Cuenta.
+	 */
+	public function getAlumnosJoinPais($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+	/**
 	 * Temporary storage of collResponsables to save a possible db hit in
 	 * the event objects are add to the collection, but the
 	 * complete collection is never requested.

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -1857,7 +1857,56 @@
 		return $this->collAlumnos;
 	}
 
+
 	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Establecimiento is new, it will return
+	 * an empty collection; or if this Establecimiento has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Establecimiento.
+	 */
+	public function getAlumnosJoinPais($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+	/**
 	 * Temporary storage of collCiclolectivos to save a possible db hit in
 	 * the event objects are add to the collection, but the
 	 * complete collection is never requested.

Modified: prosistem/alba/trunk/alba/lib/model/om/BasePais.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BasePais.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BasePais.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -68,6 +68,18 @@
 	protected $lastProvinciaCriteria = null;
 
 	/**
+	 * Collection to store aggregation of collAlumnos.
+	 * @var array
+	 */
+	protected $collAlumnos;
+
+	/**
+	 * The criteria used to select the current contents of collAlumnos.
+	 * @var Criteria
+	 */
+	protected $lastAlumnoCriteria = null;
+
+	/**
 	 * Flag to prevent endless save loop, if this object is referenced
 	 * by another object which falls in this transaction.
 	 * @var boolean
@@ -330,6 +342,14 @@
 				}
 			}
 
+			if ($this->collAlumnos !== null) {
+				foreach($this->collAlumnos as $referrerFK) {
+					if (!$referrerFK->isDeleted()) {
+						$affectedRows += $referrerFK->save($con);
+					}
+				}
+			}
+
 			$this->alreadyInSave = false;
 		}
 		return $affectedRows;
@@ -408,7 +428,15 @@
 					}
 				}
 
+				if ($this->collAlumnos !== null) {
+					foreach($this->collAlumnos as $referrerFK) {
+						if (!$referrerFK->validate($columns)) {
+							$failureMap = array_merge($failureMap, $referrerFK->getValidationFailures());
+						}
+					}
+				}
 
+
 			$this->alreadyInValidation = false;
 		}
 
@@ -631,6 +659,10 @@
 				$copyObj->addProvincia($relObj->copy($deepCopy));
 			}
 
+			foreach($this->getAlumnos() as $relObj) {
+				$copyObj->addAlumno($relObj->copy($deepCopy));
+			}
+
 		} // if ($deepCopy)
 
 
@@ -785,4 +817,356 @@
 		$l->setPais($this);
 	}
 
+	/**
+	 * Temporary storage of collAlumnos to save a possible db hit in
+	 * the event objects are add to the collection, but the
+	 * complete collection is never requested.
+	 * @return void
+	 */
+	public function initAlumnos()
+	{
+		if ($this->collAlumnos === null) {
+			$this->collAlumnos = array();
+		}
+	}
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Pais has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 * If this Pais is new, it will return
+	 * an empty collection or the current collection, the criteria
+	 * is ignored on a new object.
+	 *
+	 * @param Connection $con
+	 * @param Criteria $criteria
+	 * @throws PropelException
+	 */
+	public function getAlumnos($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+			   $this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				AlumnoPeer::addSelectColumns($criteria);
+				$this->collAlumnos = AlumnoPeer::doSelect($criteria, $con);
+			}
+		} else {
+			// criteria has no effect for a new object
+			if (!$this->isNew()) {
+				// the following code is to determine if a new query is
+				// called for.  If the criteria is the same as the last
+				// one, just return the collection.
+
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				AlumnoPeer::addSelectColumns($criteria);
+				if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+					$this->collAlumnos = AlumnoPeer::doSelect($criteria, $con);
+				}
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+		return $this->collAlumnos;
+	}
+
+	/**
+	 * Returns the number of related Alumnos.
+	 *
+	 * @param Criteria $criteria
+	 * @param boolean $distinct
+	 * @param Connection $con
+	 * @throws PropelException
+	 */
+	public function countAlumnos($criteria = null, $distinct = false, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+		return AlumnoPeer::doCount($criteria, $distinct, $con);
+	}
+
+	/**
+	 * Method called to associate a Alumno object to this object
+	 * through the Alumno foreign key attribute
+	 *
+	 * @param Alumno $l Alumno
+	 * @return void
+	 * @throws PropelException
+	 */
+	public function addAlumno(Alumno $l)
+	{
+		$this->collAlumnos[] = $l;
+		$l->setPais($this);
+	}
+
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Pais is new, it will return
+	 * an empty collection; or if this Pais has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Pais.
+	 */
+	public function getAlumnosJoinTipodocumento($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Pais is new, it will return
+	 * an empty collection; or if this Pais has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Pais.
+	 */
+	public function getAlumnosJoinCuenta($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Pais is new, it will return
+	 * an empty collection; or if this Pais has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Pais.
+	 */
+	public function getAlumnosJoinEstablecimiento($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Pais is new, it will return
+	 * an empty collection; or if this Pais has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Pais.
+	 */
+	public function getAlumnosJoinProvincia($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+
+	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Pais is new, it will return
+	 * an empty collection; or if this Pais has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Pais.
+	 */
+	public function getAlumnosJoinConceptobaja($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinConceptobaja($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinConceptobaja($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
 } // BasePais

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -1741,7 +1741,56 @@
 		return $this->collAlumnos;
 	}
 
+
 	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Provincia is new, it will return
+	 * an empty collection; or if this Provincia has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Provincia.
+	 */
+	public function getAlumnosJoinPais($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+	/**
 	 * Temporary storage of collResponsables to save a possible db hit in
 	 * the event objects are add to the collection, but the
 	 * complete collection is never requested.

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php	2007-02-12 19:41:32 UTC (rev 4181)
@@ -1045,7 +1045,56 @@
 		return $this->collAlumnos;
 	}
 
+
 	/**
+	 * If this collection has already been initialized with
+	 * an identical criteria, it returns the collection.
+	 * Otherwise if this Tipodocumento is new, it will return
+	 * an empty collection; or if this Tipodocumento has previously
+	 * been saved, it will retrieve related Alumnos from storage.
+	 *
+	 * This method is protected by default in order to keep the public
+	 * api reasonable.  You can provide public methods for those you
+	 * actually need in Tipodocumento.
+	 */
+	public function getAlumnosJoinPais($criteria = null, $con = null)
+	{
+		// include the Peer class
+		include_once 'model/om/BaseAlumnoPeer.php';
+		if ($criteria === null) {
+			$criteria = new Criteria();
+		}
+		elseif ($criteria instanceof Criteria)
+		{
+			$criteria = clone $criteria;
+		}
+
+		if ($this->collAlumnos === null) {
+			if ($this->isNew()) {
+				$this->collAlumnos = array();
+			} else {
+
+				$criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId());
+
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		} else {
+			// the following code is to determine if a new query is
+			// called for.  If the criteria is the same as the last
+			// one, just return the collection.
+
+			$criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId());
+
+			if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) {
+				$this->collAlumnos = AlumnoPeer::doSelectJoinPais($criteria, $con);
+			}
+		}
+		$this->lastAlumnoCriteria = $criteria;
+
+		return $this->collAlumnos;
+	}
+
+	/**
 	 * Temporary storage of collResponsables to save a possible db hit in
 	 * the event objects are add to the collection, but the
 	 * complete collection is never requested.

Added: prosistem/alba/trunk/alba/web/css/informes.css
===================================================================
--- prosistem/alba/trunk/alba/web/css/informes.css	2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/web/css/informes.css	2007-02-12 19:41:32 UTC (rev 4181)
@@ -0,0 +1,22 @@
+.titulo
+{
+  color: #000;
+  font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
+  font-size: 20px;
+  font-weight: bold
+}
+
+.subtitulo
+{
+  color: #000;
+  font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
+  font-size: 18px;
+  font-weight: bold
+}
+
+.texto
+{
+  color: #000;
+  font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
+  font-size: 17px;
+}


Property changes on: prosistem/alba/trunk/alba/web/css/informes.css
___________________________________________________________________
Name: svn:keywords
   + Id Date Author Rev URL

    

SVN Alba r4181 - in prosistem/alba/trunk/alba: apps/principal/lib/helper apps/principal/modules/alumno/config apps/principal/modules/informes/actions apps/principal/modules/informes/config apps/principal/modules/informes/templates config data/sql lib/model/map lib/model/om web/css

commits＠pressenter.com.ar

tags

participants (1)