diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
--- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
@@ -62,7 +62,10 @@
             OB.error("The receipt has been closed with an empty 'net' amount in a line (value: " + line.get('net') + ")");
           }
         });
-
+        // 6. verify that client and organization are not null
+        if (OB.UTIL.isNullOrUndefined(this.get('client')) || OB.UTIL.isNullOrUndefined(this.get('organization'))) {
+          OB.error("The receipt has been closed with a wrong client: " + this.get('client') + " or organization: " + this.get('organization'));
+        }
       } catch (e) {
         // do nothing, we do not want to generate another error
       }