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

PDF : fix several unalignment: doc et PHP8.3 Compatibility

Browse source
This commit is contained in:
sparkyx 2024-11-05 08:41:10 +01:00
parent 78309926ab
commit aa1d683221
8 changed files with 88 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/export/export_gl_pdf.php
View file

@ -96,6 +96,7 @@ foreach ($a_accounting as $accounting_item)
$solde_d = 0.0;
$solde_c = 0.0;
$current_exercice="";
$idx=0;
foreach ($acc_account_ledger->row as $detail)
{
@ -146,7 +147,7 @@ foreach ($a_accounting as $accounting_item)
$solde_c = 0.0;
$pdf->line_new();
$pdf->SetFont('DejaVuCond','',6);
$idx=0;
}
if ($detail['cred_montant'] > 0)
@ -161,25 +162,27 @@ foreach ($a_accounting as $accounting_item)
}
$i = 0;
$idx++;
$fill=$pdf->is_fill($idx);
$side=" ".$acc_account_ledger->get_amount_side($solde);
$pdf->write_multi($width[$i], 3, shrink_date($detail['j_date_fmt']), 0, $lor[$i]);
$pdf->write_multi($width[$i], 6, shrink_date($detail['j_date_fmt']), 0, $lor[$i],fill:$fill);
$i++;
$pdf->write_multi($width[$i], 3, $detail['jr_internal'], 0, $lor[$i] );
$pdf->write_multi($width[$i], 6, $detail['jr_internal'], 0, $lor[$i] ,fill:$fill);
$i++;
/* limit set to 40 for the substring */
// $triple_point = (mb_strlen($detail['description']) > 40 ) ? '...':'';
// $pdf->write_multi($width[$i], 6, mb_substr($detail['description'],0,40).$triple_point, 0,$lor[$i]);
$pdf->write_multi($width[$i], 3,$detail['description'].'['.$detail['jr_optype'].']', 0,$lor[$i]);
$pdf->write_multi($width[$i], 6,$detail['description'].'['.$detail['jr_optype'].']', 0,$lor[$i],fill:$fill);
$i++;
$pdf->write_cell($width[$i], 6, $detail['jr_pj_number'], 0, 0, $lor[$i]);
$pdf->write_cell($width[$i], 6, $detail['jr_pj_number'], 0, 0, $lor[$i],fill:$fill);
$i++;
$pdf->write_cell($width[$i], 6, ($detail['letter']!=-1)?$detail['letter']:'', 0, 0, $lor[$i]);
$pdf->write_cell($width[$i], 6, ($detail['letter']!=-1)?$detail['letter']:'', 0, 0, $lor[$i],fill:$fill);
$i++;
$pdf->write_cell($width[$i], 6, ($detail['deb_montant'] > 0 ? nbm( $detail['deb_montant']) : ''), 0, 0, $lor[$i]);
$pdf->write_cell($width[$i], 6, ($detail['deb_montant'] > 0 ? nbm( $detail['deb_montant']) : ''), 0, 0, $lor[$i],fill:$fill);
$i++;
$pdf->write_cell($width[$i], 6, ($detail['cred_montant'] > 0 ? nbm( $detail['cred_montant']) : ''), 0, 0, $lor[$i]);
$pdf->write_cell($width[$i], 6, ($detail['cred_montant'] > 0 ? nbm( $detail['cred_montant']) : ''), 0, 0, $lor[$i],fill:$fill);
$i++;
$pdf->write_cell($width[$i], 6, nbm(abs( $solde)).$side, 0, 0, $lor[$i]);
$pdf->write_cell($width[$i], 6, nbm(abs( $solde)).$side, 0, 0, $lor[$i],fill:$fill);
$i++;
$pdf->line_new();

53
include/export/export_poste_detail_pdf.php
View file

@ -66,6 +66,7 @@ if ( count($a_poste) == 0 )
$size=array(13,25,13,65,12,20,20,20);
$align=array('L','C','C','L','R','R','R','R');
$operation=new Acc_Operation($cn);
foreach ($a_poste as $poste)
{
$Poste=new Acc_Account_Ledger($cn,$poste['pcm_val']);
@ -83,21 +84,21 @@ foreach ($a_poste as $poste)
$pdf->SetFont('DejaVuCond','',8);
$l=0;
$pdf->write_cell($size[$l],6,_('Date'),0,0,'L');
$pdf->write_cell($size[$l],8,_('Date'),0,0,'L');
$l++;
$pdf->write_cell($size[$l],6,_('Ref'),0,0,'C');
$pdf->write_cell($size[$l],8,_('Ref'),0,0,'C');
$l++;
$pdf->write_cell($size[$l],6,_('Journal'),0,0,'C');
$pdf->write_cell($size[$l],8,_('Journal'),0,0,'C');
$l++;
$pdf->write_multi($size[$l],3,_('Libellé'),0,'L');
$pdf->write_multi($size[$l],8,_('Libellé'),0,'L');
$l++;
$pdf->write_cell($size[$l],6,_('Let'),0,0,'R');
$pdf->write_cell($size[$l],8,_('Let'),0,0,'R');
$l++;
$pdf->write_cell($size[$l],6,_('Debit'),0,0,'R');
$pdf->write_cell($size[$l],8,_('Debit'),0,0,'R');
$l++;
$pdf->write_cell($size[$l],6,_('Credit'),0,0,'R');
$pdf->write_cell($size[$l],8,_('Credit'),0,0,'R');
$l++;
$pdf->write_cell($size[$l],6,_('Prog'),0,0,'R');
$pdf->write_cell($size[$l],8,_('Prog'),0,0,'R');
$l++;
$pdf->line_new();
$tot_deb=0;
@ -129,12 +130,12 @@ foreach ($a_poste as $poste)
$str_diff_solde=sprintf("%12.2f ",$diff_solde);
$pdf->SetFont('DejaVu','B',8);
$pdf->write_cell(15,6,_('totaux'),0,0,'L');
$pdf->write_cell(15,6,$current_exercice,0,0,'L');
$pdf->write_cell(40,6,$solde,0,'L');
$pdf->write_cell(40,6,$str_debit,0,0,'R');
$pdf->write_cell(40,6,$str_credit,0,0,'R');
$pdf->write_cell(40,6,$str_diff_solde,0,0,'R');
$pdf->write_cell(15,8,_('totaux'),0,0,'L');
$pdf->write_cell(15,8,$current_exercice,0,0,'L');
$pdf->write_cell(40,8,$solde,0,'L');
$pdf->write_cell(40,8,$str_debit,0,0,'R');
$pdf->write_cell(40,8,$str_credit,0,0,'R');
$pdf->write_cell(40,8,$str_diff_solde,0,0,'R');
$pdf->line_new();
/*
* reset total and current_exercice
@ -147,26 +148,26 @@ foreach ($a_poste as $poste)
$l=0;
$diff=bcsub($row['deb_montant'],$row['cred_montant']);
$prog=bcadd($prog,$diff);
$fill=(isset($_GET['oper_detail']))?$pdf->is_fill(0):$pdf->is_fill($e);
$date=shrink_date($row['j_date_fmt']);
$pdf->write_cell($size[$l],6,$date,0,0,$align[$l]);
$pdf->write_cell($size[$l],8,$date,0,0,$align[$l],fill:$fill);
$l++;
if ( $row['jr_pj_number'] == '')
$pdf->write_cell($size[$l],6,$row['jr_internal'],0,0,$align[$l]);
$pdf->write_cell($size[$l],8,$row['jr_internal'],0,0,$align[$l],fill:$fill);
else
$pdf->write_cell($size[$l],6,$row['jr_pj_number'],0,0,$align[$l]);
$pdf->write_cell($size[$l],8,$row['jr_pj_number'],0,0,$align[$l],fill:$fill);
$l++;
$pdf->write_cell($size[$l],6,mb_substr($row['jrn_def_code'],0,14),0,0,$align[$l]);
$pdf->write_cell($size[$l],8,mb_substr($row['jrn_def_code'],0,14),0,0,$align[$l],fill:$fill);
$l++;
$tiers=$operation->find_tiers($row['jr_id'], $row['j_id'], $row['j_qcode']);
$description=($tiers=="")?$row["description"]:"[".$tiers."]".$row['description'];
$pdf->write_multi($size[$l],3, $description,0,$align[$l]);
$pdf->write_multi($size[$l],8, $description,0,$align[$l],fill:$fill);
$l++;
$pdf->write_cell($size[$l],6,(($row['letter']!=-1)?$row['letter']:''),0,0,$align[$l]);
$pdf->write_cell($size[$l],8,(($row['letter']!=-1)?$row['letter']:''),0,0,$align[$l],fill:$fill);
$l++;
$pdf->write_cell($size[$l],6,(sprintf('% 12.2f',$row['deb_montant'])),0,0,$align[$l]);
$pdf->write_cell($size[$l],8,(sprintf('% 12.2f',$row['deb_montant'])),0,0,$align[$l],fill:$fill);
$l++;
$pdf->write_cell($size[$l],6,(sprintf('% 12.2f',$row['cred_montant'])),0,0,$align[$l]);
$pdf->write_cell($size[$l],8,(sprintf('% 12.2f',$row['cred_montant'])),0,0,$align[$l],fill:$fill);
$l++;
$solde="=";
if ( $prog < 0 )
@ -175,9 +176,9 @@ foreach ($a_poste as $poste)
{
$solde=_("D");
}
$pdf->write_cell($size[$l],6,(sprintf('% 12.2f %s',abs($prog),$solde)),0,0,$align[$l]);
$pdf->write_cell($size[$l],8,(sprintf('% 12.2f %s',abs($prog),$solde)),0,0,$align[$l],fill:$fill);
$l++;
$pdf->line_new();
$pdf->line_new(8);
$tot_deb=bcadd($tot_deb,$row['deb_montant']);
$tot_cred=bcadd($tot_cred,$row['cred_montant']);
/* -------------------------------------- */
@ -237,7 +238,7 @@ foreach ($a_poste as $poste)
$str_diff_solde=sprintf("%12.2f ",$diff_solde);
$pdf->SetFont('DejaVu','B',8);
$pdf->line_new();
$pdf->write_cell(160,5,_("Débit"),0,0,'R');
$pdf->write_cell(30,5,$str_debit,0,0,'R');
$pdf->line_new();