From 98a1125eec6d5e4d6f97942cc71214776e06c845 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 31 Oct 2004 14:43:38 +0000
Subject: [PATCH] Fix: La fonction filtre des contacts et societes s'accorde
 bien avec la fonction tri.

---
 htdocs/contact/index.php | 5 +++++
 htdocs/societe.php       | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index 1cf07a95185..736cdbe022f 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -151,6 +151,11 @@ if ($result)
 
   print '<table class="noborder" width="100%">';
 
+  if ($contactname)
+    {
+      print $langs->trans("Filter")." (".$langs->trans("Lastname")." ".$langs->trans("or")." ".$langs->trans("Firstname")."): $contactname";
+    }
+
   // Ligne des titres
   print '<tr class="liste_titre">';
   print_liste_field_titre($langs->trans("Lastname"),"index.php","p.name", $begin, "&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
diff --git a/htdocs/societe.php b/htdocs/societe.php
index 58456d24164..edf0fe4d62e 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -140,8 +140,8 @@ if ($search_ville) {
 
 if ($socname)
 {
-  $title_filtre .= "'$socname'";
   $sql .= " AND s.nom like '%".$socname."%'";
+  $search_nom=$socname;
 }
 
 $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
@@ -156,6 +156,7 @@ if ($result)
 
   print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num);
     
+  // Lignes des titres
   print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
   print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params,"&search_nom=$search_nom&search_ville=$search_ville","",$sortfield);
@@ -163,6 +164,7 @@ if ($result)
   print '<td colspan="2" align="center">&nbsp;</td>';
   print "</tr>\n";
 
+  // Lignes des champs de filtre
   print '<form method="post" action="societe.php">';
   print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
   print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';