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.

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

TVA intracommunautaire journal #1381

Merged
merged 1 commit into from
Dec 12, 2023
Merged
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions db/migrations/20231206213600_tva_intra_compta.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

use Phinx\Migration\AbstractMigration;

class TVAIntraCompta extends AbstractMigration
{
public function change()
{
$sql = <<<EOF
ALTER TABLE `compta`
ADD `tva_intra` VARCHAR(20) AFTER `nom_frs`;
EOF;
$this->execute($sql);
}
}
4 changes: 4 additions & 0 deletions db/seeds/Compta.php
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ public function run()
[
'idoperation' => 2,
'idcategorie' => 34,
'nom_frs' => 'Prestabox',
'tva_intra' => 'FR5512345',
'montant' => 1000,
'idmode_regl' => 2,
'date_regl' => '2023-10-16',
@@ -31,6 +33,8 @@ public function run()
[
'idoperation' => 1,
'idcategorie' => 34,
'nom_frs' => 'Un fournisseur',
'tva_intra' => 'FR9912345',
'montant' => 500,
'idmode_regl' => 2,
'date_regl' => '2023-10-17',
8 changes: 7 additions & 1 deletion htdocs/pages/administration/compta_journal.php
Original file line number Diff line number Diff line change
@@ -104,6 +104,7 @@ function paybox_link($description)
$champs['idoperation'] = $champsRecup['idoperation'];
$champs['idcategorie'] = $champsRecup['idcategorie'];
$champs['nom_frs'] = $champsRecup['nom_frs'];
$champs['tva_intra'] = $champsRecup['tva_intra'];
$champs['montant'] = $champsRecup['montant'];
$champs['description'] = $champsRecup['description'];
$champs['numero'] = $champsRecup['numero'];
@@ -145,7 +146,8 @@ function paybox_link($description)

$formulaire->addElement('select' , 'idcategorie', 'Type de compte', $compta->obtenirListCategories());
$formulaire->addElement('text', 'nom_frs', 'Nom fournisseurs' , array('size' => 30, 'maxlength' => 40));
$formulaire->addElement('text', 'numero', 'Numero facture' , array('size' => 30, 'maxlength' => 40));
$formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', array('size' => 30, 'maxlength' => 100));
$formulaire->addElement('text', 'numero', 'Numero facture' , array('size' => 30, 'maxlength' => 40));
$formulaire->addElement('textarea', 'description', 'Description', array('cols' => 42, 'rows' => 5));
$formulaire->addElement('text', 'montant', 'Montant' , array('size' => 30, 'maxlength' => 40));
$formulaire->addElement('text', 'comment', 'Commentaire' , array('size' => 30, 'maxlength' => 255));
@@ -212,6 +214,7 @@ function paybox_link($description)
$valeur['idcategorie'],
$date_ecriture,
$valeur['nom_frs'],
$valeur['tva_intra'],
$valeur['montant'],
$valeur['description'],
$valeur['numero'],
@@ -234,6 +237,7 @@ function paybox_link($description)
$valeur['idcategorie'],
$date_ecriture,
$valeur['nom_frs'],
$valeur['tva_intra'],
$valeur['montant'],
$valeur['description'],
$valeur['numero'],
@@ -650,6 +654,7 @@ function paybox_link($description)
26, // A déterminer
$ligneCompta['date_ecriture'],
$ligneCompta['nom_frs'],
$ligneCompta['tva_intra'],
$montant,
$ligneCompta['description'],
$ligneCompta['numero'],
@@ -668,6 +673,7 @@ function paybox_link($description)
$ligneCompta['idcategorie'],
$ligneCompta['date_ecriture'],
$ligneCompta['nom_frs'],
$ligneCompta['tva_intra'],
$ligneCompta['montant'] - $montantTotal,
$ligneCompta['description'],
$ligneCompta['numero'],
9 changes: 6 additions & 3 deletions sources/Afup/Comptabilite/Comptabilite.php
Original file line number Diff line number Diff line change
@@ -490,14 +490,14 @@ public function obtenirListReglementsJournal()
return $reglements;
}

function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $montant, $description,
function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $tva_intra, $montant, $description,
$numero, $idmode_regl, $date_regl, $obs_regl, $idevenement, $numero_operation = null,
$attachmentRequired = 0, $montantHtSoumisTva0 = null, $montantHtSoumisTva55 = null, $montantHtSoumisTva10 = null, $montantHtSoumisTva20 = null)
{

$requete = 'INSERT INTO ';
$requete .= 'compta (';
$requete .= 'idoperation,idcategorie,date_ecriture,nom_frs,montant,description,';
$requete .= 'idoperation,idcategorie,date_ecriture,nom_frs,tva_intra,montant,description,';
$requete .= 'numero,idmode_regl,date_regl,obs_regl,idevenement, numero_operation,idcompte, attachment_required,
montant_ht_soumis_tva_0, montant_ht_soumis_tva_5_5, montant_ht_soumis_tva_10, montant_ht_soumis_tva_20
) ';
@@ -506,6 +506,7 @@ function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs
$requete .= $this->_bdd->echapper($idcategorie) . ',';
$requete .= $this->_bdd->echapper($date_ecriture) . ',';
$requete .= $this->_bdd->echapper($nom_frs) . ',';
$requete .= $this->_bdd->echapper($tva_intra) . ',';
$requete .= $this->_bdd->echapper($montant) . ',';
$requete .= $this->_bdd->echapper($description) . ',';
$requete .= $this->_bdd->echapper($numero) . ',';
@@ -529,7 +530,7 @@ function ajouter($idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs
return $resultat;
}

function modifier($id, $idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $montant, $description,
function modifier($id, $idoperation, $idcompte, $idcategorie, $date_ecriture, $nom_frs, $tva_intra, $montant, $description,
$numero, $idmode_regl, $date_regl, $obs_regl, $idevenement, $comment, $numero_operation = null, $attachmentRequired = 0,
$montantHtSoumisTva0 = null, $montantHtSoumisTva55 = null, $montantHtSoumisTva10 = null, $montantHtSoumisTva20 = null
)
@@ -542,6 +543,7 @@ function modifier($id, $idoperation, $idcompte, $idcategorie, $date_ecriture, $n
$requete .= 'idcategorie=' . $this->_bdd->echapper($idcategorie) . ',';
$requete .= 'date_ecriture=' . $this->_bdd->echapper($date_ecriture) . ',';
$requete .= 'nom_frs=' . $this->_bdd->echapper($nom_frs) . ',';
$requete .= 'tva_intra=' . $this->_bdd->echapper($tva_intra) . ',';
$requete .= 'montant=' . $this->_bdd->echapper($montant) . ',';
$requete .= 'description=' . $this->_bdd->echapper($description) . ',';
$requete .= 'numero=' . $this->_bdd->echapper($numero) . ',';
@@ -1073,6 +1075,7 @@ function extraireComptaDepuisCSVBanque(Importer $importer)
$enregistrement['idcategorie'],
$enregistrement['date_ecriture'],
$enregistrement['nom_frs'],
$enregistrement['tva_intra'],
$enregistrement['montant'],
$enregistrement['description'],
$enregistrement['numero'],
2 changes: 2 additions & 0 deletions tests/behat/features/Admin/Tresorerie/Journal.feature
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ Feature: Administration - Trésorerie - Journal
And I select "1" from "date_saisie[F]"
And I select "26" from "idcategorie"
And I fill in "nom_frs" with "Fournisseur"
And I fill in "tva_intra" with "FR4412345"
And I fill in "numero" with "001"
And I fill in "description" with "Description dépense 001"
And I fill in "montant" with "12000"
@@ -51,6 +52,7 @@ Feature: Administration - Trésorerie - Journal
And I select "1" from "date_saisie[F]"
And I select "26" from "idcategorie"
And I fill in "nom_frs" with "Fournisseur"
And I fill in "tva_intra" with "FR6612345"
And I fill in "numero" with "001"
And I fill in "description" with "Description recette 001"
And I fill in "montant" with "12000"