X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Fen_US-new.sql;h=b025189a685689c9c5afea160d2aceb9f686c7fb;hb=317210096efdbe5b375d5a0112d4f10a3c3c0b53;hp=2486d26183aa23986b0b7e9d71943fd963d937c7;hpb=f9ad5818b3b263cf9ecb9d3d08d833ed79d97fe6;p=fa-stable.git diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 2486d261..b025189a 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Generation Time: Sep 26, 2014 at 11:37 AM +-- Generation Time: Sep 26, 2015 at 11:37 AM -- Server version: 5.0.51 -- PHP Version: 5.2.6-1+lenny2 @@ -257,6 +257,7 @@ INSERT INTO `0_chart_master` VALUES ('1825', '', 'Accum. Amort. -Furn. & Equ INSERT INTO `0_chart_master` VALUES ('1840', '', 'Vehicle', '3', 0); INSERT INTO `0_chart_master` VALUES ('1845', '', 'Accum. Amort. -Vehicle', '3', 0); INSERT INTO `0_chart_master` VALUES ('2100', '', 'Accounts Payable', '4', 0); +INSERT INTO `0_chart_master` VALUES ('2105', '', 'Deferred Income', '4', 0); INSERT INTO `0_chart_master` VALUES ('2110', '', 'Accrued Income Tax - Federal', '4', 0); INSERT INTO `0_chart_master` VALUES ('2120', '', 'Accrued Income Tax - State', '4', 0); INSERT INTO `0_chart_master` VALUES ('2130', '', 'Accrued Franchise Tax', '4', 0); @@ -446,7 +447,7 @@ INSERT INTO `0_crm_categories` VALUES (12, 'supplier', 'invoice', 'Invoices', 'I DROP TABLE IF EXISTS `0_crm_contacts`; CREATE TABLE IF NOT EXISTS `0_crm_contacts` ( `id` int(11) NOT NULL auto_increment, - `person_id` int(11) NOT NULL default '0' COMMENT 'foreign key to crm_contacts', + `person_id` int(11) NOT NULL default '0' COMMENT 'foreign key to crm_persons', `type` varchar(20) NOT NULL COMMENT 'foreign key to crm_categories', `action` varchar(20) NOT NULL COMMENT 'foreign key to crm_categories', `entity_id` varchar(11) default NULL COMMENT 'entity id in related class table', @@ -619,7 +620,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` ( `trans_no` int(11) unsigned NOT NULL default '0', `type` smallint(6) unsigned NOT NULL default '0', `version` tinyint(1) unsigned NOT NULL default '0', - `debtor_no` int(11) unsigned default NULL, + `debtor_no` int(11) unsigned NOT NULL, `branch_code` int(11) NOT NULL default '-1', `tran_date` date NOT NULL default '0000-00-00', `due_date` date NOT NULL default '0000-00-00', @@ -639,7 +640,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` ( `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`), + PRIMARY KEY (`type`,`trans_no`,`debtor_no`), KEY `debtor_no` (`debtor_no`,`branch_code`), KEY `tran_date` (`tran_date`), KEY `order_` (`order_`) @@ -746,7 +747,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` ( -- Dumping data for table `0_fiscal_year` -- -INSERT INTO `0_fiscal_year` VALUES (1, '2015-01-01', '2015-12-31', 0); +INSERT INTO `0_fiscal_year` VALUES (1, '2018-01-01', '2018-12-31', 0); -- -------------------------------------------------------- @@ -1033,6 +1034,7 @@ INSERT INTO `0_payment_terms` VALUES (1, 'Due 15th Of the Following Month', 0, 1 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', 0, 0, 0); +INSERT INTO `0_payment_terms` VALUES (5, 'Prepaid', -1, 0, 0); -- -------------------------------------------------------- @@ -1276,7 +1278,7 @@ CREATE TABLE IF NOT EXISTS `0_recurrent_invoices` ( -- -------------------------------------------------------- -- ---- Table structure for table `0_reflines` +-- Table structure for table `0_reflines` -- DROP TABLE IF EXISTS `0_reflines`; @@ -1294,7 +1296,7 @@ CREATE TABLE `0_reflines` ( ) ENGINE=InnoDB AUTO_INCREMENT=23; -- ---- Dumping data for table `0_reflines` +-- Dumping data for table `0_reflines` -- INSERT INTO `0_reflines` VALUES @@ -1575,7 +1577,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_category` ( `dflt_cogs_act` varchar(15) NOT NULL default '', `dflt_inventory_act` varchar(15) NOT NULL default '', `dflt_adjustment_act` varchar(15) NOT NULL default '', - `dflt_assembly_act` varchar(15) NOT NULL default '', + `dflt_wip_act` varchar(15) NOT NULL default '', `dflt_dim1` int(11) default NULL, `dflt_dim2` int(11) default NULL, `inactive` tinyint(1) NOT NULL default '0', @@ -1630,11 +1632,10 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` ( `cogs_account` varchar(15) NOT NULL default '', `inventory_account` varchar(15) NOT NULL default '', `adjustment_account` varchar(15) NOT NULL default '', - `assembly_account` varchar(15) NOT NULL default '', + `wip_account` varchar(15) NOT NULL default '', `dimension_id` int(11) default NULL, `dimension2_id` int(11) default NULL, - `actual_cost` double NOT NULL default '0', - `last_cost` double NOT NULL default '0', + `purchase_cost` double NOT NULL default '0', `material_cost` double NOT NULL default '0', `labour_cost` double NOT NULL default '0', `overhead_cost` double NOT NULL default '0', @@ -1786,7 +1787,7 @@ DROP TABLE IF EXISTS `0_supp_trans`; CREATE TABLE IF NOT EXISTS `0_supp_trans` ( `trans_no` int(11) unsigned NOT NULL default '0', `type` smallint(6) unsigned NOT NULL default '0', - `supplier_id` int(11) unsigned default NULL, + `supplier_id` int(11) unsigned NOT NULL, `reference` tinytext NOT NULL, `supp_reference` varchar(60) NOT NULL default '', `tran_date` date NOT NULL default '0000-00-00', @@ -1797,7 +1798,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', - PRIMARY KEY (`type`,`trans_no`), + PRIMARY KEY (`type`,`trans_no`,`supplier_id`), KEY `supplier_id` (`supplier_id`), KEY `tran_date` (`tran_date`) ) ENGINE=InnoDB; @@ -1841,6 +1842,7 @@ 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, '1'); +INSERT INTO `0_sys_prefs` VALUES ('shortname_name_in_list','setup.company', 'tinyint', 1, '0'); 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'); @@ -1876,13 +1878,13 @@ INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'var INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', 15, '5010'); INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', 15, '5040'); 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_wip_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.4.0'); +INSERT INTO `0_sys_prefs` VALUES ('version_id', 'system', 'varchar', 11, '2.4.1'); 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'); INSERT INTO `0_sys_prefs` VALUES ('bcc_email', 'setup.company', 'varchar', 100, ''); -INSERT INTO `0_sys_prefs` VALUES ('deferred_income_act', 'glsetup.sales', 'varchar', '15', ''); +INSERT INTO `0_sys_prefs` VALUES ('deferred_income_act', 'glsetup.sales', 'varchar', '15', '2105'); INSERT INTO `0_sys_prefs` VALUES ('gl_closing_date','setup.closing_date', 'date', 8, ''); INSERT INTO `0_sys_prefs` VALUES ('alternative_tax_include_on_docs','setup.company', 'tinyint', 1, '0'); INSERT INTO `0_sys_prefs` VALUES ('no_zero_lines_amount','glsetup.sales', 'tinyint', 1, '1'); @@ -1893,6 +1895,9 @@ INSERT INTO `0_sys_prefs` VALUES ('print_invoice_no','glsetup.sales', 'tinyint', INSERT INTO `0_sys_prefs` VALUES ('allow_negative_prices','glsetup.inventory', 'tinyint', 1, '1'); INSERT INTO `0_sys_prefs` VALUES ('print_item_images_on_quote','glsetup.inventory', 'tinyint', 1, '0'); INSERT INTO `0_sys_prefs` VALUES ('suppress_tax_rates','setup.company', 'tinyint', 1, '0'); +INSERT INTO `0_sys_prefs` VALUES ('company_logo_report','setup.company', 'tinyint', 1, '0'); +INSERT INTO `0_sys_prefs` VALUES ('barcodes_on_stock','setup.company', 'tinyint', 1, '0'); +INSERT INTO `0_sys_prefs` VALUES ('ref_no_auto_increase','setup.company', 'tinyint', 1, '0'); INSERT INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup.items', 'varchar', '15', '5660'); INSERT INTO `0_sys_prefs` VALUES ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1'); INSERT INTO `0_sys_prefs` VALUES ('use_manufacturing','setup.company', 'tinyint', 1, '1'); @@ -2227,6 +2232,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_issue_items` ( `stock_id` varchar(40) default NULL, `issue_id` int(11) default NULL, `qty_issued` double default NULL, + `unit_cost` double NOT NULL default '0', PRIMARY KEY (`id`) ) ENGINE=InnoDB; @@ -2268,7 +2274,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_requirements` ( `stock_id` char(20) NOT NULL default '', `workcentre` int(11) NOT NULL default '0', `units_req` double NOT NULL default '1', - `std_cost` double NOT NULL default '0', + `unit_cost` double NOT NULL default '0', `loc_code` char(5) NOT NULL default '', `units_issued` double NOT NULL default '0', PRIMARY KEY (`id`),