diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 970af97e5..0681ea327 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -8885,6 +8885,11 @@
           creationDate = new Date();
         }
         model.setIsCalculateGrossLockState(true);
+        // Set current organization to receipt
+        model.set(
+          'organization',
+          OB.MobileApp.model.get('terminal').organization
+        );
         model.set('creationDate', creationDate);
         model.set('timezoneOffset', creationDate.getTimezoneOffset());
         model.set('created', creationDate.getTime());
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
index b19a4bfdf..f3b8dec98 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
@@ -232,11 +232,6 @@ enyo.kind({
       return false;
     }
 
-    // Set current organization to receipt
-    this.model
-      .get('order')
-      .set('organization', OB.MobileApp.model.get('terminal').organization);
-
     // deletion without warning is allowed if the ticket has been processed
     if (this.hasClass('paidticket')) {
       this.doDeleteOrder();