From 541322af9c4d0c7aea371cf09e6adeac5e9a897b Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 12 Jul 2011 17:16:11 +0200 Subject: [PATCH 1/1] Update of default COAs --- sql/en_US-demo.sql | 8 ++++---- sql/en_US-new.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index 5231bad9..d5a6d8ab 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -2161,7 +2161,6 @@ DROP TABLE IF EXISTS `0_tax_groups`; CREATE TABLE IF NOT EXISTS `0_tax_groups` ( `id` int(11) NOT NULL auto_increment, `name` varchar(60) NOT NULL default '', - `tax_shipping` tinyint(1) NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) @@ -2171,8 +2170,8 @@ CREATE TABLE IF NOT EXISTS `0_tax_groups` ( -- Dumping data for table `0_tax_groups` -- -INSERT INTO `0_tax_groups` VALUES(1, 'Tax', 0, 0); -INSERT INTO `0_tax_groups` VALUES(2, 'Tax Exempt', 0, 0); +INSERT INTO `0_tax_groups` VALUES(1, 'Tax', 0); +INSERT INTO `0_tax_groups` VALUES(2, 'Tax Exempt', 0); -- -------------------------------------------------------- @@ -2185,6 +2184,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` ( `tax_group_id` int(11) NOT NULL default '0', `tax_type_id` int(11) NOT NULL default '0', `rate` double NOT NULL default '0', + `tax_shipping` tinyint(1) NOT NULL default '0', PRIMARY KEY (`tax_group_id`,`tax_type_id`) ) TYPE=InnoDB; @@ -2192,7 +2192,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` ( -- Dumping data for table `0_tax_group_items` -- -INSERT INTO `0_tax_group_items` VALUES(1, 1, 5); +INSERT INTO `0_tax_group_items` VALUES(1, 1, 5, 1); -- -------------------------------------------------------- diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index bc1f4ce1..bcd1539d 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -1920,7 +1920,6 @@ DROP TABLE IF EXISTS `0_tax_groups`; CREATE TABLE IF NOT EXISTS `0_tax_groups` ( `id` int(11) NOT NULL auto_increment, `name` varchar(60) NOT NULL default '', - `tax_shipping` tinyint(1) NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) @@ -1930,8 +1929,8 @@ CREATE TABLE IF NOT EXISTS `0_tax_groups` ( -- Dumping data for table `0_tax_groups` -- -INSERT INTO `0_tax_groups` VALUES(1, 'Tax', 0, 0); -INSERT INTO `0_tax_groups` VALUES(2, 'Tax Exempt', 0, 0); +INSERT INTO `0_tax_groups` VALUES(1, 'Tax', 0); +INSERT INTO `0_tax_groups` VALUES(2, 'Tax Exempt', 0); -- -------------------------------------------------------- @@ -1944,6 +1943,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` ( `tax_group_id` int(11) NOT NULL default '0', `tax_type_id` int(11) NOT NULL default '0', `rate` double NOT NULL default '0', + `tax_shipping` tinyint(1) NOT NULL default '0', PRIMARY KEY (`tax_group_id`,`tax_type_id`) ) TYPE=InnoDB; @@ -1951,7 +1951,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` ( -- Dumping data for table `0_tax_group_items` -- -INSERT INTO `0_tax_group_items` VALUES(1, 1, 5); +INSERT INTO `0_tax_group_items` VALUES(1, 1, 5, 1); -- -------------------------------------------------------- -- 2.30.2