Merge pull request #1394 from afup/fix_inter_intra

on corrige des libellé intercommunautaire en intracommunautaire
afup · Dec 21, 2023 · 1d9422d · 1d9422d
2 parents ec3c30a + 3b650b3
commit 1d9422d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/htdocs/pages/administration/compta_facture.php b/htdocs/pages/administration/compta_facture.php
@@ -138,7 +138,7 @@
 	$formulaire->addElement('text'    , 'prenom'     , 'Prénom'         , array('size' => 30, 'maxlength' => 40));
 	$formulaire->addElement('text'    , 'tel'        , 'Numero de tél'	, array('size' => 30, 'maxlength' => 40));
 	$formulaire->addElement('text'    , 'email'      , 'Email (facture)', array('size' => 30, 'maxlength' => 100));
-	$formulaire->addElement('text'    , 'tva_intra'  , 'TVA intercommunautaire (facture)', array('size' => 30, 'maxlength' => 100));
+	$formulaire->addElement('text'    , 'tva_intra'  , 'TVA intracommunautaire (facture)', array('size' => 30, 'maxlength' => 100));
 
 	if ($champs['numero_devis'] || $champs['numero_facture'] )
 	{

diff --git a/sources/Afup/Utils/PDF_Facture.php b/sources/Afup/Utils/PDF_Facture.php
@@ -182,7 +182,7 @@ function Footer()
             $this->Ln();
 
             $this->SetFont('Arial', 'B', 6);
-            $this->Cell(145, 3, utf8_decode('Numéro de TVA intercommunautaire'), 0, 0, 'C');
+            $this->Cell(145, 3, utf8_decode('Numéro de TVA intracommunautaire'), 0, 0, 'C');
             $this->SetFont('Arial', null, 6);
             $this->Cell(-60, 3, $this->configuration->obtenir('afup|numero_tva'), 0, 0, 'C');
         }

diff --git a/tests/behat/features/Admin/Events/FacturesEvennement.feature b/tests/behat/features/Admin/Events/FacturesEvennement.feature
@@ -51,8 +51,8 @@ Feature: Administration - Évènements - Factures d'évènement
     Then The page "1" of the PDF should contain "TOTAL TTC 250,00 €"
     Then The page "1" of the PDF should contain "Payé par CB le 02/01/2024"
     Then The page "1" of the PDF should not contain "TVA non applicable - art. 293B du CGI"
-    Then The page "1" of the PDF should contain "Numéro de TVA intercommunautaire NUMERO_A_AJOUTER"
-    Then the checksum of the response content should be "291937b30581aff285caba857e470013"
+    Then The page "1" of the PDF should contain "Numéro de TVA intracommunautaire NUMERO_A_AJOUTER"
+    Then the checksum of the response content should be "e0ea03688103cc03fd9c507c1cf30dab"
 
   @reloadDbWithTestData
   @clearEmails

diff --git a/tests/behat/features/MembersArea/Index.feature b/tests/behat/features/MembersArea/Index.feature
@@ -65,7 +65,7 @@ Feature: Espace membre, accueil
     Then The page "1" of the PDF should contain "Code Désignation Prix"
     Then The page "1" of the PDF should contain "ADH Adhésion AFUP jusqu'au 01/01/2024 30.00 €"
     Then The page "1" of the PDF should contain "TVA non applicable - art. 293B du CGI"
-    Then The page "1" of the PDF should not contain "Numéro de TVA intercommunautaire NUMERO_A_AJOUTER"
+    Then The page "1" of the PDF should not contain "Numéro de TVA intracommunautaire NUMERO_A_AJOUTER"
     Then the checksum of the response content should be "2e334b2ea4b010d7ca71fe128370b07e"
 
   @reloadDbWithTestData @vat
@@ -90,8 +90,8 @@ Feature: Espace membre, accueil
     Then The page "1" of the PDF should contain "Total TVA 20% 0,30 €"
     Then The page "1" of the PDF should contain "Total TTC 30,00 €"
     Then The page "1" of the PDF should not contain "TVA non applicable - art. 293B du CGI"
-    Then The page "1" of the PDF should contain "Numéro de TVA intercommunautaire NUMERO_A_AJOUTER"
-    Then the checksum of the response content should be "71b3236befcc99a25155b9388cce90f9"
+    Then The page "1" of the PDF should contain "Numéro de TVA intracommunautaire NUMERO_A_AJOUTER"
+    Then the checksum of the response content should be "ad8d0c5660f0c201c4d9112fd237c3f5"
 
   @reloadDbWithTestData @vat
   Scenario: Test d'une facture de cotisation de personne morale avant 2024
@@ -111,7 +111,7 @@ Feature: Espace membre, accueil
     Then The page "1" of the PDF should contain "Code Désignation Prix"
     Then The page "1" of the PDF should contain "ADH Adhésion AFUP jusqu'au 02/01/2024 150.00 €"
     Then The page "1" of the PDF should contain "TVA non applicable - art. 293B du CGI"
-    Then The page "1" of the PDF should not contain "Numéro de TVA intercommunautaire NUMERO_A_AJOUTER"
+    Then The page "1" of the PDF should not contain "Numéro de TVA intracommunautaire NUMERO_A_AJOUTER"
     Then the checksum of the response content should be "7feed06ea4905cb0bf198c4f1cf6d211"
 
   @reloadDbWithTestData @vat
@@ -135,8 +135,9 @@ Feature: Espace membre, accueil
     Then The page "1" of the PDF should contain "Total TVA 20% 30,00 €"
     Then The page "1" of the PDF should contain "Total TTC 180,00 €"
     Then The page "1" of the PDF should not contain "TVA non applicable - art. 293B du CGI"
-    Then The page "1" of the PDF should contain "Numéro de TVA intercommunautaire NUMERO_A_AJOUTER"
-    Then the checksum of the response content should be "43316d1e84385a340db546c4b5cbbf34"
+    Then The page "1" of the PDF should contain "Numéro de TVA intracommunautaire NUMERO_A_AJOUTER"
+    Then the checksum of the response content should be "5c9f09899fdd3525e31b8a4c7183cfd4"
+
 
   @reloadDbWithTestData
   Scenario: On peux télécharger la facture de cotisation pour une personne morale