git-svn-id: https://svn.coded.pt/svn/SIPRP@1431 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SIPRPSoft/src/siprp/data/Marcacao.java

@@ -214,6 +214,7 @@ public abstract class Marcacao extends BaseObject implements ColumnizedObject
 				aviso.save();
 				
 				empresa.save();
+				result = true;
 			}
 			else if( object instanceof MarcacoesEstabelecimentoData )
 			{
@@ -256,8 +257,9 @@ public abstract class Marcacao extends BaseObject implements ColumnizedObject
 				}
 				
 				estabelecimento.save();
+				result = true;
 			}
-			if( object instanceof MarcacoesTrabalhadorData )
+			else if( object instanceof MarcacoesTrabalhadorData )
 			{
 				AvisosData aviso = getProvider().load( AvisosData.class, 
 					new Object[]{ object.get( MarcacoesTrabalhadorData.ID ), new Integer( AvisosData.TIPO_TRABALHADOR ) }, 
@@ -315,13 +317,13 @@ public abstract class Marcacao extends BaseObject implements ColumnizedObject
 				}
 				
 				trab.save();
-			}
-			else
-			{
-				result = false;
-			}
 				result = true;
 			}
+//			else
+//			{
+//				result = false;
+//			}
+		}
 		catch ( Exception e )
 		{
 			throw new EvoDataException( e );