Merge pull request #1890 from gilmoskowitz/i24621_packageModPriv

update extension reports with existing grade or we get too many copies

diff --git a/enyo-client/database/source/update_version.sql b/enyo-client/database/source/update_version.sql
index 9d6b744..276adb2 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.0' WHERE pkghead_name = 'xt';
+UPDATE pkghead SET pkghead_version = '4.7.0Beta2' WHERE pkghead_name = 'xt';

diff --git a/enyo-client/database/source/xt/functions/pg_advisory_unlock.sql b/enyo-client/database/source/xt/functions/pg_advisory_unlock.sql
index 25c3b7a..c892882 100644 (file)
--- a/enyo-client/database/source/xt/functions/pg_advisory_unlock.sql
+++ b/enyo-client/database/source/xt/functions/pg_advisory_unlock.sql
@@ -1,8 +1,4 @@
 create or replace function xt.pg_advisory_unlock(oid integer, id integer) returns boolean as $$
-  var sql = "select pg_catalog.pg_advisory_unlock($1, $2) as result;";
-  return plv8.execute(sql, [oid, id])[0].result;
-  /* temporary: let qt client use advisory locks but web client use xt.lock */
-
   var pid = plv8.execute("select pg_backend_pid() as pid;")[0].pid,
     username = plv8.execute("select geteffectivextuser() as username;")[0].username,
     sql = "select * from xt.lock where lock_table_oid = $1 and lock_record_id = $2 and lock_username = $3 and lock_pid = $4;",

diff --git a/enyo-client/database/source/xt/functions/trylock.sql b/enyo-client/database/source/xt/functions/trylock.sql
index 719607b..0c73312 100644 (file)
--- a/enyo-client/database/source/xt/functions/trylock.sql
+++ b/enyo-client/database/source/xt/functions/trylock.sql
@@ -1,8 +1,4 @@
 create or replace function xt.trylock(oid integer, id integer) returns boolean as $$
-  var sql = "select public.trylock($1, $2) as result;";
-  return plv8.execute(sql, [oid, id])[0].result;
-  /* temporary: let qt client use advisory locks but web client use xt.lock */
-
   var pid = plv8.execute("select pg_backend_pid() as pid;")[0].pid,
     data = Object.create(XT.Data),
     lock = data.tryLock(oid, id, {pid: pid});

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

diff --git a/lib/enyo-x/source/views/transaction_list_container.js b/lib/enyo-x/source/views/transaction_list_container.js
index 2116df4..7e3518e 100644 (file)
--- a/lib/enyo-x/source/views/transaction_list_container.js
+++ b/lib/enyo-x/source/views/transaction_list_container.js
@@ -227,7 +227,8 @@ trailing:true, white:true, strict:false*/
     */
     setList: function (options) {
       var component,
-      list = options.list;
+        contentHeader = this.$.contentHeader,
+        list = options.list;
 
       component = this.createComponent({
         name: "list",
@@ -248,6 +249,12 @@ trailing:true, white:true, strict:false*/
           memoizeEnabled: false,
           fit: true
         });
+
+        contentHeader.destroyClientControls();
+        if (component.headerComponents) {
+          contentHeader.createComponents(component.headerComponents);
+          contentHeader.render();
+        }
       }
 
       this.init = true;

diff --git a/package.json b/package.json
index d848338..94742bd 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",
+  "version": "4.7.0-beta2",
   "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 0d32d93..01cf349 100644 (file)
--- a/scripts/xml/distribution_install.xml
+++ b/scripts/xml/distribution_install.xml
@@ -1,5 +1,5 @@
-<package id        = "distribution-install-470"
-         version   = "4.7.0"
+<package id        = "distribution-install-470beta2"
+         version   = "4.7.0Beta2"
          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.8.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0.
+    <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.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index 0518ab7..44532c6 100644 (file)
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -1,5 +1,5 @@
-<package id        = "distribution-upgrade-470"
-         version   = "4.7.0"
+<package id        = "distribution-upgrade-470beta2"
+         version   = "4.7.0Beta2"
          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.8.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0.
+    <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.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index 464f2b8..7a8c3e2 100644 (file)
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -1,5 +1,5 @@
-<package id        = "postbooks-upgrade-470"
-         version   = "4.7.0"
+<package id        = "postbooks-upgrade-470beta2"
+         version   = "4.7.0Beta2"
          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.8.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0.
+    <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.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
index 3d34014..671a4fb 100644 (file)
--- a/scripts/xml/xtmfg_install.xml
+++ b/scripts/xml/xtmfg_install.xml
@@ -1,5 +1,5 @@
-<package id        = "manufacturing-install-470"
-         version   = "4.7.0"
+<package id        = "manufacturing-install-470beta2"
+         version   = "4.7.0Beta2"
          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.8.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0.
+    <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.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index ef6ce2c..264a45a 100644 (file)
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -1,5 +1,5 @@
-<package id        = "manufacturing-upgrade-470"
-         version   = "4.7.0"
+<package id        = "manufacturing-upgrade-470beta2"
+         version   = "4.7.0Beta2"
          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.8.0';</query>
-    <message>This package may not be applied to a database newer than 4.7.0.
+<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.0Beta2.
     </message>
 </prerequisite>
 

diff --git a/test/specs/invoice.js b/test/specs/invoice.js
index 0a43b8e..6169c36 100644 (file)
--- a/test/specs/invoice.js
+++ b/test/specs/invoice.js
@@ -864,7 +864,7 @@ TODO deferred to later sprint:
         @description When currency or invoice date is changed outstanding credit should be
           recalculated.
       */
-      it.("When currency or invoice date is changed outstanding credit should be recalculated",
+      it.skip("When currency or invoice date is changed outstanding credit should be recalculated",
           function (done) {
 
         this.timeout(9000);