// Merge -> revision 8097

2011-08-17 16:10:20 +00:00
parent 5b26bb28b8
commit 66d4533e68
41 changed files with 107 additions and 135 deletions
@@ -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,
@@ -169,7 +169,7 @@ ALTER TABLE PREFIX_product_lang DROP INDEX `id_product`;
 CREATE TABLE `PREFIX_customer_group` (
 	`id_customer` int(10) unsigned NOT NULL,
 	`id_group` int(10) unsigned NOT NULL,
-	PRIMARY KEY `customer_group_index` (`id_customer`,`id_group`),
+	PRIMARY KEY (`id_customer`,`id_group`),
 	INDEX customer_login(id_group)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

@@ -11,4 +11,6 @@ AND `id_lang` = (
 	FROM `PREFIX_lang`
 	WHERE `iso_code` = 'en'
 	LIMIT 1
-);
+);
+
+ALTER TABLE `PREFIX_discount` ADD `include_tax` TINYINT(1) NOT NULL DEFAULT '0';