X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Fen_US-new.sql;h=ee9a6f4fbf6798b69b3ccc6a7786d0aba7f452a4;hb=e0c09e32300e01d638bf4507cfe5c06f6c7386f3;hp=75903fc876c23a3a04685260ac26da24ff1a9874;hpb=e4c7f0dbe9fa83ed6382713b32a4586ce3e60d81;p=fa-stable.git

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 75903fc8..ee9a6f4f 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -613,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 ;
 
 --
@@ -648,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,
@@ -681,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 ;
 
 --
@@ -1164,6 +1165,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
   `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 ;
@@ -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');
 
 -- --------------------------------------------------------