From b01402bcf0c7b9a9b5518ac5175bd60fae34b814 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 24 Aug 2005 21:06:25 +0000
Subject: [PATCH] La recherche raccourci sur les produits regarde aussi dans la
 description et les notes

---
 htdocs/product/index.php |  8 +++--
 htdocs/product/liste.php | 65 +++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 4c7805db7a2..17ca8ee616e 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -55,9 +54,12 @@ print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\">";
 print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print "<tr $bc[0]><td>";
-print $langs->trans("Ref").':</td><td><input class="flat" type="text" size="18" name="sref"></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
+print $langs->trans("Ref").':</td><td><input class="flat" type="text" size="18" name="sref"></td>';
+print '<td rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
 print "<tr $bc[0]><td>";
-print $langs->trans("Label").':</td><td><input class="flat" type="text" size="18" name="snom"></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
+print $langs->trans("Other").':</td><td><input class="flat" type="text" size="18" name="sall"></td>';
+//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
+print '</tr>';
 print "</table></form><br>";
 
 
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index bac33b352ea..6cdd09a4746 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -40,24 +39,25 @@ if (!$user->rights->produit->lire)
 
 $sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];
 $snom=isset($_GET["snom"])?$_GET["snom"]:$_POST["snom"];
+$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
 
 $type=isset($_GET["type"])?$_GET["type"]:$_POST["type"];
 
 $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
 $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
-$page = $_GET["page"];
-
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-  
 if (! $sortfield) $sortfield="p.ref";
 if (! $sortorder) $sortorder="DESC";
+$page = $_GET["page"];
+$limit = $conf->liste_limit;
+$offset = $limit * $page ;
 
-if (isset($_POST["button_removefilter_x"])) {
+if (isset($_POST["button_removefilter_x"]))
+{
     $sref="";
     $snom="";
 }
 
+
 /*
  * Mode Liste
  *
@@ -70,40 +70,35 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 
 if ($_GET["fourn_id"] > 0)
 {
-  $fourn_id = $_GET["fourn_id"];
-  $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
+    $fourn_id = $_GET["fourn_id"];
+    $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
 }
-
-if ($_POST["mode"] == 'search')
+$sql .= " WHERE 1=1";
+if ($sall)
 {
-  $sql .= " WHERE p.ref like '%".$_POST["sall"]."%'";
-  $sql .= " OR p.label like '%".$_POST["sall"]."%'";
+    $sql .= " AND (p.label like '%".$sall."%' OR p.description like '%".$sall."%' OR p.note like '%".$sall."%')";
+}
+if (strlen($_GET["type"]) || strlen($_POST["type"]))
+{
+    $sql .= " AND p.fk_product_type = ".(strlen($_GET["type"])?$_GET["type"]:$_POST["type"]);
+}
+if ($sref)
+{
+    $sql .= " AND p.ref like '%".$sref."%'";
+}
+if ($snom)
+{
+    $sql .= " AND p.label like '%".$snom."%'";
+}
+if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0)
+{
+    $sql .= " AND p.envente = ".$_GET["envente"];
 }
 else
 {
-  $sql .= " WHERE 1=1";
-  if (strlen($_GET["type"]) || strlen($_POST["type"]))
+    if ($fourn_id == 0)
     {
-      $sql .= " AND p.fk_product_type = ".(strlen($_GET["type"])?$_GET["type"]:$_POST["type"]);
-    }
-  if ($sref)
-    {
-      $sql .= " AND p.ref like '%".$sref."%'";
-    }
-  if ($snom)
-    {
-      $sql .= " AND p.label like '%".$snom."%'";
-    }
-  if (isset($_GET["envente"]) && strlen($_GET["envente"]) > 0)
-    {
-      $sql .= " AND p.envente = ".$_GET["envente"];
-    }
-  else
-    {
-      if ($fourn_id == 0)
-	{
-	  $sql .= " AND p.envente = 1";
-	}
+        $sql .= " AND p.envente = 1";
     }
 }