From 40119f139bb35b254872b4725c23b7babe95c425 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Wed, 22 Feb 2012 15:09:33 +0000
Subject: [PATCH] //fixed bug #PSTEST-838

---
 .../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 74a44678f..4a971eb16 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
@@ -570,7 +570,7 @@
 						{l s='tax included.'}
 					{/if}
 
-					{if Configuration::get('PS_ORDER_RETURN')}
+					{if !Configuration::get('PS_ORDER_RETURN')}
 						<br /><br />{l s='Merchandise returns are disabled'}
 					{/if}
 				</div>