From 334c5c1a39ed6d05eea434a599cd3e7e0a236822 Mon Sep 17 00:00:00 2001
From: vpj-cd <devnull@localhost>
Date: Wed, 14 Oct 2009 04:40:17 +0000
Subject: [PATCH] Enable in GenFrom and VGenPanel to use any PrintFormat
 https://sourceforge.net/tracker/?func=detail&aid=2878578&group_id=176962&atid=879335

---
 .../src/org/compiere/apps/form/VGenPanel.java |  2 +-
 .../adempiere/webui/apps/form/WGenForm.java   | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/client/src/org/compiere/apps/form/VGenPanel.java b/client/src/org/compiere/apps/form/VGenPanel.java
index 04e5429b91..441f504c2a 100644
--- a/client/src/org/compiere/apps/form/VGenPanel.java
+++ b/client/src/org/compiere/apps/form/VGenPanel.java
@@ -299,7 +299,7 @@ public class VGenPanel extends CPanel implements ActionListener, ChangeListener,
 						MPrintFormat format = genForm.getPrintFormat();
 						MTable table = MTable.get(Env.getCtx(),format.getAD_Table_ID());
 						MQuery query = new MQuery(table.getTableName());
-						query.addRestriction(MMovement.COLUMNNAME_M_Movement_ID, MQuery.EQUAL, Record_ID);
+						query.addRestriction(table.getTableName() + "_ID", MQuery.EQUAL, Record_ID);
 						//	Engine
 						PrintInfo info = new PrintInfo(table.getTableName(),table.get_Table_ID(), Record_ID);               
 						ReportEngine re = new ReportEngine(Env.getCtx(), format, query, info);
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
index d25037b9d7..db91d44407 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
@@ -43,7 +43,12 @@ import org.adempiere.webui.window.SimplePDFViewer;
 import org.compiere.apps.ProcessCtl;
 import org.compiere.apps.form.GenForm;
 import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MQuery;
+import org.compiere.model.MTable;
+import org.compiere.model.PrintInfo;
+import org.compiere.print.MPrintFormat;
 import org.compiere.print.ReportEngine;
+import org.compiere.print.Viewer;
 import org.compiere.process.ProcessInfoUtil;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
@@ -358,7 +363,23 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
 		for (int i = 0; i < m_ids.length; i++)
 		{
 			int RecordID = m_ids[i];
-			ReportEngine re = ReportEngine.get (Env.getCtx(), genForm.getReportEngineType(), RecordID);
+			ReportEngine re = null;
+			
+			if(genForm.getPrintFormat() != null)
+			{
+				MPrintFormat format = genForm.getPrintFormat();
+				MTable table = MTable.get(Env.getCtx(),format.getAD_Table_ID());
+				MQuery query = new MQuery(table.getTableName());
+				query.addRestriction(table.getTableName() + "_ID", MQuery.EQUAL, RecordID);
+				//	Engine
+				PrintInfo info = new PrintInfo(table.getTableName(),table.get_Table_ID(), RecordID);               
+				re = new ReportEngine(Env.getCtx(), format, query, info);
+			}
+			else
+			{	
+				re = ReportEngine.get (Env.getCtx(), genForm.getReportEngineType(), RecordID);
+			}	
+			
 			pdfList.add(re.getPDF());				
 		}