From dd13f01215f168d457f2ec2e0ac3c97875ee36c7 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 23 May 2012 16:37:26 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-2540 : CSV importing categories errors + manufacturers + suppliers git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15649 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminImportController.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 5e217ee1f..738d3a400 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -944,6 +944,10 @@ class AdminImportControllerCore extends AdminController // Associate category to shop if (Shop::isFeatureActive() && $info['shop']) { + Db::getInstance()->execute(' + DELETE FROM '._DB_PREFIX_.'category_shop + WHERE id_category = '.(int)$category->id + ); $info['shop'] = explode(',', $info['shop']); foreach ($info['shop'] as $shop) if (!is_numeric($shop)) @@ -951,8 +955,6 @@ class AdminImportControllerCore extends AdminController else $category->addShop($shop); } - else - $category->addShop(Configuration::get('PS_SHOP_DEFAULT')); } } @@ -1897,6 +1899,10 @@ class AdminImportControllerCore extends AdminController // Associate supplier to group shop if (Shop::isFeatureActive() && $manufacturer->shop) { + Db::getInstance()->execute(' + DELETE FROM '._DB_PREFIX_.'manufacturer_shop + WHERE id_manufacturer = '.(int)$manufacturer->id + ); $manufacturer->shop = explode(',', $manufacturer->shop); $shops = array(); foreach ($manufacturer->shop as $shop) @@ -1964,6 +1970,10 @@ class AdminImportControllerCore extends AdminController // Associate supplier to group shop if (Shop::isFeatureActive() && $supplier->shop) { + Db::getInstance()->execute(' + DELETE FROM '._DB_PREFIX_.'supplier_shop + WHERE id_supplier = '.(int)$supplier->id + ); $supplier->shop = explode(',', $supplier->shop); $shops = array(); foreach ($supplier->shop as $shop)