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

Security

Browse source
This commit is contained in:
sparkyx 2020-11-12 08:54:11 +01:00
parent e97f6ff385
commit 22b3512167
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/export/export_fiche_detail_pdf.php
View file

@ -109,12 +109,12 @@ for ($e=0;$e<count($array);$e++)
$diff_solde=bcsub($tot_deb,$tot_cred);
if ( $diff_solde < 0 )
{
$solde=" créditeur ";
$solde=" "._("créditeur")." ";
$diff_solde=bcmul($diff_solde,-1);
}
else
{
$solde=" débiteur ";
$solde=" "._('débiteur')." ";
}
$str_diff_solde=sprintf("%12.2f €",$diff_solde);
@ -129,7 +129,7 @@ for ($e=0;$e<count($array);$e++)
/*
* reset total and current_exercice
*/
$prog=0;
$progress=0;
$current_exercice=$row['p_exercice'];
$tot_deb=0;$tot_cred=0;
$pdf->SetFont('DejaVuCond','',8);
@ -213,12 +213,12 @@ $str_credit=sprintf("% 12.2f €",$tot_cred);
$diff_solde=$tot_deb-$tot_cred;
if ( $diff_solde < 0 )
{
$solde=" créditeur ";
$solde=" "._("créditeur")." ";
$diff_solde*=-1;
}
else
{
$solde=" débiteur ";
$solde=" "._('débiteur')." ";
}
$str_diff_solde=sprintf("%12.2f €",$diff_solde);

19
include/export/export_fiche_pdf.php
View file

@ -48,23 +48,29 @@ $pdf->SetFont('DejaVu','BI',14);
$pdf->write_cell(0,8,$name,0,1,'C');
$pdf->SetTitle($name,1);
$pdf->SetAuthor('NOALYSS');
$http=new HttpInput();
$start=$http->request('start');
$end=$http->request('end');
if ( isDate($start) == null || isDate ($end) == null ) return;
/* balance */
if ( $_GET['histo'] == 4 )
{
$fd=new Fiche_Def($cn,$_REQUEST['cat']);
$cat=$http->request('cat');
$fd=new Fiche_Def($cn,$cat);
if ( $fd->hasAttribute(ATTR_DEF_ACCOUNT) == false )
{
$pdf->write_cell(0,10, "Cette catégorie n'ayant pas de poste comptable n'a pas de balance");
$pdf->write_cell(0,10, _("Cette catégorie n'ayant pas de poste comptable n'a pas de balance"));
//Save PDF to file
$fDate=date('dmy-Hi');
$pdf->Output("category-$fDate.pdf", 'D');
exit;
}
$aCard=$cn->get_array("select f_id,ad_value from fiche join fiche_Detail using (f_id) where ad_id=1 and fd_id=$1 order by 2 ",array($_REQUEST['cat']));
$aCard=$cn->get_array("select f_id,ad_value from fiche join fiche_Detail using (f_id) where ad_id=1 and fd_id=$1 order by 2 ",array($cat));
if ( empty($aCard))
{
$pdf->write_cell(0,10, "Aucune fiche trouvée");//Save PDF to file
$pdf->write_cell(0,10, _("Aucune fiche trouvée"));//Save PDF to file
$fDate=date('dmy-Hi');
$pdf->Output("category-$fDate.pdf", 'D');
exit;
@ -78,11 +84,10 @@ if ( $_GET['histo'] == 4 )
$pdf->write_cell(20,7,'D/C',0,0,'C',0);
$pdf->line_new();
$idx=0;
$filter= " (j_date >= to_date('".$start."','DD.MM.YYYY') ".
" and j_date <= to_date('".$end."','DD.MM.YYYY')) ";
for ($i=0;$i < count($aCard);$i++)
{
if ( isDate($_REQUEST['start']) == null || isDate ($_REQUEST['end']) == null ) exit;
$filter= " (j_date >= to_date('".$_REQUEST['start']."','DD.MM.YYYY') ".
" and j_date <= to_date('".$_REQUEST['end']."','DD.MM.YYYY')) ";
$oCard=new Fiche($cn,$aCard[$i]['f_id']);
$solde=$oCard->get_solde_detail($filter);
if ( $solde['debit'] == 0 && $solde['credit']==0) continue;