diff --git a/classes/order/Order.php b/classes/order/Order.php
index 12a274908..3402b6dcd 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -623,7 +623,7 @@ class OrderCore extends ObjectModel
 			&& (int)$product['id_warehouse'] > 0)
 			$product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], (int)$product['id_warehouse'], true);
 		else
-			$product['current_stock'] = '--';
+			$product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], (int)$this->id_shop);
 	}
 
 	/**
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 5c5fd66f6..d35a2edc9 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1885,6 +1885,9 @@ class AdminOrdersControllerCore extends AdminController
 		if (isset($order_invoice))
 			 $res &= $order_invoice->update();
 
+		// Update product available quantity
+		StockAvailable::updateQuantity($order_detail->product_id, $order_detail->product_attribute_id, ($old_quantity - $order_detail->product_quantity), $order->id_shop);
+
 		$products = $this->getProducts($order);
 		// Get the last product
 		$product = $products[$order_detail->id];
@@ -1893,9 +1896,6 @@ class AdminOrdersControllerCore extends AdminController
 		$product['amount_refundable'] = $product['total_price_tax_incl'] - $resume['amount_tax_incl'];
 		$product['amount_refund'] = Tools::displayPrice($resume['amount_tax_incl']);
 
-		// Update product available quantity
-		StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], ($old_quantity - $product['product_quantity']), $order->id_shop);
-
 		// Get invoices collection
 		$invoice_collection = $order->getInvoicesCollection();