diff -r 207c3231878f src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Wed Oct 23 12:34:47 2013 +0200
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Wed Oct 23 12:36:15 2013 +0200
@@ -247,6 +247,10 @@
           || (!isQuotation && (!isLayaway && !partialpayLayaway || fullpayLayaway) && (jsonorder
               .has("generateInvoice") && jsonorder.getBoolean("generateInvoice")));
       boolean createShipment = !isQuotation && (!isLayaway && !partialpayLayaway || fullpayLayaway);
+      if (jsonorder.has("generateShipment")) {
+        createShipment &= jsonorder.getBoolean("generateShipment");
+        createInvoice &= jsonorder.getBoolean("generateShipment");
+      }
       sendEmail = (jsonorder.has("sendEmail") && jsonorder.getBoolean("sendEmail"));
       // Order header
       long t111 = System.currentTimeMillis();