diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index 9373f9a94..d6719aea4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -704,7 +704,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId()); String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy"); String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento; for (LogConferencia logConferencia : lsLogConferencia) { - + Calendar cal =calHoje; + if(!Boolean.TRUE.equals(logConferencia.getIndmesmodia())){ - cal.add(Calendar.DAY_OF_MONTH, 1); + cal = calAmanha; } if (logConferencia.getStatus().equals(StatusLogConferencia.CONFERIDO) diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java index a88dc533a..3c8f01111 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java +++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java @@ -71,6 +71,8 @@ public class BoletoComissao { private Date feccorrida; private Integer corridaId; + + private Boolean indCancelacion; public Integer getEmpresaId() { return empresaId; @@ -1066,4 +1068,14 @@ public class BoletoComissao { this.valorTarjetaOcd = valorTarjetaOcd; } + public Boolean getIndCancelacion() { + return indCancelacion; + } + + public void setIndCancelacion(Boolean indCancelacion) { + this.indCancelacion = indCancelacion; + } + + + }