From 207462383969e868daa2d78ca0847ef9440e6714 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Tue, 5 Apr 2005 11:41:58 +0000
Subject: [PATCH] Resolution conflits cvs update

---
 htdocs/comm/prospect/pre.inc.php   | 17 ++++++++---------
 htdocs/comm/prospect/prospects.php | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/prospect/pre.inc.php b/htdocs/comm/prospect/pre.inc.php
index 97dcc6f450a..24e3a4ba135 100644
--- a/htdocs/comm/prospect/pre.inc.php
+++ b/htdocs/comm/prospect/pre.inc.php
@@ -19,13 +19,14 @@
  * $Source$
  *
  */
-
-/**     \file       htdocs/comm/prospect/pre.inc.php
-        \ingroup    commercial
-		\brief      Fichier de gestion du menu gauche de l'espace commercial
-		\version    $Revision$
+
+/*!
+  \file       htdocs/comm/prospect/pre.inc.php
+  \ingroup    commercial
+  \brief      Fichier de gestion du menu gauche de l'espace commercial
+  \version    $Revision$
 */
-
+
 require("../../main.inc.php");
 
 function llxHeader($head = "", $urlp = "") {
@@ -55,11 +56,9 @@ function llxHeader($head = "", $urlp = "") {
       $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
     }
 
+
   $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
 	
   left_menu($menu->liste);
-
 }
-
-
 ?>
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index 895668ac528..5fd83a938b2 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -83,6 +83,16 @@ if ($user->societe_id)
   $sql .= " AND s.idp = " .$user->societe_id;
 }
 
+if ($_GET["search_nom"])
+{
+  $sql .= " AND lower(s.nom) like '%".strtolower($_GET["search_nom"])."%'";
+}
+
+if ($_GET["search_ville"])
+{
+  $sql .= " AND lower(s.ville) like '%".strtolower($_GET["search_ville"])."%'";
+}
+
 if ($socname)
 {
   $sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'";
@@ -137,9 +147,12 @@ if ($result)
   print '<td valign="right">';
   print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">';
   print '</td><td>';
-  print '<input type="text" class="flat" name="search_ville" value="'.$_GET["search_nom"].'">';
-  print "</td><td>&nbsp;</td>";
-  print "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>";
+
+  print '<input type="text" name="search_ville" value="'.$_GET["search_ville"].'">';
+  print "</td>";
+  print "<td>";
+  print '<input type="submit"></td><td colspan="6">&nbsp;</td>';
+
   print "</tr>\n";
 
   $var=true;