Improved error handling.

[fa-stable.git] / sql / en_US-new.sql

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index a9455510976deee0bb5db0d908bd7f5b9fec2e79..041bced2cd601abdc0ff1dd95cca7cad6122d65b 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -468,7 +468,6 @@ CREATE TABLE IF NOT EXISTS `0_crm_contacts` (
 -- Dumping data for table `0_crm_contacts`
 --
 
-
 -- --------------------------------------------------------
 
 --
@@ -614,8 +613,8 @@ CREATE TABLE IF NOT EXISTS `0_debtors_master` (
   `notes` tinytext NOT NULL,
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`debtor_no`),
-  UNIQUE KEY `name` (`name`),
-  KEY `debtor_ref` (`debtor_ref`)
+  KEY `name` (`name`),
+  UNIQUE KEY `debtor_ref` (`debtor_ref`)
 ) TYPE=MyISAM AUTO_INCREMENT=1 ;
 
 --
@@ -649,7 +648,6 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` (
   `alloc` double NOT NULL default '0',
   `rate` double NOT NULL default '1',
   `ship_via` int(11) default NULL,
-  `trans_link` int(11) NOT NULL default '0',
   `dimension_id` int(11) NOT NULL default '0',
   `dimension2_id` int(11) NOT NULL default '0',
   `payment_terms` int(11) default NULL,
@@ -682,8 +680,10 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans_details` (
   `discount_percent` double NOT NULL default '0',
   `standard_cost` double NOT NULL default '0',
   `qty_done` double NOT NULL default '0',
+  `src_id` int(11) NOT NULL,
   PRIMARY KEY  (`id`),
-  KEY `Transaction` (`debtor_trans_type`,`debtor_trans_no`)
+  KEY `Transaction` (`debtor_trans_type`,`debtor_trans_no`),
+  KEY (`src_id`)
 ) TYPE=InnoDB AUTO_INCREMENT=1 ;
 
 --
@@ -763,8 +763,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` (
 
 INSERT INTO `0_fiscal_year` VALUES(1, '2008-01-01', '2008-12-31', 0);
 INSERT INTO `0_fiscal_year` VALUES(2, '2009-01-01', '2009-12-31', 0);
-
--- --------------------------------------------------------
+INSERT INTO `0_fiscal_year` VALUES(3, '2010-01-01', '2010-12-31', 0);
 
 --
 -- Table structure for table `0_gl_trans`
@@ -1046,7 +1045,7 @@ CREATE TABLE IF NOT EXISTS `0_payment_terms` (
 INSERT INTO `0_payment_terms` VALUES(1, 'Due 15th Of the Following Month', 0, 17, 0);
 INSERT INTO `0_payment_terms` VALUES(2, 'Due By End Of The Following Month', 0, 30, 0);
 INSERT INTO `0_payment_terms` VALUES(3, 'Payment due within 10 days', 10, 0, 0);
-INSERT INTO `0_payment_terms` VALUES(4, 'Cash Only', 1, 0, 0);
+INSERT INTO `0_payment_terms` VALUES(4, 'Cash Only', 0, 0, 0);
 
 -- --------------------------------------------------------
 
@@ -1165,6 +1164,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
   `requisition_no` tinytext,
   `into_stock_location` varchar(5) NOT NULL default '',
   `delivery_address` tinytext NOT NULL,
+  `total` double NOT NULL default '0',
+  `tax_included` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`order_no`),
   KEY `ord_date` (`ord_date`)
 ) TYPE=InnoDB AUTO_INCREMENT=1 ;
@@ -1360,6 +1361,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` (
   `from_stk_loc` varchar(5) NOT NULL default '',
   `delivery_date` date NOT NULL default '0000-00-00',
   `payment_terms` int(11) default NULL,
+  `total` double NOT NULL default '0',
   PRIMARY KEY  (`trans_type`,`order_no`)
 ) TYPE=InnoDB;
 
@@ -1645,6 +1647,7 @@ CREATE TABLE IF NOT EXISTS `0_suppliers` (
   `bank_account` varchar(60) NOT NULL default '',
   `curr_code` char(3) default NULL,
   `payment_terms` int(11) default NULL,
+  `tax_included` tinyint(1) NOT NULL default '0',
   `dimension_id` int(11) default '0',
   `dimension2_id` int(11) default '0',
   `tax_group_id` int(11) default NULL,
@@ -1737,6 +1740,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_trans` (
   `ov_gst` double NOT NULL default '0',
   `rate` double NOT NULL default '1',
   `alloc` double NOT NULL default '0',
+  `tax_included` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`type`,`trans_no`),
   KEY `supplier_id` (`supplier_id`),
   KEY `SupplierID_2` (`supplier_id`,`supp_reference`),
@@ -1818,7 +1822,7 @@ INSERT INTO `0_sys_prefs` VALUES('default_adj_act', 'glsetup.items', 'varchar',
 INSERT INTO `0_sys_prefs` VALUES('default_inv_sales_act', 'glsetup.items', 'varchar', 15, '4010');
 INSERT INTO `0_sys_prefs` VALUES('default_assembly_act', 'glsetup.items', 'varchar', 15, '1530');
 INSERT INTO `0_sys_prefs` VALUES('default_workorder_required', 'glsetup.manuf', 'int', 11, '20');
-INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3');
+INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
 INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
 
 -- --------------------------------------------------------