From 3cd702da4223b9e58f95f47f7940fe33e42781f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 24 Oct 2013 16:30:02 +0200 Subject: [PATCH] [-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793 --- classes/ObjectModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 3dd0072b6..0c70cbf3c 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -1139,7 +1139,7 @@ abstract class ObjectModelCore { $vars = get_class_vars($class_name); foreach ($vars['shopIDs'] as $id_shop) - $or[] = ' main.id_shop = '.(int)$id_shop.' '; + $or[] = '(main.id_shop = '.(int)$id_shop.(isset($this->def['fields']['id_shop_group']) ? ' OR (id_shop = 0 AND id_shop_group='.(int)Shop::getGroupFromShop((int)$id_shop).')' : '').')'; $prepend = ''; if (count($or)) @@ -1658,4 +1658,4 @@ abstract class ObjectModelCore { $this->update_fields = $fields; } -} \ No newline at end of file +}