diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index a7c24b02ea4..d62c23237b9 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -475,14 +475,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
 	print "</table>";
 	print "</td></tr>\n";
 
-	/* Je desactive cette option "facturation" car ce statut fiscal n'existe pas. Seul le reel et franchise existe.
-	 Cette option ne doit donc pas etre en "exclusif" avec l'option fiscale de gestion de tva. Peut etre faut-il
-	 une option a part qui n'entre pas en conflit avec les choix "assujeti TVA" ou "non".
-	 $var=!$var;
-	 print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"facturation\"".($conf->global->FACTURE_TVAOPTION == "facturation"?" checked":"")."> Option facturation</label></td>";
-	 print "<td colspan=\"2\">L'option 'facturation' est utilisee par les entreprises qui payent la TVA a facturation (vente de materiel).</td></tr>\n";
-	 */
-
 	$var=!$var;
 	print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"franchise\"".($conf->global->FACTURE_TVAOPTION == "franchise"?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 	print '<td colspan="2">';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 042bfb80f19..0a8f5cb8707 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -380,11 +380,11 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 	$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 
 	// Define if company use vat or not (Do not use conf->global->FACTURE_TVAOPTION anymore)
-	$mysoc->tva_assuj=($conf->global->FACTURE_TVAOPTION=='franchise'?0:1);
-	
+	$mysoc->tva_assuj=((isset($conf->global->FACTURE_TVAOPTION) && $conf->global->FACTURE_TVAOPTION=='franchise')?0:1);
+
 	// Define if company use local taxes
-	$mysoc->localtax1_assuj=($conf->global->FACTURE_LOCAL_TAX1_OPTION=='franchise'?0:1);
-	$mysoc->localtax2_assuj=($conf->global->FACTURE_LOCAL_TAX2_OPTION=='franchise'?0:1);
+	$mysoc->localtax1_assuj=($conf->global->FACTURE_LOCAL_TAX1_OPTION?1:0);
+	$mysoc->localtax2_assuj=($conf->global->FACTURE_LOCAL_TAX2_OPTION?1:0);
 }