bank_trans_type_id removed from bank_trans in en_US-demo.sql and en_US-new.sql.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3a6c25b7108fd438b2ac2886e08494cb0287772c..5882fedf073d67dcdf572a03d4c83eca5c7efdda 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+27-Aug-2009 Joe Hunt
+# bank_trans_type_id removed from bank_trans in en_US-demo.sql and en_US-new.sql.
+$ /sql/en_US-demo.sql
+  /sql/en_US-new.sql
+  
 26-Aug-2009 Janusz Dobrowolski
 ! Merged changes from main trunk  2.1.4-2.1.5 (see below)
 

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index fa2d5c792a13b6df4a4e39967a7e234f355ffd39..3a008e4cd07363d968b2304425d72dcdd90ea75f 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -107,7 +107,6 @@ CREATE TABLE `0_bank_trans` (
   `bank_act` varchar(11) default NULL,
   `ref` varchar(40) default NULL,
   `trans_date` date NOT NULL default '0000-00-00',
-  `bank_trans_type_id` int(10) unsigned default NULL,
   `amount` double default NULL,
   `dimension_id` int(11) NOT NULL default '0',
   `dimension2_id` int(11) NOT NULL default '0',
@@ -122,17 +121,17 @@ CREATE TABLE `0_bank_trans` (
 
 ### Data of table `0_bank_trans` ###
 
-INSERT INTO `0_bank_trans` VALUES ('1', '22', '4', '1', '1', '2009-06-21', '', '-3465', '0', '0', '3', '2', '');
-INSERT INTO `0_bank_trans` VALUES ('2', '26', '1', '1', '', '2009-06-21', '', '-10', '0', '0', '1', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('3', '26', '1', '1', '', '2009-06-21', '', '-20', '0', '0', '1', '0', '');
-INSERT INTO `0_bank_trans` VALUES ('4', '0', '18', '1', '1', '2009-02-20', '', '1000', '0', '0', '0', '', '');
-INSERT INTO `0_bank_trans` VALUES ('5', '0', '19', '1', '2', '2009-02-21', '', '4000', '0', '0', '0', '', '');
-INSERT INTO `0_bank_trans` VALUES ('6', '2', '5', '1', '1', '2009-06-21', '', '100', '0', '0', '4', '3', '');
-INSERT INTO `0_bank_trans` VALUES ('7', '1', '8', '1', '1', '2009-06-21', '', '-50', '0', '0', '4', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('8', '26', '5', '1', '', '2009-06-21', '', '-10', '0', '0', '1', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('9', '26', '5', '1', '', '2009-06-21', '', '-20', '0', '0', '1', '0', '');
-INSERT INTO `0_bank_trans` VALUES ('10', '26', '7', '1', '', '2009-06-21', '', '-10', '0', '0', '1', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('11', '26', '7', '1', '', '2009-06-21', '', '-20', '0', '0', '1', '0', '');
+INSERT INTO `0_bank_trans` VALUES ('1', '22', '4', '1', '1', '2009-06-21', '-3465', '0', '0', '3', '2', '');
+INSERT INTO `0_bank_trans` VALUES ('2', '26', '1', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', '');
+INSERT INTO `0_bank_trans` VALUES ('3', '26', '1', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', '');
+INSERT INTO `0_bank_trans` VALUES ('4', '0', '18', '1', '1', '2009-02-20', '1000', '0', '0', '0', '', '');
+INSERT INTO `0_bank_trans` VALUES ('5', '0', '19', '1', '2', '2009-02-21', '4000', '0', '0', '0', '', '');
+INSERT INTO `0_bank_trans` VALUES ('6', '2', '5', '1', '1', '2009-06-21', '100', '0', '0', '4', '3', '');
+INSERT INTO `0_bank_trans` VALUES ('7', '1', '8', '1', '1', '2009-06-21', '-50', '0', '0', '4', '1', '');
+INSERT INTO `0_bank_trans` VALUES ('8', '26', '5', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', '');
+INSERT INTO `0_bank_trans` VALUES ('9', '26', '5', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', '');
+INSERT INTO `0_bank_trans` VALUES ('10', '26', '7', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', '');
+INSERT INTO `0_bank_trans` VALUES ('11', '26', '7', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', '');
 
 
 ### Structure of table `0_bom` ###

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 66ad32f472a3c7b656267c035b31b5eecaee8b1f..793fc514e4951e428bb214846b3c76e6d9862725 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -104,7 +104,6 @@ CREATE TABLE `0_bank_trans` (
   `bank_act` varchar(11) default NULL,
   `ref` varchar(40) default NULL,
   `trans_date` date NOT NULL default '0000-00-00',
-  `bank_trans_type_id` int(10) unsigned default NULL,
   `amount` double default NULL,
   `dimension_id` int(11) NOT NULL default '0',
   `dimension2_id` int(11) NOT NULL default '0',