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

This commit is contained in:
Rémi Gaillard
2013-03-25 15:54:25 +01:00
+3 -1
View File
@@ -49,4 +49,6 @@ ALTER TABLE `PREFIX_address` CHANGE `phone_mobile` `phone_mobile` varchar(32) de
UPDATE `PREFIX_customer` SET `id_gender` = 1 WHERE `email` LIKE 'pub@prestashop.com' AND `id_customer` = 1 AND `id_gender` = 4;
UPDATE `PREFIX_cart_rule_carrier` crc INNER JOIN `PREFIX_carrier` c ON crc.`id_carrier` = c.`id_carrier` SET crc.`id_carrier` = c.`id_reference`;
UPDATE `PREFIX_cart_rule_carrier` crc INNER JOIN `PREFIX_carrier` c ON crc.`id_carrier` = c.`id_carrier` SET crc.`id_carrier` = c.`id_reference`;
UPDATE `PREFIX_order_payment` SET `order_reference` = LPAD(order_reference, 9 , '0');