0053687: When an order created with an incomplete address (address1 empty) is loaded shows confusing data

diff --git a/web-jspack/org.openbravo.pos2/src/components/Ticket/TicketBPAddress/TicketBPAddressGeneric.jsx b/web-jspack/org.openbravo.pos2/src/components/Ticket/TicketBPAddress/TicketBPAddressGeneric.jsx
index 5786e87e3..5817d2663 100644
--- a/web-jspack/org.openbravo.pos2/src/components/Ticket/TicketBPAddress/TicketBPAddressGeneric.jsx
+++ b/web-jspack/org.openbravo.pos2/src/components/Ticket/TicketBPAddress/TicketBPAddressGeneric.jsx
@@ -73,13 +73,17 @@ const TicketBPAddressGeneric = ({
           address: new OB.App.Class.ExternalBusinessPartnerAddress(
             obInvoicingAddress
           ),
-          defaultAddress: alternateInvoicingLocation
+          defaultAddress: alternateInvoicingLocation || {
+            address1: invoiceAlternateLocationName
+          }
         }
       : {
           address: new OB.App.Class.ExternalBusinessPartnerAddress(
             obShippingAddress
           ),
-          defaultAddress: alternateShippingLocation
+          defaultAddress: alternateShippingLocation || {
+            address1: alternateLocationName
+          }
         };
   }
 

diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
index d3506c840..32ef67109 100644
--- a/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
@@ -75,8 +75,12 @@ public class PaidReceiptProperties extends ModelExtension {
         add(new HQLProperty("ord.invoiceTerms", "invoiceTerms"));
         add(new HQLProperty("ord.externalBusinessPartnerReference",
             "externalBusinessPartnerReference"));
-        add(new HQLProperty("alternateLocation.addressLine1", "alternateLocationName"));
-        add(new HQLProperty("invAlternateLocation.addressLine1", "invoiceAlternateLocationName"));
+        add(new HQLProperty(
+            "concat(coalesce(alternateLocation.postalCode, ''), '-', coalesce(alternateLocation.cityName, '') '-', coalesce(alternateLocation.addressLine1, ''))",
+            "alternateLocationName"));
+        add(new HQLProperty(
+            "concat(coalesce(invAlternateLocation.postalCode, ''), '-', coalesce(invAlternateLocation.cityName, ''),  '-', coalesce(invAlternateLocation.addressLine1, ''))",
+            "invoiceAlternateLocationName"));
         add(new HQLProperty("ord.obposSkipTaxCalculation", "skipTaxCalculation"));
       }
     };