From ec3095ac32863bd271a841dd6ce5e93a241efc6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 28 Jun 2013 10:18:49 +0200 Subject: [PATCH] [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 --- classes/ObjectModel.php | 2 +- .../admin/AdminManufacturersController.php | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index fc6a40697..83fdb7516 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -546,7 +546,7 @@ abstract class ObjectModelCore $object_id = Db::getInstance()->Insert_ID(); - if ($definition['multilang']) + if (isset($definition['multilang']) && $definition['multilang']) { $res = Db::getInstance()->executeS(' SELECT * diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 550179b1d..b1e630bc1 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -189,7 +189,7 @@ class AdminManufacturersControllerCore extends AdminController $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (a.`id_manufacturer` = m.`id_manufacturer`)'; - $this->_where = 'AND a.`id_customer` = 0 AND a.`id_supplier` = 0 AND a.`id_warehouse` = 0'; + $this->_where = 'AND a.`id_customer` = 0 AND a.`id_supplier` = 0 AND a.`id_warehouse` = 0 AND a.`deleted`=0'; $this->context->smarty->assign('title_list', $this->l('Manufacturers addresses:')); @@ -406,6 +406,12 @@ class AdminManufacturersControllerCore extends AdminController 'type' => 'hidden', 'name' => 'alias', ); + + $form['input'][] = array( + 'type' => 'hidden', + 'name' => 'id_address', + ); + $form['input'][] = array( 'type' => 'text', 'label' => $this->l('Last name:'), @@ -712,6 +718,9 @@ class AdminManufacturersControllerCore extends AdminController return $res; } -} - - + + protected function beforeDelete($object) + { + return true; + } +} \ No newline at end of file