X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Fen_US-new.sql;h=69d6b9971f755e205b1689f217b34c51d583548f;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=a866a6f7e7b4587df8f57d3d2eeb70b91b3e1f95;hpb=0e3e25a3524827d3e016f86efc300560d5dcbbb4;p=fa-stable.git diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index a866a6f7..69d6b997 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -102,6 +102,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_accounts` ( `bank_curr_code` char(3) NOT NULL default '', `dflt_curr_act` tinyint(1) NOT NULL default '0', `id` smallint(6) NOT NULL auto_increment, + `bank_charge_act` varchar(15) NOT NULL default '', `last_reconciled_date` timestamp NOT NULL default '0000-00-00 00:00:00', `ending_reconcile_balance` double NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', @@ -115,8 +116,8 @@ CREATE TABLE IF NOT EXISTS `0_bank_accounts` ( -- Dumping data for table `0_bank_accounts` -- -INSERT INTO `0_bank_accounts` VALUES('1060', 0, 'Current account', 'N/A', 'N/A', '', 'USD', 1, 1, '0000-00-00 00:00:00', 0, 0); -INSERT INTO `0_bank_accounts` VALUES('1065', 3, 'Petty Cash account', 'N/A', 'N/A', '', 'USD', 0, 2, '0000-00-00 00:00:00', 0, 0); +INSERT INTO `0_bank_accounts` VALUES('1060', 0, 'Current account', 'N/A', 'N/A', '', 'USD', 1, 1, '5690', '0000-00-00 00:00:00', 0, 0); +INSERT INTO `0_bank_accounts` VALUES('1065', 3, 'Petty Cash account', 'N/A', 'N/A', '', 'USD', 0, 2, '5690', '0000-00-00 00:00:00', 0, 0); -- -------------------------------------------------------- @@ -576,6 +577,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` ( `br_post_address` tinytext NOT NULL, `group_no` int(11) NOT NULL default '0', `notes` tinytext NOT NULL, + `bank_account` varchar(60) DEFAULT NULL, `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`branch_code`,`debtor_no`), KEY `branch_code` (`branch_code`), @@ -651,6 +653,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` ( `dimension_id` int(11) NOT NULL default '0', `dimension2_id` int(11) NOT NULL default '0', `payment_terms` int(11) default NULL, + `tax_included` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`type`,`trans_no`), KEY `debtor_no` (`debtor_no`,`branch_code`), KEY `tran_date` (`tran_date`) @@ -1196,7 +1199,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_order_details` ( `quantity_ordered` double NOT NULL default '0', `quantity_received` double NOT NULL default '0', PRIMARY KEY (`po_detail_item`), - KEY `order` (`order_no`,`po_detail_item`) + KEY `order` (`order_no`,`po_detail_item`), + KEY `itemcode` (`item_code`) ) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- @@ -1389,7 +1393,8 @@ CREATE TABLE IF NOT EXISTS `0_sales_order_details` ( `quantity` double NOT NULL default '0', `discount_percent` double NOT NULL default '0', PRIMARY KEY (`id`), - KEY `sorder` (`trans_type`,`order_no`) + KEY `sorder` (`trans_type`,`order_no`), + KEY `stkcode` (`stk_code`) ) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- @@ -1649,6 +1654,7 @@ CREATE TABLE IF NOT EXISTS `0_suppliers` ( `curr_code` char(3) default NULL, `payment_terms` int(11) default NULL, `tax_included` tinyint(1) NOT NULL default '0', + `tax_algorithm` tinyint(1) NOT NULL default '1', `dimension_id` int(11) default '0', `dimension2_id` int(11) default '0', `tax_group_id` int(11) default NULL, @@ -1742,6 +1748,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_trans` ( `rate` double NOT NULL default '1', `alloc` double NOT NULL default '0', `tax_included` tinyint(1) NOT NULL default '0', + `tax_algorihm` tinyint(1) NOT NULL default '1', PRIMARY KEY (`type`,`trans_no`), KEY `supplier_id` (`supplier_id`), KEY `SupplierID_2` (`supplier_id`,`supp_reference`), @@ -1766,7 +1773,7 @@ CREATE TABLE IF NOT EXISTS `0_sys_prefs` ( `category` varchar(30) default NULL, `type` varchar(20) NOT NULL default '', `length` smallint(6) default NULL, - `value` tinytext, + `value` text, PRIMARY KEY (`name`), KEY `category` (`category`) ) ENGINE=MyISAM; @@ -1788,7 +1795,7 @@ INSERT INTO `0_sys_prefs` VALUES('coy_logo', 'setup.company', 'varchar', 100, '' INSERT INTO `0_sys_prefs` VALUES('domicile', 'setup.company', 'varchar', 55, ''); INSERT INTO `0_sys_prefs` VALUES('curr_default', 'setup.company', 'char', 3, 'USD'); INSERT INTO `0_sys_prefs` VALUES('use_dimension', 'setup.company', 'tinyint', 1, '1'); -INSERT INTO `0_sys_prefs` VALUES('f_year', 'setup.company', 'int', 11, '4'); +INSERT INTO `0_sys_prefs` VALUES('f_year', 'setup.company', 'int', 11, '3'); INSERT INTO `0_sys_prefs` VALUES('no_item_list', 'setup.company', 'tinyint', 1, '0'); INSERT INTO `0_sys_prefs` VALUES('no_customer_list', 'setup.company', 'tinyint', 1, '0'); INSERT INTO `0_sys_prefs` VALUES('no_supplier_list', 'setup.company', 'tinyint', 1, '0'); @@ -1802,6 +1809,7 @@ INSERT INTO `0_sys_prefs` VALUES('profit_loss_year_act', 'glsetup.general', 'var INSERT INTO `0_sys_prefs` VALUES('retained_earnings_act', 'glsetup.general', 'varchar', 15, '3590'); INSERT INTO `0_sys_prefs` VALUES('bank_charge_act', 'glsetup.general', 'varchar', 15, '5690'); INSERT INTO `0_sys_prefs` VALUES('exchange_diff_act', 'glsetup.general', 'varchar', 15, '4450'); +INSERT INTO `0_sys_prefs` VALUES('tax_algorithm', 'glsetup.general', 'tinyint', 1, '1'); INSERT INTO `0_sys_prefs` VALUES('default_credit_limit', 'glsetup.customer', 'int', 11, '1000'); INSERT INTO `0_sys_prefs` VALUES('accumulate_shipping', 'glsetup.customer', 'tinyint', 1, '0'); INSERT INTO `0_sys_prefs` VALUES('legal_text', 'glsetup.customer', 'tinytext', 0, ''); @@ -1811,6 +1819,7 @@ INSERT INTO `0_sys_prefs` VALUES('default_sales_act', 'glsetup.sales', 'varchar' INSERT INTO `0_sys_prefs` VALUES('default_sales_discount_act', 'glsetup.sales', 'varchar', 15, '4510'); INSERT INTO `0_sys_prefs` VALUES('default_prompt_payment_act', 'glsetup.sales', 'varchar', 15, '4500'); INSERT INTO `0_sys_prefs` VALUES('default_delivery_required', 'glsetup.sales', 'smallint', 6, '1'); +INSERT INTO `0_sys_prefs` VALUES('default_receival_required', 'glsetup.purchase', 'smallint', 6, '10'); INSERT INTO `0_sys_prefs` VALUES('default_dim_required', 'glsetup.dims', 'int', 11, '20'); INSERT INTO `0_sys_prefs` VALUES('pyt_discount_act', 'glsetup.purchase', 'varchar', 15, '5060'); INSERT INTO `0_sys_prefs` VALUES('creditors_act', 'glsetup.purchase', 'varchar', 15, '2100'); @@ -1918,7 +1927,6 @@ DROP TABLE IF EXISTS `0_tax_groups`; CREATE TABLE IF NOT EXISTS `0_tax_groups` ( `id` int(11) NOT NULL auto_increment, `name` varchar(60) NOT NULL default '', - `tax_shipping` tinyint(1) NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) @@ -1928,8 +1936,8 @@ CREATE TABLE IF NOT EXISTS `0_tax_groups` ( -- Dumping data for table `0_tax_groups` -- -INSERT INTO `0_tax_groups` VALUES(1, 'Tax', 0, 0); -INSERT INTO `0_tax_groups` VALUES(2, 'Tax Exempt', 0, 0); +INSERT INTO `0_tax_groups` VALUES(1, 'Tax', 0); +INSERT INTO `0_tax_groups` VALUES(2, 'Tax Exempt', 0); -- -------------------------------------------------------- @@ -1941,7 +1949,7 @@ DROP TABLE IF EXISTS `0_tax_group_items`; CREATE TABLE IF NOT EXISTS `0_tax_group_items` ( `tax_group_id` int(11) NOT NULL default '0', `tax_type_id` int(11) NOT NULL default '0', - `rate` double NOT NULL default '0', + `tax_shipping` tinyint(1) NOT NULL default '0', PRIMARY KEY (`tax_group_id`,`tax_type_id`) ) ENGINE=InnoDB; @@ -1949,7 +1957,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_group_items` ( -- Dumping data for table `0_tax_group_items` -- -INSERT INTO `0_tax_group_items` VALUES(1, 1, 5); +INSERT INTO `0_tax_group_items` VALUES(1, 1, 5, 1); -- -------------------------------------------------------- @@ -2062,6 +2070,7 @@ CREATE TABLE IF NOT EXISTS `0_users` ( `rep_popup` tinyint(1) default '1', `sticky_doc_date` tinyint(1) default '0', `startup_tab` varchar(20) NOT NULL default '', + `transaction_days` smallint(6) NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `user_id` (`user_id`)