diff --git a/classes/order/Order.php b/classes/order/Order.php
index fdb50dc53..32f6d8366 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -552,7 +552,7 @@ class OrderCore extends ObjectModel
 				$row['product_quantity'] = 0;
 				foreach ($selectedProducts as $key => $id_product)
 					if ($row['id_order_detail'] == $id_product)
-						$row['producsvt_quantity'] = (int)($selectedQty[$key]);
+						$row['product_quantity'] = (int)($selectedQty[$key]);
 				if (!$row['product_quantity'])
 					continue;
 			}
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 113f188e2..279bff4c6 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -683,7 +683,7 @@ class AdminOrdersControllerCore extends AdminController
 							$languages = Language::getLanguages($order);
 							foreach ($languages as $language)
 							{
-								$voucher->description[$language['id_lang']] = $this->l('Credit Slip for order #').(int)($order->id);
+								$cartrule->description[$language['id_lang']] = $this->l('Credit Slip for order #').(int)($order->id);
 								// Define a temporary name
 								$cartrule->name[$language['id_lang']] = 'V0C'.(int)($order->id_customer).'O'.(int)($order->id);
 							}
@@ -702,7 +702,7 @@ class AdminOrdersControllerCore extends AdminController
 							$products = $order->getProducts(false, $full_product_list, $full_quantity_list);
 							// Totals are stored in the order currency (or at least should be)
 							$total = $order->getTotalProductsWithTaxes($products);
-							$discounts = $order->getDiscounts(true);
+							$discounts = $order->getCartRules();
 							$total_tmp = $total;
 							foreach ($discounts as $discount)
 							{