0046258: Wrong default language used in POS when user and role has not defined a language

diff --git a/src/org/openbravo/retail/posterminal/POSLoginHandler.java b/src/org/openbravo/retail/posterminal/POSLoginHandler.java
index dd87a6625..4cdb76137 100644
--- a/src/org/openbravo/retail/posterminal/POSLoginHandler.java
+++ b/src/org/openbravo/retail/posterminal/POSLoginHandler.java
@@ -321,6 +321,11 @@ public class POSLoginHandler extends MobileCoreLoginHandler {
         return role.getOBPOSDefaultPosLanguage();
       }
     }
+
+    if (user.getClient().getLanguage()!=null) {
+      return user.getClient().getLanguage();
+    }
+
     return (Language) OBDal.getInstance()
         .createCriteria(Language.class)
         .add(Restrictions.eq(Language.PROPERTY_LANGUAGE, "en_US"))