From d1e214e55d516b101ca7a029fa9644abf2333922 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 18 Feb 2016 19:16:44 +0000
Subject: [PATCH] fixes bug #7139

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@53053 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../service/impl/ConferenciaComissaoServiceImpl.java        | 6 ++++--
 .../ventaboletos/vo/comissao/MovimentosAtrasoVO.java        | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 745e09440..2255fd3ae 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -422,12 +422,14 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 					conferencia.setPuntoVenta(puntoVenta);
 					
 					conferencia = suscribirOrActualizacion(conferencia);
-				} else if(conferencia != null && conferencia.getIndmaloterecebido()) {
+				} 
+				cDataInicial.add(Calendar.DAY_OF_MONTH, 1);
+
+				if(conferencia != null && conferencia.getIndmaloterecebido()) {
 					continue;
 				}
 				confirmarChegadaMalote(conferencia);
 				
-				cDataInicial.add(Calendar.DAY_OF_MONTH, 1);
 				
 			}
 			
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java
index f5dcfde05..e21fafe0b 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java
@@ -123,11 +123,11 @@ public class MovimentosAtrasoVO implements Comparable<MovimentosAtrasoVO> {
 	}
 	
 	public String getDescricaoSituacao() {
-		return getSituacao().toString();
+		return getSituacao() != null ? getSituacao().toString() : "";
 	}
 
 	public String getShortDescricaoSituacao() {
-		return getSituacao().getShortDescricao();
+		return getSituacao() != null ? getSituacao().getShortDescricao() : "";
 	}
 
 	@Override