From c8ecf3d604c9968abdbb1d60150d8be4ad393b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 23 Jan 2013 16:07:53 +0100 Subject: [PATCH] [-] BO: Fix #PSCFV-7377 customizable fields on product duplication --- classes/Product.php | 2 +- install-dev/upgrade/php/create_multistore.php | 2 +- install-dev/upgrade/php/generate_tax_rules.php | 4 ++-- install-dev/upgrade/php/setAllGroupsOnHomeCategory.php | 2 +- install-dev/upgrade/php/update_order_canada.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index cd55ca53e..eead74dc8 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3567,7 +3567,7 @@ class ProductCore extends ObjectModel if (isset($customizations['labels'])) { - $query = 'INSERT INTO `'._DB_PREFIX_.'` (`id_customization_field`, `id_lang`, `name`) VALUES '; + $query = 'INSERT INTO `'._DB_PREFIX_.'customization_field_lang` (`id_customization_field`, `id_lang`, `name`) VALUES '; $data = array(); foreach ($customizations['labels'][$old_customization_field_id] as $customization_label) $data = array( diff --git a/install-dev/upgrade/php/create_multistore.php b/install-dev/upgrade/php/create_multistore.php index 43e683992..80f4576b8 100755 --- a/install-dev/upgrade/php/create_multistore.php +++ b/install-dev/upgrade/php/create_multistore.php @@ -79,7 +79,7 @@ function create_multistore() // Stock conversion $sql = 'INSERT INTO `'._DB_PREFIX_.'.stock` (`id_product`, `id_product_attribute`, `id_group_shop`, `id_shop`, `quantity`) - VALUES (SELECT `p.id_product`, 0, 1, 1, `p.quantity` FROM `'._DB_PREFIX_.'.product` p);'; + VALUES (SELECT p.`id_product`, 0, 1, 1, p.`quantity` FROM `'._DB_PREFIX_.'.product` p);'; $res &= Db::getInstance()->execute($sql); $sql = 'INSERT INTO `'._DB_PREFIX_.'.stock` (`id_product`, `id_product_attribute`, `id_group_shop`, `id_shop`, `quantity`) diff --git a/install-dev/upgrade/php/generate_tax_rules.php b/install-dev/upgrade/php/generate_tax_rules.php index 099b4cd1d..950e103d2 100644 --- a/install-dev/upgrade/php/generate_tax_rules.php +++ b/install-dev/upgrade/php/generate_tax_rules.php @@ -63,8 +63,8 @@ function generate_tax_rules() } $states = Db::getInstance()->executeS(' - SELECT * FROM `'._DB_PREFIX_.'states s - LEFT JOIN `'._DB_PREFIX_.'tax_state ts ON (ts.`id_state` = s.`id_state`) + SELECT * FROM `'._DB_PREFIX_.'states` s + LEFT JOIN `'._DB_PREFIX_.'tax_state` ts ON (ts.`id_state` = s.`id_state`) WHERE `id_tax` = '.(int)$id_tax); if ($states) diff --git a/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php b/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php index a72153ba7..ad437cd40 100755 --- a/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php +++ b/install-dev/upgrade/php/setAllGroupsOnHomeCategory.php @@ -27,7 +27,7 @@ function setAllGroupsOnHomeCategory() { $ps_lang_default = Db::getInstance()->getValue('SELECT value - FROM `'._DB_PREFIX_.'`configuration WHERE name="PS_LANG_DEFAULT"'); + FROM `'._DB_PREFIX_.'configuration` WHERE name="PS_LANG_DEFAULT"'); $results = Db::getInstance()->executeS('SELECT id_group FROM `'._DB_PREFIX_.'group`'); $groups = array(); diff --git a/install-dev/upgrade/php/update_order_canada.php b/install-dev/upgrade/php/update_order_canada.php index 01da90dee..79413b8fe 100644 --- a/install-dev/upgrade/php/update_order_canada.php +++ b/install-dev/upgrade/php/update_order_canada.php @@ -55,7 +55,7 @@ function update_order_canada() $id_order_list = Db::getInstance()->executeS($sql); $default_price_display_method = Db::getInstance()->getValue('SELECT price_display_method - FROM `'._DB_PREFIX_.'group WHERE id_group=1`'); + FROM `'._DB_PREFIX_.'group` WHERE id_group=1'); $values = ''; foreach ($id_order_list as $order) {