From a3de006c5aef52992528a4d311a78253fa5bc54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 20 Feb 2013 17:34:32 +0100
Subject: [PATCH] [-] BO: Fix #PSCFV-7838 deleted taxes should not appears on
 the listing

---
 controllers/admin/AdminProductsController.php | 2 +-
 controllers/admin/AdminTaxesController.php    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 2ed758309..2042076ca 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -355,7 +355,7 @@ class AdminProductsControllerCore extends AdminController
 	protected function loadObject($opt = false)
 	{
 		$result = parent::loadObject($opt);
-		if ($result && Validate::isLoadedObjec($this->object))
+		if ($result && Validate::isLoadedObject($this->object))
 			$this->object->loadStockData();
 		return $result;
 	}
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index 1476f134d..ce2dfb427 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -103,6 +103,8 @@ class AdminTaxesControllerCore extends AdminController
 				);
 
 		parent::__construct();
+		
+		$this->_where .= ' AND a.deleted = 0';
 	}
 
 	/**