diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties
index 017b6513..24249feb 100644
--- a/trunk/SIPRPSoft/properties/version.properties
+++ b/trunk/SIPRPSoft/properties/version.properties
@@ -1,6 +1,6 @@
 #siprpsoft versioning file
-#Mon Aug 23 19:42:10 WEST 2010
+#Tue Aug 24 10:59:33 WEST 2010
 major=12
 name=siprpsoft
 minor=2
-build=2
+build=3
diff --git a/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java b/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
index 5a0c873c..6f69331f 100644
--- a/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
+++ b/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
@@ -437,19 +437,19 @@ public class PlanoActuacaoDataProvider
 		List<EvoJoinObject> result = null;
 		List<ForeignKey> fks = new LinkedList<ForeignKey>();
 		
-		ForeignKey fk1 = new ForeignKey( HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL, HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.RISCO_ID_FULL );
-		fk1.setJoin( JOIN.INNER );
-		ForeignKey fk2 = new ForeignKey( HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.POSTO_ID_FULL, HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.POSTO_ID_FULL );
-		fk2.setJoin( JOIN.OUTER );
-		ForeignKey fk3 = new ForeignKey( HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.MEDIDA_ID_FULL, HsRelatorioMedidaData.class, HsRelatorioMedidaData.ID_FULL );
-		fk3.setJoin( JOIN.OUTER );
-		fks.add( fk1 );
-		fks.add( fk2 );
-		fks.add( fk3 );
+//		ForeignKey fk1 = new ForeignKey( HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL, HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.RISCO_ID_FULL );
+//		fk1.setJoin( JOIN.INNER );
+//		ForeignKey fk2 = new ForeignKey( HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.POSTO_ID_FULL, HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.POSTO_ID_FULL );
+//		fk2.setJoin( JOIN.OUTER );
+//		ForeignKey fk3 = new ForeignKey( HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.MEDIDA_ID_FULL, HsRelatorioMedidaData.class, HsRelatorioMedidaData.ID_FULL );
+//		fk3.setJoin( JOIN.OUTER );
+//		fks.add( fk1 );
+//		fks.add( fk2 );
+//		fks.add( fk3 );
 		
-//		fks.add( new ForeignKey( HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.MEDIDA_ID_FULL, HsRelatorioMedidaData.class, HsRelatorioMedidaData.ID_FULL ) );
-//		fks.add( new ForeignKey( HsRelatorioMedidaData.class, HsRelatorioMedidaData.RISCO_ID_FULL, HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL ) );
-//		fks.add( new ForeignKey( HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL, HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.RISCO_ID_FULL ) );
+		fks.add( new ForeignKey( HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.MEDIDA_ID_FULL, HsRelatorioMedidaData.class, HsRelatorioMedidaData.ID_FULL ) );
+		fks.add( new ForeignKey( HsRelatorioMedidaData.class, HsRelatorioMedidaData.RISCO_ID_FULL, HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL ) );
+		fks.add( new ForeignKey( HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL, HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.RISCO_ID_FULL ) );
 		
 		Expression where = new Field( HsRelatorioPostoMedidaData.POSTO_ID_FULL ).isEqual( posto.getId() ).and(
 				new Field( HsRelatorioRiscoData.DELETED_DATE_FULL ).isEqual( null )
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java
index 86ec8926..cf0619e8 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java
@@ -186,12 +186,13 @@ public class GerirMedidasRelatorioPanel extends SIPRPLazyLoadedPanel
 					if( selection instanceof RiscoRelatorioNode )
 					{
 						object = selection == null ? null : ((RiscoRelatorioNode) selection).getUserObject();
-
+						setEnabled();
 					}
 					else if( selection instanceof MedidaRelatorioNode )
 					{
 						object = selection == null ? null : ((MedidaRelatorioNode) selection).getUserObject();
 						selectedMedida = (HsRelatorioPostoMedidaData) object;
+						setEnabled();
 					}
 				}
 				firePropertyChange( SELECTION_CHANGED, null, object );
@@ -447,7 +448,7 @@ public class GerirMedidasRelatorioPanel extends SIPRPLazyLoadedPanel
 		{
 			try
 			{
-				List< EvoJoinObject > objects = HigieneSegurancaLogic.getRelatorioMedidasForPosto( posto );
+				List<EvoJoinObject> objects = HigieneSegurancaLogic.getRelatorioMedidasForPosto( posto );
 				RiscoRelatorioNode riscoNode = null;
 				for( EvoJoinObject evoJoinObject : objects )
 				{
@@ -469,7 +470,6 @@ public class GerirMedidasRelatorioPanel extends SIPRPLazyLoadedPanel
 			{
 				ErrorLogger.logExceptionAndShow( e );
 			}
-			
 		}
 		
 		TreeTools.sort( root, new Comparator<DefaultMutableTreeNode>()