dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// merge 1.4 (5397)

Browse Source
This commit is contained in:
fBrignoli
2011-04-22 16:00:58 +00:00
parent 0cd5856fe5
commit ff49083fb6
126 changed files with 3390 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db.sql
+9 -8
View File
@@ -361,6 +361,7 @@ CREATE TABLE `PREFIX_country` (
`need_identification_number` tinyint(1) NOT NULL default '0',
`need_zip_code` tinyint(1) NOT NULL default '1',
`zip_code_format` varchar(12) NOT NULL default '',
`display_tax_label` BOOLEAN NOT NULL,
PRIMARY KEY (`id_country`),
KEY `country_iso_code` (`iso_code`),
KEY `country_` (`id_zone`)
@@ -373,13 +374,6 @@ CREATE TABLE `PREFIX_country_lang` (
UNIQUE KEY `country_lang_index` (`id_country`,`id_lang`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_country_tax` (
`id_country_tax` int(11) NOT NULL AUTO_INCREMENT,
`id_country` int(11) NOT NULL,
`id_tax_rules_group` int(11) NOT NULL,
PRIMARY KEY (`id_country_tax`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_currency` (
`id_currency` int(10) unsigned NOT NULL auto_increment,
`name` varchar(32) NOT NULL,
@@ -1409,8 +1403,8 @@ CREATE TABLE `PREFIX_tab` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_tab_lang` (
`id_lang` int(10) unsigned NOT NULL,
`id_tab` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
`name` varchar(32) default NULL,
PRIMARY KEY (`id_tab`,`id_lang`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -1637,3 +1631,10 @@ CREATE TABLE `PREFIX_county_zip_code` (
PRIMARY KEY ( `id_county` , `from_zip_code` , `to_zip_code` )
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_address_format` (
`id_country` int(10) unsigned NOT NULL,
`format` varchar(255) NOT NULL DEFAULT '',
KEY `country` (`id_country`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;