Fixed initial en_US-*.sql files (fiscal years setup, default value set for sys_prefs...

diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index b2546519ba003817cf4e78bf599e45f4976aff81..c00bee34ffa328a40cc288837104c3a17d3780f2 100644 (file)
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -36,7 +36,7 @@ ALTER TABLE `0_tax_groups` DROP COLUMN `tax_shipping`;
 
 ALTER TABLE `0_sales_order_details` ADD KEY `stkcode` (`stk_code`);
 ALTER TABLE `0_purch_order_details` ADD KEY `itemcode` (`item_code`);
-ALTER TABLE `0_sys_prefs` CHANGE `value` `value` TEXT NOT NULL;
+ALTER TABLE `0_sys_prefs` CHANGE `value` `value` TEXT NOT NULL DEFAULT '';
 ALTER TABLE `0_cust_branch` ADD COLUMN `bank_account` varchar(60) DEFAULT NULL AFTER `notes`;
 
 ALTER TABLE `0_debtor_trans` ADD COLUMN `tax_included` tinyint(1) unsigned NOT NULL default '0' AFTER `payment_terms`;

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 3effa593b6bb302af828d229c82e15e2b7cd89d3..976e91e761c084b70633e03bef244eb180fc247b 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -823,8 +823,8 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` (
 -- Dumping data for table `0_fiscal_year`
 --
 
-INSERT INTO `0_fiscal_year` VALUES(1, '2013-01-01', '2013-12-31', 0);
-INSERT INTO `0_fiscal_year` VALUES(2, '2014-01-01', '2014-12-31', 0);
+INSERT INTO `0_fiscal_year` VALUES(1, '2014-01-01', '2014-12-31', 0);
+INSERT INTO `0_fiscal_year` VALUES(2, '2015-01-01', '2015-12-31', 0);
 
 --
 -- Table structure for table `0_gl_trans`
@@ -1109,7 +1109,7 @@ CREATE TABLE IF NOT EXISTS `0_item_units` (
 INSERT INTO `0_item_units` VALUES('each', 'Each', 0, 0);
 INSERT INTO `0_item_units` VALUES('hr', 'Hours', 1, 0);
 
---- Structure of table `0_journal`
+-- Table structure for table `0_journal`
 
 DROP TABLE IF EXISTS `0_journal`;
 CREATE TABLE `0_journal` (
@@ -1127,7 +1127,7 @@ CREATE TABLE `0_journal` (
   KEY `tran_date` (`tran_date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
 
---- Data of table `0_journal`
+-- Data of table `0_journal`
 
 
 -- --------------------------------------------------------
@@ -2040,7 +2040,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` text NOT NULL,
+  `value` TEXT NOT NULL DEFAULT '',
   PRIMARY KEY  (`name`),
   KEY `category` (`category`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 868941e0bf94f42a85581695e6864f77c2248277..4667e952c072af8205c4a22c16e8d23503c5a3da 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -761,8 +761,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` (
 -- Dumping data for table `0_fiscal_year`
 --
 
-INSERT INTO `0_fiscal_year` VALUES(1, '2013-01-01', '2013-12-31', 0);
-INSERT INTO `0_fiscal_year` VALUES(2, '2014-01-01', '2014-12-31', 0);
+INSERT INTO `0_fiscal_year` VALUES(1, '2015-01-01', '2015-12-31', 0);
 
 --
 -- Table structure for table `0_gl_trans`
@@ -955,7 +954,7 @@ CREATE TABLE IF NOT EXISTS `0_item_units` (
 INSERT INTO `0_item_units` VALUES('each', 'Each', 0, 0);
 INSERT INTO `0_item_units` VALUES('hr', 'Hours', 0, 0);
 
---- Structure of table `0_journal`
+-- Table structure for table `0_journal`
 
 DROP TABLE IF EXISTS `0_journal`;
 CREATE TABLE `0_journal` (
@@ -973,7 +972,7 @@ CREATE TABLE `0_journal` (
   KEY `tran_date` (`tran_date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
 
---- Data of table `0_journal`
+-- Data of table `0_journal`
 
 
 -- --------------------------------------------------------
@@ -1801,7 +1800,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` text NOT NULL,
+  `value` TEXT NOT NULL DEFAULT '',
   PRIMARY KEY  (`name`),
   KEY `category` (`category`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -1823,7 +1822,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, '2');
+INSERT INTO `0_sys_prefs` VALUES('f_year', 'setup.company', 'int', 11, '1');
 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');