[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 22/33: Cosmetic #0002081: PRINTTVA : l'export
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 22/33: Cosmetic #0002081: PRINTTVA : l'export PDF de la TVA |
Date: |
Thu, 11 Nov 2021 06:02:49 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 6f8265689a0f1c003724293594e81233437be882
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Thu Oct 14 19:26:20 2021 +0200
Cosmetic #0002081: PRINTTVA : l'export PDF de la TVA
---
include/export/export_printtva_pdf.php | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/export/export_printtva_pdf.php
b/include/export/export_printtva_pdf.php
index 624229f..876e848 100644
--- a/include/export/export_printtva_pdf.php
+++ b/include/export/export_printtva_pdf.php
@@ -104,11 +104,10 @@ for ($i = 0; $i < $nb_array; $i++) {
if ($ledger_name != $array[$i]['jrn_def_name']) {
// Display totals
$pdf->SetFont('DejaVuCond', 'B', 7);
- $pdf->line_new();
- $pdf->write_cell(70, 5, "");
+ $pdf->write_cell(80, 5, "");
for ($e=2;$e<$nb_col;$e++){
$colname=$a_col[$e];
- $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 0, 0, 'R');
+ $pdf->write_cell(40, 5, nbm($a_tot[$colname]), 1, 0, 'R');
$a_tot[$colname]=0;
}
$pdf->line_new();
@@ -253,12 +252,11 @@ for ($i = 0; $i < $nb_array; $i++) {
if ($ledger_name != $array[$i]['jrn_def_name']) {
// Display totals
$pdf->SetFont('DejaVuCond', 'B', 7);
- $pdf->line_new();
- $pdf->write_cell(70, 5, "");
+ $pdf->write_cell($a_size['tva_label']+$a_size['tva_rate'], 5, "");
for ($e=2;$e<$nb_col;$e++){
$t_idx=$a_colp[$e];
$colname=$a_colp[$e];
- $pdf->write_cell($a_size[$t_idx], 5, nbm($a_tot[$colname]), 0, 0,
'R');
+ $pdf->write_cell($a_size[$t_idx], 5, nbm($a_tot[$colname]), 1, 0,
'R');
$a_tot[$colname]=0;
}
$pdf->line_new();
@@ -279,8 +277,12 @@ for ($i = 0; $i < $nb_array; $i++) {
} else {
$pdf->write_cell($a_size[$t_idx], 5,$a_purchase_header[$e], 1,
0, 'R');
}
- $a_tot[$colname]=0;
}
+ for ($e=2;$e<$nb_col;$e++){
+ $colname=$a_colp[$e];
+ $a_tot[$colname]=bcadd($a_tot[$colname],$array[$i][$colname]);
+ }
+ $pdf->line_new();
}
$pdf->SetFont('DejaVuCond', '', 7);
for ($e=0;$e<$nb_col;$e++){
- [Noalyss-commit] [noalyss] 03/33: Improve HttpInput::extract , the array is set and not passed anymore, (continued)
- [Noalyss-commit] [noalyss] 03/33: Improve HttpInput::extract , the array is set and not passed anymore, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 05/33: Bug : pour non-assujetti , pas de calcul en devise, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 07/33: Bug for reversed operation when currency are used, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 14/33: Typo, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 13/33: Compute.php it happens that the argument are not numeric, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 16/33: Documentation, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 15/33: Bug #2079 : 0002079: Recherche de carte : guillement ne passe pas, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 21/33: Cosmetic #2082 : OD parfois ajout différence de change, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 18/33: Bug : currency_id was nullable script compatible PSQL 10, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 20/33: Cosmetic #0002080 : NOT-FOUND, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 22/33: Cosmetic #0002081: PRINTTVA : l'export PDF de la TVA,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 23/33: Fix : date before 2000 throws an exception, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 25/33: Improve ACC_LEDGER compute internal ledger code in base 36, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 27/33: Operation ANC : Bug with decimal, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 28/33: Bug #2085: Comptabilité analytique : erreur dans les balances croisées, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 29/33: Task #0002087: Improve COMPTA/MENUFIN/FREC, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 30/33: Task #0002088: Export PDF de ANCBCC, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 17/33: Cosmetic bug : if no rows found , throw a warning, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 19/33: Task #0002068: Pas de champ recherche dans la liste de fiches, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 24/33: Gestion->suivi, global administrators can access all the documents. Improve search, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 26/33: Cosmetic Add close button, Dany De Bontridder, 2021/11/11