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 ""; echo "".td(_('Nom société')).$all->input("p_name",$my->MY_NAME).""; + $all->value=''; echo "".td(_("Téléphone")).$all->input("p_tel",$my->MY_TEL).""; + $all->value=''; echo "".td(_("Fax")).$all->input("p_fax",$my->MY_FAX).""; + $all->value=''; echo "".td(_("Rue ")).$all->input("p_street",$my->MY_STREET).""; + $all->value=''; echo "".td(_("Numéro")).$all->input("p_no",$my->MY_NUMBER).""; + $all->value=''; echo "".td(_("Code Postal")).$all->input("p_cp",$my->MY_CP).""; + $all->value=''; echo "".td(_("Commune")).$all->input("p_Commune",$my->MY_COMMUNE).""; + $all->value=''; echo "".td(_("Pays")).$all->input("p_pays",$my->MY_PAYS).""; + $all->value=''; echo "".td(_("Numéro de Tva")).$all->input("p_tva",$my->MY_TVA).""; if ( $User->check_action(PARCA)==0) $compta->setReadonly(true); echo "".td(_("Utilisation de la compta. analytique")).$compta->input("p_compta",$array).""; diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index c13af3624..d8abf1a3b 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -1005,7 +1005,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj if ($this->check_periode() == true) { $lPeriode->p_id=$period; } else { - $lPeriode->find_periode($e_date); + $lPeriode->find_periode($date); } $ret=""; $ret.="
"; @@ -1027,7 +1027,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj $ret.=HtmlInput::hidden('date',$date); $ret.=HtmlInput::hidden('desc',$desc); - $ret.=HtmlInput::hidden('period',$period); + $ret.=HtmlInput::hidden('period',$lPeriode->p_id); $ret.=HtmlInput::hidden('e_pj',$e_pj); $ret.=HtmlInput::hidden('e_pj_suggest',$e_pj_suggest); $mt=microtime(true); diff --git a/include/class_action.php b/include/class_action.php index 2f0f375bf..6bcf2ea17 100644 --- a/include/class_action.php +++ b/include/class_action.php @@ -774,7 +774,8 @@ class Action $step=$_SESSION['g_pagesize']; $page=(isset($_GET['offset']))?$_GET['page']:1; $offset=(isset($_GET['offset']))?Database::escape_string($_GET['offset']):0; - $limit=" LIMIT $step OFFSET $offset "; + if ( $step != -1 ) $limit=" LIMIT $step OFFSET $offset "; + else $limit=''; $bar=jrn_navigation_bar($offset,$max_line,$step,$page); $Res=$this->db->exec_sql($sql.$limit); @@ -796,7 +797,7 @@ class Action // if there are no records return a message if ( sizeof ($a_row) == 0 or $a_row == false ) { - $r='
'; + $r='
'; $r.='
Aucun enregistrement trouvé'; $r.="
"; return $r; diff --git a/include/class_calendar.php b/include/class_calendar.php index bf5b23f0a..4504d3e04 100644 --- a/include/class_calendar.php +++ b/include/class_calendar.php @@ -51,7 +51,8 @@ class Calendar { $array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user'])); for ($i=0;$i'; + $p_array[$ind]=(isset($p_array[$ind]))?$p_array[$ind]:''; + $p_array[$ind].=''; $p_array[$ind].="".h($array[$i]['ag_title_fmt']).''; $p_array[$ind].="";