diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 7c32c31f696..1634998d023 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -794,11 +794,11 @@ class FormCompany
     	{
     		$valors=explode(":", $tax);
     
-    		if(sizeof($valors)>1)
+    		if(count($valors)>1)
     		{
     			//montar select
     			print '<select class="flat" name="'.$htmlname.'">';
-    			while($i <= (sizeof($valors))-1){
+    			while($i <= (count($valors))-1){
     				if ($selected == $valors[$i]){
     					print '<option value="'.$valors[$i].'" selected="selected">';
     				}else{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3a4fd073336..365dd408a2e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2896,6 +2896,7 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	{
 		if ($local == 1)
 		{
+			if(! $mysoc->localtax1_assuj) return 0;
 			if ($thirdparty_seller->id==$mysoc->id)
 			{
 				if (! $thirdparty_buyer->localtax1_assuj) return 0;
@@ -2908,7 +2909,7 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 
 		if ($local == 2)
 		{
-		
+			if(! $mysoc->localtax2_assuj) return 0;
 			if ($thirdparty_seller->id==$mysoc->id )
 			{
 				if (! $thirdparty_buyer->localtax2_assuj) return 0;
@@ -3002,7 +3003,7 @@ function isOnlyOneLocalTax($local)
 
 	$valors=explode(":", $tax);
 	
-	if(sizeof($valors)>1)
+	if(count($valors)>1)
 	{
 		return false;
 	}