Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ajout des infos de montants HT/de TVA dans le journal #1370

Merged
merged 5 commits into from
Nov 30, 2023
+32 −1
Merged

ajout des infos de montants HT/de TVA dans le journal #1370

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
384b2a5
export CSV du journal : on ajoute les infos de justificatif
agallou Nov 28, 2023
1021cf7
export csv journal : ajout du montant HT total
agallou Nov 28, 2023
512ab27
ajout du montant de la TVA
agallou Nov 28, 2023
6b68ab0
export CSV du journal : ajout de colonnes avec le détail de la TVA
agallou Nov 28, 2023
606c24a
correction typo sur calcul du montant de TVA
agallou Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions htdocs/pages/administration/compta_journal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,17 @@ function paybox_link($description)
'Crédit',
'Règlement',
'Commentaire',
'Justificatif',
'Nom justificatif',
'Montant HT',
'TVA',
'Montant HT non soumis à TVA',
'Montant HT soumis à TVA 5,5',
'TVA 5,5',
'Montant HT soumis à TVA 10',
'TVA 10',
'Montant HT soumis à TVA 20',
'TVA 20'
];
fputcsv($fp, $columns, $csvDelimiter, $csvEnclosure);

Expand All @@ -329,6 +340,17 @@ function paybox_link($description)
$line['idoperation'] != 1 ? $total : '',
$line['reglement'],
$line['comment'],
$line['attachment_required'] ? 'Oui' : 'Non',
$line['attachment_filename'],
$line['montant_ht'],
$line['montant_tva'],
$line['montant_ht_0'],
$line['montant_ht_5_5'],
$line['montant_tva_5_5'],
$line['montant_ht_10'],
$line['montant_tva_10'],
$line['montant_ht_20'],
$line['montant_tva_20']
],
$csvDelimiter,
$csvEnclosure
Expand Down
11 changes: 10 additions & 1 deletion sources/Afup/Comptabilite/Comptabilite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,16 @@ function obtenirJournal($debitCredit = '',
$requete .= 'compta_reglement.reglement, ';
$requete .= 'compta_evenement.evenement, ';
$requete .= 'compta_categorie.categorie, ';
$requete .= 'compta_compte.nom_compte ';
$requete .= 'compta_compte.nom_compte, ';
$requete .= '(compta.montant_ht_soumis_tva_0 + compta.montant_ht_soumis_tva_5_5 + compta.montant_ht_soumis_tva_10 + compta.montant_ht_soumis_tva_20) as montant_ht, ';
$requete .= '((compta.montant_ht_soumis_tva_5_5*0.055) + (compta.montant_ht_soumis_tva_10*0.1) + compta.montant_ht_soumis_tva_20*0.2) as montant_tva, ';
agallou marked this conversation as resolved.
Show resolved Hide resolved
agallou marked this conversation as resolved.
Show resolved Hide resolved
$requete .= 'compta.montant_ht_soumis_tva_0 as montant_ht_0, ';
$requete .= 'compta.montant_ht_soumis_tva_5_5 as montant_ht_5_5, ';
$requete .= 'compta.montant_ht_soumis_tva_5_5*0.055 as montant_tva_5_5, ';
$requete .= 'compta.montant_ht_soumis_tva_10 as montant_ht_10, ';
$requete .= 'compta.montant_ht_soumis_tva_10*0.1 as montant_tva_10, ';
$requete .= 'compta.montant_ht_soumis_tva_20 as montant_ht_20, ';
$requete .= 'compta.montant_ht_soumis_tva_20*0.2 as montant_tva_20 ';
$requete .= 'FROM ';
$requete .= 'compta ';
$requete .= 'LEFT JOIN ';
Expand Down
Loading