From a48e8cf1118817495c9f7dc1dba7bc8ba22b2f3b Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 21 Sep 2012 14:10:37 +0000
Subject: [PATCH] [-] FO : fixed bug #PSCFV-4112

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17467 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/front/OrderOpcController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index b9551506e..6a46736ed 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -444,7 +444,7 @@ class OrderOpcControllerCore extends ParentOrderController
 			else
 				return '<p class="warning">'.Tools::displayError('Error: There are no carriers available that deliver to this address').'</p>';
 		}
-		if (!$this->context->cart->getDeliveryOption(null, true) && !$this->context->cart->isVirtualCart())
+		if (!$this->context->cart->getDeliveryOption(null, false) && !$this->context->cart->isVirtualCart())
 			return '<p class="warning">'.Tools::displayError('Error: please choose a carrier').'</p>';
 		if (!$this->context->cart->id_currency)
 			return '<p class="warning">'.Tools::displayError('Error: no currency has been selected').'</p>';