// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -0,0 +1,16 @@
+SET NAMES 'utf8';
+
+UPDATE `PREFIX_address_format` SET `format`='firstname lastname
+company
+address1
+address2
+city
+State:name
+postcode
+Country:name' 
+WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='GB');
+
+UPDATE `PREFIX_country` SET `contains_states` = 1 WHERE `id_country` = 145;
+
+INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
+('PS_LEGACY_IMAGES', '1', NOW(), NOW());