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

diff --git a/sql/alter2.1.sql b/sql/alter2.1.sql
index 7201d1c4..c162462b 100644
--- a/sql/alter2.1.sql
+++ b/sql/alter2.1.sql
@@ -32,13 +32,14 @@ DROP TABLE IF EXISTS `0_groups`;
 CREATE TABLE `0_groups` (
   `id` smallint(6) UNSIGNED NOT NULL auto_increment,
   `description` varchar(60) NOT NULL default '',
+  `inactive` tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)
 ) TYPE=MyISAM AUTO_INCREMENT=1 ;
 
-INSERT INTO `0_groups` VALUES ('1', 'Small');
-INSERT INTO `0_groups` VALUES ('2', 'Medium');
-INSERT INTO `0_groups` VALUES ('3', 'Large');
+INSERT INTO `0_groups` VALUES ('1', 'Small', '0');
+INSERT INTO `0_groups` VALUES ('2', 'Medium', '0');
+INSERT INTO `0_groups` VALUES ('3', 'Large', '0');
 
 DROP TABLE IF EXISTS `0_recurrent_invoices`;
 
@@ -57,29 +58,21 @@ CREATE TABLE `0_recurrent_invoices` (
   UNIQUE KEY `description` (`description`)
 ) TYPE=InnoDB AUTO_INCREMENT=1 ;
 
-ALTER TABLE `0_cust_branch` DROP COLUMN `group_no`;
 ALTER TABLE `0_cust_branch` ADD `group_no` int(11) NOT NULL default '0';
 
-ALTER TABLE `0_debtor_trans` DROP COLUMN `dimension_id`;
 ALTER TABLE `0_debtor_trans` ADD `dimension_id` int(11) NOT NULL default '0';
-ALTER TABLE `0_debtor_trans` DROP COLUMN `dimension2_id`;
 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_bank_trans` DROP COLUMN `bank_trans_type_id`;
+ALTER TABLE `0_bank_trans` ADD `reconciled` date default NULL;
 
-ALTER TABLE `0_users` DROP COLUMN `query_size`;
 ALTER TABLE `0_users` ADD `query_size` TINYINT(1) DEFAULT '10';
 
-ALTER TABLE `0_users` DROP COLUMN `graphic_links`;
 ALTER TABLE `0_users` ADD `graphic_links` TINYINT(1) DEFAULT '1';
 
 DROP TABLE IF EXISTS `0_sales_pos`;
@@ -91,52 +84,51 @@ CREATE TABLE `0_sales_pos` (
   `credit_sale` tinyint(1) NOT NULL,
   `pos_location` varchar(5) NOT NULL,
   `pos_account` smallint(6) UNSIGNED NOT NULL,
+  `inactive` tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (`id`),
   UNIQUE KEY(`pos_name`)
 ) TYPE=MyISAM AUTO_INCREMENT=1;
 
-INSERT INTO `0_sales_pos` VALUES ('1', 'Default', '1', '1', 'DEF', '1');
+# After upgrade default POS cash sale is off. Change in POS setup if you wish.
+INSERT INTO `0_sales_pos` VALUES ('1', 'Default', '0', '1', 'DEF', '1', '0');
 
-ALTER TABLE `0_users` DROP COLUMN `pos`;
 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) UNSIGNED NOT NULL auto_increment,
+  `type` tinyint(1) NOT NULL default '0',
   `description` varchar(60) NOT NULL,
-  `deposit` tinyint(1) NOT NULL default '0',
-  `bank_only` tinyint(1) NOT NULL default '0',
+  `base_amount` double NOT NULL default '0',
+  `base_desc` varchar(60) NULL,
   PRIMARY KEY  (`id`),
   KEY `description` (`description`)
 ) TYPE=MyISAM AUTO_INCREMENT=1;
 
-INSERT INTO `0_quick_entries` VALUES ('1', 'Maintenance', '0', '1');
-INSERT INTO `0_quick_entries` VALUES ('2', 'Phone', '0', '1');
-INSERT INTO `0_quick_entries` VALUES ('3', 'Cash Sales', '1', '1');
+INSERT INTO `0_quick_entries` VALUES ('1', '1', 'Maintenance', '0', 'Amount');
+INSERT INTO `0_quick_entries` VALUES ('2', '1', 'Phone', '0', 'Amount');
+INSERT INTO `0_quick_entries` VALUES ('3', '2', 'Cash Sales', '0', 'Amount');
 
 DROP TABLE IF EXISTS `0_quick_entry_lines`;
 
 CREATE TABLE `0_quick_entry_lines` (
   `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',
+  `action` varchar(2) NOT NULL,
+  `dest_id` varchar(11) NOT NULL,
   `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;
 
-INSERT INTO `0_quick_entry_lines` VALUES ('1', '1', '6600', '1', '0', 0, '0', '0');
-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');
+INSERT INTO `0_quick_entry_lines` VALUES ('1', '1','0','=', '6600', '0', '0');
+INSERT INTO `0_quick_entry_lines` VALUES ('2', '2','0','=', '6730', '0', '0');
+INSERT INTO `0_quick_entry_lines` VALUES ('3', '3','0','=', '3000', '0', '0');
 
-ALTER TABLE `0_users` DROP COLUMN `print_profile`;
 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';
 
 DROP TABLE IF EXISTS `0_print_profiles`;
@@ -187,44 +179,33 @@ CREATE TABLE `0_item_codes` (
   `category_id` smallint(6) UNSIGNED NOT NULL,
   `quantity` double NOT NULL default '1',
   `is_foreign` tinyint(1) NOT NULL default 0,
+  `inactive` tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (`id`),
   UNIQUE KEY(`stock_id`, `item_code`)
 ) TYPE=MyISAM AUTO_INCREMENT=1;
 
-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`;
 
-ALTER TABLE `0_suppliers` DROP COLUMN `phone`;
 ALTER TABLE `0_suppliers` ADD `phone` varchar(30) NOT NULL DEFAULT '' AFTER `supp_address`;
 
-ALTER TABLE `0_suppliers` DROP COLUMN `fax`;
 ALTER TABLE `0_suppliers` ADD `fax` varchar(30) NOT NULL DEFAULT '' AFTER `phone`;
 
-ALTER TABLE `0_suppliers` DROP COLUMN `gst_no`;
 ALTER TABLE `0_suppliers` ADD `gst_no` varchar(25) NOT NULL DEFAULT '' AFTER `fax`;
 
-ALTER TABLE `0_suppliers` DROP COLUMN `contact`;
 ALTER TABLE `0_suppliers` ADD `contact` varchar(60) NOT NULL DEFAULT '' AFTER `gst_no`;
 
-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` );
@@ -239,3 +220,56 @@ CREATE TABLE IF NOT EXISTS `0_sql_trail` (
   PRIMARY KEY (`id`)
 ) TYPE = MyISAM;
 
+ALTER TABLE `0_tax_types` DROP COLUMN `out`;
+
+ALTER TABLE `0_chart_master` DROP COLUMN `tax_code`;
+
+ALTER TABLE `0_chart_master` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_currencies` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_bank_accounts` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_debtors_master` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_stock_master` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_workcentres` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_locations` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_sales_types` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_areas` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_salesman` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_shippers` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_credit_status` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_payment_terms` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_suppliers` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_stock_category` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `0_item_units` ADD `inactive` tinyint(1) NOT NULL DEFAULT '0';
+
+DROP TABLE IF EXISTS `0_trans_tax_details`;
+
+CREATE TABLE `0_trans_tax_details` (
+  `id` int(11) NOT NULL auto_increment,
+  `trans_type` smallint(6) default NULL,
+  `trans_no` int(11) default NULL,
+  `tran_date` date NOT NULL,
+  `tax_type_id` int(11) NOT NULL default '0',
+  `rate` double NOT NULL default '0',
+  `ex_rate` double NOT NULL default '1',
+  `included_in_price` tinyint(1) NOT NULL default '0',
+  `net_amount` double NOT NULL default '0',
+  `amount` double NOT NULL default '0',
+  `memo` tinytext default NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB AUTO_INCREMENT=1 ;
+