diff --git a/pom.xml b/pom.xml index a62e9dc9b..a055001e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.10.6 + 1.10.7 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajarDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajarDetalhado.java index c1faf3eff..97dd7fffe 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajarDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajarDetalhado.java @@ -84,7 +84,7 @@ public class RelatorioPassageirosViajarDetalhado extends Relatorio { sql.append(" U.CVEUSUARIO AS AGENTE, "); sql.append(" ' ' AS CONTROLE "); sql.append(" FROM BOLETO B INNER JOIN USUARIO U ON (B.USUARIO_ID = U.USUARIO_ID) "); - sql.append(" WHERE B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL "+passagemAberta+" "); + sql.append(" WHERE ((B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL) OR (TIPOVENTA_ID = 15 AND B.MOTIVOCANCELACION_ID IS NULL)) "+passagemAberta+" "); if (dataCadastroInicial != null && dataCadastroFinal != null) { sql.append("AND B.FECCREACION BETWEEN TO_DATE('" + formatSemHora.format(dataCadastroInicial) + " 00:00:00', " + formatToDate + ") " + "AND TO_DATE('" + formatSemHora.format(dataCadastroFinal) + " 23:59:59', " + formatToDate + ") ");