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

Merge alioth/master into devel

Browse source
This commit is contained in:
Dany De Bontridder 2014-11-24 20:30:43 +01:00
commit c21889921f
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/balance.inc.php
View file

@ -92,7 +92,7 @@ echo _('Filtre')." ";
$rad=new IRadio();
$array_ledger=$g_user->get_ledger('ALL',3);
$array=get_array_column($array_ledger,'jrn_def_id');
$selected=(isset($_GET['balr_jrn']))?$_GET['balr_jrn']:null;
$selected=(isset($_GET['r_jrn']))?$_GET['r_jrn']:null;
$select_cat=(isset($_GET['r_cat']))?$_GET['r_cat']:null;
$array_cat=Acc_Ledger::array_cat();

8
include/class_anc_grandlivre.php
View file

@ -104,6 +104,7 @@ class Anc_GrandLivre extends Anc_Print
jr_comment,
jr_pj_number,
jr_internal,
oa_row,
case when oa_debit='t' then 'D' else 'C' end,
oa_amount
from operation_analytique as B join poste_analytique using(po_id)
@ -290,12 +291,6 @@ class Anc_GrandLivre extends Anc_Print
}
if ( empty($array) )
{
$r.= _("aucune donnée");
return $r;
}
$ix=0;$prev='xx';
$tot_deb=$tot_cred=0;
$aheader=array();
@ -306,6 +301,7 @@ class Anc_GrandLivre extends Anc_Print
$aheader[]=array("title"=>'libelle','type'=>'string');
$aheader[]=array("title"=>'Pièce','type'=>'string');
$aheader[]=array("title"=>'Num.interne','type'=>'string');
$aheader[]=array("title"=>'row','type'=>'num');
$aheader[]=array("title"=>'Debit','type'=>'string');
$aheader[]=array("title"=>'Credit','type'=>'num');
Impress::array_to_csv($array, $aheader);