From 56b2edf731cecc6478ce6a98e6703043b7cf0af2 Mon Sep 17 00:00:00 2001
From: Carlos Augusto Sanchez <carlos.sanchez@globalqss.com>
Date: Tue, 28 May 2013 12:41:00 -0500
Subject: [PATCH] IDEMPIERE-970 Role with the can Export option deselected
 would actually be able to export

---
 .../webui/panel/action/ReportAction.java      | 34 +++++++++++++------
 .../webui/window/ZkReportViewer.java          | 15 +++++---
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
index bf8b4d0b13..9d4b7cca60 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
@@ -88,6 +88,7 @@ public class ReportAction implements EventListener<Event>
 	
 	public void show() 
 	{
+		final boolean isCanExport=MRole.getDefault().isCanExport();
 		if(winReport == null)
 		{
 			winReport = new Window();
@@ -119,10 +120,13 @@ public class ReportAction implements EventListener<Event>
 			
 			chkCurrentRowOnly.setLabel(Msg.getMsg(Env.getCtx(), "CurrentRowOnly"));
 			chkCurrentRowOnly.setSelected(false);
-
-			chkExport.setLabel(Msg.getMsg(Env.getCtx(), "Export"));
-			chkExport.setSelected(false);
-
+			
+			if( isCanExport )
+			{
+				chkExport.setLabel(Msg.getMsg(Env.getCtx(), "Export"));
+				chkExport.setSelected(false);
+		        }
+			
 			chkAllColumns.setLabel(Msg.getMsg(Env.getCtx(), "AllColumns"));
 			chkAllColumns.setSelected(false);
 			li = cboPrintFormat.getSelectedItem();
@@ -151,13 +155,21 @@ public class ReportAction implements EventListener<Event>
 
 			vb.appendChild(chkCurrentRowOnly);
 			
-			hb = new Hbox();
-			hb.setAlign("center");
-			hb.appendChild(chkExport);
-			chkExport.addEventListener(Events.ON_CHECK, this);
-			hb.appendChild(cboExportType);
-			cboExportType.setWidth("100%");
-			vb.appendChild(hb);
+		
+			
+			if ( isCanExport )
+			{
+				hb = new Hbox();
+				hb.setAlign("center");
+				hb.appendChild(chkExport);
+				chkExport.addEventListener(Events.ON_CHECK, this);
+				hb.appendChild(cboExportType);
+				cboExportType.setWidth("100%");
+				vb.appendChild(hb);
+			}
+			
+	
+			
 			
 			vb.appendChild(chkAllColumns);
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
index d4642d5c03..53f0e729d5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
@@ -234,9 +234,14 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		toolBar.setWidth("100%");
 		
 		previewType.setMold("select");
-		previewType.appendItem("PDF", "PDF");
 		previewType.appendItem("HTML", "HTML");
-		previewType.appendItem("Excel", "XLS");
+		
+		if ( m_isCanExport )
+		{
+			previewType.appendItem("PDF", "PDF");
+			previewType.appendItem("Excel", "XLS");
+		}
+		
 		toolBar.appendChild(previewType);		
 		previewType.addEventListener(Events.ON_SELECT, this);
 		toolBar.appendChild(new Separator("vertical"));
@@ -247,9 +252,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 				? MSysConfig.getValue(MSysConfig.ZK_REPORT_FORM_OUTPUT_TYPE,"PDF",Env.getAD_Client_ID(m_ctx),Env.getAD_Org_ID(m_ctx))
 				: MSysConfig.getValue(MSysConfig.ZK_REPORT_TABLE_OUTPUT_TYPE,"PDF",Env.getAD_Client_ID(m_ctx),Env.getAD_Org_ID(m_ctx));
 
-		if ("PDF".equals(type))
+		if ("HTML".equals(type))
 			previewType.setSelectedIndex(0);
-		else if ("HTML".equals(type))
+		else if ("PDF".equals(type))
 			previewType.setSelectedIndex(1);
 		else if ("XLS".equals(type))
 			previewType.setSelectedIndex(2);
@@ -306,7 +311,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		toolBar.appendChild(bArchive);
 		bArchive.addEventListener(Events.ON_CLICK, this);
 		
-		if (m_isCanExport)
+		if ( m_isCanExport )
 		{
 			bExport.setName("Export");
 			bExport.setImage(ThemeManager.getThemeResource("images/Export24.png"));