From 39150665d5955716247c6c6e06adbcc2cad037a9 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 5 Aug 2010 09:57:55 +0000 Subject: [PATCH] Update from beta to RC1 --- sql/alter2.3.php | 4 ++-- sql/en_US-demo.sql | 2 +- sql/en_US-new.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/alter2.3.php b/sql/alter2.3.php index c424bbe3..e480eda5 100644 --- a/sql/alter2.3.php +++ b/sql/alter2.3.php @@ -26,7 +26,7 @@ class fa2_3 { // function install($pref, $force) { - global $core_version; + global $db_version; if (!$this->preconf) return false; @@ -91,7 +91,7 @@ class fa2_3 { if (!db_query($sql)) return false; } - return update_company_prefs(array('version_id'=>$core_version), $pref); + return update_company_prefs(array('version_id'=>$db_version), $pref); } // // Checking before install diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index cd6fc572..06ae277c 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -2061,7 +2061,7 @@ 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'); -- -------------------------------------------------------- diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 078442bc..4ebea90f 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -1822,7 +1822,7 @@ 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'); -- -------------------------------------------------------- -- 2.30.2