From 5be92db59e2168845d1dd8d69d184f4607a85c8b Mon Sep 17 00:00:00 2001 From: rGaillard Date: Tue, 6 Nov 2012 15:09:00 +0000 Subject: [PATCH] [-] BO: delete the carrier on the warehouse from the id_reference --- controllers/admin/AdminCarriersController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 448c304c9..b08410dea 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -556,14 +556,20 @@ class AdminCarriersControllerCore extends AdminController if (Tools::isSubmit('delete'.$this->table)) { $id = (int)Tools::getValue('id_'.$this->table); - Warehouse::removeCarrier($id); + // Delete from the reference_id and not from the carrier id + $carrier = new Carrier((int)$id); + Warehouse::removeCarrier($carrier->id_reference); } else if (Tools::isSubmit($this->table.'Box') && count(Tools::isSubmit($this->table.'Box')) > 0) { $ids = Tools::getValue($this->table.'Box'); array_walk($ids, 'intval'); foreach ($ids as $id) - Warehouse::removeCarrier($id); + { + // Delete from the reference_id and not from the carrier id + $carrier = new Carrier((int)$id); + Warehouse::removeCarrier($carrier->id_reference); + } } parent::postProcess(); Carrier::cleanPositions();