From 7c1623c7fab3bbb6a92be2395ee81f9175775f96 Mon Sep 17 00:00:00 2001
From: PhpMadman <bjorn@nldistribution.se>
Date: Tue, 29 Oct 2013 14:53:50 +0100
Subject: [PATCH] [-] BO : Order-follow displayed order id instead of order
 reference

---
 classes/order/OrderReturn.php   | 1 +
 themes/default/order-follow.tpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index fe4fbd578..4c4c912b0 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -144,6 +144,7 @@ class OrderReturnCore extends ObjectModel
 			$data[$k]['type'] = 'Return';
 			$data[$k]['tracking_number'] = $or['id_order_return'];
 			$data[$k]['can_edit'] = false;
+			$data[$k]['reference'] = Order::getUniqReferenceOf($or['id_order']);
 		}
 		return $data;
 	}
diff --git a/themes/default/order-follow.tpl b/themes/default/order-follow.tpl
index 41abbb6f2..d28466617 100644
--- a/themes/default/order-follow.tpl
+++ b/themes/default/order-follow.tpl
@@ -70,7 +70,7 @@
 		{foreach from=$ordersReturn item=return name=myLoop}
 			<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
 				<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
-				<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
+				<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{$return.reference}</a></td>
 				<td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
 				<td class="bold">{dateFormat date=$return.date_add full=0}</td>
 				<td class="history_invoice">