0033665: POSLoginHandler call has a timeout which is too short and should not retry

diff --git a/web/org.openbravo.mobile.core/source/data/ob-requestrouter.js b/web/org.openbravo.mobile.core/source/data/ob-requestrouter.js
--- a/web/org.openbravo.mobile.core/source/data/ob-requestrouter.js
+++ b/web/org.openbravo.mobile.core/source/data/ob-requestrouter.js
@@ -99,6 +99,7 @@
 
         }
         ajaxRequest.fail = function (inSender, inResponse) {
+          var lastRequest = false;
           // found a special behavior:
           // if a request fails right away then fail is called. Then after the timeout
           // again fail is called.
@@ -107,36 +108,41 @@
             return;
           }
 
+          // noRetries and only one server, or
+          // did all the retries and only one server, or
+          // tried last not online server and still failing
+          // then call origFail
+          lastRequest = ajaxRequest.noRetries && OB.RR.RequestRouter.servers.length === 1;
+          lastRequest |= (OB.RR.RequestRouter.servers.length === 1 && ajaxRequest.numberOfRetries >= OB.UTIL.localStorage.getItem('maxNumOfRequestRetries'));
+          lastRequest |= (!online && OB.RR.RequestRouter.servers.length === (index + 1));
+
           if (inSender === 401) {
             //The server is online but need to relogin because token has expired or have been deleted
             // so reset the online status directly
             server.set('online', true);
             me.handle401(server);
+          } else if (lastRequest) {
+            // we tried all (offline) servers, no other option left, fail
+            if (!ajaxRequest.done) {
+              // the done flag keeps track that the request was done.
+              OB.RR.sendingMessages = false;
+              ajaxRequest.done = true;
+              if (ajaxRequest.origFail) {
+                ajaxRequest.origFail(inSender, inResponse);
+              }
+            }
+          } else if (ajaxRequest.noRetries || ajaxRequest.numberOfRetries >= OB.UTIL.localStorage.getItem('maxNumOfRequestRetries')) {
+            // no retries needed, or
+            // did all the retries, change to offline for the current server, move to next server
+            server.changeOnlineStatus(false, ajaxRequest.ignoreForConnectionStatus);
+            ajaxRequest.numberOfRetries = 0;
+            me.callServer(online, index + 1, service, ajaxRequest);
           } else {
-            // tried last not online server and still failing, call origFail
-            if (!online && OB.RR.RequestRouter.servers.length === (index + 1)) {
-              // we tried all offline servers, no other option left, fail
-              if (!ajaxRequest.done) {
-                // the done flag keeps track that the request was done.
-                OB.RR.sendingMessages = false;
-                ajaxRequest.done = true;
-                if (ajaxRequest.origFail) {
-                  ajaxRequest.origFail(inSender, inResponse);
-                }
-              }
-            } else if (ajaxRequest.noRetries || ajaxRequest.numberOfRetries >= OB.UTIL.localStorage.getItem('maxNumOfRequestRetries')) {
-              // no retries needed, or
-              // did all the retries, change to offline for the current server, move to next server
-              server.changeOnlineStatus(false, ajaxRequest.ignoreForConnectionStatus);
-              ajaxRequest.numberOfRetries = 0;
-              me.callServer(online, index + 1, service, ajaxRequest);
-            } else {
-              // do a retry
-              ajaxRequest.numberOfRetries = ajaxRequest.numberOfRetries + 1;
-              setTimeout(function () {
-                me.callServer(online, index, service, ajaxRequest);
-              }, 50);
-            }
+            // do a retry
+            ajaxRequest.numberOfRetries = ajaxRequest.numberOfRetries + 1;
+            setTimeout(function () {
+              me.callServer(online, index, service, ajaxRequest);
+            }, 50);
           }
         };
 
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
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -1863,7 +1863,8 @@
       url: this.get('loginHandlerUrl'),
       cacheBust: false,
       method: 'POST',
-      timeout: 5000,
+      timeout: 30000,
+      noRetries: true,
       contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
       data: params,
       success: function (inSender, inResponse) {