Merged revisions 4050-4051,4054 via svnmerge from
svn+ssh://danydb@svn/svn/phpcompta/branches/rel550 ........ r4050 | danydb | 2011-03-24 11:35:16 +0100 (Thu, 24 Mar 2011) | 2 lines generate a id only if not set ........ r4051 | danydb | 2011-03-24 11:35:53 +0100 (Thu, 24 Mar 2011) | 1 line Update doc ........ r4054 | danydb | 2011-03-26 00:51:25 +0100 (Sat, 26 Mar 2011) | 1 line If no receipt, keep operation together ........
This commit is contained in:
parent
0e56504405
commit
3278e5a464
4 changed files with 3 additions and 2 deletions
Binary file not shown.
Binary file not shown.
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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='<input type="text" name="'.$this->name.'" id="'.$this->id.'"'.
|
||||
'style="border:solid 1px blue;"'.
|
||||
'size="8"'.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue