diff --git a/base/src/org/compiere/process/InvoiceGenerate.java b/base/src/org/compiere/process/InvoiceGenerate.java
index a1750416ff..46aab9036e 100644
--- a/base/src/org/compiere/process/InvoiceGenerate.java
+++ b/base/src/org/compiere/process/InvoiceGenerate.java
@@ -130,6 +130,8 @@ public class InvoiceGenerate extends SvrProcess
 			//
 			sql += " AND EXISTS (SELECT * FROM C_OrderLine ol "
 					+ "WHERE o.C_Order_ID=ol.C_Order_ID AND ol.QtyOrdered<>ol.QtyInvoiced) "
+				+ "AND o.C_DocType_ID IN (SELECT C_DocType_ID FROM C_DocType "
+					+ "WHERE DocBaseType='SOO' AND DocSubTypeSO NOT IN ('ON','OB','WR')) "
 				+ "ORDER BY M_Warehouse_ID, PriorityRule, C_BPartner_ID, C_Order_ID";
 		}
 	//	sql += " FOR UPDATE";