Removed obsolete field 'included_in_price' from table 'Tax_group_items' in en_US...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2449fe1514d4b3cc39031fd783117cde00c3a48b..6f5b79b83d17694ab805d0c2d25d38972dc015d3 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+25_Apr-2009 Joe Hunt
+! Removed obsolete field 'included_in_price' from table 'Tax_group_items' in en_US-demo.sql.
+$ /sql/en_US-demo.sql
+  /sql/alter2.2.sql
+
 24-Apr-2009 Janusz Dobrowolski
 + Added inactive records support.
 $ /admin/payment_terms.php

diff --git a/sql/alter2.2.sql b/sql/alter2.2.sql
index b0a9173ea90f3d8d3caa3079b5a4cc46e9b90e97..1965a8dc0525246b0142a118bdf870f8bac2ffc9 100644 (file)
--- a/sql/alter2.2.sql
+++ b/sql/alter2.2.sql
@@ -37,3 +37,4 @@ ALTER TABLE `0_movement_types` ADD COLUMN `inactive` tinyint(1) NOT NULL default
 ALTER TABLE `0_item_tax_types` ADD COLUMN `inactive` tinyint(1) NOT NULL default '0';
 ALTER TABLE `0_tax_types` ADD COLUMN `inactive` tinyint(1) NOT NULL default '0';
 ALTER TABLE `0_tax_groups` ADD COLUMN `inactive` tinyint(1) NOT NULL default '0';
+ALTER TABLE `0_tax_group_items` DROP COLUMN `included_in_price`;

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index b3544add06f4595bbcf0ba1ad1af6e9a73eed8f6..b402102e9e2bd2e09b7ca41754295f45e81687fa 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -2103,7 +2103,6 @@ CREATE TABLE `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',
-  `included_in_price` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`tax_group_id`,`tax_type_id`)
 ) TYPE=InnoDB  ;