diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl
index bcee5d084..9e1a47ae0 100755
--- a/admin-dev/themes/template/orders/view.tpl
+++ b/admin-dev/themes/template/orders/view.tpl
@@ -380,7 +380,7 @@
 							<td>{$line.type}</td>
 							<td>{$line.state_name}</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>
+								<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>{else if isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
 								{if $line.can_edit}
 								<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&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;">
diff --git a/classes/Cart.php b/classes/Cart.php
index 12334fe05..0e371a1be 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -1933,10 +1933,10 @@ class CartCore extends ObjectModel
 			if (!isset($delivery_option[$id_address]))
 				foreach ($options as $key => $option)
 					if ($option['is_best_price'])
-								{
-									$delivery_option[$id_address] = $key;
-									break;
-								}
+					{
+						$delivery_option[$id_address] = $key;
+						break;
+					}
 
 		if (count($delivery_option) == 1)
 			$this->id_carrier = $this->getIdCarrierFromDeliveryOption($delivery_option);
diff --git a/classes/Discount.php b/classes/Discount.php
index 820288f6c..5fef0cf10 100644
--- a/classes/Discount.php
+++ b/classes/Discount.php
@@ -204,7 +204,7 @@ class DiscountCore extends CartRule
 	public static function createOrderDiscount($order, $productList, $qtyList, $name, $shipping_cost = false, $id_category = 0, $subcategory = 0)
 	{
 		// Todo
-		die ('TODO');
+		//die ('TODO');
 		
 		$languages = Language::getLanguages($order);
 		$products = $order->getProducts(false, $productList, $qtyList);
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index d20de6966..1d433faa1 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -474,6 +474,7 @@ class AdminOrdersControllerCore extends AdminController
 							}
 
 							// Delete product
+							$orderDetail = new OrderDetail((int)($id_order_detail));
 							if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct))
 								$this->_errors[] = Tools::displayError('An error occurred during deletion of the product.').' <span class="bold">'.$orderDetail->product_name.'</span>';
 							Hook::exec('cancelProduct', array('order' => $order, 'id_order_detail' => $id_order_detail));
@@ -512,7 +513,8 @@ class AdminOrdersControllerCore extends AdminController
 					// Generate voucher
 					if (isset($_POST['generateDiscount']) AND !sizeof($this->_errors))
 					{
-						if (!$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Credit Slip concerning the order #'), isset($_POST['shippingBack'])))
+						// @todo generate a voucher using cartrules
+						if (true || !$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Credit Slip concerning the order #'), isset($_POST['shippingBack'])))
 							$this->_errors[] = Tools::displayError('Cannot generate voucher');
 						else
 						{