fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #7139 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@53053 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-02-18 19:16:44 +00:00
parent dd2bc75588
commit d1e214e55d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -422,12 +422,14 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
conferencia.setPuntoVenta(puntoVenta); conferencia.setPuntoVenta(puntoVenta);
conferencia = suscribirOrActualizacion(conferencia); conferencia = suscribirOrActualizacion(conferencia);
} else if(conferencia != null && conferencia.getIndmaloterecebido()) { }
cDataInicial.add(Calendar.DAY_OF_MONTH, 1);
if(conferencia != null && conferencia.getIndmaloterecebido()) {
continue; continue;
} }
confirmarChegadaMalote(conferencia); confirmarChegadaMalote(conferencia);
cDataInicial.add(Calendar.DAY_OF_MONTH, 1);
} }

4
src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java
View File

@ -123,11 +123,11 @@ public class MovimentosAtrasoVO implements Comparable<MovimentosAtrasoVO> {
} }
public String getDescricaoSituacao() { public String getDescricaoSituacao() {
return getSituacao().toString(); return getSituacao() != null ? getSituacao().toString() : "";
} }
public String getShortDescricaoSituacao() { public String getShortDescricaoSituacao() {
return getSituacao().getShortDescricao(); return getSituacao() != null ? getSituacao().getShortDescricao() : "";
} }
@Override @Override