fixes bug #10103

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77566 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java

@@ -49,13 +49,10 @@ public class RelatorioGratuidade extends Relatorio {
 				}
 				String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : "";
 				String agencia = parametros.get("agencia") != null ? parametros.get("agencia").toString() : "";
-				String ruta = parametros.get("ruta") != null && !parametros.get("ruta").equals(-1) ? parametros.get("ruta").toString() : "";
-				String origem = parametros.get("origem") != null ? parametros.get("origem").toString() : "";
-				String destino = parametros.get("destino") != null ? parametros.get("destino").toString() : "";
 				String categoria = parametros.get("categoria") != null ? parametros.get("categoria").toString() : "";
-				orgaoConcedenteId = parametros.get("orgao_concedente_id") != null ? (Integer) parametros.get("orgao_concedente_id") : null;
+				
 						
-				String sql = getSql(empresa, agencia, ruta, fecInicioViagem, fecFinalViagem, fecInicioVenda, fecFinalVenda, origem, destino, categoria);
+				String sql = getSql(empresa, agencia, fecInicioViagem, fecFinalViagem, fecInicioVenda, fecFinalVenda, categoria);
 		
 				System.out.println(sql);
 		
@@ -79,15 +76,6 @@ public class RelatorioGratuidade extends Relatorio {
 				if(agencia != null && !agencia.equals("")){
 					stmt.setInt("puntoventa_id", Integer.parseInt(agencia));
 				}
-				if(ruta != null && !ruta.equals("")){
-					stmt.setInt("ruta_id", Integer.parseInt(ruta));
-				}
-				if(origem != null && !origem.equals("")){
-					stmt.setInt("origem_id", Integer.parseInt(origem));
-				}
-				if(destino != null && !destino.equals("")){
-					stmt.setInt("destino_id", Integer.parseInt(destino));
-				}
 				if(categoria != null && !categoria.equals("")){
 					stmt.setInt("categoria_id", Integer.parseInt(categoria));
 				}
@@ -103,13 +91,16 @@ public class RelatorioGratuidade extends Relatorio {
 				
 				while (rset.next()) {
 					RelatorioGratuidadeBean gratuidadeBean = new RelatorioGratuidadeBean();
+					
+					gratuidadeBean.setTarifa(rset.getBigDecimal("precio"));
+					gratuidadeBean.setCcf(rset.getString("ccf"));
 					gratuidadeBean.setCorridaId(rset.getString("corrida_id"));
 					gratuidadeBean.setCveusuario(rset.getString("cveusuario"));
 					gratuidadeBean.setDescnumdoc(rset.getString("descnumdoc"));
 					gratuidadeBean.setDesctipoventa(rset.getString("desctipoventa"));
 					gratuidadeBean.setDestino(rset.getString("destino"));
 					gratuidadeBean.setFeccreacion(rset.getDate("feccreacion"));
-					gratuidadeBean.setFechorviaje(rset.getTime("fechorviaje"));
+					gratuidadeBean.setFechorviaje(rset.getDate("fechorviaje"));
 					gratuidadeBean.setKm(rset.getInt("numkmviaje"));
 					gratuidadeBean.setLinha(rset.getString("descruta"));
 					gratuidadeBean.setNombpasajero(rset.getString("nombpasajero"));
@@ -125,7 +116,7 @@ public class RelatorioGratuidade extends Relatorio {
 					gratuidadeBean.setDescdestino(rset.getString("descdestino"));
 					gratuidadeBean.setNumfoliosistema(rset.getString("numfoliosistema"));
 
-					gratuidadeBean.setTipoDoc(rset.getString("desctipo"));
+					gratuidadeBean.setTipoDoc(rset.getString("desctipodoc"));
 					gratuidadeBean.setTipo(rset.getString("desccategoria"));
 					gratuidadeBean.setSeguro(rset.getBigDecimal("importeseguro"));
 					gratuidadeBean.setPedagio(rset.getBigDecimal("importepedagio"));
@@ -155,72 +146,160 @@ public class RelatorioGratuidade extends Relatorio {
 	protected void processaParametros() throws Exception {
 	}
 	
-	private String getSql(String empresa, String agencia, String ruta, String fecInicioViagem, String fecFinalViagem, String fecInicioVenda, String fecFinalVenda, String origem, String destino, String categoria) {
+	private String getSql(String empresa, String agencia, String fecInicioViagem, String fecFinalViagem, String fecInicioVenda, String fecFinalVenda, String categoria) {
-		StringBuffer sql = new StringBuffer();
+		
-		String orderBy = "";
+		
-		sql.append("SELECT og.descorgao, b.feccreacion, ori.cveparada origen, des.cveparada destino, ori.descparada descorigen, des.descparada descdestino, b.numkmviaje, "); 
+		StringBuilder sb = new StringBuilder();
-		sql.append("r.descruta, b.corrida_id, b.fechorviaje, b.numasiento, b.numfoliosistema, tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, "); 
+	
-		sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa, C.cvecategoria, ti.DESCTIPO, "); 
+
-		sql.append("c.DESCCATEGORIA, tar.IMPORTEPEDAGIO, tar.IMPORTESEGURO, tar.IMPORTETAXAEMBARQUE, b.DESCNUMDOC, b.INDSTATUSBOLETO, ori.CVEPARADA codOrigem, des.CVEPARADA codDestino ");
+		sb.append("SELECT * ");
-		sql.append("FROM boleto b ");
+		sb.append("FROM ");
-		sql.append("JOIN categoria c ON b.categoria_id = c.categoria_id ");
+		sb.append("  (SELECT b.boleto_id,");
-		sql.append("JOIN parada ori ON ori.parada_id = b.origen_id ");
+		sb.append("          b.ccf,");
-		sql.append("JOIN parada des ON des.parada_id = b.destino_id ");
+		sb.append("          og.descorgao,");
-		sql.append("JOIN ruta r ON r.ruta_id = b.ruta_id ");
+		sb.append("          b.feccreacion,");
-		sql.append("JOIN tipo_venta tv ON tv.tipoventa_id = b.tipoventa_id ");
+		sb.append("          ori.cveparada origen,");
-		sql.append("JOIN punto_venta ag ON ag.puntoventa_id = b.puntoventa_id ");
+		sb.append("          des.cveparada destino,");
-		sql.append("JOIN usuario u ON u.usuario_id = b.usuario_id ");
+		sb.append("          ori.descparada descorigen,");
-		sql.append("JOIN vigencia_tarifa vt ON b.feccorrida BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia ");
+		sb.append("          des.descparada descdestino,");
-		sql.append("JOIN tarifa tar ON (tar.ruta_id = b.ruta_id ");
+		sb.append("          b.numkmviaje,");
-		sql.append("    AND tar.marca_id = b.marca_id ");
+		sb.append("          r.descruta,");
-		sql.append("    AND tar.claseservicio_id = b.claseservicio_id ");
+		sb.append("          b.corrida_id,");
-		sql.append("    AND tar.vigenciatarifa_id = vt.vigenciatarifa_id ");
+		sb.append("          b.fechorviaje,");
-		sql.append("    AND tar.origen_id = b.origen_id ");
+		sb.append("          b.numasiento,");
-		sql.append("    AND tar.destino_id = b.destino_id) ");
+		sb.append("          b.numfoliosistema,");
-		sql.append("JOIN empresa e ON e.empresa_id = b.empresacorrida_id ");
+		sb.append("          case when b.tipoventa_id in(5,12,18,41,49)  then 'PTA' else tv.desctipoventa end as desctipoventa, ");
-		sql.append("LEFT JOIN TIPO_IDENTIFICACION ti ON ti.TIPOIDENTIFICACION_ID = b.TIPOIDENTIFICACIONDOC_ID ");
+		sb.append("          b.nombpasajero,");
-		sql.append("join ORGAO_CONCEDENTE og on og.ORGAOCONCEDENTE_ID = tar.ORGAOCONCEDENTE_ID ");
+		sb.append("          b.descnumdoc,");
-		sql.append("WHERE 1=1 ");
+		sb.append("          tar.preciooriginal,");
+		sb.append("          tar.precio,");
+		sb.append("          b.porccategoria,");
+		sb.append("          b.preciopagado,");
+		sb.append("          u.cveusuario,");
+		sb.append("          ag.nombpuntoventa,");
+		sb.append("          e.nombempresa,");
+		sb.append("          ca.cvecategoria,");
+		sb.append("          b.desctipodoc,");
+		sb.append("          ca.desccategoria,");
+		sb.append("          tar.importepedagio,");
+		sb.append("          tar.importeseguro,");
+		sb.append("          tar.importetaxaembarque,");
+		sb.append("          'RESERVA' as indstatusboleto, ");
+		sb.append("          ori.cveparada codorigem,");
+		sb.append("          des.cveparada coddestino");
+		sb.append("   FROM boleto b");
+		sb.append("   JOIN categoria ca ON b.categoria_id = ca.categoria_id");
+		sb.append("   JOIN parada ori ON ori.parada_id = b.origen_id");
+		sb.append("   JOIN parada des ON des.parada_id = b.destino_id");
+		sb.append("   JOIN ruta r ON r.ruta_id = b.ruta_id");
+		sb.append("   JOIN tipo_venta tv ON tv.tipoventa_id = b.tipoventa_id");
+		sb.append("   JOIN punto_venta ag ON ag.puntoventa_id = b.puntoventa_id");
+		sb.append("   JOIN usuario u ON u.usuario_id = b.usuario_id");
+		sb.append("   JOIN vigencia_tarifa vt ON b.fechorventa BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia and vt.activo = 1");
+		sb.append("   JOIN tarifa tar ON (tar.ruta_id = b.ruta_id");
+		sb.append("                       AND tar.marca_id = b.marca_id");
+		sb.append("                       AND tar.claseservicio_id = b.claseservicio_id");
+		sb.append("                       AND tar.vigenciatarifa_id = vt.vigenciatarifa_id");
+		sb.append("                       AND tar.origen_id = b.origen_id");
+		sb.append("                       AND tar.destino_id = b.destino_id and tar.activo = 1)");
+		sb.append("   JOIN empresa e ON e.empresa_id = b.empresacorrida_id");
+		sb.append("   JOIN orgao_concedente og ON og.orgaoconcedente_id = tar.orgaoconcedente_id");
+		sb.append("   WHERE 1=1  and b.tipoventa_id = 15");
+		sb.append("   AND b.indstatusboleto = 'S' ");
 		if (fecInicioViagem != null && fecFinalViagem != null) {
-			sql.append(" AND b.feccorrida BETWEEN :fecInicioViagem AND :fecFinalViagem ");
+			sb.append(" AND b.feccorrida BETWEEN :fecInicioViagem AND :fecFinalViagem ");
-			orderBy = "b.feccorrida";
 		}
 		if (fecInicioVenda != null && fecFinalVenda != null) {
-			sql.append(" AND b.FECHORVENTA BETWEEN :fecInicioVenda AND :fecFinalVenda ");
+			sb.append(" AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
-			if (orderBy.length() > 0) {
-				orderBy += ",";
-			}
-			orderBy += "b.FECHORVENTA";
 		}
-		sql.append("AND b.motivocancelacion_id IS NULL ");
 		if (!empresa.isEmpty()){
-			sql.append("AND b.empresacorrida_id = :empresa_id  ");
+			sb.append("AND b.empresacorrida_id = :empresa_id  ");
 		}
-		if (!agencia.isEmpty()){
+		if (!agencia.isEmpty() && !agencia.equals("-1")){
-			sql.append("       AND b.puntoventa_id = :puntoventa_id  ");
+			sb.append("       AND b.puntoventa_id = :puntoventa_id  ");
-		}
-		if (!ruta.isEmpty() && !ruta.equals("-1")){
-			sql.append("       AND b.ruta_id = :ruta_id  ");
-		}
-		if(!origem.isEmpty()){
-			sql.append("       AND ori.parada_id = :origem_id   ");
-		}
-		if(!destino.isEmpty()){
-			sql.append("       AND des.parada_id = :destino_id   ");
 		}
 		if(!categoria.isEmpty()){
-			sql.append("       AND c.categoria_id = :categoria_id ");
+			sb.append("       AND ca.categoria_id = :categoria_id ");
-			if (orderBy.length() > 0) {
-				orderBy += ",";
-			}
-			orderBy += "c.categoria_id";
 		}
-		if(orgaoConcedenteId != null){
+		sb.append("   ");
-			sql.append("       AND r.orgaoconcedente_id = :orgao_concedente_id  ");
+		sb.append("   UNION ALL ");
+		sb.append("   ");
+		sb.append("   SELECT c.transacao_id,");
+		sb.append("                    c.ccf,");
+		sb.append("                    og.descorgao,");
+		sb.append("                    c.feccreacion,");
+		sb.append("                    ori.cveparada origen,");
+		sb.append("                    des.cveparada destino,");
+		sb.append("                    ori.descparada descorigen,");
+		sb.append("                    des.descparada descdestino,");
+		sb.append("                    c.numkmviaje,");
+		sb.append("                    r.descruta,");
+		sb.append("                    c.corrida_id,");
+		sb.append("                    c.fechorviaje,");
+		sb.append("                    c.numasiento,");
+		sb.append("                    c.numfoliosistema,");
+		sb.append("                    case when c.tipoventa_id in(5,12,18,41,49)  then 'PTA' when c.tipoventa_id = '81' then 'VENDA DE TRANSFERENCIA' else tv.desctipoventa end as desctipoventa, ");
+		sb.append("                    c.nombpasajero,");
+		sb.append("                    c.descnumdoc,");
+		sb.append("                    tar.preciooriginal,");
+		sb.append("                    tar.precio,");
+		sb.append("                    c.porccategoria,");
+		sb.append("                    c.preciopagado,");
+		sb.append("                    u.cveusuario,");
+		sb.append("                    ag.nombpuntoventa,");
+		sb.append("                    e.nombempresa,");
+		sb.append("                    ca.cvecategoria,");
+		sb.append("                    c.desctipodoc,");
+		sb.append("                    ca.desccategoria,");
+		sb.append("                    tar.importepedagio,");
+		sb.append("                    tar.importeseguro,");
+		sb.append("                    tar.importetaxaembarque,");
+		sb.append("                    case when c.indstatusboleto = 'V' then 'VENDIDO' when c.indstatusboleto = 'C' and c.motivocancelacion_id = 31 then 'CANCELADO' ");
+		sb.append(" 				        when c.indstatusboleto = 'C' and c.motivocancelacion_id = 32 then 'DEVOLVIDO' ");
+		sb.append(" 				        when c.indstatusboleto = 'E' and c.indreimpresion = 1 then  'ENTREGUE' ");
+		sb.append("                         when c.indstatusboleto = 'T' and c.motivocancelacion_id = 10 or c.tipoventa_id = 8  then 'TROCA'  ");
+		sb.append("                         when c.indstatusboleto = 'T'  and c.tipoventa_id = 81 or  c.indstatusboleto = 'T' then 'TRANSFERÊNCIA' " );
+		sb.append("                         when c.indstatusboleto = 'T'  and c.tipoventa_id = 82 then 'CONFIRM.ABERTO' " );
+		sb.append("                         when c.indstatusboleto = 'T' and c.tipoventa_id = 41  then 'CHECKIN REATIVADO' end as indstatusboleto, ");
+		sb.append("                    ori.cveparada codorigem,");
+		sb.append("                    des.cveparada coddestino");
+		sb.append("   FROM caja c");
+		sb.append("   JOIN categoria ca ON c.categoria_id = ca.categoria_id");
+		sb.append("   JOIN parada ori ON ori.parada_id = c.origen_id");
+		sb.append("   JOIN parada des ON des.parada_id = c.destino_id");
+		sb.append("   JOIN ruta r ON r.ruta_id = c.ruta_id");
+		sb.append("   JOIN tipo_venta tv ON tv.tipoventa_id = c.tipoventa_id");
+		sb.append("   JOIN punto_venta ag ON ag.puntoventa_id = c.puntoventa_id");
+		sb.append("   JOIN usuario u ON u.usuario_id = c.usuario_id");
+		sb.append("   JOIN vigencia_tarifa vt ON c.fechorventa BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia");
+		sb.append("   JOIN tarifa tar ON (tar.ruta_id = c.ruta_id");
+		sb.append("                       AND tar.marca_id = c.marca_id");
+		sb.append("                       AND tar.claseservicio_id = c.claseservicio_id");
+		sb.append("                       AND tar.vigenciatarifa_id = vt.vigenciatarifa_id");
+		sb.append("                       AND tar.origen_id = c.origen_id");
+		sb.append("                       AND tar.destino_id = c.destino_id and tar.activo = 1)");
+		sb.append("   JOIN empresa e ON e.empresa_id = c.empresacorrida_id");
+		sb.append("   JOIN orgao_concedente og ON og.orgaoconcedente_id = tar.orgaoconcedente_id");
+		sb.append("   WHERE 1=1  and (c.motivocancelacion_id IN (31,32) OR c.motivocancelacion_id IS NULL) ");
+		sb.append("     AND (c.indreimpresion = 0  OR (c.indstatusboleto IN ('E','T') AND c.indreimpresion = 1))");
+		if (fecInicioViagem != null && fecFinalViagem != null) {
+			sb.append(" AND c.feccorrida BETWEEN :fecInicioViagem AND :fecFinalViagem ");
 		}
-		
+		if (fecInicioVenda != null && fecFinalVenda != null) {
-		sql.append(" ORDER BY " + orderBy);
+			sb.append(" AND c.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
+		}
+		if (!empresa.isEmpty()){
+			sb.append("AND c.empresacorrida_id = :empresa_id  ");
+		}
+		if (!agencia.isEmpty() && !agencia.equals("-1")){
+			sb.append("       AND c.puntoventa_id = :puntoventa_id  ");
+		}
+		if(!categoria.isEmpty()){
+			sb.append("       AND ca.categoria_id = :categoria_id ");
+		}
+		sb.append(") ");
+		sb.append("ORDER BY 1");
 
-		return sql.toString();
+		return sb.toString();
 	}
 }

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties

@@ -1,20 +1,23 @@
 #geral
-msg.noData=No se pudo obtener datos con los parámetros reportados.
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
-msg.a=a
+msg.a=à
 
 #Labels header
 header.periodo=Período: 
-header.data.hora=Fecha/Hora\: 
+header.data.hora=Data/Hora\: 
 header.pagina=Página\: 
 header.filtro=Filtro\: 
-header.filtro.servico=Servicio\: 
+header.filtro.servico=Serviço\: 
-header.filtro.linha=Línea\: 
+header.filtro.linha=Linha\: 
-header.filtro.grupo=Grupo de líneas\:
+header.filtro.grupo=Grupo de Linhas\:
 header.empresa=Empresa\:
+header.periodo.viagem=Período Viagem
+header.periodo.venda=Período Venda
 
 #Labels detail
 
 detail.data=Data
+detail.dataServico=Data Servi.
 detail.origen=Origem
 detail.destino=Destino
 detail.km=Km
@@ -27,15 +30,27 @@ detail.pasajero=Passageiro
 detail.documento=Doc
 detail.precio=Preço
 detail.desconto=Desc.(%)
-detail.tarifadesconto=Tarifa
+detail.valorCobrado=Vlr.Cobrado
+detail.tarifa=Tarifa
 detail.bilheteiro=Bilheteiro
 detail.agencia=Agência
-detail.total=Orgão
+detail.dataMD=Data MD
+detail.empresa=Empresa
+detail.tipo=Tipo
+detail.tipoDoc=Tipo Doc.
+detail.tarifa=Tarifa
+detail.seguro=Seguro
+detail.utr=UTR
+detail.tpp=TPP
+detail.pedagio=Pedágio
+detail.rg=RG
+detail.status=Status
+detail.codOrigem=Cod. Origem
+detail.codDestino=Cod. Destino
+detail.total=Total 	
+detail.ccf=CCf
 
-detail.total=Total 		Quantidade: 
+linhas=Linhas
-
-linhas=Líneas
-
-detail.numfoliosistema=N.Bil
-detail.numasiento=Pol
 
+detail.numfoliosistema=Bilhete
+detail.numasiento=Poltrona

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties

@@ -17,6 +17,7 @@ header.periodo.venda=Per
 #Labels detail
 
 detail.data=Data
+detail.dataServico=Data Servi.
 detail.origen=Origem
 detail.destino=Destino
 detail.km=Km
@@ -29,24 +30,27 @@ detail.pasajero=Passageiro
 detail.documento=Doc
 detail.precio=Preço
 detail.desconto=Desc.(%)
-detail.tarifadesconto=Tarifa
+detail.valorCobrado=Vlr.Cobrado
+detail.tarifa=Tarifa
 detail.bilheteiro=Bilheteiro
 detail.agencia=Agência
 detail.dataMD=Data MD
+detail.empresa=Empresa
 detail.tipo=Tipo
 detail.tipoDoc=Tipo Doc.
 detail.tarifa=Tarifa
 detail.seguro=Seguro
 detail.utr=UTR
+detail.tpp=TPP
 detail.pedagio=Pedágio
 detail.rg=RG
 detail.status=Status
 detail.codOrigem=Cod. Origem
 detail.codDestino=Cod. Destino
-detail.total=Total 		Quantidade: 
+detail.total=Total 	
-detail.total=Orgão
+detail.ccf=CCf
 
 linhas=Linhas
 
-detail.numfoliosistema=N.Bil
+detail.numfoliosistema=Bilhete
-detail.numasiento=Pol
+detail.numasiento=Poltrona

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml

@@ -1,8 +1,8 @@
 <?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="RelatorioEmpresaCorrida" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
+<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="RelatorioEmpresaCorrida" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="2.1961500000000127"/>
+	<property name="ireport.zoom" value="0.9330147604194715"/>
-	<property name="ireport.x" value="1071"/>
+	<property name="ireport.x" value="203"/>
-	<property name="ireport.y" value="136"/>
+	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<parameter name="fecInicioViagem" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -15,6 +15,7 @@
 	<parameter name="TITULO" class="java.lang.String"/>
 	<parameter name="fecInicioVenda" class="java.lang.String"/>
 	<parameter name="fecFinalVenda" class="java.lang.String"/>
+	<parameter name="nomb_empresa" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -24,7 +25,7 @@
 	<field name="km" class="java.lang.Integer"/>
 	<field name="linha" class="java.lang.String"/>
 	<field name="corridaId" class="java.lang.String"/>
-	<field name="fechorviaje" class="java.sql.Time"/>
+	<field name="fechorviaje" class="java.util.Date"/>
 	<field name="desctipoventa" class="java.lang.String"/>
 	<field name="nombpasajero" class="java.lang.String"/>
 	<field name="descnumdoc" class="java.lang.String"/>
@@ -44,12 +45,14 @@
 	<field name="seguro" class="java.math.BigDecimal"/>
 	<field name="utr" class="java.math.BigDecimal"/>
 	<field name="pedagio" class="java.math.BigDecimal"/>
-	<field name="rg" class="java.lang.String"/>
+	<field name="tpp" class="java.lang.String"/>
 	<field name="status" class="java.lang.String"/>
 	<field name="dataMd" class="java.lang.String"/>
 	<field name="codOrigem" class="java.lang.String"/>
 	<field name="codDestino" class="java.lang.String"/>
 	<field name="descorgao" class="java.lang.String"/>
+	<field name="ccf" class="java.lang.String"/>
+	<field name="tarifa" class="java.math.BigDecimal"/>
 	<variable name="qtde" class="java.lang.Integer" calculation="Count">
 		<variableExpression><![CDATA[$F{km}]]></variableExpression>
 	</variable>
@@ -59,527 +62,511 @@
 	<variable name="total_com_desconto" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{preciopagado}]]></variableExpression>
 	</variable>
-	<group name="empresa">
-		<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
-		<groupHeader>
-			<band height="68">
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement uuid="d15af518-c902-4903-bf8a-d4cf3ff6c05e" x="69" y="10" width="191" height="16"/>
-					<textElement textAlignment="Left">
-						<font size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="d08e6683-5388-4505-9e47-fc3d501c62b9" x="0" y="40" width="17" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.data}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="34" y="40" width="25" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="82" y="40" width="31" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="6124e4be-a471-4867-86f5-bb635ce5db7f" x="113" y="40" width="21" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.km}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="134" y="40" width="40" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="174" y="40" width="44" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="218" y="40" width="42" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="316" y="40" width="29" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="374" y="40" width="33" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="407" y="40" width="32" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="439" y="40" width="28" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="467" y="40" width="30" height="27"/>
-					<textElement textAlignment="Right">
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="497" y="40" width="24" height="27"/>
-					<textElement textAlignment="Right">
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.tarifadesconto}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="521" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="e727feec-a329-4f8c-af2a-c89c3c2e9606" x="551" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
-				</textField>
-				<line>
-					<reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="1" y="67" width="821" height="1"/>
-				</line>
-				<textField>
-					<reportElement uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0" x="1" y="10" width="68" height="16"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173" x="345" y="40" width="29" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.tipopassagem}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39" x="260" y="40" width="26" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca" x="286" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459" x="581" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="7b62e459-04bc-4227-be76-24bf5938d552" x="611" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="069eab80-7d6d-4dae-a598-c5014deb81f4" x="641" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.tipoDoc}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="5105aee2-c3ec-4571-a14c-06b69218decc" x="671" y="40" width="30" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.rg}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0" x="701" y="40" width="21" height="27"/>
-					<textElement textAlignment="Center">
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.status}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="f3655778-94dd-4fb6-8c84-cf32416201e0" x="722" y="40" width="20" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31" x="742" y="40" width="29" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.utr}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="c74391a0-cc07-44f7-90af-3036910e6bb3" x="772" y="40" width="26" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e" x="17" y="40" width="17" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.codOrigem}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2" x="59" y="40" width="23" height="27"/>
-					<textElement>
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.codDestino}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="d1507aa6-eaf3-4e5e-8178-6452c4da0854" x="798" y="40" width="24" height="27"/>
-					<textElement textAlignment="Center">
-						<font size="6"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.orgao}]]></textFieldExpression>
-				</textField>
-			</band>
-		</groupHeader>
-	</group>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
-	<pageHeader>
+	<title>
-		<band height="71" splitType="Stretch">
+		<band height="144">
 			<textField>
-				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="20" width="113" height="20"/>
+				<reportElement x="0" y="0" width="314" height="37" uuid="652312bd-292a-424d-a234-5f157e3699c6"/>
-				<textElement/>
+				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="37" width="82" height="23" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
 				<textFieldExpression><![CDATA[$R{header.periodo.viagem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="666" y="0" width="56" height="20"/>
+				<reportElement x="633" y="37" width="106" height="23" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="798" y="20" width="22" height="20"/>
+				<reportElement x="811" y="37" width="30" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="734" y="20" width="37" height="20"/>
+				<reportElement x="739" y="37" width="39" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="113" y="20" width="147" height="20"/>
+				<reportElement x="82" y="37" width="232" height="23" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[( $P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : "" )]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="260" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
-			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="722" y="0" width="98" height="20"/>
+				<reportElement x="739" y="0" width="102" height="37" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
 				<textElement textAlignment="Left"/>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="771" y="20" width="27" height="20"/>
+				<reportElement x="778" y="37" width="33" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27" x="0" y="40" width="113" height="20"/>
+				<reportElement x="0" y="60" width="82" height="21" uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="113" y="40" width="147" height="20"/>
+				<reportElement x="82" y="60" width="232" height="21" uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="81" width="82" height="20" uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0"/>
+				<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="368" y="114" width="73" height="26" uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="474" y="114" width="68" height="26" uuid="e18edb89-17f4-417e-8041-664f11245cbd"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="257" y="114" width="57" height="26" uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="224" y="114" width="33" height="26" uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="314" y="114" width="28" height="26" uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="739" y="114" width="39" height="26" uuid="cc834009-ae90-46d4-8bbb-37578b69f621"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="633" y="114" width="44" height="26" uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="707" y="114" width="32" height="26" uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="841" y="114" width="28" height="26" uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="869" y="114" width="40" height="26" uuid="e14732be-42a0-4f54-9eb2-52f10ece154b"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="909" y="114" width="41" height="26" uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valorCobrado}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="109" y="114" width="30" height="26" uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="778" y="114" width="33" height="26" uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.tipopassagem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="542" y="114" width="34" height="26" uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="576" y="114" width="36" height="26" uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="139" y="114" width="43" height="26" uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="811" y="114" width="30" height="26" uuid="7b62e459-04bc-4227-be76-24bf5938d552"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="677" y="114" width="30" height="26" uuid="069eab80-7d6d-4dae-a598-c5014deb81f4"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.tipoDoc}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1062" y="114" width="20" height="26" uuid="5105aee2-c3ec-4571-a14c-06b69218decc"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.tpp}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1082" y="114" width="50" height="26" uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.status}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="983" y="114" width="27" height="26" uuid="f3655778-94dd-4fb6-8c84-cf32416201e0"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1043" y="114" width="19" height="26" uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.utr}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1010" y="114" width="33" height="26" uuid="c74391a0-cc07-44f7-90af-3036910e6bb3"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="342" y="114" width="26" height="26" uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.codOrigem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="441" y="114" width="33" height="26" uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.codDestino}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="114" width="54" height="26" uuid="421120df-7852-4311-95a8-93478f8c4a5e"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.empresa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="54" y="114" width="55" height="26" uuid="24ef9240-77fe-4c43-b065-4aa214805b3e"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="612" y="114" width="21" height="26" uuid="9e0176f6-a8ff-4246-8038-34155064d017"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.ccf}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="950" y="114" width="33" height="26" uuid="97583aa4-45de-402c-8ce9-978c974d6e0c"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.tarifa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="182" y="114" width="42" height="26" uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.dataServico}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="140" width="1132" height="1" uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350"/>
+			</line>
+			<textField>
+				<reportElement x="82" y="81" width="232" height="20" uuid="3541e1b0-8dfe-404e-9461-64d10d85531a"/>
+				<textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression>
+			</textField>
 		</band>
-	</pageHeader>
+	</title>
 	<columnHeader>
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="23" splitType="Prevent">
+		<band height="25" splitType="Prevent">
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToBandHeight" x="113" y="0" width="21" height="23"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{km}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToBandHeight" x="174" y="0" width="44" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="224" y="0" width="33" height="23" uuid="3111776a-f727-4313-841c-55dabd804df4"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="HH:mm:ss" isBlankWhenNull="true">
-				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToBandHeight" x="218" y="0" width="42" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="314" y="0" width="28" height="23" uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{fechorviaje}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToBandHeight" x="134" y="0" width="40" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="739" y="0" width="39" height="23" uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
-				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToBandHeight" x="0" y="0" width="17" height="23"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{feccreacion}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c" stretchType="RelativeToBandHeight" x="316" y="0" width="29" height="23"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{desctipoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="374" y="0" width="33" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="707" y="0" width="32" height="23" uuid="37fa056d-c401-4268-a455-c5caf5e4eb54"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{nombpasajero}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="407" y="0" width="32" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descnumdoc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60" stretchType="RelativeToBandHeight" x="467" y="0" width="30" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="869" y="0" width="40" height="23" uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60"/>
-				<textElement textAlignment="Right">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{porccategoria}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="f0161d55-b853-4318-8028-8aec04c0487d" stretchType="RelativeToBandHeight" x="497" y="0" width="24" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="909" y="0" width="41" height="23" uuid="f0161d55-b853-4318-8028-8aec04c0487d"/>
-				<textElement textAlignment="Right">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciopagado}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="1f3bab43-ae23-41b1-b5a6-a6c4c09fd359" stretchType="RelativeToBandHeight" x="521" y="0" width="30" height="23"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{cveusuario}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="24dcce32-309b-48f9-8543-1e1bffdef942" x="551" y="0" width="30" height="23"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToBandHeight" x="82" y="0" width="31" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="474" y="0" width="68" height="23" uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descdestino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToBandHeight" x="34" y="0" width="25" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="368" y="0" width="73" height="23" uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descorigen}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed" stretchType="RelativeToBandHeight" x="439" y="0" width="28" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="841" y="0" width="28" height="23" uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed"/>
-				<textElement textAlignment="Right">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciooriginal}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2" stretchType="RelativeToBandHeight" x="345" y="0" width="29" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="778" y="0" width="33" height="23" uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cvecategoria}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="8b89e606-e89c-4b3d-a5b5-4dfd339de5df" stretchType="RelativeToBandHeight" x="260" y="0" width="26" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="542" y="0" width="34" height="23" uuid="8b89e606-e89c-4b3d-a5b5-4dfd339de5df"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numasiento}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="4177f54f-ba97-4731-8c32-c8fc23ce483a" stretchType="RelativeToBandHeight" x="286" y="0" width="30" height="23"/>
-				<textElement>
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="9e5ccd79-6850-4b3c-bfa1-405a96d3f826" x="772" y="0" width="26" height="23"/>
+				<reportElement x="1010" y="0" width="33" height="23" uuid="9e5ccd79-6850-4b3c-bfa1-405a96d3f826"/>
-				<textElement textAlignment="Left">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="32e01305-63ee-444c-a4a7-e9246621ca83" x="742" y="0" width="29" height="23"/>
+				<reportElement x="1043" y="0" width="19" height="23" uuid="32e01305-63ee-444c-a4a7-e9246621ca83"/>
-				<textElement textAlignment="Left">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{utr}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="bff1a8a9-115f-4abf-811a-92ac988ca380" x="722" y="0" width="20" height="23"/>
+				<reportElement x="983" y="0" width="27" height="23" uuid="bff1a8a9-115f-4abf-811a-92ac988ca380"/>
-				<textElement textAlignment="Left">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="9df5776a-63e5-4480-81d5-34427fd79e23" x="641" y="0" width="30" height="23"/>
+				<reportElement x="677" y="0" width="30" height="23" uuid="9df5776a-63e5-4480-81d5-34427fd79e23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipoDoc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="d75d9725-26ac-47f5-94db-995e5b49f30a" x="611" y="0" width="30" height="23"/>
+				<reportElement x="811" y="0" width="30" height="23" uuid="d75d9725-26ac-47f5-94db-995e5b49f30a"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="fe98c2f8-b8cc-4f51-bf9d-9b767fe94088" x="671" y="0" width="30" height="23"/>
+				<reportElement x="1062" y="0" width="20" height="23" uuid="fe98c2f8-b8cc-4f51-bf9d-9b767fe94088"/>
-				<textElement textAlignment="Left">
+				<textElement>
 					<font size="6"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{rg}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{tpp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="c6379bbf-bdfb-4600-b6ec-e1e9a6640c6d" x="701" y="0" width="21" height="23"/>
+				<reportElement x="1082" y="0" width="50" height="23" uuid="c6379bbf-bdfb-4600-b6ec-e1e9a6640c6d"/>
-				<textElement textAlignment="Center">
+				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="230fcb25-af91-4a54-b98e-a4477a3f5935" x="581" y="0" width="30" height="23"/>
-				<textElement textAlignment="Left">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{dataMd}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="8bdcad97-d2f3-443d-b2bb-2292e060a68e" stretchType="RelativeToBandHeight" x="17" y="0" width="17" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="342" y="0" width="26" height="23" uuid="8bdcad97-d2f3-443d-b2bb-2292e060a68e"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="1c2892df-b5e0-4ef7-a4f2-3479e022d73c" stretchType="RelativeToBandHeight" x="59" y="0" width="23" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="441" y="0" width="33" height="23" uuid="1c2892df-b5e0-4ef7-a4f2-3479e022d73c"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codDestino}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
-				<reportElement uuid="490de404-9c54-4fad-be6d-9b1d1041b3dd" x="798" y="0" width="24" height="23"/>
+				<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="54" height="23" uuid="8caf3414-13cb-49df-a75c-ebfa9840e025"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="54" y="0" width="55" height="23" uuid="b4bf2776-70de-48e8-8130-fd67cbbad3f3"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="109" y="0" width="30" height="23" uuid="1f3bab43-ae23-41b1-b5a6-a6c4c09fd359"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cveusuario}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="139" y="0" width="43" height="23" uuid="230fcb25-af91-4a54-b98e-a4477a3f5935"/>
+				<textElement textAlignment="Center">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{feccreacion}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="257" y="0" width="57" height="23" uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="633" y="0" width="44" height="23" uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b"/>
+				<textElement textAlignment="Left">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nombpasajero}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="950" y="0" width="33" height="23" uuid="7a2eccbc-06b0-450a-bd27-6b1c669f408c"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{descorgao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="576" y="0" width="36" height="23" uuid="4177f54f-ba97-4731-8c32-c8fc23ce483a"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="612" y="0" width="21" height="23" uuid="56de76ac-7bd5-489d-bb2f-5fdba2eb8f67"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{ccf}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="182" y="0" width="42" height="23" uuid="dfd8ec54-db1c-49c7-b293-cd387e04dbb9"/>
+				<textElement textAlignment="Center">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{fechorviaje}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
 	<summary>
-		<band height="53">
+		<band height="18">
 			<textField>
-				<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="24" width="186" height="16"/>
+				<reportElement x="0" y="0" width="139" height="18" uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="196" y="24" width="90" height="16"/>
+				<reportElement x="182" y="0" width="75" height="18" uuid="6005f63d-1abc-408d-9af2-adea341fadda"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="c3632bd6-baee-4919-880b-1e0f94fe44c0" x="521" y="24" width="90" height="16"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="5bb15b93-745c-48fd-8803-3047a49c358c" x="611" y="24" width="90" height="16"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression>
-			</textField>
 		</band>
 	</summary>
 	<noData>
-		<band height="22">
+		<band height="25">
 			<textField>
-				<reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="803" height="20"/>
+				<reportElement x="0" y="0" width="1132" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/>
-				<textElement/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class RelatorioGratuidadeBean {
+	
 	private Date feccreacion;
 	private String origen;
 	private String descorigen;
@@ -30,12 +31,15 @@ public class RelatorioGratuidadeBean {
 	private BigDecimal seguro;
 	private BigDecimal pedagio;
 	private BigDecimal utr;
+	private BigDecimal tpp;
+	private BigDecimal tarifa;
 	private String rg;
 	private String status;
 	private Date dataMd;
 	private String codOrigem;
 	private String codDestino;
 	private String descorgao;
+	private String ccf;
 	
 	public String getDescorgao() {
 		return descorgao;
@@ -228,6 +232,25 @@ public class RelatorioGratuidadeBean {
 	}
 	public void setNumfoliosistema(String numfoliosistema) {
 		this.numfoliosistema = numfoliosistema;
-	}	
+	}
+	public String getCcf() {
+		return ccf;
+	}
+	public void setCcf(String ccf) {
+		this.ccf = ccf;
+	}
+	public BigDecimal getTarifa() {
+		return tarifa;
+	}
+	public void setTarifa(BigDecimal tarifa) {
+		this.tarifa = tarifa;
+	}
+	public BigDecimal getTpp() {
+		return tpp;
+	}
+	public void setTpp(BigDecimal tpp) {
+		this.tpp = tpp;
+	}
+
 	
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java

@@ -55,22 +55,16 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer {
 	private Datebox datFinalViagem;
 	private Datebox datInicialVenda;
 	private Datebox datFinalVenda;
-	private MyComboboxEstandar cmbTeste;
+	private MyComboboxEstandar cmbEmpresa;
 	private MyComboboxPuntoVenta cmbAgencia;
-	private MyComboboxEstandar cmbLinha;
-	private MyComboboxParada cmbOrigem;
-	private MyComboboxParada cmbDestino;
 	private MyComboboxEstandar cmbTipoGratuidade;
-	private MyComboboxEstandar cmbOrgaoConcedente;
 
 	private List<Empresa> lsEmpresas;
-	private List<Ruta> lsLinhas;
 	private List<Categoria> lsCategorias;
 	
 	private MyListbox selectedTipoGratuidadeList;
 	private List<Categoria> listSelectedTipoGratuidade;
 	
-	private List<OrgaoConcedente> lsOrgaoConcedente;
 	
 	public void onClick$btnRemoveTipoGratuidade(Event ev) throws InterruptedException {
 		Categoria categoria = (Categoria) selectedTipoGratuidadeList.getSelectedItem().getValue();
@@ -145,30 +139,20 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer {
 			 return;
 		}
 			
-		if (cmbTeste.getSelectedIndex() != -1) {
+		if (cmbEmpresa.getSelectedIndex() != -1) {
-			parametros.put("empresa", ((Empresa) cmbTeste.getSelectedItem().getValue()).getEmpresaId());
+			parametros.put("empresa", ((Empresa) cmbEmpresa.getSelectedItem().getValue()).getEmpresaId());
+			parametros.put("nomb_empresa", ((Empresa) cmbEmpresa.getSelectedItem().getValue()).getNombempresa());
+
+		}else{
+			parametros.put("nomb_empresa", "TODAS" );
 		}
+		
 		if (cmbAgencia.getSelectedIndex() != -1) {
 			parametros.put("agencia", ((PuntoVenta) cmbAgencia.getSelectedItem().getValue()).getPuntoventaId());
 		}
-		if (cmbLinha.getSelectedIndex() != -1) {
-			parametros.put("ruta", ((Ruta) cmbLinha.getSelectedItem().getValue()).getRutaId());
-		}
-		if(cmbOrigem.getSelectedIndex() != -1){
-			parametros.put("origem", ((Parada) cmbOrigem.getSelectedItem().getValue()).getParadaId());
-		}
-		if(cmbDestino.getSelectedIndex() != -1){
-			parametros.put("destino", ((Parada) cmbDestino.getSelectedItem().getValue()).getParadaId());
-		}
 		if(cmbTipoGratuidade.getSelectedIndex() != -1){
 			parametros.put("categoria", ((Categoria) cmbTipoGratuidade.getSelectedItem().getValue()).getCategoriaId());
 		}
-		if (cmbOrgaoConcedente.getSelectedItem() != null) {
-			OrgaoConcedente orgaoConcedente = (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue();
-			parametros.put("orgao_concedente_id", orgaoConcedente.getOrgaoConcedenteId());
-			parametros.put("orgao_concedente_desc", orgaoConcedente.getDescOrgao());
-		}
-		
 		parametros.put("TITULO", Labels.getLabel("relatorioGratuidadeController.window.title"));
 
 		Relatorio relatorio = new RelatorioGratuidade(parametros, dataSourceRead.getConnection());
@@ -188,10 +172,9 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer {
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 
-		lsLinhas = rutaService.obtenerTodos();
+
 		lsEmpresas = empresaService.obtenerTodos();
 		lsCategorias = categoriaService.obtenerTodos();
-		lsOrgaoConcedente = orgaocConcedenteService.obtenerTodos();
 		listSelectedTipoGratuidade = new ArrayList<Categoria>();
 
 		super.doAfterCompose(comp);
@@ -205,13 +188,6 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer {
 		this.lsEmpresas = lsEmpresas;
 	}
 
-	public List<Ruta> getLsLinhas() {
-		return lsLinhas;
-	}
-
-	public void setLsLinhas(List<Ruta> lsLinhas) {
-		this.lsLinhas = lsLinhas;
-	}
 	
 	public List<Categoria> getLsCategorias() {
 		return lsCategorias;
@@ -261,30 +237,6 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer {
 		this.cmbAgencia = cmbAgencia;
 	}
 
-	public MyComboboxEstandar getCmbLinha() {
-		return cmbLinha;
-	}
-
-	public void setCmbLinha(MyComboboxEstandar cmbLinha) {
-		this.cmbLinha = cmbLinha;
-	}
-
-	public MyComboboxParada getCmbOrigem() {
-		return cmbOrigem;
-	}
-
-	public void setCmbOrigem(MyComboboxParada cmbOrigem) {
-		this.cmbOrigem = cmbOrigem;
-	}
-
-	public MyComboboxParada getCmbDestino() {
-		return cmbDestino;
-	}
-
-	public void setCmbDestino(MyComboboxParada cmbDestino) {
-		this.cmbDestino = cmbDestino;
-	}
-
 	public MyComboboxEstandar getCmbTipoGratuidade() {
 		return cmbTipoGratuidade;
 	}
@@ -293,20 +245,5 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer {
 		this.cmbTipoGratuidade = cmbTipoGratuidade;
 	}
 
-	public MyComboboxEstandar getCmbOrgaoConcedente() {
-		return cmbOrgaoConcedente;
-	}
-
-	public void setCmbOrgaoConcedente(MyComboboxEstandar cmbOrgaoConcedente) {
-		this.cmbOrgaoConcedente = cmbOrgaoConcedente;
-	}
-
-	public List<OrgaoConcedente> getLsOrgaoConcedente() {
-		return lsOrgaoConcedente;
-	}
-
-	public void setLsOrgaoConcedente(List<OrgaoConcedente> lsOrgaoConcedente) {
-		this.lsOrgaoConcedente = lsOrgaoConcedente;
-	}
 	
 }

web/gui/relatorios/filtroRelatorioGratuidade.zul

@@ -7,7 +7,7 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioGratuidade"
 		apply="${relatorioGratuidadeController}"
-		contentStyle="overflow:auto" height="320px" width="550px"
+		contentStyle="overflow:auto" height="335px" width="550px"
 		border="normal">
 
 		<grid fixedLayout="true">
@@ -65,7 +65,7 @@
 				<row>
 					<label
 						value="${c:l('relatorioGratuidadeController.lbEmpresa.value')}" />
-					<combobox id="cmbTeste" width="70%"
+					<combobox id="cmbEmpresa" width="70%"
 						maxlength="60" mold="rounded" buttonVisible="true"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						model="@{winFiltroRelatorioGratuidade$composer.lsEmpresas}" />
@@ -77,42 +77,7 @@
 						maxlength="60" mold="rounded" buttonVisible="true"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
 						 />
-				</row>
+				</row>				
-				<row>
-					<label
-						value="${c:l('relatorioGratuidadeController.lbLinhas.value')}" />
-					<combobox id="cmbLinha" width="70%"
-						mold="rounded" buttonVisible="true"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						model="@{winFiltroRelatorioGratuidade$composer.lsLinhas}" />
-				</row>
-				
-				<row>
-					<label
-						value="${c:l('relatorioGratuidadeController.lbOrigem.value')}" />
-					<combobox id="cmbOrigem" width="70%"
-						maxlength="60" mold="rounded" buttonVisible="true"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"/>
-				</row>
-				
-				<row>
-					<label
-						value="${c:l('relatorioGratuidadeController.lbDestino.value')}" />
-					<combobox id="cmbDestino" width="70%"
-						maxlength="60" mold="rounded" buttonVisible="true"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"/>
-				</row>
-				
-				<row>
-					<label
-						value="${c:l('relatorioTabelaPrecoController.orgaoConcedente.value')}" />
-					<combobox id="cmbOrgaoConcedente"
-						buttonVisible="true"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						model="@{winFiltroRelatorioGratuidade$composer.lsOrgaoConcedente}"
-						width="70%" />
-				</row>
-				
 				<row>
 					<label value="${c:l('relatorioGratuidadeController.lbTipoGratuidade.value')}" />
 					<combobox id="cmbTipoGratuidade" width="70%"