diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl
index 341a68352..168321572 100755
--- a/admin-dev/themes/template/orders/view.tpl
+++ b/admin-dev/themes/template/orders/view.tpl
@@ -418,7 +418,13 @@
 							<td>{$line.type}</td>
 							<td>{$line.state_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>
+								{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 href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
 								{if $line.can_edit}
diff --git a/classes/order/Order.php b/classes/order/Order.php
index adb1647c1..04bc62997 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1367,9 +1367,12 @@ class OrderCore extends ObjectModel
 		return OrderReturn::getOrdersReturn($this->id_customer, $this->id);
 	}
 
+	/**
+	 * @return array return all shipping method for the current order
+	 */
 	public function getShipping()
 	{
-		$shipping = Db::getInstance()->ExecuteS('
+		return Db::getInstance()->ExecuteS('
 			SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`
 			FROM `'._DB_PREFIX_.'orders` o
 			LEFT JOIN `'._DB_PREFIX_.'order_history` oh
@@ -1381,7 +1384,6 @@ class OrderCore extends ObjectModel
 			LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl
 				ON (oh.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)Context::getContext()->language->id.')
 			WHERE o.`id_order` = '.(int)$this->id);
-		return $shipping;
 	}
 
 	/**
diff --git a/classes/order/OrderCarrier.php b/classes/order/OrderCarrier.php
index aacaf9a5b..aad7e6361 100644
--- a/classes/order/OrderCarrier.php
+++ b/classes/order/OrderCarrier.php
@@ -51,7 +51,6 @@ class OrderCarrierCore extends ObjectModel
 	/** @var integer */
 	public $tracking_number;
 
-
 	/** @var string Object creation date */
 	public $date_add;
 
@@ -68,7 +67,7 @@ class OrderCarrierCore extends ObjectModel
 			'weight' => 				array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
 			'shipping_cost_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
 			'shipping_cost_tax_incl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
-			'tracking_number' => 		array('type' => self::TYPE_FLOAT, 'validate' => 'isAnything'),
+			'tracking_number' => 		array('type' => self::TYPE_STRING, 'validate' => 'isAnything'),
 			'date_add' => 				array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
 		),
 	);
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 5fe56c0b9..04653cb10 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -813,7 +813,7 @@ class AdminOrdersControllerCore extends AdminController
 			'slips' => OrderSlip::getOrdersSlip($order->id_customer, $order->id),
 			'orderMessages' => OrderMessage::getOrderMessages($order->id_lang),
 			'messages' => Message::getMessagesByOrderId($order->id, true),
-			'carrier' => $carrier = new Carrier($order->id_carrier),
+			'carrier' => new Carrier($order->id_carrier),
 			'history' => $order->getHistory($this->context->language->id),
 			'states' => OrderState::getOrderStates($this->context->language->id),
 			'warehouse_list' => $warehouse_list,