diff --git a/htdocs/pages/administration/compta_journal.php b/htdocs/pages/administration/compta_journal.php index 750c1d8ba..89b7898de 100755 --- a/htdocs/pages/administration/compta_journal.php +++ b/htdocs/pages/administration/compta_journal.php @@ -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); @@ -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 diff --git a/sources/Afup/Comptabilite/Comptabilite.php b/sources/Afup/Comptabilite/Comptabilite.php index 3458fd51b..2369e583f 100755 --- a/sources/Afup/Comptabilite/Comptabilite.php +++ b/sources/Afup/Comptabilite/Comptabilite.php @@ -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, '; + $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 ';