0031046: [RR15Q4] Uncaught exception while browsing pending cashups

diff --git a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
--- a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
+++ b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
@@ -232,7 +232,8 @@
   OB.UTIL.createNewCashup = function (callback) {
     // Create the cashup empty
     var uuid = OB.UTIL.get_UUID();
-    OB.Dal.save(new OB.Model.CashUp({
+
+    var newCashup = new OB.Model.CashUp({
       id: uuid,
       netSales: OB.DEC.Zero,
       grossSales: OB.DEC.Zero,
@@ -247,55 +248,57 @@
       isbeingprocessed: 'Y',
       posterminal: OB.MobileApp.model.get('terminal').id,
       isprocessed: 'N'
-    }), function () {
-      OB.MobileApp.model.get('terminal').cashUpId = uuid;
-      // Get Info from the last Cashup
-      //1. Search in local
-      var criteria = {
-        'isprocessed': 'Y',
-        '_orderByClause': 'creationDate desc'
-      };
-      OB.Dal.find(OB.Model.CashUp, criteria, function (lastCashUp) {
-        var lastCashUpPayments;
-        if (lastCashUp.length !== 0) {
-          lastCashUpPayments = JSON.parse(lastCashUp.at(0).get('objToSend')).cashCloseInfo;
-          OB.UTIL.initializePaymentMethodCashup(lastCashUpPayments);
-          if (callback) {
-            callback();
-          }
-        } else {
-          //2. Search in server
-          new OB.DS.Process('org.openbravo.retail.posterminal.master.Cashup').exec({
-            isprocessed: 'Y'
-          }, function (data) {
-            if (data[0]) {
-              lastCashUp = new OB.Model.CashUp();
-              lastCashUp.set(data[0]);
-              lastCashUpPayments = lastCashUp.get('cashPaymentMethodInfo');
-              //lastCashUpPayments = JSON.parse(lastCashUp.get('cashPaymentMethodInfo'));
-            } else {
-              // Set all  to 0
-              lastCashUpPayments = null;
-            }
-            OB.UTIL.initializePaymentMethodCashup(lastCashUpPayments, null, true);
-
+    });
+    OB.UTIL.composeCashupInfo(new Backbone.Collection([newCashup]), null, function () {
+      OB.Dal.save(newCashup, function () {
+        OB.MobileApp.model.get('terminal').cashUpId = uuid;
+        // Get Info from the last Cashup
+        //1. Search in local
+        var criteria = {
+          'isprocessed': 'Y',
+          '_orderByClause': 'creationDate desc'
+        };
+        OB.Dal.find(OB.Model.CashUp, criteria, function (lastCashUp) {
+          var lastCashUpPayments;
+          if (lastCashUp.length !== 0) {
+            lastCashUpPayments = JSON.parse(lastCashUp.at(0).get('objToSend')).cashCloseInfo;
+            OB.UTIL.initializePaymentMethodCashup(lastCashUpPayments);
             if (callback) {
               callback();
             }
-          }, function () {
-            // error
-            //console.error("OB.Model.CashUp fail");
-          });
-        }
+          } else {
+            //2. Search in server
+            new OB.DS.Process('org.openbravo.retail.posterminal.master.Cashup').exec({
+              isprocessed: 'Y'
+            }, function (data) {
+              if (data[0]) {
+                lastCashUp = new OB.Model.CashUp();
+                lastCashUp.set(data[0]);
+                lastCashUpPayments = lastCashUp.get('cashPaymentMethodInfo');
+                //lastCashUpPayments = JSON.parse(lastCashUp.get('cashPaymentMethodInfo'));
+              } else {
+                // Set all  to 0
+                lastCashUpPayments = null;
+              }
+              OB.UTIL.initializePaymentMethodCashup(lastCashUpPayments, null, true);
+
+              if (callback) {
+                callback();
+              }
+            }, function () {
+              // error
+              //console.error("OB.Model.CashUp fail");
+            });
+          }
+        }, function () {
+          // error
+          //console.error("OB.Model.CashUp find");
+        });
       }, function () {
         // error
-        //console.error("OB.Model.CashUp find");
-      });
-    }, function () {
-      // error
-      //console.error("OB.Model.CashUp fail");
-    }, true);
-
+        //console.error("OB.Model.CashUp fail");
+      }, true);
+    });
   };
   OB.UTIL.initializePaymentMethodCashup = function (lastCashUpPayments, cashup, funcType) {
     _.each(OB.MobileApp.model.get('payments'), function (payment) {