admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

date problem with CSV (str_jr_date instead of jr_date)

Browse source
This commit is contained in:
Dany De Bontridder 2011-12-04 05:32:34 +00:00
parent 91f0b0c903
commit 520f51c33c
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/class_acc_ledger.php
View file

@ -2442,7 +2442,7 @@ class Acc_Ledger extends jrn_def_sql
join parm_periode on p_id=jr_tech_per";
if ( ! empty($p_array)) extract($p_array);
$r_jrn=(isset($r_jrn))?$r_jrn:-1;
/* if no variable are set then give them a default
@ -2452,22 +2452,17 @@ class Acc_Ledger extends jrn_def_sql
$amount_min=0;
$amount_max=0;
if ( ! isset ($date_start))
{
$user=new User($this->db);
$exercice=$user->get_exercice();
$per=new Periode($this->db);
list($per_start,$per_end)=$per->limit_year($exercice);
list($date_start,$none)=$per_start->get_date_limit();
list($none,$date_end)=$per_end->get_date_limit();
}
$desc='';
$qcode=(isset($qcode))?$qcode:"";
if ( isset($qcodesearch_op)) $qcode=$qcodesearch_op;
$accounting=(isset($accounting))?$accounting:"";
$periode=new Periode($this->db);
$user=new User($this->db);
$p_id=$user->get_periode();
if ( $p_id != null )
{
list($date_start,$date_end)=$periode->get_date_limit($p_id);
}
}
/* if p_jrn : 0 if means all ledgers, if -1 means all ledger of this

4
include/export_histo_csv.php
View file

@ -50,8 +50,8 @@ for ($i=0;$i<count($res);$i++)
{
printf('"%s";',$res[$i]['jr_internal']);
printf('"%s";',$res[$i]['jrn_def_name']);
printf('"%s";',$res[$i]['jr_date']);
printf('"%s";',$res[$i]['jr_ech']);
printf('"%s";',$res[$i]['str_jr_date']);
printf('"%s";',$res[$i]['str_jr_ech']);
printf('"%s";',$res[$i]['jr_pj_number']);
printf('"%s";',$res[$i]['quick_code']);
printf('"%s %s";',$res[$i]['name'],$res[$i]['first_name']);