From e3a1f317a80f7990ec2570577ef07d452ab966cb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 11 Oct 2010 09:31:10 +0000
Subject: [PATCH] Fix: uniformize json with search company Fix: search product
 with jQuery

---
 htdocs/core/class/html.form.class.php | 6 +++---
 htdocs/product/ajaxproducts.php       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2994eacd947..ceab58708f0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1147,11 +1147,11 @@ class Form
             if ($conf->global->MAIN_USE_NEW_JQUERY)
             {
                 // mode=2 means suppliers products
-                print ajax_autocompleter2('',$htmlname,DOL_URL_ROOT.'/product/ajaxproducts.php','outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished,'');
+                print ajax_autocompleter('',$htmlname,DOL_URL_ROOT.'/product/ajaxproducts.php','outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished,'');
 
                 print '<div class="ui-widget">';
-                print '<label for="'.$htmlname.'free">'.$langs->trans("RefOrLabel").':</label>';
-                print '<input id="'.$htmlname.'free" />';
+                print '<label for="search_'.$htmlname.'">'.$langs->trans("RefOrLabel").':</label>';
+                print '<input id="search_'.$htmlname.'" />';
                 print '</div>';
             }
             else
diff --git a/htdocs/product/ajaxproducts.php b/htdocs/product/ajaxproducts.php
index 30fd07015e4..b7f49f63f78 100644
--- a/htdocs/product/ajaxproducts.php
+++ b/htdocs/product/ajaxproducts.php
@@ -56,10 +56,10 @@ top_httphead();
 
 dol_syslog(join(',',$_POST));
 
-if (! isset($_GET['keysearch']) && ! isset($_GET['idprod'])) return;
+if (! isset($_GET['keysearch']) && ! isset($_GET['idprod']) && ! isset($_GET['idprodfournprice'])) return;
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey=isset($_GET['keysearch'])?$_GET['keysearch']:$_GET['idprod'];
+$searchkey=isset($_GET['keysearch'])?$_GET['keysearch']:($_GET['idprod']?$_GET['idprod']:$_GET['idprodfournprice']);
 $outjson=isset($_GET['outjson'])?$_GET['outjson']:0;
 
 // Get list of product.