diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 991a296eefc..bcfba485824 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -728,12 +728,17 @@ class pdf_einstein extends ModelePDFCommandes
 							case '3':
 							case '5':
 							case '7':
-								continue 2;
-								break;
+							//TODO: Place into a function to control showing by country or study better option
+								if($mysoc->country_code!='ES')
+								{
+									continue 2;
+									break;
+								}
+								
 						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey>0)    // On affiche pas taux 0
+							if ($tvakey!=0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
@@ -764,13 +769,18 @@ class pdf_einstein extends ModelePDFCommandes
 							case '1':
 							case '3':
 							case '5':
-							case '7':
-								continue 2;
-								break;
+							case '7':								
+								//TODO: Place into a function to control showing by country or study better option
+								if($mysoc->country_code!='ES')
+								{
+									continue 2;
+									break;
+								}
+								
 						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey>0)    // On affiche pas taux 0
+							if ($tvakey!=0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e5c2ae7cf5d..aa883b74ed0 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -858,12 +858,16 @@ class pdf_crabe extends ModelePDFFactures
 							case '3':
 							case '5':
 							case '7':
-								continue 2;
-								break;
-						}
+								//TODO: Place into a function to control showing by country or study better option
+								if($mysoc->country_code!='ES')
+								{
+									continue 2;
+									break;
+								}
+														}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey>0)    // On affiche pas taux 0
+							if ($tvakey!=0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
@@ -895,12 +899,16 @@ class pdf_crabe extends ModelePDFFactures
 							case '3':
 							case '5':
 							case '7':
-								continue 2;
-								break;
+								//TODO: Place into a function to control showing by country or study better option
+								if($mysoc->country_code!='ES')
+								{
+									continue 2;
+									break;
+								}
 						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey>0)    // On affiche pas taux 0
+							if ($tvakey!=0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index a9277c90dd7..9eaa7ae2788 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -761,12 +761,17 @@ class pdf_azur extends ModelePDFPropales
 							case '3':
 							case '5':
 							case '7':
-								continue 2;
-								break;
+								//TODO: Place into a function to control showing by country or study better option
+								if($mysoc->country_code!='ES')
+								{
+									continue 2;
+									break;
+								}
+								
 						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey>0)    // On affiche pas taux 0
+							if ($tvakey!=0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
@@ -798,12 +803,17 @@ class pdf_azur extends ModelePDFPropales
 							case '3':
 							case '5':
 							case '7':
-								continue 2;
-								break;
+								//TODO: Place into a function to control showing by country or study better option
+								if($mysoc->country_code!='ES')
+								{
+									continue 2;
+									break;
+								}
+								
 						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey>0)    // On affiche pas taux 0
+							if ($tvakey!=0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;