From 7fc65bb8eb8f4dbdc96cb63e4067685209dde35f Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Fri, 13 Apr 2012 14:26:11 +0000
Subject: [PATCH] [-] BO : #PSCFI-PSCFI-5323 - Refound displayed instead of
 Return on the order lines if the order is shipped

---
 .../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 904157053..60c7b0897 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
@@ -536,7 +536,7 @@
 						<th colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th>
 						<th colspan="2" style="display: none;" class="edit_product_fields">&nbsp;</th>
 						<th colspan="2" style="display: none;" class="standard_refund_fields"><img src="../img/admin/delete.gif" alt="{l s='Products'}" />
-							{if ($order->hasBeenDelivered())}
+							{if ($order->hasBeenDelivered() || $order->hasBeenShipped())}
 								{l s='Return'}
 							{elseif ($order->hasBeenPaid())}
 								{l s='Refund'}