diff --git a/org.adempiere.base/src/org/compiere/model/PrintInfo.java b/org.adempiere.base/src/org/compiere/model/PrintInfo.java
index d91bd69049..bc7a2ce127 100644
--- a/org.adempiere.base/src/org/compiere/model/PrintInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/PrintInfo.java
@@ -118,8 +118,7 @@ public PrintInfo (String Name, int AD_Table_ID, int Record_ID, String Record_UU)
 	 */
 	public boolean isReport()
 	{
-		return m_AD_Process_ID != 0	//	Menu Report
-			|| m_C_BPartner_ID == 0;
+		return m_Record_ID <= 0 && Util.isEmpty(m_Record_UU);
 	}	//	isReport
 	
 	/**
diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Archive.java b/org.adempiere.ui/src/org/compiere/apps/form/Archive.java
index 28cc6a0bbc..837123f1fa 100644
--- a/org.adempiere.ui/src/org/compiere/apps/form/Archive.java
+++ b/org.adempiere.ui/src/org/compiere/apps/form/Archive.java
@@ -200,8 +200,6 @@ public void cmd_query(boolean reports, KeyNamePair process, KeyNamePair table, I
 		{
 			if (C_BPartner_ID != null)
 				sql.append(" AND C_BPartner_ID=").append(C_BPartner_ID);
-			else
-				sql.append(" AND C_BPartner_ID IS NOT NULL");
 		}
 		
 		//	Name