From 7d67b9cc6e4e20d3ed3e3b0a2d791c05bdcd693e Mon Sep 17 00:00:00 2001 From: aFolletete Date: Tue, 13 Dec 2011 09:50:21 +0000 Subject: [PATCH] // revert r11153 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11164 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/order/Order.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index e7b307cb4..01c2625ba 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -147,8 +147,8 @@ class OrderCore extends ObjectModel */ public $reference; - - + + protected $webserviceParameters = array( 'objectMethods' => array('add' => 'addWs'), @@ -1091,9 +1091,7 @@ class OrderCore extends ObjectModel FROM `'._DB_PREFIX_.'order_carrier` WHERE `id_order` = '.(int)$order_invoice->id_order.' AND `id_order_invoice` IS NOT NULL'); - $order_carrier = new OrderCarrier(); - $order_carrier->id_carrier = $this->id_carrier; - $order_carrier->id_order = $this->id; + $order_carrier = new OrderCarrier($id_order_carrier); $order_carrier->id_order_invoice = (int)$order_invoice->id; $order_carrier->update();