diff -r 538663410311 src/org/openbravo/retail/posterminal/master/CrossStoreInfoProperties.java
--- a/src/org/openbravo/retail/posterminal/master/CrossStoreInfoProperties.java	Tue Mar 24 15:44:33 2020 +0100
+++ b/src/org/openbravo/retail/posterminal/master/CrossStoreInfoProperties.java	Wed Mar 25 18:23:19 2020 +0100
@@ -22,20 +22,25 @@
   @Override
   public List<HQLProperty> getHQLProperties(Object params) {
     final List<HQLProperty> list = new ArrayList<>();
-
-    final StringBuilder address = new StringBuilder();
-    address.append("CONCAT(");
-    address.append(" COALESCE(l.addressLine1, '')");
-    address.append(" , CASE WHEN l.addressLine2 IS NOT NULL THEN CONCAT(' - ',l.addressLine2) END");
-    address.append(" , ' '");
-    address.append(" , COALESCE(l.postalCode, '')");
-    address.append(" , ' '");
-    address.append(" , COALESCE(l.cityName, '')");
-    address.append(" , CASE WHEN r.name IS NOT NULL THEN CONCAT(' (',r.name,')') END");
-    address.append(" , ' '");
-    address.append(" , COALESCE(c.name, '')");
-    address.append(")");
-    list.add(new HQLProperty(address.toString(), "address"));
+    //@formatter:off
+    final String addressHQL = ""
+    + "CONCAT("
+    + "  COALESCE(l.addressLine1, ''), "
+    + "  CASE WHEN l.addressLine2 IS NOT NULL THEN "
+    + "    CONCAT(' - ',l.addressLine2) "
+    + "  END, "
+    + "  ' ', "
+    + "  COALESCE(l.postalCode, ''), "
+    + "  ' ', "
+    + "  COALESCE(l.cityName, ''), "
+    + "  CASE WHEN r.name IS NOT NULL THEN "
+    + "    CONCAT(' (',r.name,')') "
+    + "  END, "
+    + "  ' ', "
+    + "  COALESCE(c.name, '')"
+    + ")";
+    //@formatter:on
+    list.add(new HQLProperty(addressHQL.toString(), "address"));
     list.add(new HQLProperty("u.phone", "phone"));
     list.add(new HQLProperty("u.alternativePhone", "alternativePhone"));
     list.add(new HQLProperty("u.email", "email"));
@@ -43,5 +48,4 @@
 
     return list;
   }
-
 }