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

2013-03-29 11:26:48 +01:00
parent bfc717e241 5fbe5b7687
commit d2e57706d2
7 changed files with 22 additions and 10 deletions
@@ -33,7 +33,8 @@ CREATE TABLE `PREFIX_tab_module_preference` (

 /* PHP:add_new_tab(AdminMarketing, es:Marketing|it:Marketing|en:Marketing|de:Marketing|fr:Marketing,  1); */;

-ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
+/* PHP:p1540_add_missing_columns(); */;
+
 ALTER TABLE `PREFIX_stock_available` ADD UNIQUE `product_sqlstock` (`id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`);

 UPDATE PREFIX_configuration SET `value` = '8388608' WHERE `name` = 'PS_PRODUCT_PICTURE_MAX_SIZE' AND `value` <= '524288';