diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar
index d05990d7..5a05972c 100644
Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ
diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar
index 0ab9bced..27dd146d 100644
Binary files a/trunk/SIPRPSoft/lib/shst.jar and b/trunk/SIPRPSoft/lib/shst.jar differ
diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties
index ca5a9b1d..e27d0eba 100644
--- a/trunk/SIPRPSoft/properties/version.properties
+++ b/trunk/SIPRPSoft/properties/version.properties
@@ -1,6 +1,6 @@
 #siprpsoft versioning file
-#Mon Aug 16 09:51:42 WEST 2010
+#Thu Aug 19 09:59:31 WEST 2010
 major=12
 name=siprpsoft
 minor=1
-build=11
+build=12
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioLegislacaoPanel.java
index 085ec654..958a5857 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioLegislacaoPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioLegislacaoPanel.java
@@ -12,7 +12,6 @@ import java.util.List;
 import java.util.Vector;
 
 import javax.swing.JButton;
-import javax.swing.JPanel;
 
 import leaf.ui.SimpleTable;
 import siprp.data.outer.EstabelecimentosData;
@@ -21,10 +20,11 @@ import siprp.data.outer.HsRelatorioLegislacaoData;
 import siprp.data.outer.MarcacoesEstabelecimentoData;
 import siprp.logic.HigieneSegurancaLogic;
 
+import com.evolute.swing.panel.EvoPanel;
 import com.evolute.utils.error.ErrorLogger;
 import com.evolute.utils.tables.ColumnizedObjectArray;
 
-public class RelatorioLegislacaoPanel extends JPanel
+public class RelatorioLegislacaoPanel extends EvoPanel
 {
 
 	private static final long serialVersionUID = 1L;
@@ -51,25 +51,32 @@ public class RelatorioLegislacaoPanel extends JPanel
 			@Override
 			public void actionPerformed( ActionEvent e )
 			{
-				if( relatorio != null )
+				runAsynchronously( new Runnable()
 				{
-					MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
-					if( marcacao != null )
+					@Override
+					public void run()
 					{
-						EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
-						if( estabelecimento != null )
+						if( relatorio != null )
 						{
-							try
+							MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
+							if( marcacao != null )
 							{
-								HigieneSegurancaLogic.reverterLegislacao( relatorio, estabelecimento );
-							} catch( Exception e1 )
-							{
-								ErrorLogger.logException( e1 );
+								EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
+								if( estabelecimento != null )
+								{
+									try
+									{
+										HigieneSegurancaLogic.reverterLegislacao( relatorio, estabelecimento, true );
+									} catch( Exception e1 )
+									{
+										ErrorLogger.logException( e1 );
+									}
+								}
 							}
+							refresh();
 						}
 					}
-					refresh();
-				}
+				} );
 			}
 		} );
 	}
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java
index 50199ce8..196ddee4 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.Vector;
 
 import javax.swing.JButton;
-import javax.swing.JPanel;
 
 import leaf.ui.SimpleTable;
 import siprp.data.outer.EstabelecimentosData;
@@ -22,10 +21,11 @@ import siprp.data.outer.HsRelatorioNormalizacaoData;
 import siprp.data.outer.MarcacoesEstabelecimentoData;
 import siprp.logic.HigieneSegurancaLogic;
 
+import com.evolute.swing.panel.EvoPanel;
 import com.evolute.utils.error.ErrorLogger;
 import com.evolute.utils.tables.ColumnizedObjectArray;
 
-public class RelatorioNormalizacaoPanel extends JPanel
+public class RelatorioNormalizacaoPanel extends EvoPanel
 {
 
 	private static final long serialVersionUID = 1L;
@@ -53,25 +53,32 @@ public class RelatorioNormalizacaoPanel extends JPanel
 			@Override
 			public void actionPerformed( ActionEvent e )
 			{
-				if( relatorio != null )
+				runAsynchronously( new Runnable()
 				{
-					MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
-					if( marcacao != null )
+					@Override
+					public void run()
 					{
-						EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
-						if( estabelecimento != null )
+						if( relatorio != null )
 						{
-							try
+							MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
+							if( marcacao != null )
 							{
-								HigieneSegurancaLogic.reverterNormalizacao( relatorio, estabelecimento );
-							} catch( Exception e1 )
-							{
-								ErrorLogger.logException( e1 );
+								EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
+								if( estabelecimento != null )
+								{
+									try
+									{
+										HigieneSegurancaLogic.reverterNormalizacao( relatorio, estabelecimento, true );
+									} catch( Exception e1 )
+									{
+										ErrorLogger.logException( e1 );
+									}
+								}
 							}
+							refresh();
 						}
 					}
-					refresh();
-				}
+				} );
 			}
 		} );
 	}
diff --git a/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java b/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java
index 1837d8e7..269a5f12 100644
--- a/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java
+++ b/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java
@@ -216,14 +216,10 @@ public class HigieneSegurancaLogic
 				EstabelecimentosData estabelecimento = relatorio.toMarcacao_id() == null ? null : relatorio.toMarcacao_id().toEstabelecimento_id();
 				if( estabelecimento != null )
 				{
-					System.out.println("delete");
 					deleteRelatorioContents( relatorio );
-					System.out.println("are");
 					reverterAreas( relatorio, estabelecimento );
-					System.out.println("leg");
-					reverterLegislacao( relatorio, estabelecimento );
-					System.out.println("norm");
-					reverterNormalizacao( relatorio, estabelecimento );
+					reverterLegislacao( relatorio, estabelecimento, false );
+					reverterNormalizacao( relatorio, estabelecimento, false );
 				}
 			}
 		}
@@ -390,7 +386,7 @@ public class HigieneSegurancaLogic
 		}
 	}
 
-	public static void reverterLegislacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
+	public static void reverterLegislacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento, boolean delete ) throws Exception
 	{
 //		System.out.println( "\nreverterLegislacao( " + estabelecimento + " ) : " );
 		
@@ -404,7 +400,13 @@ public class HigieneSegurancaLogic
 //		{
 //			relatorio.fromHsRelatorioLegislacao_hs_relatorio_id().get( 0 ).delete();
 //		}
-		
+		if( delete )
+		{
+			for( HsRelatorioLegislacaoData rl : relatorio.fromHsRelatorioLegislacao_hs_relatorio_id() )
+			{
+				rl.delete();
+			}
+		}
 		for( HsLegislacaoEstabelecimentoData rel : estabelecimento.fromHsLegislacaoEstabelecimento_estabelecimento_id() )
 		{
 			HsLegislacaoData legislacao = rel.toLegislacao_id();
@@ -430,7 +432,7 @@ public class HigieneSegurancaLogic
 		return result;
 	}
 	
-	public static void reverterNormalizacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
+	public static void reverterNormalizacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento, boolean delete ) throws Exception
 	{
 //		System.out.println( "\nreverterNormalizacao( " + estabelecimento + " ) : " );
 		
@@ -444,7 +446,13 @@ public class HigieneSegurancaLogic
 //		{
 //			relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().get( 0 ).delete();
 //		}
-		
+		if( delete )
+		{
+			for( HsRelatorioNormalizacaoData rn : relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id() )
+			{
+				rn.delete();
+			}
+		}
 		for( HsNormalizacaoEstabelecimentoData rel : estabelecimento.fromHsNormalizacaoEstabelecimento_estabelecimento_id() )
 		{
 			HsNormalizacaoData normalizacao = rel.toNormalizacao_id();