From b070c2dd701817bf5ea7201eaa86cecd7c9dcd32 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Fri, 28 Sep 2012 16:45:23 +0000
Subject: [PATCH] // Fix #PSCFV-4520

---
 .../controllers/orders/helpers/view/view.tpl  |  4 ++--
 controllers/admin/AdminOrdersController.php   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

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 bdc868634..d67571d55 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
@@ -109,7 +109,7 @@
 		<!-- Left column -->
 		<div style="width: 49%; float:left;">
 			<!-- Change status form -->
-			<form action="{$currentIndex}&viewOrder&token={$smarty.get.token}" method="post">
+			<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}
@@ -264,7 +264,7 @@
 				<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'}">
+				<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
 					<p class="warn">{l s='Don\'t forget to update your conversion rate before make this change.'}</p>
 					<label>{l s='Don\'t forget to update your conversion rate before make this change.'}</label>
 					<select name="new_currency">
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 0ec08dae3..1171db801 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -934,19 +934,18 @@ class AdminOrdersControllerCore extends AdminController
 							'ecotax',
 							'product_price',
 							'reduction_amount',
-							'total_shipping',
-							'total_shipping_tax_excl',
-							'total_shipping_tax_incl',
-							'total_products',
-							'total_products_wt',
-							'total_paid',
-							'total_paid_tax_incl',
-							'total_paid_tax_excl',
-							'total_paid_real',
+							'total_shipping_price_tax_excl',
+							'total_shipping_price_tax_incl',
+							'total_price_tax_incl',
+							'total_price_tax_excl',
 							'product_quantity_discount',
 							'purchase_supplier_price',
+							'reduction_amount',
 							'reduction_amount_tax_incl',
-							'reduction_amount_tax_excl'
+							'reduction_amount_tax_excl',
+							'unit_price_tax_incl',
+							'unit_price_tax_excl',
+							
 						);
 						foreach ($fields as $field)
 							$order_detail->{$field} = Tools::convertPriceFull($order_detail->{$field}, $old_currency, $currency);