X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Fen_US-new.sql;h=09fe3108c6d170333a64605a80fc550fa1867a75;hb=90b3d069d96b99671af51726e2953352738abb75;hp=9f9a4f01675d1b790c9ee3b7922cf03a7827f320;hpb=a53239ed3af61d9e7e0c4728124942859686f770;p=fa-stable.git diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 9f9a4f01..09fe3108 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `0_areas` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`area_code`), UNIQUE KEY `description` (`description`) -) TYPE=MyISAM AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_areas` @@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `0_attachments` ( `filetype` varchar(60) NOT NULL default '', PRIMARY KEY (`id`), KEY `type_no` (`type_no`,`trans_no`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_attachments` @@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS `0_audit_trail` ( PRIMARY KEY (`id`), KEY `Seq` (`fiscal_year`,`gl_date`,`gl_seq`), KEY `Type_and_Number` (`type`,`trans_no`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_audit_trail` @@ -109,7 +109,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_accounts` ( KEY `bank_account_name` (`bank_account_name`), KEY `bank_account_number` (`bank_account_number`), KEY `account_code` (`account_code`) -) TYPE=MyISAM AUTO_INCREMENT=3 ; +) ENGINE=MyISAM AUTO_INCREMENT=3 ; -- -- Dumping data for table `0_bank_accounts` @@ -143,7 +143,7 @@ CREATE TABLE IF NOT EXISTS `0_bank_trans` ( KEY `type` (`type`,`trans_no`), KEY `bank_act_2` (`bank_act`,`reconciled`), KEY `bank_act_3` (`bank_act`,`trans_date`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_bank_trans` @@ -170,7 +170,7 @@ CREATE TABLE IF NOT EXISTS `0_bom` ( KEY `loc_code` (`loc_code`), KEY `parent` (`parent`,`loc_code`), KEY `workcentre_added` (`workcentre_added`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_bom` @@ -199,7 +199,7 @@ CREATE TABLE IF NOT EXISTS `0_budget_trans` ( PRIMARY KEY (`counter`), KEY `Type_and_Number` (`type`,`type_no`), KEY `Account` (`account`,`tran_date`,`dimension_id`,`dimension2_id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_budget_trans` @@ -219,7 +219,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_class` ( `ctype` tinyint(1) NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`cid`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_chart_class` @@ -246,7 +246,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_master` ( PRIMARY KEY (`account_code`), KEY `account_name` (`account_name`), KEY `accounts_by_type` (`account_type`,`account_code`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_chart_master` @@ -347,7 +347,7 @@ CREATE TABLE IF NOT EXISTS `0_chart_types` ( PRIMARY KEY (`id`), KEY `name` (`name`), KEY `class_id` (`class_id`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; -- -- Dumping data for table `0_chart_types` @@ -379,7 +379,7 @@ CREATE TABLE IF NOT EXISTS `0_comments` ( `date_` date default '0000-00-00', `memo_` tinytext, KEY `type_and_id` (`type`,`id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_comments` @@ -400,7 +400,7 @@ CREATE TABLE IF NOT EXISTS `0_credit_status` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `reason_description` (`reason_description`) -) TYPE=MyISAM AUTO_INCREMENT=5 ; +) ENGINE=MyISAM AUTO_INCREMENT=5 ; -- -- Dumping data for table `0_credit_status` @@ -428,7 +428,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_categories` ( PRIMARY KEY (`id`), UNIQUE KEY `type` (`type`,`action`), UNIQUE KEY `type_2` (`type`,`name`) -) TYPE=InnoDB AUTO_INCREMENT=13 ; +) ENGINE=InnoDB AUTO_INCREMENT=13 ; -- -- Dumping data for table `0_crm_categories` @@ -462,7 +462,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_contacts` ( `entity_id` varchar(11) default NULL COMMENT 'entity id in related class table', PRIMARY KEY (`id`), KEY `type` (`type`,`action`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_crm_contacts` @@ -490,7 +490,7 @@ CREATE TABLE IF NOT EXISTS `0_crm_persons` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), KEY `ref` (`ref`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_crm_persons` @@ -513,7 +513,7 @@ CREATE TABLE IF NOT EXISTS `0_currencies` ( `auto_update` tinyint(1) NOT NULL default '1', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`curr_abrev`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_currencies` @@ -542,7 +542,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` ( PRIMARY KEY (`id`), KEY `From` (`trans_type_from`,`trans_no_from`), KEY `To` (`trans_type_to`,`trans_no_to`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_cust_allocations` @@ -576,12 +576,13 @@ 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`), KEY `branch_ref` (`branch_ref`), KEY `group_no` (`group_no`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_cust_branch` @@ -613,9 +614,9 @@ 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`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; + KEY `name` (`name`), + UNIQUE KEY `debtor_ref` (`debtor_ref`) +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_debtors_master` @@ -651,10 +652,11 @@ 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`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_debtor_trans` @@ -682,8 +684,9 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans_details` ( `qty_done` double NOT NULL default '0', `src_id` int(11) NOT NULL, PRIMARY KEY (`id`), - KEY `Transaction` (`debtor_trans_type`,`debtor_trans_no`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; + KEY `Transaction` (`debtor_trans_type`,`debtor_trans_no`), + KEY (`src_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_debtor_trans_details` @@ -710,7 +713,7 @@ CREATE TABLE IF NOT EXISTS `0_dimensions` ( KEY `date_` (`date_`), KEY `due_date` (`due_date`), KEY `type_` (`type_`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_dimensions` @@ -732,7 +735,7 @@ CREATE TABLE IF NOT EXISTS `0_exchange_rates` ( `date_` date NOT NULL default '0000-00-00', PRIMARY KEY (`id`), UNIQUE KEY `curr_code` (`curr_code`,`date_`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_exchange_rates` @@ -754,7 +757,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` ( PRIMARY KEY (`id`), UNIQUE KEY `begin` (`begin`), UNIQUE KEY `end` (`end`) -) TYPE=InnoDB AUTO_INCREMENT=4 ; +) ENGINE=InnoDB AUTO_INCREMENT=4 ; -- -- Dumping data for table `0_fiscal_year` @@ -763,6 +766,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); +INSERT INTO `0_fiscal_year` VALUES(4, '2011-01-01', '2011-12-31', 0); -- -- Table structure for table `0_gl_trans` @@ -787,7 +791,7 @@ CREATE TABLE IF NOT EXISTS `0_gl_trans` ( KEY `dimension2_id` (`dimension2_id`), KEY `tran_date` (`tran_date`), KEY `account_and_tran_date` (`account`,`tran_date`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_gl_trans` @@ -811,7 +815,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_batch` ( PRIMARY KEY (`id`), KEY `delivery_date` (`delivery_date`), KEY `purch_order_no` (`purch_order_no`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_grn_batch` @@ -835,7 +839,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_items` ( `quantity_inv` double NOT NULL default '0', PRIMARY KEY (`id`), KEY `grn_batch_id` (`grn_batch_id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_grn_items` @@ -855,7 +859,7 @@ CREATE TABLE IF NOT EXISTS `0_groups` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `description` (`description`) -) TYPE=MyISAM AUTO_INCREMENT=4 ; +) ENGINE=MyISAM AUTO_INCREMENT=4 ; -- -- Dumping data for table `0_groups` @@ -884,7 +888,7 @@ CREATE TABLE IF NOT EXISTS `0_item_codes` ( PRIMARY KEY (`id`), UNIQUE KEY `stock_id` (`stock_id`,`item_code`), KEY `item_code` (`item_code`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_item_codes` @@ -905,7 +909,7 @@ CREATE TABLE IF NOT EXISTS `0_item_tax_types` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) TYPE=InnoDB AUTO_INCREMENT=2 ; +) ENGINE=InnoDB AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_item_tax_types` @@ -924,7 +928,7 @@ CREATE TABLE IF NOT EXISTS `0_item_tax_type_exemptions` ( `item_tax_type_id` int(11) NOT NULL default '0', `tax_type_id` int(11) NOT NULL default '0', PRIMARY KEY (`item_tax_type_id`,`tax_type_id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_item_tax_type_exemptions` @@ -945,7 +949,7 @@ CREATE TABLE IF NOT EXISTS `0_item_units` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`abbr`), UNIQUE KEY `name` (`name`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_item_units` @@ -971,7 +975,7 @@ CREATE TABLE IF NOT EXISTS `0_locations` ( `contact` varchar(30) NOT NULL default '', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`loc_code`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_locations` @@ -992,7 +996,7 @@ CREATE TABLE IF NOT EXISTS `0_loc_stock` ( `reorder_level` bigint(20) NOT NULL default '0', PRIMARY KEY (`loc_code`,`stock_id`), KEY `stock_id` (`stock_id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_loc_stock` @@ -1012,7 +1016,7 @@ CREATE TABLE IF NOT EXISTS `0_movement_types` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) TYPE=MyISAM AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_movement_types` @@ -1035,7 +1039,7 @@ CREATE TABLE IF NOT EXISTS `0_payment_terms` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`terms_indicator`), UNIQUE KEY `terms` (`terms`) -) TYPE=MyISAM AUTO_INCREMENT=5 ; +) ENGINE=MyISAM AUTO_INCREMENT=5 ; -- -- Dumping data for table `0_payment_terms` @@ -1044,7 +1048,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); -- -------------------------------------------------------- @@ -1061,7 +1065,7 @@ CREATE TABLE IF NOT EXISTS `0_prices` ( `price` double NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `price` (`stock_id`,`sales_type_id`,`curr_abrev`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_prices` @@ -1085,7 +1089,7 @@ CREATE TABLE IF NOT EXISTS `0_printers` ( `timeout` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) TYPE=MyISAM AUTO_INCREMENT=4 ; +) ENGINE=MyISAM AUTO_INCREMENT=4 ; -- -- Dumping data for table `0_printers` @@ -1109,7 +1113,7 @@ CREATE TABLE IF NOT EXISTS `0_print_profiles` ( `printer` tinyint(3) unsigned default NULL, PRIMARY KEY (`id`), UNIQUE KEY `profile` (`profile`,`report`) -) TYPE=MyISAM AUTO_INCREMENT=10 ; +) ENGINE=MyISAM AUTO_INCREMENT=10 ; -- -- Dumping data for table `0_print_profiles` @@ -1140,7 +1144,7 @@ CREATE TABLE IF NOT EXISTS `0_purch_data` ( `conversion_factor` double NOT NULL default '1', `supplier_description` char(50) NOT NULL default '', PRIMARY KEY (`supplier_id`,`stock_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_purch_data` @@ -1164,9 +1168,10 @@ 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 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_purch_orders` @@ -1193,8 +1198,9 @@ 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`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; + KEY `order` (`order_no`,`po_detail_item`), + KEY `itemcode` (`item_code`) +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_purch_order_details` @@ -1217,7 +1223,7 @@ CREATE TABLE IF NOT EXISTS `0_quick_entries` ( `bal_type` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), KEY `description` (`description`) -) TYPE=MyISAM AUTO_INCREMENT=4 ; +) ENGINE=MyISAM AUTO_INCREMENT=4 ; -- -- Dumping data for table `0_quick_entries` @@ -1244,7 +1250,7 @@ CREATE TABLE IF NOT EXISTS `0_quick_entry_lines` ( `dimension2_id` smallint(6) unsigned default NULL, PRIMARY KEY (`id`), KEY `qid` (`qid`) -) TYPE=MyISAM AUTO_INCREMENT=7 ; +) ENGINE=MyISAM AUTO_INCREMENT=7 ; -- -- Dumping data for table `0_quick_entry_lines` @@ -1277,7 +1283,7 @@ CREATE TABLE IF NOT EXISTS `0_recurrent_invoices` ( `last_sent` date NOT NULL default '0000-00-00', PRIMARY KEY (`id`), UNIQUE KEY `description` (`description`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_recurrent_invoices` @@ -1297,7 +1303,7 @@ CREATE TABLE IF NOT EXISTS `0_refs` ( `reference` varchar(100) NOT NULL default '', PRIMARY KEY (`id`,`type`), KEY `Type_and_Reference` (`type`,`reference`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_refs` @@ -1323,7 +1329,7 @@ CREATE TABLE IF NOT EXISTS `0_salesman` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`salesman_code`), UNIQUE KEY `salesman_name` (`salesman_name`) -) TYPE=MyISAM AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_salesman` @@ -1361,7 +1367,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` ( `payment_terms` int(11) default NULL, `total` double NOT NULL default '0', PRIMARY KEY (`trans_type`,`order_no`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_sales_orders` @@ -1386,8 +1392,9 @@ 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`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; + KEY `sorder` (`trans_type`,`order_no`), + KEY `stkcode` (`stk_code`) +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_sales_order_details` @@ -1411,7 +1418,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_pos` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `pos_name` (`pos_name`) -) TYPE=MyISAM AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_sales_pos` @@ -1434,7 +1441,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_types` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `sales_type` (`sales_type`) -) TYPE=MyISAM AUTO_INCREMENT=3 ; +) ENGINE=MyISAM AUTO_INCREMENT=3 ; -- -- Dumping data for table `0_sales_types` @@ -1459,7 +1466,7 @@ CREATE TABLE IF NOT EXISTS `0_security_roles` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `role` (`role`) -) TYPE=MyISAM AUTO_INCREMENT=11 ; +) ENGINE=MyISAM AUTO_INCREMENT=11 ; -- -- Dumping data for table `0_security_roles` @@ -1493,7 +1500,7 @@ CREATE TABLE IF NOT EXISTS `0_shippers` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`shipper_id`), UNIQUE KEY `name` (`shipper_name`) -) TYPE=MyISAM AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_shippers` @@ -1514,7 +1521,7 @@ CREATE TABLE IF NOT EXISTS `0_sql_trail` ( `result` tinyint(1) NOT NULL, `msg` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_sql_trail` @@ -1545,7 +1552,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_category` ( `dflt_no_sale` tinyint(1) NOT NULL default '0', PRIMARY KEY (`category_id`), UNIQUE KEY `description` (`description`) -) TYPE=MyISAM AUTO_INCREMENT=5 ; +) ENGINE=MyISAM AUTO_INCREMENT=5 ; -- -- Dumping data for table `0_stock_category` @@ -1587,7 +1594,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` ( `no_sale` tinyint(1) NOT NULL default '0', `editable` tinyint(1) NOT NULL default '0', PRIMARY KEY (`stock_id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_stock_master` @@ -1618,7 +1625,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_moves` ( PRIMARY KEY (`trans_id`), KEY `type` (`type`,`trans_no`), KEY `Move` (`stock_id`,`loc_code`,`tran_date`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_stock_moves` @@ -1645,6 +1652,8 @@ 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', + `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, @@ -1656,7 +1665,7 @@ CREATE TABLE IF NOT EXISTS `0_suppliers` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`supplier_id`), KEY `supp_ref` (`supp_ref`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_suppliers` @@ -1681,7 +1690,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_allocations` ( PRIMARY KEY (`id`), KEY `From` (`trans_type_from`,`trans_no_from`), KEY `To` (`trans_type_to`,`trans_no_to`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_supp_allocations` @@ -1710,7 +1719,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_invoice_items` ( `memo_` tinytext, PRIMARY KEY (`id`), KEY `Transaction` (`supp_trans_type`,`supp_trans_no`,`stock_id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_supp_invoice_items` @@ -1737,12 +1746,14 @@ 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', + `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`), KEY `type` (`type`), KEY `tran_date` (`tran_date`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_supp_trans` @@ -1761,10 +1772,10 @@ 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`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_sys_prefs` @@ -1797,6 +1808,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, ''); @@ -1818,8 +1830,9 @@ 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'); +INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550'); -- -------------------------------------------------------- @@ -1833,7 +1846,7 @@ CREATE TABLE IF NOT EXISTS `0_sys_types` ( `type_no` int(11) NOT NULL default '1', `next_reference` varchar(100) NOT NULL default '', PRIMARY KEY (`type_id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_sys_types` @@ -1877,7 +1890,7 @@ CREATE TABLE IF NOT EXISTS `0_tags` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `type` (`type`,`name`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_tags` @@ -1895,7 +1908,7 @@ CREATE TABLE IF NOT EXISTS `0_tag_associations` ( `record_id` varchar(15) NOT NULL, `tag_id` int(11) NOT NULL, UNIQUE KEY `record_id` (`record_id`,`tag_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Dumping data for table `0_tag_associations` @@ -1912,18 +1925,17 @@ 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`) -) TYPE=InnoDB AUTO_INCREMENT=3 ; +) ENGINE=InnoDB AUTO_INCREMENT=3 ; -- -- 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); -- -------------------------------------------------------- @@ -1935,15 +1947,15 @@ 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`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- 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); -- -------------------------------------------------------- @@ -1960,7 +1972,7 @@ CREATE TABLE IF NOT EXISTS `0_tax_types` ( `name` varchar(60) NOT NULL default '', `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=2 ; +) ENGINE=InnoDB AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_tax_types` @@ -1990,7 +2002,7 @@ CREATE TABLE IF NOT EXISTS `0_trans_tax_details` ( PRIMARY KEY (`id`), KEY `Type_and_Number` (`trans_type`,`trans_no`), KEY `tran_date` (`tran_date`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_trans_tax_details` @@ -2012,7 +2024,7 @@ CREATE TABLE IF NOT EXISTS `0_useronline` ( PRIMARY KEY (`id`), KEY `timestamp` (`timestamp`), KEY `ip` (`ip`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_useronline` @@ -2059,7 +2071,7 @@ CREATE TABLE IF NOT EXISTS `0_users` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `user_id` (`user_id`) -) TYPE=MyISAM AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 ; -- -- Dumping data for table `0_users` @@ -2080,7 +2092,7 @@ CREATE TABLE IF NOT EXISTS `0_voided` ( `date_` date NOT NULL default '0000-00-00', `memo_` tinytext NOT NULL, UNIQUE KEY `id` (`type`,`id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Dumping data for table `0_voided` @@ -2101,7 +2113,7 @@ CREATE TABLE IF NOT EXISTS `0_workcentres` ( `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_workcentres` @@ -2131,7 +2143,7 @@ CREATE TABLE IF NOT EXISTS `0_workorders` ( `additional_costs` double NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `wo_ref` (`wo_ref`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_workorders` @@ -2154,7 +2166,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issues` ( `workcentre_id` int(11) default NULL, PRIMARY KEY (`issue_no`), KEY `workorder_id` (`workorder_id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_wo_issues` @@ -2174,7 +2186,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issue_items` ( `issue_id` int(11) default NULL, `qty_issued` double default NULL, PRIMARY KEY (`id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_wo_issue_items` @@ -2196,7 +2208,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_manufacture` ( `date_` date NOT NULL default '0000-00-00', PRIMARY KEY (`id`), KEY `workorder_id` (`workorder_id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_wo_manufacture` @@ -2221,7 +2233,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_requirements` ( `units_issued` double NOT NULL default '0', PRIMARY KEY (`id`), KEY `workorder_id` (`workorder_id`) -) TYPE=InnoDB AUTO_INCREMENT=1 ; +) ENGINE=InnoDB AUTO_INCREMENT=1 ; -- -- Dumping data for table `0_wo_requirements`