From 15e976f06d1b36eb593dd1fafa5cb95861bf1eea Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 6 May 2007 19:46:18 +0000
Subject: [PATCH] =?UTF-8?q?Simplification=20de=20la=20recherche=20ajax=20p?=
 =?UTF-8?q?our=20la=20liste=20deroulante=20des=20produits/services=20Ajout?=
 =?UTF-8?q?=20d'un=20indicateur=20par=20d=E9faut=20lors=20du=20traitement?=
 =?UTF-8?q?=20ajax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/html.form.class.php                      |  16 +++++++---------
 .../includes/scriptaculous/dolibarr_changes.txt |  15 +++++++++++++++
 htdocs/includes/scriptaculous/lib/prototype.js  |   2 ++
 htdocs/langs/en_US/main.lang                    |   1 +
 htdocs/langs/fr_FR/main.lang                    |   1 +
 htdocs/product/ajaxproducts.php                 |   4 ++--
 htdocs/theme/auguria/img/ajaxworking.gif        | Bin 0 -> 2483 bytes
 7 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 htdocs/includes/scriptaculous/dolibarr_changes.txt
 create mode 100644 htdocs/theme/auguria/img/ajaxworking.gif

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 7bef029ef88..26cdf1ceee4 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -406,12 +406,12 @@ class Form
 				{
 					print '<input type="text" size="45" id="pays" name="pays" value="'.$obj->libelle.'" '.$htmloption.' />';
 				}
-				print '<span id="indicator1" style="display: none">'.img_gif('Working...','ajaxworking').'</span>';
+				print '<span id="indicator" style="display: none">'.img_gif('Working...','ajaxworking').'</span>';
 				print '<input type="hidden" name="pays_id" id="pays_id" value="'.$pays_id.'" />';
 				print '</div>';
 				print '<div id="hint" class="autocomplete"></div>';
 				print '<script type="text/javascript">';
-				print 'new Ajax.Autocompleter(\'pays\',\'hint\',\''.DOL_URL_ROOT.'/societe/ajaxcountries.php\',{method: \'post\',paramName: \'pays\',indicator: \'indicator1\',afterUpdateElement: ac_return});';
+				print 'new Ajax.Autocompleter(\'pays\',\'hint\',\''.DOL_URL_ROOT.'/societe/ajaxcountries.php\',{method: \'post\',paramName: \'pays\',afterUpdateElement: ac_return});';
 				print '</script>';
 			}
 			else
@@ -821,13 +821,12 @@ class Form
     global $langs,$conf,$user;
     if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)
     {
-    	print $langs->trans("Ref").':<input type="text" size="8" name="ajkeyref'.$htmlname.'" id="ajkeyref'.$htmlname.'">&nbsp; &nbsp;';
-    	print $langs->trans("Label").':<input type="text" size="16" name="ajkeylabel'.$htmlname.'" id="ajkeylabel'.$htmlname.'">';
+    	print $langs->trans("RefOrLabel").' : <input type="text" size="16" name="'.$htmlname.'" id="'.$htmlname.'">';
+    	print '<span id="indicator" style="display: none">'.img_gif('Working...','ajaxworking').'</span>';
     	print '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="">';
     	print '<script type="text/javascript">';
     	print 'var url = \''.DOL_URL_ROOT.'/product/ajaxproducts.php\';';
-    	print 'new Form.Element.Observer($("ajkeyref'.$htmlname.'"), 1, function(){var myAjax = new Ajax.Updater( {success: \'ajdynfield'.$htmlname.'\'}, url, {method: \'get\', parameters: "keyref="+$("ajkeyref'.$htmlname.'").value+"&htmlname='.$htmlname.'&price_level='.$price_level.'"});});';
-    	print 'new Form.Element.Observer($("ajkeylabel'.$htmlname.'"), 1, function(){var myAjax = new Ajax.Updater( {success: \'ajdynfield'.$htmlname.'\'}, url, {method: \'get\', parameters: "keylabel="+$("ajkeylabel'.$htmlname.'").value+"&htmlname='.$htmlname.'&price_level='.$price_level.'"});});';
+    	print 'new Form.Element.Observer($("'.$htmlname.'"), 1, function(){var myAjax = new Ajax.Updater( {success: \'ajdynfield'.$htmlname.'\'}, url, {method: \'get\', parameters: "keysearch="+$("'.$htmlname.'").value+"&htmlname='.$htmlname.'&price_level='.$price_level.'"});});';
     	print '</script>';
     	print '<div class="notopnoleftnoright" id="ajdynfield'.$htmlname.'"></div>';
     }
@@ -844,7 +843,7 @@ class Form
      \param      filtretype      Pour filtre sur type de produit
      \param      limit           Limite sur le nombre de lignes retournées
   */
-  function select_produits_do($selected='',$htmlname='productid',$filtretype='',$limit=20,$price_level=0,$ajaxkeyref='',$ajaxkeylabel='')
+  function select_produits_do($selected='',$htmlname='productid',$filtretype='',$limit=20,$price_level=0,$ajaxkeysearch='')
   {
     global $langs,$conf,$user;
     $user->getrights("categorie");
@@ -867,8 +866,7 @@ class Form
 	$sql.= ' AND IFNULL(c.visible,1)=1';
       }
     if ($filtretype && $filtretype != '') $sql.=" AND p.fk_product_type=".$filtretype;
-    if ($ajaxkeyref && $ajaxkeyref != '') $sql.=" AND p.ref like '%".$ajaxkeyref."%'";
-    if ($ajaxkeylabel && $ajaxkeylabel != '') $sql.=" AND p.label like '%".$ajaxkeylabel."%'";
+    if ($ajaxkeysearch && $ajaxkeysearch != '') $sql.=" AND p.ref like '%".$ajaxkeysearch."%' OR p.label like '%".$ajaxkeysearch."%'";
     $sql.= " ORDER BY p.nbvente DESC";
     if ($limit) $sql.= " LIMIT $limit";
     
diff --git a/htdocs/includes/scriptaculous/dolibarr_changes.txt b/htdocs/includes/scriptaculous/dolibarr_changes.txt
new file mode 100644
index 00000000000..77759e9cbd0
--- /dev/null
+++ b/htdocs/includes/scriptaculous/dolibarr_changes.txt
@@ -0,0 +1,15 @@
+If scriptaculous files are replaced by new version, following changes must be done:
+
+* Edit prototype.js to set:
+***************************
+
+Ajax.Responders.register({
+  onCreate: function() {
+    $('indicator').show( );
+    Ajax.activeRequestCount++;
+  },
+  onComplete: function() {
+    $('indicator').hide( );
+    Ajax.activeRequestCount--;
+  }
+});
\ No newline at end of file
diff --git a/htdocs/includes/scriptaculous/lib/prototype.js b/htdocs/includes/scriptaculous/lib/prototype.js
index 0476b8fdccc..5ccac892133 100644
--- a/htdocs/includes/scriptaculous/lib/prototype.js
+++ b/htdocs/includes/scriptaculous/lib/prototype.js
@@ -793,9 +793,11 @@ Object.extend(Ajax.Responders, Enumerable);
 
 Ajax.Responders.register({
   onCreate: function() {
+    $('indicator').show( );
     Ajax.activeRequestCount++;
   },
   onComplete: function() {
+    $('indicator').hide( );
     Ajax.activeRequestCount--;
   }
 });
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 6eb7268d95e..d1b646e9192 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -110,6 +110,7 @@ Note=Note
 CurrentNote=Current note
 Title=Title
 Label=Label
+RefOrLabel=Ref. or label
 Info=Log
 Family=Family
 Description=Description
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 9ac514b7ef5..36985f16ef8 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -111,6 +111,7 @@ Note=Note
 CurrentNote=Note actuelle
 Title=Titre
 Label=Libellé
+RefOrLabel=Réf. ou libellé
 Info=Suivi
 Family=Famille
 Description=Description
diff --git a/htdocs/product/ajaxproducts.php b/htdocs/product/ajaxproducts.php
index fb3f9609758..aaedbef8c56 100644
--- a/htdocs/product/ajaxproducts.php
+++ b/htdocs/product/ajaxproducts.php
@@ -39,10 +39,10 @@ print "\n<body>";
 
 
 // Generation liste de produits
-if(isset($_GET['keyref']) && !empty($_GET['keyref']) || isset($_GET['keylabel']) && !empty($_GET['keylabel']))
+if(isset($_GET['keysearch']) && !empty($_GET['keysearch']))
 {
 	$form = new Form($db);
-	$form->select_produits_do("",$_GET["htmlname"],"","",$_GET["price_level"],$_GET["keyref"],$_GET["keylabel"]);
+	$form->select_produits_do("",$_GET["htmlname"],"","",$_GET["price_level"],$_GET["keysearch"]);
 }
 
 print "</body>"; 
diff --git a/htdocs/theme/auguria/img/ajaxworking.gif b/htdocs/theme/auguria/img/ajaxworking.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1e421c3113fbe4f3ddc96bb743cecc8530fd4c21
GIT binary patch
literal 2483
zcmeH|@oyVv8ONXZeece1&S&?vbM3s$lyl~-*J8@i1mUio^x92YZ_6TgOKH&h!?{#d
z3kbPTXg~tqa~zVewRml!B@m%YP}VMOB}dv1o4Oy)skT*xv4DgW2~`}UAec~b)d@1G
zES%e4x@vy`+Iv5obUK|r&*%9*&+U0)cXoRz3Q_nEgSEA_8#iuTyLRo;rArG73)9on
zV`F0{PMkP=`0&1c`+9nMy1KeLJ3C{s7{nkr!TYV-r{_}x{}%>QYvKOhfoFH+ioM&m
zS_B0}r9PD85HQHJ3T%xD(B~n=ff)c2)iAr#G%!Ru5}H@G1zw|8%@lJUgfv=Qwi}g-
zv}xn&OU8A9+IQfo?Y85L;I{X=YcTuv%x2R3=F$4W+yp2_LbT__sqNuRvAOMKabAir
zus!eBFG2mc+IbELBTAP)T;$HH(#*Dt=eqtOoGw|BKF$}p!*?7~R8ROGqDX=SZ5UM<
z$4usxeXK|yeP+<CbD&z>v^~RH8i^RXX*4~kuK#NMP{9{ydi{>htmrz+k+KD^nl+9k
zX8uTP9-HmMvZ)rIeD#qkBJf7li-B|Dxijj2pLnsvKMoRwNFeI_0Z4Mt1L4qA!h%!-
zLntosq2&gQ5~aUd6#TMGSw<Kh$4Gt9F#N@IMOxGQW~Pi^1&|-LWwS0vzaX-!7wl4=
zLiFp`vjcw5JX4aE^@02QlVscB5$1kl>7<P5Bd^D1-&s8H<@>eVZQD>w3x&J`a%f8$
zP!3atnZb8+mq#NSFBCX{Ory!7y$BURYI-@#g-7C>-b$XkY3DF`R6XQ%H2}*>S~q!a
zSWzX#KF0)1AcKO6X7^Pdnt$?#3+<niW{a1;b+O|Q=ldrfBlvzbTA=2;Ej2?v2q5hn
zEtt&_O7*lp=+ExLYteK!H(*$9(=B1~5|L!Jrcc3Afr3$(p-xIdGF`4V|Mlkr2_270
zmj9<Kqxh+4Z}VrRzSH@VlBoHgtxRF5Guh$6@C8cfO2;jKMchx)O7nO?QU${k2&vKJ
z5UU`<)CAO7MG&m%tnPYC2t!b@XqCQ>=|$g#=Sg3_*p><&eIXPd<YMk=lzKqn!f=p_
zgTVaUZeWR=+1l-W$A7o_rO1r_+Q2Js&f`R8X#BL#f6A2Gw_ck#zuy7&!o|TwcYq@F
zNp$6wCzE^Lutb;%PH@qOw&+vB%OTdLtsL<MCsH^Mz<s0`?Rh<GG{hu2xci@DkpImj
zU1t{kFV1;bRVH3AZK(covwXF$&W}1$j95p!npbr8pUn@5TQ*2)=e@~6fPxgaa(pxx
zcxIG6pdmyL3@sZ~5|V@LxN`z4dR$m9KK%AL(bA@IY;I{Jv|-`E`0u>k&ZY-81Of7{
zj!5wf8hge-rz2n4x*9?a9L%GCd(XEUPfa4-oVvni`zP0*`QFY4*(WLZK}$ix2o&IO
zo*9M^C=_|@z)DR(m8n~j+%ENugSjEgjr3cNytN}e#tu3TbZnHkC!AAE$?$U7Lz9Tz
z{^RCmsw!zJ(7Go;j<95*2Kjg9NSj%No7eY3Sm#-<{c8~HFI%Jc;-Fx+v}D}rNWu^t
zk#;phOJZphN!0p#)6EY{s!;{ub0jI9w#S{NQ^ATXE{ojo$#Ce<g@R}}Rjj4oc*W-h
zhp_bOv@05NNHhGb>+PcXRHnRg%&yG0#kpm>@AsY!hwkkN1Rc2xajfMeYw=)EF*Rt;
zYdAE(Ei(M(2-0sqYYBJh6eetSRJ_MW@w&|5>vdNkBBgD}q02w9o{JWXqV(=4`LXgi
z#2ruC8P+Y;;a41@C7FFDB}fP-t@l6p+b;b0)9PInZTI~M?krly-NrB`X)fw1iL6m5
zn{|*BO-g1ca7@E7y{}OFOD}zR@5|k;(b!W((vh8YJ6D-tk6zWYH~*T$+vN`1DD(c4
kB%|)E-2#k@pI5Dp<FI!=)ZN)_1MH_nJX1CPZFAW1Kl_s2BLDyZ

literal 0
HcmV?d00001