diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index e6fa9682703..528abfcd6a5 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -115,7 +115,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
 		$sql.= " WHERE cv.taux = ".$txtva;
 		$sql.= " AND cv.fk_pays = ".$countryid;
-		dol_syslog("calcul_price_total search vat information", LOG_DEBUG);
+		dol_syslog("calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 24686d51e2e..b8a942d5899 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -197,16 +197,16 @@ class PricesTest extends PHPUnit_Framework_TestCase
 
         // --------------------------------------------------------
 
-        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value)
+        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product
 		$mysoc->country_code='ES';
 		$mysoc->country_id=4;
 		$mysoc->localtax1_assuj=0;
 		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 0);
+        $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES');
+        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES for service');
 
-        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect)
+        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
 		$mysoc->country_code='ES';
 		$mysoc->country_id=4;
 		$mysoc->localtax1_assuj=0;
@@ -214,11 +214,21 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES');
+		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test6 ES for product');
+
+        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=1;
+        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
+		print __METHOD__." result2=".join(', ',$result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES for service');
 
 		// --------------------------------------------------------
 
-        // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value)
+        // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service
 		$mysoc->country_code='ES';
 		$mysoc->country_id=4;
 		$mysoc->localtax1_assuj=0;
@@ -226,16 +236,16 @@ class PricesTest extends PHPUnit_Framework_TestCase
         $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
 		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test7 ES');
+		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test7 ES for product');
 
-        // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
+        // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
 		$mysoc->country_code='ES';
 		$mysoc->country_id=4;
 		$mysoc->localtax1_assuj=0;
 		$mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 0);
+        $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
 		print __METHOD__." result2=".join(', ',$result2)."\n";
-		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES');
+		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES for service');
 
 
         /*