diff --git a/src/org/openbravo/retail/posterminal/InitialValidations.java b/src/org/openbravo/retail/posterminal/InitialValidations.java
index 48d21da8c..a8279836a 100644
--- a/src/org/openbravo/retail/posterminal/InitialValidations.java
+++ b/src/org/openbravo/retail/posterminal/InitialValidations.java
@@ -119,11 +119,13 @@ public class InitialValidations {
     } else if (documentType.getDocumentTypeForInvoice() == null) {
       throw new OBException(String.format(
           OBMessageUtils.messageBD("OBPOS_DocTypeInvoiceNotConfigured"), documentType.getName()));
-    } else if (documentType.getDoctypesimpinvoice() == null) {
+    } else if (documentType.getDoctypesimpinvoice() == null
+        && posTerminal.getObposTerminaltype().isGenerateInvoice()) {
       throw new OBException(
           String.format(OBMessageUtils.messageBD("OBPOS_DocTypeSimplifiedInvoiceNotConfigured"),
               documentType.getName()));
-    } else if (documentType.getDoctypeaggrinvoice() == null) {
+    } else if (documentType.getDoctypeaggrinvoice() == null
+        && posTerminal.getObposTerminaltype().isGroupingOrders()) {
       throw new OBException(
           String.format(OBMessageUtils.messageBD("OBPOS_DocTypeAggregatedInvoiceNotConfigured"),
               documentType.getName()));
@@ -137,11 +139,13 @@ public class InitialValidations {
       throw new OBException(
           String.format(OBMessageUtils.messageBD("OBPOS_DocTypeReturnInvoiceNotConfigured"),
               returnDocumentType.getName()));
-    } else if (returnDocumentType.getDoctypesimpinvoice() == null) {
+    } else if (returnDocumentType.getDoctypesimpinvoice() == null
+        && posTerminal.getObposTerminaltype().isGenerateInvoice()) {
       throw new OBException(String.format(
           OBMessageUtils.messageBD("OBPOS_DocTypeSimplifiedReturnInvoiceNotConfigured"),
           returnDocumentType.getName()));
-    } else if (returnDocumentType.getDoctypeaggrinvoice() == null) {
+    } else if (returnDocumentType.getDoctypeaggrinvoice() == null
+        && posTerminal.getObposTerminaltype().isGroupingOrders()) {
       throw new OBException(String.format(
           OBMessageUtils.messageBD("OBPOS_DocTypeAggregatedReturnInvoiceNotConfigured"),
           returnDocumentType.getName()));