From 76e03d9d384cd6665e466620181fccaae7e6bd8a Mon Sep 17 00:00:00 2001
From: root <root@debian.presta>
Date: Thu, 3 Jan 2013 18:35:01 +0100
Subject: [PATCH] [-] FO : Fix #PSCFV-6307 correct invoice address in OPC

---
 controllers/front/AddressController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index d0e69df2d..382b90455 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -219,6 +219,12 @@ class AddressControllerCore extends FrontController
 			else // Update cart address
 				$this->context->cart->autosetProductAddress();
 
+            if (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE'))
+            { 
+                $this->context->cart->id_address_invoice = (int)$address->id;
+                $this->context->cart->update();                
+            }
+            
 			if ($this->ajax)
 			{
 				$return = array(