X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.1.sql;h=7201d1c465260fce83a2c6c49abe72c88987761a;hb=f7c756dac5a70f01550b1fceb99c6858e232faf2;hp=d29d00c076fe794b1c7ca413a81a187a17c2dc9c;hpb=c67f9fd41437917b5032c0396ab42704d0870064;p=fa-stable.git

diff --git a/sql/alter2.1.sql b/sql/alter2.1.sql
index d29d00c0..7201d1c4 100644
--- a/sql/alter2.1.sql
+++ b/sql/alter2.1.sql
@@ -14,11 +14,11 @@
 DROP TABLE IF EXISTS `0_attachments`;
 
 CREATE TABLE `0_attachments` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) UNSIGNED NOT NULL auto_increment,
   `description` varchar(60) NOT NULL default '',
   `type_no` int(11) NOT NULL default '0',
   `trans_no` int(11) NOT NULL default '0',
-  `bin_data` mediumblob NOT NULL,
+  `unique_name` varchar(60) NOT NULL default '',
   `tran_date` date NOT NULL default '0000-00-00',
   `filename` varchar(60) NOT NULL default '',
   `filesize` int(11) NOT NULL default '0',
@@ -30,7 +30,7 @@ CREATE TABLE `0_attachments` (
 DROP TABLE IF EXISTS `0_groups`;
 
 CREATE TABLE `0_groups` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` smallint(6) UNSIGNED NOT NULL auto_increment,
   `description` varchar(60) NOT NULL default '',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)
@@ -43,11 +43,11 @@ INSERT INTO `0_groups` VALUES ('3', 'Large');
 DROP TABLE IF EXISTS `0_recurrent_invoices`;
 
 CREATE TABLE `0_recurrent_invoices` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` smallint(6) UNSIGNED NOT NULL auto_increment,
   `description` varchar(60) NOT NULL default '',
-  `order_no` int(11) NOT NULL default '0',
-  `debtor_no` int(11) NOT NULL default '0',
-  `group_no` int(11) NOT NULL default '0',
+  `order_no` int(11) UNSIGNED NOT NULL,
+  `debtor_no` int(11) UNSIGNED NULL default NULL,
+  `group_no` smallint(6) UNSIGNED NULL default NULL,
   `days` int(11) NOT NULL default '0',
   `monthly` int(11) NOT NULL default '0',
   `begin` date NOT NULL default '0000-00-00',
@@ -68,6 +68,13 @@ ALTER TABLE `0_debtor_trans` ADD `dimension2_id` int(11) NOT NULL default '0';
 ALTER TABLE `0_bank_accounts` DROP COLUMN `id`;
 ALTER TABLE `0_bank_accounts` DROP PRIMARY KEY;
 ALTER TABLE `0_bank_accounts` ADD `id` SMALLINT(6) AUTO_INCREMENT PRIMARY KEY;
+ALTER TABLE `0_bank_accounts` DROP COLUMN `last_reconciled_date`;
+ALTER TABLE `0_bank_accounts` ADD `last_reconciled_date` timestamp NOT NULL default '0000-00-00';
+ALTER TABLE `0_bank_accounts` DROP COLUMN `ending_reconcile_balance`;
+ALTER TABLE `0_bank_accounts` ADD `ending_reconcile_balance` double NOT NULL default '0';
+
+ALTER TABLE `0_bank_trans` DROP COLUMN `reconciled`;
+ALTER TABLE `0_bank_trans` ADD `reconciled` tinyint(1) NOT NULL default '0';
 
 ALTER TABLE `0_users` DROP COLUMN `query_size`;
 ALTER TABLE `0_users` ADD `query_size` TINYINT(1) DEFAULT '10';
@@ -78,12 +85,12 @@ ALTER TABLE `0_users` ADD `graphic_links` TINYINT(1) DEFAULT '1';
 DROP TABLE IF EXISTS `0_sales_pos`;
 
 CREATE TABLE `0_sales_pos` (
-  `id` smallint(6) NOT NULL auto_increment,
+  `id` smallint(6) UNSIGNED NOT NULL auto_increment,
   `pos_name` varchar(30) NOT NULL,
   `cash_sale` tinyint(1) NOT NULL,
   `credit_sale` tinyint(1) NOT NULL,
   `pos_location` varchar(5) NOT NULL,
-  `pos_account` varchar(11) NOT NULL,
+  `pos_account` smallint(6) UNSIGNED NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY(`pos_name`)
 ) TYPE=MyISAM AUTO_INCREMENT=1;
@@ -96,7 +103,7 @@ ALTER TABLE `0_users` ADD `pos` SMALLINT(6) DEFAULT '1';
 DROP TABLE IF EXISTS `0_quick_entries`;
 
 CREATE TABLE `0_quick_entries` (
-  `id` smallint(6) NOT NULL auto_increment,
+  `id` smallint(6) UNSIGNED NOT NULL auto_increment,
   `description` varchar(60) NOT NULL,
   `deposit` tinyint(1) NOT NULL default '0',
   `bank_only` tinyint(1) NOT NULL default '0',
@@ -111,14 +118,14 @@ INSERT INTO `0_quick_entries` VALUES ('3', 'Cash Sales', '1', '1');
 DROP TABLE IF EXISTS `0_quick_entry_lines`;
 
 CREATE TABLE `0_quick_entry_lines` (
-  `id` smallint(6) NOT NULL auto_increment,
-  `qid` smallint(6) NOT NULL,
+  `id` smallint(6) UNSIGNED NOT NULL auto_increment,
+  `qid` smallint(6) UNSIGNED NOT NULL,
   `account` varchar(11) NOT NULL,
   `tax_acc` tinyint(1) NOT NULL default '0',
   `pct` tinyint(1) NOT NULL default '0',
   `amount` double default NULL default '0',
-  `dimension_id` int(11) NOT NULL default '0',
-  `dimension2_id` int(11) NOT NULL default '0',
+  `dimension_id` smallint(6) UNSIGNED NULL default NULL,
+  `dimension2_id` smallint(6) UNSIGNED NULL default NULL,
   PRIMARY KEY  (`id`),
   KEY `qid` (`qid`)
 ) TYPE=MyISAM AUTO_INCREMENT=1;
@@ -128,16 +135,16 @@ INSERT INTO `0_quick_entry_lines` VALUES ('2', '2', '6730', '1', '0', 0, '0', '0
 INSERT INTO `0_quick_entry_lines` VALUES ('3', '3', '3000', '1', '0', 0, '0', '0');
 
 ALTER TABLE `0_users` DROP COLUMN `print_profile`;
-ALTER TABLE `0_users` ADD `print_profile` VARCHAR(30) DEFAULT '' AFTER `show_hints` ;
+ALTER TABLE `0_users` ADD `print_profile` VARCHAR(30) NOT NULL DEFAULT '1';
 ALTER TABLE `0_users` DROP COLUMN `rep_popup`;
-ALTER TABLE `0_users` ADD `rep_popup` TINYINT(1) DEFAULT '1' AFTER `print_profile` ;
+ALTER TABLE `0_users` ADD `rep_popup` TINYINT(1) DEFAULT '1';
 
 DROP TABLE IF EXISTS `0_print_profiles`;
 CREATE TABLE `0_print_profiles` (
-  `id` tinyint(11) NOT NULL auto_increment,
+  `id` smallint(6) UNSIGNED NOT NULL auto_increment,
   `profile` varchar(30) NOT NULL,
-  `report` varchar(5) NOT NULL,
-  `printer` tinyint(5) NOT NULL,
+  `report` varchar(5) NULL default NULL,
+  `printer` tinyint(3) UNSIGNED NULL default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `profile` (`profile`,`report`)
 ) TYPE=MyISAM AUTO_INCREMENT=10;
@@ -155,7 +162,7 @@ INSERT INTO `0_print_profiles` VALUES ('9', 'Sales Department', '201', '2');
 DROP TABLE IF EXISTS `0_printers`;
 
 CREATE TABLE `0_printers` (
-  `id` smallint(6) NOT NULL auto_increment,
+  `id` tinyint(3) UNSIGNED NOT NULL auto_increment,
   `name` varchar(20) NOT NULL,
   `description` varchar(60) NOT NULL,
   `queue` varchar(20) NOT NULL,
@@ -173,11 +180,11 @@ INSERT INTO `0_printers` VALUES ('3', 'Local', 'Local print server at user IP',
 DROP TABLE IF EXISTS `0_item_codes`;
 
 CREATE TABLE `0_item_codes` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) UNSIGNED NOT NULL auto_increment,
   `item_code` varchar(20) NOT NULL,
   `stock_id` varchar(20) NOT NULL,
   `description` varchar(200) NOT NULL default '',
-  `category_id` int(11) NOT NULL,
+  `category_id` smallint(6) UNSIGNED NOT NULL,
   `quantity` double NOT NULL default '1',
   `is_foreign` tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (`id`),
@@ -187,6 +194,12 @@ CREATE TABLE `0_item_codes` (
 ALTER TABLE `0_company` DROP COLUMN `foreign_codes`;
 ALTER TABLE `0_company` ADD `foreign_codes` TINYINT(1) NOT NULL DEFAULT '0';
 
+ALTER TABLE `0_company` DROP COLUMN `accumulate_shipping`;
+ALTER TABLE `0_company` ADD `accumulate_shipping` TINYINT(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_company` DROP COLUMN `legal_text`;
+ALTER TABLE `0_company` ADD `legal_text` tinytext NOT NULL DEFAULT '';
+
 ALTER TABLE `0_suppliers` DROP COLUMN `supp_address`;
 ALTER TABLE `0_suppliers` ADD `supp_address` tinytext NOT NULL DEFAULT '' AFTER `address`;
 
@@ -205,12 +218,21 @@ ALTER TABLE `0_suppliers` ADD `contact` varchar(60) NOT NULL DEFAULT '' AFTER `g
 ALTER TABLE `0_suppliers` DROP COLUMN `credit_limit`;
 ALTER TABLE `0_suppliers` ADD `credit_limit` double NOT NULL DEFAULT '0' AFTER `tax_group_id`;
 
+ALTER TABLE `0_suppliers` DROP COLUMN `supp_account_no`;
+ALTER TABLE `0_suppliers` ADD `supp_account_no` varchar(40) NOT NULL DEFAULT '' AFTER `contact`;
+
+ALTER TABLE `0_suppliers` DROP COLUMN `website`;
+ALTER TABLE `0_suppliers` ADD `website` varchar(100) NOT NULL DEFAULT '' AFTER `email`;
+
+ALTER TABLE `0_suppliers` DROP COLUMN `notes`;
+ALTER TABLE `0_suppliers` ADD `notes` tinytext NOT NULL DEFAULT '';
+
 ALTER TABLE `0_chart_types` DROP INDEX `name`, ADD INDEX `name` ( `name` );
 
 DROP TABLE IF EXISTS `0_sql_trail`; 
 
 CREATE TABLE IF NOT EXISTS `0_sql_trail` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) UNSIGNED NOT NULL auto_increment,
   `sql` text NOT NULL, 
   `result` tinyint(1) NOT NULL, 
   `msg` varchar(255) NOT NULL,