From 5b804d3628583e91c5cf5e0fc576456c5a63b8ee Mon Sep 17 00:00:00 2001
From: sLorenzini <sarah.lorenzini@prestashop.com>
Date: Tue, 23 Jul 2013 17:54:47 +0200
Subject: [PATCH] // update order tab

---
 .../modules_positions/list_modules.tpl        |    5 +-
 .../controllers/orders/_customized_data.tpl   |  238 ++--
 .../controllers/orders/_documents.tpl         |  222 +--
 .../controllers/orders/_new_product.tpl       |  106 +-
 .../controllers/orders/_product_line.tpl      |  226 ++--
 .../template/controllers/orders/_shipping.tpl |  109 +-
 .../controllers/orders/helpers/view/view.tpl  | 1194 ++++++++++-------
 7 files changed, 1163 insertions(+), 937 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
index 6ef99565c..e4b1ec6a6 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
@@ -138,19 +138,20 @@
 											</td>
 											<td>
 												<div class="btn-group btn-group-action">
+													<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
 													<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
 														<span class="caret"></span>&nbsp;
 													</button>
 													<ul class="dropdown-menu">
 														<li>
 															<a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&editGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}">
-																<i class="icon-edit"></i>
+																<i class="icon-pencil"></i>
 																{l s='Edit'}
 															</a>
 														</li>
 														<li>
 															<a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&deleteGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}">
-																<i class="icon-remove"></i>
+																<i class="icon-trash"></i>
 																{l s='Delete'}
 															</a>
 														</li>
diff --git a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
index 7e5b10b7e..4cfdf06fb 100755
--- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
@@ -23,126 +23,128 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {if $product['customizedDatas']}
-	<tr class="customized customized-{$product['id_order_detail']|intval}">
-		<td align="center">
-			<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
-			{if isset($product['image']) && $product['image']->id|intval}{$product['image_tag']}{else}--{/if}</td>
-		<td>
-			<a href="index.php?controller=adminproducts&id_product={$product['product_id']|intval}&updateproduct&token={getAdminToken tab='AdminProducts'}">
-			<span class="productName">{$product['product_name']} - {l s='Customized'}</span><br />
-			{if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}<br />{/if}
-			{if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}
-			</a>
-		</td>
-		<td align="center">
-			<span class="product_price_show">{displayPrice price=$product['product_price_wt'] currency=$currency->id|intval}</span>
-			{if $can_edit}
-			<span class="product_price_edit" style="display:none;">
-				<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
-				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
-				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
-			</span>
-			{/if}
-		</td>
-		<td align="center" class="productQuantity">{$product['customizationQuantityTotal']}</td>
-		{if ($order->hasBeenPaid())}<td align="center" class="productQuantity">{$product['customizationQuantityRefunded']}</td>{/if}
-		{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<td align="center" class="productQuantity">{$product['customizationQuantityReturned']}</td>{/if}
-		{if $stock_management}<td align="center" class=""> - </td>{/if}
-		<td align="center" class="total_product">
-		{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-			{displayPrice price=Tools::ps_round($product['product_price'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
-		{else}
-			{displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
-		{/if}
-		</td>
-		<td class="cancelQuantity standard_refund_fields current-edit" style="display:none" colspan="2">
-			&nbsp;
-		</td>
-		<td class="edit_product_fields" colspan="2" style="display:none">&nbsp;</td>
-		<td class="partial_refund_fields current-edit" style="text-align:left;display:none"></td>
-		{if ($can_edit && !$order->hasBeenDelivered())}
-			<td class="product_action" style="text-align:right">
-				<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-				<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
-				<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-				<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
-			</td>
-		{/if}
-	</tr>
-	{foreach $product['customizedDatas'] as $customizationPerAddress}
-		{foreach $customizationPerAddress as $customizationId => $customization}
-			<tr class="customized customized-{$product['id_order_detail']|intval}">
-				<td colspan="2">
+	<tbody>
+		<tr class="customized customized-{$product['id_order_detail']|intval}">
+			<td align="center">
 				<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
-			{foreach $customization.datas as $type => $datas}
-				{if ($type == Product::CUSTOMIZE_FILE)}
-					<ul style="margin: 4px 0px 4px 0px; padding: 0px; list-style-type: none;">
-					{foreach from=$datas item=data}
-						<li style="margin: 2px;">
-							<span>{if $data['name']}{$data['name']}{else}{l s='Picture #'}{$data@iteration}{/if}{l s=':'}</span>&nbsp;
-								<a href="displayImage.php?img={$data['value']}&name={$order->id|intval}-file{$data@iteration}" target="_blank"><img src="{$smarty.const._THEME_PROD_PIC_DIR_}{$data['value']}_small" alt="" /></a>
-						</li>
-					{/foreach}
-					</ul>
-				{elseif ($type == Product::CUSTOMIZE_TEXTFIELD)}
-					<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">
-					{foreach from=$datas item=data}
-						<li>{if $data['name']}{l s='%s:' sprintf=$data['name']}{else}{l s='Text #%s:' sprintf=$data@iteration}{/if} {$data['value']}</li>
-					{/foreach}
-					</ul>
+				{if isset($product['image']) && $product['image']->id|intval}{$product['image_tag']}{else}--{/if}</td>
+			<td>
+				<a href="index.php?controller=adminproducts&id_product={$product['product_id']|intval}&updateproduct&token={getAdminToken tab='AdminProducts'}">
+				<span class="productName">{$product['product_name']} - {l s='Customized'}</span><br />
+				{if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}<br />{/if}
+				{if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}
+				</a>
+			</td>
+			<td align="center">
+				<span class="product_price_show">{displayPrice price=$product['product_price_wt'] currency=$currency->id|intval}</span>
+				{if $can_edit}
+				<span class="product_price_edit" style="display:none;">
+					<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
+					{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
+					{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
+				</span>
 				{/if}
+			</td>
+			<td align="center" class="productQuantity">{$product['customizationQuantityTotal']}</td>
+			{if ($order->hasBeenPaid())}<td align="center" class="productQuantity">{$product['customizationQuantityRefunded']}</td>{/if}
+			{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<td align="center" class="productQuantity">{$product['customizationQuantityReturned']}</td>{/if}
+			{if $stock_management}<td align="center" class=""> - </td>{/if}
+			<td align="center" class="total_product">
+			{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+				{displayPrice price=Tools::ps_round($product['product_price'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
+			{else}
+				{displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
+			{/if}
+			</td>
+			<td class="cancelQuantity standard_refund_fields current-edit" style="display:none" colspan="2">
+				&nbsp;
+			</td>
+			<td class="edit_product_fields" colspan="2" style="display:none">&nbsp;</td>
+			<td class="partial_refund_fields current-edit" style="text-align:left;display:none"></td>
+			{if ($can_edit && !$order->hasBeenDelivered())}
+				<td class="product_action" style="text-align:right">
+					<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
+					<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
+					<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
+					<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
+				</td>
+			{/if}
+		</tr>
+		{foreach $product['customizedDatas'] as $customizationPerAddress}
+			{foreach $customizationPerAddress as $customizationId => $customization}
+				<tr class="customized customized-{$product['id_order_detail']|intval}">
+					<td colspan="2">
+					<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
+				{foreach $customization.datas as $type => $datas}
+					{if ($type == Product::CUSTOMIZE_FILE)}
+						<ul style="margin: 4px 0px 4px 0px; padding: 0px; list-style-type: none;">
+						{foreach from=$datas item=data}
+							<li style="margin: 2px;">
+								<span>{if $data['name']}{$data['name']}{else}{l s='Picture #'}{$data@iteration}{/if}{l s=':'}</span>&nbsp;
+									<a href="displayImage.php?img={$data['value']}&name={$order->id|intval}-file{$data@iteration}" target="_blank"><img src="{$smarty.const._THEME_PROD_PIC_DIR_}{$data['value']}_small" alt="" /></a>
+							</li>
+						{/foreach}
+						</ul>
+					{elseif ($type == Product::CUSTOMIZE_TEXTFIELD)}
+						<ul style="margin: 0px 0px 4px 0px; padding: 0px 0px 0px 6px; list-style-type: none;">
+						{foreach from=$datas item=data}
+							<li>{if $data['name']}{l s='%s:' sprintf=$data['name']}{else}{l s='Text #%s:' sprintf=$data@iteration}{/if} {$data['value']}</li>
+						{/foreach}
+						</ul>
+					{/if}
+				{/foreach}
+					</td>
+					<td align="center">-
+					</td>
+					<td align="center" class="productQuantity">
+						<span class="product_quantity_show{if (int)$customization['quantity'] > 1} red bold{/if}">{$customization['quantity']}</span>
+						{if $can_edit}
+						<span class="product_quantity_edit" style="display:none;">
+							<input type="text" name="product_quantity[{$customizationId|intval}]" class="edit_product_quantity" value="{$customization['quantity']|htmlentities}" size="2" />
+						</span>
+						{/if}
+					</td>
+					{if ($order->hasBeenPaid())}<td align="center">{$customization['quantity_refunded']}</td>{/if}
+					{if ($order->hasBeenDelivered())}<td align="center">{$customization['quantity_returned']}</td>{/if}
+					<td align="center">
+					-
+					</td>
+					<td align="center" class="total_product">
+						{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+							{displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id|intval}
+						{else}
+							{displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id|intval}
+						{/if}
+					</td>				
+					<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
+						<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$customization['quantity_returned']|intval}" />
+						<input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']|intval}" />
+						<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
+						{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($customization['quantity_returned']) < (int)($customization['quantity']))}
+							<input type="checkbox" name="id_customization[{$customizationId|intval}]" id="id_customization[{$customizationId|intval}]" value="{$product['id_order_detail']|intval}" onchange="setCancelQuantity(this, {$customizationId|intval}, {$customization['quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_reinjected']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
+						{else}
+						--
+					{/if}
+					</td>
+					<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
+					{if ($customization['quantity_returned'] + $customization['quantity_refunded'] >= $customization['quantity'])}
+						<input type="hidden" name="cancelCustomizationQuantity[{$customizationId|intval}]" value="0" />
+					{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
+						<input type="text" id="cancelQuantity_{$customizationId|intval}" name="cancelCustomizationQuantity[{$customizationId|intval}]" size="2" onclick="selectCheckbox(this);" value="" />0/{$customization['quantity']-$customization['quantity_refunded']}
+					{/if}
+					</td>
+					<td class="partial_refund_fields current-edit" style="text-align:left;display:none">
+						<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input type="text" size="3" name="partialRefundProductQuantity[{$product['id_order_detail']|intval}]" value="0" />		
+						0/{$customization['quantity']-$customization['quantity_refunded']}
+						</div>
+						<div style="width:40%;margin-top:5px;float:left">{l s='Amount:'}</div> <div style="width:60%;margin-top:2px;float:left">{$currency->prefix}<input type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']|intval}]" />{$currency->suffix}</div>
+					</td>
+					{if ($can_edit && !$order->hasBeenDelivered())}
+						<td class="edit_product_fields" colspan="2" style="display:none"></td>
+						<td class="product_action" style="text-align:right"></td>
+					{/if}
+				</tr>
 			{/foreach}
-				</td>
-				<td align="center">-
-				</td>
-				<td align="center" class="productQuantity">
-					<span class="product_quantity_show{if (int)$customization['quantity'] > 1} red bold{/if}">{$customization['quantity']}</span>
-					{if $can_edit}
-					<span class="product_quantity_edit" style="display:none;">
-						<input type="text" name="product_quantity[{$customizationId|intval}]" class="edit_product_quantity" value="{$customization['quantity']|htmlentities}" size="2" />
-					</span>
-					{/if}
-				</td>
-				{if ($order->hasBeenPaid())}<td align="center">{$customization['quantity_refunded']}</td>{/if}
-				{if ($order->hasBeenDelivered())}<td align="center">{$customization['quantity_returned']}</td>{/if}
-				<td align="center">
-				-
-				</td>
-				<td align="center" class="total_product">
-					{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-						{displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id|intval}
-					{else}
-						{displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id|intval}
-					{/if}
-				</td>				
-				<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
-					<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$customization['quantity_returned']|intval}" />
-					<input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']|intval}" />
-					<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
-					{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($customization['quantity_returned']) < (int)($customization['quantity']))}
-						<input type="checkbox" name="id_customization[{$customizationId|intval}]" id="id_customization[{$customizationId|intval}]" value="{$product['id_order_detail']|intval}" onchange="setCancelQuantity(this, {$customizationId|intval}, {$customization['quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_reinjected']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
-					{else}
-					--
-				{/if}
-				</td>
-				<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
-				{if ($customization['quantity_returned'] + $customization['quantity_refunded'] >= $customization['quantity'])}
-					<input type="hidden" name="cancelCustomizationQuantity[{$customizationId|intval}]" value="0" />
-				{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
-					<input type="text" id="cancelQuantity_{$customizationId|intval}" name="cancelCustomizationQuantity[{$customizationId|intval}]" size="2" onclick="selectCheckbox(this);" value="" />0/{$customization['quantity']-$customization['quantity_refunded']}
-				{/if}
-				</td>
-				<td class="partial_refund_fields current-edit" style="text-align:left;display:none">
-					<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input type="text" size="3" name="partialRefundProductQuantity[{$product['id_order_detail']|intval}]" value="0" />		
-					0/{$customization['quantity']-$customization['quantity_refunded']}
-					</div>
-					<div style="width:40%;margin-top:5px;float:left">{l s='Amount:'}</div> <div style="width:60%;margin-top:2px;float:left">{$currency->prefix}<input type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']|intval}]" />{$currency->suffix}</div>
-				</td>
-				{if ($can_edit && !$order->hasBeenDelivered())}
-					<td class="edit_product_fields" colspan="2" style="display:none"></td>
-					<td class="product_action" style="text-align:right"></td>
-				{/if}
-			</tr>
 		{/foreach}
-	{/foreach}
+	</tbody>
 {/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
index 54b1e8599..2e037b9ab 100644
--- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
@@ -22,118 +22,140 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<table class="table" width="100%;" cellspacing="0" cellpadding="0" id="documents_table">
+<table class="table table-hover" width="100%;" cellspacing="0" cellpadding="0" id="documents_table">
 	<thead>
-	<tr>
-		<th style="width:10%">{l s='Date'}</th>
-		<th style="">{l s='Document'}</th>
-		<th style="width:20%">{l s='Number'}</th>
-		<th style="width:10%">{l s='Amount'}</th>
-		<th style="width:1%"></th>
-	</tr>
+		<tr>
+			<th width="10%">
+				<span class="title_box ">{l s='Date'}</span>
+			</th>
+			<th>
+				<span class="title_box ">{l s='Document'}</span>
+			</th>
+			<th width="20%">
+				<span class="title_box ">{l s='Number'}</span>
+			</th>
+			<th width="20%">
+				<span class="title_box ">{l s='Amount'}</span>
+			</th>
+			<th width="1%"></th>
+		</tr>
 	</thead>
 	<tbody>
-	{foreach from=$order->getDocuments() item=document}
+		{foreach from=$order->getDocuments() item=document}
 
-	{if get_class($document) eq 'OrderInvoice'}
-		{if isset($document->is_delivery)}
-		<tr class="invoice_line" id="delivery_{$document->id}">
-		{else}
-		<tr class="invoice_line" id="invoice_{$document->id}">
-		{/if}
-	{elseif get_class($document) eq 'OrderSlip'}
-		<tr class="invoice_line" id="orderslip_{$document->id}">
-	{/if}
-
-		<td class="document_date">{dateFormat date=$document->date_add}</td>
-		<td class="document_type">
 			{if get_class($document) eq 'OrderInvoice'}
 				{if isset($document->is_delivery)}
-					{l s='Delivery slip'}
+				<tr id="delivery_{$document->id}">
 				{else}
-					{l s='Invoice'}
+				<tr id="invoice_{$document->id}">
 				{/if}
 			{elseif get_class($document) eq 'OrderSlip'}
-				{l s='Credit Slip'}
-			{/if}</td>
-		<td class="document_number">
-			{if get_class($document) eq 'OrderInvoice'}
-				{if isset($document->is_delivery)}
-					<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
-			   	{else}
-					<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
-			   {/if}
-			{elseif get_class($document) eq 'OrderSlip'}
-				<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
+				<tr id="orderslip_{$document->id}">
 			{/if}
-			{if get_class($document) eq 'OrderInvoice'}
-				{if isset($document->is_delivery)}
-					#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->delivery_number}
-				{else}
-					{$document->getInvoiceNumberFormatted($current_id_lang)}
-				{/if}
-			{elseif get_class($document) eq 'OrderSlip'}
-				#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
-			{/if} <img src="../img/admin/details.gif" alt="{l s='See the document'}" /></a></td>
-		<td class="document_amount">
-		{if get_class($document) eq 'OrderInvoice'}
-			{if isset($document->is_delivery)}
-				--
-			{else}
-				{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
-				{if $document->getTotalPaid()}
-					<span style="color:red;font-weight:bold;">
-					{if $document->getRestPaid() > 0}
-						({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})
-					{else if $document->getRestPaid() < 0}
-						({displayPrice price=-$document->getRestPaid() currency=$currency->id} {l s='overpaid'})
+
+					<td>{dateFormat date=$document->date_add}</td>
+					<td>
+						{if get_class($document) eq 'OrderInvoice'}
+							{if isset($document->is_delivery)}
+								{l s='Delivery slip'}
+							{else}
+								{l s='Invoice'}
+							{/if}
+						{elseif get_class($document) eq 'OrderSlip'}
+							{l s='Credit Slip'}
+						{/if}
+					</td>
+					<td>
+						{if get_class($document) eq 'OrderInvoice'}
+							{if isset($document->is_delivery)}
+								<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
+						   	{else}
+								<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
+						   {/if}
+						{elseif get_class($document) eq 'OrderSlip'}
+							<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
+						{/if}
+						{if get_class($document) eq 'OrderInvoice'}
+							{if isset($document->is_delivery)}
+								#{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->delivery_number}
+							{else}
+								{$document->getInvoiceNumberFormatted($current_id_lang)}
+							{/if}
+						{elseif get_class($document) eq 'OrderSlip'}
+							#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
+						{/if} <i class="icon-search"></i>
+							</a>
+					</td>
+					<td>
+					{if get_class($document) eq 'OrderInvoice'}
+						{if isset($document->is_delivery)}
+							--
+						{else}
+							{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
+							{if $document->getTotalPaid()}
+								<span>
+								{if $document->getRestPaid() > 0}
+									({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})
+								{else if $document->getRestPaid() < 0}
+									({displayPrice price=-$document->getRestPaid() currency=$currency->id} {l s='overpaid'})
+								{/if}
+								</span>
+							{/if}
+						{/if}
+					{elseif get_class($document) eq 'OrderSlip'}
+						{displayPrice price=$document->amount currency=$currency->id}
 					{/if}
-					</span>
+					</td>
+					<td>
+					{if get_class($document) eq 'OrderInvoice'}
+						{if !isset($document->is_delivery)}
+							{if $document->getRestPaid()}
+								<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
+							{/if}
+							<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
+								<i class="icon-pencil"></i>
+							</a>
+						{/if}
+					{/if}
+					</td>
+				</tr>
+			{if get_class($document) eq 'OrderInvoice'}
+				{if !isset($document->is_delivery)}
+				<tr id="invoiceNote{$document->id}" style="display:none">
+					<td colspan="5">
+						<form action="{$current_index}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
+							<p>
+								<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
+								<input type="hidden" name="id_order_invoice" value="{$document->id}" />
+								<textarea name="note" rows="10" cols="10" id="editNote{$document->id}" class="edit-note">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
+							</p>
+							<p>
+								<button type="submit" name="submitEditNote" class="btn btn-default"> 
+									<i class="icon-save"></i>
+									{l s='Save'}
+								</button>
+								<a class="btn btn-default" href="#" id="cancelNote" onclick="$('#invoiceNote{$document->id}').hide();return false;">
+									<i class="icon-remove"></i>
+									{l s='Cancel'}
+								</a>
+							</p>
+						</form>
+					</td>
+				</tr>
 				{/if}
 			{/if}
-		{elseif get_class($document) eq 'OrderSlip'}
-			{displayPrice price=$document->amount currency=$currency->id}
-		{/if}
-		</td>
-		<td class="right document_action">
-		{if get_class($document) eq 'OrderInvoice'}
-			{if !isset($document->is_delivery)}
-				{if $document->getRestPaid()}
-					<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
-				{/if}
-				<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"><img src="../img/admin/note.png" alt="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"{if $document->note eq ''} class="js-disabled-action"{/if} /></a>
-			{/if}
-		{/if}
-		</td>
-	</tr>
-	{if get_class($document) eq 'OrderInvoice'}
-		{if !isset($document->is_delivery)}
-	<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit">
-		<td colspan="5">
-			<form action="{$current_index}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
-				<p>
-					<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
-					<input type="hidden" name="id_order_invoice" value="{$document->id}" />
-					<textarea name="note" rows="10" cols="10" id="editNote{$document->id}" class="edit-note">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
-				</p>
-				<p class="right">
-					<input type="submit" name="submitEditNote" value="{l s='Save'}" class="button" />&nbsp;
-					<a href="#" id="cancelNote" onclick="$('#invoiceNote{$document->id}').hide();return false;">{l s='Cancel'}</a>
-				</p>
-			</form>
-		</td>
-	</tr>
-		{/if}
-	{/if}
-	{foreachelse}
-	<tr>
-		<td colspan="5" class="center">
-			<h3>{l s='No documents are available'}</h3>
-			{if isset($invoice_management_active) && $invoice_management_active}
-			<p><a class="button" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
-			{/if}
-		</td>
-	</tr>
-	{/foreach}
+		{foreachelse}
+			<tr>
+				<td colspan="5" class="center">
+					<h4>{l s='No documents are available'}</h4>
+					{if isset($invoice_management_active) && $invoice_management_active}
+					<a class="btn btn-default" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+						<i class="icon-repeat"></i>
+						{l s='Generate invoice'}
+					</a>
+					{/if}
+				</td>
+			</tr>
+		{/foreach}
 	</tbody>
 </table>
diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
index 44027fb81..40842f15a 100644
--- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
@@ -22,56 +22,58 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<tr id="new_product" height="52" style="display:none;background-color:#e9f1f6">
-	<td style="display:none;" colspan="2">
-		<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
-		{l s='Product:'} <input type="text" id="add_product_product_name" value="" size="42" />
-		<div id="add_product_product_attribute_area" style="margin-top: 5px;display: none;">
-			{l s='Combinations'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
-		</div>
-		<div id="add_product_product_warehouse_area" style="margin-top: 5px; display: none;">
-			{l s='Warehouse'} <select  id="add_product_warehouse" name="add_product_warehouse">
+<tbody>
+	<tr id="new_product" height="52" style="display:none;background-color:#e9f1f6">
+		<td style="display:none;" colspan="2">
+			<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
+			{l s='Product:'} <input type="text" id="add_product_product_name" value="" size="42" />
+			<div id="add_product_product_attribute_area" style="margin-top: 5px;display: none;">
+				{l s='Combinations'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
+			</div>
+			<div id="add_product_product_warehouse_area" style="margin-top: 5px; display: none;">
+				{l s='Warehouse'} <select  id="add_product_warehouse" name="add_product_warehouse">
+				</select>
+			</div>
+		</td>
+		<td style="display:none;">
+			{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
+			{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}<br />
+		</td>
+		<td style="display:none;" align="center" class="productQuantity"><input type="text" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" size="3" disabled="disabled" /></td>
+		{if ($order->hasBeenPaid())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
+		{if ($order->hasBeenDelivered())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
+		<td style="display:none;" align="center" class="productQuantity" id="add_product_product_stock">0</td>
+		<td style="display:none;" align="center" id="add_product_product_total">{displayPrice price=0 currency=$currency->id}</td>
+		<td style="display:none;" align="center" colspan="2">
+			{if sizeof($invoices_collection)}
+			<select name="add_product[invoice]" id="add_product_product_invoice" disabled="disabled">
+				<optgroup class="existing" label="{l s='Existing'}">
+					{foreach from=$invoices_collection item=invoice}
+					<option value="{$invoice->id}">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
+					{/foreach}
+				</optgroup>
+				<optgroup label="{l s='New'}">
+					<option value="0">{l s='Create a new invoice'}</option>
+				</optgroup>
 			</select>
-		</div>
-	</td>
-	<td style="display:none;">
-		{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
-		{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}<br />
-	</td>
-	<td style="display:none;" align="center" class="productQuantity"><input type="text" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" size="3" disabled="disabled" /></td>
-	{if ($order->hasBeenPaid())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
-	{if ($order->hasBeenDelivered())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
-	<td style="display:none;" align="center" class="productQuantity" id="add_product_product_stock">0</td>
-	<td style="display:none;" align="center" id="add_product_product_total">{displayPrice price=0 currency=$currency->id}</td>
-	<td style="display:none;" align="center" colspan="2">
-		{if sizeof($invoices_collection)}
-		<select name="add_product[invoice]" id="add_product_product_invoice" disabled="disabled">
-			<optgroup class="existing" label="{l s='Existing'}">
-				{foreach from=$invoices_collection item=invoice}
-				<option value="{$invoice->id}">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
-				{/foreach}
-			</optgroup>
-			<optgroup label="{l s='New'}">
-				<option value="0">{l s='Create a new invoice'}</option>
-			</optgroup>
-		</select>
-		{/if}
-	</td>
-	<td style="display:none;">
-		<input type="button" class="button" id="submitAddProduct" value="{l s='Add product'}" disabled="disabled" />
-	</td>
-</tr>
-<tr id="new_invoice" style="display:none;background-color:#e9f1f6;">
-	<td colspan="10">
-		<h3>{l s='New invoice information'}</h3>
-		<label>{l s='Carrier'}</label>
-		<div class="margin-form">
-			{$carrier->name}
-		</div>
-		<div class="margin-form">
-			<input type="checkbox" name="add_invoice[free_shipping]" value="1" />
-			<label class="t">{l s='Free shipping'}</label>
-			<p>{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied.'}</p>
-		</div>
-	</td>
-</tr>
+			{/if}
+		</td>
+		<td style="display:none;">
+			<input type="button" class="button" id="submitAddProduct" value="{l s='Add product'}" disabled="disabled" />
+		</td>
+	</tr>
+	<tr id="new_invoice" style="display:none;background-color:#e9f1f6;">
+		<td colspan="10">
+			<h3>{l s='New invoice information'}</h3>
+			<label>{l s='Carrier'}</label>
+			<div class="margin-form">
+				{$carrier->name}
+			</div>
+			<div class="margin-form">
+				<input type="checkbox" name="add_invoice[free_shipping]" value="1" />
+				<label class="t">{l s='Free shipping'}</label>
+				<p>{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied.'}</p>
+			</div>
+		</td>
+	</tr>
+</tbody>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
index f16827cc4..83cc5c0db 100755
--- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
@@ -31,123 +31,125 @@
 {/if}
 
 {if ($product['product_quantity'] > $product['customizationQuantityTotal'])}
-<tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}>
-	<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td>
-	<td><a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
-		<span class="productName">{$product['product_name']}</span><br />
-		{if $product.product_reference}{l s='Ref:'} {$product.product_reference}<br />{/if}
-		{if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if}
-	</a></td>
-	<td align="center">
-		<span class="product_price_show">{displayPrice price=$product_price currency=$currency->id}</span>
-		{if $can_edit}
-		<span class="product_price_edit" style="display:none;">
-			<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']}" />
-			{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
-			{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
-		</span>
-		{/if}
-	</td>
-	<td align="center" class="productQuantity">
-		<span class="product_quantity_show{if (int)$product['product_quantity'] > 1} red bold{/if}">{$product['product_quantity']}</span>
-		{if $can_edit}
-		<span class="product_quantity_edit" style="display:none;">
-			<input type="text" name="product_quantity" class="edit_product_quantity" value="{$product['product_quantity']|htmlentities}" size="2" />
-		</span>
-		{/if}
-	</td>
-	{if ($order->hasBeenPaid())}
-		<td align="center" class="productQuantity">
-			{$product['product_quantity_refunded']}
-			{if count($product['refund_history'])}
-				<span class="tooltip">
-					<span class="tooltip_label tooltip_button">+</span>
-					<div class="tooltip_content">
-					<span class="title">{l s='Refund history'}</span>
-					{foreach $product['refund_history'] as $refund}
-						{l s='%1s - %2s' sprintf=[{dateFormat date=$refund.date_add}, {displayPrice price=$refund.amount_tax_incl}]}<br />
-					{/foreach}
-					</div>
-				</span>
+<tbody>
+	<tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}>
+		<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td>
+		<td><a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
+			<span class="productName">{$product['product_name']}</span><br />
+			{if $product.product_reference}{l s='Ref:'} {$product.product_reference}<br />{/if}
+			{if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if}
+		</a></td>
+		<td align="center">
+			<span class="product_price_show">{displayPrice price=$product_price currency=$currency->id}</span>
+			{if $can_edit}
+			<span class="product_price_edit" style="display:none;">
+				<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']}" />
+				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
+				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
+			</span>
 			{/if}
 		</td>
-	{/if}
-	{if $order->hasBeenDelivered() || $order->hasProductReturned()}
 		<td align="center" class="productQuantity">
-			{$product['product_quantity_return']}
-			{if count($product['return_history'])}
-				<span class="tooltip">
-					<span class="tooltip_label tooltip_button">+</span>
-					<div class="tooltip_content">
-					<span class="title">{l s='Return history'}</span>
-					{foreach $product['return_history'] as $return}
-						{l s='%1s - %2s - %3s' sprintf=[{dateFormat date=$return.date_add}, $return.product_quantity, $return.state]}<br />
-					{/foreach}
-					</div>
-				</span>
+			<span class="product_quantity_show{if (int)$product['product_quantity'] > 1} red bold{/if}">{$product['product_quantity']}</span>
+			{if $can_edit}
+			<span class="product_quantity_edit" style="display:none;">
+				<input type="text" name="product_quantity" class="edit_product_quantity" value="{$product['product_quantity']|htmlentities}" size="2" />
+			</span>
 			{/if}
 		</td>
-	{/if}
-	{if $stock_management}<td align="center" class="productQuantity product_stock">{$product['current_stock']}</td>{/if}
-	<td align="center" class="total_product">
-		{displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id}
-	</td>
-	<td colspan="2" style="display: none;" class="add_product_fields">&nbsp;</td>
-	<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
-		<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$product['product_quantity_return']}" />
-		<input type="hidden" name="totalQty" id="totalQty" value="{$product['product_quantity']}" />
-		<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
-	{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($product['product_quantity_return']) < (int)($product['product_quantity']))}
-		<input type="checkbox" name="id_order_detail[{$product['id_order_detail']}]" id="id_order_detail[{$product['id_order_detail']}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, {$product['id_order_detail']}, {$product['product_quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_return']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
-	{else}
-		--
-	{/if}
-	</td>
-	<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
-	{if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}
-		<input type="hidden" name="cancelQuantity[{$product['id_order_detail']}]" value="0" />
-	{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
-		<input type="text" id="cancelQuantity_{$product['id_order_detail']}" name="cancelQuantity[{$product['id_order_detail']}]" size="2" onclick="selectCheckbox(this);" value="" />
-	{/if}
-
-	{if $product['customizationQuantityTotal']}
-		{assign var=productQuantity value=($product['product_quantity']-$product['customizationQuantityTotal'])}
-	{else}
-		{assign var=productQuantity value=$product['product_quantity']}
-	{/if}
-
-	{if ($order->hasBeenDelivered())}
-		{$product['product_quantity_refunded']}/{$productQuantity-$product['product_quantity_refunded']}
-	{elseif ($order->hasBeenPaid())}
-		{$product['product_quantity_return']}/{$productQuantity}
-	{else}
-		0/{$productQuantity}
-	{/if}
-	</td>
-	<td class="partial_refund_fields current-edit" style="text-align:left;display:none">
-		<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input onchange="checkPartialRefundProductQuantity(this)" type="text" size="3" name="partialRefundProductQuantity[{{$product['id_order_detail']}}]" value="0" /> 0/{$productQuantity-$product['product_quantity_refunded']}</div>
-		<div style="width:40%;margin-top:5px;float:left">{l s='Amount:'}</div> <div style="width:60%;margin-top:2px;float:left">{$currency->prefix}<input onchange="checkPartialRefundProductAmount(this)" type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']}]" /> {$currency->suffix}</div> {if !empty($product['amount_refund']) && $product['amount_refund'] > 0}({l s='%s refund' sprintf=$product['amount_refund']}){/if}
-		<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
-		<input type="hidden" value="{$product['amount_refundable']}" class="partialRefundProductAmount" />
-	</td>
-	{if ($can_edit && !$order->hasBeenDelivered())}
-	<td class="product_invoice" colspan="2" style="display: none;text-align:center;">
-		{if sizeof($invoices_collection)}
-		<select name="product_invoice" class="edit_product_invoice">
-			{foreach from=$invoices_collection item=invoice}
-			<option value="{$invoice->id}" {if $invoice->id == $product['id_order_invoice']}selected="selected"{/if}>#{Configuration::get('PS_INVOICE_PREFIX', $current_id_lang, null, $order->id_shop)}{'%06d'|sprintf:$invoice->number}</option>
-			{/foreach}
-		</select>
+		{if ($order->hasBeenPaid())}
+			<td align="center" class="productQuantity">
+				{$product['product_quantity_refunded']}
+				{if count($product['refund_history'])}
+					<span class="tooltip">
+						<span class="tooltip_label tooltip_button">+</span>
+						<div class="tooltip_content">
+						<span class="title">{l s='Refund history'}</span>
+						{foreach $product['refund_history'] as $refund}
+							{l s='%1s - %2s' sprintf=[{dateFormat date=$refund.date_add}, {displayPrice price=$refund.amount_tax_incl}]}<br />
+						{/foreach}
+						</div>
+					</span>
+				{/if}
+			</td>
+		{/if}
+		{if $order->hasBeenDelivered() || $order->hasProductReturned()}
+			<td align="center" class="productQuantity">
+				{$product['product_quantity_return']}
+				{if count($product['return_history'])}
+					<span class="tooltip">
+						<span class="tooltip_label tooltip_button">+</span>
+						<div class="tooltip_content">
+						<span class="title">{l s='Return history'}</span>
+						{foreach $product['return_history'] as $return}
+							{l s='%1s - %2s - %3s' sprintf=[{dateFormat date=$return.date_add}, $return.product_quantity, $return.state]}<br />
+						{/foreach}
+						</div>
+					</span>
+				{/if}
+			</td>
+		{/if}
+		{if $stock_management}<td align="center" class="productQuantity product_stock">{$product['current_stock']}</td>{/if}
+		<td align="center" class="total_product">
+			{displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id}
+		</td>
+		<td colspan="2" style="display: none;" class="add_product_fields">&nbsp;</td>
+		<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
+			<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$product['product_quantity_return']}" />
+			<input type="hidden" name="totalQty" id="totalQty" value="{$product['product_quantity']}" />
+			<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
+		{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($product['product_quantity_return']) < (int)($product['product_quantity']))}
+			<input type="checkbox" name="id_order_detail[{$product['id_order_detail']}]" id="id_order_detail[{$product['id_order_detail']}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, {$product['id_order_detail']}, {$product['product_quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_return']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
 		{else}
-		&nbsp;
+			--
 		{/if}
-	</td>
-	<td class="product_action" style="text-align:right">
-		<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-		<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
-		<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-		<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
-	</td>
-	{/if}
-</tr>
+		</td>
+		<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
+		{if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}
+			<input type="hidden" name="cancelQuantity[{$product['id_order_detail']}]" value="0" />
+		{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
+			<input type="text" id="cancelQuantity_{$product['id_order_detail']}" name="cancelQuantity[{$product['id_order_detail']}]" size="2" onclick="selectCheckbox(this);" value="" />
+		{/if}
+
+		{if $product['customizationQuantityTotal']}
+			{assign var=productQuantity value=($product['product_quantity']-$product['customizationQuantityTotal'])}
+		{else}
+			{assign var=productQuantity value=$product['product_quantity']}
+		{/if}
+
+		{if ($order->hasBeenDelivered())}
+			{$product['product_quantity_refunded']}/{$productQuantity-$product['product_quantity_refunded']}
+		{elseif ($order->hasBeenPaid())}
+			{$product['product_quantity_return']}/{$productQuantity}
+		{else}
+			0/{$productQuantity}
+		{/if}
+		</td>
+		<td class="partial_refund_fields current-edit" style="text-align:left;display:none">
+			<div style="width:40%;margin-top:5px;float:left">{l s='Quantity:'}</div> <div style="width:60%;margin-top:2px;float:left"><input onchange="checkPartialRefundProductQuantity(this)" type="text" size="3" name="partialRefundProductQuantity[{{$product['id_order_detail']}}]" value="0" /> 0/{$productQuantity-$product['product_quantity_refunded']}</div>
+			<div style="width:40%;margin-top:5px;float:left">{l s='Amount:'}</div> <div style="width:60%;margin-top:2px;float:left">{$currency->prefix}<input onchange="checkPartialRefundProductAmount(this)" type="text" size="3" name="partialRefundProduct[{$product['id_order_detail']}]" /> {$currency->suffix}</div> {if !empty($product['amount_refund']) && $product['amount_refund'] > 0}({l s='%s refund' sprintf=$product['amount_refund']}){/if}
+			<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
+			<input type="hidden" value="{$product['amount_refundable']}" class="partialRefundProductAmount" />
+		</td>
+		{if ($can_edit && !$order->hasBeenDelivered())}
+		<td class="product_invoice" colspan="2" style="display: none;text-align:center;">
+			{if sizeof($invoices_collection)}
+			<select name="product_invoice" class="edit_product_invoice">
+				{foreach from=$invoices_collection item=invoice}
+				<option value="{$invoice->id}" {if $invoice->id == $product['id_order_invoice']}selected="selected"{/if}>#{Configuration::get('PS_INVOICE_PREFIX', $current_id_lang, null, $order->id_shop)}{'%06d'|sprintf:$invoice->number}</option>
+				{/foreach}
+			</select>
+			{else}
+			&nbsp;
+			{/if}
+		</td>
+		<td class="product_action" style="text-align:right">
+			<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
+			<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
+			<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
+			<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
+		</td>
+		{/if}
+	</tr>
+</tbody>
 {/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
index 40f2072d1..d90607a72 100644
--- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
@@ -22,53 +22,72 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
-<colgroup>
-	<col width="15%">
-	<col width="15%">
-	<col width="">
-	<col width="10%">
-	<col width="20%">
-</colgroup>
+<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
+	<colgroup>
+		<col width="15%">
+		<col width="15%">
+		<col width="">
+		<col width="20%">
+		<col width="1%">
+	</colgroup>
 	<thead>
-	<tr>
-		<th>{l s='Date'}</th>
-		<th>{l s='Type'}</th>
-		<th>{l s='Carrier'}</th>
-		<th>{l s='Weight'}</th>
-		<th>{l s='Shipping cost'}</th>
-		<th>{l s='Tracking number'}</th>
-	</tr>
+		<tr>
+			<th>
+				<span class="title_box ">{l s='Date'}</span>
+			</th>
+			<th>
+				<span class="title_box ">{l s='Type'}</span>
+			</th>
+			<th>
+				<span class="title_box ">{l s='Carrier'}</span>
+			</th>
+			<th>
+				<span class="title_box ">{l s='Weight'}</span>
+			</th>
+			<th>
+				<span class="title_box ">{l s='Shipping cost'}</span>
+			</th>
+			<th>
+				<span class="title_box ">{l s='Tracking number'}</span>
+			</th>
+		</tr>
 	</thead>
 	<tbody>
-	{foreach from=$order->getShipping() item=line}
-	<tr>
-		<td>{dateFormat date=$line.date_add full=true}</td>
-		<td>{$line.type}</td>
-		<td>{$line.carrier_name}</td>
-		<td>{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
-		<td>
-			{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
-				{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}
-			{else}
-				{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}
-			{/if}
-		</td>
-		<td>
-			<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
-			{if $line.can_edit}
-				<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
-					<span class="shipping_number_edit" style="display:none;">
-						<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
-						<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
-						<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
-					</span>
-					<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-					<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-				</form>
-			{/if}
-		</td>
-	</tr>
-	{/foreach}
+		{foreach from=$order->getShipping() item=line}
+		<tr>
+			<td>{dateFormat date=$line.date_add full=true}</td>
+			<td>{$line.type}</td>
+			<td>{$line.carrier_name}</td>
+			<td>{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
+			<td class="center">
+				{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
+					{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}
+				{else}
+					{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}
+				{/if}
+			</td>
+			<td class="right">
+				<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
+				{if $line.can_edit}
+					<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
+						<span class="shipping_number_edit" style="display:none;">
+							<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
+							<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
+							<button type="submit" class="btn btn-small" name="submitShippingNumber"> 
+								<i class="icon-refresh"></i>
+								{l s='Update'}
+							</button>
+						</span>
+						<a href="#" class="edit_shipping_number_link">
+							<i class="icon-search"></i>
+						</a>
+						<a href="#" class="cancel_shipping_number_link" style="display: none;">
+							<i class="icon-remove"></i>
+						</a>
+					</form>
+				{/if}
+			</td>
+		</tr>
+		{/foreach}
 	</tbody>
 </table>
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 f760fd772..d91a2ffb1 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
@@ -63,6 +63,7 @@
 	{/if}
 
 <div class="row">
+	<!-- Global informations -->
 	<div class="col-lg-12">
 		<div class="well">
 			<span>
@@ -107,62 +108,89 @@
 		</div>
 	</div>
 
+	<!-- Breadcrumb -->
 	<div class="col-lg-12">
 		<div class="breadcrumb pull-right">
-			<b>{l s='Orders'}</b> :
-			{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
-			{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
+			<span><strong>{l s='Orders'}</strong></span> :
+			{if $previousOrder}
+				<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">
+					{l s='< Prev'}
+				</a>
+			{/if}
+			{if $nextOrder}
+				<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">
+					{l s='Next >'}
+				</a>
+			{/if}
 		</div>
 	</div>
 
+	<!-- Status -->
 	<div class="col-lg-12">
 		<!-- Change status form -->
 		<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
-			<select id="id_order_state" name="id_order_state">
-			{foreach from=$states item=state}
-				{if $state['id_order_state'] != $currentState->id}
-				<option value="{$state['id_order_state']}">{$state['name']|stripslashes}</option>
-				{/if}
-			{/foreach}
-			</select>
+			<label class="control-label col-lg-1 text-right">
+				{l s='Status:'}
+			</label>
+			<div class="col-lg-10">
+				<select id="id_order_state" name="id_order_state">
+					{foreach from=$states item=state}
+						{if $state['id_order_state'] != $currentState->id}
+						<option value="{$state['id_order_state']}">{$state['name']|stripslashes}</option>
+						{/if}
+					{/foreach}
+				</select>
+			</div>
 			<input type="hidden" name="id_order" value="{$order->id}" />
-			<input type="submit" name="submitState" value="{l s='Add'}" class="button" />
+			<button type="submit" name="submitState" class="btn btn-default"> 
+				{l s='Add'}
+			</button>
 		</form>
 		<!-- History of status -->
-		<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
+		<table cellspacing="0" cellpadding="0" class="table table-hover">
 			<colgroup>
 				<col width="1%">
 				<col width="">
 				<col width="20%">
 				<col width="20%">
 			</colgroup>
-		{foreach from=$history item=row key=key}
-			{if ($key == 0)}
-			<tr>
-				<th><img src="../img/os/{$row['id_order_state']}.gif" /></th>
-				<th>{$row['ostate_name']|stripslashes}</th>
-				<th>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</th>
-				<th>{dateFormat date=$row['date_add'] full=true}</th>
-			</tr>
-			{else}
-			<tr class="{if ($key % 2)}alt_row{/if}">
-				<td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
-				<td>{$row['ostate_name']|stripslashes}</td>
-				<td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td>
-				<td>{dateFormat date=$row['date_add'] full=true}</td>
-			</tr>
-			{/if}
-		{/foreach}
+			{foreach from=$history item=row key=key}
+				{if ($key == 0)}
+				<thead>
+					<tr>
+						<th>
+							<img src="../img/os/{$row['id_order_state']}.gif" />
+						</th>
+						<th>
+							<span class="title_box ">{$row['ostate_name']|stripslashes}</span>
+						</th>
+						<th>
+							<span class="title_box ">{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</span>
+						</th>
+						<th>
+							<span class="title_box ">{dateFormat date=$row['date_add'] full=true}</span>
+						</th>
+					</tr>
+				</thead>
+				{else}
+				<tbody>
+					<tr class="{if ($key % 2)}alt_row{/if}">
+						<td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
+						<td>{$row['ostate_name']|stripslashes}</td>
+						<td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td>
+						<td>{dateFormat date=$row['date_add'] full=true}</td>
+					</tr>
+				</tbody>
+				{/if}
+			{/foreach}
 		</table>
 
 		{if $customer->id}
 	</div>
-	<!-- Left column -->
 
 	<!-- Customer informations -->
-
 	<div class="col-lg-6">
-		<form action="" method="post">
+		<form action="" method="">
 			<fieldset class="well">
 				<legend>
 					<i class="icon-user"></i>
@@ -179,41 +207,42 @@
 						{l s='This feature will generate a random password and send an email to the customer.'}
 					</form>
 					{else}
-						<div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</b></div>
+						<div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</strong></div>
 					{/if}
 				{else}
-					{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
-					{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br />
-					{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
+					{l s='Account registered:'} <strong>{dateFormat date=$customer->date_add full=true}</strong><br />
+					{l s='Valid orders placed:'} <strong>{$customerStats['nb_orders']}</strong><br />
+					{l s='Total spent since registration:'} <strong>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</strong><br />
 			</fieldset>
 			{/if}
 		{/if}
 
 		<!-- Sources block -->
 		{if (sizeof($sources))}
-		<fieldset>
-			<legend>
-				<i class="icon-signal"></i>
-				{l s='Sources'}
-			</legend>
-			<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
-			{foreach from=$sources item=source}
-				<li>
-					{dateFormat date=$source['date_add'] full=true}<br />
-					<b>{l s='From'}</b>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
-					<b>{l s='To'}</b> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
-					{if $source['keywords']}<b>{l s='Keywords'}</b> {$source['keywords']}<br />{/if}<br />
-				</li>
-			{/foreach}
-			</ul>
-		</fieldset>
+			<fieldset>
+				<legend>
+					<i class="icon-signal"></i>
+					{l s='Sources'}
+				</legend>
+				<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
+				{foreach from=$sources item=source}
+					<li>
+						{dateFormat date=$source['date_add'] full=true}<br />
+						<strong>{l s='From'}</strong>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
+						<strong>{l s='To'}</strong> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
+						{if $source['keywords']}<strong>{l s='Keywords'}</strong> {$source['keywords']}<br />{/if}<br />
+					</li>
+				{/foreach}
+				</ul>
+			</fieldset>
 		{/if}
 
 		<!-- Admin order hook -->
 		{hook h="displayAdminOrder" id_order=$order->id}
 		</form>
 	</div>
-	
+
+	<!-- New message -->
 	<div class="col-lg-6">
 		<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
 			<fieldset class="well">
@@ -221,21 +250,27 @@
 					<i class="icon-envelope"></i>
 					{l s='New message'}
 				</legend>
-				<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if};">
+				<p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if};">
 					<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
-						<b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'}
+						<strong>{l s='Click here'}</strong> {l s='to add a comment or send a message to the customer.'}
 					</a>
-				</div>
-				<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a>
+				</p>
+				<p>
+					<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
+						<strong>{l s='Click here'}</strong> {l s='to see all messages.'}
+					</a>
+				</p>
 				<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
-					<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
-						<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
-						{foreach from=$orderMessages item=orderMessage}
-							<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
-						{/foreach}
-					</select>
+					<p>
+						<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
+							<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
+							{foreach from=$orderMessages item=orderMessage}
+								<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
+							{/foreach}
+						</select>
+					</p>
 					<div class="row">
-						<label class="control-label col-lg-4 text-right">{l s='Display to customer?'}</label>
+						<label class="control-label col-lg-4">{l s='Display to customer?'}</label>
 						<div class="col-lg-8">
 							<label for="visibility" class="radio-inline">
 								<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
@@ -256,451 +291,597 @@
 				</div>
 			</fieldset>
 		</form>
-
-	{if (sizeof($messages))}
-		<fieldset>
-		<legend><img src="../img/admin/email.gif" /> {l s='Messages'}</legend>
-		{foreach from=$messages item=message}
-			<div style="overflow:auto; width:400px;" {if $message['is_new_for_me']}class="new_message"{/if}>
-			{if ($message['is_new_for_me'])}
-				<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}"><img src="../img/admin/enabled.gif" alt="" /></a>
-			{/if}
-			{l s='At'} <i>{dateFormat date=$message['date_add']}
-			</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
-			{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if}
-			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
-			</div>
-			<br />
-		{/foreach}
-		</fieldset>
-	{/if}
+		{if (sizeof($messages))}
+			<form action="" method="">
+				<fieldset class="well">
+					<legend>
+						<i class="icon-envelope"></i>
+						{l s='Messages'}
+					</legend>
+					{foreach from=$messages item=message}
+						<div {if $message['is_new_for_me']}class="new_message"{/if}>
+							{if ($message['is_new_for_me'])}
+								<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}">
+									<i class="icon-ok"></i>
+									{l s='Mark this message as \'viewed\''}
+								</a>
+							{/if}
+							<p>
+								{l s='At'} 
+								<i>{dateFormat date=$message['date_add']}</i> 
+								{l s='from'} 
+								<strong>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</strong>
+							</p>
+							{if ($message['private'] == 1)}<span>{l s='Private'}</span>{/if}
+							<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
+						</div>
+					{/foreach}
+				</fieldset>
+			</form>
+		{/if}
 	</div>
 
-	<div class="col-lg-12">
-		<!-- Addresses -->
-		{if !$order->isVirtual()}
-			<div>
-				<!-- Shipping address -->
-				<fieldset>
-					<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
+	<div class="col-lg-12"></div>
 
+	<!-- Addresses -->
+	<div class="col-lg-6">
+		{if !$order->isVirtual()}
+			<form action="" method="">
+				<!-- Shipping address -->
+				<fieldset class="well">
+					<legend>
+						<i class="icon-truck"></i>
+						{l s='Shipping address'}
+					</legend>
 					{if $can_edit}
 					<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
-						<div style="margin-bottom:5px;">
-							<p>
-								<select name="id_address">
-									{foreach from=$customer_addresses item=address}
-									<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
-									{/foreach}
-								</select>
-								<input class="button" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
-							</p>
-						</div>
-					</form>
-					{/if}
-
-					<div style="float: right">
-						<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}"><img src="../img/admin/edit.gif" /></a>
-						<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank"><img src="../img/admin/google.gif" alt="" class="middle" /></a>
-					</div>
-
-					{displayAddressDetail address=$addresses.delivery newLine='<br />'}
-					{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
-				</fieldset>
-			</div>
-		{/if}
-		<div>
-			<!-- Invoice address -->
-			<fieldset>
-				<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
-
-				{if $can_edit}
-				<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
-					<div style="margin-bottom:5px;">
-						<p>
+						<div class="col-lg-10">
 							<select name="id_address">
 								{foreach from=$customer_addresses item=address}
-								<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
+								<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
 								{/foreach}
 							</select>
-							<input class="button" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
-						</p>
+						</div>
+						<button class="btn btn-default" type="submit" name="submitAddressShipping">
+							{l s='Change'}
+						</button>
+					</form>
+					{/if}
+					<hr/>
+					<div class="col-lg-6">
+						{displayAddressDetail address=$addresses.delivery newLine='<br />'}
+						{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
 					</div>
+					<div class="col-lg-6 btn-group btn-group-action">
+						<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
+						<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
+							<span class="caret"></span>&nbsp;
+						</button>
+						<ul class="dropdown-menu">
+							<li>
+								<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}">
+									<i class="icon-pencil"></i>
+									{l s='Edit'}
+								</a>
+							</li>
+							<li>
+								<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank">
+									<i class="icon-map-marker"></i>
+									{l s='Map'}
+								</a>
+							</li>
+						</ul>
+					</div>
+				</fieldset>
+			</form>
+		{/if}
+	</div>
+
+	<!-- Invoice address -->
+	<div class="col-lg-6">
+		<form action="" method="">
+			<fieldset class="well">
+				<legend>
+					<i class="icon-file"></i>
+					{l s='Invoice address'}
+				</legend>
+				{if $can_edit}
+				<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+					<div class="col-lg-10">
+						<select name="id_address">
+							{foreach from=$customer_addresses item=address}
+							<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
+							{/foreach}
+						</select>
+					</div>
+						<button class="btn btn-default" type="submit" name="submitAddressInvoice">
+							{l s='Change'}
+						</button>
 				</form>
 				{/if}
-
-				<div style="float: right">
-					<a href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}"><img src="../img/admin/edit.gif" /></a>
+				<hr/>
+				<div class="col-lg-6">
+					{displayAddressDetail address=$addresses.invoice newLine='<br />'}
+					{if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if}
 				</div>
-
-				{displayAddressDetail address=$addresses.invoice newLine='<br />'}
-				{if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if}
+				<div class="col-lg-6">
+					<a class="btn btn-default"  href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}">
+						<i class="icon-pencil"></i>
+						{l s='Edit'}
+					</a>
+					</div>
 			</fieldset>
-		</div>
+		</form>
 	</div>
 
+	<div class="col-lg-12"></div>
+
 	<!-- linked orders block -->
 	{if count($order->getBrother()) > 0}
 		<div class="col-lg-6">
-			<fieldset>
-				<legend><img src="../img/admin/tab-orders.gif" /> {l s='Linked orders'}</legend>
-				<table class="table" width="100%;" cellspacing="0" cellpadding="0">
-					<thead>
-						<tr>
-							<th width="10%">
-								{l s='Order no. '}
-							</th>
-							<th>
-								{l s='Status'}
-							</th>
-							<th width="10%">
-								{l s='Amount'}
-							</th>
-							<th width="5%">
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						{foreach $order->getBrother() as $brother_order}
+			<form action="" method="">
+				<fieldset class="well">
+					<legend>
+						<i class="icon-shopping-cart"></i>
+						{l s='Linked orders'}
+					</legend>
+					<table class="table table-hover" width="100%;" cellspacing="0" cellpadding="0">
+						<thead>
 							<tr>
+								<th width="15%">
+									<span class="title_box ">{l s='Order no. '}</span>
+								</th>
+								<th>
+									<span class="title_box ">{l s='Status'}</span>
+								</th>
+								<th width="10%">
+									<span class="title_box ">{l s='Amount'}</span>
+								</th>
+								<th width="5%">
+								</th>
+							</tr>
+						</thead>
+						<tbody>
+							{foreach $order->getBrother() as $brother_order}
+								<tr>
+									<td>
+										<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+									</td>
+									<td>
+										{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
+									</td>
+									<td>
+										{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
+									</td>
+									<td>
+										<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img alt="{l s='See the order'}" src="../img/admin/details.gif"></a>
+									</td>
+								</tr>
+							{/foreach}
+						</tbody>
+					</table>
+				</fieldset>
+			</form>
+		</div>
+	{/if}
+
+	<!-- Documents block -->
+	<div class="col-lg-6">
+		<form action="" method="">
+			<fieldset class="well">
+				<legend>
+					<i class="icon-file-text"></i>
+					{l s='Documents'}
+				</legend>
+				{* Include document template *}
+				{include file='controllers/orders/_documents.tpl'}
+			</fieldset>
+		</form>
+	</div>
+
+	<!-- Payments block -->
+	<div class="col-lg-6">
+		<form action="" method="">
+			<fieldset class="well">
+				<legend>
+					<i class="icon-money"></i>
+					{l s='Payment'}
+				</legend>
+
+				{if (!$order->valid && sizeof($currencies) > 1)}
+				<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+					<p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
+					<div class="col-lg-10">
+						<select name="new_currency">
+							{foreach from=$currencies item=currency_change}
+								{if $currency_change['id_currency'] != $order->id_currency}
+								<option value="{$currency_change['id_currency']}">{$currency_change['name']} - {$currency_change['sign']}</option>
+								{/if}
+							{/foreach}
+						</select>
+					</div>
+					<button type="submit" class="btn btn-default" name="submitChangeCurrency"> 
+						{l s='Change'}
+					</button>
+				</form>
+				<hr/>
+				{/if}
+				
+				{if count($order->getOrderPayments()) > 0}
+				<p class="alert alert-block" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
+					{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} <strong>{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</strong>
+					{foreach $order->getBrother() as $brother_order}
+						{if $brother_order@first}
+							{if count($order->getBrother()) == 1}
+								<br />{l s='This warning also concerns order '}
+							{else}
+								<br />{l s='This warning also concerns the next orders:'}
+							{/if}
+						{/if}
+						<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+					{/foreach}
+				</p>
+				{/if}
+				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+					<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0">
+						<colgroup>
+							<col width="15%">
+							<col width="39%">
+							<col width="20%">
+							<col width="15%">
+							<col width="10%">
+							<col width="1%">
+						</colgroup>
+						<thead>
+							<tr>
+								<th>
+									<span class="title_box ">{l s='Date'}</span>
+								</th>
+								<th>
+									<span class="title_box ">{l s='Payment method'}</span>
+								</th>
+								<th>
+									<span class="title_box ">{l s='Transaction ID'}</span>
+								</th>
+								<th>
+									<span class="title_box ">{l s='Amount'}</span>
+								</th>
+								<th>
+									<span class="title_box ">{l s='Invoice'}</span>
+								</th>
+								<th>&nbsp;</th>
+							</tr>
+						</thead>
+						<tbody>
+							{foreach from=$order->getOrderPaymentCollection() item=payment}
+							<tr>
+								<td>{dateFormat date=$payment->date_add full=true}</td>
+								<td>{$payment->payment_method}</td>
+								<td>{$payment->transaction_id}</td>
+								<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
 								<td>
-									<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+								{if $invoice = $payment->getOrderInvoice($order->id)}
+									{$invoice->getInvoiceNumberFormatted($current_id_lang)}
+								{else}
+									{l s='No invoice'}
+								{/if}
 								</td>
-								<td>
-									{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
-								</td>
-								<td>
-									{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
-								</td>
-								<td>
-									<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img alt="{l s='See the order'}" src="../img/admin/details.gif"></a>
+								<td class="right">
+									<a href="#" class="open_payment_information">
+										<i class="icon-search"></i>
+									</a>
 								</td>
 							</tr>
-						{/foreach}
-					</tbody>
-				</table>
-			</fieldset>
-		</div>
-	{/if}
+							<tr class="payment_information" style="display: none;">
+								<td colspan="6">
+									<p>
+										<strong>{l s='Card Number'}</strong>&nbsp;
+										{if $payment->card_number}
+											{$payment->card_number}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
 
-	<div class="col-lg-6">
-	<!-- Documents block -->
-		<fieldset>
-			<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
+									<p>
+										<strong>{l s='Card Brand'}</strong>&nbsp;
+										{if $payment->card_brand}
+											{$payment->card_brand}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
 
-			{* Include document template *}
-			{include file='controllers/orders/_documents.tpl'}
-		</fieldset>
-	</div>
+									<p>
+										<strong>{l s='Card Expiration'}</strong>&nbsp;
+										{if $payment->card_expiration}
+											{$payment->card_expiration}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
 
-	<div class="col-lg-6">
-		<!-- Payments block -->
-		<fieldset>
-			<legend><img src="../img/admin/money.gif" /> {l s='Payment: '}</legend>
-
-			{if (!$order->valid && sizeof($currencies) > 1)}
-			<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-				<p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
-				<label>{l s='Don\'t forget to update your conversion rate before making this change.'}</label>
-				<select name="new_currency">
-					{foreach from=$currencies item=currency_change}
-						{if $currency_change['id_currency'] != $order->id_currency}
-						<option value="{$currency_change['id_currency']}">{$currency_change['name']} - {$currency_change['sign']}</option>
-						{/if}
-					{/foreach}
-				</select>
-				<input type="submit" class="button" name="submitChangeCurrency" value="{l s='Change'}" />
-			</form>
-			<hr class="clear"/>
-			{/if}
-			
-			{if count($order->getOrderPayments()) > 0}
-			<p class="error" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
-				{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id}
-				{l s='paid instead of'} <span class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</span>
-				
-				{foreach $order->getBrother() as $brother_order}
-					{if $brother_order@first}
-						{if count($order->getBrother()) == 1}
-							<br />{l s='This warning also concerns order '}
-						{else}
-							<br />{l s='This warning also concerns the next orders:'}
-						{/if}
-					{/if}
-					<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
-				{/foreach}
-			</p>
-			{/if}
-
-			<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-				<table class="table" width="100%" cellspacing="0" cellpadding="0">
-					<colgroup>
-						<col width="15%">
-						<col width="">
-						<col width="20%">
-						<col width="10%">
-						<col width="10%">
-						<col width="1%">
-					</colgroup>
-					<thead>
-						<tr>
-							<th>{l s='Date'}</th>
-							<th>{l s='Payment method'}</th>
-							<th>{l s='Transaction ID'}</th>
-							<th>{l s='Amount'}</th>
-							<th>{l s='Invoice'}</th>
-							<th>&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						{foreach from=$order->getOrderPaymentCollection() item=payment}
-						<tr>
-							<td>{dateFormat date=$payment->date_add full=true}</td>
-							<td>{$payment->payment_method}</td>
-							<td>{$payment->transaction_id}</td>
-							<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
-							<td>
-							{if $invoice = $payment->getOrderInvoice($order->id)}
-								{$invoice->getInvoiceNumberFormatted($current_id_lang)}
-							{else}
-								{l s='No invoice'}
-							{/if}
-							</td>
-							<td class="right">
-								<a href="#" class="open_payment_information"><img src="../img/admin/details.gif" title="{l s='See payment information'}" alt="{l s='See payment information'}" /></a>
-							</td>
-						</tr>
-						<tr class="payment_information" style="display: none;">
-							<td colspan="6">
-								<p>
-									<b>{l s='Card Number'}</b>&nbsp;
-									{if $payment->card_number}
-										{$payment->card_number}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-
-								<p>
-									<b>{l s='Card Brand'}</b>&nbsp;
-									{if $payment->card_brand}
-										{$payment->card_brand}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-
-								<p>
-									<b>{l s='Card Expiration'}</b>&nbsp;
-									{if $payment->card_expiration}
-										{$payment->card_expiration}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-
-								<p>
-									<b>{l s='Card Holder'}</b>&nbsp;
-									{if $payment->card_holder}
-										{$payment->card_holder}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-							</td>
-						</tr>
-						{foreachelse}
-						<tr>
-							<td colspan="6" class="center">
-								<h3>{l s='No payments are available'}</h3>
-							</td>
-						</tr>
-						{/foreach}
-						<tr class="current-edit">
-							<td><input type="text" name="payment_date" class="datepicker" size="17" value="{date('Y-m-d H:i:s')}" /></td>
-							<td>
-								<select name="payment_method" class="payment_method">
-								{foreach from=$payment_methods item=payment_method}
-									<option value="{$payment_method}">{$payment_method}</option>
-								{/foreach}
-								</select>
-							</td>
-							<td>
-								<input type="text" name="payment_transaction_id" value="" />
-							</td>
-							<td>
-								<input type="text" name="payment_amount" size="5" value="" />
-								<select name="payment_currency" class="payment_currency">
-								{foreach from=$currencies item=current_currency}
-									<option value="{$current_currency['id_currency']}"{if $current_currency['id_currency'] == $currency->id} selected="selected"{/if}>{$current_currency['sign']}</option>
-								{/foreach}
-								</select>
-							</td>
-							{if count($invoices_collection) > 0}
-							<td>
-								<select name="payment_invoice" id="payment_invoice">
-								{foreach from=$invoices_collection item=invoice}
-									<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
-								{/foreach}
-								</select>
-							</td>
-							{/if}
-							<td><input class="button" type="submit" name="submitAddPayment" value="{l s='Add'}" /></td>
-						</tr>
-					</tbody>
-				</table>
-			</form>
-		</fieldset>
-	</div>
-
-	<!-- Shipping block -->
-	{if !$order->isVirtual()}
-		<div class="col-lg-6">
-			<fieldset>
-				<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
-
-				<div class="clear" style="float: left; margin-right: 10px;">
-					<span>{l s='Recycled packaging'}</span>
-					{if $order->recyclable}
-					<img src="../img/admin/enabled.gif" />
-					{else}
-					<img src="../img/admin/disabled.gif" />
-					{/if}
-				</div>
-				<div style="float: left;">
-					<span>{l s='Gift wrapping'}</span>
-					{if $order->gift}
-					<img src="../img/admin/enabled.gif" />
-					</div>
-					<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;">
-						{if $order->gift_message}
-						<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message'}</b><br />{$order->gift_message|nl2br}</div>
-						{/if}
-					{else}
-					<img src="../img/admin/disabled.gif" />
-					{/if}
-				</div>
-				<div class="clear" style="margin-bottom: 10px;"></div>
-
-				{include file='controllers/orders/_shipping.tpl'}
-
-				{if $carrierModuleCall}
-					{$carrierModuleCall}
-				{/if}
-			</fieldset>
-		</div>
-		<div class="col-lg-6">
-			<!-- Return block -->
-			<fieldset>
-				<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
-
-				{if $order->getReturn()|count > 0}
-				<table class="table" width="100%" cellspacing="0" cellpadding="0">
-					<thead>
-						<tr>
-							<th style="width:30%">Date</th>
-							<th>Type</th>
-							<th style="width:20%">Carrier</th>
-							<th style="width:30%">Tracking number</th>
-						</tr>
-					</thead>
-					<tbody>
-						{foreach from=$order->getReturn() item=line}
-						<tr>
-							<td>{$line.date_add}</td>
-							<td>{$line.type}</td>
-							<td>{$line.state_name}</td>
-							<td>
-								<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
-								{if $line.can_edit}
-								<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
-									<span class="shipping_number_edit" style="display:none;">
-										<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
-										<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
-									</span>
-									<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-									<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-								</form>
+									<p>
+										<strong>{l s='Card Holder'}</strong>&nbsp;
+										{if $payment->card_holder}
+											{$payment->card_holder}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
+								</td>
+							</tr>
+							{foreachelse}
+							<tr>
+								<td colspan="6" class="center">
+									<h4>{l s='No payments are available'}</h4>
+								</td>
+							</tr>
+							{/foreach}
+							<tr>
+								<td>
+									<input type="text" name="payment_date" class="datepicker" size="17" value="{date('Y-m-d H:i:s')}" />
+								</td>
+								<td>
+									<select name="payment_method" class="payment_method">
+									{foreach from=$payment_methods item=payment_method}
+										<option value="{$payment_method}">{$payment_method}</option>
+									{/foreach}
+									</select>
+								</td>
+								<td>
+									<input type="text" name="payment_transaction_id" value="" />
+								</td>
+								<td>
+									<input type="text" name="payment_amount" size="5" value="" />
+									<select name="payment_currency" class="payment_currency">
+									{foreach from=$currencies item=current_currency}
+										<option value="{$current_currency['id_currency']}"{if $current_currency['id_currency'] == $currency->id} selected="selected"{/if}>{$current_currency['sign']}</option>
+									{/foreach}
+									</select>
+								</td>
+								{if count($invoices_collection) > 0}
+								<td>
+									<select name="payment_invoice" id="payment_invoice">
+									{foreach from=$invoices_collection item=invoice}
+										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
+									{/foreach}
+									</select>
+								</td>
 								{/if}
-							</td>
-						</tr>
-						{/foreach}
-					</tbody>
-				</table>
-				{else}
-				{l s='No merchandise returned yet.'}
-				{/if}
-
-				{if $carrierModuleCall}
-					{$carrierModuleCall}
-				{/if}
+								<td>
+									<button class="btn btn-default" type="submit" name="submitAddPayment"> 
+										{l s='Add'}
+									</button>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+				</form>
 			</fieldset>
+		</form>
+	</div>
+
+	{if !$order->isVirtual()}
+		<!-- Shipping block -->
+		<div class="col-lg-6">
+			<form action="" method="">
+				<fieldset class="well">
+					<legend>
+						<i class="icon-truck"></i>
+						{l s='Shipping'}
+					</legend>
+					{if $order->recyclable}
+						<p>
+							<span class="label label-success">
+								<i class="icon-ok"></i>
+								{l s='Recycled packaging'}
+							</span>
+						</p>
+					{else}
+						<p>
+							<span class="label label-danger">
+								<i class="icon-remove"></i>
+								{l s='Recycled packaging'}
+							</span>
+						</p>
+					{/if}
+					{if $order->gift}
+						<p>
+							<span class="label label-success">
+								<i class="icon-ok"></i>
+								{l s='Gift wrapping'}
+							</span>
+							{if $order->gift_message}
+								<div class="alert alert-block">
+									<p>
+										<strong>{l s='Message'}</strong>
+									</p>
+									<p>
+										{$order->gift_message|nl2br}
+									</p>
+								</div>
+							{/if}
+						</p>
+					{else}
+						<p>
+							<span class="label label-danger">
+								<i class="icon-remove"></i>
+								{l s='Gift wrapping'}
+							</span>
+						</p>
+					{/if}
+
+					{include file='controllers/orders/_shipping.tpl'}
+
+					{if $carrierModuleCall}
+						{$carrierModuleCall}
+					{/if}
+				</fieldset>
+			</form>
+		</div>
+
+		<!-- Return block -->
+		<div class="col-lg-6">	
+			<form action="" method="">
+				<fieldset class="well">
+					<legend>
+						<i class="icon-suitcase"></i>
+						{l s='Merchandise returns'}
+					</legend>
+
+					{if $order->getReturn()|count > 0}
+					<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0">
+						<thead>
+							<tr>
+								<th width="30%">
+									<span class="title_box ">{l s='Date'}</span>
+								</th>
+								<th>
+									<span class="title_box ">{l s='Type'}</span>
+								</th>
+								<th width="20%">
+									<span class="title_box ">{l s='Carrier'}</span>
+								</th>
+								<th width="30%">
+									<span class="title_box ">{l s='Tracking number'}</span>
+								</th>
+							</tr>
+						</thead>
+						<tbody>
+							{foreach from=$order->getReturn() item=line}
+							<tr>
+								<td>{$line.date_add}</td>
+								<td>{$line.type}</td>
+								<td>{$line.state_name}</td>
+								<td>
+									<span id="shipping_number_show">
+										{if isset($line.url) && isset($line.tracking_number)}
+										<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>
+										{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}
+									</span>
+									{if $line.can_edit}
+									<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
+										<span class="shipping_number_edit" style="display:none;">
+											<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
+											<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
+										</span>
+										<a href="#" class="edit_shipping_number_link">
+											<i class="icon-pencil"></i>
+										</a>
+										<a href="#" class="cancel_shipping_number_link" style="display: none;">
+											<i class="icon-remove"></i>
+										</a>
+									</form>
+									{/if}
+								</td>
+							</tr>
+							{/foreach}
+						</tbody>
+					</table>
+					{else}
+					{l s='No merchandise returned yet.'}
+					{/if}
+
+					{if $carrierModuleCall}
+						{$carrierModuleCall}
+					{/if}
+				</fieldset>
+			</form>
 		</div>
 	{/if}
-</div>
-
-	<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
-		<input type="hidden" name="id_order" value="{$order->id}" />
-		<fieldset style="width: 100%; ">
-			<div style="display: none">
-				<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
-			</div>
-			<legend><img src="../img/admin/cart.gif" alt="{l s='Products:'}" />{l s='Products:'}</legend>
-			<div style="float:left;width: 100%;">
+	
+	<div class="col-lg-12">
+		<form class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
+			<input type="hidden" name="id_order" value="{$order->id}" />
+			<fieldset class="well">
+				<div style="display: none">
+					<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
+				</div>
+				<legend>
+					<i class="icon-shopping-cart"></i>
+					{l s='Products:'}
+				</legend>
 				{if $can_edit}
-				{if !$order->hasBeenDelivered()}<div style="float: left;"><a href="#" class="add_product button"><img src="../img/admin/add.gif" alt="{l s='Add a product'}" /> {l s='Add a product'}</a></div>{/if}
-				<div style="float: right; margin-right: 10px" id="refundForm">
-				<!--
+				{if !$order->hasBeenDelivered()}
+					<a href="#" class="add_product btn btn-default">
+						<i class="icon-plus-sign-alt"></i>
+						{l s='Add a product'}
+					</a>
+				{/if}
+				<!--<div style="float: right; margin-right: 10px" id="refundForm">
+				
 					<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Process a standard refund'}" /> {l s='Process a standard refund'}</a>
 					<a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Process a partial refund'}" /> {l s='Process a partial refund'}</a>
-				-->
-				</div>
-				<br clear="left" /><br />
+				
+				</div>-->
 				{/if}
-				<table style="width: 100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
-					<tr>
-						<th height="39" align="center" style="width: 7%">&nbsp;</th>
-						<th>{l s='Product'}</th>
-						<th style="width: 15%; text-align: center">{l s='Unit Price'} <sup>*</sup></th>
-						<th style="width: 4%; text-align: center">{l s='Qty'}</th>
-						{if ($order->hasBeenPaid())}<th style="width: 3%; text-align: center">{l s='Refunded'}</th>{/if}
-						{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<th style="width: 3%; text-align: center">{l s='Returned'}</th>{/if}
-						{if $stock_management}<th style="width: 10%; text-align: center">{l s='Available quantity'}</th>{/if}
-						<th style="width: 10%; text-align: center">{l s='Total'} <sup>*</sup></th>
-						<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() || $order->hasBeenShipped())}
-								{l s='Return'}
-							{elseif ($order->hasBeenPaid())}
-								{l s='Refund'}
-							{else}
-								{l s='Cancel'}
-							{/if}
-						</th>
-						<th style="width: 12%;text-align:right;display:none" class="partial_refund_fields">
-							{l s='Partial refund'}
-						</th>
-						{if !$order->hasBeenDelivered()}
-						<th style="width: 8%;text-align:center;">
-							{l s='Action'}
-						</th>
+				<div class="col-lg-12">
+					<table cellspacing="0" cellpadding="0" class="table table-hover" id="orderProducts">
+						<thead>
+							<tr>
+								<th height="39" class="center" width="7%">&nbsp;</th>
+								<th>
+									<span class="title_box ">{l s='Product'}</span>
+								</th>
+								<th width="15%" class="center">
+									<span class="title_box ">{l s='Unit Price'} <sup>*</sup></span>
+								</th>
+								<th width="4%" class="center">
+									<span class="title_box ">{l s='Qty'}</span>
+								</th>
+								{if ($order->hasBeenPaid())}
+									<th width="3%" class="center">
+										<span class="title_box ">{l s='Refunded'}</span>
+									</th>
+								{/if}
+								{if ($order->hasBeenDelivered() || $order->hasProductReturned())}
+									<th width="3%" class="center">
+										<span class="title_box ">{l s='Returned'}</span>
+									</th>
+								{/if}
+								{if $stock_management}
+									<th width="10%" class="center">
+										<span class="title_box ">{l s='Available quantity'}</span>
+									</th>
+								{/if}
+								<th width="10%" class="center">
+									<span class="title_box ">{l s='Total'} <sup>*</sup></span>
+								</th>
+								<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() || $order->hasBeenShipped())}
+										<span class="title_box ">{l s='Return'}</span>
+									{elseif ($order->hasBeenPaid())}
+										<span class="title_box ">{l s='Refund'}</span>
+									{else}
+										<span class="title_box ">{l s='Cancel'}</span>
+									{/if}
+								</th>
+								<th widht="12%" style="display:none" class="partial_refund_fields right">
+									<span class="title_box ">{l s='Partial refund'}</span>
+								</th>
+								{if !$order->hasBeenDelivered()}
+								<th width="8%" class="center">
+									<span class="title_box ">{l s='Action'}</span>
+								</th>
+								{/if}
+							</tr>
+						</thead>
+						{foreach from=$products item=product key=k}
+							{* Include customized datas partial *}
+							{include file='controllers/orders/_customized_data.tpl'}
+
+							{* Include product line partial *}
+							{include file='controllers/orders/_product_line.tpl'}
+						{/foreach}
+						{if $can_edit}
+							{include file='controllers/orders/_new_product.tpl'}
 						{/if}
-					</tr>
-
-					{foreach from=$products item=product key=k}
-						{* Include customized datas partial *}
-						{include file='controllers/orders/_customized_data.tpl'}
-
-						{* Include product line partial *}
-						{include file='controllers/orders/_product_line.tpl'}
-					{/foreach}
-					{if $can_edit}
-						{include file='controllers/orders/_new_product.tpl'}
-					{/if}
-				</table>
-
-				<div style="float:left; width:280px; margin-top:15px;">
+					</table>
+				</div>
+				<div class="col-lg-12">
 					<sup>*</sup> {l s='For this customer group, prices are displayed as:'}
 					{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
 						{l s='tax excluded.'}
@@ -712,25 +893,25 @@
 						<br /><br />{l s='Merchandise returns are disabled'}
 					{/if}
 				</div>
-				<div style="float:right; margin-top: 20px;">
-					<table class="table" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0">
+				<div class="col-lg-7 pull-right">
+					<table class="table table-hover" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0">
 						<tr id="total_products">
-							<td width="150px;"><b>{l s='Products:'}</b></td>
+							<td width="150px;"><strong>{l s='Products:'}</strong></td>
 							<td class="amount" align="right">{displayPrice price=$order->total_products_wt currency=$currency->id}</td>
 							<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
 						</tr>
 						<tr id="total_discounts" {if $order->total_discounts_tax_incl == 0}style="display: none;"{/if}>
-							<td><b>{l s='Discounts'}</b></td>
+							<td><strong>{l s='Discounts'}</strong></td>
 							<td class="amount" align="right">-{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id}</td>
 							<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
 						</tr>
 						<tr id="total_wrapping" {if $order->total_wrapping_tax_incl == 0}style="display: none;"{/if}>
-							<td><b>{l s='Wrapping'}</b></td>
+							<td><strong>{l s='Wrapping'}</strong></td>
 							<td class="amount" align="right">{displayPrice price=$order->total_wrapping_tax_incl currency=$currency->id}</td>
 							<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
 						</tr>
 						<tr id="total_shipping">
-							<td><b>{l s='Shipping'}</b></td>
+							<td><strong>{l s='Shipping'}</strong></td>
 							<td class="amount" align="right">{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}</td>
 							<td class="partial_refund_fields current-edit" style="display:none;">{$currency->prefix}<input type="text" size="3" name="partialRefundShippingCost" value="0" />{$currency->suffix}</td>
 						</tr>
@@ -743,11 +924,10 @@
 						</tr>
 					</table>
 				</div>
-				<div class="clear"></div>
 
 				{if (sizeof($discounts) || $can_edit)}
-				<div style="float:right; width:450px; margin-top:15px;">
-					<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+				<div class="col-lg-7 pull-right">
+					<table cellspacing="0" cellpadding="0" class="table table-hover" style="width:100%;">
 						<tr>
 							<th><img src="../img/admin/coupon.gif" alt="{l s='Discounts'}" />{l s='Discount name'}</th>
 							<th align="center" style="width: 100px">{l s='Value'}</th>
@@ -784,32 +964,30 @@
 					</table>
 				</div>
 				{/if}
-			</div>
 
-			<div style="clear:both; height:15px;">&nbsp;</div>
-			<div style="float: right; width: 160px; display: none;" class="standard_refund_fields">
-				{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
+				<div style="display: none;" class="standard_refund_fields">
+					{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
+						<input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
+					{/if}
+					{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
+						<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit card slip'}</label><br />
+						<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
+						<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
+					{/if}
+					{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
+						<div style="text-align:center; margin-top:5px;">
+							<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="button" style="margin-top:8px;" />
+						</div>
+					{/if}
+				</div>
+				<div style="float: right; width: 160px; display:none;" class="partial_refund_fields">
 					<input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
-				{/if}
-				{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-					<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit card slip'}</label><br />
-					<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
-					<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
-				{/if}
-				{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-					<div style="text-align:center; margin-top:5px;">
-						<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="button" style="margin-top:8px;" />
-					</div>
-				{/if}
-			</div>
-			<div style="float: right; width: 160px; display:none;" class="partial_refund_fields">
-				<input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
-				<input type="checkbox" id="generateDiscountRefund" name="generateDiscountRefund" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
-				<input type="submit" name="partialRefund" value="{l s='Partial refund'}" class="button" style="margin-top:8px;" />
-			</div>
-		</fieldset>
-	</form>
-
-	<div class="clear">&nbsp;</div>
-	<br /><br /><a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
+					<input type="checkbox" id="generateDiscountRefund" name="generateDiscountRefund" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
+					<input type="submit" name="partialRefund" value="{l s='Partial refund'}" class="button" style="margin-top:8px;" />
+				</div>
+			</fieldset>
+		</form>
+	</div>
+</div>
+<a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
 {/block}