diff --git a/ChangeLog b/ChangeLog
index a834607cdb4..060f747b5f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,7 @@ For users:
 - New: [ task #826 ] Optionnal increase stock when deleting an invoice already validated.
 - New: [ task #823 ] Shipping_validate email notification.
 - New: [ task #900 ] Review code of ficheinter.class.php
+- Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 
 For translators:
 - Update language files.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4eea7aa785a..20565a1162b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2811,7 +2811,18 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 			}
 		}
 
-		if ($local == 2 && ! $thirdparty_buyer->localtax2_assuj) return 0;
+		if ($local == 2) 
+		{
+			
+			if ($thirdparty_seller->id==$mysoc->id)
+			{
+				if (! $thirdparty_buyer->localtax2_assuj) return 0;
+			}
+			else
+			{
+				if (! $thirdparty_seller->localtax2_assuj) return 0;
+			}
+		}
 	}
 	else
 	{