From 58d50f2e301ffe112ada7ba13e5bb6543ad0154a Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Tue, 14 Feb 2012 14:42:18 +0000 Subject: [PATCH] // fix update_order_canada missing column display method git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13310 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/upgrade/php/update_order_canada.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-dev/upgrade/php/update_order_canada.php b/install-dev/upgrade/php/update_order_canada.php index 44cf10d42..0d87b32b5 100644 --- a/install-dev/upgrade/php/update_order_canada.php +++ b/install-dev/upgrade/php/update_order_canada.php @@ -46,7 +46,7 @@ function update_order_canada() WHERE name="PS_TAX_ADDRESS_TYPE"'); $address_field = str_replace('`','\`', $address_field); - $sql = 'SELECT `id_order` + $sql = 'SELECT `id_order`, `price_display_method` FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'customer` cus ON (o.id_customer = cus.id_customer) LEFT JOIN `'._DB_PREFIX_.'group` g ON (g.id_group = cus.id_default_group) @@ -66,7 +66,7 @@ function update_order_canada() // returns Group::getDefaultPriceDisplayMethod $tax_calculation_method = $order['price_display_method']; - $products = Db::getInstance()->ExecuteS(' + $products = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_detail` od WHERE od.`id_order` = '.(int)$id_order);