diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java
index 68d3876f..33bedd53 100644
--- a/trunk/SIPRPSoft/src/siprp/Main.java
+++ b/trunk/SIPRPSoft/src/siprp/Main.java
@@ -91,14 +91,17 @@ public class Main implements com.evolute.utils.ui.window.Connector
 	public static void main( String args[] )
 		throws Exception
 	{
-		UIManager.put( "TextField.inactiveForeground", UIManager.get( "TextField.foreground" ) );
+		UIManager.put( "TextField.inactiveForeground", ColorUIResource.BLACK );
 		UIManager.put( "TextField.foreground", ColorUIResource.RED.darker() );
 		
-		UIManager.put( "TextArea.inactiveForeground", UIManager.get( "TextArea.foreground" ) );
+		UIManager.put( "TextArea.inactiveForeground", ColorUIResource.BLACK );
 		UIManager.put( "TextArea.foreground", ColorUIResource.RED.darker() );
 		
-		UIManager.put( "ComboBox.disabledForeground", UIManager.get( "ComboBox.foreground" ) );
+		UIManager.put( "ComboBox.disabledForeground", ColorUIResource.BLACK );
 		UIManager.put( "ComboBox.foreground", ColorUIResource.RED.darker() );
+		
+		UIManager.put( "FormattedTextField.inactiveForeground", ColorUIResource.BLACK );
+		UIManager.put( "FormattedTextField.foreground", ColorUIResource.RED.darker() );
 
 //		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Cl\u00ednico Avenida" );
 //		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java
index b398775f..2be0f31d 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java
@@ -38,7 +38,6 @@ import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.text.AbstractDocument.LeafElement;
 
 import leaf.data.Validator;
 import leaf.ui.LeafButton;
@@ -296,11 +295,19 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 	{
 		if( relatorio != null )
 		{
-			int ret = ask == false ? JOptionPane.YES_OPTION : JOptionPane.showConfirmDialog( this, "Todas as altera" + ccedil + otilde + "es ao plano de actua" + ccedil + atilde + "o ser" + atilde + "o perdidas\nTem a certeza?","Carregar dados do estabelecimento",JOptionPane.YES_NO_OPTION);
-			if( JOptionPane.YES_OPTION == ret )
+			try
 			{
-				HigieneSegurancaLogic.reverterRelatorio(relatorio);
-				setRelatorio( relatorio, false );
+				setCursor( new Cursor( Cursor.WAIT_CURSOR ) );
+				int ret = ask == false ? JOptionPane.YES_OPTION : JOptionPane.showConfirmDialog( this, "Todas as altera" + ccedil + otilde + "es ao plano de actua" + ccedil + atilde + "o ser" + atilde + "o perdidas\nTem a certeza?","Carregar dados do estabelecimento",JOptionPane.YES_NO_OPTION);
+				if( JOptionPane.YES_OPTION == ret )
+				{
+					HigieneSegurancaLogic.reverterRelatorio(relatorio);
+					setRelatorio( relatorio, false );
+				}
+			}
+			finally
+			{
+				setCursor( new Cursor( Cursor.DEFAULT_CURSOR ) );
 			}
 		}
 	}
@@ -558,6 +565,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 		buttonSubmit.setEnabled( enabled );
 		buttonPdfPlano.setEnabled( relatorio != null );
 		buttonRevertPlano.setEnabled( enabled );
+		panelFuncionarios.setEnabled( enabled );
 	}
 	
 	public void setRelatorio( HsRelatorio relatorio,boolean create )