From b65423f232bb0c7e0ea9ca5a835f962f13ebf3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 22 May 2013 10:30:57 +0200 Subject: [PATCH 1/2] [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 --- classes/stock/StockManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php index f1d956d1d..a313da21f 100644 --- a/classes/stock/StockManager.php +++ b/classes/stock/StockManager.php @@ -479,8 +479,8 @@ class StockManagerCore implements StockManagerInterface $query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').' AND os.id_order_state != '.(int)Configuration::get('PS_OS_CANCELED').')'); $query->groupBy('od.id_order_detail'); - //if (count($ids_warehouse)) - //$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')'); + if (count($ids_warehouse)) + $query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')'); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); $client_orders_qty = 0; if (count($res)) @@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface return $stocks; } -} +} \ No newline at end of file From c7a056f301405e9ac80474d307539e49903ddac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 22 May 2013 10:42:35 +0200 Subject: [PATCH 2/2] [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 --- classes/Tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tools.php b/classes/Tools.php index f5ca5a939..56e8645b5 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1523,7 +1523,7 @@ class ToolsCore if (self::$_cache_nb_media_servers && ($id_media_server = (abs(crc32($filename)) % self::$_cache_nb_media_servers + 1))) return constant('_MEDIA_SERVER_'.$id_media_server.'_'); - return Tools::getHttpHost(); + return Tools::getShopDomain(); } public static function generateHtaccess($path = null, $rewrite_settings = null, $cache_control = null, $specific = '', $disable_multiviews = null, $medias = false, $disable_modsec = null)