From fb1bd35a4eafef68e0a990cc1e22d5b1482e0b95 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Fri, 4 May 2012 09:34:46 +0000
Subject: [PATCH] =?UTF-8?q?Se=20modifica=20la=20select=20de=20lista=20de?=
 =?UTF-8?q?=20ofertas=20para=20hacer=20join=20con=20pedido=20y=20usarios?=
 =?UTF-8?q?=20y=20sacar=20las=20descripciones=20y=20as=C3=AD=20poder=20ord?=
 =?UTF-8?q?enar=20por=20solicitud=20y=20candidato=20en=20dicha=20lista=20d?=
 =?UTF-8?q?e=20ofertas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Incam_Intranet/trunk@145 e2b1556b-49f8-d141-9351-52d6861a72d9
---
 src/Objects/ListaOfertas.php | 2 +-
 src/lista_ofertas.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Objects/ListaOfertas.php b/src/Objects/ListaOfertas.php
index 1665a2b..a933f92 100644
--- a/src/Objects/ListaOfertas.php
+++ b/src/Objects/ListaOfertas.php
@@ -60,7 +60,7 @@ LEFT JOIN pedidos on pedidos.oid = candidato_pedido.pedido";
 
         $bd = new BD();
         $resultado = $bd->execQuery($consulta);
-
+//echo $consulta;
         // Procesamos las ofertas.
         if (mysql_num_rows($resultado) == 0) {
             $this->ofertas = array();
diff --git a/src/lista_ofertas.php b/src/lista_ofertas.php
index 343b8b1..b2d1848 100644
--- a/src/lista_ofertas.php
+++ b/src/lista_ofertas.php
@@ -25,7 +25,7 @@ $modo = (!empty($_GET['modo'])) ? $_GET["modo"] : "";
 // sacado de http://patrickallaert.blogspot.com/2007/09/building-dynamic-sql-queries-elegant.html
 $cond = array();
 if ($tipoOfertas != "") {
-    $cond[] = "estado = '$tipoOfertas'";
+    $cond[] = "candidato_pedido.estado = '$tipoOfertas'";
 }
 
 $orden = array();