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

// Merge -> revision 8097

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-17 16:10:20 +00:00
parent 89bc665d48
commit 0aada6cc1e
41 changed files with 107 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db.sql
+2 -1
View File
@@ -115,7 +115,7 @@ CREATE TABLE `PREFIX_attribute_lang` (
`id_attribute` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
`name` varchar(128) NOT NULL,
PRIMARY KEY `attribute_lang` (`id_attribute`,`id_lang`),
PRIMARY KEY (`id_attribute`,`id_lang`),
KEY `id_lang` (`id_lang`,`name`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -567,6 +567,7 @@ CREATE TABLE `PREFIX_discount` (
`date_from` datetime NOT NULL,
`date_to` datetime NOT NULL,
`minimal` decimal(17,2) default NULL,
`include_tax` tinyint(1) NOT NULL default '0',
`active` tinyint(1) unsigned NOT NULL default '0',
`cart_display` tinyint(1) unsigned NOT NULL default '0',
`date_add` datetime NOT NULL,