diff --git a/html/ajax_poste.php b/html/ajax_poste.php index 07198e9ff..d4195a443 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -28,7 +28,7 @@ - param c : control for storing the pcm_val -> javascript account - param l : control for storing the pcm_lib -> javascript label - param ctl : the node to update (ipopup) - - param q : the query -> javascript query + - param q : the acc_query -> javascript query * - ctl (to return) * * @@ -68,7 +68,7 @@ case "sf": $ipopup=$ctl; $attr=sprintf('this.ctl=\'%s\';',$ipopup); $ctl.='_content'; - $it=new IText('query'); + $it=new IText('acc_query'); $it->size=30; $it->value=(isset($q))?$q:''; $str_poste=$it->input(); diff --git a/html/image/loading.gif b/html/image/loading.gif index ac06a66bd..648ab1709 100644 Binary files a/html/image/loading.gif and b/html/image/loading.gif differ diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js index e384b16f1..e537fa79b 100644 --- a/html/js/accounting_item.js +++ b/html/js/accounting_item.js @@ -57,7 +57,7 @@ function PcmnUpdate(p_value,p_lib,p_parent,p_type,p_dossier) * - account the tag which will contains the number * - label the tag which will contains the label * - bracket if the value must be surrounded by [ ] - * - query for the initial query + * - acc_query for the initial query *\see ajax_poste.php */ function search_poste(obj) { @@ -76,7 +76,7 @@ function search_poste(obj) { if( obj.no_overwrite) {queryString+="&nover";} if( obj.bracket) {queryString+="&bracket";} if ( ! obj.noquery) { - if( obj.query) {queryString+="&q="+obj.query;} + if( obj.acc_query) {queryString+="&q="+obj.acc_query;} else { if ($(obj).account) { var e=$(obj).account; @@ -113,7 +113,7 @@ function search_get_poste(obj) { if ( obj.elements['jrn'] ) { queryString+="&j="+$F('jrn');} if ( obj.elements['account']) { queryString+="&c="+$F('account');} if ( obj.elements['label']) { queryString+="&l="+$F('label');} - if( obj.elements['query']) {queryString+="&q="+$F('query');} + if( obj.elements['acc_query']) {queryString+="&q="+$F('acc_query');} if (obj.ctl ) {queryString+="&ctl="+obj.ctl;} if( obj.elements['nosearch']) {queryString+="&nq";} if( obj.elements['nover']) {queryString+="&nover";} @@ -160,4 +160,4 @@ function result_poste_search(req) { */ function errorPoste() { alert('Ajax failed'); -} \ No newline at end of file +} diff --git a/html/parametre.php b/html/parametre.php index f1d7e1777..c6bbb377c 100644 --- a/html/parametre.php +++ b/html/parametre.php @@ -285,13 +285,21 @@ if ( $p_action=='company') { echo dossier::hidden(); echo "