From 4291b248cd582ebd4488fd3031436eea3e26720e Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Tue, 1 Oct 2024 17:22:18 -0300
Subject: [PATCH] fixes bug#AL-4336

---
 pom.xml                                       |   2 +-
 .../impl/RelatorioBilhetesVendidos.java       | 415 +++++------
 ...oBilhetesVendidosFiltroFormaPagamento.java | 353 +++++++++
 .../RelatorioBilhetesVendidosNovoLayout.java  | 213 +++---
 ...VendidosFiltroFormaPagamento_es.properties |  13 +
 ...didosFiltroFormaPagamento_pt_BR.properties |  13 +
 ...ilhetesVendidosFiltroFormaPagamento.jasper | Bin 0 -> 57256 bytes
 ...BilhetesVendidosFiltroFormaPagamento.jrxml | 672 ++++++++++++++++++
 .../RelatorioBilhetesVendidosController.java  |  35 +-
 web/WEB-INF/i3-label_en.label                 |   1 +
 web/WEB-INF/i3-label_es_MX.label              |   1 +
 web/WEB-INF/i3-label_fr_FR.label              |   1 +
 web/WEB-INF/i3-label_pt_BR.label              |   1 +
 .../filtroRelatorioBilhetesVendidos.zul       |  25 +-
 14 files changed, 1429 insertions(+), 316 deletions(-)
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_es.properties
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_pt_BR.properties
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jasper
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml

diff --git a/pom.xml b/pom.xml
index 5a819b524..f76ebaed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.147.3</version>
+	<version>1.148.0</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
index c2b7ff1c2..fb5034143 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
@@ -38,210 +38,7 @@ public class RelatorioBilhetesVendidos extends Relatorio {
 				Connection conexao = this.relatorio.getConexao();
 				Map<String, Object> parametros = this.relatorio.getParametros();
 
-				StringBuilder sql = new StringBuilder();
-				
-				if (parametros.get("IDAVOLTA").equals("1")) {
-					sql.append(" select ");
-					sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
-					sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
-					sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
-					sql.append(" B.NUMFOLIOSISTEMA NUMERO_PASSAGEM, ");
-					sql.append(" B.NUMSERIEPREIMPRESA SERIE, ");
-					sql.append(" B.NUMSERIEPREIMPRESA SUB_SERIE, ");
-	                sql.append(" B.NUMFOLIOPREIMPRESO PRE_IMPRESSO, ");
-	                sql.append(" p_origen.PARADA_ID COD_ORIGEM, ");
-	                sql.append(" p_origen.DESCPARADA ORIGEM, ");
-	                sql.append(" p_destino.PARADA_ID COD_DESTINO, ");
-	                sql.append(" p_destino.DESCPARADA DESTINO, ");
-	                sql.append(" pv.NUMPUNTOVENTA COD_AGENCIA, ");
-	                sql.append(" pv.NOMBPUNTOVENTA NOME_AGENCIA, ");
-	                sql.append(" CASE WHEN B.indstatusboleto = 'E' THEN utilizado.fechorventa_h  ELSE B.fechorventa_h END DATA_VENDA, ");
-	                sql.append(" CASE WHEN b.fechorventa  is null THEN utilizado.fechorventa ELSE b.fechorventa_h END DATA_EMISSAO, ");
-	                sql.append(" B.fechorviaje DATA_VIAGEM, ");
-	                sql.append(" B.CORRIDA_ID SERVICO, ");
-	                sql.append(" to_char(B.fechorviaje, 'hh24:mi:ss') HORA, ");
-	                sql.append(" B.NUMASIENTO NUMASIENTO, ");
-	                sql.append(" ct.DESCCATEGORIA CATEGORIA, ");
-	                sql.append(" R.INDSENTIDOIDA SENTIDO, ");
-	                sql.append(" R.NUMRUTA COD_LINHA, ");
-	                sql.append(" R.DESCRUTA DESC_LINHA, ");
-	                sql.append(" CASE WHEN b.MOTIVOCANCELACION_ID IS NULL THEN 'V' ELSE 'C' END STATUS_PASSAGEM, ");
-	                sql.append(" B.PRECIOPAGADO TARIFA, ");
-	                sql.append(" B.IMPORTETAXAEMBARQUE TX_EMBARQUE, ");
-	                sql.append(" B.IMPORTEPEDAGIO PEDAGIO, ");
-	                sql.append(" B.IMPORTESEGURO SEGURO, ");
-	                sql.append(" u.NOMBUSUARIO BILHETEIRO, ");
-	                sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, ");
-	                sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
-	                sql.append(" B.DESCNUMDOC AS DOC, ");
-	                sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR ");
-					
-					sql.append(" FROM caja B ");
-					sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id  AND b.indstatusboleto = 'C') ");
-					sql.append(" JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ");
-					sql.append(" JOIN PUNTO_VENTA pv on B.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
-					sql.append(" JOIN USUARIO u on u.USUARIO_ID = B.USUARIO_ID ");
-					sql.append(" LEFT JOIN USUARIO uc ON uc.USUARIO_ID = bo.USUARIO_ID ");
-					sql.append(" JOIN PARADA p_origen on p_origen.PARADA_ID = B.ORIGEN_ID ");
-					sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
-					sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
-					sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
-					sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
-					sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
-					sql.append(" left join estado est ON est.estado_id = co.estado_id ");
-					sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
-	
-					sql.append(" WHERE ");
-					sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
-					sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
-					if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
-						if (parametros.get(TIPO_DATA) != null) {
-							if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
-								sql.append(" and b.FECHORVENTA_H >= :DATA_INICIAL ");
-								sql.append(" and b.FECHORVENTA_H <= :DATA_FINAL ");
-							}
-							
-							if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
-								sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
-								sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
-							}
-							
-							if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
-								sql.append(" and b.FECCORRIDA >= :DATA_INICIAL ");
-								sql.append(" and b.FECCORRIDA <= :DATA_FINAL ");
-							}
-						}
-					}
-					
-					if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
-						sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
-					}
-					
-					if (parametros.get("MOEDA_ID") != null) {
-						sql.append(" and NVL(B.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
-					}
-					
-					if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
-						sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
-					}
-					
-					sql.append(" AND b.INDVIAJEREDONDO = 1 ");	
-				}
-					
-				
-				if (parametros.get("STATUS").toString().contains("C")||parametros.get("STATUS").toString().contains("V")) {
-					if (parametros.get("IDAVOLTA").equals("1")) {
-						sql.append(" UNION ALL ");	
-					}
-					sql.append(" select ");
-					sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
-					sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
-					sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
-					sql.append(" B.NUMFOLIOSISTEMA NUMERO_PASSAGEM, ");
-					sql.append(" B.NUMSERIEPREIMPRESA SERIE, ");
-					sql.append(" B.NUMSERIEPREIMPRESA SUB_SERIE, ");
-	                sql.append(" B.NUMFOLIOPREIMPRESO PRE_IMPRESSO, ");
-	                sql.append(" p_origen.PARADA_ID COD_ORIGEM, ");
-	                sql.append(" p_origen.DESCPARADA ORIGEM, ");
-	                sql.append(" p_destino.PARADA_ID COD_DESTINO, ");
-	                sql.append(" p_destino.DESCPARADA DESTINO, ");
-	                sql.append(" pv.NUMPUNTOVENTA COD_AGENCIA, ");
-	                sql.append(" pv.NOMBPUNTOVENTA NOME_AGENCIA, ");
-	                sql.append(" CASE WHEN B.indstatusboleto = 'E' THEN utilizado.fechorventa_h  ELSE B.fechorventa_h END DATA_VENDA, ");
-	                sql.append(" CASE WHEN b.fechorventa  is null THEN utilizado.fechorventa ELSE b.fechorventa_h END DATA_EMISSAO, ");
-	                sql.append(" B.fechorviaje DATA_VIAGEM, ");
-	                sql.append(" B.CORRIDA_ID SERVICO, ");
-	                sql.append(" to_char(B.fechorviaje, 'hh24:mi:ss') HORA, ");
-	                sql.append(" B.NUMASIENTO NUMASIENTO, ");
-	                sql.append(" ct.DESCCATEGORIA CATEGORIA, ");
-	                sql.append(" R.INDSENTIDOIDA SENTIDO, ");
-	                sql.append(" R.NUMRUTA COD_LINHA, ");
-	                sql.append(" R.DESCRUTA DESC_LINHA, ");
-	                sql.append(" CASE WHEN b.MOTIVOCANCELACION_ID IS NULL THEN 'V' ELSE 'C' END STATUS_PASSAGEM, ");
-	                sql.append(" B.PRECIOPAGADO TARIFA, ");
-	                sql.append(" B.IMPORTETAXAEMBARQUE TX_EMBARQUE, ");
-	                sql.append(" B.IMPORTEPEDAGIO PEDAGIO, ");
-	                sql.append(" B.IMPORTESEGURO SEGURO, ");
-	                sql.append(" u.NOMBUSUARIO BILHETEIRO, ");
-	                sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, ");
-	                sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
-	                sql.append(" B.DESCNUMDOC AS DOC, ");
-	                sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR ");
-					
-					sql.append(" FROM caja B ");
-					sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id  AND b.indstatusboleto = 'C') ");
-					sql.append(" JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ");
-					sql.append(" JOIN PUNTO_VENTA pv on B.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
-					sql.append(" JOIN USUARIO u on u.USUARIO_ID = B.USUARIO_ID ");
-					sql.append(" LEFT JOIN USUARIO uc ON uc.USUARIO_ID = bo.USUARIO_ID ");
-					sql.append(" JOIN PARADA p_origen on p_origen.PARADA_ID = B.ORIGEN_ID ");
-					sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
-					sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
-					sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
-					sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
-					sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
-					sql.append(" left join estado est ON est.estado_id = co.estado_id ");
-					sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
-	
-					sql.append(" WHERE ");
-					sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
-					sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
-					if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
-						if (parametros.get(TIPO_DATA) != null) {
-							if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
-								sql.append(" and b.FECHORVENTA_H >= :DATA_INICIAL ");
-								sql.append(" and b.FECHORVENTA_H <= :DATA_FINAL ");
-							}
-							
-							if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
-								sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
-								sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
-							}
-							
-							if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
-								sql.append(" and b.FECCORRIDA >= :DATA_INICIAL ");
-								sql.append(" and b.FECCORRIDA <= :DATA_FINAL ");
-							}
-						}
-					}
-					
-					if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
-						sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
-					}
-					
-					if (parametros.get("MOEDA_ID") != null) {
-						sql.append(" and NVL(B.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
-					}
-					
-					if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
-						sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
-					}
-					
-					if ( !(parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) ) {
-						if (parametros.get("STATUS").toString().contains("C")) {
-							sql.append(" AND b.motivocancelacion_id is not null ");
-						} else if (parametros.get("STATUS").toString().contains("V")) {
-							sql.append(" AND b.motivocancelacion_id is null ");
-						}
-					}
-					sql.append(" and B.ACTIVO = 1 AND b.INDVIAJEREDONDO IS NULL ");
-				}	
-				sql.append(" order by  ");
-				if (parametros.get("IDAVOLTA").equals("1")) {
-					sql.append(" BILHETEIRO, ");
-					sql.append(" DATA_EMISSAO, ");
-				}else {	
-					sql.append(" DATA_EMISSAO, ");
-					sql.append(" BILHETEIRO, ");
-				}
-				sql.append(" COD_AGENCIA, ");
-				sql.append(" NOME_AGENCIA, ");
-				sql.append(" NUMERO_PASSAGEM, ");
-				sql.append(" ORIGEM, ");
-				sql.append(" DESTINO, ");
-				sql.append(" CATEGORIA, ");
-				sql.append(" IMPRESSAO_POSTERIOR, ");
-				sql.append(" SERVICO ");
+				StringBuilder sql = getSQL(parametros);
  
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
 
@@ -305,8 +102,218 @@ public class RelatorioBilhetesVendidos extends Relatorio {
 
 				this.resultSet = rset;
 			}
+
+			
 		});
 	}
+	
+	private StringBuilder getSQL(Map<String, Object> parametros) {
+		StringBuilder sql = new StringBuilder();
+		
+		if (parametros.get("IDAVOLTA").equals("1")) {
+			sql.append(" select ");
+			sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
+			sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
+			sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
+			sql.append(" B.NUMFOLIOSISTEMA NUMERO_PASSAGEM, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SERIE, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SUB_SERIE, ");
+            sql.append(" B.NUMFOLIOPREIMPRESO PRE_IMPRESSO, ");
+            sql.append(" p_origen.PARADA_ID COD_ORIGEM, ");
+            sql.append(" p_origen.DESCPARADA ORIGEM, ");
+            sql.append(" p_destino.PARADA_ID COD_DESTINO, ");
+            sql.append(" p_destino.DESCPARADA DESTINO, ");
+            sql.append(" pv.NUMPUNTOVENTA COD_AGENCIA, ");
+            sql.append(" pv.NOMBPUNTOVENTA NOME_AGENCIA, ");
+            sql.append(" CASE WHEN B.indstatusboleto = 'E' THEN utilizado.fechorventa_h  ELSE B.fechorventa_h END DATA_VENDA, ");
+            sql.append(" CASE WHEN b.fechorventa  is null THEN utilizado.fechorventa ELSE b.fechorventa_h END DATA_EMISSAO, ");
+            sql.append(" B.fechorviaje DATA_VIAGEM, ");
+            sql.append(" B.CORRIDA_ID SERVICO, ");
+            sql.append(" to_char(B.fechorviaje, 'hh24:mi:ss') HORA, ");
+            sql.append(" B.NUMASIENTO NUMASIENTO, ");
+            sql.append(" ct.DESCCATEGORIA CATEGORIA, ");
+            sql.append(" R.INDSENTIDOIDA SENTIDO, ");
+            sql.append(" R.NUMRUTA COD_LINHA, ");
+            sql.append(" R.DESCRUTA DESC_LINHA, ");
+            sql.append(" CASE WHEN b.MOTIVOCANCELACION_ID IS NULL THEN 'V' ELSE 'C' END STATUS_PASSAGEM, ");
+            sql.append(" B.PRECIOPAGADO TARIFA, ");
+            sql.append(" B.IMPORTETAXAEMBARQUE TX_EMBARQUE, ");
+            sql.append(" B.IMPORTEPEDAGIO PEDAGIO, ");
+            sql.append(" B.IMPORTESEGURO SEGURO, ");
+            sql.append(" u.NOMBUSUARIO BILHETEIRO, ");
+            sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, ");
+            sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
+            sql.append(" B.DESCNUMDOC AS DOC, ");
+            sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR ");
+			
+			sql.append(" FROM caja B ");
+			sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id  AND b.indstatusboleto = 'C') ");
+			sql.append(" JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ");
+			sql.append(" JOIN PUNTO_VENTA pv on B.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
+			sql.append(" JOIN USUARIO u on u.USUARIO_ID = B.USUARIO_ID ");
+			sql.append(" LEFT JOIN USUARIO uc ON uc.USUARIO_ID = bo.USUARIO_ID ");
+			sql.append(" JOIN PARADA p_origen on p_origen.PARADA_ID = B.ORIGEN_ID ");
+			sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
+			sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
+			sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
+			sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
+			sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
+			sql.append(" left join estado est ON est.estado_id = co.estado_id ");
+			sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
+
+			sql.append(" WHERE ");
+			sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
+			sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
+			if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
+				if (parametros.get(TIPO_DATA) != null) {
+					if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
+						sql.append(" and b.FECHORVENTA_H >= :DATA_INICIAL ");
+						sql.append(" and b.FECHORVENTA_H <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
+						sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
+						sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
+						sql.append(" and b.FECCORRIDA >= :DATA_INICIAL ");
+						sql.append(" and b.FECCORRIDA <= :DATA_FINAL ");
+					}
+				}
+			}
+			
+			if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
+				sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
+			}
+			
+			if (parametros.get("MOEDA_ID") != null) {
+				sql.append(" and NVL(B.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
+			}
+			
+			if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+				sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+			}
+			
+			sql.append(" AND b.INDVIAJEREDONDO = 1 ");	
+		}
+			
+		
+		if (parametros.get("STATUS").toString().contains("C")||parametros.get("STATUS").toString().contains("V")) {
+			if (parametros.get("IDAVOLTA").equals("1")) {
+				sql.append(" UNION ALL ");	
+			}
+			sql.append(" select ");
+			sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
+			sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
+			sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
+			sql.append(" B.NUMFOLIOSISTEMA NUMERO_PASSAGEM, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SERIE, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SUB_SERIE, ");
+            sql.append(" B.NUMFOLIOPREIMPRESO PRE_IMPRESSO, ");
+            sql.append(" p_origen.PARADA_ID COD_ORIGEM, ");
+            sql.append(" p_origen.DESCPARADA ORIGEM, ");
+            sql.append(" p_destino.PARADA_ID COD_DESTINO, ");
+            sql.append(" p_destino.DESCPARADA DESTINO, ");
+            sql.append(" pv.NUMPUNTOVENTA COD_AGENCIA, ");
+            sql.append(" pv.NOMBPUNTOVENTA NOME_AGENCIA, ");
+            sql.append(" CASE WHEN B.indstatusboleto = 'E' THEN utilizado.fechorventa_h  ELSE B.fechorventa_h END DATA_VENDA, ");
+            sql.append(" CASE WHEN b.fechorventa  is null THEN utilizado.fechorventa ELSE b.fechorventa_h END DATA_EMISSAO, ");
+            sql.append(" B.fechorviaje DATA_VIAGEM, ");
+            sql.append(" B.CORRIDA_ID SERVICO, ");
+            sql.append(" to_char(B.fechorviaje, 'hh24:mi:ss') HORA, ");
+            sql.append(" B.NUMASIENTO NUMASIENTO, ");
+            sql.append(" ct.DESCCATEGORIA CATEGORIA, ");
+            sql.append(" R.INDSENTIDOIDA SENTIDO, ");
+            sql.append(" R.NUMRUTA COD_LINHA, ");
+            sql.append(" R.DESCRUTA DESC_LINHA, ");
+            sql.append(" CASE WHEN b.MOTIVOCANCELACION_ID IS NULL THEN 'V' ELSE 'C' END STATUS_PASSAGEM, ");
+            sql.append(" B.PRECIOPAGADO TARIFA, ");
+            sql.append(" B.IMPORTETAXAEMBARQUE TX_EMBARQUE, ");
+            sql.append(" B.IMPORTEPEDAGIO PEDAGIO, ");
+            sql.append(" B.IMPORTESEGURO SEGURO, ");
+            sql.append(" u.NOMBUSUARIO BILHETEIRO, ");
+            sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, ");
+            sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
+            sql.append(" B.DESCNUMDOC AS DOC, ");
+            sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR ");
+			
+			sql.append(" FROM caja B ");
+			sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id  AND b.indstatusboleto = 'C') ");
+			sql.append(" JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ");
+			sql.append(" JOIN PUNTO_VENTA pv on B.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
+			sql.append(" JOIN USUARIO u on u.USUARIO_ID = B.USUARIO_ID ");
+			sql.append(" LEFT JOIN USUARIO uc ON uc.USUARIO_ID = bo.USUARIO_ID ");
+			sql.append(" JOIN PARADA p_origen on p_origen.PARADA_ID = B.ORIGEN_ID ");
+			sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
+			sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
+			sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
+			sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
+			sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
+			sql.append(" left join estado est ON est.estado_id = co.estado_id ");
+			sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
+
+			sql.append(" WHERE ");
+			sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
+			sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
+			if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
+				if (parametros.get(TIPO_DATA) != null) {
+					if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
+						sql.append(" and b.FECHORVENTA_H >= :DATA_INICIAL ");
+						sql.append(" and b.FECHORVENTA_H <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
+						sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
+						sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
+						sql.append(" and b.FECCORRIDA >= :DATA_INICIAL ");
+						sql.append(" and b.FECCORRIDA <= :DATA_FINAL ");
+					}
+				}
+			}
+			
+			if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
+				sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
+			}
+			
+			if (parametros.get("MOEDA_ID") != null) {
+				sql.append(" and NVL(B.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
+			}
+			
+			if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+				sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+			}
+			
+			if ( !(parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) ) {
+				if (parametros.get("STATUS").toString().contains("C")) {
+					sql.append(" AND b.motivocancelacion_id is not null ");
+				} else if (parametros.get("STATUS").toString().contains("V")) {
+					sql.append(" AND b.motivocancelacion_id is null ");
+				}
+			}
+			sql.append(" and B.ACTIVO = 1 AND b.INDVIAJEREDONDO IS NULL ");
+		}	
+		sql.append(" order by  ");
+		if (parametros.get("IDAVOLTA").equals("1")) {
+			sql.append(" BILHETEIRO, ");
+			sql.append(" DATA_EMISSAO, ");
+		}else {	
+			sql.append(" DATA_EMISSAO, ");
+			sql.append(" BILHETEIRO, ");
+		}
+		sql.append(" COD_AGENCIA, ");
+		sql.append(" NOME_AGENCIA, ");
+		sql.append(" NUMERO_PASSAGEM, ");
+		sql.append(" ORIGEM, ");
+		sql.append(" DESTINO, ");
+		sql.append(" CATEGORIA, ");
+		sql.append(" IMPRESSAO_POSTERIOR, ");
+		sql.append(" SERVICO ");
+		return sql;
+	}
 
 	/*
 	 * (non-Javadoc)
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java
new file mode 100644
index 000000000..277b68ce1
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java
@@ -0,0 +1,353 @@
+/**
+ * 
+ */
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndStatusBoleto;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+/**
+ * @author Thiago
+ *
+ */
+public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio {
+
+
+	private static final String DATA_VENDA = "DATA_VENDA";
+	private static final String DATA_FINAL = "DATA_FINAL";
+	private static final String DATA_INICIAL = "DATA_INICIAL";
+	private static final String TIPO_DATA = "TIPO_DATA";
+	private static final String FORMA_PAGO = "FORMAPAGO_ID";
+
+	public RelatorioBilhetesVendidosFiltroFormaPagamento(Map<String, Object> parametros, Connection conexao) throws Exception {
+		super(parametros, conexao);
+
+		this.setCustomDataSource(new ArrayDataSource(this) {
+			@Override
+			public void initDados() throws Exception {
+
+				Connection conexao = this.relatorio.getConexao();
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				StringBuilder sql = getSQL(parametros);
+ 
+				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
+
+				stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString()));
+				if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null){
+					stmt.setTimestamp(DATA_INICIAL, new Timestamp(DateUtil.inicioFecha((Date) parametros.get(DATA_INICIAL)).getTime()));
+					stmt.setTimestamp(DATA_FINAL, new Timestamp(DateUtil.fimFecha((Date) parametros.get(DATA_FINAL)).getTime()));
+				}
+				if(parametros.get(FORMA_PAGO) != null) {
+					stmt.setInt("FORMAPAGO_ID", Integer.valueOf(parametros.get(FORMA_PAGO).toString()));
+				}
+				ResultSet rset = stmt.executeQuery();
+
+				while (rset.next()) {
+
+					Map<String, Object> dataResult = new HashMap<String, Object>();
+
+					dataResult.put("NUMERO_PASSAGEM", rset.getString("NUMERO_PASSAGEM"));
+					if (rset.getString("SERIE") != null) {
+						if (rset.getString("SERIE").split("-").length == 1) {
+							dataResult.put("SERIE", rset.getString("SERIE"));
+						} else {
+							dataResult.put("SERIE", rset.getString("SERIE").split("-")[0]);
+							dataResult.put("SUB_SERIE", rset.getString("SERIE").split("-")[1]);
+						}
+					}
+					dataResult.put("CVEBILHETEIRO", rset.getString("CVEBILHETEIRO"));
+					dataResult.put("CVEBILHETEIRO_CANCELADO", rset.getString("CVEBILHETEIRO_CANCELADO"));
+					dataResult.put("IMPRESSAO_POSTERIOR", rset.getString("IMPRESSAO_POSTERIOR"));
+					dataResult.put("PRE_IMPRESSO", rset.getString("PRE_IMPRESSO"));
+					dataResult.put("COD_ORIGEM", rset.getString("COD_ORIGEM"));
+					dataResult.put("ORIGEM", rset.getString("ORIGEM"));
+					dataResult.put("COD_DESTINO", rset.getString("COD_DESTINO"));
+					dataResult.put("DESTINO", rset.getString("DESTINO"));
+					dataResult.put("NOME_AGENCIA", rset.getString("NOME_AGENCIA"));
+					dataResult.put("COD_AGENCIA", rset.getString("COD_AGENCIA"));
+					dataResult.put(DATA_VENDA, rset.getDate(DATA_VENDA));
+					dataResult.put("DATA_EMISSAO", rset.getDate("DATA_EMISSAO"));
+					dataResult.put("DATA_VIAGEM", rset.getDate("DATA_VIAGEM"));
+					dataResult.put("SERVICO", rset.getString("SERVICO"));
+					dataResult.put("HORA", rset.getString("HORA"));
+					dataResult.put("NUMASIENTO", rset.getString("NUMASIENTO"));
+					dataResult.put("CATEGORIA", rset.getString("CATEGORIA"));
+					dataResult.put("SENTIDO", rset.getInt("SENTIDO"));
+					dataResult.put("COD_LINHA", rset.getString("COD_LINHA"));
+					dataResult.put("DESC_LINHA", rset.getString("DESC_LINHA"));
+					if (rset.getString("STATUS_PASSAGEM") != null) {
+						dataResult.put("STATUS_PASSAGEM", IndStatusBoleto.valueOf(rset.getString("STATUS_PASSAGEM")).getValue());
+					}
+					dataResult.put("TARIFA", rset.getString("TARIFA"));
+					dataResult.put("TX_EMBARQUE", rset.getString("TX_EMBARQUE"));
+					dataResult.put("PEDAGIO", rset.getString("PEDAGIO"));
+					dataResult.put("SEGURO", rset.getString("SEGURO"));
+					dataResult.put("BILHETEIRO", rset.getString("BILHETEIRO"));
+					dataResult.put("BILHETEIRO_CANCELAMENTO", rset.getString("BILHETEIRO_CANCELAMENTO"));
+					dataResult.put("PASSAGEIRO", rset.getString("PASSAGEIRO"));
+					dataResult.put("DOC", rset.getString("DOC"));
+					dataResult.put("LOCALIZADOR", rset.getString("LOCALIZADOR"));
+					dataResult.put("FORMA_PAGAMENTO", rset.getString("FORMA_PAGAMENTO"));
+
+					this.dados.add(dataResult);
+
+				}
+
+				this.resultSet = rset;
+			}
+
+			
+		});
+	}
+	
+	private StringBuilder getSQL(Map<String, Object> parametros) {
+		StringBuilder sql = new StringBuilder();
+		
+		if (parametros.get("IDAVOLTA").equals("1")) {
+			sql.append(" select ");
+			sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
+			sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
+			sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
+			sql.append(" B.NUMFOLIOSISTEMA NUMERO_PASSAGEM, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SERIE, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SUB_SERIE, ");
+            sql.append(" B.NUMFOLIOPREIMPRESO PRE_IMPRESSO, ");
+            sql.append(" p_origen.PARADA_ID COD_ORIGEM, ");
+            sql.append(" p_origen.DESCPARADA ORIGEM, ");
+            sql.append(" p_destino.PARADA_ID COD_DESTINO, ");
+            sql.append(" p_destino.DESCPARADA DESTINO, ");
+            sql.append(" pv.NUMPUNTOVENTA COD_AGENCIA, ");
+            sql.append(" pv.NOMBPUNTOVENTA NOME_AGENCIA, ");
+            sql.append(" CASE WHEN B.indstatusboleto = 'E' THEN utilizado.fechorventa_h  ELSE B.fechorventa_h END DATA_VENDA, ");
+            sql.append(" CASE WHEN b.fechorventa  is null THEN utilizado.fechorventa ELSE b.fechorventa_h END DATA_EMISSAO, ");
+            sql.append(" B.fechorviaje DATA_VIAGEM, ");
+            sql.append(" B.CORRIDA_ID SERVICO, ");
+            sql.append(" to_char(B.fechorviaje, 'hh24:mi:ss') HORA, ");
+            sql.append(" B.NUMASIENTO NUMASIENTO, ");
+            sql.append(" ct.DESCCATEGORIA CATEGORIA, ");
+            sql.append(" R.INDSENTIDOIDA SENTIDO, ");
+            sql.append(" R.NUMRUTA COD_LINHA, ");
+            sql.append(" R.DESCRUTA DESC_LINHA, ");
+            sql.append(" CASE WHEN b.MOTIVOCANCELACION_ID IS NULL THEN 'V' ELSE 'C' END STATUS_PASSAGEM, ");
+            sql.append(" B.PRECIOPAGADO TARIFA, ");
+            sql.append(" B.IMPORTETAXAEMBARQUE TX_EMBARQUE, ");
+            sql.append(" B.IMPORTEPEDAGIO PEDAGIO, ");
+            sql.append(" B.IMPORTESEGURO SEGURO, ");
+            sql.append(" u.NOMBUSUARIO BILHETEIRO, ");
+            sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, ");
+            sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
+            sql.append(" B.DESCNUMDOC AS DOC, ");
+            sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, ");
+    		sql.append("(SELECT LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) ");
+    		sql.append("FROM CAJA caja2 ");
+    		sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID ");
+    		sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID ");
+    		sql.append("WHERE caja2.CAJA_ID = b.CAJA_ID) AS FORMA_PAGAMENTO ");
+			sql.append(" FROM caja B ");
+			sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id  AND b.indstatusboleto = 'C') ");
+			sql.append(" JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ");
+			sql.append(" JOIN PUNTO_VENTA pv on B.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
+			sql.append(" JOIN USUARIO u on u.USUARIO_ID = B.USUARIO_ID ");
+			sql.append(" LEFT JOIN USUARIO uc ON uc.USUARIO_ID = bo.USUARIO_ID ");
+			sql.append(" JOIN PARADA p_origen on p_origen.PARADA_ID = B.ORIGEN_ID ");
+			sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
+			sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
+			sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
+			sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
+    		sql.append(" JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = b.CAJA_ID ");
+    		sql.append(" JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID ");
+			sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
+			sql.append(" left join estado est ON est.estado_id = co.estado_id ");
+			sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
+
+			sql.append(" WHERE ");
+			sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
+			sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
+			if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
+				if (parametros.get(TIPO_DATA) != null) {
+					if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
+						sql.append(" and b.FECHORVENTA_H >= :DATA_INICIAL ");
+						sql.append(" and b.FECHORVENTA_H <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
+						sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
+						sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
+						sql.append(" and b.FECCORRIDA >= :DATA_INICIAL ");
+						sql.append(" and b.FECCORRIDA <= :DATA_FINAL ");
+					}
+				}
+			}
+			
+			if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
+				sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
+			}
+			
+			if (parametros.get("MOEDA_ID") != null) {
+				sql.append(" and NVL(B.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
+			}
+			
+			if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+				sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+			}
+			
+			sql.append(" AND b.INDVIAJEREDONDO = 1 ");	
+			if(parametros.get(FORMA_PAGO) != null && !parametros.get(FORMA_PAGO).equals("-1")) {
+				sql.append(" and formaPago.FORMAPAGO_ID =:FORMAPAGO_ID ");
+			}
+		}
+			
+		
+		if (parametros.get("STATUS").toString().contains("C")||parametros.get("STATUS").toString().contains("V")) {
+			if (parametros.get("IDAVOLTA").equals("1")) {
+				sql.append(" UNION ALL ");	
+			}
+			sql.append(" select ");
+			sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
+			sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
+			sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
+			sql.append(" B.NUMFOLIOSISTEMA NUMERO_PASSAGEM, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SERIE, ");
+			sql.append(" B.NUMSERIEPREIMPRESA SUB_SERIE, ");
+            sql.append(" B.NUMFOLIOPREIMPRESO PRE_IMPRESSO, ");
+            sql.append(" p_origen.PARADA_ID COD_ORIGEM, ");
+            sql.append(" p_origen.DESCPARADA ORIGEM, ");
+            sql.append(" p_destino.PARADA_ID COD_DESTINO, ");
+            sql.append(" p_destino.DESCPARADA DESTINO, ");
+            sql.append(" pv.NUMPUNTOVENTA COD_AGENCIA, ");
+            sql.append(" pv.NOMBPUNTOVENTA NOME_AGENCIA, ");
+            sql.append(" CASE WHEN B.indstatusboleto = 'E' THEN utilizado.fechorventa_h  ELSE B.fechorventa_h END DATA_VENDA, ");
+            sql.append(" CASE WHEN b.fechorventa  is null THEN utilizado.fechorventa ELSE b.fechorventa_h END DATA_EMISSAO, ");
+            sql.append(" B.fechorviaje DATA_VIAGEM, ");
+            sql.append(" B.CORRIDA_ID SERVICO, ");
+            sql.append(" to_char(B.fechorviaje, 'hh24:mi:ss') HORA, ");
+            sql.append(" B.NUMASIENTO NUMASIENTO, ");
+            sql.append(" ct.DESCCATEGORIA CATEGORIA, ");
+            sql.append(" R.INDSENTIDOIDA SENTIDO, ");
+            sql.append(" R.NUMRUTA COD_LINHA, ");
+            sql.append(" R.DESCRUTA DESC_LINHA, ");
+            sql.append(" CASE WHEN b.MOTIVOCANCELACION_ID IS NULL THEN 'V' ELSE 'C' END STATUS_PASSAGEM, ");
+            sql.append(" B.PRECIOPAGADO TARIFA, ");
+            sql.append(" B.IMPORTETAXAEMBARQUE TX_EMBARQUE, ");
+            sql.append(" B.IMPORTEPEDAGIO PEDAGIO, ");
+            sql.append(" B.IMPORTESEGURO SEGURO, ");
+            sql.append(" u.NOMBUSUARIO BILHETEIRO, ");
+            sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, ");
+            sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
+            sql.append(" B.DESCNUMDOC AS DOC, ");
+            sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, ");
+    		sql.append("(SELECT LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) ");
+    		sql.append("FROM CAJA caja2 ");
+    		sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID ");
+    		sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID ");
+    		sql.append("WHERE caja2.CAJA_ID = b.CAJA_ID) AS FORMA_PAGAMENTO "); 			
+			sql.append(" FROM caja B ");
+			sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id  AND b.indstatusboleto = 'C') ");
+			sql.append(" JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ");
+			sql.append(" JOIN PUNTO_VENTA pv on B.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
+			sql.append(" JOIN USUARIO u on u.USUARIO_ID = B.USUARIO_ID ");
+			sql.append(" LEFT JOIN USUARIO uc ON uc.USUARIO_ID = bo.USUARIO_ID ");
+			sql.append(" JOIN PARADA p_origen on p_origen.PARADA_ID = B.ORIGEN_ID ");
+			sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
+			sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
+			sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
+			sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
+    		sql.append(" JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = b.CAJA_ID ");
+    		sql.append(" JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID ");
+			sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
+			sql.append(" left join estado est ON est.estado_id = co.estado_id ");
+			sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
+
+			sql.append(" WHERE ");
+			sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
+			sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
+			if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
+				if (parametros.get(TIPO_DATA) != null) {
+					if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
+						sql.append(" and b.FECHORVENTA_H >= :DATA_INICIAL ");
+						sql.append(" and b.FECHORVENTA_H <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
+						sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
+						sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
+					}
+					
+					if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
+						sql.append(" and b.FECCORRIDA >= :DATA_INICIAL ");
+						sql.append(" and b.FECCORRIDA <= :DATA_FINAL ");
+					}
+				}
+			}
+			
+			if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
+				sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
+			}
+			
+			if (parametros.get("MOEDA_ID") != null) {
+				sql.append(" and NVL(B.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
+			}
+			
+			if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+				sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+			}
+			
+			if ( !(parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) ) {
+				if (parametros.get("STATUS").toString().contains("C")) {
+					sql.append(" AND b.motivocancelacion_id is not null ");
+				} else if (parametros.get("STATUS").toString().contains("V")) {
+					sql.append(" AND b.motivocancelacion_id is null ");
+				}
+			}
+			sql.append(" and B.ACTIVO = 1 AND b.INDVIAJEREDONDO IS NULL ");
+			
+			if(parametros.get(FORMA_PAGO) != null && !parametros.get(FORMA_PAGO).equals("-1")) {
+				sql.append(" and formaPago.FORMAPAGO_ID =:FORMAPAGO_ID ");
+			}
+			
+		}	
+		sql.append(" order by  ");
+		if (parametros.get("IDAVOLTA").equals("1")) {
+			sql.append(" BILHETEIRO, ");
+			sql.append(" DATA_EMISSAO, ");
+		}else {	
+			sql.append(" DATA_EMISSAO, ");
+			sql.append(" BILHETEIRO, ");
+		}
+		sql.append(" COD_AGENCIA, ");
+		sql.append(" NOME_AGENCIA, ");
+		sql.append(" NUMERO_PASSAGEM, ");
+		sql.append(" ORIGEM, ");
+		sql.append(" DESTINO, ");
+		sql.append(" CATEGORIA, ");
+		sql.append(" IMPRESSAO_POSTERIOR, ");
+		sql.append(" SERVICO ");
+
+		return sql;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio#processaParametros()
+	 */
+	@Override
+	protected void processaParametros() throws Exception {
+
+	}
+
+}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
index 4b4394caa..0b058efe1 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
@@ -53,109 +53,7 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 				Connection conexao = this.relatorio.getConexao();
 				Map<String, Object> parametros = this.relatorio.getParametros();
 
-				StringBuilder sql = new StringBuilder();
-				sql.append("select t.cveestado,");
-				sql.append("       to_char(t.dataVenda, 'dd/MM/yy') as dataVenda, ");
-				sql.append("       t.statuspassagem,");
-				sql.append("       t.especie,");
-				sql.append("       t.forminicial,");
-				sql.append("       t.formfinal,");
-				sql.append("       t.serie,");
-				sql.append("       t.preciopagado AS valorcontabil,");
-				sql.append("       t.preciopagado - (t.preciopagado * coalesce(t.porcentcreditobase / 100,0))AS valorbasecalculo,");
-				sql.append("       t.icms as valoraliquiotaicms,");
-				sql.append("        ((t.preciopagado - (t.preciopagado * coalesce(t.porcentcreditobase / 100,0))) * t.icms) / 100 AS valoricms,");
-				sql.append("        cod_origem,");
-				sql.append("        origem,");
-				sql.append("        cod_destino,");
-				sql.append("        destino, ");
-				sql.append("        codFiscal ");
-				sql.append("from");
-				sql.append("  (select distinct ");
-				sql.append("     CASE WHEN ( coalesce(al.aliquota,0) <> 0  AND co.estado_id <> cd.estado_id ) THEN AL.ALIQUOTA  			   "); //1  Aliquota do estado de destino
-				sql.append("          WHEN ( EI.INDREDBASEICMSBPE = 1 and co.estado_id = cd.estado_id AND EI.ICMSIM <> 0 ) THEN EI.ICMSIM      "); //2 - ICMS intermunicipal com redutor
-				sql.append("          WHEN ( EI.INDREDBASEICMSBPE = 1 and co.estado_id <> cd.estado_id AND EI.ICMS <> 0 ) THEN EI.ICMS         "); //3 - ICMS interestadual com redutor
-				sql.append("          WHEN ( co.estado_id = cd.estado_id AND EI.TRIBUTACAOIMPORTACAOIM <> 0 ) THEN EI.TRIBUTACAOIMPORTACAOIM   "); //2 - ICMS intermunicipal
-				sql.append("          WHEN ( co.estado_id <> cd.estado_id AND EI.TRIBUTACAOIMPORTACAO <> 0 ) THEN EI.TRIBUTACAOIMPORTACAO      "); //3 - ICMS interestadual
-				sql.append("          ELSE est.icms END AS icms,              "); 																   //4 - Se nao tiver nenhum deles busca do cadastro do estado de origem
-				sql.append("     (coalesce (CASE WHEN ( (co.estado_id <> cd.estado_id AND EI.INDSEGUROESTADUAL = 1) OR (co.estado_id = cd.estado_id AND EI.INDSEGUROMUNICIPAL = 1) ) THEN c.IMPORTESEGURO ELSE 0  END + ");		//1 - IMPORTE SEGURO
-				sql.append("     CASE WHEN ( (co.estado_id <> cd.estado_id AND EI.INDTXEMBARQUEESTADUAL = 1) OR (co.estado_id = cd.estado_id AND EI.INDTXEMBARQUEMUNICIPAL = 1) ) THEN c.IMPORTETAXAEMBARQUE ELSE 0 END + "); 	//2 - IMPORTE TAXA
-				sql.append("     CASE WHEN ( (co.estado_id <> cd.estado_id AND ei.INDPEDAGIOESTDUAL = 1) OR (co.estado_id = cd.estado_id AND EI.INDPEDAGIOMUNICIPAL = 1) ) THEN c.IMPORTEPEDAGIO ELSE 0 END , 0) "); 			//3 - IMPORTE PEGADIO
-				sql.append("                    + c.preciopagado) as preciopagado, ");
-				sql.append("                   est.cveestado as cveestado,");
-				sql.append("                   CASE WHEN (  ei.indredbaseicmsbpe = 1 and ei.porcredbaseicmsim > 0 AND co.estado_id = cd.estado_id ) THEN ei.porcredbaseicmsim "); // 1 - Porcentagem de credito para base de calculo ICMS (INTERMUNICIPAL)
-				sql.append("                   WHEN (  ei.indredbaseicmsbpe = 1 and ei.porcredbaseicms > 0  AND co.estado_id <> cd.estado_id ) THEN ei.porcredbaseicms        "); // 2 - Porcentagem de credito para base de calculo ICMS (INTERESTADUAL) 
-				sql.append("                   ELSE 0 END AS porcentcreditobase,");                                                                                               // 3 - Porcentagem de credito para base de calculo ICMS (NAO EXISTENTE!) RETORNA 0
-				sql.append("                   c.fechorventa as datavenda,");
-				sql.append("                   c.indstatusboleto statuspassagem,");
-				sql.append("                   ae.decespecie as especie,");
-				sql.append("        c.numfoliosistema as forminicial,");
-				sql.append("        c.numfoliosistema as formfinal,");
-				sql.append("                   c.numseriepreimpresa as serie,");
-				sql.append("                   c.preciopagado as valorcontabil,");
-				sql.append("                   po.parada_id cod_origem, "); 
-				sql.append("                   po.descparada origem,"); 
-				sql.append("                   pd.parada_id cod_destino,"); 
-				sql.append("                   pd.descparada destino,");
-				sql.append("                   case when cd.estado_id = co.estado_id then '5357' else '6357' end as codFiscal");
-				sql.append("   from caja c");
-				sql.append("   left join aidf a on a.aidf_id = c.aidf_id");
-				sql.append("   left join aidf_especie ae on (a.aidfesp_id = ae.aidfesp_id)");
-				sql.append("   join empresa e on e.empresa_id = c.empresacorrida_id");
-				sql.append("   join parada po on po.parada_id = c.origen_id");
-				sql.append("   join ciudad co on co.ciudad_id = po.ciudad_id");
-				sql.append("   join parada pd on pd.parada_id = c.destino_id");
-				sql.append("   join ciudad cd on cd.ciudad_id = pd.ciudad_id");
-				sql.append("   join estado est on est.estado_id = co.estado_id");
-				sql.append("   join empresa_imposto ei on ei.empresa_id = e.empresa_id");
-				sql.append("   LEFT JOIN ALIQUOTA_ESTADO_DESTINO AL ON ei.EMPRESAIMPOSTO_ID = AL.EMPRESAIMPOSTO_ID AND cd.estado_id = AL.ESTADO_ID AND AL.ACTIVO = 1 ");
-				sql.append("   LEFT JOIN boleto utilizado ON (utilizado.boleto_id = c.transacaooriginal_id AND c.INDSTATUSBOLETO = 'E') ");
-				sql.append("   join punto_venta pv on c.puntoventa_id = pv.puntoventa_id");
-				sql.append("   and ei.estado_id = est.estado_id");
-				sql.append(" where ");
-				sql.append(" c.empresacorrida_id = :EMPRESA_ID ");
-				if (parametros.get(TIPO_DATA) != null) {
-					if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
-						sql.append(" and c.FECHORVENTA_H >= :DATA_INICIAL ");
-						sql.append(" and c.FECHORVENTA_H <= :DATA_FINAL ");
-					}
-					
-					if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
-						sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
-						sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
-					}
-					
-					if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
-						sql.append(" and c.FECCORRIDA >= :DATA_INICIAL ");
-						sql.append(" and c.FECCORRIDA <= :DATA_FINAL ");
-					}
-				}
-				sql.append(" and c.activo = 1");
-				sql.append(" and ei.activo = 1");
-				
-				if (parametros.get(NUMPUNTOVENTA) != null && !parametros.get(NUMPUNTOVENTA).equals("-1")) {
-					sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get(NUMPUNTOVENTA).toString() + ")");
-				}
-				
-				if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
-					sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
-				}
-				
-				if (parametros.get("MOEDA_ID") != null) {
-					sql.append(" and NVL(c.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
-				}
-				
-				if (parametros.get(STATUS) != null) {
-					if (parametros.get(STATUS).toString().contains("V") && parametros.get(STATUS).toString().contains("C")) {
-						sql.append(" and ((c.INDSTATUSBOLETO   = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) ");
-					} else if (parametros.get(STATUS).toString().contains("C")) {
-						sql.append(" and c.INDSTATUSBOLETO   = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL ");
-					} else if (parametros.get(STATUS).toString().contains("V")) {
-						sql.append(" and c.INDSTATUSBOLETO   = 'V' AND c.MOTIVOCANCELACION_ID IS NULL ");
-					}
-				}
-				sql.append(") t ");
-				sql.append("order by t.cveestado,  to_char(t.dataVenda, 'dd/MM/yy') ");
+				StringBuilder sql = getSQL(parametros);
 				
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
 
@@ -212,8 +110,117 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 					setLsDadosRelatorio(lsDadosRelatorio);
 				}
 			}
+
+			
 		});
 	}
+	
+	private StringBuilder getSQL(Map<String, Object> parametros) {
+		StringBuilder sql = new StringBuilder();
+		sql.append("select t.cveestado,");
+		sql.append("       to_char(t.dataVenda, 'dd/MM/yy') as dataVenda, ");
+		sql.append("       t.statuspassagem,");
+		sql.append("       t.especie,");
+		sql.append("       t.forminicial,");
+		sql.append("       t.formfinal,");
+		sql.append("       t.serie,");
+		sql.append("       t.preciopagado AS valorcontabil,");
+		sql.append("       t.preciopagado - (t.preciopagado * coalesce(t.porcentcreditobase / 100,0))AS valorbasecalculo,");
+		sql.append("       t.icms as valoraliquiotaicms,");
+		sql.append("        ((t.preciopagado - (t.preciopagado * coalesce(t.porcentcreditobase / 100,0))) * t.icms) / 100 AS valoricms,");
+		sql.append("        cod_origem,");
+		sql.append("        origem,");
+		sql.append("        cod_destino,");
+		sql.append("        destino, ");
+		sql.append("        codFiscal ");
+		sql.append("from");
+		sql.append("  (select distinct ");
+		sql.append("     CASE WHEN ( coalesce(al.aliquota,0) <> 0  AND co.estado_id <> cd.estado_id ) THEN AL.ALIQUOTA  			   "); //1  Aliquota do estado de destino
+		sql.append("          WHEN ( EI.INDREDBASEICMSBPE = 1 and co.estado_id = cd.estado_id AND EI.ICMSIM <> 0 ) THEN EI.ICMSIM      "); //2 - ICMS intermunicipal com redutor
+		sql.append("          WHEN ( EI.INDREDBASEICMSBPE = 1 and co.estado_id <> cd.estado_id AND EI.ICMS <> 0 ) THEN EI.ICMS         "); //3 - ICMS interestadual com redutor
+		sql.append("          WHEN ( co.estado_id = cd.estado_id AND EI.TRIBUTACAOIMPORTACAOIM <> 0 ) THEN EI.TRIBUTACAOIMPORTACAOIM   "); //2 - ICMS intermunicipal
+		sql.append("          WHEN ( co.estado_id <> cd.estado_id AND EI.TRIBUTACAOIMPORTACAO <> 0 ) THEN EI.TRIBUTACAOIMPORTACAO      "); //3 - ICMS interestadual
+		sql.append("          ELSE est.icms END AS icms,              "); 																   //4 - Se nao tiver nenhum deles busca do cadastro do estado de origem
+		sql.append("     (coalesce (CASE WHEN ( (co.estado_id <> cd.estado_id AND EI.INDSEGUROESTADUAL = 1) OR (co.estado_id = cd.estado_id AND EI.INDSEGUROMUNICIPAL = 1) ) THEN c.IMPORTESEGURO ELSE 0  END + ");		//1 - IMPORTE SEGURO
+		sql.append("     CASE WHEN ( (co.estado_id <> cd.estado_id AND EI.INDTXEMBARQUEESTADUAL = 1) OR (co.estado_id = cd.estado_id AND EI.INDTXEMBARQUEMUNICIPAL = 1) ) THEN c.IMPORTETAXAEMBARQUE ELSE 0 END + "); 	//2 - IMPORTE TAXA
+		sql.append("     CASE WHEN ( (co.estado_id <> cd.estado_id AND ei.INDPEDAGIOESTDUAL = 1) OR (co.estado_id = cd.estado_id AND EI.INDPEDAGIOMUNICIPAL = 1) ) THEN c.IMPORTEPEDAGIO ELSE 0 END , 0) "); 			//3 - IMPORTE PEGADIO
+		sql.append("                    + c.preciopagado) as preciopagado, ");
+		sql.append("                   est.cveestado as cveestado,");
+		sql.append("                   CASE WHEN (  ei.indredbaseicmsbpe = 1 and ei.porcredbaseicmsim > 0 AND co.estado_id = cd.estado_id ) THEN ei.porcredbaseicmsim "); // 1 - Porcentagem de credito para base de calculo ICMS (INTERMUNICIPAL)
+		sql.append("                   WHEN (  ei.indredbaseicmsbpe = 1 and ei.porcredbaseicms > 0  AND co.estado_id <> cd.estado_id ) THEN ei.porcredbaseicms        "); // 2 - Porcentagem de credito para base de calculo ICMS (INTERESTADUAL) 
+		sql.append("                   ELSE 0 END AS porcentcreditobase,");                                                                                               // 3 - Porcentagem de credito para base de calculo ICMS (NAO EXISTENTE!) RETORNA 0
+		sql.append("                   c.fechorventa as datavenda,");
+		sql.append("                   c.indstatusboleto statuspassagem,");
+		sql.append("                   ae.decespecie as especie,");
+		sql.append("        c.numfoliosistema as forminicial,");
+		sql.append("        c.numfoliosistema as formfinal,");
+		sql.append("                   c.numseriepreimpresa as serie,");
+		sql.append("                   c.preciopagado as valorcontabil,");
+		sql.append("                   po.parada_id cod_origem, "); 
+		sql.append("                   po.descparada origem,"); 
+		sql.append("                   pd.parada_id cod_destino,"); 
+		sql.append("                   pd.descparada destino,");
+		sql.append("                   case when cd.estado_id = co.estado_id then '5357' else '6357' end as codFiscal");
+		sql.append("   from caja c");
+		sql.append("   left join aidf a on a.aidf_id = c.aidf_id");
+		sql.append("   left join aidf_especie ae on (a.aidfesp_id = ae.aidfesp_id)");
+		sql.append("   join empresa e on e.empresa_id = c.empresacorrida_id");
+		sql.append("   join parada po on po.parada_id = c.origen_id");
+		sql.append("   join ciudad co on co.ciudad_id = po.ciudad_id");
+		sql.append("   join parada pd on pd.parada_id = c.destino_id");
+		sql.append("   join ciudad cd on cd.ciudad_id = pd.ciudad_id");
+		sql.append("   join estado est on est.estado_id = co.estado_id");
+		sql.append("   join empresa_imposto ei on ei.empresa_id = e.empresa_id");
+		sql.append("   LEFT JOIN ALIQUOTA_ESTADO_DESTINO AL ON ei.EMPRESAIMPOSTO_ID = AL.EMPRESAIMPOSTO_ID AND cd.estado_id = AL.ESTADO_ID AND AL.ACTIVO = 1 ");
+		sql.append("   LEFT JOIN boleto utilizado ON (utilizado.boleto_id = c.transacaooriginal_id AND c.INDSTATUSBOLETO = 'E') ");
+		sql.append("   join punto_venta pv on c.puntoventa_id = pv.puntoventa_id");
+		sql.append("   and ei.estado_id = est.estado_id");
+		sql.append(" where ");
+		sql.append(" c.empresacorrida_id = :EMPRESA_ID ");
+		if (parametros.get(TIPO_DATA) != null) {
+			if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
+				sql.append(" and c.FECHORVENTA_H >= :DATA_INICIAL ");
+				sql.append(" and c.FECHORVENTA_H <= :DATA_FINAL ");
+			}
+			
+			if ((parametros.get(TIPO_DATA).toString().equals("DATA_EMISSAO"))) {
+				sql.append(" and utilizado.FECHORVENTA >= :DATA_INICIAL ");
+				sql.append(" and utilizado.FECHORVENTA <= :DATA_FINAL ");
+			}
+			
+			if ((parametros.get(TIPO_DATA).toString().equals("DATA_VIAGEM"))) {
+				sql.append(" and c.FECCORRIDA >= :DATA_INICIAL ");
+				sql.append(" and c.FECCORRIDA <= :DATA_FINAL ");
+			}
+		}
+		sql.append(" and c.activo = 1");
+		sql.append(" and ei.activo = 1");
+		
+		if (parametros.get(NUMPUNTOVENTA) != null && !parametros.get(NUMPUNTOVENTA).equals("-1")) {
+			sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get(NUMPUNTOVENTA).toString() + ")");
+		}
+		
+		if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+			sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+		}
+		
+		if (parametros.get("MOEDA_ID") != null) {
+			sql.append(" and NVL(c.MONEDA_ID, 1) = "+parametros.get("MOEDA_ID") );
+		}
+		
+		if (parametros.get(STATUS) != null) {
+			if (parametros.get(STATUS).toString().contains("V") && parametros.get(STATUS).toString().contains("C")) {
+				sql.append(" and ((c.INDSTATUSBOLETO   = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) ");
+			} else if (parametros.get(STATUS).toString().contains("C")) {
+				sql.append(" and c.INDSTATUSBOLETO   = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL ");
+			} else if (parametros.get(STATUS).toString().contains("V")) {
+				sql.append(" and c.INDSTATUSBOLETO   = 'V' AND c.MOTIVOCANCELACION_ID IS NULL ");
+			}
+		}
+		sql.append(") t ");
+		sql.append("order by t.cveestado,  to_char(t.dataVenda, 'dd/MM/yy') ");
+		return sql;
+	}
 
 	private BigDecimal getValor(String campo, ResultSet resultSet) throws SQLException {
 		if (resultSet.getObject(campo) == null) {
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_es.properties
new file mode 100644
index 000000000..a743aaf84
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_es.properties
@@ -0,0 +1,13 @@
+#geral
+msg.noData=No fue posible obtener datos con los parámetros ingresados.
+
+
+#Labels cabeçalho
+cabecalho.relatorio=Reporte:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Fecha/Hora:
+cabecalho.impressorPor=Impresora por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_pt_BR.properties
new file mode 100644
index 000000000..f39ccac7e
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosFiltroFormaPagamento_pt_BR.properties
@@ -0,0 +1,13 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..d565be6cd377e19e698cc2d5064005adab2f4d0e
GIT binary patch
literal 57256
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
PG0emiu_m<?A@=_O<;5$K

literal 0
HcmV?d00001

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml
new file mode 100644
index 000000000..ced81dc4e
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml
@@ -0,0 +1,672 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasBilheteiro" pageWidth="1266" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1226" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
+	<property name="ireport.zoom" value="2.1961500000000282"/>
+	<property name="ireport.x" value="974"/>
+	<property name="ireport.y" value="0"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
+	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<parameter name="DATA_INICIAL" class="java.util.Date"/>
+	<parameter name="DATA_FINAL" class="java.util.Date"/>
+	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
+	<parameter name="FILTROS" class="java.lang.String"/>
+	<parameter name="USUARIO" class="java.lang.String"/>
+	<parameter name="NUMPUNTOVENTA" class="java.lang.String"/>
+	<parameter name="EMPRESA_ID" class="java.lang.Integer"/>
+	<parameter name="EMPRESA" class="java.lang.String"/>
+	<field name="NUMERO_PASSAGEM" class="java.lang.String"/>
+	<field name="SERIE" class="java.lang.String"/>
+	<field name="SUB_SERIE" class="java.lang.String"/>
+	<field name="PRE_IMPRESSO" class="java.lang.String"/>
+	<field name="ORIGEM" class="java.lang.String"/>
+	<field name="DESTINO" class="java.lang.String"/>
+	<field name="NOME_AGENCIA" class="java.lang.String"/>
+	<field name="DATA_VENDA" class="java.util.Date"/>
+	<field name="DATA_VIAGEM" class="java.util.Date"/>
+	<field name="SERVICO" class="java.lang.String"/>
+	<field name="HORA" class="java.lang.String"/>
+	<field name="DESC_LINHA" class="java.lang.String"/>
+	<field name="STATUS_PASSAGEM" class="java.lang.String"/>
+	<field name="TARIFA" class="java.lang.String"/>
+	<field name="TX_EMBARQUE" class="java.lang.String"/>
+	<field name="PEDAGIO" class="java.lang.String"/>
+	<field name="SEGURO" class="java.lang.String"/>
+	<field name="NUMASIENTO" class="java.lang.String"/>
+	<field name="CATEGORIA" class="java.lang.String"/>
+	<field name="SENTIDO" class="java.lang.Integer"/>
+	<field name="COD_ORIGEM" class="java.lang.String"/>
+	<field name="COD_DESTINO" class="java.lang.String"/>
+	<field name="COD_AGENCIA" class="java.lang.String"/>
+	<field name="COD_LINHA" class="java.lang.String"/>
+	<field name="IMPRESSAO_POSTERIOR" class="java.lang.String"/>
+	<field name="DATA_EMISSAO" class="java.util.Date"/>
+	<field name="BILHETEIRO" class="java.lang.String"/>
+	<field name="CVEBILHETEIRO_CANCELADO" class="java.lang.String"/>
+	<field name="CVEBILHETEIRO" class="java.lang.String"/>
+	<field name="PASSAGEIRO" class="java.lang.String"/>
+	<field name="DOC" class="java.lang.String"/>
+	<field name="LOCALIZADOR" class="java.lang.String"/>
+	<field name="FORMA_PAGAMENTO" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band height="57" splitType="Stretch">
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="83" y="15" width="55" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="42796e20-405c-441f-9fd9-b26238bc7cdb"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="0" y="0" width="1056" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="d2973779-79dc-4cc8-937a-e9167c42bab0"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="193" y="15" width="70" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="8730e85b-d436-42cd-beb6-1a881bad2478"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="0" y="15" width="83" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="26bbd310-5e59-4975-a47f-b0048e80b1b6"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="0" y="43" width="28" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="9630a784-5f92-4abe-805c-fd175e4f8241"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="1145" y="0" width="81" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="91cded42-c53d-469a-abc7-6eb0d59f69af"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="1056" y="31" width="170" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="62f6ba6e-1aaf-4449-aef6-2e9d6e541856"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="1198" y="15" width="28" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="985f839c-258a-47eb-b72b-bec819b7bdbb"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="1056" y="15" width="142" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="ba831a24-59f4-4f8f-888f-fd69711018e9"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1056" y="0" width="89" height="15" uuid="5cbb57ef-bd5e-4d1b-a077-d0ff398df801"/>
+				<textElement textAlignment="Right">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="138" y="15" width="55" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="6d6ab075-006c-4796-98d5-f047ae963876"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="28" y="43" width="1198" height="14" uuid="c486add3-94d7-419f-9f37-04f6a6da879e"/>
+				<textElement verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="10" splitType="Stretch">
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="28" height="10" isPrintWhenDetailOverflows="true" uuid="3766fa33-6281-4576-a9d1-3b984e1976d3"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left">
+					<font size="6" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Bilhete]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="193" y="0" width="70" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="6adaca80-9b5a-4a03-a80b-5eeed4894d7f"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Origem]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="582" y="0" width="32" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="95367884-2b52-4bbd-b716-852ff13290e9"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Serviço]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="333" y="0" width="100" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a39ab8f3-becb-44e3-b4f5-b7c43889508c"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Agência]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="547" y="0" width="35" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="170230ea-2a12-4444-9f13-c706d557ae8d"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Hr. Viag.]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="263" y="0" width="70" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="c0542d93-dde4-448d-932c-453d6a4a6882"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Destino]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="509" y="0" width="38" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="9c65b631-065c-49af-ab2c-3bcea583eaea"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Dt. Viagem]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="433" y="0" width="38" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a7f96097-c8fd-4ba0-bea7-7b40a0fc81f7"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Dt. Venda]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="614" y="0" width="19" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0452264c-0f27-46d6-84ad-0fba6e5abdfa"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Polt]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="633" y="0" width="27" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="f596b16a-f9d9-42f5-b86f-3f468b0deb8f"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Categoria]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="660" y="0" width="36" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="73e29f93-98a9-4411-8f89-220426f2cb6d"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Sentido]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="794" y="0" width="30" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="f00ced65-e4ea-4332-87d4-0674493f0f87"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Status]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="722" y="0" width="72" height="10" isPrintWhenDetailOverflows="true" uuid="235c8f23-9c13-48cd-ab7a-e74363424caf"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement>
+					<font size="6" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Desc Linha]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="824" y="0" width="20" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="5de9c4ee-7a93-4086-9106-c7d2ad35497e"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Tarifa]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="844" y="0" width="20" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="ed37427e-5811-4fd0-b5ea-627d9a56448d"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Taxa]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="864" y="0" width="30" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8a929bec-8a30-4e9f-a2f2-32bd629776df"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Pedagio]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="894" y="0" width="30" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="6c2a21a8-3afa-4fc6-89b3-10f1887233c8"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Seguro]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="696" y="0" width="26" height="10" isPrintWhenDetailOverflows="true" uuid="cbaa75b2-d156-4324-94b5-4f633008d9ce"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement>
+					<font size="6" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Linha]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="924" y="0" width="36" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="b81ac40e-df45-4de0-b4fe-7452a9b48a9c"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Imp. Pos.]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="471" y="0" width="38" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="38792191-5417-4267-a784-9a634a276565"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Dt. Emiss.]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="28" y="0" width="55" height="10" isPrintWhenDetailOverflows="true" uuid="7d77d66e-6033-4ea3-9066-a42b92e4982e"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left">
+					<font size="6" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Bilheteiro]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="138" y="0" width="55" height="10" isPrintWhenDetailOverflows="true" uuid="672ee466-505c-4913-a6c7-0a18ca4c7bfb"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left">
+					<font size="6" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Bilheteiro Cancel]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="83" y="0" width="55" height="10" isPrintWhenDetailOverflows="true" uuid="77757ee7-73f9-415c-be39-634c74e26e9a"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left">
+					<font size="6" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Cod.Bilheteiro]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="960" y="0" width="96" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="9d4cfe17-48f5-44d6-82fb-19a09342107a"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Passageiro]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1056" y="0" width="40" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="7974d1b8-bd78-4cc8-9411-ca70fa1d38d8"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Documento]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1096" y="0" width="47" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="024b61d2-6fd5-4c94-85a6-55ff2d1bcb91"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Localizador]]></text>
+			</staticText>
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1143" y="0" width="83" height="10" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="08650aaa-364a-4733-b529-c18c601b8295"/>
+				<box>
+					<bottomPen lineWidth="0.25"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<text><![CDATA[Forma Pagamento]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="12" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="28" height="12" isPrintWhenDetailOverflows="true" uuid="bc091860-adab-47d8-8352-982bc8e484a3"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{NUMERO_PASSAGEM}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="193" y="0" width="70" height="12" isPrintWhenDetailOverflows="true" uuid="4cd8a33f-6aaa-47cb-949e-38c6b74d3d39"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="263" y="0" width="70" height="12" isPrintWhenDetailOverflows="true" uuid="17011486-0d4c-4e22-b534-48e0bb025673"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="333" y="0" width="100" height="12" isPrintWhenDetailOverflows="true" uuid="a89c84e4-0e13-4e85-a565-9eb0bc6e5423"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{COD_AGENCIA}+" - "+$F{NOME_AGENCIA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="433" y="0" width="38" height="12" isPrintWhenDetailOverflows="true" uuid="7be97f5f-b36b-4679-befb-e5f2b4532963"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DATA_VENDA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="38" height="12" isPrintWhenDetailOverflows="true" uuid="7c1e2d86-f9ce-4730-866c-dc6cbdd0cf2c"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DATA_VIAGEM}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="582" y="0" width="32" height="12" isPrintWhenDetailOverflows="true" uuid="7c0246f5-739b-440c-a242-915117bd9fd1"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{SERVICO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="547" y="0" width="35" height="12" isPrintWhenDetailOverflows="true" uuid="dd401917-6047-4e1b-9722-31fe8d096594"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{HORA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="614" y="0" width="19" height="12" isPrintWhenDetailOverflows="true" uuid="4dafd61b-ce2b-4690-b029-2a1382113099"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{NUMASIENTO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="633" y="0" width="27" height="12" isPrintWhenDetailOverflows="true" uuid="8ad565b3-b12c-4fef-a1c7-836e7415436d"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{CATEGORIA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="660" y="0" width="36" height="12" isPrintWhenDetailOverflows="true" uuid="b0200cfc-1b6b-4636-9f4b-5fe5d87c2687"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{SENTIDO} == 0 ? "Ida" : "Volta"]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="794" y="0" width="30" height="12" isPrintWhenDetailOverflows="true" uuid="27ec5d64-d949-4b02-a4a7-d6c5db93b3bd"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{STATUS_PASSAGEM}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="722" y="0" width="72" height="12" isPrintWhenDetailOverflows="true" uuid="f5f01da5-4ea3-41ba-8b58-b1f7e8e70601"/>
+				<textElement textAlignment="Left">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DESC_LINHA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="824" y="0" width="20" height="12" isPrintWhenDetailOverflows="true" uuid="5c87326c-e72c-47fb-95d0-0cb47c42d16f"/>
+				<textElement textAlignment="Right">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TARIFA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="844" y="0" width="20" height="12" isPrintWhenDetailOverflows="true" uuid="1ffff7a9-956e-489d-bdd4-61e0f8ce6a13"/>
+				<textElement textAlignment="Right">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TX_EMBARQUE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="864" y="0" width="30" height="12" isPrintWhenDetailOverflows="true" uuid="4ee7ead3-26af-4d0d-b3aa-cf07e24b0594"/>
+				<textElement textAlignment="Right">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{PEDAGIO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="894" y="0" width="30" height="12" isPrintWhenDetailOverflows="true" uuid="07367eac-338d-4ba8-b718-fa416fa3f012"/>
+				<textElement textAlignment="Right">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{SEGURO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="696" y="0" width="26" height="12" isPrintWhenDetailOverflows="true" uuid="6095d523-240a-4ba2-bd94-73ce9f851c9a"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{COD_LINHA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="924" y="0" width="36" height="12" isPrintWhenDetailOverflows="true" uuid="e5abc4be-54af-4252-acc0-a6181c085023"/>
+				<textElement textAlignment="Center">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{IMPRESSAO_POSTERIOR}.equals("E") ? "Sim" : "Não"]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="471" y="0" width="38" height="12" isPrintWhenDetailOverflows="true" uuid="eff5dfcb-b060-42dd-b910-2fe23e58cb9e"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DATA_EMISSAO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="28" y="0" width="55" height="12" isPrintWhenDetailOverflows="true" uuid="119f5dce-b02a-4d33-b74a-03eda5cef5a9"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{BILHETEIRO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="138" y="0" width="55" height="12" isPrintWhenDetailOverflows="true" uuid="a5b1e7fa-5c06-4a24-b7de-fca396b264e1"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{CVEBILHETEIRO_CANCELADO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="83" y="0" width="55" height="12" isPrintWhenDetailOverflows="true" uuid="0f5856f2-2cdf-4178-9beb-33742b4fb83a"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{CVEBILHETEIRO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="960" y="0" width="96" height="12" isPrintWhenDetailOverflows="true" uuid="69a097fd-d502-4fe9-a830-77b5e81c0192"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{PASSAGEIRO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1056" y="0" width="40" height="12" isPrintWhenDetailOverflows="true" uuid="bcb6534a-8109-4565-884b-c9cc806ad787"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DOC}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1096" y="0" width="47" height="12" isPrintWhenDetailOverflows="true" uuid="6396e623-432c-452e-a316-14cc92bd37bf"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{LOCALIZADOR}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1143" y="0" width="83" height="12" isPrintWhenDetailOverflows="true" uuid="f807b716-15e8-46d3-b712-9630eb7d0165"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<noData>
+		<band height="50">
+			<textField>
+				<reportElement x="-566" y="0" width="1792" height="28" uuid="995c4c61-6291-4e5f-8d92-b75502a10466"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
index 40307b0a3..017180e47 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
@@ -22,17 +22,21 @@ import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Paging;
 import org.zkoss.zul.Radiogroup;
+import org.zkoss.zul.Row;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
+import com.rjconsultores.ventaboletos.entidad.FormaPago;
 import com.rjconsultores.ventaboletos.entidad.Moneda;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.enums.IndStatusBoleto;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidos;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidosFiltroFormaPagamento;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidosNovoLayout;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.EstadoService;
+import com.rjconsultores.ventaboletos.service.FormaPagoService;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@@ -72,9 +76,15 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 	private Checkbox chkCancelado;
 	private Checkbox chkIdaVolta;
 	private Checkbox chkEmitido;
+	private Checkbox chkFormaPagamento;
 	private Radiogroup rgLayout;
 	@Autowired
 	private EstadoService estadoService;
+	private List<FormaPago> lsFormaPago;
+	private MyComboboxEstandar cmbFormaPago;
+	@Autowired
+	private FormaPagoService formaPagoService;
+	private Row rowFiltroFormaPagamento;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -85,6 +95,8 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 		chkVendido.setChecked(true);
 		chkCancelado.setChecked(true);
 		puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro());
+		lsFormaPago = formaPagoService.obtenerTodos();
+		cmbFormaPago.setAutocomplete(true);
 
 	}
 
@@ -246,8 +258,17 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 		}else {
 			parametros.put("IDAVOLTA", "0");
 		}
+		
+		FormaPago formaPago = null;
 
-		if (novoLayout) {
+		if (cmbFormaPago.getSelectedItem() != null) {
+			 formaPago = ((FormaPago) cmbFormaPago.getSelectedItem().getValue());
+			parametros.put("FORMAPAGO_ID", formaPago.getFormapagoId());
+			filtro.append(formaPago.getDescpago()).append("; ");
+		}
+		if(chkFormaPagamento.isChecked()) {
+			relatorio = new RelatorioBilhetesVendidosFiltroFormaPagamento(parametros, dataSourceRead.getConnection());
+		}else if (novoLayout) {
 			relatorio = new RelatorioBilhetesVendidosNovoLayout(parametros, dataSourceRead.getConnection());
 			parametros.put("TITULO", Labels.getLabel("relatorioBilhetesVendidosController.window.title"));
 		} else {
@@ -260,6 +281,10 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 
 		openWindow("/component/reportView.zul", Labels.getLabel("relatorioBilhetesVendidosController.window.title"), args, MODAL);
 	}
+	
+	public void onClick$chkFormaPagamento(Event event) {
+		rowFiltroFormaPagamento.setVisible(chkFormaPagamento.isChecked());
+	}
 
 	public Combobox getCmbMoeda() {
 		return cmbMoeda;
@@ -276,4 +301,12 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 	public void setChkEmitido(Checkbox chkEmitido) {
 		this.chkEmitido = chkEmitido;
 	}
+	
+	public List<FormaPago> getLsFormaPago() {
+		return lsFormaPago;
+	}
+	
+	public void setLsFormaPago(List<FormaPago> lsFormaPago) {
+		this.lsFormaPago = lsFormaPago;
+	}
 }
diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label
index e65c32d70..e0eb62b91 100644
--- a/web/WEB-INF/i3-label_en.label
+++ b/web/WEB-INF/i3-label_en.label
@@ -8822,6 +8822,7 @@ relatorioBilhetesVendidosController.reimpresso.label = Reprinted
 relatorioBilhetesVendidosController.reservado.label = Reserved
 relatorioBilhetesVendidosController.transferido.label = Transferred
 relatorioBilhetesVendidosController.vendido.label = Sold
+relatorioBilhetesVendidosController.lbFormaPagamento.value= Payment Method
 # Relatório Bilhetes Vendidos
 relatorioBilhetesVendidosController.window.title = Tickets Sold
 relatorioBilhetesVendidosEstoqueAgenciaController.IdaVolta.label = Round trip
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 30f784244..784378a8a 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -8835,6 +8835,7 @@ relatorioBilhetesVendidosController.reimpresso.label = Reimpresso
 relatorioBilhetesVendidosController.reservado.label = Reservado
 relatorioBilhetesVendidosController.transferido.label = Transferido
 relatorioBilhetesVendidosController.vendido.label = Vendido
+relatorioBilhetesVendidosController.lbFormaPagamento.value= Forma Pago
 # Relatório Bilhetes Vendidos
 # Relatório Bilhetes Vendidos
 relatorioBilhetesVendidosController.window.title = Bilhetes Vendidos
diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label
index 8714d404c..cacdaa173 100644
--- a/web/WEB-INF/i3-label_fr_FR.label
+++ b/web/WEB-INF/i3-label_fr_FR.label
@@ -8820,6 +8820,7 @@ relatorioBilhetesVendidosController.reimpresso.label = Réimprimé
 relatorioBilhetesVendidosController.reservado.label = Réservé
 relatorioBilhetesVendidosController.transferido.label = Transféré
 relatorioBilhetesVendidosController.vendido.label = Vendu
+relatorioBilhetesVendidosController.lbFormaPagamento.value= Mode de paiement
 # Relatório Bilhetes Vendidos
 relatorioBilhetesVendidosController.window.title = Billets vendus
 relatorioBilhetesVendidosEstoqueAgenciaController.IdaVolta.label = Aller-retour
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index bba8579fb..3f336202c 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -8808,6 +8808,7 @@ relatorioBilhetesVendidosController.reimpresso.label = Reimpresso
 relatorioBilhetesVendidosController.reservado.label = Reservado
 relatorioBilhetesVendidosController.transferido.label = Transferido
 relatorioBilhetesVendidosController.vendido.label = Vendido
+relatorioBilhetesVendidosController.lbFormaPagamento.value= Forma Pagamento
 # Relatório Bilhetes Vendidos
 relatorioBilhetesVendidosController.window.title = Bilhetes Vendidos
 relatorioBilhetesVendidosEstoqueAgenciaController.IdaVolta.label = Ida/Volta 
diff --git a/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul b/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul
index f2aa750d8..13fbedfd3 100644
--- a/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul
+++ b/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul
@@ -6,7 +6,7 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioBilhetesVendidos"
 		apply="${relatorioBilhetesVendidosController}"
-		contentStyle="overflow:auto" height="427px" width="550px"
+		contentStyle="overflow:auto" height="467px" width="860px"
 		border="normal">
 
 		<grid fixedLayout="true">
@@ -38,7 +38,7 @@
 				<row spans="1,1,2">
 					<label
 						value="${c:l('relatorioBilhetesVendidosController.lbEmpresa.value')}" />
-					<combobox id="cmbEmpresa" buttonVisible="true"
+					<combobox id="cmbEmpresa" buttonVisible="true" mold="rounded"
 						constraint="no empty"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						model="@{winFiltroRelatorioBilhetesVendidos$composer.lsEmpresa}"
@@ -104,9 +104,10 @@
 		</grid>
 		<grid fixedLayout="true">
 			<columns>
-				<column width="30%" />
-				<column width="30%" />
-				<column width="30%" />
+				<column width="25%" />
+				<column width="25%" />
+				<column width="25%" />
+				<column width="25%" />
 			</columns>
 			<rows>
 				<row>
@@ -114,19 +115,29 @@
 						value="${c:l('relatorioBilhetesVendidosController.lbStatus.value')}" />
 					<label value="" />
 					<label value="" />
+					<label value="" />
 				</row>
 				<row>
 					<checkbox id="chkVendido"   checked = "true" label="${c:l('relatorioBilhetesVendidosController.vendido.label')}" />
 					<checkbox id="chkCancelado" checked = "true" label="${c:l('relatorioBilhetesVendidosController.cancelado.label')}" />
 					<checkbox id="chkIdaVolta"  checked = "true" label="${c:l('relatorioBilhetesVendidosController.IdaVolta.label')}" />	
+					<checkbox id="chkFormaPagamento"  checked = "true" label="${c:l('relatorioBilhetesVendidosController.lbFormaPagamento.value')}" />	
 				</row>
-				<row spans="3">        
+				<row spans="4">        
 					<radiogroup Id="rgLayout" >
 						<radio value="DATA_VENDA" label="${c:l('relatorioBilhetesVendidosController.dataVenda.label')}" checked = "true"/>
 						<radio value="DATA_EMISSAO" label="${c:l('relatorioBilhetesVendidosController.dataEmissao.label')}" />
 						<radio value="DATA_VIAGEM" label="${c:l('relatorioBilhetesVendidosController.dataViagem.label')}" />
 					</radiogroup>
 				</row>
+				<row id ="rowFiltroFormaPagamento" spans="1,1,2" visible="true">
+					<label id="lblFormaPago"
+						value="${c:l('relatorioBilhetesVendidosController.lbFormaPagamento.value')}" />
+					<combobox id="cmbFormaPago" 
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						width="95%" mold="rounded" 
+						model="@{winFiltroRelatorioBilhetesVendidos$composer.lsFormaPago}" />
+				</row>
 			</rows>
 		</grid>
 		<grid fixedLayout="true">
@@ -147,7 +158,7 @@
 						model="@{winFiltroRelatorioBilhetesVendidos$composer.lsEstado}" />
 			    
 					<label value="${c:l('myComboboxMoeda.label.moeda')}" />
-					<combobox id="cmbMoeda" width="90%" buttonVisible="true"
+					<combobox id="cmbMoeda" width="90%" buttonVisible="true" mold="rounded"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda" />
 				</row>
 			</rows>