Update from beta to RC1

diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index c424bbe377cd871100d39047eb73a0d5f7660bdf..e480eda5eb12eed2e79079ffb518722d7bd42890 100644 (file)
--- 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 cd6fc5720ca0d0744949c4c0011b08127f36c88f..06ae277c5e3e84829dc0db91eab8735c75cfd6b2 100644 (file)
--- 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 078442bcdb3b0d8fad0a78b9029299dff24a7d12..4ebea90fafbe2633595c7ec391cfc0a0ea79eb05 100644 (file)
--- 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');
 
 -- --------------------------------------------------------