diff --git a/src-db/database/model/modifiedTables/C_ORDER.xml b/src-db/database/model/modifiedTables/C_ORDER.xml
--- a/src-db/database/model/modifiedTables/C_ORDER.xml
+++ b/src-db/database/model/modifiedTables/C_ORDER.xml
@@ -21,6 +21,10 @@
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -4936,6 +4936,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -400,6 +400,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java
--- a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java
+++ b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java
@@ -68,6 +68,7 @@
+ "', '"
+ posTerminal.getObposTerminaltype().getDocumentTypeForReturns().getId()
+ "') and not exists (select 1 from OrderLine as ord where invoicedQuantity<>0 and ord.salesOrder = line.salesOrder)"
+ + " and line.salesOrder.oBPOSNotInvoiceOnCashUp = false"
+ " order by line.businessPartner.id, line.salesOrder.id";
OBQuery query = OBDal.getInstance().createQuery(OrderLine.class, hqlWhereClause);