diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java
index f27544b8..3354fa1c 100644
--- a/trunk/siprp/Main.java
+++ b/trunk/siprp/Main.java
@@ -29,7 +29,7 @@ import javax.swing.tree.*;
 
 public class Main implements com.evolute.utils.ui.window.Connector
 {
-	public final static String SHST_VERSION = "5.8.6";
+	public final static String SHST_VERSION = "5.8.7";
 	
 	private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader();
 	
diff --git a/trunk/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/siprp/companydataloaders/SIPRPDataLoader.java
index f084da7d..497bb5d6 100644
--- a/trunk/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/siprp/companydataloaders/SIPRPDataLoader.java
@@ -95,7 +95,7 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "-rg2hevoevo" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
 		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
@@ -104,7 +104,7 @@ public class SIPRPDataLoader implements CompanyDataLoader
 		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.3:5432" );
 		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
 		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-		
+//		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
diff --git a/trunk/siprp/ficha/EmpresaPanel.java b/trunk/siprp/ficha/EmpresaPanel.java
index ab40bc49..b33cee9b 100644
--- a/trunk/siprp/ficha/EmpresaPanel.java
+++ b/trunk/siprp/ficha/EmpresaPanel.java
@@ -311,7 +311,7 @@ public class EmpresaPanel extends JPanel
 				try
 				{
 					empresa = (EmpresaData)JDO.load( EmpresaData.class, empresaID );
-					String names[] = empresa.getFieldNames();
+					String names[] = (String[])empresaComponents.keySet().toArray( new String[0] );
 					ComponentController.fill( names, empresa.getHashData(), empresaComponents );
 					
 					if( estabelecimentoID != null )
@@ -408,7 +408,7 @@ public class EmpresaPanel extends JPanel
 //				estabelecimento.setProperty( name, hash.get( name ) );
 //			}
 			
-			String names[] = empresa.getFieldNames();
+			String names[] = (String[])empresaComponents.keySet().toArray( new String[0] );
 //			String names[] = new String[]{ EmpresaData.DESIGNACAO_SOCIAL, EmpresaData.SERVICO_SAUDE_TIPO, 
 //											EmpresaData.SERVICO_SAUDE_DESIGNACAO, EmpresaData.SERVICO_HIGIENE_TIPO,
 //											EmpresaData.SERVICO_HIGIENE_DESIGNACAO };
diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/siprp/ficha/FichaWindow.java
index 358914c3..aef15588 100644
--- a/trunk/siprp/ficha/FichaWindow.java
+++ b/trunk/siprp/ficha/FichaWindow.java
@@ -705,7 +705,7 @@ public class FichaWindow extends TabbedWindow
 		ListActionDialog dialog = new ListActionDialog( this, "Imprimir Fichas Anteriores", new String[]{ "Data" },
 												linhas, this );
 		dialog.setSize( 250, 200 );
-		dialog.show();
+		dialog.setVisible( true );
 	}
 	
 	public boolean executeListAction( int line, Object value )