diff --git a/trunk/SIPRPSoft/jnlp/production/siprpsoft.jnlp b/trunk/SIPRPSoft/jnlp/production/siprpsoft.jnlp
index d432fad2..bdec7565 100644
--- a/trunk/SIPRPSoft/jnlp/production/siprpsoft.jnlp
+++ b/trunk/SIPRPSoft/jnlp/production/siprpsoft.jnlp
@@ -18,8 +18,8 @@
   <update check="timeout" policy="always" />
   <resources>
     <j2se version="1.6.0+" initial-heap-size="256m" max-heap-size="512m" />
-    <property name="server.port" value="5436" />
-    <property name="server.address" value="www.evolute.pt" />
+    <property name="server.port" value="5432" />
+    <property name="server.address" value="10.158.2.2" />
     <jar href="siprpsoft.jar" />
     <extension name="PDFRenderer" href="PDFRenderer.jnlp" />
     <jar href="lib/TableLayout.jar" />
diff --git a/trunk/SIPRPSoft/jnlp/test/siprpsoft.jnlp b/trunk/SIPRPSoft/jnlp/test/siprpsoft.jnlp
index 981843f2..8ddc0491 100644
--- a/trunk/SIPRPSoft/jnlp/test/siprpsoft.jnlp
+++ b/trunk/SIPRPSoft/jnlp/test/siprpsoft.jnlp
@@ -18,8 +18,8 @@
   <update check="timeout" policy="always" />
   <resources>
     <j2se version="1.6.0+" initial-heap-size="256m" max-heap-size="512m" />
-    <property name="server.port" value="5436" />
-    <property name="server.address" value="www.evolute.pt" />
+    <property name="server.port" value="5432" />
+    <property name="server.address" value="10.158.2.2" />
     <jar href="siprpsoft.jar" />
     <extension name="PDFRenderer" href="PDFRenderer.jnlp" />
     <jar href="lib/TableLayout.jar" />
diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar
index ae5757a9..889891d5 100644
Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ
diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties
index ec687219..7827c92e 100644
--- a/trunk/SIPRPSoft/properties/version.properties
+++ b/trunk/SIPRPSoft/properties/version.properties
@@ -1,6 +1,6 @@
 #siprpsoft versioning file
-#Tue Jul 20 10:33:05 WEST 2010
+#Tue Jul 20 19:53:26 WEST 2010
 major=12
 name=siprpsoft
 minor=1
-build=1
+build=4
diff --git a/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java b/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
index 0c614f69..6ef67835 100644
--- a/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
+++ b/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
@@ -278,11 +278,18 @@ public class PlanoActuacaoDataProvider
 		List< HsLegislacaoData > result = null;
 		try
 		{
-			Expression where = new Field( HsLegislacaoData.DELETED_DATE_FULL ).isEqual( null );
-			where = where.and( new Field( HsLegislacaoEmpresaData.EMPRESA_ID_FULL ).isEqual( empresa.getId() ) );
-			List<ForeignKey> fks = new LinkedList<ForeignKey>();
-			fks.add(  new ForeignKey( HsLegislacaoData.class, HsLegislacaoData.ID_FULL, HsLegislacaoEmpresaData.class, HsLegislacaoEmpresaData.LEGISLACAO_ID_FULL ) );
-			result = ENTITY_PROVIDER.listLoad( HsLegislacaoData.class, fks, where, new String[] { HsLegislacaoData.DESCRIPTION_FULL } );
+			if( empresa != null )
+			{
+				Expression where = new Field( HsLegislacaoData.DELETED_DATE_FULL ).isEqual( null );
+				where = where.and( new Field( HsLegislacaoEmpresaData.EMPRESA_ID_FULL ).isEqual( empresa.getId() ) );
+				List<ForeignKey> fks = new LinkedList<ForeignKey>();
+				fks.add(  new ForeignKey( HsLegislacaoData.class, HsLegislacaoData.ID_FULL, HsLegislacaoEmpresaData.class, HsLegislacaoEmpresaData.LEGISLACAO_ID_FULL ) );
+				result = ENTITY_PROVIDER.listLoad( HsLegislacaoData.class, fks, where, new String[] { HsLegislacaoData.DESCRIPTION_FULL } );
+			}
+			else
+			{
+				result = ENTITY_PROVIDER.listLoad( HsLegislacaoData.class, new Object[]{ null }, new String[] { HsLegislacaoData.DELETED_DATE_FULL }, new String[]{ HsLegislacaoData.DESCRIPTION_FULL } );
+			}
 		}
 		catch ( Exception e )
 		{