From 5fb6bcc04003cef93d32011950447d64475a9e8b Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 28 Dec 2011 15:49:35 +0000 Subject: [PATCH] // fixed supply orders git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11861 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/stock/SupplyOrder.php | 2 +- controllers/admin/AdminSupplyOrdersController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/stock/SupplyOrder.php b/classes/stock/SupplyOrder.php index 712d8ca7f..c16668ef2 100755 --- a/classes/stock/SupplyOrder.php +++ b/classes/stock/SupplyOrder.php @@ -444,7 +444,7 @@ class SupplyOrderCore extends ObjectModel $query->where('so.id_supply_order = '.(int)$match.' OR so.reference = "'.pSQL($match).'"'); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); - return ($res > 0); + return ((int)$res); } /** diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index e8c7d749b..5adb6856f 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -941,7 +941,7 @@ class AdminSupplyOrdersControllerCore extends AdminController if (Tools::isSubmit('reference')) { $ref = pSQL(Tools::getValue('reference')); - if (SupplyOrder::exists($ref)) + if ((int)SupplyOrder::exists($ref) != (int)Tools::getValue('id_supply_order')) $this->_errors[] = Tools::displayError($this->l('The reference has to be unique.')); }