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

Merge branch 'dev7109' into entreprise

Browse source
This commit is contained in:
Dany De Bontridder 2019-08-17 22:22:59 +02:00
commit f33ff144e5
70 changed files with 2833 additions and 797 deletions
Download patch file Download diff file Expand all files Collapse all files

46
include/export/export_ledger_csv.php
View file

@ -135,6 +135,18 @@ if ( $get_option=="E")
}
if ($ret_detail==null)
return;
$a_heading[]="";
$a_heading[]="";
$a_heading[]="";
$a_heading[]=_("Date paiement");
$a_heading[]=_("Montant paiement");
$a_heading[]=_("Methode paiement");
$a_heading[]=_("Opération paiement");
// Prepare the query for reconcile date
$prepared_query=new Prepared_Query($cn);
$prepared_query->prepare_reconcile_date();
$nb=Database::num_row($ret_detail);
$title=array();
foreach ($a_heading as $key=> $value)
@ -156,6 +168,16 @@ if ( $get_option=="E")
$type="number";
$export->add($row[$j], $type);
}
//info payment
$ret_reconcile=$cn->execute('reconcile_date',array($row['jr_id']));
$max=Database::num_row($ret_reconcile);
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
$export->add($row['jr_date']);
$export->add($row['jr_montant'],"number");
$export->add($row['qcode_bank']);
$export->add($row['jr_internal']);
}
$export->write();
}
}
@ -188,22 +210,10 @@ if ($get_option=="L" && ($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') )
}else {
$Row=$Jrn->get_rowSimple($get_from_periode, $get_to_periode);
}
$cn->prepare('reconcile_date_csv',
'select *
from
jrn
where
jr_id in
(select
jra_concerned
from
jrn_rapt
where jr_id = $1
union all
select
jr_id
from jrn_rapt
where jra_concerned=$1)');
// Prepare the query for reconcile date
$prepared_query=new Prepared_Query($cn);
$prepared_query->prepare_reconcile_date();
$title=array();
$title[]=_("operation");
$title[]=_("Date");
@ -255,7 +265,7 @@ if ($get_option=="L" && ($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') )
$export->add($line['currency_rate_ref']);
//------ Add reconcilied operation ---------------
$ret_reconcile=$cn->execute('reconcile_date_csv',
$ret_reconcile=$cn->execute('reconcile_date',
array($line['jr_id']));
$max=Database::num_row($ret_reconcile);
if ($max>0)
@ -263,9 +273,11 @@ if ($get_option=="L" && ($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') )
for ($e=0; $e<$max; $e++)
{
$row=Database::fetch_array($ret_reconcile, $e);
$export->add($row['qcode_bank']);
$export->add($row['jr_date']);
$export->add($row['jr_internal']);
$export->add($row['jr_pj_number']);
$export->add($row['jr_montant'],"number");
}
}
$export->write();