From d28d7e63c11400107bb3eec9b03521668790f59e Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Tue, 31 Jul 2012 12:18:10 +0000
Subject: [PATCH] [-] FO : Bug Fixed #PSCFV-3417 - Wrong total order price
 calculation with tax disabled

---
 classes/tax/TaxRulesTaxManager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/classes/tax/TaxRulesTaxManager.php b/classes/tax/TaxRulesTaxManager.php
index 40b049565..e4e98c3a0 100644
--- a/classes/tax/TaxRulesTaxManager.php
+++ b/classes/tax/TaxRulesTaxManager.php
@@ -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)
 			{