Merge pull request #1897 from gpazo/bumpin470

Bumpin470

diff --git a/enyo-client/database/source/update_version.sql b/enyo-client/database/source/update_version.sql
index 276adb2..9d6b744 100644 (file)
--- a/enyo-client/database/source/update_version.sql
+++ b/enyo-client/database/source/update_version.sql
@@ -1 +1 @@
-UPDATE pkghead SET pkghead_version = '4.7.0Beta2' WHERE pkghead_name = 'xt';
+UPDATE pkghead SET pkghead_version = '4.7.0' WHERE pkghead_name = 'xt';

diff --git a/foundation-database/public/tables/setVersion.sql b/foundation-database/public/tables/setVersion.sql
index 0d396dd..e66a56b 100644 (file)
--- a/foundation-database/public/tables/setVersion.sql
+++ b/foundation-database/public/tables/setVersion.sql
@@ -1 +1 @@
-SELECT setMetric('ServerVersion', '4.7.0Beta2');
+SELECT setMetric('ServerVersion', '4.7.0');

diff --git a/package.json b/package.json
index f1e9fa4..3f804e7 100644 (file)
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "xTuple <dev@xtuple.com>",
   "name": "xtuple",
   "description": "xTuple Enterprise Resource Planning Mobile-Web client",
-  "version": "4.7.0-beta2",
+  "version": "4.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/xtuple/xtuple.git"

diff --git a/scripts/xml/distribution_install.xml b/scripts/xml/distribution_install.xml
index 01cf349..6ef7963 100644 (file)
--- a/scripts/xml/distribution_install.xml
+++ b/scripts/xml/distribution_install.xml
@@ -1,5 +1,5 @@
-<package id        = "distribution-install-470beta2"
-         version   = "4.7.0Beta2"
+<package id        = "distribution-install-470"
+         version   = "4.7.0"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
          updater   = "2.2.4" >
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.7.0Beta2' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index 44532c6..48ca1d1 100644 (file)
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -1,5 +1,5 @@
-<package id        = "distribution-upgrade-470beta2"
-         version   = "4.7.0Beta2"
+<package id        = "distribution-upgrade-470"
+         version   = "4.7.0"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
          updater   = "2.2.4" >
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.7.0Beta2' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/ent_package.xml b/scripts/xml/ent_package.xml
index f830e6a..371811d 100644 (file)
--- a/scripts/xml/ent_package.xml
+++ b/scripts/xml/ent_package.xml
@@ -1,5 +1,5 @@
-<package id        = "enterprise-upgrade-470beta2"
-         version   = "4.7.0Beta2"
+<package id        = "enterprise-upgrade-470"
+         version   = "4.7.0"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
          updater   = "2.2.4" >
@@ -30,8 +30,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.7.0Beta2' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index 7a8c3e2..5393463 100644 (file)
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -1,5 +1,5 @@
-<package id        = "postbooks-upgrade-470beta2"
-         version   = "4.7.0Beta2"
+<package id        = "postbooks-upgrade-470"
+         version   = "4.7.0"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
          updater   = "2.2.4" >
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.7.0Beta2' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
index 671a4fb..bdf2024 100644 (file)
--- a/scripts/xml/xtmfg_install.xml
+++ b/scripts/xml/xtmfg_install.xml
@@ -1,5 +1,5 @@
-<package id        = "manufacturing-install-470beta2"
-         version   = "4.7.0Beta2"
+<package id        = "manufacturing-install-470"
+         version   = "4.7.0"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
          updater   = "2.2.4" >
@@ -19,8 +19,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.7.0Beta2' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index 6099b14..c02dd0a 100644 (file)
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -1,5 +1,5 @@
-<package id        = "manufacturing-upgrade-470beta2"
-         version   = "4.7.0Beta2"
+<package id        = "manufacturing-upgrade-470"
+         version   = "4.7.0"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
          updater   = "2.2.4" >
@@ -30,8 +30,8 @@
 
   <prerequisite type = "query"
                 name = "Checking for too-new xTuple ERP database version" >
-    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.7.0Beta2' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0Beta.
+    <query>SELECT NOT fetchMetricText('ServerVersion') >= '4.8.0' AND fetchMetricText('ServerVersion') != '4.7.0';</query>
+    <message>This package may not be applied to a database newer than 4.7.0Beta2.
     </message>
   </prerequisite>