// Merge -> 8910

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-30 08:17:25 +00:00
parent 4b56fa5c68
commit 3620f0837f
28 changed files with 2046 additions and 118 deletions
+3 -3
View File
@@ -553,7 +553,7 @@ CREATE TABLE `PREFIX_delivery` (
`id_range_price` int(10) unsigned default NULL,
`id_range_weight` int(10) unsigned default NULL,
`id_zone` int(10) unsigned NOT NULL,
`price` decimal(17,2) NOT NULL,
`price` decimal(20,6) NOT NULL,
PRIMARY KEY (`id_delivery`),
KEY `id_zone` (`id_zone`),
KEY `id_carrier` (`id_carrier`,`id_zone`),
@@ -1614,8 +1614,8 @@ CREATE TABLE `PREFIX_store` (
`address2` varchar(128) DEFAULT NULL,
`city` varchar(64) NOT NULL,
`postcode` varchar(12) NOT NULL,
`latitude` float(10,6) DEFAULT NULL,
`longitude` float(10,6) DEFAULT NULL,
`latitude` decimal(10,8) DEFAULT NULL,
`longitude` decimal(10,8) DEFAULT NULL,
`hours` varchar(254) DEFAULT NULL,
`phone` varchar(16) DEFAULT NULL,
`fax` varchar(16) DEFAULT NULL,