From e4c9eee04bd9a28d9115be5e221a62ff33076a76 Mon Sep 17 00:00:00 2001
From: aFolletete <alain.folletete@prestashop.com>
Date: Thu, 2 Feb 2012 13:30:51 +0000
Subject: [PATCH] // fixed little bug on AdminTracking // fixed undefined error

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12928 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../controllers/orders/_print_pdf_icon.tpl    |  4 ++--
 controllers/admin/AdminTrackingController.php | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
index 142b58109..24118d1da 100644
--- a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
@@ -26,7 +26,7 @@
 
 {* Generate HTML code for printing Invoice Icon with link *}
 <span style="width:20px; margin-right:5px;">
-{if (($order_state->invoice && $order->invoice_number) && $tr['product_number'])}
+{if ($order_state->invoice && $order->invoice_number)}
 	<a target="_blank" href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
 {else}
 	-
@@ -40,4 +40,4 @@
 {else}
 	-
 {/if}
-</span>
\ No newline at end of file
+</span>
diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php
index fc8618507..8df64d18a 100644
--- a/controllers/admin/AdminTrackingController.php
+++ b/controllers/admin/AdminTrackingController.php
@@ -69,8 +69,8 @@ class AdminTrackingControllerCore extends AdminController
 		$this->table = 'category';
 		$this->lang = true;
 		$this->identifier = 'id_category';
-		$this->_defaultOrderBy = 'id_category';
-		$this->_defaultOrderWay = 'DESC';
+		$this->_orderBy = 'id_category';
+		$this->_orderWay = 'DESC';
 		self::$currentIndex = 'index.php?controller=AdminCategories';
 		$this->token = Tools::getAdminTokenLite('AdminCategories');
 
@@ -103,8 +103,8 @@ class AdminTrackingControllerCore extends AdminController
 		$this->table = 'product';
 		$this->lang = true;
 		$this->identifier = 'id_product';
-		$this->_defaultOrderBy = 'id_product';
-		$this->_defaultOrderWay = 'DESC';
+		$this->_orderBy = 'id_product';
+		$this->_orderWay = 'DESC';
 		self::$currentIndex = 'index.php?controller=AdminProducts';
 		$this->token = Tools::getAdminTokenLite('AdminProducts');
 		$this->show_toolbar = false;
@@ -141,8 +141,8 @@ class AdminTrackingControllerCore extends AdminController
 		$this->table = 'product';
 		$this->lang = true;
 		$this->identifier = 'id_product';
-		$this->_defaultOrderBy = 'id_product';
-		$this->_defaultOrderWay = 'DESC';
+		$this->_orderBy = 'id_product';
+		$this->_orderWay = 'DESC';
 		$this->show_toolbar = false;
 		self::$currentIndex = 'index.php?controller=AdminProducts';
 		$this->token = Tools::getAdminTokenLite('AdminProducts');
@@ -179,8 +179,8 @@ class AdminTrackingControllerCore extends AdminController
 		$this->table = 'product';
 		$this->lang = true;
 		$this->identifier = 'id_product';
-		$this->_defaultOrderBy = 'id_product';
-		$this->_defaultOrderWay = 'DESC';
+		$this->_orderBy = 'id_product';
+		$this->_orderWay = 'DESC';
 		$this->_filter = 'AND active = 0';
 		$this->list_no_filter = true;
 		$this->tpl_list_vars = array('sub_title' => $this->l('List of disabled products:'));
@@ -206,8 +206,8 @@ class AdminTrackingControllerCore extends AdminController
 		$this->actions = array();
 		$this->lang = false;
 		$this->identifier = '';
-		$this->_defaultOrderBy = '';
-		$this->_defaultOrderWay = '';
+		$this->_orderBy = '';
+		$this->_orderWay = '';
 		$this->_filter = '';
 		$this->_group = '';
 		$this->list_no_filter = true;