From 1fb9b13eff686bb458a2edac53793e8eb5123f1b Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 18 Jan 2012 11:14:40 +0000 Subject: [PATCH] // Fixed #PSTEST-512 --- controllers/admin/AdminSupplyOrdersController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index cddb9434b..00ad3d271 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -1551,13 +1551,14 @@ class AdminSupplyOrdersControllerCore extends AdminController $query->leftJoin('attribute', 'atr', 'atr.id_attribute = pac.id_attribute'); $query->leftJoin('attribute_lang', 'al', 'al.id_attribute = atr.id_attribute AND al.id_lang = '.$id_lang); $query->leftJoin('attribute_group_lang', 'agl', 'agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$id_lang); + $query->leftJoin('product_supplier', 'ps', 'ps.id_product = p.id_product'); $query->where('pl.name LIKE \'%'.$pattern.'%\' OR p.reference LIKE \'%'.$pattern.'%\''); $query->where('p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))'); $query->where('p.is_virtual = 0 AND p.cache_is_pack = 0'); if ($id_supplier) - $query->where('p.id_supplier = '.$id_supplier); + $query->where('ps.id_supplier = '.$id_supplier.' OR p.id_supplier = '.$id_supplier); $query->groupBy('pa.id_product_attribute');