diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
index f98504d7ad..e8570cc8aa 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
@@ -1,28 +1,46 @@
 package org.adempiere.webui.window;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.util.logging.Level;
 
+import javax.servlet.http.HttpServletRequest;
+
+import net.sf.jasperreports.engine.JRExporterParameter;
 import net.sf.jasperreports.engine.JasperExportManager;
 import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.export.JRCsvExporter;
+import net.sf.jasperreports.engine.export.JRHtmlExporter;
+import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
+import net.sf.jasperreports.engine.export.JRXlsExporter;
+import net.sf.jasperreports.engine.export.JRXlsExporterParameter;
 
 import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.webui.component.Listbox;
 import org.adempiere.webui.component.Window;
 import org.compiere.util.CLogger;
 import org.zkoss.util.media.AMedia;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zkex.zul.Borderlayout;
 import org.zkoss.zkex.zul.Center;
 import org.zkoss.zkex.zul.North;
 import org.zkoss.zul.Iframe;
+import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Toolbar;
-import org.zkoss.zul.Toolbarbutton;
 
-public class ZkJRViewer extends Window {
-
-	private static final long serialVersionUID = 2021796699437770927L;
+public class ZkJRViewer extends Window implements EventListener{
 
+	/**
+	 * generated serial version id
+	 */
+	private static final long serialVersionUID = -7657218073670612078L;
 	private JasperPrint jasperPrint;
-
+	private Listbox previewType = new Listbox();
+	private Iframe iframe;
+	private AMedia media;
 	/**	Logger			*/
 	private static CLogger log = CLogger.getCLogger(ZkJRViewer.class);
 	
@@ -40,11 +58,15 @@ public class ZkJRViewer extends Window {
 
 		Toolbar toolbar = new Toolbar();
 		toolbar.setHeight("26px");
-		Toolbarbutton button = new Toolbarbutton();
-		button.setImage("/images/Print24.png");
-		button.setTooltiptext("Print");
-		toolbar.appendChild(button);
 
+		previewType.setMold("select");
+		previewType.appendItem("PDF", "PDF");
+		previewType.appendItem("HTML", "HTML");
+		previewType.appendItem("Excel", "XLS");
+		previewType.appendItem("CSV", "CSV");
+		toolbar.appendChild(previewType);
+		previewType.addEventListener(Events.ON_SELECT, this);
+		
 		North north = new North();
 		layout.appendChild(north);
 		north.appendChild(toolbar);
@@ -58,16 +80,7 @@ public class ZkJRViewer extends Window {
 		iframe.setWidth("100%");
 
 		try {
-			String path = System.getProperty("java.io.tmpdir");
-			String prefix = makePrefix(jasperPrint.getName());
-			if (log.isLoggable(Level.FINE))
-			{
-				log.log(Level.FINE, "Path="+path + " Prefix="+prefix);
-			}
-			File file = File.createTempFile(prefix, ".pdf", new File(path));
-			JasperExportManager.exportReportToPdfFile(jasperPrint, file.getAbsolutePath());
-			AMedia media = new AMedia(getTitle(), "pdf", "application/pdf", file, true);
-			iframe.setContent(media);
+			renderReport();
 		} catch (Exception e) {
 			log.log(Level.SEVERE, e.getLocalizedMessage(), e);
 			throw new AdempiereException("Failed to render report.", e);
@@ -89,4 +102,103 @@ public class ZkJRViewer extends Window {
 		}
 		return prefix.toString();
 	}
+	/**************************************************************************
+	 * 	Action Listener
+	 * 	@param e event
+	 */
+	public void actionPerformed (Event e)
+	{
+		
+		if (e.getTarget() == previewType)
+			cmd_render();
+	}	//	actionPerformed
+
+	private void cmd_render() {
+		try {
+			renderReport();
+		} catch (Exception e) {
+			throw new AdempiereException("Failed to render report", e);
+		}
+	}
+	public void onEvent(Event event) throws Exception {	
+		if(event.getName().equals(Events.ON_CLICK) || event.getName().equals(Events.ON_SELECT))
+			actionPerformed(event);
+		
+	}
+	
+	private void renderReport() throws Exception {
+		Listitem selected = previewType.getSelectedItem();
+		if (selected == null || "PDF".equals(selected.getValue())) {
+			String path = System.getProperty("java.io.tmpdir");
+			String prefix = makePrefix(jasperPrint.getName());
+			if (log.isLoggable(Level.FINE))
+			{
+				log.log(Level.FINE, "Path="+path + " Prefix="+prefix);
+			}
+			File file = File.createTempFile(prefix, ".pdf", new File(path));
+			JasperExportManager.exportReportToPdfFile(jasperPrint, file.getAbsolutePath());
+			media = new AMedia(getTitle(), "pdf", "application/pdf", file, true);
+						
+			
+		} else if ("HTML".equals(previewType.getSelectedItem().getValue())) {
+			String path = System.getProperty("java.io.tmpdir");
+			String prefix = makePrefix(jasperPrint.getName());
+			if (log.isLoggable(Level.FINE))
+			{
+				log.log(Level.FINE, "Path="+path + " Prefix="+prefix);
+			}
+			File file = File.createTempFile(prefix, ".html", new File(path));
+			
+			JRHtmlExporter exporter = new JRHtmlExporter();
+	          exporter.setParameter(JRExporterParameter.JASPER_PRINT,jasperPrint);
+	          exporter.setParameter(JRExporterParameter.OUTPUT_FILE, file);
+	          // Make images available for the HTML output  
+	         exporter.setParameter(JRHtmlExporterParameter.IS_OUTPUT_IMAGES_TO_DIR, Boolean.TRUE);
+	         exporter.setParameter(JRHtmlExporterParameter.IMAGES_DIR_NAME, Executions.getCurrent().getDesktop().getSession().getWebApp().getRealPath("/images/report/"));
+	         HttpServletRequest request = (HttpServletRequest)Executions.getCurrent().getNativeRequest();
+	         exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, request.getContextPath()+"/images/report/");
+	 	     exporter.exportReport();			
+			media = new AMedia(getTitle(), "html", "text/html", file, false);
+		} else if ("XLS".equals(previewType.getSelectedItem().getValue())) {
+			String path = System.getProperty("java.io.tmpdir");
+			String prefix = makePrefix(jasperPrint.getName());
+			if (log.isLoggable(Level.FINE))
+			{
+				log.log(Level.FINE, "Path="+path + " Prefix="+prefix);
+			}
+			File file = File.createTempFile(prefix, ".xls", new File(path));		
+	        FileOutputStream fos = new FileOutputStream(file);
+
+			// coding For Excel:
+			JRXlsExporter exporterXLS = new JRXlsExporter();
+			exporterXLS.setParameter(JRXlsExporterParameter.JASPER_PRINT, jasperPrint);
+			exporterXLS.setParameter(JRXlsExporterParameter.OUTPUT_STREAM, fos);
+			exporterXLS.setParameter(JRXlsExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE);
+			exporterXLS.exportReport();			
+			media = new AMedia(getTitle(), "xls", "application/vnd.ms-excel", file, true);						
+			
+		}else if ("CSV".equals(previewType.getSelectedItem().getValue())) {
+			String path = System.getProperty("java.io.tmpdir");
+			String prefix = makePrefix(jasperPrint.getName());
+			if (log.isLoggable(Level.FINE))
+			{
+				log.log(Level.FINE, "Path="+path + " Prefix="+prefix);
+			}
+			File file = File.createTempFile(prefix, ".csv", new File(path));
+			FileOutputStream fos = new FileOutputStream(file);
+			JRCsvExporter exporter= new JRCsvExporter();
+			exporter.setParameter(JRExporterParameter.JASPER_PRINT,  jasperPrint);
+			exporter.setParameter(JRExporterParameter.OUTPUT_STREAM,  fos);
+			exporter.exportReport();
+			
+			media = new AMedia(getTitle(), "csv", "application/csv", file, true);	
+		}
+
+		iframe.setSrc(null);
+		Events.echoEvent("onRenderReport", this, null);		
+	}
+	
+	public void onRenderReport() {
+		iframe.setContent(media);
+	}
 }