diff --git a/html/image/loading.gif b/html/image/loading.gif index 1d47a9dda..7962c5489 100644 Binary files a/html/image/loading.gif and b/html/image/loading.gif differ diff --git a/html/style.css b/html/style.css index 6eb25a09a..2fc231000 100644 --- a/html/style.css +++ b/html/style.css @@ -836,6 +836,7 @@ div.topmenu { h2.dossier { color:darkblue; font-style: italic; +display:inline; font-size:20px; margin:0; diff --git a/include/class_anc_acc_list.php b/include/class_anc_acc_list.php index 82588efac..6f22b52f1 100644 --- a/include/class_anc_acc_list.php +++ b/include/class_anc_acc_list.php @@ -29,9 +29,9 @@ require_once('class_anc_acc_link.php'); class Anc_Acc_List extends Anc_Acc_Link { /** - *@brief display form to get the parameter + *@brief display form to get the parameter * - card_poste 1 by card, 2 by account - * - from_poste + * - from_poste * - to_poste * - from from date * - to until date @@ -48,7 +48,7 @@ class Anc_Acc_List extends Anc_Acc_Link array('value'=>4,'label'=>'Par activité/Poste Comptable') ); - + $icard->selected=$this->card_poste; $r.=$icard->input(); $r.=HtmlInput::request_to_hidden(array('ac')); @@ -64,7 +64,7 @@ class Anc_Acc_List extends Anc_Acc_Link $date=($date != '')?" $date":''; $sql_from_poste=($this->from_poste!='')?" and po.po_name >= upper('".Database::escape_string($this->from_poste)."')":''; $sql_to_poste=($this->to_poste!='')?" and po.po_name <= upper('".Database::escape_string($this->to_poste)."')":''; - $this->arow=$this->db->get_array(" + $this->arow=$this->db->get_array(" SELECT po.po_id, po.pa_id, po.po_name, po.po_description, sum( CASE WHEN operation_analytique.oa_debit = true THEN operation_analytique.oa_amount * (-1)::numeric @@ -115,7 +115,7 @@ CASE WHEN operation_analytique.oa_debit = true THEN operation_analytique.oa_amount * (-1)::numeric ELSE operation_analytique.oa_amount END) <> 0::numeric order by po_name,name",array($this->pa_id)); - + } /** @@ -185,8 +185,8 @@ END) <> 0::numeric order by name,po_name",array($this->pa_id)); *@brief display the button export CSV *@param $p_hidden is a string containing hidden items *@return html string - */ - function show_button($p_hidden) + */ + function show_button($p_hidden="") { $r=""; $r.= '