Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-06-26 18:13:38 +02:00
parent e33e5229b4 2b94a338b8
commit 3524ccc99b
18 changed files with 112 additions and 79 deletions
@@ -92,7 +92,6 @@ UPDATE PREFIX_stock_mvt sm SET sm.id_stock = IFNULL((
 	WHERE s.id_product = sm.id_product
 	AND s.id_product_attribute = sm.id_product_attribute
 	ORDER BY s.id_shop
-	LIMIT 1
 ), 0);
 DELETE FROM PREFIX_stock_mvt WHERE id_stock = 0;
 ALTER TABLE PREFIX_stock_mvt DROP id_product, DROP id_product_attribute;