From da12fbdd5e5412c0c0f45e73da5f287d14f504b9 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 2 Sep 2013 19:09:47 +0200 Subject: [PATCH] [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes --- controllers/admin/AdminImportController.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index e00153fe8..b0bef57b6 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -2435,17 +2435,12 @@ class AdminImportControllerCore extends AdminController $discount_rate = (float)$info['discount_rate']; $tax_rate = (float)$info['tax_rate']; - // checks if one product is there only once - if (isset($product['id_product'])) - { - if ($product['id_product'] == $id_product_attribute) - $this->errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product, - $id_product_attribute, $current_line + 1); - else - $product['id_product'] = $id_product_attribute; - } + // checks if one product/attribute is there only once + if (isset($products[$id_product][$id_product_attribute])) + $this->errors[] = sprintf($this->l('Product/Attribute (%d/%d) cannot be added twice (at line %d).'), $id_product, + $id_product_attribute, $current_line + 1); else - $product['id_product'] = 0; + $products[$id_product][$id_product_attribute] = $quantity_expected; // checks parameters if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))