0047578: SCO window moves to pos window without asking login, when doing multiple refresh in sco.

diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
index be5d8d3a0..bb2e50142 100644
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -632,8 +632,9 @@
                     }
                     var nextWindow = OB.MobileApp.model.get('nextWindow');
                     if (nextWindow) {
-                      OB.POS.navigate(nextWindow);
-                      OB.MobileApp.model.unset('nextWindow');
+                      if (OB.POS.navigate(nextWindow)) {
+                        OB.MobileApp.model.unset('nextWindow');
+                      }
                     } else {
                       OB.POS.navigate(OB.MobileApp.model.get('defaultWindow'));
                     }
@@ -2215,7 +2216,7 @@
     },
     windows: null,
     navigate: function(route) {
-      OB.MobileApp.model.navigate(route);
+      return OB.MobileApp.model.navigate(route);
     },
     registerWindow: function(window) {
       OB.MobileApp.windowRegistry.registerWindow(window);

diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
index eb14df99..5a4041bb 100644
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -260,6 +260,10 @@ OB.Model.Terminal = Backbone.Model.extend({
       },
       false
     );
+
+    window.addEventListener('beforeunload', function(e) {
+      OB.MobileApp.model.reloadingApplication = true;
+    });
   },
 
   /**
@@ -537,11 +541,15 @@ OB.Model.Terminal = Backbone.Model.extend({
    * http://backbonejs.org/#Router-navigate
    */
   navigate: function(route, pReplace, parameters) {
+    if (OB.MobileApp.model.reloadingApplication) {
+      OB.info('Navigation cancelled since application is reloading');
+      return false;
+    }
     if (route === Backbone.history.getFragment()) {
       OB.info(
         'Navigating to same window: ' + route + '. Navigation cancelled.'
       );
-      return true;
+      return false;
     }
     if (pReplace !== false) {
       pReplace = true;
@@ -559,6 +567,7 @@ OB.Model.Terminal = Backbone.Model.extend({
       trigger: true,
       replace: pReplace
     });
+    return true;
   },
 
   /**

diff --git a/web/org.openbravo.mobile.core/source/component/ob-login.js b/web/org.openbravo.mobile.core/source/component/ob-login.js
index 97062b4a..2722631e 100644
--- a/web/org.openbravo.mobile.core/source/component/ob-login.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-login.js
@@ -359,7 +359,7 @@ enyo.kind({
     OB.MobileApp.model.set('currentWindow', 'login');
     OB.MobileApp.view.currentWindowState = 'unknown';
     OB.MobileApp.model.set('currentWindowState', 'unknown');
-    OB.MobileApp.model.unset('nextWindow');
+    OB.UTIL.localStorage.removeItem('nextWindow');
 
     this.$.screenLockedLbl.setContent(
       OB.I18N.getLabel('OBMOBC_LoginScreenLocked')
diff --git a/web/org.openbravo.mobile.core/source/model/ob-router.js b/web/org.openbravo.mobile.core/source/model/ob-router.js
index a85ca1cd..7eaf34b0 100644
--- a/web/org.openbravo.mobile.core/source/model/ob-router.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-router.js
@@ -37,7 +37,7 @@ OB.Model = window.OB.Model || {};
     any: function(route) {
       // this can happen if the webpage is reloaded and the user was in a registeredWindow that no longer exists
       if (route) {
-        OB.MobileApp.model.set('nextWindow', route);
+        OB.UTIL.localStorage.setItem('nextWindow', route);
       }
       this.terminal.navigate('');
     },

diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
index bb2e50142..3f2c6265d 100644
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -630,10 +630,10 @@
                     ) {
                       return;
                     }
-                    var nextWindow = OB.MobileApp.model.get('nextWindow');
+                    var nextWindow = OB.UTIL.localStorage.getItem('nextWindow');
                     if (nextWindow) {
                       if (OB.POS.navigate(nextWindow)) {
-                        OB.MobileApp.model.unset('nextWindow');
+                        OB.UTIL.localStorage.removeItem('nextWindow');
                       }
                     } else {
                       OB.POS.navigate(OB.MobileApp.model.get('defaultWindow'));

diff --git a/web/org.openbravo.retail.sessions/js/countcash/countcash-model.js b/web/org.openbravo.retail.sessions/js/countcash/countcash-model.js
index f0fe887..30cb980 100644
--- a/web/org.openbravo.retail.sessions/js/countcash/countcash-model.js
+++ b/web/org.openbravo.retail.sessions/js/countcash/countcash-model.js
@@ -81,7 +81,7 @@ OB.OBPOSSession.CountCash.Model.AvoidCountCashAndSendOpenTill = function(
               callback();
             }
             OB.UTIL.showLoading(false);
-            OB.MobileApp.model.set('nextWindow', 'retail.pointofsale');
+            OB.UTIL.localStorage.setItem('nextWindow', 'retail.pointofsale');
             OB.UTIL.updateCashupCreationDate();
           },
           function() {
@@ -92,7 +92,7 @@ OB.OBPOSSession.CountCash.Model.AvoidCountCashAndSendOpenTill = function(
             if (callback) {
               callback();
             }
-            OB.MobileApp.model.set('nextWindow', 'retail.pointofsale');
+            OB.UTIL.localStorage.setItem('nextWindow', 'retail.pointofsale');
           }
         );
       });