[-] BO: Invoices and products order detail are now not empty after deleting a product

2012-08-07 12:20:10 +00:00
parent 7a96b768c7
commit 63a2b6c9f2
6 changed files with 20 additions and 7 deletions
@@ -488,9 +488,8 @@ class OrderCore extends ObjectModel
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
 		SELECT *
 		FROM `'._DB_PREFIX_.'order_detail` od
-		LEFT JOIN `'._DB_PREFIX_.'product` p
-		ON p.id_product = od.product_id
-		'.Shop::addSqlAssociation('product', 'p').'
+		LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.id_product = od.product_id)
+		LEFT JOIN `'._DB_PREFIX_.'product_shop` ps ON (ps.id_product = p.id_product AND ps.id_shop = od.id_shop)
 		WHERE od.`id_order` = '.(int)($this->id));
 	}