From bc1580fcd4ac9bfd162bbeb1968eec3874f9491f Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Wed, 15 Feb 2012 09:53:35 +0000
Subject: [PATCH] [-] BO : fix PSTEST-753 - Warning Trying to get property of
 non-object in view.tpl sur la page commande

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13332 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../default/template/controllers/orders/helpers/view/view.tpl   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index eb62ec449..1aedaa41a 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -69,7 +69,7 @@
 			<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
 			{/if}
 			 |
-			{if ($currentState->delivery || $order->delivery_number)}
+			{if (($currentState && $currentState->delivery) || $order->delivery_number)}
 			<a class="button"  href="pdf.php?id_order={$order->id}&delivery" target="_blank"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
 			{else}
 			<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}