0047638: Cross Store Returns

diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
index 3e0110b8d..9b2d0cfa6 100644
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java
@@ -1155,10 +1155,11 @@ public class OrderLoader extends POSDataSynchronizationProcess
     OBPOSApplications posTerminal = OBDal.getInstance()
         .get(OBPOSApplications.class, jsonorder.getString("posTerminal"));
     BusinessPartner bp = order.getBusinessPartner();
-    order.setTransactionDocument(
-        POSUtils.isCrossStore(order, posTerminal) ? order.getOrganization().getObposCDoctype()
-            : (DocumentType) OBDal.getInstance()
-                .getProxy("DocumentType", jsonorder.getString("documentType")));
+    order.setTransactionDocument(POSUtils.isCrossStore(order, posTerminal)
+        ? jsonorder.getLong("orderType") == 1 ? order.getOrganization().getObposCDoctyperet()
+            : order.getOrganization().getObposCDoctype()
+        : (DocumentType) OBDal.getInstance()
+            .getProxy("DocumentType", jsonorder.getString("documentType")));
     order.setAccountingDate(order.getOrderDate());
     order.setScheduledDeliveryDate(order.getOrderDate());
     order.setPartnerAddress(OBDal.getInstance()
diff --git a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/TicketUtils.js b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/TicketUtils.js
index db9bd74a4..d666236ad 100644
--- a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/TicketUtils.js
+++ b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/TicketUtils.js
@@ -1408,13 +1408,13 @@
         ticket,
         payload
       );
-      if (isCrossStore) {
-        return ticket;
-      }
 
       const newTicket = { ...ticket };
       const isSale = OB.App.State.Ticket.Utils.isSale(ticket, payload);
       newTicket.orderType = isSale ? 0 : 1;
+      if (isCrossStore) {
+        return newTicket;
+      }
       newTicket.documentType = isSale
         ? payload.terminal.terminalType.documentType
         : payload.terminal.terminalType.documentTypeForReturns;