Merge pull request #1843 from xtuple/4_6_x

4 6 x

diff --git a/enyo-client/database/source/xt/functions/cust_outstanding_credit.sql b/enyo-client/database/source/xt/functions/cust_outstanding_credit.sql
index fa626f8..6aa15db 100644 (file)
--- a/enyo-client/database/source/xt/functions/cust_outstanding_credit.sql
+++ b/enyo-client/database/source/xt/functions/cust_outstanding_credit.sql
@@ -18,7 +18,7 @@ from (
   where aropen_cust_id = $1
   and aropen_open
   --and aropen_posted = false
-  group by aropen_id
+  group by aropen_id, aropen_cust_id, aropen_curr_id, aropen_amount
 ) unalloc;
 
 $$ language sql;

diff --git a/test/specs/invoice.js b/test/specs/invoice.js
index e674090..0a43b8e 100644 (file)
--- a/test/specs/invoice.js
+++ b/test/specs/invoice.js
@@ -864,9 +864,9 @@ TODO deferred to later sprint:
         @description 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",
+      it.("When currency or invoice date is changed outstanding credit should be recalculated",
           function (done) {
-        // frustratingly nondeterministic
+
         this.timeout(9000);
         var outstandingCreditChanged = function () {
           if (invoiceModel.get("outstandingCredit")) {