0040058: Can initiate login in a terminal with a user from another store, but it is blocked on loading

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1548939015 -19800
#      Thu Jan 31 18:20:15 2019 +0530
# Node ID be35f8318acc2d0e0dffa69c588b7ea8bee1601a
# Parent  849cfdc2820004c2dd5b4dbcb40aa9962fb933bd
Related to issue 40058 : Added ADMessage to Validate Login Defaults when login

diff -r 849cfdc28200 -r be35f8318acc src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jan 30 11:28:48 2019 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Jan 31 18:20:15 2019 +0530
@@ -1635,6 +1635,18 @@
 <!--A2DA38723FEA4AA28CF28A9D15BF2D7F-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--A2DA38723FEA4AA28CF28A9D15BF2D7F--></AD_MESSAGE>
 
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C--><AD_MESSAGE>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <AD_MESSAGE_ID><![CDATA[A3EDD8D1E0E842CF932B8919ECF71A6C]]></AD_MESSAGE_ID>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <VALUE><![CDATA[OBMOBC_NoLoginAccess]]></VALUE>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <MSGTEXT><![CDATA[There was a problem while creating session. Please review your access and terminal configuration.]]></MSGTEXT>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--A3EDD8D1E0E842CF932B8919ECF71A6C--></AD_MESSAGE>
+
 <!--A669C64CD75243BBAECCDA989F9A569D--><AD_MESSAGE>
 <!--A669C64CD75243BBAECCDA989F9A569D-->  <AD_MESSAGE_ID><![CDATA[A669C64CD75243BBAECCDA989F9A569D]]></AD_MESSAGE_ID>
 <!--A669C64CD75243BBAECCDA989F9A569D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 849cfdc28200 -r be35f8318acc src/org/openbravo/mobile/core/login/MobileCoreLoginHandler.java
--- a/src/org/openbravo/mobile/core/login/MobileCoreLoginHandler.java	Wed Jan 30 11:28:48 2019 +0100
+++ b/src/org/openbravo/mobile/core/login/MobileCoreLoginHandler.java	Thu Jan 31 18:20:15 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2018 Openbravo S.L.U.
+ * Copyright (C) 2012-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -43,6 +43,7 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.obps.ActivationKey;
 import org.openbravo.erpCommon.obps.ActivationKey.LicenseRestriction;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.mobile.core.MobileCoreConstants;
 import org.openbravo.mobile.core.MobileCoreKernelUtils;
@@ -285,7 +286,7 @@
     } else {
       // Re-login
       log4j.error("Unable to fill session Arguments for: " + userId);
-      throw new OBException("Unable to do login");
+      throw new OBException(OBMessageUtils.messageBD("OBMOBC_NoLoginAccess"));
     }
 
     // Login process if finished, set the flag as not logging in

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1548939250 -19800
#      Thu Jan 31 18:24:10 2019 +0530
# Node ID c2d6dfbf46bab7dc3faa8655e7238891ae11a95a
# Parent  4f1b78879df9cc99a6fa8dc5421e92889e7a091e
Related to issue 40058 : Validate Login Defaults when login

diff -r 4f1b78879df9 -r c2d6dfbf46ba src/org/openbravo/retail/posterminal/POSLoginHandler.java
--- a/src/org/openbravo/retail/posterminal/POSLoginHandler.java	Wed Jan 30 11:22:18 2019 +0100
+++ b/src/org/openbravo/retail/posterminal/POSLoginHandler.java	Thu Jan 31 18:24:10 2019 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2018 Openbravo S.L.U.
+ * Copyright (C) 2012-2019 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -274,11 +274,12 @@
       query.setParameter("clientId", terminal.getClient().getId());
       query.setParameter("roleId", currentRole.getId());
       query.setMaxResults(1);
-      BigDecimal distance = BigDecimal.ONE;
-      distance.negate();
+      BigDecimal distance = null;
       try {
         distance = query.uniqueResult();
       } catch (Exception ex) {
+      }
+      if (distance == null) {
         distance = BigDecimal.ONE;
         distance.negate();
       }