0031811: [Multiserver] Enable multi-server for more modules, include check script

diff --git a/src-db/database/sourcedata/OBMOBC_SERVICES.xml b/src-db/database/sourcedata/OBMOBC_SERVICES.xml
--- a/src-db/database/sourcedata/OBMOBC_SERVICES.xml
+++ b/src-db/database/sourcedata/OBMOBC_SERVICES.xml
@@ -77,6 +77,17 @@
 <!--0D2EB64F1F47422CAD3FC938627980C0-->  <ROUTINGTYPE><![CDATA[Transaction]]></ROUTINGTYPE>
 <!--0D2EB64F1F47422CAD3FC938627980C0--></OBMOBC_SERVICES>
 
+<!--0F14787F388F4F50A82E0606D7859127--><OBMOBC_SERVICES>
+<!--0F14787F388F4F50A82E0606D7859127-->  <OBMOBC_SERVICES_ID><![CDATA[0F14787F388F4F50A82E0606D7859127]]></OBMOBC_SERVICES_ID>
+<!--0F14787F388F4F50A82E0606D7859127-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0F14787F388F4F50A82E0606D7859127-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0F14787F388F4F50A82E0606D7859127-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--0F14787F388F4F50A82E0606D7859127-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0F14787F388F4F50A82E0606D7859127-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.stock.OtherStoresDetailedStock]]></SERVICE>
+<!--0F14787F388F4F50A82E0606D7859127-->  <DESCRIPTION><![CDATA[org.openbravo.retail.posterminal.stock.OtherStoresDetailedStock]]></DESCRIPTION>
+<!--0F14787F388F4F50A82E0606D7859127-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--0F14787F388F4F50A82E0606D7859127--></OBMOBC_SERVICES>
+
 <!--1C02D5E5BEDD49F9A12F64D0ACA0848F--><OBMOBC_SERVICES>
 <!--1C02D5E5BEDD49F9A12F64D0ACA0848F-->  <OBMOBC_SERVICES_ID><![CDATA[1C02D5E5BEDD49F9A12F64D0ACA0848F]]></OBMOBC_SERVICES_ID>
 <!--1C02D5E5BEDD49F9A12F64D0ACA0848F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -253,6 +264,17 @@
 <!--6DA0A81997B6498FB93C88CC61F7736C-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
 <!--6DA0A81997B6498FB93C88CC61F7736C--></OBMOBC_SERVICES>
 
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81--><OBMOBC_SERVICES>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <OBMOBC_SERVICES_ID><![CDATA[6E38AFD9C7CE46789E0DBAB31B54AC81]]></OBMOBC_SERVICES_ID>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.CheckBusinessPartnerCredit]]></SERVICE>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <DESCRIPTION><![CDATA[Checks Business Partner current credit]]></DESCRIPTION>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--6E38AFD9C7CE46789E0DBAB31B54AC81--></OBMOBC_SERVICES>
+
 <!--77179D0CF2284420B4FD74D7D3E9FA8B--><OBMOBC_SERVICES>
 <!--77179D0CF2284420B4FD74D7D3E9FA8B-->  <OBMOBC_SERVICES_ID><![CDATA[77179D0CF2284420B4FD74D7D3E9FA8B]]></OBMOBC_SERVICES_ID>
 <!--77179D0CF2284420B4FD74D7D3E9FA8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -275,6 +297,28 @@
 <!--7B00D319166743D59883B2985FB00D08-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
 <!--7B00D319166743D59883B2985FB00D08--></OBMOBC_SERVICES>
 
+<!--7D711BFC2FF04161AFBE009EF86E650D--><OBMOBC_SERVICES>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <OBMOBC_SERVICES_ID><![CDATA[7D711BFC2FF04161AFBE009EF86E650D]]></OBMOBC_SERVICES_ID>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.CheckTerminalAuth]]></SERVICE>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <DESCRIPTION><![CDATA[Check terminal authentication to link device to terminal configuration]]></DESCRIPTION>
+<!--7D711BFC2FF04161AFBE009EF86E650D-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--7D711BFC2FF04161AFBE009EF86E650D--></OBMOBC_SERVICES>
+
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE--><OBMOBC_SERVICES>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <OBMOBC_SERVICES_ID><![CDATA[7E6D32BDE84C4C63834FA1C61A1B78AE]]></OBMOBC_SERVICES_ID>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.PaidReceipts]]></SERVICE>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <DESCRIPTION><![CDATA[Query service for tickets/orders]]></DESCRIPTION>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--7E6D32BDE84C4C63834FA1C61A1B78AE--></OBMOBC_SERVICES>
+
 <!--7F28869BCA274DE68231F665A61AAD5A--><OBMOBC_SERVICES>
 <!--7F28869BCA274DE68231F665A61AAD5A-->  <OBMOBC_SERVICES_ID><![CDATA[7F28869BCA274DE68231F665A61AAD5A]]></OBMOBC_SERVICES_ID>
 <!--7F28869BCA274DE68231F665A61AAD5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297,6 +341,17 @@
 <!--8010BE2483F74522B72F14A3378C7B7F-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
 <!--8010BE2483F74522B72F14A3378C7B7F--></OBMOBC_SERVICES>
 
+<!--896C42944E6F41FC8A11325614B7DE55--><OBMOBC_SERVICES>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <OBMOBC_SERVICES_ID><![CDATA[896C42944E6F41FC8A11325614B7DE55]]></OBMOBC_SERVICES_ID>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.master.LoadedProduct]]></SERVICE>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <DESCRIPTION><![CDATA[Query to load a product with no external columns]]></DESCRIPTION>
+<!--896C42944E6F41FC8A11325614B7DE55-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--896C42944E6F41FC8A11325614B7DE55--></OBMOBC_SERVICES>
+
 <!--8BEB9BAB0FF74817A8C0FA0DDCDEB4A7--><OBMOBC_SERVICES>
 <!--8BEB9BAB0FF74817A8C0FA0DDCDEB4A7-->  <OBMOBC_SERVICES_ID><![CDATA[8BEB9BAB0FF74817A8C0FA0DDCDEB4A7]]></OBMOBC_SERVICES_ID>
 <!--8BEB9BAB0FF74817A8C0FA0DDCDEB4A7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -385,6 +440,17 @@
 <!--A54C29C4FB2242AB80E6409E07E453A2-->  <ROUTINGTYPE><![CDATA[Transaction]]></ROUTINGTYPE>
 <!--A54C29C4FB2242AB80E6409E07E453A2--></OBMOBC_SERVICES>
 
+<!--A5C4E6D978464BCD9E15621B0F848570--><OBMOBC_SERVICES>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <OBMOBC_SERVICES_ID><![CDATA[A5C4E6D978464BCD9E15621B0F848570]]></OBMOBC_SERVICES_ID>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.ProcessCashMgmtMaster]]></SERVICE>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <DESCRIPTION><![CDATA[Query service for ProcessCashMgmtMaster]]></DESCRIPTION>
+<!--A5C4E6D978464BCD9E15621B0F848570-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--A5C4E6D978464BCD9E15621B0F848570--></OBMOBC_SERVICES>
+
 <!--A71FD5F66B0B43159815D6CE39F508E2--><OBMOBC_SERVICES>
 <!--A71FD5F66B0B43159815D6CE39F508E2-->  <OBMOBC_SERVICES_ID><![CDATA[A71FD5F66B0B43159815D6CE39F508E2]]></OBMOBC_SERVICES_ID>
 <!--A71FD5F66B0B43159815D6CE39F508E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -418,6 +484,50 @@
 <!--B95F87D66EE34039A282DEE5E99A9345-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
 <!--B95F87D66EE34039A282DEE5E99A9345--></OBMOBC_SERVICES>
 
+<!--BC9C939D42044CABBF78A688C4027CCC--><OBMOBC_SERVICES>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <OBMOBC_SERVICES_ID><![CDATA[BC9C939D42044CABBF78A688C4027CCC]]></OBMOBC_SERVICES_ID>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.stock.StoreDetailedStock]]></SERVICE>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <DESCRIPTION><![CDATA[org.openbravo.retail.posterminal.stock.StoreDetailedStock]]></DESCRIPTION>
+<!--BC9C939D42044CABBF78A688C4027CCC-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--BC9C939D42044CABBF78A688C4027CCC--></OBMOBC_SERVICES>
+
+<!--CE12B21436984B93B88142E0E023AF87--><OBMOBC_SERVICES>
+<!--CE12B21436984B93B88142E0E023AF87-->  <OBMOBC_SERVICES_ID><![CDATA[CE12B21436984B93B88142E0E023AF87]]></OBMOBC_SERVICES_ID>
+<!--CE12B21436984B93B88142E0E023AF87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CE12B21436984B93B88142E0E023AF87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CE12B21436984B93B88142E0E023AF87-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--CE12B21436984B93B88142E0E023AF87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CE12B21436984B93B88142E0E023AF87-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.master.Characteristic]]></SERVICE>
+<!--CE12B21436984B93B88142E0E023AF87-->  <DESCRIPTION><![CDATA[Query service for product characteristics by product]]></DESCRIPTION>
+<!--CE12B21436984B93B88142E0E023AF87-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--CE12B21436984B93B88142E0E023AF87--></OBMOBC_SERVICES>
+
+<!--BCE2B0DE0FDB44929478A59D3D210690--><OBMOBC_SERVICES>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <OBMOBC_SERVICES_ID><![CDATA[BCE2B0DE0FDB44929478A59D3D210690]]></OBMOBC_SERVICES_ID>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.utility.CheckApproval]]></SERVICE>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <DESCRIPTION><![CDATA[Checks the approval entered by the user]]></DESCRIPTION>
+<!--BCE2B0DE0FDB44929478A59D3D210690-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--BCE2B0DE0FDB44929478A59D3D210690--></OBMOBC_SERVICES>
+
+<!--CD6204646FAC428CAD1152031A341E02--><OBMOBC_SERVICES>
+<!--CD6204646FAC428CAD1152031A341E02-->  <OBMOBC_SERVICES_ID><![CDATA[CD6204646FAC428CAD1152031A341E02]]></OBMOBC_SERVICES_ID>
+<!--CD6204646FAC428CAD1152031A341E02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CD6204646FAC428CAD1152031A341E02-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CD6204646FAC428CAD1152031A341E02-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--CD6204646FAC428CAD1152031A341E02-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CD6204646FAC428CAD1152031A341E02-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.Profile]]></SERVICE>
+<!--CD6204646FAC428CAD1152031A341E02-->  <DESCRIPTION><![CDATA[Gets Profile info]]></DESCRIPTION>
+<!--CD6204646FAC428CAD1152031A341E02-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--CD6204646FAC428CAD1152031A341E02--></OBMOBC_SERVICES>
+
 <!--CFCEE5A18D134F948F47913802A19E91--><OBMOBC_SERVICES>
 <!--CFCEE5A18D134F948F47913802A19E91-->  <OBMOBC_SERVICES_ID><![CDATA[CFCEE5A18D134F948F47913802A19E91]]></OBMOBC_SERVICES_ID>
 <!--CFCEE5A18D134F948F47913802A19E91-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
--- a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
+++ b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
@@ -322,9 +322,10 @@
       if (apps.size() == 1) {
         terminal = ((OBPOSApplications) apps.get(0));
         result.put("servers", getServers(terminal));
-        result.put("services", getServices());
       }
     }
+    // We do not need to be in a specific terminal to load services
+    result.put("services", getServices());
 
     String value;
     try {
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
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -883,8 +883,10 @@
           window.localStorage.setItem('cacheSessionId', inResponse.cacheSessionId);
         }
         //Save available servers and services and initialize Request Router layer
-        if (inResponse.servers && inResponse.services) {
+        if (inResponse.servers) {
           localStorage.servers = JSON.stringify(inResponse.servers);
+        }
+        if (inResponse.services) {
           localStorage.services = JSON.stringify(inResponse.services);
         }
         OB.RR.RequestRouter.initialize();

diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -721,6 +721,18 @@
 <!--71D7D32AA3924EDAB73FD15E1B735685-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--71D7D32AA3924EDAB73FD15E1B735685--></AD_MESSAGE>
 
+<!--7280D87159A44CD784FDEFE563868403--><AD_MESSAGE>
+<!--7280D87159A44CD784FDEFE563868403-->  <AD_MESSAGE_ID><![CDATA[7280D87159A44CD784FDEFE563868403]]></AD_MESSAGE_ID>
+<!--7280D87159A44CD784FDEFE563868403-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7280D87159A44CD784FDEFE563868403-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7280D87159A44CD784FDEFE563868403-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7280D87159A44CD784FDEFE563868403-->  <VALUE><![CDATA[OBMOBC_WrongMobileService]]></VALUE>
+<!--7280D87159A44CD784FDEFE563868403-->  <MSGTEXT><![CDATA[The request has no data to send. Check the Routing type of the service in Mobile Services window in the backend. It could be wrongly set as Transaction. (service requested: ' %0')]]></MSGTEXT>
+<!--7280D87159A44CD784FDEFE563868403-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7280D87159A44CD784FDEFE563868403-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--7280D87159A44CD784FDEFE563868403-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--7280D87159A44CD784FDEFE563868403--></AD_MESSAGE>
+
 <!--744291728E5940878309729A7EC85237--><AD_MESSAGE>
 <!--744291728E5940878309729A7EC85237-->  <AD_MESSAGE_ID><![CDATA[744291728E5940878309729A7EC85237]]></AD_MESSAGE_ID>
 <!--744291728E5940878309729A7EC85237-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/OBMOBC_SERVICES.xml b/src-db/database/sourcedata/OBMOBC_SERVICES.xml
--- a/src-db/database/sourcedata/OBMOBC_SERVICES.xml
+++ b/src-db/database/sourcedata/OBMOBC_SERVICES.xml
@@ -50,7 +50,7 @@
 <!--A1581719E8D14206A3B31FB1337140E3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A1581719E8D14206A3B31FB1337140E3-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
 <!--A1581719E8D14206A3B31FB1337140E3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A1581719E8D14206A3B31FB1337140E3-->  <SERVICE><![CDATA[org.openbravo.client.kernel/OBPOS_Main/ApplicationFormats]]></SERVICE>
+<!--A1581719E8D14206A3B31FB1337140E3-->  <SERVICE><![CDATA[org.openbravo.mobile.core/OBPOS_Main/ApplicationFormats]]></SERVICE>
 <!--A1581719E8D14206A3B31FB1337140E3-->  <DESCRIPTION><![CDATA[Provides currency and number format information]]></DESCRIPTION>
 <!--A1581719E8D14206A3B31FB1337140E3-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
 <!--A1581719E8D14206A3B31FB1337140E3--></OBMOBC_SERVICES>
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
@@ -432,10 +432,27 @@
             me.sendMessages(server);
             };
 
+        if (!ajaxRequest.data || !JSON.parse(ajaxRequest.data).data) {
+          var errorMessage = OB.I18N.getLabel('OBMOBC_WrongMobileService', [ajaxRequest.url]);
+          OB.error(errorMessage);
+
+          OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_LblWarning'), OB.I18N.getLabel('OBMOBC_WrongMobileService', [ajaxRequest.url]), [{
+            isConfirmButton: true,
+            label: OB.I18N.getLabel('OBMOBC_LblOk'),
+            action: function () {
+              OB.MobileApp.model.lock();
+              return true;
+            }
+          }], {
+            onHideFunction: function () {
+              OB.MobileApp.model.lock();
+              return true;
+            }
+          });
+          return;
+        }
         var parsedData = JSON.parse(ajaxRequest.data);
-        if (!parsedData.data) {
-          throw "The service has not returned any data. Add it to the Mobile Services window in the backend (service requested: '" + ajaxRequest.url + "'')";
-        } else if (parsedData.data.length > 0) {
+        if (parsedData.data.length > 0) {
           var message = new OB.Model.Message();
           message.set('server', server.get('name'));
           message.set('mainServer', server.get('mainServer'));
@@ -629,6 +646,7 @@
           return serviceName.indexOf(srvc.get('name')) !== -1;
         });
         if (services.length === 0) {
+          OB.error("The service does not exist. Add it to the Mobile Services window in the backend (service requested: '" + serviceName + "'')");
           service = new OB.RR.Service({
             name: 'Generic',
             type: OB.RR.ServTypeFailover
@@ -657,10 +675,12 @@
 
       this.servers = new Backbone.Collection();
       this.availableServices = new Backbone.Collection();
-      if (localStorage.servers && localStorage.services) {
+      if (localStorage.servers) {
         _.each(JSON.parse(localStorage.servers), function (server) {
           me.servers.add(new OB.RR.Server(server));
         });
+      }
+      if (localStorage.services) {
         _.each(JSON.parse(localStorage.services), function (service) {
           me.availableServices.add(new OB.RR.Service(service));
         });