diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
index 08a3dce8..758b2bd5 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
@@ -629,7 +629,7 @@ public class ListaPlanos extends AbstractPageBean
 			System.out.println( "CREATING PDF ..." );
 			byte[] pdf = pdfCreator.createPDF( pID, true, withPatrimoniais );
 			System.out.println( "\t.. DONE !" );
-            showPdf( pdf );
+            showPdf( pdf, withPatrimoniais );
         }
         catch ( Exception ex )
         {
@@ -638,40 +638,27 @@ public class ListaPlanos extends AbstractPageBean
         }
 	}
 
-    private void showPdf( byte[] pdf ) throws Exception
+    private void showPdf( byte[] pdf, boolean isPatrimoniais ) throws Exception
     {
-//        FacesContext fc = getFacesContext();
-//        HttpServletResponse response = (HttpServletResponse) fc.getExternalContext().getResponse();
-//        response.setContentType("application/pdf");
-//        //response.getOutputStream().flush();
-//        response.flushBuffer();             
-//        response.getOutputStream().write(pdf, 0, pdf.length);
-//        fc.getResponseComplete();
-        
-        System.out.println("PDF LEN : " + pdf.length);
-        
+		String filename = isPatrimoniais ? "Plano_Patrimoniais.pdf" : "Plano.pdf";
+        System.out.println( "\nPDF LEN : " + pdf.length );
+		System.out.println( "FileName : " + filename );
+		
 		FacesContext context = FacesContext.getCurrentInstance();
-        HttpServletResponse response =
-			( HttpServletResponse ) context.getExternalContext().getResponse();
+        HttpServletResponse response = ( HttpServletResponse ) context.getExternalContext().getResponse();
         
         response.setHeader( "Expires", "0" );
         response.setHeader( "Cache-Control", "must-revalidate, post-check=0, pre-check=0" );
-//response.setHeader("Content-disposition","inline; filename=kiran.pdf");
         response.setHeader( "Pragma", "public" );
         response.setContentType( "application/pdf" );
-//response.setHeader("Content-Disposition", "attachment;filename=\"ContactList.pdf\"");
-        response.addHeader( "Content-disposition", "attachment;filename=\"Plano.pdf\"" );
-        
-        //response.setHeader("Content-disposition", "filename=plano.pdf");
+        response.addHeader( "Content-disposition", "attachment;filename=\"" + filename + "\"" );
         response.setContentLength( pdf.length );
-        //try {
-                response.getOutputStream().write( pdf );
-                response.getOutputStream().flush();
-                response.getOutputStream().close();
-                context.responseComplete();
-//        } catch (IOException e) {
-//                ErrorLogger.logException( e );
-//        }        
+
+		response.getOutputStream().write( pdf );
+		response.getOutputStream().flush();
+		response.getOutputStream().close();
+		context.responseComplete();
+       
 		System.out.println( "SHOW PDF done." );
    }
     
diff --git a/trunk/PlanosActuacao/web/ListaPlanos.jsp b/trunk/PlanosActuacao/web/ListaPlanos.jsp
index 8a6c6553..49ce13f5 100644
--- a/trunk/PlanosActuacao/web/ListaPlanos.jsp
+++ b/trunk/PlanosActuacao/web/ListaPlanos.jsp
@@ -91,8 +91,11 @@
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlano_action}" id="lnkPlanoActivo"
                                                         style="color: #008000;" text="imprimir"/>
 													<webuijsf:staticText id="staticTextActivosSeparator" text=" | " />
+													<webuijsf:staticText id="lnkPlanoImprimirPatrimoniais" text="imprimir (Patrimoniais)" />
+													<!--
 													<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoPatrimoniais_action}" id="lnkPlanoImprimirPatrimoniais"
                                                         style="color: #008000;" text="imprimir (Patrimoniais)"/>
+													-->
                                                 </webuijsf:tableColumn>
                                                 <webuijsf:tableColumn headerText="Loja" id="tableColumn13" sort="loja_nome">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkLojaActivo" text="#{currentRow.value['nome_estabelecimento']}"/>
@@ -149,8 +152,10 @@
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromSeguimento_action}" id="hyperlink4"
                                                         style="color: #008000;" text="imprimir" />
 													<webuijsf:staticText id="staticTextSeguimentoSeparator" text=" | " />
-													<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoSeguimentoPatrimoniais_action}" id="lnkPlanoImprimirSeguimentoPatrimoniais"
+													<webuijsf:staticText id="lnkPlanoImprimirSeguimentoPatrimoniais" text="imprimir (Patrimoniais)" />
+													<!-- <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoSeguimentoPatrimoniais_action}" id="lnkPlanoImprimirSeguimentoPatrimoniais"
                                                         style="color: #008000;" text="imprimir (Patrimoniais)"/>
+													-->
                                                 </webuijsf:tableColumn>
                                                 <webuijsf:tableColumn headerText="Loja" id="tableColumn14" sort="nome_estabelecimento">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink5" text="#{currentRow.value['nome_estabelecimento']}"/>
@@ -205,8 +210,10 @@
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromConcluidos_action}" id="hyperlink9"
                                                         style="color: #008000;" text="imprimir"/>
 													<webuijsf:staticText id="staticTextConcluidoSeparator" text=" | " />
-													<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoConcluidoPatrimoniais_action}" id="lnkPlanoImprimirConcluidoPatrimoniais"
+													<webuijsf:staticText id="lnkPlanoImprimirConcluidoPatrimoniais" text="imprimir (Patrimoniais)" />
+													<!-- <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoConcluidoPatrimoniais_action}" id="lnkPlanoImprimirConcluidoPatrimoniais"
                                                         style="color: #008000;" text="imprimir (Patrimoniais)"/>
+													-->
                                                 </webuijsf:tableColumn>
                                                 <webuijsf:tableColumn headerText="Loja" id="tableColumn15" sort="nome_estabelecimento">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink10" text="#{currentRow.value['nome_estabelecimento']}"/>