diff --git a/doc/manuel-fr.odt b/doc/manuel-fr.odt index 67e1b7edb..3c17a3cb0 100644 Binary files a/doc/manuel-fr.odt and b/doc/manuel-fr.odt differ diff --git a/doc/manuel-fr.pdf b/doc/manuel-fr.pdf index cf320c224..3b1e7a646 100644 Binary files a/doc/manuel-fr.pdf and b/doc/manuel-fr.pdf differ diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 01ad55b57..967a85f97 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -358,7 +358,7 @@ class Acc_Ledger "jr_grpt_id=j_grpt ". " left join tmp_pcmn on pcm_val=j_poste ". " where j_jrn_def=".$this->id. - " and ".$periode." order by j_date::date asc,substring(jr_pj_number,'\\\\d+$')::numeric asc,j_debit desc ". + " and ".$periode." order by j_date::date asc,substring(jr_pj_number,'\\\\d+$')::numeric asc,j_grpt,j_debit desc ". $cond_limite); } diff --git a/include/class_idate.php b/include/class_idate.php index 3cf5d2217..a3c4111ba 100644 --- a/include/class_idate.php +++ b/include/class_idate.php @@ -32,7 +32,8 @@ class IDate extends HtmlInput $this->name=($p_name==null)?$this->name:$p_name; $this->value=($p_value==null)?$this->value:$p_value; if ( $this->readOnly==true) return $this->display(); - $this->id=self::generate_id($this->name); + if( ! isset ($this->id)) + $this->id=self::generate_id($this->name); $r='