From ca6c08c36c962c27333933be5ec4a401d8c824d1 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Thu, 10 May 2012 07:45:22 +0000
Subject: [PATCH] [-] BO : #PSCFV-2276 - Fix bug on changing status of a order
 with virtual products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15140 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/order/Order.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/classes/order/Order.php b/classes/order/Order.php
index 8a1b72d02..069249238 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1100,9 +1100,13 @@ class OrderCore extends ObjectModel
 				FROM `'._DB_PREFIX_.'order_carrier`
 				WHERE `id_order` = '.(int)$order_invoice->id_order.'
 				AND (`id_order_invoice` IS NULL OR `id_order_invoice` = 0)');
-			$order_carrier = new OrderCarrier($id_order_carrier);
-			$order_carrier->id_order_invoice = (int)$order_invoice->id;
-			$order_carrier->update();
+			
+			if ($id_order_carrier)
+			{
+				$order_carrier = new OrderCarrier($id_order_carrier);
+				$order_carrier->id_order_invoice = (int)$order_invoice->id;
+				$order_carrier->update();
+			}
 
 			// Update order detail
 			Db::getInstance()->execute('