0047513: 19Q1: Wrong cashup_id link for a ticket when doing an action

diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
index bc568f403..ef37fa637 100644
--- a/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
@@ -51,6 +51,7 @@ public class PaidReceiptProperties extends ModelExtension {
         add(new HQLProperty("salesRepresentative.id", "salesRepresentative"));
         add(new HQLProperty("ord.organization.id", "organization"));
         add(new HQLProperty("ord.client.id", "client"));
+        add(new HQLProperty("ord.obposAppCashup", "obposAppCashup"));
         add(new HQLProperty(
             "(case when ord.documentType.sOSubType = 'OB' then true else false end)",
             "isQuotation"));
diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
index 5fdd29297..c3b1df2e0 100644
--- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
@@ -209,7 +209,11 @@
               }
             });
 
-            frozenReceipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
+            if (!frozenReceipt.get('isPaid') || frozenReceipt.get('payments').models.find(p => {
+              return !p.get('isPrePayment');
+            })) {
+              frozenReceipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
+            }
             // convert returns
             if (receipt.isNegative()) {
               _.forEach(frozenReceipt.get('payments').models, function (item) {
@@ -626,7 +630,11 @@
                   currentReceipt.set('timezoneOffset', creationDate.getTimezoneOffset());
                   currentReceipt.set('created', creationDate.getTime());
                   currentReceipt.set('obposCreatedabsolute', OB.I18N.formatDateISO(creationDate)); // Absolute date in ISO format
-                  currentReceipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
+                  if (!currentReceipt.get('isPaid') || currentReceipt.get('payments').models.find(p => {
+                    return !p.get('isPrePayment');
+                  })) {
+                    currentReceipt.set('obposAppCashup', OB.MobileApp.model.get('terminal').cashUpId);
+                  }
                   if (OB.UTIL.isNullOrUndefined(currentReceipt.get('amountToLayaway'))) {
                     currentReceipt.set('completeTicket', true);
                   }

diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
index 2c809ec90..7291cab51 100644
--- a/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
@@ -53,6 +53,7 @@ public class PaidReceiptProperties extends ModelExtension {
         add(new HQLProperty("ord.organization.id", "organization"));
         add(new HQLProperty("ord.organization.name", "organization$_identifier"));
         add(new HQLProperty("ord.client.id", "client"));
+        add(new HQLProperty("ord.obposAppCashup", "obposAppCashup"));
         add(new HQLProperty(
             "(case when ord.documentType.sOSubType = 'OB' then true else false end)",
             "isQuotation"));
diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
index c82f1b884..2de423b12 100644
--- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
@@ -303,10 +303,17 @@
                 }
               });
 
-              frozenReceipt.set(
-                'obposAppCashup',
-                OB.MobileApp.model.get('terminal').cashUpId
-              );
+              if (
+                !frozenReceipt.get('isPaid') ||
+                frozenReceipt.get('payments').models.find(p => {
+                  return !p.get('isPrePayment');
+                })
+              ) {
+                frozenReceipt.set(
+                  'obposAppCashup',
+                  OB.MobileApp.model.get('terminal').cashUpId
+                );
+              }
               // convert returns
               if (receipt.isNegative()) {
                 _.forEach(frozenReceipt.get('payments').models, function(item) {
@@ -1060,10 +1067,17 @@
                           'obposCreatedabsolute',
                           OB.I18N.formatDateISO(creationDate)
                         ); // Absolute date in ISO format
-                        currentReceipt.set(
-                          'obposAppCashup',
-                          OB.MobileApp.model.get('terminal').cashUpId
-                        );
+                        if (
+                          !currentReceipt.get('isPaid') ||
+                          currentReceipt.get('payments').models.find(p => {
+                            return !p.get('isPrePayment');
+                          })
+                        ) {
+                          currentReceipt.set(
+                            'obposAppCashup',
+                            OB.MobileApp.model.get('terminal').cashUpId
+                          );
+                        }
                         if (
                           OB.UTIL.isNullOrUndefined(
                             currentReceipt.get('amountToLayaway')