diff --git a/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java b/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
index c0fa732bfd..c8e6d7ef81 100644
--- a/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
+++ b/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
@@ -87,7 +87,7 @@ public class InOutGenerateRMA extends SvrProcess
 	            p_movementDate = new Timestamp(System.currentTimeMillis());
 	        }
         }
-        p_Selection = getProcessInfo().getAD_InfoWindow_ID() > 0;
+        if (getProcessInfo().getAD_InfoWindow_ID() > 0) p_Selection=true;
     }
     
     protected String doIt() throws Exception
diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
index ce845d1bc4..20bba55872 100644
--- a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
@@ -150,7 +150,7 @@ public class InOutGenerate extends SvrProcess
 			+ ", Movement=" + m_movementDate);
 		
 		
-		if (getProcessInfo().getAD_InfoWindow_ID() > 0)	//	VInOutGen
+		if ((getProcessInfo().getAD_InfoWindow_ID() > 0) || (getProcessInfo().getAD_InfoWindow_ID()==0 && p_Selection))
 		{
 			p_Selection = true;
 			m_sql = new StringBuffer("SELECT C_Order.* FROM C_Order, T_Selection ")