[-] FO : Bug Fixed #PSCFV-3417 - Wrong total order price calculation with tax disabled

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:18:10 +00:00
parent a22276d161
commit f4d03c95db
1 changed files with 4 additions and 1 deletions
@@ -69,6 +69,10 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface
 		if (isset($this->tax_calculator))
 			return $this->tax_calculator;

+		$taxes = array();
+		if (!Configuration::get('PS_TAX'))
+			return new TaxCalculator($taxes);
+
 		$postcode = 0;
 		if (!empty($this->address->postcode))
 			$postcode = $this->address->postcode;
@@ -86,7 +90,6 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface

 			$behavior = 0;
 			$first_row = true;
-			$taxes = array();

 			foreach ($rows as $row)
 			{