// Fix bug with address changing and multi-address on opc

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13892 b9a71923-0436-4b27-9f14-aed3839534dd

classes/Cart.php

@@ -3012,7 +3012,7 @@ class CartCore extends ObjectModel
 				)';
 				Db::getInstance()->execute($sql);
 
-		// upgradng address delivery
+		// Upgrading address delivery
 		$sql = 'UPDATE `'._DB_PREFIX_.'cart_product`
 			SET `id_address_delivery` =
 			(

controllers/front/OrderOpcController.php

@@ -190,6 +190,9 @@ class OrderOpcControllerCore extends ParentOrderController
 									if (!$this->context->cart->update())
 										$this->errors[] = Tools::displayError('An error occurred while updating your cart.');
 									
+									if (!$this->context->cart->isMultiAddressDelivery())
+										$this->context->cart->setNoMultishipping(); // As the cart is no multishipping, set each delivery address lines with the main delivery address
+
 									if (!count($this->errors))
 									{
 										$result = $this->_getCarrierList();