merge com atualizações feitas no projeto principal do adm

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

@@ -635,7 +635,8 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
 		sql.append("AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
 		sql.append("AND BO.ACTIVO = 1 ");
 		sql.append("AND BO.INDSTATUSOPERACION = 'F' ");
-		sql.append("AND BO.MOTIVOCANCELACION_ID IS NULL OR  BO.MOTIVOCANCELACION_ID = 0 ");
+		sql.append("AND ( BO.MOTIVOCANCELACION_ID IS NULL OR  BO.MOTIVOCANCELACION_ID = 0 ) ");
+		sql.append("   AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA) ;
 		sql.append("GROUP BY CR.CORRIDA_ID, CR.FECCORRIDA ");
 		sql.append("ORDER BY CR.FECCORRIDA");
 

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

@@ -98,13 +98,14 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
 	 * @throws ParseException
 	 */
 	protected void carregarDadosTotaisVenda(String fecInicio, String fecFinal, String empresa, String empresaNome, String puntoVenta) throws SQLException, ParseException {
-
+		boolean isDiario = TipoRelatorioFechamentoEnum.DIARIO.equals(tipoRelatorio);
 		NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), criarQueryBilhetesVenda(puntoVenta, empresa));
 		
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
-		
 		ResultSet rset1 = criaResultSet(fecInicio, fecFinal, sdf, stmt);
-		
+		String dataInicial = fecInicio;
+		String dataFinal = fecFinal;
+		sdf =  (isDiario ? new SimpleDateFormat("yyyy-MM-dd hh:mm:ss") : new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"));
 		StringBuilder puntoVentaIds = new StringBuilder();
 		puntoVentaIds.append(" 0");
 
@@ -121,7 +122,12 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
 			Integer qtdedigitado = rset1.getInt("qtdedigitado");
 			Integer qtdeAnulado = rset1.getInt("qtdeAnulado");
 			Integer qtdeDevolvido = rset1.getInt("qtdeDevolvido");
-
+			
+			if (isDiario) {
+				dataInicial = rset1.getString("DATA");
+				dataFinal = rset1.getString("DATA");
+			}		
+					
 			vendido = rset1.getBigDecimal("vendido");
 			BigDecimal digitado = rset1.getBigDecimal("digitado");
 			BigDecimal anulado = rset1.getBigDecimal("anulado");
@@ -129,11 +135,12 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
 
 			total = preencherAgenciaFechamento(empresaNome, rset1, agenciaFechamento, total, vendido, qtdevendido, qtdedigitado, qtdeAnulado, qtdeDevolvido, digitado, anulado, devolvido);
 
-			carregarDadosReceitaDespesa(fecInicio, fecFinal, empresa, sdf, agenciaFechamento, total, vendido, puntoVentaId);
+			carregarDadosReceitaDespesa(dataInicial, dataFinal, isDiario, empresa, sdf, agenciaFechamento, total, vendido, puntoVentaId);
 			lsDadosRelatorio.add(agenciaFechamento);
 		}
 		
-		inserirReceitaDespesa(fecInicio, fecFinal, empresa, puntoVentaIds, empresaNome);
+		//Comentado para atender ao mantis 23925
+		//inserirReceitaDespesa(fecInicio, fecFinal, empresa, puntoVentaIds, empresaNome);
 
 	}
 
@@ -154,8 +161,12 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
 	 * @throws SQLException
 	 * @throws ParseException
 	 */
-	protected void carregarDadosReceitaDespesa(String fecInicio, String fecFinal, String empresa, SimpleDateFormat sdf, RelatorioAgenciaFechamentoAntigoBean agenciaFechamento, BigDecimal total, BigDecimal vendido, String puntoVentaId) throws SQLException, ParseException {
+	protected void carregarDadosReceitaDespesa(String fecInicio, String fecFinal, Boolean isDiario, String empresa, SimpleDateFormat sdf, RelatorioAgenciaFechamentoAntigoBean agenciaFechamento, BigDecimal total, BigDecimal vendido, String puntoVentaId) throws SQLException, ParseException {
 		NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), criarQueryReceitaDespesa(puntoVentaId, empresa));
+		if (isDiario) {
+			fecInicio = fecInicio.substring(0, 10).toString() + " 00:00:00";
+			fecFinal = fecFinal.substring(0, 10).toString() + " 23:59:59";
+		}
 
 		stmt.setTimestamp("de", new java.sql.Timestamp(sdf.parse(fecInicio).getTime()));
 		stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime()));
@@ -318,7 +329,7 @@ public abstract class RelatorioAgenciaFechamento extends Relatorio {
 		sql.append("   	 AND cd.TURNO_ID IS NOT NULL ");
 		sql.append("     AND cd.FECCORTE BETWEEN :de AND :ate ");
 		sql.append("     AND cd.puntoventa_id = pv.puntoventa_id ");
-		sql.append("     AND  pv.puntoventa_id not in ( " + puntoVentaIds.toString() + ") ");
+		sql.append("     AND  pv.puntoventa_id in ( " + puntoVentaIds.toString() + ") ");
 
 		if (empresa != null && !empresa.equals("") && !empresa.equals("-1")) {
 			sql.append("     AND ee.EMPRESA_ID = " + empresa + "                       ");

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

@@ -71,48 +71,45 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio {
 				sql.append("  SELECT  ");
 				sql.append("    r.DESCRUTA as linha,  ");
 				sql.append("    r.ruta_id  as rutaid, ");
-				sql.append("    count( c.caja_id) as passageiros,  ");
+				sql.append("    count( c.boleto_id) as passageiros,  ");
-				sql.append("    sum( c.PRECIOPAGADO )as valor, ");
+				sql.append("    sum( coalesce(c.preciopagado, 0) )as valor, ");
-				sql.append("    to_char( c.FECCORRIDA, 'D') as dia, ");
+				sql.append("    to_char( co.FECCORRIDA, 'D') as dia, ");
 				// Quantidade de dias da semana diferente vendidas
 				// "WW" Esse parâmetro para o to_char tras o dia da semana da data
-				sql.append("    coalesce(count(DISTINCT to_char( c.FECCORRIDA, 'WW')), 0) as qtde, ");
+				sql.append("    coalesce(count(DISTINCT to_char( co.FECCORRIDA, 'WW')), 0) as qtde, ");
 				sql.append("    r.indsentidoida as sentido, ");
 				sql.append("    da.cantasientos as assentos, ");
 				sql.append("    TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi') as horario, ");
-				sql.append("    c.CORRIDA_ID as servico ");
+				sql.append("    co.CORRIDA_ID as servico ");
-				sql.append("  FROM CAJA c ");
+				sql.append("  FROM boleto c ");
-				sql.append("  inner join corrida co ");
+				sql.append("  RIGHT OUTER JOIN corrida co ");
 				sql.append("    on c.CORRIDA_ID = co.CORRIDA_ID ");
 				sql.append("    and c.FECCORRIDA = co.FECCORRIDA ");
 				sql.append("    and co.ACTIVO = 1  ");
 				sql.append("  inner join ruta r  ");
-				sql.append("    on c.RUTA_ID = r.RUTA_ID ");
+				sql.append("    on co.RUTA_ID = r.RUTA_ID ");
 				sql.append("    and r.ACTIVO = 1 ");
 				sql.append("  inner join MARCA m ");
-				sql.append("    on m.marca_id = c.marca_id ");
+				sql.append("    on m.marca_id = co.marca_id ");
 				sql.append("    and m.activo = 1 ");
 				sql.append("  left join rol_operativo ro ");
 				sql.append("    on ro.roloperativo_id = co.roloperativo_id ");
 			    sql.append("  left join diagrama_autobus da "); 
 	    		sql.append("    on ro.diagramaautobus_id = da.diagramaautobus_id "); 
-				sql.append("  WHERE c.activo = 1 ");
+				sql.append("  WHERE co.activo = 1 ");
 				sql.append("    AND m.EMPRESA_ID  = :EMPRESA_ID ");
-				sql.append("    and c.FECCORRIDA >= :DATA_INICIAL ");
+				sql.append("    and co.FECCORRIDA >= :DATA_INICIAL ");
-				sql.append("    and c.FECCORRIDA <= :DATA_FINAL ");
+				sql.append("    and co.FECCORRIDA <= :DATA_FINAL ");
 				
 				if (parametros.get("LINHAS") != null && !possuiFiltroTodos("LINHAS")) {
-					sql.append("    and c.ruta_id IN (" + parametros.get("LINHAS").toString() + ")");
+					sql.append("    and co.ruta_id IN (" + parametros.get("LINHAS").toString() + ")");
 				}
 				
 				sql.append("    and c.MOTIVOCANCELACION_ID is null ");
-				sql.append("    and c.INDREIMPRESION = 0 ");
-				sql.append("    and c.MOTIVOREIMPRESION_ID is null ");
-				sql.append("    and c.INDSTATUSBOLETO = 'V' ");
 				sql.append("  GROUP by r.DESCRUTA,  r.ruta_id, r.indsentidoida, da.cantasientos, ");
-				sql.append("      to_char( c.FECCORRIDA, 'D'), TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi'), ");
+				sql.append("      to_char( co.FECCORRIDA, 'D'), TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi'), ");
-				sql.append("      c.CORRIDA_ID ");
+				sql.append("      co.CORRIDA_ID ");
-				sql.append("  ORDER by r.DESCRUTA, r.indsentidoida desc, to_char( c.FECCORRIDA, 'D') ");
+				sql.append("  ORDER by r.DESCRUTA, r.indsentidoida desc, to_char( co.FECCORRIDA, 'D') ");
 				sql.append("  ) ");
 				sql.append("PIVOT  ");
 				sql.append("( ");

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

@@ -58,6 +58,7 @@ public class RelatorioBPe extends Relatorio {
 					dataResult.put("dtvenda", rset.getString("dtvenda"));
 					dataResult.put("hrvenda", rset.getString("hrvenda"));
 					dataResult.put("locpuntoventa", rset.getString("locpuntoventa"));
+					dataResult.put("numPuntoVenta", rset.getString("numPuntoVenta"));
 					dataResult.put("origem", rset.getString("origem"));
 					dataResult.put("destino", rset.getString("destino"));
 					dataResult.put("dtviagem", rset.getString("dtviagem"));
@@ -94,7 +95,7 @@ public class RelatorioBPe extends Relatorio {
 		ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
 
 		String estados = (String) parametros.get("ESTADOS_ID");
-		Integer empresaId = (Integer) parametros.get("EMPRESA_ID");
+		String empresaId = (String) parametros.get("EMPRESA_ID");
 		String status = (String) parametros.get("STATUS");
 		String chBpe = (String) parametros.get("CHBPE");
 		String numBpe = (String) parametros.get("NUMBPE");
@@ -103,7 +104,7 @@ public class RelatorioBPe extends Relatorio {
 		String alias = (String) parametros.get("ALIAS");
 		
 		sql.append(" SELECT ");
-		sql.append(" 	dtvenda, hrvenda, locpuntoventa, origem, destino, dtviagem, vlbpe, valortarifa, valortaxa, valorpedagio,  ");
+		sql.append(" 	dtvenda, hrvenda, locpuntoventa,numPuntoVenta,  origem, destino, dtviagem, vlbpe, valortarifa, valortaxa, valorpedagio,  ");
 		sql.append(" 	valorseguro, valoroutros, chbpe, protocolo, num_bpe, numserie_bpe, status, obs, qrcode, errocontingencia  ");
 		sql.append(" FROM ( ");
 
@@ -131,11 +132,11 @@ public class RelatorioBPe extends Relatorio {
 		return sql.toString();
 	}
 
-	private void getWhere(StringBuilder sql, ConstanteService constanteService, String estados, Integer empresaId, String status, String chBpe, String numBpe, Date dtInicio, Date dtFim) {
+	private void getWhere(StringBuilder sql, ConstanteService constanteService, String estados, String empresaId, String status, String chBpe, String numBpe, Date dtInicio, Date dtFim) {
 		sql.append(" WHERE e.ACTIVO = 1 ");
 
 		if (empresaId != null) {
-			sql.append(" AND ep.EMPRESA_ID =  " + empresaId + " ");
+			sql.append(" AND ep.EMPRESA_ID IN ( " + empresaId + " ) ");
 		}
 		if (estados != null) {
 			sql.append(" AND e.ESTADO_ID IN ( " + estados + " )");
@@ -149,7 +150,7 @@ public class RelatorioBPe extends Relatorio {
 		} else if (status != null && status.equals("S")) {//Substituidos
 			sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpeSub.BPE_ID IS NOT NULL AND bol.ACTIVO = 1 ");
 		} else if (status != null && status.equals("SB")) {//Substituicao
-			sql.append(" AND bpe.CODSTAT IN ('100', '102','150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and bpeSub.CODSTAT IN('150','100','102') ");
+			sql.append(" AND  ((bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and  bpeSub.CODSTAT IN ('100', '102', '150')) or (bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 ))  ");
 		} else if (status != null && status.equals("NE")) {//Nao Embarcado
 			sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' AND bol.ACTIVO = 1 ");
 		} else if (status != null && status.equals("R")) {//Rejeitado
@@ -161,6 +162,9 @@ public class RelatorioBPe extends Relatorio {
 		} else if (status != null && status.equals("PE")) {//Pendente Envio
 			sql.append(" AND bpe.CODSTAT IN ('-1','-2') ");
 		}
+		else if (status != null && status.equals("T")) {//Opcao Todas
+			sql.append(opcaoTodas());
+		}
 		
 		if(dtInicio != null && dtFim != null) {
 			Constante constanteBPeOtimizado = constanteService.buscarPorNomeConstante(Constantes.RELATORIO_BPE_OTIMIZADO);
@@ -183,6 +187,22 @@ public class RelatorioBPe extends Relatorio {
 		}
 	}
 
+	private String opcaoTodas() {
+		
+		StringBuilder sql = new StringBuilder();
+
+		sql.append(" AND ((bpe.CODSTAT = '100' AND bol.ACTIVO = 1) OR (bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' AND bol.ACTIVO = 1 ) ");
+		sql.append(" OR (bpe.CODSTAT IN ('100', '102') AND bpeSub.BPE_ID IS NOT NULL AND bol.ACTIVO = 1) ");
+		sql.append(" OR ((bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and  bpeSub.CODSTAT IN ('100', '102', '150')) or (bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 )) ");
+		sql.append(" OR (bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' AND bol.ACTIVO = 1) ");
+		sql.append(" OR (bpe.CODSTAT NOT IN ('100','135','102','150','-1','-2')) ");
+		sql.append(" OR (bpe.CODSTAT IN ('100', '150') AND bpe.INDCONTINGENCIA = 1 AND bol.ACTIVO = 1) ");
+		sql.append(" OR (bpe.CODSTAT IN ('-10','-20') AND bol.ACTIVO = 1) ");
+		sql.append(" OR (bpe.CODSTAT IN ('-1','-2'))) ");
+
+		return sql.toString();
+	}
+
 	private void getSelectFrom(StringBuilder sql, String alias) {
 		sql.append("SELECT");
 		sql.append("  TO_CHAR(COALESCE(bpe.DT_VENDA,bol.FECHORVENTA),'dd/mm/yyyy') as dtvenda, ");
@@ -194,6 +214,7 @@ public class RelatorioBPe extends Relatorio {
 			sql.append("  COALESCE(destA.DESCPARADA, dest.DESCPARADA) as destino,");
 		}
 		sql.append("  locpv.DESCPARADA as locpuntoventa, ");
+		sql.append("  pv.NUMPUNTOVENTA as numPuntoVenta, ");
 		sql.append("  ori.DESCPARADA as origem,  ");
 		sql.append("  dest.DESCPARADA as destino,");
 		
@@ -217,7 +238,7 @@ public class RelatorioBPe extends Relatorio {
 		sql.append("                  case ");
 		sql.append("                    when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' ");
 		sql.append("                    when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' ");
-		sql.append("                    when bpe.tiposubstituicao is not null then 'Autorizado/Substitução' ");
+		sql.append("                    when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' ");
 		sql.append("                    when bpeSub.bpe_id is not null then 'Autorizado/Substituído' ");
 		sql.append("                    else 'Autorizado' ");
 		sql.append("                  end ");
@@ -225,7 +246,7 @@ public class RelatorioBPe extends Relatorio {
 		
 		sql.append("  when '102' then ( ");
 		sql.append("                case ");
-		sql.append("                    when bpe.tiposubstituicao is not null then 'Substitução' ");
+		sql.append("                    when bpe.tiposubstituicao is not null then 'Substituição' ");
 		sql.append("                    when bpeSub.bpe_id is not null then 'Substituído' ");
 		sql.append("                end ");
 		sql.append("                ) ");
@@ -251,7 +272,7 @@ public class RelatorioBPe extends Relatorio {
 		sql.append("  bpe.QRCODE, bpe.errocontingencia ");
 
 		sql.append(" FROM BPE bpe ");
-		sql.append(" LEFT JOIN BPE bpeSub ON bpe.BPESUBSTITUICAO_ID = bpeSub.BPE_ID AND bpeSub.activo = 1 ");
+		sql.append(" LEFT JOIN BPE bpeSub on (bpeSub.bpesubstituicao_id = bpe.bpe_id and bpeSub.activo = 1) ");
 		sql.append(" LEFT JOIN BOLETO bol ON bol.BOLETO_ID = bpe.BOLETO_ID and bpe.activo = 1  ");
 		sql.append(" LEFT JOIN estado e ON e.CODIBGE = bpe.UF  ");
 		sql.append(" LEFT JOIN marca ma ON bol.MARCA_ID = ma.MARCA_ID  ");

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

@@ -0,0 +1,146 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioBpeNumeracaoReusoBean;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioBpeNumeracaoReuso extends Relatorio {
+	
+	private List<RelatorioBpeNumeracaoReusoBean> lsDadosRelatorio;
+
+	public RelatorioBpeNumeracaoReuso(Map<String, Object> parametros, Connection conexao) throws Exception {
+
+		super(parametros, conexao);
+
+		this.setCustomDataSource(new ArrayDataSource(this) {
+
+			public void initDados() throws Exception {
+				Connection conexao = this.relatorio.getConexao();
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				String sql = getSql(parametros);
+				
+				Date dtInicio = (Date) parametros.get("DATA_INICIO");
+				Date dtFim = (Date) parametros.get("DATA_FIM");
+			
+				NamedParameterStatement ps = new NamedParameterStatement(conexao, sql.toString());
+				if(dtInicio != null && dtFim != null) {
+					ps.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00");
+					ps.setString("dataFinal", DateUtil.getStringDate(dtFim, "dd/MM/yyyy") + " 23:59:59");
+				}
+
+				ResultSet rset = ps.executeQuery();
+				lsDadosRelatorio = new ArrayList<RelatorioBpeNumeracaoReusoBean>();
+
+				while (rset.next()) {					
+						RelatorioBpeNumeracaoReusoBean bean = new RelatorioBpeNumeracaoReusoBean();
+						bean.setEstado(rset.getString("estado"));
+						bean.setSerieBPE(rset.getString("serieBPE"));
+						bean.setNumeroBPE( rset.getInt("numeroBPE"));
+						lsDadosRelatorio.add(bean);	
+					}								
+				buscarInicialFinalPorUf();
+				setLsDadosRelatorio(lsDadosRelatorio);
+				this.resultSet = rset;
+			}		
+		});
+	}
+
+	@Override
+	protected void processaParametros() throws Exception {
+	}
+
+	private String getSql(Map<String, Object> parametros) {
+
+
+		String estados = (String) parametros.get("ESTADOS_ID");
+		String empresaId = (String) parametros.get("EMPRESA_ID");
+		Date dtInicio = (Date) parametros.get("DATA_INICIO");
+		Date dtFim = (Date) parametros.get("DATA_FIM");
+		
+		String sql = getSql( estados, empresaId, dtInicio, dtFim);
+			
+		return sql.toString();
+	}
+
+	private String getSql(String estados, String empresaId, Date dtInicio, Date dtFim) {
+		
+		StringBuilder sql = new StringBuilder();
+		
+		sql.append("select tabela.estado as estado , tabela.serieBPE as serieBPE, to_number(tabela.numeroBPE) as numeroBPE, estadoId as estadoId  from ( select (to_number(bol.num_bpe) + 1) as numeroBPE,  BOL.NUMSERIE_BPE as serieBPE, E.NOMBESTADO as estado,  e.estado_id as estadoId   ");
+		sql.append(" FROM BOLETO bol ");
+		sql.append("   LEFT outer JOIN BOLETO  r on bol.num_bpe + 1 = r.num_bpe ");
+		sql.append("   inner join parada origem  on origem.parada_id = bol.origen_id    ");
+		sql.append("    inner join ciudad cidade  on cidade.ciudad_id = origem.ciudad_id   ");
+		sql.append("   inner join estado e on (e.estado_id = cidade.estado_id)    ");
+		if (empresaId != null) {
+			sql.append(" AND bol.EMPRESACORRIDA_ID IN(  " + empresaId + " ) ");
+		}
+		if (estados != null) {
+			sql.append(" AND e.ESTADO_ID IN ( " + estados + " )");
+		}
+		sql.append("  and bol.fechorventa between to_date(:dataInicio,'dd/MM/yyyy hh24:mi:ss') and to_date(:dataFinal,'dd/MM/yyyy hh24:mi:ss') ");
+		sql.append("  minus ");
+		sql.append("select  to_number(bol.num_bpe) as numeroBPE ,  BOL.NUMSERIE_BPE as serieBPE, E.NOMBESTADO as estado, e.estado_id as estadoId  ");
+		sql.append(" FROM BOLETO bol ");
+		sql.append("   inner join parada origem  on origem.parada_id = bol.origen_id    ");
+		sql.append("    inner join ciudad cidade  on cidade.ciudad_id = origem.ciudad_id   ");
+		sql.append("    inner join estado e on (e.estado_id = cidade.estado_id)    ");
+		if (empresaId != null) {
+			sql.append(" AND bol.EMPRESACORRIDA_ID IN(  " + empresaId + " ) ");
+		}
+		if (estados != null) {
+			sql.append(" AND e.ESTADO_ID IN ( " + estados + " )");
+		}
+		sql.append(" ) tabela ");
+		sql.append("  group by tabela.estado, tabela.serieBPE,  numeroBPE, estadoId ");
+		sql.append("  ORDER BY tabela.estado,  tabela.serieBPE, tabela.numeroBPE ASC  ");
+		return sql.toString();
+	}
+	public void setLsDadosRelatorio(List<RelatorioBpeNumeracaoReusoBean> lsDadosRelatorio) {
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
+		this.lsDadosRelatorio = lsDadosRelatorio;
+	}
+	private void buscarInicialFinalPorUf() {
+				
+		String estado = "";
+		List<Integer> bpes = new ArrayList<Integer>();
+		 Map<String, String> estados = converterListaParaMap(lsDadosRelatorio);
+		 
+		 for (Map.Entry<String, String> entry : estados.entrySet()) {
+			 estado = entry.getValue();
+				if(estado != null){
+					for (RelatorioBpeNumeracaoReusoBean relatorio2 : lsDadosRelatorio) {
+						if(estado.equals(relatorio2.getEstado())){				
+							bpes.add(relatorio2.getNumeroBPE());
+						}
+					}
+					for (RelatorioBpeNumeracaoReusoBean relatorio2 : lsDadosRelatorio) {
+						if(estado.equals(relatorio2.getEstado())){				
+							relatorio2.setFinalAutorizado(bpes.get(bpes.size()-1));
+						}
+					}				
+				}
+		    }		
+	}
+	
+	public Map<String, String> converterListaParaMap(List<RelatorioBpeNumeracaoReusoBean> list) {
+	    Map<String, String> map = new HashMap<String,String>();
+	    for (RelatorioBpeNumeracaoReusoBean relatorio : list) {
+	        map.put(relatorio.getEstado(), relatorio.getEstado());
+	    }
+	    return map;
+	}	
+}

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

@@ -47,6 +47,8 @@ public class RelatorioCadastroClientesDetalhado extends Relatorio {
 					dataResult.put("usuario", rset.getString("usuario"));
 					dataResult.put("codigoPuntoVenta", rset.getString("codigoPuntoVenta"));
 					dataResult.put("puntoVenta", rset.getString("puntoVenta"));
+					dataResult.put("descIdentificaUno", rset.getString("descIdentificaUno"));
+					dataResult.put("descIdentificaDos", rset.getString("descIdentificaDos"));
 
 					this.dados.add(dataResult);
 				}
@@ -83,8 +85,19 @@ public class RelatorioCadastroClientesDetalhado extends Relatorio {
 		sql.append("AND empresaFidelidad.EMPRESA_ID = empresa.EMPRESA_ID ");
 		sql.append("AND clienteFidelidad.CLIENTE_ID = cliente.CLIENTE_ID) AS \"numFidelidade\", ");
 		sql.append("cliente.NOMBCLIENTE                AS \"cliente\", ");
-		sql.append("cliente.NUMIDENTIFICAUNO           AS \"identificaUno\", ");
+		/*Foi feito esse CASE para forçar que o CPF fica no identificaUno e o RG identificaDos*/
-		sql.append("cliente.NUMIDENTIFICADOS            AS \"identificaDos\", ");
+		sql.append(" CASE ");
+		sql.append(" 	WHEN CLIENTE.TIPOIDENTIFICAUNO_ID = 2 THEN cliente.NUMIDENTIFICAUNO ");
+		sql.append(" 	WHEN CLIENTE.TIPOIDENTIFICADOS_ID = 2 THEN cliente.NUMIDENTIFICADOS ");
+		sql.append(" 	ELSE '' ");
+		sql.append(" END AS \"identificaUno\", ");
+		sql.append("ti.DESCTIPO                        AS \"descIdentificaUno\", ");
+		sql.append(" CASE ");
+		sql.append(" 	WHEN CLIENTE.TIPOIDENTIFICAUNO_ID = 1 THEN cliente.NUMIDENTIFICAUNO ");
+		sql.append(" 	WHEN CLIENTE.TIPOIDENTIFICADOS_ID = 1 THEN cliente.NUMIDENTIFICADOS ");
+		sql.append(" 	ELSE '' ");
+		sql.append(" END AS \"identificaDos\", ");
+		sql.append("ti2.DESCTIPO                       AS \"descIdentificaDos\", ");
 		sql.append("cliente.FECNACIMIENTO              AS \"fecNascimento\", ");
 		sql.append("cliente.NUMTELEFONODOS             AS \"celular\", ");
 		sql.append("cliente.NUMTELEFONO                AS \"telefone\", ");
@@ -104,6 +117,8 @@ public class RelatorioCadastroClientesDetalhado extends Relatorio {
 		sql.append("INNER JOIN PUNTO_VENTA             puntoVenta ON usuarioUbicacion.PUNTOVENTA_ID       = puntoVenta.PUNTOVENTA_ID ");
 		sql.append("INNER JOIN TIPO_PTOVTA         tipoPuntoVenta ON tipoPuntoVenta.TIPOPTOVTA_ID         = puntoVenta.TIPOPTOVTA_ID ");
 		sql.append("LEFT JOIN EMPRESA                    empresa ON empresa.EMPRESA_ID                   = cliente.EMPRESA_ID ");
+		sql.append("LEFT JOIN TIPO_IDENTIFICACION ti  ON  ti.TIPOIDENTIFICACION_ID = CLIENTE.TIPOIDENTIFICAUNO_ID  ");
+		sql.append("LEFT JOIN TIPO_IDENTIFICACION ti2 ON TI2.TIPOIDENTIFICACION_ID = CLIENTE.TIPOIDENTIFICADOS_ID  ");
 
 		sql.append("WHERE cliente.ACTIVO = 1 ");
 		sql.append("AND usuarioUbicacion.ACTIVO = 1 ");

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

@@ -34,6 +34,7 @@ public class RelatorioCheckin extends Relatorio {
 		Date fecFinal = (Date) getParametros().get("DATA_FINAL");
 		fecInicio = DateUtil.inicioFecha(fecInicio);
 		fecFinal = DateUtil.fimFecha(fecFinal);
+	
 		
 		if (StringUtils.isNotBlank(idsBilheteiros)) {
 			String []ls = idsBilheteiros.split(",");
@@ -103,11 +104,14 @@ public class RelatorioCheckin extends Relatorio {
 		sql.append("inner join boleto_checkin bc on b.boleto_id = bc.boletooriginal_id ");
 		sql.append("inner join parada o on b.origen_id = o.parada_id ");
 		sql.append("inner join usuario u on bc.usuario_id = u.usuario_id ");
+		
+		 
 		sql.append(" where b.activo = 1  ");
 		sql.append("and bc.FECMODIF between ? and  ? ");
 		sql.append(corridaId == null ? "" : " and b.corrida_id = ? ");
 		sql.append(origenId == null ? "" : " and b.origen_id = ? ");
 		sql.append((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") ");
+		
 		sql.append(" order by bc.datacancelado desc");
 
 		return sql.toString();

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

@@ -0,0 +1,160 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioCheckinAbertoBean;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioCheckinAberto extends Relatorio {
+	
+	public static final String DATA_INICIO_SERVICO = "DATA_INICIO_SERVICO";
+	public static final String DATA_FIM_SERVICO = "DATA_FIM_SERVICO";
+	public static final String DATA_INICIO_ENCERRAMENTO = "DATA_INICIO_ENCERRAMENTO";
+	public static final String DATA_FIM_ENCERRAMENTO = "DATA_FIM_ENCERRAMENTO";
+	private List<RelatorioCheckinAbertoBean> lsDadosRelatorio;
+	
+	public RelatorioCheckinAberto(Map<String, Object> parametros, Connection conexao)  throws Exception {
+		super(parametros, conexao);
+		
+		this.setCustomDataSource(new DataSource(this) {
+			@Override
+			public void initDados() throws Exception {
+
+				Connection conexao = this.relatorio.getConexao();
+
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				String dataInicioServico = null;
+				if (parametros.containsKey(DATA_INICIO_SERVICO)) {
+					dataInicioServico = parametros.get(DATA_INICIO_SERVICO).toString() + " 00:00";
+				}
+
+				String dataFimServico = null;
+				if (parametros.containsKey(DATA_FIM_SERVICO)) {
+					dataFimServico = parametros.get(DATA_FIM_SERVICO).toString() + " 23:59";
+				}
+
+				String dataInicioEncerramento = null;
+				if (parametros.containsKey(DATA_INICIO_ENCERRAMENTO)) {
+					dataInicioEncerramento = parametros.get(DATA_INICIO_ENCERRAMENTO).toString() + " 00:00";
+				}
+
+				String dataFimEncerramento = null;
+				if (parametros.containsKey(DATA_FIM_ENCERRAMENTO)) {
+					dataFimEncerramento = parametros.get(DATA_FIM_ENCERRAMENTO).toString() + " 23:59";
+				}
+
+				Integer empresa_id = (Integer) parametros.get("empresa_id");
+				Integer localidade_id = (Integer) parametros.get("localidade_id");
+
+				String sql = getSql(dataInicioServico, dataFimServico, dataInicioEncerramento, dataFimEncerramento, empresa_id, localidade_id);
+				
+				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
+
+				if (dataInicioServico != null && dataFimServico != null) {
+					stmt.setString("dataInicioServico", dataInicioServico);
+					stmt.setString("dataFimServico", dataFimServico);
+				}
+
+				if (dataInicioEncerramento != null && dataFimEncerramento != null) {
+					stmt.setString("dataInicioEncerramento", dataInicioEncerramento);
+					stmt.setString("dataFimEncerramento", dataFimEncerramento);
+				}
+
+				if (empresa_id != null) {
+					stmt.setInt("empresa_id", empresa_id);
+				}
+
+				if (localidade_id != null) {
+					stmt.setInt("localidade_id", localidade_id);
+				}
+
+				ResultSet rs = stmt.executeQuery();
+		
+				lsDadosRelatorio = new ArrayList<RelatorioCheckinAbertoBean>();
+				
+				SimpleDateFormat formatadorData = new SimpleDateFormat("dd/MM/yyyy");
+				SimpleDateFormat formatadorDataHora = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+
+				while (rs.next()) {
+					RelatorioCheckinAbertoBean bean = new RelatorioCheckinAbertoBean();
+					bean.setServico(rs.getInt("servico"));
+					bean.setDataServico(formatadorData.format(rs.getDate("data_servico")));
+					bean.setLocalidade(rs.getString("localidade"));
+					//bean.setUsuario(rs.getString("usuario"));
+					
+					lsDadosRelatorio.add(bean);
+				}
+
+				if (lsDadosRelatorio.size() > 0) {
+					setLsDadosRelatorio(lsDadosRelatorio);
+				}
+			}
+		});
+	}
+	
+	@Override
+	protected void processaParametros() throws Exception {
+		if (parametros.containsKey(DATA_INICIO_SERVICO) && parametros.containsKey(DATA_FIM_SERVICO)) {
+			this.parametros.put("PERIODO_SERVICO", parametros.get(DATA_INICIO_SERVICO) + " à " + parametros.get(DATA_FIM_SERVICO));
+		}
+
+		if (parametros.containsKey(DATA_INICIO_ENCERRAMENTO) && parametros.containsKey(DATA_FIM_ENCERRAMENTO)) {
+			this.parametros.put("PERIODO_ENCERRAMENTO", parametros.get(DATA_INICIO_ENCERRAMENTO) + " à " + parametros.get(DATA_FIM_ENCERRAMENTO));
+		}
+	}
+
+	private void setLsDadosRelatorio(List<RelatorioCheckinAbertoBean> lsDadosRelatorio) {
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
+		this.lsDadosRelatorio = lsDadosRelatorio;
+	}
+	
+	private String getSql(String dataInicioServico, String dataFimServico, String dataInicioEncerramento, String dataFimEncerramento, Integer empresa_id, Integer localidade_id) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("select c.corrida_id as servico, ");
+		sb.append("c.feccorrida as data_servico, ");
+		sb.append("p.cveparada || ' - ' || p.descparada as localidade, ");
+		sb.append("cc.fechorcerrado as data_encerramento ");
+		sb.append("from corrida c ");
+		sb.append("join parada p on p.parada_id = c.origen_id ");
+		sb.append("left join checkin_cerrado cc on (c.corrida_id = cc.corrida_id and c.feccorrida=cc.feccorrida ) ");
+
+		
+		if (empresa_id!=null) {
+			sb.append("join marca m on m.marca_id = c.marca_id ");
+		}
+		
+		sb.append("where c.activo = 1 ");
+
+		sb.append(" and cc.corrida_id is null ");
+
+		if (dataInicioServico != null && dataFimServico != null) {
+			sb.append("and c.feccorrida between to_date(:dataInicioServico, 'dd/mm/yyyy hh24:mi') and to_date(:dataFimServico, 'dd/mm/yyyy hh24:mi') ");
+		}
+		
+		if (dataInicioEncerramento != null && dataFimEncerramento != null) {
+			sb.append("and c.feccorrida between to_date(:dataInicioEncerramento, 'dd/mm/yyyy hh24:mi') and to_date(:dataFimEncerramento, 'dd/mm/yyyy hh24:mi') ");
+		}
+		
+		if (empresa_id != null) {
+			sb.append("and m.empresa_id = :empresa_id ");
+		}
+
+		if (localidade_id != null) {
+			sb.append("and p.parada_id = :localidade_id ");
+		}
+
+		sb.append("order by 2, 1, 4, 3");
+
+		return sb.toString();
+	}
+}

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

@@ -76,7 +76,10 @@ public class RelatorioDepositos extends Relatorio {
 						deposito.setVrfechamento(rs.getBigDecimal("vrfechamento"));
 						deposito.setEmpresaId(rs.getInt("empresaId"));
 						deposito.setPuntoventaId(rs.getInt("puntoventaId"));
-						
+						if (! filtrarPendentes){
+							deposito.setNumdeposito(rs.getString("numdeposito"));
+						}
+												
 						boolean isPontoVendaEmpresaDiferente = (puntoventaIdAux == null || !puntoventaIdAux.equals(deposito.getPuntoventaId())) ||
 								   							   (empresaIdAux == null || !empresaIdAux.equals(deposito.getEmpresaId()));
 						

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

@@ -28,8 +28,32 @@ public class RelatorioEstoque extends Relatorio {
 				while (rset.next()) {
 					Map<String, Object> dataResult = new HashMap<String, Object>();
 
-					String formInicio = rset.getString("tipoVenta").equals(EnumTipoVenda.TPV_MANUAL.getId().toString()) ? 
+					String tipoVenta = rset.getString("tipoVenta");
-							(rset.getString("ultimoFolioCaja") != null ? rset.getString("ultimoFolioCaja") : rset.getString("forminicial")) : rset.getString("forminicial");
+					String formfinal = rset.getString("formfinal");
+
+					String formInicio = rset.getString("forminicial");
+					if (tipoVenta.equals(EnumTipoVenda.TPV_MANUAL.getId().toString())) {
+
+						String ultimoFolioCaja = rset.getString("ultimoFolioCaja");
+
+						boolean isFormularioMaior = false;
+						try {
+							int ultimoFolioCajaInt = Integer.parseInt(ultimoFolioCaja);
+							int formfinalInt = Integer.parseInt(formfinal);
+
+							if (ultimoFolioCaja != null && ultimoFolioCajaInt > formfinalInt) {
+								isFormularioMaior = true;
+							}
+
+						} catch (Exception e) {
+						}
+
+						if (isFormularioMaior) {
+							formInicio = formfinal;
+						} else {
+							formInicio = ultimoFolioCaja != null ? ultimoFolioCaja : formInicio;
+						}
+					}
 
 					dataResult.put("aidf", rset.getString("aidf"));
 					dataResult.put("empresa", rset.getString("nombempresa"));
@@ -37,7 +61,7 @@ public class RelatorioEstoque extends Relatorio {
 					dataResult.put("agencia", rset.getString("nombpuntoventa"));
 					dataResult.put("serie", rset.getString("serie"));
 					dataResult.put("forminicio", formInicio);
-					dataResult.put("formfinal", rset.getString("formfinal"));
+					dataResult.put("formfinal", formfinal);
 					dataResult.put("estado", rset.getString("nombestado"));
 					dataResult.put("tipo", rset.getString("tipo"));
 					this.dados.add(dataResult);
@@ -60,7 +84,7 @@ public class RelatorioEstoque extends Relatorio {
 		sql.append("	dab.NUMSERIEPREIMPRESA AS serie, ");
 		sql.append("	es.descestacion AS estacao, ");
 		sql.append("	tp.desctipo AS tipo, ");
-		
+
 		sql.append(" 	( case  ");
 		sql.append("    	 when ");
 		sql.append("			dab.STATUSOPERACION = 0 ");
@@ -70,7 +94,7 @@ public class RelatorioEstoque extends Relatorio {
 		sql.append("     		coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) ");
 		sql.append(" 	end ) AS forminicial,");
 		sql.append(" 	dab.NUMFOLIOFINAL AS formfinal, ");
-		
+
 		sql.append("	( SELECT ");
 		sql.append(" 		MAX(to_number(c.numfoliopreimpreso)) + 1 AS numfoliopreimpreso");
 		sql.append(" 		 FROM Caja c");

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

@@ -53,7 +53,7 @@ public class RelatorioGratuidadeAGR extends Relatorio {
 				String linhaIds = parametros.get("linhaIds").toString();
 				String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : "";
 						
-				String sql = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tipGratuIds, clienteIds, empresa);
+				String sql = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tipGratuIds, clienteIds, empresa, fecInicioViagem, fecFinalViagem);
 		
 				SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@@ -125,7 +125,7 @@ public class RelatorioGratuidadeAGR extends Relatorio {
 	protected void processaParametros() throws Exception {
 	}
 	
-	private String getSql(String fecInicioVenda, String fecFinalVenda, String linha, String tipoGratu, String cliente, String empresa ) {
+	private String getSql(String fecInicioVenda, String fecFinalVenda, String linha, String tipoGratu, String cliente, String empresa, String fecInicioViagem, String fecFinalViagem ) {
 	
 		StringBuilder sql = new StringBuilder(3400);
 
@@ -177,7 +177,9 @@ public class RelatorioGratuidadeAGR extends Relatorio {
 		
 		if( fecInicioVenda != null && fecFinalVenda !=null ){
 			sql.append("     AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
-		}else {			
+		}
+		
+		if( fecInicioViagem != null && fecFinalViagem !=null ){			
 			sql.append("     AND b.fechorviaje BETWEEN :fecInicioViagem AND :fecFinalViagem ");
 		}
 		

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

@@ -204,7 +204,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
 		sql.append("THEN  b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS ");
 		sql.append("END 									 AS CPF, ");
 		sql.append("r.PREFIXO      							 AS LINHA, ");
-		sql.append(" LISTAGG( ");
+		sql.append(" LISTAGG( DISTINCT ");
 		sql.append("cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || ");
 		sql.append("cd.DESCIUDAD || '/' || cd.DESESTADO	 ,';;;;' )" );
 		sql.append(" WITHIN GROUP( ORDER BY cd.CLIENTEDIRECCION_ID ASC )" );
@@ -212,7 +212,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
 		sql.append("COALESCE(c.numtelefono, CAJA.DESCTELEFONO) AS tel,");
 		sql.append("c.DESCCORREO 							 AS email, ");
 		sql.append("CASE ");
-		sql.append("WHEN B.MOTIVOCANCELACION_ID IN (31, 32, 90, 23,10) ");
+		sql.append("WHEN B.MOTIVOCANCELACION_ID IN (31, 32, 90, 23,10, 27) ");
 		sql.append("THEN 1 ELSE 0 ");
 		sql.append("END  									AS DESISTENCIA, ");
 		sql.append(" (COALESCE(T.PRECIO, 0)  	   + COALESCE(T.IMPORTEPEDAGIO,0)) ");
@@ -298,12 +298,12 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
 		sql.append("           ELSE c.NUMIDENTIFICADOS");
 		sql.append("       END AS CPF,");
 		sql.append("       r.PREFIXO AS LINHA,");
-		sql.append("       LISTAGG(cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || cd.DESCIUDAD || '/' || cd.DESESTADO, ';;;;') WITHIN GROUP(");
+		sql.append("       LISTAGG( DISTINCT cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || cd.DESCIUDAD || '/' || cd.DESESTADO, ';;;;') WITHIN GROUP(");
 		sql.append("                                                                                                                          ORDER BY cd.CLIENTEDIRECCION_ID ASC) AS ENDERECO, ");
 		sql.append("                                                                                                                    COALESCE(c.numtelefono, CAJA.DESCTELEFONO) AS tel,");
 		sql.append("                                                                                                                    c.DESCCORREO AS email,");
 		sql.append("                                                                                                                    CASE");
-		sql.append("                                                                                                                        WHEN B.MOTIVOCANCELACION_ID IN (31,32, 90, 23,10 ) THEN 1 ELSE 0 END AS DESISTENCIA, ");
+		sql.append("                                                                                                                        WHEN B.MOTIVOCANCELACION_ID IN (31,32, 90, 23,10, 27 ) THEN 1 ELSE 0 END AS DESISTENCIA, ");
 		sql.append("      (COALESCE(NULL, b.preciobase) + COALESCE(NULL, 0)) -(COALESCE(b.PRECIOPAGADO, 0) + COALESCE(b.IMPORTEPEDAGIO, 0)) AS vlrGratuidade,");
 		sql.append("      bpe.chbpe AS chaveBPE ");
 		sql.append("FROM BOLETO b ");
@@ -369,7 +369,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
 		sql.append("             WHEN B.MOTIVOCANCELACION_ID IN (31,");
 		sql.append("                                             32,");
 		sql.append("                                             90,");
-		sql.append("                                             23,10) THEN 1");
+		sql.append("                                             23,10, 27) THEN 1");
 		sql.append("             ELSE 0");
 		sql.append("         END,");
 		sql.append("         COALESCE(c.numtelefono, CAJA.DESCTELEFONO),");

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

@@ -187,7 +187,7 @@ public class RelatorioIndiceIRK extends Relatorio {
 		sb.append("      INNER JOIN parada origen ON (origen.parada_id = tr.origen_id)");
 		sb.append("      INNER JOIN parada destino ON (destino.parada_id = tr.destino_id)");
 		sb.append("      WHERE cj.activo = 1");
-		sb.append("        AND cj.motivocancelacion_id IS NULL");
+		sb.append("        AND cj.motivocancelacion_id IS NULL and cj.indstatusboleto = 'V' ");
 		sb.append("        and cj.feccorrida BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YY hh24:mi:ss') ");
 		sb.append(rutaIds == null ||TODOS.equals(rutaIds) ? "" : "   AND    r.ruta_id IN (   " + rutaIds + "   )     ");
 		sb.append(corridasIds == null || TODOS.equals(corridasIds)	 ? "" : "   AND    cj.corrida_id IN (   " + corridasIds + "   )     ");

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

@@ -507,7 +507,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 		sql.append(" INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = TF.VIGENCIATARIFA_ID  AND C.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA )  ");		
 		
 		
-		sql.append("                 WHERE C.ACTIVO = 1   AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'dd/mm/yyyy hh24:mi:ss') ");
+		sql.append("                 WHERE C.ACTIVO <> 0   AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'dd/mm/yyyy hh24:mi:ss') ");
 		
 		if (lsNumServico.size() > 0) {
 			for (Corrida corrida : lsNumServico) {
@@ -563,7 +563,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 		
 		
 		
-		sql.append("        WHERE CO.ACTIVO = 1 ");
+		sql.append("        WHERE CO.ACTIVO <> 0 ");
 		sql.append("		AND RC.ACTIVO = 1");
 		sql.append("		AND T.ACTIVO = 1");
 		sql.append("        AND BO.INDSTATUSBOLETO != 'S' AND BO.MOTIVOCANCELACION_ID IS NULL ");

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

@@ -516,7 +516,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio {
 		
 		sql.append("                 LEFT JOIN BOLETO B  ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA AND B.ACTIVO = 1 AND B.MOTIVOCANCELACION_ID IS NULL ");
 		sql.append("                                     AND (B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA).append(" OR PORCCATEGORIA = 100)) ");
-		sql.append("                 WHERE C.ACTIVO = 1   ");
+		sql.append("                 WHERE C.ACTIVO <> 0   ");
 		sql.append("                 AND  C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YYYY hh24:mi:ss') AND  TO_DATE(:DATA_FINAL, 'DD/MM/YYYY hh24:mi:ss')           ");
 
 		if (lsNumServico.size() > 0) {
@@ -559,7 +559,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio {
 		sql.append("        INNER JOIN BOLETO BO ON CO.CORRIDA_ID = BO.CORRIDA_ID AND CO.FECCORRIDA = BO.FECCORRIDA AND BO.ACTIVO = 1 ");
 		sql.append("		INNER JOIN RUTA_COMBINACION RC ON RC.RUTA_ID = CO.RUTA_ID ");
 		sql.append("		INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID AND T.ORIGEN_ID = BO.ORIGEN_ID AND T.DESTINO_ID = BO.DESTINO_ID ");
-		sql.append("        WHERE CO.ACTIVO = 1 ");
+		sql.append("        WHERE CO.ACTIVO <> 0 ");
 		sql.append("		AND RC.ACTIVO = 1");
 		sql.append("		AND T.ACTIVO = 1");
 		sql.append("        AND BO.INDSTATUSBOLETO != 'S' AND BO.MOTIVOCANCELACION_ID IS NULL ");

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

@@ -0,0 +1,44 @@
+/**
+ * 
+ */
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.entidad.LogAuditoria;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.LogAuditoriaBean;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioLogAuditoria extends RelatorioDemandas {
+	public RelatorioLogAuditoria(Map<String, Object> parametros, Connection conexao, List list) throws Exception {
+		super(parametros, conexao);
+		
+		List<LogAuditoriaBean> listaBean = new ArrayList<LogAuditoriaBean>();
+		
+		for (Object object : list) {
+			LogAuditoria log = (LogAuditoria)object;
+			LogAuditoriaBean bean = new LogAuditoriaBean();
+			
+			bean.setIdAuditado(log.getIdAuditado());
+			bean.setCampoAlterado(log.getCampoAlterado());
+			bean.setEmpresa(log.getEmpresa() != null ? log.getEmpresa().getNombempresa() : "");
+			bean.setUsuario(log.getUsuario() != null ? log.getUsuario().getNombusuario() : "");
+			bean.setClasseAlterada(log.getClasseAlterada());
+			bean.setClassePrincipal(log.getClassePrincipal());
+			bean.setTela(log.getTela());
+			bean.setDataAlteracao(log.getFecmodif());
+			bean.setCampoAlterado(log.getCampoAlterado());
+			bean.setValorAtual(log.getValorNovo());
+			bean.setValorAnterior(log.getValorAnterior());
+			bean.setTipoAlteracao(log.getTipoAlteracao());
+			listaBean.add(bean);
+		}
+		setCollectionDataSource(new JRBeanCollectionDataSource(listaBean));
+
+
+	}
+}

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

@@ -563,19 +563,19 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
 			sb.append("AND e.empresa_id = :empresa_id ");
 		}
 
-		if (agencia_id != null) {
+		if (agencia_id != null && !agencia_id.equals(-1)) {
 			sb.append("AND c.puntoventa_id = :puntoventa_id ");
 		}
 
-		if (ruta_id != null) {
+		if (ruta_id != null && !ruta_id.equals(-1)) {
 			sb.append("AND c.ruta_id = :ruta_id ");
 		}
 
-		if (origem_id != null) {
+		if (origem_id != null && !origem_id.equals(-1)) {
 			sb.append("AND ori.parada_id = :origem_id ");
 		}
 
-		if (destino_id != null) {
+		if (destino_id != null && !destino_id.equals(-1)) {
 			sb.append("AND des.parada_id = :destino_id ");
 		}
 

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

@@ -70,19 +70,19 @@ public class RelatorioOrigemDestino extends Relatorio {
 			bean.setFechorsalida(rs.getTimestamp("fechorsalida"));
 			bean.setOrigem(rs.getString("origem"));
 			bean.setDestino(rs.getString("destino"));
-			bean.setKm_tramo(rs.getBigDecimal("km_tramo"));
+			bean.setKm_tramo(limpaNulo(rs.getBigDecimal("km_tramo")));
 			bean.setDescruta(rs.getString("descruta"));
 			bean.setIndsentidoida(rs.getInt("indsentidoida"));
-			bean.setKm_corrida(rs.getBigDecimal("km_corrida"));
+			bean.setKm_corrida(limpaNulo(rs.getBigDecimal("km_corrida")));
 			bean.setAbsolutos(rs.getBigDecimal("absolutos"));
 			bean.setReceita(rs.getBigDecimal("receita"));
 			bean.setPreciobase(rs.getBigDecimal("preciobase"));
-			bean.setEquivalente_total_corrida(rs.getBigDecimal("equivalente_total_corrida"));
+			bean.setEquivalente_total_corrida(limpaNulo(rs.getBigDecimal("equivalente_total_corrida")));
 			bean.setDisponibilidade(rs.getInt("disponibilidade"));
 			bean.setViagens(rs.getInt("viagens"));
 			bean.setAbsoluto_total_corrida(rs.getInt("absoluto_total_corrida"));
-			bean.setImportetaxaembarque(rs.getBigDecimal("importetaxaembarque"));
+			bean.setImportetaxaembarque(limpaNulo(rs.getBigDecimal("importetaxaembarque")));
-			bean.setImportepedagio(rs.getBigDecimal("importepedagio"));
+			bean.setImportepedagio(limpaNulo(rs.getBigDecimal("importepedagio")));
 			
 			bean.setOrigemId(rs.getInt("origen_id"));
 			bean.setDestinoId(rs.getInt("destino_id"));
@@ -689,4 +689,12 @@ public class RelatorioOrigemDestino extends Relatorio {
 		}
 		return "";
 	}
+	
+	private BigDecimal limpaNulo( BigDecimal val ) {
+		if( val == null ) {
+			return BigDecimal.ZERO;
+		}else {
+			return val;
+		}
+	}
 }

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

@@ -149,6 +149,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends
 		sql.append(" AND tar.vigenciatarifa_id = vt.vigenciatarifa_id  ");
 		sql.append(" AND tar.origen_id = b.origen_id  ");
 		sql.append(" AND tar.destino_id = b.destino_id ");
+		sql.append(" AND tar.TRAMO_ID = tr.TRAMO_ID ");
 		sql.append("AND tar.activo = 1 ) ");
 		sql.append(" WHERE b.empresacorrida_id IN :empresa_id ");
 

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

@@ -23,8 +23,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasCartoes extends Relatorio {
-	
+
-	private static Logger log = Logger.getLogger(RelatorioMovimentacaoEstoque.class);
+	private static Logger log = Logger.getLogger(RelatorioVendasCartoes.class);
 
 	List<RelatorioVendasCartoesBean> list = null;
 
@@ -36,10 +36,10 @@ public class RelatorioVendasCartoes extends Relatorio {
 			public void initDados() throws Exception {
 				Connection conexao = this.relatorio.getConexao();
 				Map<String, Object> parametros = this.relatorio.getParametros();
-				
+
 				NamedParameterStatement stmt = null;
 				ResultSet rset = null;
-				
+
 				String dataInicial = parametros.get("DATA_INICIAL").toString() + " 00:00:00";
 				String dataFinal = parametros.get("DATA_FINAL").toString() + " 23:59:59";
 				Empresa empresa = (Empresa) parametros.get("EMPRESA");
@@ -47,28 +47,29 @@ public class RelatorioVendasCartoes extends Relatorio {
 				Usuario usuario = (Usuario) parametros.get("USUARIO");
 				Estacion estacao = (Estacion) parametros.get("ESTACION");
 				String tipoAgencias = (String) parametros.get("TIPOPUNTOVENTA");
-				
+
 				String sql = getSql(dataInicial, dataFinal, empresa, puntoVenta, tipoAgencias, usuario, estacao, buscarPorDataDaVenda);
-				
+				log.info("query= " + sql);
+
 				try {
 					stmt = new NamedParameterStatement(conexao, sql);
-					
+
-					if(empresa != null){
+					if (empresa != null) {
 						stmt.setInt("empresaId", empresa.getEmpresaId());
 					}
-					if(puntoVenta != null){
+					if (puntoVenta != null) {
 						stmt.setInt("puntoventaId", puntoVenta.getPuntoventaId());
 					}
-					if(dataInicial != null){
+					if (dataInicial != null) {
-						stmt.setString("dataInicial",dataInicial);
+						stmt.setString("dataInicial", dataInicial);
 					}
-					if(dataFinal != null){
+					if (dataFinal != null) {
 						stmt.setString("dataFinal", dataFinal);
 					}
-					if(estacao != null){
+					if (estacao != null) {
 						stmt.setInt("estacionId", estacao.getEstacionId());
 					}
-					if(usuario != null){
+					if (usuario != null) {
 						stmt.setInt("usuarioId", usuario.getUsuarioId());
 					}
 
@@ -77,50 +78,50 @@ public class RelatorioVendasCartoes extends Relatorio {
 					list = new ArrayList<RelatorioVendasCartoesBean>();
 					BigDecimal valorTotal = BigDecimal.ZERO;
 					while (rset.next()) {
-						
+
 						RelatorioVendasCartoesBean bean = new RelatorioVendasCartoesBean();
-						
+
 						bean.setDataVenda(rset.getDate("dataVenda"));
-						bean.setDataOperacao(rset.getString("dataOperacao")  != null ?  DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null);
+						bean.setDataOperacao(rset.getString("dataOperacao") != null ? DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null);
-						bean.setDescPagamento(rset.getString("descPagamento") != null ?  rset.getString("descPagamento") : null);
+						bean.setDescPagamento(rset.getString("descPagamento") != null ? rset.getString("descPagamento") : null);
-						bean.setValor(rset.getBigDecimal("valor") != null ?  rset.getBigDecimal("valor") : null);
+						bean.setValor(rset.getBigDecimal("valor") != null ? rset.getBigDecimal("valor") : null);
-						bean.setAutorizacao(rset.getString("autorizacao") != null ?  rset.getString("autorizacao") : null);
+						bean.setAutorizacao(rset.getString("autorizacao") != null ? rset.getString("autorizacao") : null);
 						bean.setQtdParcelas(rset.getInt("qtdParcelas"));
 						bean.setNumeroPuntoVenta(rset.getInt("numeroPuntoVenta"));
-						bean.setNomePuntoVenta(rset.getString("nomePuntoVenta") != null ?  rset.getString("nomePuntoVenta") : null);
+						bean.setNomePuntoVenta(rset.getString("nomePuntoVenta") != null ? rset.getString("nomePuntoVenta") : null);
-						bean.setDescOperadoraCartao(rset.getString("descOperadoraCartao") != null ?  rset.getString("descOperadoraCartao") : null);
+						bean.setDescOperadoraCartao(rset.getString("descOperadoraCartao") != null ? rset.getString("descOperadoraCartao") : null);
-						bean.setNSU(rset.getString("nsu") != null ?  rset.getString("nsu") : null);
+						bean.setNSU(rset.getString("nsu") != null ? rset.getString("nsu") : null);
-						bean.setNumeroCartao(rset.getString("numeroCartao") != null ?  rset.getString("numeroCartao") : null);
+						bean.setNumeroCartao(rset.getString("numeroCartao") != null ? rset.getString("numeroCartao") : null);
-						bean.setBandeira(rset.getString("bandeira") != null ?  rset.getString("bandeira") : null);
+						bean.setBandeira(rset.getString("bandeira") != null ? rset.getString("bandeira") : null);
-						bean.setEstabelecimento(rset.getString("estabelecimento") != null ?  rset.getString("estabelecimento") : null);
+						bean.setEstabelecimento(rset.getString("estabelecimento") != null ? rset.getString("estabelecimento") : null);
-						bean.setTerminal(rset.getString("terminal") != null ?  rset.getString("terminal") : null);
+						bean.setTerminal(rset.getString("terminal") != null ? rset.getString("terminal") : null);
-						valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO); 
+						valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO);
 						bean.setValorTotal(valorTotal);
-						
+
 						list.add(bean);
 					}
 				} catch (Exception e) {
 					log.error(e.getMessage(), e);
 				} finally {
-					if(rset != null && !rset.isClosed()) {
+					if (rset != null && !rset.isClosed()) {
 						rset.close();
 					}
-					if(stmt != null && !stmt.isClosed()) {
+					if (stmt != null && !stmt.isClosed()) {
 						stmt.close();
 					}
 				}
 			}
 		});
-		
+
 		this.setCollectionDataSource(new JRBeanCollectionDataSource(list));
 	}
-	
+
-	private RelatorioVendasCartoesBean calcTotalValor(RelatorioVendasCartoesBean bean) {
+	// private RelatorioVendasCartoesBean calcTotalValor(RelatorioVendasCartoesBean bean) {
-		BigDecimal valorTotal = bean.getValorTotal().add(bean.getValorTotal());
+	// BigDecimal valorTotal = bean.getValorTotal().add(bean.getValorTotal());
-		bean.setValorTotal(valorTotal);
+	// bean.setValorTotal(valorTotal);
-		return bean;
+	// return bean;
-	}
+	// }
-	
+
 	@Override
 	protected void processaParametros() throws Exception {
 	}
@@ -128,9 +129,9 @@ public class RelatorioVendasCartoes extends Relatorio {
 	private String getSql(String dataInicial, String dataFinal, Empresa empresa, PuntoVenta puntoVenta, String tipoAgencias, Usuario usuario, Estacion estacion, Boolean buscarPorDataDaVenda) {
 
 		StringBuilder sb = new StringBuilder();
-		
+
 		sb.append("SELECT caja.descpago as descPagamento,");
-		sb.append("       to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,"); 
+		sb.append("       to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,");
 		sb.append("       caja.autorizacao as autorizacao,");
 		sb.append("       coalesce(caja.qtdparcelas, 1) as qtdParcelas ,");
 		sb.append("       caja.datavenda as dataVenda, ");
@@ -150,8 +151,8 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append("          ct.cantparcelas AS qtdparcelas,");
 		sb.append("          c.fechorventa AS datavenda,");
 		sb.append("          case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco,");
-		sb.append(" pt.numpuntoventa as numeroPuntoVenta, "); 
+		sb.append(" pt.numpuntoventa as numeroPuntoVenta, ");
-		sb.append("pt.nombpuntoventa as nomePuntoVenta, "); 
+		sb.append("pt.nombpuntoventa as nomePuntoVenta, ");
 		sb.append("ct.descoperadoracartao as descoperadoracartao, ");
 		sb.append("ct.nsu as NSU, ");
 		sb.append(" ct.numtarjeta as numeroCartao,  ");
@@ -169,38 +170,36 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append("   LEFT JOIN estacion_sitef  estsitef ON ( estsitef.estacion_id = c.estacion_id and estsitef.activo = 1) ");
 		sb.append("   WHERE c.indreimpresion = 0 ");
 
-		if(empresa!= null){
+		if (empresa != null) {
 			sb.append("and ma.empresa_id = :empresaId ");
 		}
-		
+
-		if(puntoVenta != null){
+		if (puntoVenta != null) {
 			sb.append("AND c.puntoventa_id = :puntoventaId ");
 		}
-		
+
-		if(estacion!= null){
+		if (estacion != null) {
 			sb.append("AND c.estacion_id = :estacionId ");
 		}
-		
+
-		if(usuario!= null){
+		if (usuario != null) {
 			sb.append(" and c.usuario_id = :usuarioId ");
 		}
-		
+
-		if(dataInicial != null && buscarPorDataDaVenda){
+		if (dataInicial != null && buscarPorDataDaVenda) {
 			sb.append("AND c.fechorventa >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') ");
 		} else if (dataInicial != null && !buscarPorDataDaVenda) {
 			sb.append("AND c.feccorte >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') ");
 		}
-		
+
-		if(dataFinal != null && buscarPorDataDaVenda){
+		if (dataFinal != null && buscarPorDataDaVenda) {
 			sb.append("AND c.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') ");
-		}  else if (dataInicial != null && !buscarPorDataDaVenda) {
+		} else if (dataInicial != null && !buscarPorDataDaVenda) {
 			sb.append("AND c.feccorte <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') ");
 		}
 
 		sb.append(tipoAgencias.equals("-1") || tipoAgencias.equals("TODAS") ? "" : " and  pt.tipoptovta_id not in  (" + tipoAgencias + ") ");
 
-		
-
 		sb.append("     AND fp.formapago_id IN(2,3)");
 		sb.append("     AND c.activo = 1) caja ");
 		sb.append("GROUP BY caja.descpago,");
@@ -217,7 +216,7 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append(" caja.estabelecimento, ");
 		sb.append(" caja.terminal ");
 		sb.append("ORDER BY caja.nomePuntoVenta, caja.datavenda ");
-		
+
 		return sb.toString();
 	}
 

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

@@ -0,0 +1,240 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.Estacion;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+import com.rjconsultores.ventaboletos.entidad.Usuario;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasCartoesBean;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioVendasCartoesAlternativo extends Relatorio {
+
+	private static Logger log = Logger.getLogger(RelatorioVendasCartoesAlternativo.class);
+
+	List<RelatorioVendasCartoesBean> list = null;
+
+	public RelatorioVendasCartoesAlternativo(Map<String, Object> parametros, Connection conexao, final Boolean buscarPorDataDaVenda) throws Exception {
+		super(parametros, conexao);
+
+		this.setCustomDataSource(new DataSource(this) {
+
+			public void initDados() throws Exception {
+				Connection conexao = this.relatorio.getConexao();
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				NamedParameterStatement stmt = null;
+				ResultSet rset = null;
+
+				String dataInicial = parametros.get("DATA_INICIAL").toString() + " 00:00:00";
+				String dataFinal = parametros.get("DATA_FINAL").toString() + " 23:59:59";
+				Empresa empresa = (Empresa) parametros.get("EMPRESA");
+				PuntoVenta puntoVenta = (PuntoVenta) parametros.get("PUNTOVENTA");
+				Usuario usuario = (Usuario) parametros.get("USUARIO");
+				Estacion estacao = (Estacion) parametros.get("ESTACION");
+				String tipoAgencias = (String) parametros.get("TIPOPUNTOVENTA");
+
+				String sql = getSql(dataInicial, dataFinal, empresa, puntoVenta, tipoAgencias, usuario, estacao, buscarPorDataDaVenda);
+
+				log.info("query=" + sql);
+
+				try {
+					stmt = new NamedParameterStatement(conexao, sql);
+
+					if (empresa != null) {
+						stmt.setInt("empresaId", empresa.getEmpresaId());
+					}
+					if (puntoVenta != null) {
+						stmt.setInt("puntoventaId", puntoVenta.getPuntoventaId());
+					}
+					if (dataInicial != null) {
+						stmt.setString("dataInicial", dataInicial);
+					}
+					if (dataFinal != null) {
+						stmt.setString("dataFinal", dataFinal);
+					}
+					if (estacao != null) {
+						stmt.setInt("estacionId", estacao.getEstacionId());
+					}
+					if (usuario != null) {
+						stmt.setInt("usuarioId", usuario.getUsuarioId());
+					}
+
+					rset = stmt.executeQuery();
+
+					list = new ArrayList<RelatorioVendasCartoesBean>();
+					BigDecimal valorTotal = BigDecimal.ZERO;
+					while (rset.next()) {
+
+						RelatorioVendasCartoesBean bean = new RelatorioVendasCartoesBean();
+
+						bean.setDataVenda(rset.getDate("dataVenda"));
+						bean.setDataOperacao(rset.getString("dataOperacao") != null ? DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null);
+						bean.setDescPagamento(rset.getString("descPagamento") != null ? rset.getString("descPagamento") : null);
+						bean.setValor(rset.getBigDecimal("valor") != null ? rset.getBigDecimal("valor") : null);
+						bean.setAutorizacao(rset.getString("autorizacao") != null ? rset.getString("autorizacao") : null);
+						bean.setQtdParcelas(rset.getInt("qtdParcelas"));
+
+						valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO);
+						bean.setValorTotal(valorTotal);
+
+						list.add(bean);
+					}
+				} catch (Exception e) {
+					log.error(e.getMessage(), e);
+				} finally {
+					if (rset != null && !rset.isClosed()) {
+						rset.close();
+					}
+					if (stmt != null && !stmt.isClosed()) {
+						stmt.close();
+					}
+				}
+			}
+		});
+
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(list));
+	}
+
+	// private RelatorioVendasCartoesBean calcTotalValor(RelatorioVendasCartoesBean bean) {
+	// BigDecimal valorTotal = bean.getValorTotal().add(bean.getValorTotal());
+	// bean.setValorTotal(valorTotal);
+	// return bean;
+	// }
+
+	@Override
+	protected void processaParametros() throws Exception {
+	}
+
+	private String getSql(String dataInicial, String dataFinal, Empresa empresa, PuntoVenta puntoVenta, String tipoAgencias, Usuario usuario, Estacion estacion, Boolean buscarPorDataDaVenda) {
+
+		StringBuilder sb = new StringBuilder();
+
+		sb.append("SELECT caja.descpago as descPagamento,");
+		sb.append("       to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,");
+		sb.append("       caja.autorizacao as autorizacao,");
+		sb.append("       coalesce(caja.qtdparcelas, 1) as qtdParcelas ,");
+		sb.append("       trunc(caja.datavenda) as dataVenda, ");
+		sb.append("       sum(caja.preco) as valor ");
+		sb.append("FROM");
+		sb.append("  (SELECT fp.descpago AS descpago,");
+		sb.append("          ct.fecoperacion AS dataoperacao,");
+		sb.append("          ct.numautorizacion AS autorizacao,");
+		sb.append("          ct.cantparcelas AS qtdparcelas,");
+		sb.append("          c.fechorventa AS datavenda,");
+		sb.append("          case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco");
+		sb.append("   FROM caja c");
+		sb.append("   INNER JOIN caja_formapago cfp ON c.caja_id=cfp.caja_id AND cfp.activo = 1 ");
+		sb.append("   INNER JOIN marca ma on ma.marca_id = c.marca_id ");
+		sb.append("   INNER JOIN forma_pago fp ON cfp.formapago_id=fp.formapago_id");
+		sb.append("   LEFT JOIN caja_det_pago cdp ON (c.caja_id = cdp.caja_id and cdp.cajaformapago_id = cfp.cajaformapago_id)");
+		sb.append("   LEFT JOIN caja_tarjeta ct ON (ct.cajadetpago_id = cdp.cajadetpago_id)");
+		sb.append("   INNER JOIN punto_venta pt ON (pt.puntoventa_id = c.puntoventa_id) ");
+		sb.append("   WHERE c.indreimpresion = 0 ");
+
+		if (empresa != null) {
+			sb.append("and ma.empresa_id = :empresaId ");
+		}
+
+		if (puntoVenta != null) {
+			sb.append("AND c.puntoventa_id = :puntoventaId ");
+		}
+
+		if (estacion != null) {
+			sb.append("AND c.estacion_id = :estacionId ");
+		}
+
+		if (usuario != null) {
+			sb.append(" and c.usuario_id = :usuarioId ");
+		}
+
+		if (dataInicial != null && buscarPorDataDaVenda) {
+			sb.append("AND c.fechorventa >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') ");
+		} else if (dataInicial != null && !buscarPorDataDaVenda) {
+			sb.append("AND c.feccorte >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') ");
+		}
+
+		if (dataFinal != null && buscarPorDataDaVenda) {
+			sb.append("AND c.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') ");
+		} else if (dataInicial != null && !buscarPorDataDaVenda) {
+			sb.append("AND c.feccorte <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') ");
+		}
+
+		sb.append(tipoAgencias.equals("-1") || tipoAgencias.equals("TODAS") ? "" : " and  pt.tipoptovta_id not in  (" + tipoAgencias + ") ");
+
+		sb.append("     AND fp.formapago_id IN(2,3)");
+		sb.append("     AND c.activo = 1 ");
+
+		sb.append("		UNION ");
+		sb.append("		SELECT ");
+		sb.append("    		fp.descpago           as descpago, ");
+		sb.append("    		ct.fecoperacion       as dataoperacao, ");
+		sb.append("    		ct.numautorizacion    as autorizacao, ");
+		sb.append("    		coalesce(ct.cantparcelas, 1) as qtdparcelas, ");
+		sb.append("    		coalesce(c.fechorventa, cd.fechorvta) as datavenda, ");
+		sb.append("    		case when cdp.importe < 0 and fp.formapago_id in (3, 2) then 0 else cdp.importe end as preco ");
+		sb.append("  	FROM caja_diversos cd ");
+		sb.append("  		JOIN caja_diversos_pago cdp on cdp.cajadiversos_id = cd.cajadiversos_id ");
+		sb.append("  		INNER JOIN forma_pago fp on fp.formapago_id = cdp.formapago_id ");
+		sb.append("  		INNER JOIN evento_extra ee on ee.eventoextra_id = cd.eventoextra_id ");
+		sb.append("  		LEFT JOIN  boleto c on c.boleto_id = ee.boleto_id ");
+		sb.append("  		LEFT JOIN caja_tarjeta ct on ( cdp.cajatarjeta_id = ct.cajatarjeta_id) ");
+		sb.append("  	WHERE cd.activo = 1  ");
+		sb.append(" 		AND (ee.boleto_id is null or ee.boleto_id = c.boleto_id) ");
+		sb.append("  		AND fp.formapago_id in (3, 2) ");
+
+		if (empresa != null) {
+			sb.append("and ee.empresa_id = :empresaId ");
+		}
+
+		if (puntoVenta != null) {
+			sb.append("AND cd.puntoventa_id = :puntoventaId ");
+		}
+
+		if (estacion != null) {
+			sb.append("AND cd.estacion_id = :estacionId ");
+		}
+
+		if (usuario != null) {
+			sb.append(" AND cd.usuario_id = :usuarioId ");
+		}
+
+		if (dataInicial != null && buscarPorDataDaVenda) {
+			sb.append(" AND cd.fechorvta >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') ");
+		} else if (dataInicial != null && !buscarPorDataDaVenda) {
+			sb.append(" AND cd.feccorte >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') ");
+		}
+
+		if (dataFinal != null && buscarPorDataDaVenda) {
+			sb.append(" AND cd.fechorvta <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') ");
+		} else if (dataInicial != null && !buscarPorDataDaVenda) {
+			sb.append(" AND cd.feccorte <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') ");
+		}
+
+		sb.append(tipoAgencias.equals("-1") || tipoAgencias.equals("TODAS") ? "" : " and  pt.tipoptovta_id not in  (" + tipoAgencias + ") ");
+		sb.append("   ) caja   ");
+
+		sb.append("GROUP BY caja.descpago,");
+		sb.append("         to_char(caja.dataoperacao, 'ddMMyyyy'),");
+		sb.append("         caja.autorizacao,");
+		sb.append("         caja.qtdparcelas,");
+		sb.append("         trunc(caja.datavenda) ");
+		sb.append("ORDER BY caja.descpago, trunc(caja.datavenda), caja.autorizacao");
+
+		return sb.toString();
+	}
+
+}

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

@@ -107,9 +107,9 @@ public class RelatorioVendasConexaoRuta extends Relatorio {
 			bean.setPoltrona((String) rset.getObject("poltrona"));
 			bean.setNumLinha((Integer) rset.getInt("numLinha"));
 			bean.setDescricaoLinha((String) rset.getObject("descricaoLinha"));
-			bean.setCodOrigem((Integer) rset.getInt("codOrigem"));
+			bean.setCodOrigem((String) rset.getString("codOrigem"));
 			bean.setDescricaoOrigem((String) rset.getObject("descricaoOrigem"));
-			bean.setCodDestino((Integer) rset.getInt("codDestino"));
+			bean.setCodDestino((String) rset.getString("codDestino"));
 			bean.setDescricaoDestino((String) rset.getObject("descricaoDestino"));
 			bean.setDataEmbarque((Date) rset.getObject("dataEmbarque"));
 			bean.setDataVenda((Date) rset.getObject("dataVenda"));

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

@@ -166,7 +166,7 @@ public class RelatorioVendasRequisicao extends Relatorio {
 			  .append("JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
 			  .append("JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
 			  .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
-			  .append("WHERE FP.FORMAPAGO_ID = 11 ")
+			  .append("WHERE (FP.FORMAPAGO_ID = 11 OR FP.TIPO_PAGO = 6) ")
 			  .append("AND C.ACTIVO = 1 ")
 			  .append("AND C.INDREIMPRESION = 0 ");
 			  

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

@@ -29,4 +29,5 @@ label.numBPe=N
 label.serie=Série
 label.status=Status
 label.obs=Observação
+label.codAgencia=Cod.Agência
 header.filtro.total=Total Geral:

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

@@ -29,4 +29,5 @@ label.protocolo=Protocolo
 label.numBPe=Núm. BPe
 label.serie=Série
 label.status=Status
-label.obs=Observação
+label.obs=Observação
+label.codAgencia=Cod. Agência

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

@@ -0,0 +1,32 @@
+#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:
+
+label.dataVenda=Data Venda
+label.horaVenda=Hora Venda
+label.origem=Origem
+label.destino=Destino
+label.dataViagem=Data Viagem
+label.valorBPe=Valor  
+label.origemPV= Loc. Venda
+label.valortarifa=Tarifa
+label.valortaxa=Taxa
+label.valorpedagio=Pedágio
+label.valorseguro=Seguro
+label.valoroutros=Outros
+label.chaveAcesso=Chave Acesso
+label.protocolo=Protocolo
+label.numBPe=Núm. BPe
+label.serie=Série
+label.status=Status
+label.obs=Observação
+header.filtro.total=Total Geral:

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

@@ -0,0 +1,32 @@
+#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:
+header.filtro.total=Total Geral:
+
+label.dataVenda=Data Venda
+label.horaVenda=Hora Venda
+label.origem=Origem
+label.destino=Destino
+label.dataViagem=Data Viagem
+label.valorBPe=Valor   
+label.origemPV= Loc. Venda
+label.valortarifa=Tarifa  
+label.valortaxa=Taxa
+label.valorpedagio=Pedágio
+label.valorseguro=Seguro
+label.valoroutros=Outros
+label.chaveAcesso=Chave Acesso
+label.protocolo=Protocolo
+label.numBPe=Núm. BPe
+label.serie=Série
+label.status=Status
+label.obs=Observação

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

@@ -0,0 +1,18 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+msg.a=à
+
+#Labels header
+header.data.hora=Data/Hora\: 
+header.pagina=Página\: 
+header.periodo.servico=Período Serviço\:
+header.periodo.encerramento=Período Encerramento\:
+header.empresa=Empresa\:
+
+#Labels detail
+detail.servico=Serviço
+detail.data.servico=Data Serviço
+detail.localidade=Localidade
+detail.data.encerramento=Data Encerramento
+detail.usuario.operacao=Usuário da Operação
+detail.imei=Dispositivo

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

@@ -0,0 +1,18 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+msg.a=à
+
+#Labels header
+header.data.hora=Data/Hora\: 
+header.pagina=Página\: 
+header.periodo.servico=Período Serviço\:
+header.periodo.encerramento=Período Encerramento\:
+header.empresa=Empresa\:
+
+#Labels detail
+detail.servico=Serviço
+detail.data.servico=Data Serviço
+detail.localidade=Origem do Serviço
+detail.data.encerramento=Data Encerramento
+detail.usuario.operacao=Usuário da Operação
+detail.imei=Dispositivo

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

@@ -13,7 +13,7 @@ cabecalho.filtros=Filtros:
 
 #Labels datail
 datail.voucher=Nº Bilhete / Voucher
-datail.origen=Origem
+datail.origen=Origem do Serviço
 datail.servicio=Serviço
 datail.data.servicio=Data do Serviço
 datail.data.checkin=Data Checkin

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

@@ -10,10 +10,16 @@ cabecalho.impressorPor=Impressor por:
 cabecalho.pagina=Página
 cabecalho.de=de
 cabecalho.filtros=Filtros:
+#Labels header 
+cabecalho.pagina=Página\: 
+cabecalho.empresa=Empresa\:
+cabecalho.bilheteiro = Bilheteiro(s)\:
+cabecalho.usuario = Usuário\:
+
 
 #Labels datail
 datail.voucher=Nº Bilhete / Voucher
-datail.origen=Origem
+datail.origen=Origem do Serviço
 datail.servicio=Serviço
 datail.data.servicio=Data do Serviço
 datail.data.checkin=Data Checkin

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

@@ -0,0 +1,19 @@
+TITULO = Relatório Log de Auditoria
+PERIODO = PERÍODO
+header.data.hora=Data/Hora\: 
+cabecalho.impressorPor=Impresso por
+
+DATA_ALTERACAO = DATA ATLERAÇÃO
+ID_AUDITADO = ID AUDITADO
+EMPRESA = EMPRESA
+USUARIO = USUARIO
+TIPO_ALTERACAO = TIPO ALTERAÇÃO
+TELA = TELA
+CAMPO_ALTERADO = CAMPO ALTERADO
+VALOR_ATUAL = VALOR ATUAL
+VALOR_ANTERIOR = VALOR ANTERIOR
+CLASSE_ALTERADA = CLASSE ALTERADA
+CLASSE_PRINCIPAL = CLASSE PRINCIPAL
+
+
+msg.noData=Não foi possivel obter dados com os parâmetros informados.

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

@@ -0,0 +1,19 @@
+TITULO = Relatório Log de Auditoria
+PERIODO = PERÍODO
+header.data.hora=Data/Hora\: 
+cabecalho.impressorPor=Impresso por
+
+DATA_ALTERACAO = DATA ATLERAÇÃO
+ID_AUDITADO = ID AUDITADO
+EMPRESA = EMPRESA
+USUARIO = USUARIO
+TIPO_ALTERACAO = TIPO ALTERAÇÃO
+TELA = TELA
+CAMPO_ALTERADO = CAMPO ALTERADO
+VALOR_ATUAL = VALOR ATUAL
+VALOR_ANTERIOR = VALOR ANTERIOR
+CLASSE_ALTERADA = CLASSE ALTERADA
+CLASSE_PRINCIPAL = CLASSE PRINCIPAL
+
+
+msg.noData=Não foi possivel obter dados com os parâmetros informados.

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

@@ -0,0 +1,35 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+msg.a=à
+
+#Labels header
+header.titulo.relatorio=Relatório Vendas de Cartões
+header.periodo=Per\u00EDodo\: 
+header.data.hora=Data/Hora\: 
+header.pagina=P\u00E1gina\: 
+header.filtro=Filtro\: 
+header.filtro.servico=Servi\u00E7o\: 
+header.filtro.empresa=Empresa: 
+header.filtro.agencia=Agência: 
+header.filtro.estacao=Estação:
+header.filtro.bilheteiro=Bilheteiro:
+header.filtro.grupo=Grupo de Linhas\:
+
+#Labels detail
+
+detail.dataOperacao=Data Operação
+detail.dataVenda=Data Venda
+detail.autorizacao=Autorização
+detail.qtdParcelas=Quantidade Parcelas
+detail.valorTotal=Valor Total
+detail.valor=Valor R$
+
+#Group
+
+group.total=Total Geral:
+sub.total=Sub Total:
+total.debito=Total Débito:
+total.credito=Total Crédito:
+linhas=Linhas
+
+

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

@@ -0,0 +1,35 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+msg.a=à
+
+#Labels header
+header.titulo.relatorio=Relatório Vendas de Cartões
+header.periodo=Per\u00EDodo\: 
+header.data.hora=Data/Hora\: 
+header.pagina=P\u00E1gina\: 
+header.filtro=Filtro\: 
+header.filtro.servico=Servi\u00E7o\: 
+header.filtro.empresa=Empresa: 
+header.filtro.agencia=Agência: 
+header.filtro.estacao=Estação:
+header.filtro.bilheteiro=Bilheteiro:
+header.filtro.grupo=Grupo de Linhas\:
+
+#Labels detail
+
+detail.dataOperacao=Data Operação
+detail.dataVenda=Data Venda
+detail.autorizacao=Autorização
+detail.qtdParcelas=Quantidade Parcelas
+detail.valorTotal=Valor Total
+detail.valor=Valor R$
+
+#Group
+
+group.total=Total Geral:
+sub.total=Sub Total:
+total.debito=Total Débito:
+total.credito=Total Crédito:
+linhas=Linhas
+
+

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.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="RelatorioAproveitamentoFinanceiro" pageWidth="873" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="833" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="1.771561000000002"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="pageHeader"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="546"/>
 	<property name="ireport.y" value="0"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
@@ -33,6 +33,7 @@
 	<parameter name="NUMPUNTOVENTA" class="java.lang.String"/>
 	<parameter name="EMPRESA_ID" class="java.lang.Integer"/>
 	<parameter name="EMPRESA" class="java.lang.String"/>
+	<parameter name="ASSENTOS" class="java.math.BigDecimal"/>
 	<field name="LINHA" class="java.lang.String"/>
 	<field name="SENTIDO" class="java.lang.String"/>
 	<field name="ASSENTOS" class="java.math.BigDecimal"/>
@@ -440,8 +441,13 @@
 			)]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
-	<variable name="assentosGeral" class="java.math.BigDecimal" calculation="Sum">
+	<variable name="assentosGeral" class="java.math.BigDecimal" resetType="None" incrementType="Group" incrementGroup="LINHA" calculation="Lowest">
 		<variableExpression><![CDATA[$F{ASSENTOS}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="totAssentos" class="java.math.BigDecimal" resetType="Group" resetGroup="LINHA" calculation="Sum">
+		<variableExpression><![CDATA[$F{ASSENTOS}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
 	<group name="LINHA">
 		<groupExpression><![CDATA[$F{LINHA}]]></groupExpression>
@@ -481,7 +487,7 @@
 					</textElement>
 					<textFieldExpression><![CDATA["Receita unitária objetiva: "]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
 					<reportElement uuid="1b592450-cd14-4fd8-badc-0ce52de329d9" stretchType="RelativeToBandHeight" mode="Transparent" x="485" y="0" width="157" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="1.25"/>
@@ -490,7 +496,6 @@
 						<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 						<paragraph lineSpacing="Single"/>
 					</textElement>
-					<textFieldExpression><![CDATA["Lugares p/ Viagem: "+$F{ASSENTOS}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
 					<reportElement uuid="3389b306-a4a8-465a-a227-8f9ece4baa3c" stretchType="RelativeToBandHeight" mode="Transparent" x="794" y="0" width="38" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
@@ -525,7 +530,7 @@
 					<textFieldExpression><![CDATA[$V{totViagemLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="8d82e76c-f2c4-41db-b416-94aae8599b8f" stretchType="RelativeToTallestObject" mode="Transparent" x="490" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="8d82e76c-f2c4-41db-b416-94aae8599b8f" stretchType="RelativeToTallestObject" mode="Transparent" x="514" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -537,7 +542,7 @@
 					<textFieldExpression><![CDATA[$V{totQuaQtdeServico}+"/"+$V{totQuaTotLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="4c9dbc16-1daf-4077-97a6-951ce1a0807a" stretchType="RelativeToTallestObject" mode="Transparent" x="528" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="4c9dbc16-1daf-4077-97a6-951ce1a0807a" stretchType="RelativeToTallestObject" mode="Transparent" x="549" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -550,7 +555,7 @@
 					<textFieldExpression><![CDATA[$V{totQuaFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="f8fd4f7a-0c50-4026-8248-5ab0242f89a3" stretchType="RelativeToTallestObject" mode="Transparent" x="452" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="f8fd4f7a-0c50-4026-8248-5ab0242f89a3" stretchType="RelativeToTallestObject" mode="Transparent" x="479" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -563,7 +568,7 @@
 					<textFieldExpression><![CDATA[$V{totTerFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="c0596899-e184-49a8-a2aa-40bb09f62001" stretchType="RelativeToTallestObject" mode="Transparent" x="642" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="c0596899-e184-49a8-a2aa-40bb09f62001" stretchType="RelativeToTallestObject" mode="Transparent" x="654" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -575,7 +580,7 @@
 					<textFieldExpression><![CDATA[$V{totSexQtdeServico}+"/"+$V{totSexTotLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="e7449824-474e-44de-823b-7940c3bd7df3" stretchType="RelativeToTallestObject" mode="Transparent" x="756" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="e7449824-474e-44de-823b-7940c3bd7df3" stretchType="RelativeToTallestObject" mode="Transparent" x="759" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -588,7 +593,7 @@
 					<textFieldExpression><![CDATA[$V{totSabFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="ef308b3d-fb21-4deb-9f96-17e5397f5e72" stretchType="RelativeToTallestObject" mode="Transparent" x="414" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="ef308b3d-fb21-4deb-9f96-17e5397f5e72" stretchType="RelativeToTallestObject" mode="Transparent" x="444" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -600,7 +605,7 @@
 					<textFieldExpression><![CDATA[$V{totTerQtdeServico}+"/"+$V{totTerTotLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="be2fa440-3a9d-45ca-9b50-8a889516b66f" stretchType="RelativeToTallestObject" mode="Transparent" x="376" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="be2fa440-3a9d-45ca-9b50-8a889516b66f" stretchType="RelativeToTallestObject" mode="Transparent" x="409" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -613,7 +618,7 @@
 					<textFieldExpression><![CDATA[$V{totSegFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="6f96cc36-c8e2-4f75-b557-cfd68bcb6612" stretchType="RelativeToTallestObject" mode="Transparent" x="566" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="6f96cc36-c8e2-4f75-b557-cfd68bcb6612" stretchType="RelativeToTallestObject" mode="Transparent" x="584" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -625,7 +630,7 @@
 					<textFieldExpression><![CDATA[$V{totQuiQtdeServico}+"/"+$V{totQuiTotLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="6fa898d8-a03c-449e-b31a-4955944a2e52" stretchType="RelativeToTallestObject" mode="Transparent" x="604" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="6fa898d8-a03c-449e-b31a-4955944a2e52" stretchType="RelativeToTallestObject" mode="Transparent" x="619" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -638,7 +643,7 @@
 					<textFieldExpression><![CDATA[$V{totQuiFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="08356c95-4909-4382-9bfe-3e580a34b8ca" stretchType="RelativeToTallestObject" mode="Transparent" x="680" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="08356c95-4909-4382-9bfe-3e580a34b8ca" stretchType="RelativeToTallestObject" mode="Transparent" x="689" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -651,7 +656,7 @@
 					<textFieldExpression><![CDATA[$V{totSexFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="ec86e129-a917-4360-bf8a-6af223fa4dce" stretchType="RelativeToTallestObject" mode="Transparent" x="718" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="ec86e129-a917-4360-bf8a-6af223fa4dce" stretchType="RelativeToTallestObject" mode="Transparent" x="724" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -663,7 +668,7 @@
 					<textFieldExpression><![CDATA[$V{totSabQtdeServico}+"/"+$V{totSabTotLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="94739135-6cee-4279-a5c8-5002af1da96c" stretchType="RelativeToTallestObject" mode="Transparent" x="262" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="94739135-6cee-4279-a5c8-5002af1da96c" stretchType="RelativeToTallestObject" mode="Transparent" x="304" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<leftPen lineWidth="0.25"/>
@@ -676,7 +681,7 @@
 					<textFieldExpression><![CDATA[$V{totDomQtdeLinha}+"/"+$V{totDomTotLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="e6847b00-50c1-455e-a3ae-d0eaff028425" stretchType="RelativeToTallestObject" mode="Transparent" x="300" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="e6847b00-50c1-455e-a3ae-d0eaff028425" stretchType="RelativeToTallestObject" mode="Transparent" x="339" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -689,7 +694,7 @@
 					<textFieldExpression><![CDATA[$V{totDomFinLinha}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement uuid="a8c28c63-bc20-46bf-9bc6-2315659cf8ab" stretchType="RelativeToTallestObject" mode="Transparent" x="338" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="a8c28c63-bc20-46bf-9bc6-2315659cf8ab" stretchType="RelativeToTallestObject" mode="Transparent" x="374" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -727,7 +732,7 @@
 					<textFieldExpression><![CDATA[$V{totPassageiroLinha}.intValue()]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-					<reportElement uuid="862fa0c4-b5c7-48a8-9179-565f9ace04ee" stretchType="RelativeToTallestObject" mode="Transparent" x="175" y="0" width="49" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="862fa0c4-b5c7-48a8-9179-565f9ace04ee" stretchType="RelativeToTallestObject" mode="Transparent" x="176" y="0" width="49" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
@@ -752,6 +757,13 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$V{totViagemLinha}.intValue()]]></textFieldExpression>
 				</textField>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement uuid="ec22d2c4-8bf5-43a1-8376-4f423c1ff964" stretchType="RelativeToTallestObject" x="262" y="0" width="38" height="14" isPrintWhenDetailOverflows="true"/>
+					<textElement textAlignment="Center">
+						<font size="8" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{totAssentos}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupFooter>
 	</group>
@@ -919,7 +931,7 @@
 				<textFieldExpression><![CDATA["Hora "]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="083ed504-c257-4a90-9f63-b20e828cc97f" stretchType="RelativeToTallestObject" mode="Transparent" x="262" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="083ed504-c257-4a90-9f63-b20e828cc97f" stretchType="RelativeToTallestObject" mode="Transparent" x="304" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<leftPen lineWidth="0.25"/>
@@ -943,7 +955,7 @@
 				<textFieldExpression><![CDATA["Num Viag."]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="e3a57847-646c-4572-b38d-2ed6a0e6d611" stretchType="RelativeToTallestObject" mode="Transparent" x="262" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="e3a57847-646c-4572-b38d-2ed6a0e6d611" stretchType="RelativeToTallestObject" mode="Transparent" x="304" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<leftPen lineWidth="0.25"/>
@@ -957,7 +969,7 @@
 				<textFieldExpression><![CDATA["Domingo"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="61a4d236-6f58-44c9-9f04-bb856ee561ae" stretchType="RelativeToTallestObject" mode="Transparent" x="300" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="61a4d236-6f58-44c9-9f04-bb856ee561ae" stretchType="RelativeToTallestObject" mode="Transparent" x="339" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -970,7 +982,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="5aa85acf-b465-4fba-81b3-1a6f27c08b66" stretchType="RelativeToTallestObject" mode="Transparent" x="338" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="5aa85acf-b465-4fba-81b3-1a6f27c08b66" stretchType="RelativeToTallestObject" mode="Transparent" x="374" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -982,7 +994,7 @@
 				<textFieldExpression><![CDATA["Qte"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="2ac9c463-e254-4dc9-90cf-c382c8b4bea9" stretchType="RelativeToTallestObject" mode="Transparent" x="338" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="2ac9c463-e254-4dc9-90cf-c382c8b4bea9" stretchType="RelativeToTallestObject" mode="Transparent" x="374" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -995,7 +1007,7 @@
 				<textFieldExpression><![CDATA["Segunda"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="a624f925-4c0c-404f-90b2-8f320c2801c5" stretchType="RelativeToTallestObject" mode="Transparent" x="376" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="a624f925-4c0c-404f-90b2-8f320c2801c5" stretchType="RelativeToTallestObject" mode="Transparent" x="409" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1008,7 +1020,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="283e091a-669d-493f-b1e8-0b1cac1f27ea" stretchType="RelativeToTallestObject" mode="Transparent" x="414" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="283e091a-669d-493f-b1e8-0b1cac1f27ea" stretchType="RelativeToTallestObject" mode="Transparent" x="444" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1020,7 +1032,7 @@
 				<textFieldExpression><![CDATA["Qte"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="589f02ab-c83b-4b77-9a34-0b81201382b0" stretchType="RelativeToTallestObject" mode="Transparent" x="414" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="589f02ab-c83b-4b77-9a34-0b81201382b0" stretchType="RelativeToTallestObject" mode="Transparent" x="444" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1033,7 +1045,7 @@
 				<textFieldExpression><![CDATA["Terça"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="95225d89-604e-4e2f-8251-67a0090cb573" stretchType="RelativeToTallestObject" mode="Transparent" x="452" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="95225d89-604e-4e2f-8251-67a0090cb573" stretchType="RelativeToTallestObject" mode="Transparent" x="479" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1046,7 +1058,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="a9f72f66-7403-4fe4-9544-b21006711ae6" stretchType="RelativeToTallestObject" mode="Transparent" x="490" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="a9f72f66-7403-4fe4-9544-b21006711ae6" stretchType="RelativeToTallestObject" mode="Transparent" x="514" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1058,7 +1070,7 @@
 				<textFieldExpression><![CDATA["Qte"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="c2613b74-a63d-4a4c-8480-b04aa8c8ea30" stretchType="RelativeToTallestObject" mode="Transparent" x="490" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2613b74-a63d-4a4c-8480-b04aa8c8ea30" stretchType="RelativeToTallestObject" mode="Transparent" x="514" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1071,7 +1083,7 @@
 				<textFieldExpression><![CDATA["Quarta"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="36263c71-f9bb-4155-bacb-9ad0e5b27364" stretchType="RelativeToTallestObject" mode="Transparent" x="528" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="36263c71-f9bb-4155-bacb-9ad0e5b27364" stretchType="RelativeToTallestObject" mode="Transparent" x="549" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1084,7 +1096,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="27f9340f-e948-42ae-bbc4-04329a1323ac" stretchType="RelativeToTallestObject" mode="Transparent" x="566" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="27f9340f-e948-42ae-bbc4-04329a1323ac" stretchType="RelativeToTallestObject" mode="Transparent" x="584" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1096,7 +1108,7 @@
 				<textFieldExpression><![CDATA["Qte"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="ca510ca3-2586-43d7-bb9c-39902b2d4a95" stretchType="RelativeToTallestObject" mode="Transparent" x="566" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="ca510ca3-2586-43d7-bb9c-39902b2d4a95" stretchType="RelativeToTallestObject" mode="Transparent" x="584" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1109,7 +1121,7 @@
 				<textFieldExpression><![CDATA["Quinta"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="3237381f-e625-457e-8110-70d9f6de80d5" stretchType="RelativeToTallestObject" mode="Transparent" x="604" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="3237381f-e625-457e-8110-70d9f6de80d5" stretchType="RelativeToTallestObject" mode="Transparent" x="619" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1122,7 +1134,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="6a1f8a46-66d6-4d2c-b61f-79c52f037c32" stretchType="RelativeToTallestObject" mode="Transparent" x="642" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="6a1f8a46-66d6-4d2c-b61f-79c52f037c32" stretchType="RelativeToTallestObject" mode="Transparent" x="654" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1134,7 +1146,7 @@
 				<textFieldExpression><![CDATA["Qte"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="bbf0d948-f0a3-4cb6-bdf4-a912415d7acf" stretchType="RelativeToTallestObject" mode="Transparent" x="642" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="bbf0d948-f0a3-4cb6-bdf4-a912415d7acf" stretchType="RelativeToTallestObject" mode="Transparent" x="654" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1147,7 +1159,7 @@
 				<textFieldExpression><![CDATA["Sexta"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="4b703af3-f42a-4c9f-8391-ef863ce8bc24" stretchType="RelativeToTallestObject" mode="Transparent" x="680" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="4b703af3-f42a-4c9f-8391-ef863ce8bc24" stretchType="RelativeToTallestObject" mode="Transparent" x="689" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1160,7 +1172,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="2ae0ff64-e230-431d-896f-c4480057ed7c" stretchType="RelativeToTallestObject" mode="Transparent" x="756" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="2ae0ff64-e230-431d-896f-c4480057ed7c" stretchType="RelativeToTallestObject" mode="Transparent" x="759" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1173,7 +1185,7 @@
 				<textFieldExpression><![CDATA["Fin%"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="69042f11-e1df-4727-814d-6825b8af042a" stretchType="RelativeToTallestObject" mode="Transparent" x="718" y="14" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="69042f11-e1df-4727-814d-6825b8af042a" stretchType="RelativeToTallestObject" mode="Transparent" x="724" y="14" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1185,7 +1197,7 @@
 				<textFieldExpression><![CDATA["Qte"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="bb4dd80f-2904-406a-8fa1-875b117f8b4b" stretchType="RelativeToTallestObject" mode="Transparent" x="718" y="0" width="76" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="bb4dd80f-2904-406a-8fa1-875b117f8b4b" stretchType="RelativeToTallestObject" mode="Transparent" x="724" y="0" width="70" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1210,6 +1222,18 @@
 				</textElement>
 				<textFieldExpression><![CDATA["%Fin Média"]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="903c0f44-d95a-4d87-8c1a-3940ddcf412c" stretchType="RelativeToTallestObject" mode="Transparent" x="262" y="0" width="42" height="28" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA["Lugares p/ Viagem"]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
@@ -1230,7 +1254,7 @@
 				<textFieldExpression><![CDATA[$F{SERVICO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="8b10f3c4-4fc7-4b47-952e-6bde8ec3bdda" stretchType="RelativeToTallestObject" mode="Transparent" x="262" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="8b10f3c4-4fc7-4b47-952e-6bde8ec3bdda" stretchType="RelativeToTallestObject" mode="Transparent" x="304" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<leftPen lineWidth="0.25"/>
@@ -1243,7 +1267,7 @@
 				<textFieldExpression><![CDATA[$F{DOM_QTDE}+"/"+$F{DOM_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="e7451802-1685-48ff-8159-adbe18e78ba1" stretchType="RelativeToTallestObject" mode="Transparent" x="300" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="e7451802-1685-48ff-8159-adbe18e78ba1" stretchType="RelativeToTallestObject" mode="Transparent" x="339" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1256,7 +1280,7 @@
 				<textFieldExpression><![CDATA[$F{DOM_FIN}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="69d60b51-442c-4eff-8c0a-5a5db58cd4ec" stretchType="RelativeToTallestObject" mode="Transparent" x="338" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="69d60b51-442c-4eff-8c0a-5a5db58cd4ec" stretchType="RelativeToTallestObject" mode="Transparent" x="374" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1268,7 +1292,7 @@
 				<textFieldExpression><![CDATA[$F{SEG_QTDE}+"/"+$F{SEG_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="78e35b64-7cfe-46c6-9108-3e0ffcae9ed3" stretchType="RelativeToTallestObject" mode="Transparent" x="376" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="78e35b64-7cfe-46c6-9108-3e0ffcae9ed3" stretchType="RelativeToTallestObject" mode="Transparent" x="409" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1281,7 +1305,7 @@
 				<textFieldExpression><![CDATA[$F{SEG_FIN}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="3f9935c7-2e40-432e-a7f9-cb2cfdac0349" stretchType="RelativeToTallestObject" mode="Transparent" x="414" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="3f9935c7-2e40-432e-a7f9-cb2cfdac0349" stretchType="RelativeToTallestObject" mode="Transparent" x="444" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1293,7 +1317,7 @@
 				<textFieldExpression><![CDATA[$F{TER_QTDE}+"/"+$F{TER_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="4b34e84b-7eaf-4eff-ac0e-6231730fa0b8" stretchType="RelativeToTallestObject" mode="Transparent" x="452" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="4b34e84b-7eaf-4eff-ac0e-6231730fa0b8" stretchType="RelativeToTallestObject" mode="Transparent" x="479" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1306,7 +1330,7 @@
 				<textFieldExpression><![CDATA[$F{TER_FIN}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="40537dda-f21b-482c-ac59-089ac07d84e3" stretchType="RelativeToTallestObject" mode="Transparent" x="490" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="40537dda-f21b-482c-ac59-089ac07d84e3" stretchType="RelativeToTallestObject" mode="Transparent" x="514" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1318,7 +1342,7 @@
 				<textFieldExpression><![CDATA[$F{QUA_QTDE}+"/"+$F{QUA_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="cc1110d3-85f4-4435-b6ca-db36b13c5b4b" stretchType="RelativeToTallestObject" mode="Transparent" x="528" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="cc1110d3-85f4-4435-b6ca-db36b13c5b4b" stretchType="RelativeToTallestObject" mode="Transparent" x="549" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1331,7 +1355,7 @@
 				<textFieldExpression><![CDATA[$F{QUA_FIN}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="860a6605-fd85-4077-9886-b8c8d6afc137" stretchType="RelativeToTallestObject" mode="Transparent" x="566" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="860a6605-fd85-4077-9886-b8c8d6afc137" stretchType="RelativeToTallestObject" mode="Transparent" x="584" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1343,7 +1367,7 @@
 				<textFieldExpression><![CDATA[$F{QUI_QTDE}+"/"+$F{QUI_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="3362ebe9-2d11-4e08-867e-f2e74315914f" stretchType="RelativeToTallestObject" mode="Transparent" x="604" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="3362ebe9-2d11-4e08-867e-f2e74315914f" stretchType="RelativeToTallestObject" mode="Transparent" x="619" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1356,7 +1380,7 @@
 				<textFieldExpression><![CDATA[$F{QUI_FIN}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="3002b366-c323-439a-a4df-6e1d3d41d678" stretchType="RelativeToTallestObject" mode="Transparent" x="642" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="3002b366-c323-439a-a4df-6e1d3d41d678" stretchType="RelativeToTallestObject" mode="Transparent" x="654" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1368,7 +1392,7 @@
 				<textFieldExpression><![CDATA[$F{SEX_QTDE}+"/"+$F{SEX_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="c852fc1e-0ee5-4887-9632-515116db0a34" stretchType="RelativeToTallestObject" mode="Transparent" x="680" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="c852fc1e-0ee5-4887-9632-515116db0a34" stretchType="RelativeToTallestObject" mode="Transparent" x="689" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1381,7 +1405,7 @@
 				<textFieldExpression><![CDATA[$F{SEX_FIN}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="4285d70c-071e-407e-aa05-53c2bcf44fa2" stretchType="RelativeToTallestObject" mode="Transparent" x="718" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="4285d70c-071e-407e-aa05-53c2bcf44fa2" stretchType="RelativeToTallestObject" mode="Transparent" x="724" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1393,7 +1417,7 @@
 				<textFieldExpression><![CDATA[$F{SAB_QTDE}+"/"+$F{SAB_TOT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="e7edfa0c-5b02-470d-8674-246afcfeddff" stretchType="RelativeToTallestObject" mode="Transparent" x="756" y="0" width="38" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="e7edfa0c-5b02-470d-8674-246afcfeddff" stretchType="RelativeToTallestObject" mode="Transparent" x="759" y="0" width="35" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -1454,6 +1478,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{VIAGENS}.intValue()]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="3a8636e6-e4ff-4bb8-9982-8da74473c105" stretchType="RelativeToBandHeight" x="262" y="0" width="38" height="14"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{ASSENTOS}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<lastPageFooter>

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

@@ -1,7 +1,7 @@
 <?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="RelatorioBPe" pageWidth="1350" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="1310" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f">
 	<property name="ireport.zoom" value="1.0980750000000004"/>
-	<property name="ireport.x" value="21"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -16,6 +16,7 @@
 	<parameter name="USUARIO" class="java.lang.String"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="FILTROS" class="java.lang.String"/>
+	<parameter name="STATUS" class="java.lang.String"/>
 	<field name="dtvenda" class="java.lang.String"/>
 	<field name="hrvenda" class="java.lang.String"/>
 	<field name="origem" class="java.lang.String"/>
@@ -35,6 +36,7 @@
 	<field name="valorseguro" class="java.math.BigDecimal"/>
 	<field name="valoroutros" class="java.math.BigDecimal"/>
 	<field name="protocolo" class="java.lang.String"/>
+	<field name="numPuntoVenta" class="java.lang.String"/>
 	<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{valortarifa}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
@@ -180,7 +182,7 @@
 				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.origemPV}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{STATUS}.equals("T") ? $R{label.codAgencia} : $R{label.origemPV}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="84e806d9-098f-4a0a-8436-415b4517f1e8" x="501" y="0" width="70" height="15"/>
@@ -320,7 +322,8 @@
 				<textElement>
 					<font size="9"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{locpuntoventa}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{STATUS}.equals("T") ? $F{numPuntoVenta} : $F{locpuntoventa}
+]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="a5e99430-53c7-4a72-b80e-222d65555557" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="500" y="0" width="70" height="15" isPrintWhenDetailOverflows="true"/>

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

@@ -0,0 +1,240 @@
+<?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="RelatorioReceitaServico" columnCount="8" printOrder="Horizontal" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="100" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
+	<property name="ireport.zoom" value="1.7715610000000075"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
+	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
+	<parameter name="DATA_INICIAL" class="java.util.Date"/>
+	<parameter name="DATA_FINAL" class="java.util.Date"/>
+	<parameter name="USUARIO" class="java.lang.String"/>
+	<parameter name="FILTROS" class="java.lang.String"/>
+	<parameter name="ESTADOS_ID" class="java.lang.String"/>
+	<parameter name="inicialAutorizado" class="java.util.Collection"/>
+	<parameter name="finalAutorizado" class="java.lang.Integer"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="estado" class="java.lang.String"/>
+	<field name="numeroBPE" class="java.lang.Integer"/>
+	<field name="serieBPE" class="java.lang.String"/>
+	<field name="finalAutorizado" class="java.lang.Integer"/>
+	<variable name="bilhete_COUNT" class="java.lang.Integer" resetType="Group" resetGroup="estado" calculation="Count">
+		<variableExpression><![CDATA[$F{numeroBPE}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_BILHETES_GERAL" class="java.lang.Integer" incrementType="Group" incrementGroup="estado" calculation="Sum">
+		<variableExpression><![CDATA[$V{bilhete_COUNT}]]></variableExpression>
+		<initialValueExpression><![CDATA[]]></initialValueExpression>
+	</variable>
+	<variable name="inicio" class="java.lang.Integer" resetType="None" incrementType="Group" incrementGroup="estado" calculation="Lowest">
+		<variableExpression><![CDATA[$F{numeroBPE}]]></variableExpression>
+		<initialValueExpression><![CDATA[]]></initialValueExpression>
+	</variable>
+	<variable name="fim" class="java.lang.Integer" incrementType="Group" incrementGroup="estado" calculation="Highest">
+		<variableExpression><![CDATA[$F{numeroBPE}]]></variableExpression>
+		<initialValueExpression><![CDATA[$F{numeroBPE}]]></initialValueExpression>
+	</variable>
+	<group name="estado">
+		<groupExpression><![CDATA[$P{ESTADOS_ID}.equals("") ? null : $F{estado}]]></groupExpression>
+		<groupHeader>
+			<band height="46">
+				<staticText>
+					<reportElement uuid="2abbc372-a813-4da6-8ce1-e5901a15b430" x="0" y="26" width="97" height="20"/>
+					<textElement>
+						<font size="11" isBold="true" isItalic="false"/>
+					</textElement>
+					<text><![CDATA[Número BPE ]]></text>
+				</staticText>
+				<staticText>
+					<reportElement uuid="b3502755-0bd7-4f2a-92da-9b978a6a1f05" x="0" y="0" width="97" height="20"/>
+					<textElement textAlignment="Left">
+						<font size="11" isBold="true" isItalic="false"/>
+					</textElement>
+					<text><![CDATA[Estado:]]></text>
+				</staticText>
+				<textField>
+					<reportElement uuid="6c12b027-87a2-4a76-a291-1874b37595ea" x="97" y="0" width="102" height="20">
+						<printWhenExpression><![CDATA[!$P{ESTADOS_ID}.equals("")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="10" isBold="true" isItalic="false"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{estado}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement uuid="62d2b85b-9b75-453a-8d3d-e90136f0ce98" x="199" y="1" width="62" height="19"/>
+					<textElement textAlignment="Left">
+						<font size="11" isBold="true" isItalic="false"/>
+					</textElement>
+					<text><![CDATA[Série:]]></text>
+				</staticText>
+				<textField>
+					<reportElement uuid="b62df4a9-ba4b-4cb5-b7e8-ec69c20e0189" x="261" y="1" width="87" height="19">
+						<printWhenExpression><![CDATA[!$P{ESTADOS_ID}.equals("")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="11" isBold="true" isItalic="false"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{serieBPE}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement uuid="c804ad70-880e-4aaf-b321-0da2bb917c1a" x="261" y="26" width="87" height="20"/>
+					<textElement/>
+					<textFieldExpression><![CDATA[$V{inicio}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement uuid="c9a2844a-5957-46e0-b08a-8dd909d5dce6" x="199" y="26" width="62" height="20"/>
+					<textElement textAlignment="Left">
+						<font size="11" isBold="true" isItalic="false"/>
+					</textElement>
+					<text><![CDATA[Nº Inicial:]]></text>
+				</staticText>
+				<staticText>
+					<reportElement uuid="1a592966-8259-4762-94e9-d27da948da93" x="348" y="26" width="71" height="20"/>
+					<textElement textAlignment="Left">
+						<font size="11" isBold="true" isItalic="false"/>
+					</textElement>
+					<text><![CDATA[Nº Final:]]></text>
+				</staticText>
+				<textField>
+					<reportElement uuid="1d8c442d-ba8a-419e-9445-25690fcfc14b" x="419" y="26" width="135" height="20" printWhenGroupChanges="estado"/>
+					<textElement/>
+					<textFieldExpression><![CDATA[$F{finalAutorizado}]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="31">
+				<printWhenExpression><![CDATA[!$P{ESTADOS_ID}.equals("")]]></printWhenExpression>
+				<textField>
+					<reportElement uuid="159f0892-ce02-41a2-9c6b-e7b25ce4012a" x="702" y="8" width="100" height="20"/>
+					<textElement textAlignment="Right">
+						<font size="11"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{bilhete_COUNT}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement uuid="e3d729bc-7c1b-4196-ba3c-c2422ba28ead" x="554" y="8" width="148" height="20"/>
+					<textElement>
+						<font size="11" isItalic="false"/>
+					</textElement>
+					<text><![CDATA[Total de Documentos]]></text>
+				</staticText>
+				<line>
+					<reportElement uuid="e46ceea6-b4ea-4951-8a2e-ee9969f84e91" x="0" y="1" width="801" height="1"/>
+				</line>
+				<line>
+					<reportElement uuid="c8484e52-e7f5-41e7-9c15-408458302a2e" x="0" y="28" width="801" height="1"/>
+				</line>
+			</band>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band height="82" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="554" height="42" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="15" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="554" y="0" width="137" height="25"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
+				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="691" y="0" width="111" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="bbf33a72-515f-42fc-8c79-e859aebca31d" x="0" y="59" width="802" height="1"/>
+			</line>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="554" y="25" width="137" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" 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 evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="691" y="25" width="111" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" 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 uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="554" y="42" width="248" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" 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>
+			<line>
+				<reportElement uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf" x="0" y="81" width="802" height="1"/>
+			</line>
+			<textField>
+				<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="59" width="832" height="14"/>
+				<textElement verticalAlignment="Middle">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<detail>
+		<band height="26" splitType="Stretch">
+			<textField>
+				<reportElement uuid="9a639996-146c-42c9-a8fd-f947a59310f4" x="0" y="10" width="97" height="16"/>
+				<textElement>
+					<font size="10" isItalic="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numeroBPE}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<summary>
+		<band height="21" splitType="Stretch">
+			<staticText>
+				<reportElement uuid="8f64fd0a-a820-4ad6-8fc8-cb6d4f8e9831" x="554" y="0" width="148" height="21"/>
+				<textElement>
+					<font size="11" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[Total Geral de Documentos]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="36133c4b-460e-4642-b827-053d0a247a18" x="702" y="0" width="100" height="21"/>
+				<textElement textAlignment="Right">
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_BILHETES_GERAL}]]></textFieldExpression>
+			</textField>
+		</band>
+	</summary>
+	<noData>
+		<band height="50">
+			<textField>
+				<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="0" y="24" width="802" height="26"/>
+				<textElement markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

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

@@ -1,5 +1,5 @@
 <?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="RelatorioHistoricoClientes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="832" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f">
+<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="RelatorioHistoricoClientes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="832" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20">
 	<property name="ireport.zoom" value="1.3310000000000064"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -27,310 +27,307 @@
 	<field name="usuario" class="java.lang.String"/>
 	<field name="codigoPuntoVenta" class="java.lang.String"/>
 	<field name="puntoVenta" class="java.lang.String"/>
+	<field name="descIdentificaUno" class="java.lang.String"/>
+	<field name="descIdentificaDos" class="java.lang.String"/>
 	<title>
 		<band height="79" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
 					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement uuid="2f4f1314-9363-4e6d-822f-c85c1890998b" mode="Transparent" x="811" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="811" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" 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>
+				<textFieldExpression class="java.lang.String"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7" mode="Transparent" x="728" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="728" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
 					<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
-				<reportElement uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442" mode="Transparent" x="728" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="728" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single" 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>
+				<textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="8601bf20-f5f8-4fed-9445-7adfe580d236" mode="Transparent" x="543" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="543" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" lineSpacing="Single" 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>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91" x="543" y="0" width="185" height="25"/>
+				<reportElement x="543" y="0" width="185" height="25"/>
-				<textElement textAlignment="Right">
+				<textElement textAlignment="Right" lineSpacing="Single">
 					<font size="9" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42" x="-1" y="58" width="832" height="1"/>
+				<reportElement x="-1" y="58" width="832" height="1"/>
 			</line>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974" x="-1" y="59" width="833" height="15"/>
+				<reportElement x="-1" y="59" width="833" height="15"/>
-				<textElement verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle" lineSpacing="Single">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{FILTROS}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6" positionType="Float" x="-1" y="78" width="832" height="1"/>
+				<reportElement positionType="Float" x="-1" y="78" width="832" height="1"/>
 			</line>
 		</band>
 	</title>
 	<columnHeader>
 		<band height="15">
 			<textField>
-				<reportElement uuid="b0825447-d75d-48f9-8a73-2d4d027f118e" x="0" y="0" width="48" height="15"/>
+				<reportElement x="0" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.numFidelidade}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.numFidelidade}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="3e3b8c9a-56f4-47fe-808a-d186c11f1545" x="48" y="0" width="63" height="15"/>
+				<reportElement x="48" y="0" width="63" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.cliente}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e2f9b240-4afd-4745-8022-16a2e36539ff" x="111" y="0" width="63" height="15"/>
+				<reportElement x="111" y="0" width="63" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.identificaUno}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.identificaUno}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d6d91a5c-6562-4c03-9116-b1ea126bf8bb" x="174" y="0" width="48" height="15"/>
+				<reportElement x="174" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.identificaDos}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.identificaDos}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2ea05454-8bd5-4900-bb36-17efd61c9548" x="222" y="0" width="48" height="15"/>
+				<reportElement x="222" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.fecNascimento}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.fecNascimento}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="40b973a0-600d-4488-90d2-799b298a346c" x="318" y="0" width="48" height="15"/>
+				<reportElement x="318" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.telefone}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.telefone}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b9acecfc-dc72-4c78-ade8-94796fd90cd5" x="366" y="0" width="48" height="15"/>
+				<reportElement x="366" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.fax}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.fax}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d1408686-f401-45a6-a98b-6b6dd4b8d781" x="462" y="0" width="25" height="15"/>
+				<reportElement x="462" y="0" width="25" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.sexo}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.sexo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e926e191-ca63-461e-8db8-e11fe9ae46bf" x="487" y="0" width="48" height="15"/>
+				<reportElement x="487" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.fecCadastro}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.fecCadastro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f54349c9-1197-48c7-8a56-f6676f0db9ec" x="535" y="0" width="48" height="15"/>
+				<reportElement x="535" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.empresaId}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.empresaId}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f393c224-cf21-44ab-9b44-734ce8b178f2" x="583" y="0" width="60" height="15"/>
+				<reportElement x="583" y="0" width="60" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.codUsuario}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.codUsuario}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="02ab3040-ee0f-4b6a-96c5-30917ca12f08" x="643" y="0" width="60" height="15"/>
+				<reportElement x="643" y="0" width="60" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.usuario}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.usuario}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fe0da755-8bd9-4a08-8e48-60b3dec97f21" x="703" y="0" width="60" height="15"/>
+				<reportElement x="703" y="0" width="60" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.codigoPuntoVenta}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.codigoPuntoVenta}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e430d55f-dfdd-4824-a61b-e1317573519e" x="763" y="0" width="60" height="15"/>
+				<reportElement x="763" y="0" width="60" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.puntoVenta}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.puntoVenta}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="47ddaf82-d85d-45d4-88ce-761794b73d0a" x="414" y="0" width="48" height="15"/>
+				<reportElement x="414" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.email}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.email}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="5b98c030-46f8-4693-a1bf-672c9479a829" x="270" y="0" width="48" height="15"/>
+				<reportElement x="270" y="0" width="48" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.celular}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.celular}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="15" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="c80af5cb-d1c7-4dec-a49c-1e2a710bf74a" stretchType="RelativeToTallestObject" x="0" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{numFidelidade}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{numFidelidade}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="2309bea8-858d-475a-8fe0-692db536e36d" stretchType="RelativeToTallestObject" x="48" y="0" width="63" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="48" y="0" width="63" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{cliente}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{cliente}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="5f00584f-9c75-4025-a898-1da55cc6bb08" stretchType="RelativeToTallestObject" x="111" y="0" width="63" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="111" y="0" width="63" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{identificaUno}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{identificaUno}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="1ae99590-f220-419c-a8d9-1dfe191fc3f1" stretchType="RelativeToTallestObject" x="174" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="174" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{identificaDos}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{identificaDos}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="db24f95f-9f89-4601-9721-54cb262b5082" stretchType="RelativeToTallestObject" x="222" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="222" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{fecNascimento}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{fecNascimento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="183a64b5-9c50-4581-98d8-52d8ece8b1ab" stretchType="RelativeToTallestObject" x="270" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="270" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{celular}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{celular}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="cac8b5f7-dfe4-4893-9994-9dc519097e28" stretchType="RelativeToTallestObject" x="318" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="318" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{telefone}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{telefone}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="1f230ab5-06c7-4c23-b1ed-cc6d8f9118b3" stretchType="RelativeToTallestObject" x="366" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="366" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{fax}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{fax}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="da1adb0f-9e41-4aa4-aaa0-7654af3b29b7" stretchType="RelativeToTallestObject" x="414" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="414" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{email}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{email}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7911217f-c670-41f4-ad8c-95a9ddbeae0a" stretchType="RelativeToTallestObject" x="462" y="0" width="25" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="462" y="0" width="25" height="15"/>
-				<textElement textAlignment="Center">
+				<textElement textAlignment="Center" lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sexo}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{sexo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="d8786ea8-e54d-4c8e-a5f1-fcdb4befb657" stretchType="RelativeToTallestObject" x="487" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="487" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{fecCadastro}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{fecCadastro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="4f3bcc67-62ef-4a0c-a6a0-6d3378718e89" stretchType="RelativeToTallestObject" x="535" y="0" width="48" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="535" y="0" width="48" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{empresaId} == 0 ? "" : $F{empresaId}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{empresaId} == 0 ? "" : $F{empresaId}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="41497ab8-79c3-4f1e-bff0-1f43c02564a7" stretchType="RelativeToTallestObject" x="583" y="0" width="60" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="583" y="0" width="60" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{codUsuario}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{codUsuario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="6f93931e-8444-44de-adce-2b55cc49cbc6" stretchType="RelativeToTallestObject" x="643" y="0" width="60" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="643" y="0" width="60" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{usuario}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{usuario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="8c85e53f-77f6-4d0d-8264-c07e096d3e6b" stretchType="RelativeToTallestObject" x="703" y="0" width="60" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="703" y="0" width="60" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{codigoPuntoVenta}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{codigoPuntoVenta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="48cf7af6-3a32-4ffe-b440-3dd9faad34fd" stretchType="RelativeToTallestObject" x="763" y="0" width="60" height="15"/>
+				<reportElement stretchType="RelativeToTallestObject" x="763" y="0" width="60" height="15"/>
-				<textElement>
+				<textElement lineSpacing="Single">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{puntoVenta}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{puntoVenta}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
 	<noData>
 		<band height="50">
 			<textField>
-				<reportElement uuid="6b9f63c1-76d9-4dd7-8fce-9bc0d91292af" x="0" y="24" width="831" height="26"/>
+				<reportElement x="0" y="24" width="831" height="26"/>
-				<textElement markup="none">
+				<textElement lineSpacing="Single" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>
 	</noData>

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

@@ -1,7 +1,7 @@
 <?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="RelatorioCheckin" pageWidth="675" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="635" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="48d32af4-ba9f-41c2-91a5-5d2fe57e149c">
 	<property name="ireport.zoom" value="1.4641000000000008"/>
-	<property name="ireport.x" value="82"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
@@ -9,6 +9,9 @@
 	<parameter name="CORRIDA_ID" class="java.lang.Long"/>
 	<parameter name="ORIGEN" class="java.lang.String"/>
 	<parameter name="IDS_BILHETEIROS" class="java.lang.String"/>
+	<parameter name="IS_CHECKIN_ABERTO" class="java.lang.Boolean"/>
+	<parameter name="nomb_empresa" class="java.lang.String"/>
+	<parameter name="nombUsuario" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -26,18 +29,74 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="21" splitType="Stretch">
+		<band height="83" splitType="Stretch">
-			<textField pattern="" isBlankWhenNull="false">
+			<line>
-				<reportElement uuid="5ee43799-932b-4ce1-8056-df380a9050a8" mode="Transparent" x="0" y="0" width="338" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement x="0" y="80" width="619" height="1" uuid="b28df970-c219-4853-afeb-6821e0a44f04"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+			</line>
-					<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+			<textField>
-					<paragraph lineSpacing="Single"/>
+				<reportElement mode="Opaque" x="0" y="0" width="476" height="30" backcolor="#D7D7D7" uuid="50c553a9-7292-44df-8b24-24eb14e98841"/>
+				<textElement markup="styled">
+					<font size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
-			<line>
+			<textField>
-				<reportElement uuid="b28df970-c219-4853-afeb-6821e0a44f04" x="0" y="20" width="619" height="1"/>
+				<reportElement x="0" y="31" width="130" height="16" uuid="3cbad5ad-ea6f-4718-b7e5-a98dc6be0188"/>
-			</line>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="130" y="31" width="505" height="16" uuid="6c12f1b5-cae1-4ea9-b674-703d0f3d2bdc"/>
+				<textFieldExpression><![CDATA[($P{DATA_INICIAL} != null ? new java.text.SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL}) : "") +
+" à " +
+($P{DATA_FINAL} != null ? new java.text.SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}) : "")]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="131" y="49" width="504" height="16" isRemoveLineWhenBlank="true" uuid="64d65c79-be80-4596-b84e-e2c3c3ddaa8a"/>
+				<textFieldExpression><![CDATA[$P{nombUsuario}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="49" width="130" height="16" isRemoveLineWhenBlank="true" uuid="cdd0af8e-575e-4afa-b68f-6d0812032d4b"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.usuario}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement mode="Opaque" x="577" y="15" width="29" height="15" backcolor="#D7D7D7" uuid="17fabb43-59cc-4375-86a8-793ff7a67f50"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement mode="Opaque" x="476" y="15" width="62" height="15" backcolor="#D7D7D7" uuid="e0a35762-56d1-4da2-a945-8ae4d5348bb7"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.pagina}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement mode="Opaque" x="538" y="0" width="97" height="15" backcolor="#D7D7D7" uuid="54f55cc3-21cb-482f-a58b-fca885e48517"/>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement mode="Opaque" x="606" y="15" width="29" height="15" backcolor="#D7D7D7" uuid="d0201aca-580e-4359-9503-c579a43dcccd"/>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement mode="Opaque" x="476" y="0" width="62" height="15" backcolor="#D7D7D7" uuid="1ac071ee-3dcd-427a-909f-9d39e40c6708"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement mode="Opaque" x="538" y="15" width="39" height="15" backcolor="#D7D7D7" uuid="fb1a5b0c-1e7e-443e-b0ff-db26c4ed289d"/>
+				<textElement textAlignment="Right"/>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
@@ -45,125 +104,125 @@
 	</pageHeader>
 	<columnHeader>
 		<band height="33" splitType="Stretch">
-			<textField>
+			<textField isBlankWhenNull="false">
-				<reportElement uuid="e4282770-fa67-4c58-a5aa-92e4d6f27166" x="0" y="0" width="100" height="30"/>
+				<reportElement x="0" y="0" width="100" height="30" isRemoveLineWhenBlank="true" uuid="e4282770-fa67-4c58-a5aa-92e4d6f27166"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.voucher}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
-				<reportElement uuid="1e0b20c0-f208-4853-8601-73cec6e1992e" x="100" y="0" width="134" height="30"/>
+				<reportElement x="246" y="0" width="96" height="30" uuid="1e0b20c0-f208-4853-8601-73cec6e1992e"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.origen}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isBlankWhenNull="false">
-				<reportElement uuid="32e830a3-6303-465c-85aa-12678fe6b80a" x="234" y="0" width="39" height="30"/>
+				<reportElement x="100" y="0" width="42" height="30" uuid="32e830a3-6303-465c-85aa-12678fe6b80a"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.servicio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a5ac8565-1ca0-425b-9d25-97d26753e7ec" x="273" y="0" width="55" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement x="342" y="0" width="48" height="30" isPrintWhenDetailOverflows="true" uuid="d937b8b4-5e49-4d0d-a211-42e3d3fb45ba"/>
-				<textElement rotation="None" markup="none">
-					<font isBold="true" isUnderline="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{datail.data.servicio}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="d937b8b4-5e49-4d0d-a211-42e3d3fb45ba" x="328" y="0" width="48" height="30" isPrintWhenDetailOverflows="true"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.data.checkin}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="44e42972-eac1-40e6-ba0e-7c83b208d41b" x="376" y="0" width="115" height="30"/>
+				<reportElement x="390" y="0" width="115" height="30" uuid="44e42972-eac1-40e6-ba0e-7c83b208d41b"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.bilheteiro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29e15a6a-68ff-4f19-832f-ce0d7a7310ae" x="555" y="0" width="64" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement x="569" y="0" width="64" height="30" isPrintWhenDetailOverflows="true" uuid="29e15a6a-68ff-4f19-832f-ce0d7a7310ae"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.data.remarcada}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="acc2f86e-4ee2-4e61-807f-27fd740db652" x="0" y="30" width="619" height="1"/>
+				<reportElement x="0" y="30" width="619" height="1" uuid="acc2f86e-4ee2-4e61-807f-27fd740db652"/>
 			</line>
 			<textField>
-				<reportElement uuid="28a7ce94-e2d1-4a68-a816-185b176ba0a8" x="491" y="0" width="64" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement x="505" y="0" width="64" height="30" isPrintWhenDetailOverflows="true" uuid="28a7ce94-e2d1-4a68-a816-185b176ba0a8"/>
 				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{datail.cveusuario}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="148" y="0" width="89" height="30" isPrintWhenDetailOverflows="true" uuid="a5ac8565-1ca0-425b-9d25-97d26753e7ec"/>
+				<textElement rotation="None" markup="none">
+					<font isBold="true" isUnderline="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{datail.data.servicio}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="23" splitType="Stretch">
-			<textField isBlankWhenNull="true">
+			<textField isBlankWhenNull="false">
-				<reportElement uuid="82b42ca3-255a-4038-9730-35e2f9a1bb0f" x="0" y="0" width="100" height="20"/>
+				<reportElement isPrintRepeatedValues="false" x="0" y="0" width="100" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="82b42ca3-255a-4038-9730-35e2f9a1bb0f"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numFolioSistema}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="c5cc5e04-b1fa-4ebc-b408-3810648fc7eb" x="100" y="0" width="134" height="20"/>
+				<reportElement x="246" y="0" width="96" height="20" uuid="c5cc5e04-b1fa-4ebc-b408-3810648fc7eb"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origen}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isBlankWhenNull="false">
-				<reportElement uuid="d4baaf3d-a171-4b29-8aa8-cef5b56a11b3" x="234" y="0" width="39" height="20"/>
+				<reportElement x="100" y="0" width="42" height="20" uuid="d4baaf3d-a171-4b29-8aa8-cef5b56a11b3"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="acbbd64d-1fbd-4b4f-b7d5-5a11005ae98e" x="273" y="0" width="55" height="20"/>
+				<reportElement x="342" y="0" width="48" height="20" uuid="1ce5d236-a684-450f-8e63-1523f0c7e103"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{feccorrida}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="1ce5d236-a684-450f-8e63-1523f0c7e103" x="328" y="0" width="48" height="20"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dataCancelado}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c" x="376" y="0" width="115" height="20"/>
+				<reportElement x="390" y="0" width="115" height="20" uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombUsuario}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="648d03b0-ee8a-4b2f-af9f-c33c4d01f40e" x="555" y="0" width="64" height="20"/>
+				<reportElement x="569" y="0" width="64" height="20" uuid="648d03b0-ee8a-4b2f-af9f-c33c4d01f40e"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dataRemarcacao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="80c86e43-26cc-428c-b2e5-99d685118a06" x="491" y="0" width="64" height="20"/>
+				<reportElement x="505" y="0" width="64" height="20" uuid="80c86e43-26cc-428c-b2e5-99d685118a06"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cveusuario}]]></textFieldExpression>
 			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="148" y="0" width="89" height="20" uuid="acbbd64d-1fbd-4b4f-b7d5-5a11005ae98e"/>
+				<textElement textAlignment="Left">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{feccorrida}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -178,7 +237,7 @@
 	<noData>
 		<band height="38">
 			<textField>
-				<reportElement uuid="c68d03cd-3b82-4f22-ba2a-6bb344fd3944" x="15" y="11" width="530" height="20"/>
+				<reportElement x="0" y="11" width="530" height="20" uuid="c68d03cd-3b82-4f22-ba2a-6bb344fd3944"/>
 				<textElement markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>

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

@@ -0,0 +1,168 @@
+<?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="RelatorioEncerramentoCheckin" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0e8aff42-5ba8-48ac-9950-da8178561888">
+	<property name="ireport.zoom" value="1.7715610000000017"/>
+	<property name="ireport.x" value="26"/>
+	<property name="ireport.y" value="0"/>
+	<parameter name="TITULO" class="java.lang.String"/>
+	<parameter name="PERIODO_SERVICO" class="java.lang.String"/>
+	<parameter name="PERIODO_ENCERRAMENTO" class="java.lang.String"/>
+	<parameter name="EMPRESA" class="java.lang.String"/>
+	<field name="servico" class="java.lang.Integer"/>
+	<field name="dataServico" class="java.lang.String"/>
+	<field name="localidade" class="java.lang.String"/>
+	<field name="dataEncerramento" class="java.lang.String"/>
+	<field name="usuario" class="java.lang.String"/>
+	<field name="imei" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band height="82" splitType="Stretch">
+			<line>
+				<reportElement x="0" y="76" width="555" height="1" uuid="481b2107-ee62-4815-8a89-8435d34384c8"/>
+			</line>
+			<textField isBlankWhenNull="true">
+				<reportElement x="111" y="40" width="444" height="15" uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2"/>
+				<textElement verticalAlignment="Middle">
+					<font size="9"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{PERIODO_ENCERRAMENTO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement x="0" y="40" width="111" height="15" uuid="46ecd1c0-ef3e-4274-9094-1b2dbed2fc43"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$R{header.periodo.encerramento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="454" y="0" width="44" height="10" uuid="33327397-2913-4d10-a128-6e18a85a33c7"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement x="0" y="56" width="111" height="15" uuid="17a5536e-1cf6-48d8-91ad-53d8148af1d6"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="482" y="14" width="44" height="10" uuid="be33ee08-3388-45c3-a0b0-29f482d37076"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.pagina} + "" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="111" y="56" width="444" height="15" uuid="48f1a994-4bbe-4b8e-948f-81542fa792c3"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="9"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="111" y="24" width="444" height="15" uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="9"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{PERIODO_SERVICO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement x="0" y="0" width="454" height="20" uuid="9bc31956-04ad-43d0-bcee-08f7b5bf1145"/>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement x="0" y="24" width="111" height="15" uuid="4a51f623-fe84-4f71-8bfe-271f36619eb1"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$R{header.periodo.servico}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement x="499" y="0" width="56" height="10" uuid="34f65212-5ae5-4077-b4d8-64d55f0289a9"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="526" y="14" width="29" height="10" uuid="7883d71b-800c-4367-8c86-e8df1c9a8c35"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[" de " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="17" splitType="Stretch">
+			<line>
+				<reportElement x="0" y="14" width="555" height="1" uuid="cd1b96dd-2097-4af7-a025-7962bc5d7bee"/>
+			</line>
+			<textField>
+				<reportElement x="0" y="0" width="86" height="14" uuid="61efe86a-3f69-4010-ad07-57ade030c3c3"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.servico}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="86" y="0" width="94" height="14" uuid="dbf216e4-6896-4a81-8391-6a51b2703155"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.data.servico}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="180" y="0" width="133" height="14" uuid="7812f684-2bdd-4642-84f2-426c0fa9f826"/>
+				<textElement>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.localidade}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="11" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="86" height="10" uuid="6ef05dfb-fea9-451c-a45a-1dc3f766af84"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="7" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="86" y="0" width="94" height="10" uuid="bb3d4047-5bea-4a27-8fbe-0f3ffc8e2c61"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="7" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataServico}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="180" y="0" width="133" height="10" uuid="75f7f9d7-1565-4fb2-81ae-2155c588c756"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="7" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{localidade}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+	<noData>
+		<band height="20">
+			<textField>
+				<reportElement x="0" y="0" width="555" height="20" uuid="6320f11e-df43-4140-8144-55d84dc92ce6"/>
+				<textElement markup="none"/>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.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="RelatorioDepositos" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="65274c35-4f3f-4196-bd84-f042e9ac12ea">
 	<property name="ireport.zoom" value="1.3310000000000006"/>
-	<property name="ireport.x" value="70"/>
+	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="38"/>
+	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -370,7 +370,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{vrpendente}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
 				<reportElement uuid="8b59222e-761c-4aba-9132-638c2b9932a9" stretchType="RelativeToTallestObject" x="485" y="0" width="70" height="17"/>
 				<box>
 					<topPen lineWidth="0.5"/>
@@ -382,6 +382,7 @@
 					<font size="8" isBold="true"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
+				<textFieldExpression><![CDATA[$F{numdeposito}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="4f651cd3-e07f-42d3-ba24-d0c2bcaa3460" stretchType="RelativeToTallestObject" x="0" y="0" width="65" height="17"/>

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

@@ -1,7 +1,7 @@
 <?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="RelatorioVendasComissao" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
 	<property name="ireport.zoom" value="1.0980750000000008"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="34"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="fecInicio" class="java.lang.String"/>
 	<parameter name="fecFinal" class="java.lang.String"/>
@@ -35,15 +35,15 @@
 		</groupHeader>
 		<groupFooter>
 			<band height="22">
-				<textField pattern="¤ #,##0.00">
+				<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
-					<reportElement uuid="d9967577-1a2d-4e8c-afc3-5aa8fa18ae63" x="722" y="0" width="79" height="20"/>
+					<reportElement uuid="d9967577-1a2d-4e8c-afc3-5aa8fa18ae63" stretchType="RelativeToTallestObject" x="660" y="0" width="141" height="20"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{subtotal}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement uuid="8028606d-ad70-4197-b011-d2ade8e44267" x="622" y="0" width="100" height="20"/>
+					<reportElement uuid="8028606d-ad70-4197-b011-d2ade8e44267" x="560" y="0" width="100" height="20"/>
 					<textElement textAlignment="Center">
 						<font isBold="true"/>
 					</textElement>
@@ -256,15 +256,15 @@
 	</pageFooter>
 	<summary>
 		<band height="26" splitType="Stretch">
-			<textField pattern="¤ #,##0.00">
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
-				<reportElement uuid="d9967577-1a2d-4e8c-afc3-5aa8fa18ae63" x="722" y="6" width="79" height="20"/>
+				<reportElement uuid="d9967577-1a2d-4e8c-afc3-5aa8fa18ae63" stretchType="RelativeToTallestObject" x="660" y="6" width="141" height="20"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="8028606d-ad70-4197-b011-d2ade8e44267" x="622" y="6" width="100" height="20"/>
+				<reportElement uuid="8028606d-ad70-4197-b011-d2ade8e44267" x="560" y="6" width="100" height="20"/>
 				<textElement textAlignment="Center">
 					<font isBold="true"/>
 				</textElement>

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

@@ -112,7 +112,11 @@
 			<textField>
 				<reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="82" y="37" width="695" height="20"/>
 				<textElement/>
-				<textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression>
+				<textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) :
+  (
+    $P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : ""
+  )
+)]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="31b4831f-a97b-44a1-a30f-ba93c667fa81" x="82" y="57" width="695" height="20" isRemoveLineWhenBlank="true"/>
@@ -279,7 +283,7 @@
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
 				<reportElement uuid="82cfcbd9-ad4a-47e8-a166-e0a48c207387" stretchType="RelativeToTallestObject" x="319" y="0" width="82" height="16" isPrintWhenDetailOverflows="true"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>
@@ -319,7 +323,7 @@
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{descOrigem}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="HH:mm" isBlankWhenNull="true">
 				<reportElement uuid="ab7a3319-6e43-4ed9-bb0e-114f3d072da8" stretchType="RelativeToTallestObject" x="401" y="0" width="82" height="16" isPrintWhenDetailOverflows="true"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>

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

@@ -1051,7 +1051,7 @@
 				<textElement textAlignment="Right">
 					<font size="6"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{segOpc}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement uuid="8eb7e8a7-3443-4fcf-b10a-b135bf78b3f5" stretchType="RelativeToTallestObject" x="404" y="0" width="15" height="10" isPrintWhenDetailOverflows="true"/>
@@ -1093,7 +1093,7 @@
 				<textElement textAlignment="Right">
 					<font size="6"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{segOpc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="afdc1c7a-72f8-4992-b747-97e4744034a1" stretchType="RelativeToTallestObject" x="145" y="0" width="30" height="10" isPrintWhenDetailOverflows="true"/>

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

@@ -0,0 +1,267 @@
+<?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="relatorioFormaPagamentoAgencia" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
+	<property name="ireport.zoom" value="6.1159090448414934"/>
+	<property name="ireport.x" value="3899"/>
+	<property name="ireport.y" value="102"/>
+	<parameter name="DATA_INICIAL" class="java.util.Date"/>
+	<parameter name="DATA_FINAL" class="java.util.Date"/>
+	<parameter name="NOME_USUARIO" class="java.lang.String"/>
+	<parameter name="USUARIO_ID" class="java.lang.String"/>
+	<queryString language="SQL">
+		<![CDATA[]]>
+	</queryString>
+	<field name="dataAlteracao" class="java.util.Date"/>
+	<field name="idAuditado" class="java.lang.String"/>
+	<field name="empresa" class="java.lang.String"/>
+	<field name="usuario" class="java.lang.String"/>
+	<field name="tipoAlteracao" class="java.lang.String"/>
+	<field name="tela" class="java.lang.String"/>
+	<field name="campoAlterado" class="java.lang.String"/>
+	<field name="valorAtual" class="java.lang.String"/>
+	<field name="valorAnterior" class="java.lang.String"/>
+	<field name="classeAlterada" class="java.lang.String"/>
+	<field name="classePrincipal" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band height="41">
+			<textField>
+				<reportElement uuid="3152d9c0-592e-4136-b3d8-2a674e779468" mode="Opaque" x="0" y="20" width="94" height="20" backcolor="#CCCCCC"/>
+				<textElement markup="none">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{PERIODO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="50b8071e-9e65-49d2-bd12-b9354502caf3" mode="Opaque" x="0" y="0" width="561" height="20" backcolor="#CCCCCC"/>
+				<textElement markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{TITULO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" mode="Opaque" x="94" y="20" width="128" height="20" backcolor="#CCCCCC"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" mode="Opaque" x="222" y="20" width="339" height="20" backcolor="#CCCCCC"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="7e62b5c0-9626-4774-b650-1dc0906be19d" x="1" y="40" width="801" height="1"/>
+			</line>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement uuid="eeee2daa-07e2-427c-9b9a-9fdb48f7a4ea" mode="Opaque" x="640" y="0" width="162" height="20" backcolor="#CDCDCD"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="dd78670d-f524-42f3-b915-eec9faf69a27" mode="Opaque" x="561" y="20" width="139" height="20" backcolor="#CDCDCD"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="d7f6f595-b82b-4a05-9433-9313538db864" mode="Opaque" x="700" y="20" width="102" height="20" backcolor="#CDCDCD"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{USUARIO_ID}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="d219b329-181b-4ef6-b4f6-b624acb75988" mode="Opaque" x="561" y="0" width="79" height="20" backcolor="#CDCDCD"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="29">
+			<textField>
+				<reportElement uuid="333a50a8-5d67-42b5-b3c6-2d70ceabfe25" x="0" y="0" width="94" height="28"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{DATA_ALTERACAO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="94" y="0" width="51" height="28"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{ID_AUDITADO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="145" y="0" width="77" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{EMPRESA}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="222" y="0" width="55" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{USUARIO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="277" y="0" width="77" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{TIPO_ALTERACAO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="354" y="0" width="70" height="28"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{TELA}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="be9f28a6-e16c-49af-a1ae-a806a4a835d8" x="501" y="0" width="60" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{VALOR_ATUAL}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="218e15c9-18bd-4ec5-9ff1-36b5e016569e" x="561" y="0" width="79" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{VALOR_ANTERIOR}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="33fdc3c8-28af-450b-9afb-bffbe50ff8b8" x="1" y="28" width="801" height="1"/>
+			</line>
+			<textField>
+				<reportElement uuid="478182fa-9c5c-4e61-8719-e4b056b80585" x="640" y="0" width="60" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{CLASSE_ALTERADA}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="fd782db0-7497-4596-8ace-8adbd28b895a" x="424" y="0" width="77" height="28"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{CAMPO_ALTERADO}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="b34da1e3-7c52-4ae7-88a4-503b181eeb79" x="700" y="0" width="102" height="28"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{CLASSE_PRINCIPAL}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="37" splitType="Stretch">
+			<textField pattern="dd/MM/yyyy HH.mm" isBlankWhenNull="true">
+				<reportElement uuid="66455995-be07-4062-8234-ade8ccfd79c0" x="1" y="0" width="93" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataAlteracao}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="151a46f2-5c54-4a0e-91c2-a49986a08cff" x="145" y="0" width="77" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab" x="94" y="0" width="51" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{idAuditado}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="d2f490c1-e807-4243-a3e0-b86229a83c6b" x="222" y="0" width="55" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{usuario}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="dcb305f9-8649-4440-a485-4ada6876b066" x="561" y="0" width="79" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorAnterior}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="acacd737-9c59-4893-ac3a-ab43c1909a69" x="640" y="0" width="60" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{classeAlterada}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="a3119d26-2d10-40c5-98dc-bf0f6be3fc25" x="277" y="0" width="77" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tipoAlteracao}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="ccad4f84-243a-47cf-904a-15c4ba7feee4" x="354" y="0" width="70" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tela}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="48f4dece-76dc-4445-89f3-73c0537c8bf9" x="424" y="0" width="77" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{campoAlterado}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="d098d054-0eef-474a-91d3-c7ea9090ab74" x="501" y="0" width="60" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorAtual}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="182eb372-ed63-41a3-bf16-bfe1c4a97cd7" x="700" y="0" width="102" height="37" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{classePrincipal}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band/>
+	</columnFooter>
+	<lastPageFooter>
+		<band/>
+	</lastPageFooter>
+	<summary>
+		<band height="50">
+			<line>
+				<reportElement uuid="29cf051d-d1b2-4744-932b-9e8adb6b254d" x="1" y="0" width="801" height="1"/>
+			</line>
+		</band>
+	</summary>
+	<noData>
+		<band height="45">
+			<textField>
+				<reportElement uuid="6c28de84-ceae-409b-bde5-04f66cb9a805" x="1" y="12" width="801" height="20"/>
+				<textElement markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

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

@@ -19,7 +19,7 @@
 		<![CDATA[select cj.numseriepreimpresa, nvl(cj.empresacorrida_id, ma.marca_id) empresacorrida_id,
        em.nombempresa, es.cveestado, cj.numfoliosistema, cj.fechorventa, cj.feccorrida,
        cj.preciopagado
-  from caja cj,
+  from boleto cj,
        empresa em,
        punto_venta pv,
        parada pa,
@@ -34,9 +34,11 @@
    and pa.ciudad_id = ci.ciudad_id
    and ci.estado_id = es.estado_id
    and nvl(cj.empresacorrida_id, ma.empresa_id) = $P{EMPRESA_ID}
+   and cj.indcancelacion = 0 
+   and cj.motivocancelacion_id is null
    $P!{LS_CATEGORIA}
    and trunc(cj.fechorventa) between trunc($P{DATA_INICIO}) and trunc($P{DATA_FINAL})
-   and ((cj.feccorrida is null) or ($P{PASSAGEM_ABERTA} = 'T'))
+   $P!{PASSAGEM_ABERTA}
  order by em.nombempresa, es.cveestado, cj.fechorventa]]>
 	</queryString>
 	<field name="NUMSERIEPREIMPRESA" class="java.lang.String"/>

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.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="RelatorioReceitaServico" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
 	<property name="ireport.zoom" value="1.2100000000000002"/>
-	<property name="ireport.x" value="594"/>
+	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="146"/>
+	<property name="ireport.y" value="70"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
@@ -36,10 +36,10 @@
 	<variable name="TOTAL_TARIFA" class="java.math.BigDecimal" resetType="Group" resetGroup="data" calculation="Sum">
 		<variableExpression><![CDATA[$F{tarifa}]]></variableExpression>
 	</variable>
-	<variable name="TOTAL_TUT" class="java.math.BigDecimal" calculation="Sum">
+	<variable name="TOTAL_TUT" class="java.math.BigDecimal" resetType="Group" resetGroup="data" calculation="Sum">
 		<variableExpression><![CDATA[$F{tut}]]></variableExpression>
 	</variable>
-	<variable name="TOTAL_PEDAGIO" class="java.math.BigDecimal" calculation="Sum">
+	<variable name="TOTAL_PEDAGIO" class="java.math.BigDecimal" resetType="Group" resetGroup="data" calculation="Sum">
 		<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="bilhete_COUNT" class="java.lang.Integer" resetType="Group" resetGroup="data" calculation="Count">

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

@@ -2,7 +2,7 @@
 <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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="3.138428376721017"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="374"/>
+	<property name="ireport.y" value="250"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -39,13 +39,14 @@
 	<queryString>
 		<![CDATA[SELECT SUB.*,
        (NVL(SUB.PASSAGEIROS,0) / DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0))) AS PASSAGEIROS_MPA,
-       ( ROUND(NVL(SUB.PASSAGEIROS_EQUIVALENTE,0), 2) / DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0))) AS PASSAGEIROS_MPE,
+       ( ROUND(NVL(SUB.PASSAGEIROS,0), 2) / DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0))) AS PASSAGEIROS_MPE,
        (NVL(SUB.RECEITA_TOTAL,0) / DECODE(NVL(SUB.KM_RODADO,0), 0, 1, NVL(SUB.KM_RODADO,0))) RECEITA_KM,
        (NVL(SUB.RECEITA_TOTAL,0) / DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0))) AS RECEITA_VIAGEM,
-       ROUND(((NVL(SUB.RECEITA_TOTAL,0) / DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0))) / DECODE(NVL(SUB.TARIFA,0), 0, 1, NVL(SUB.TARIFA,0))), 2) AS EQ,
+       ROUND(((NVL(RECEITA_TARIFA,0) / DECODE(NVL(RECEITA_TARIFA,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0))) / DECODE(NVL(SUB.TARIFA,0), 0, 1, NVL(SUB.TARIFA,0))), 2) AS EQ,
-       (ROUND(NVL(SUB.PASSAGEIROS_EQUIVALENTE,0), 2) * NVL(SUB.EXTENSAO_KM,0)) AS PAX_KM,
+       --(ROUND(NVL(SUB.PASSAGEIROS,0), 2) * NVL(SUB.EXTENSAO_KM,0)) AS PAX_KM,
        (NVL(SUB.ASSENTOS,0) * NVL(SUB.KM_RODADO,0)) AS PAX_OFERTADO,
-       ((ROUND(NVL(SUB.PASSAGEIROS_EQUIVALENTE,0), 2) * NVL(SUB.EXTENSAO_KM,0)) / (NVL(SUB.ASSENTOS,0) * NVL(SUB.KM_RODADO,0))) * 100 AS IAP
+       ((((SUB.PAX_KM) / (NVL(SUB.ASSENTOS,0) * NVL(SUB.KM_RODADO,0)))) * 100) AS IAP
+       --(((ROUND(NVL(SUB.PASSAGEIROS_EQUIVALENTE,0), 2) * NVL(SUB.EXTENSAO_KM,0)) / (NVL(SUB.ASSENTOS,0) * NVL(SUB.KM_RODADO,0)) ) * 100) AS IAP
 
 FROM (
 
@@ -55,12 +56,16 @@ SUM(NVL(TAB.RECEITA_SEGURO,0)) AS RECEITA_SEGURO, SUM(NVL(TAB.RECEITA_BAGAGEM,0)
 SUM(NVL(TAB.RECEITA_SEGURO_OUTROS,0)) AS RECEITA_SEGURO_OUTROS, SUM(NVL(TAB.RECEITA_TARIFA,0)) AS RECEITA_TARIFA,
 SUM(NVL(TAB.RECEITA_PEDAGIO,0)) AS RECEITA_PEDAGIO, SUM(NVL(TAB.RECEITA_EMBARQUE,0)) AS RECEITA_EMBARQUE, SUM(NVL(TAB.PASSAGEIROS,0)) AS PASSAGEIROS,
 SUM(NVL(TAB.VIAGENS_EXTRA,0)) AS VIAGENS_EXTRA, SUM(NVL(TAB.VIAGENS,0)) AS VIAGENS, SUM(NVL(TAB.RECEITA_TOTAL,0)) AS RECEITA_TOTAL,
-SUM(NVL(TAB.VIAGENS_TOTAL,0)) AS VIAGENS_TOTAL, SUM(NVL(TAB.KM_RODADO,0)) AS KM_RODADO, SUM(NVL(TAB.PASSAGEIROS_EQUIVALENTE,0)) AS PASSAGEIROS_EQUIVALENTE
+SUM(NVL(TAB.VIAGENS_TOTAL,0)) AS VIAGENS_TOTAL, SUM(NVL(TAB.KM_RODADO,0)) AS KM_RODADO, SUM(NVL(TAB.PASSAGEIROS,0)) AS PASSAGEIROS_EQUIVALENTE,
+SUM(NVL(TAB.PAX_KM,0)) AS PAX_KM
 
 FROM (SELECT TAB1.*,
                (TAB1.RECEITA_TARIFA + RECEITA_SEGURO + RECEITA_EMBARQUE + RECEITA_PEDAGIO) RECEITA_TOTAL,
                (NVL(TAB1.VIAGENS,0) + NVL(TAB1.VIAGENS_EXTRA,0)) VIAGENS_TOTAL,
                ((NVL(TAB1.VIAGENS,0) + NVL(TAB1.VIAGENS_EXTRA,0)) * NVL(TAB1.EXTENSAO_KM,0)) KM_RODADO,
+
+               TAB1.KM_REAL PAX_KM,
+
                (SELECT SUM(NVL(PE.EQUIVALENTE,0))
                   FROM (SELECT CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, ROUND((BO.NUMKMVIAJE * COUNT(1) /
 				(SELECT SUM(NVL(TR.CANTKMREAL,0)) FROM RUTA_COMBINACION RS, TRAMO TR WHERE RS.RUTA_ID = CO.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID)), 2) EQUIVALENTE
@@ -71,8 +76,9 @@ FROM (SELECT TAB1.*,
                            AND (BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0)
                          GROUP BY CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, BO.NUMKMVIAJE) PE
                  WHERE PE.FECCORRIDA = TAB1.FECCORRIDA AND PE.RUTA_ID = TAB1.RUTA_ID) PASSAGEIROS_EQUIVALENTE
+
           FROM (SELECT RT.RUTA_ID,
-		  RT.INDSENTIDOIDA,
+                       RT.INDSENTIDOIDA,
                        RT.NUMRUTA,
                        CR.FECCORRIDA,
                        CONCAT(RT.DESCRUTA, CASE WHEN RT.INDSENTIDOIDA = 0 THEN ' - VOLTA' ELSE ' - IDA' END) DESCRUTA,
@@ -80,8 +86,14 @@ FROM (SELECT TAB1.*,
                        DA.CANTASIENTOS ASSENTOS,
                        RO.ROLOPERATIVO_ID,
                        CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 'S' ELSE 'N' END INTERESTADUAL,
-                       NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA,
+                       NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA,
-                       (SELECT SUM(NVL(RS.KMORIGINAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM,
+
+                       --(SELECT SUM(NVL(RS.KMORIGINAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM,
+                       TR.CANTKMREAL AS EXTENSAO_KM,
+
+                       SUM(NVL(BL.NUMKMVIAJE,0))  KM_REAL,
+
+
                        NVL(SUM(NVL(BL.IMPORTESEGURO,0)), 0) RECEITA_SEGURO,
                        0 RECEITA_BAGAGEM,
                        0 RECEITA_SEGURO_OUTROS,
@@ -110,7 +122,7 @@ FROM (SELECT TAB1.*,
                    AND CS.CLASESERVICIO_ID = RT.CLASESERVICIO_ID
                    AND CR.FECCORRIDA = BL.FECCORRIDA
 				   AND CR.RUTA_ID = NVL($P{RUTA_ID}, CR.RUTA_ID)
-                   AND DECODE($P{GRUPORUTA_ID}, NULL, 1, RT.GRUPORUTA_ID) = DECODE($P{GRUPORUTA_ID}, NULL, 1, $P{GRUPORUTA_ID})
+				   AND DECODE($P{GRUPORUTA_ID}, NULL, 1, RT.GRUPORUTA_ID) = DECODE($P{GRUPORUTA_ID}, NULL, 1, $P{GRUPORUTA_ID})
                    AND CR.CORRIDA_ID = BL.CORRIDA_ID
                    AND CR.EMPRESACORRIDA_ID = $P{EMPRESA_ID}
                    AND CR.ORIGEN_ID = PO.PARADA_ID
@@ -132,9 +144,11 @@ FROM (SELECT TAB1.*,
                    AND BL.INDSTATUSOPERACION = 'F'
                    AND TF.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID
                    AND VT.ACTIVO = 1
+                   AND BL.CATEGORIA_ID NOT IN (3)
                    AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA
                    AND CR.FECCORRIDA BETWEEN $P{DATA_INICIAL} AND $P{DATA_FINAL}
                    AND CR.ACTIVO = 1
+                  AND BL.ACTIVO = 1
                  GROUP BY CS.CVECLASE,
                           RT.RUTA_ID,
                           RT.NUMRUTA,
@@ -146,7 +160,15 @@ FROM (SELECT TAB1.*,
                           GR.DESCGRUPO,
                           CO.ESTADO_ID,
                           CD.ESTADO_ID,
-		     RT.INDSENTIDOIDA) TAB1) TAB
+                          TR.CANTKMREAL,
+		     RT.INDSENTIDOIDA) TAB1
+     GROUP BY TAB1.RUTA_ID,TAB1.INDSENTIDOIDA,TAB1.NUMRUTA,TAB1.FECCORRIDA,TAB1.DESCRUTA,
+             TAB1.TARIFA,TAB1.ASSENTOS,TAB1.ROLOPERATIVO_ID,TAB1.INTERESTADUAL,
+             TAB1.GRUPO_LINHA,TAB1.EXTENSAO_KM,TAB1.RECEITA_SEGURO,TAB1.RECEITA_BAGAGEM,
+             TAB1.RECEITA_SEGURO_OUTROS,TAB1.RECEITA_TARIFA,TAB1.RECEITA_PEDAGIO,TAB1.RECEITA_EMBARQUE,
+             TAB1.PASSAGEIROS,TAB1.VIAGENS_EXTRA,TAB1.VIAGENS,TAB1.CVE_CLASE_SERVICIO, TAB1.KM_REAL
+
+             ) TAB
 GROUP BY TAB.RUTA_ID, TAB.NUMRUTA, TAB.DESCRUTA, TAB.TARIFA, TAB.ASSENTOS, TAB.ROLOPERATIVO_ID,
 TAB.INTERESTADUAL, TAB.GRUPO_LINHA, TAB.EXTENSAO_KM, TAB.CVE_CLASE_SERVICIO, TAB.INDSENTIDOIDA) SUB
 WHERE

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

@@ -0,0 +1,268 @@
+<?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="RelatorioVendasCartoesAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativoAlternativo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
+	<property name="ireport.zoom" value="4.177248169415656"/>
+	<property name="ireport.x" value="2573"/>
+	<property name="ireport.y" value="78"/>
+	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
+	<parameter name="DATA_INICIAL" class="java.lang.String">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DATA_FINAL" class="java.lang.String"/>
+	<parameter name="LINHA_FILTRO" class="java.lang.String"/>
+	<parameter name="SERVICO_FILTRO" class="java.lang.String"/>
+	<parameter name="TOTAL_PASSAGENS" class="java.math.BigDecimal"/>
+	<parameter name="DESCGRUPO" class="java.lang.String"/>
+	<parameter name="NOME_EMPRESA" class="java.lang.String"/>
+	<parameter name="ESTACAO" class="java.lang.String"/>
+	<parameter name="NOME_USUARIO" class="java.lang.String"/>
+	<parameter name="NOME_AGENCIA" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="valorTotal" class="java.math.BigDecimal"/>
+	<field name="descPagamento" class="java.lang.String"/>
+	<field name="dataOperacao" class="java.util.Date"/>
+	<field name="autorizacao" class="java.lang.String"/>
+	<field name="qtdParcelas" class="java.lang.Integer"/>
+	<field name="dataVenda" class="java.util.Date"/>
+	<field name="valor" class="java.math.BigDecimal"/>
+	<variable name="total_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorTotal}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valor}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_TIPO_CARTAO" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
+		<variableExpression><![CDATA[$F{valor}]]></variableExpression>
+	</variable>
+	<group name="groupRuta">
+		<groupExpression><![CDATA[$F{descPagamento}]]></groupExpression>
+		<groupHeader>
+			<band height="19">
+				<textField isBlankWhenNull="true">
+					<reportElement x="0" y="0" width="179" height="16" uuid="f1171f5c-2175-4176-82b0-c1a31f78f1d3"/>
+					<textElement>
+						<font size="12" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{descPagamento}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="0" y="0" width="803" height="1" uuid="b6bdef50-f793-4c23-b188-505c0fb7bf18"/>
+				</line>
+				<line>
+					<reportElement x="0" y="15" width="802" height="1" uuid="6e1204b5-dc16-40df-b592-9046e0b31a14"/>
+				</line>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="25">
+				<line>
+					<reportElement positionType="Float" x="0" y="0" width="803" height="1" uuid="8dd18564-6d32-4232-a0fd-f39054849109"/>
+				</line>
+				<textField>
+					<reportElement x="0" y="1" width="218" height="23" uuid="a7c33cf2-944b-4bd1-bb55-72ab698cc599"/>
+					<textElement>
+						<font size="12" isBold="true" isItalic="false"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{descPagamento}.equals("CRÉDITO") ? $R{total.credito} : $R{total.debito}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
+					<reportElement x="349" y="1" width="38" height="10" uuid="27802809-5617-44e5-a89b-cc64e8bde961"/>
+					<textElement textAlignment="Right">
+						<font size="10"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{total_group}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement x="648" y="1" width="132" height="23" uuid="b3279060-d361-41c6-bc5c-a02d9d08774c"/>
+					<textElement textAlignment="Right">
+						<font size="10"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{TOTAL_TIPO_CARTAO}]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band height="110" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="20" width="349" height="20" uuid="2523431f-2c2c-4a2b-a34f-785b8ea8f9dd"/>
+				<textElement textAlignment="Center">
+					<font size="15"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.titulo.relatorio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="40" width="112" height="20" uuid="9bb1d24c-1a5c-4281-b900-d35779e00807"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="648" y="0" width="56" height="20" uuid="77235663-6b8a-411f-89be-24b315b65adb"/>
+				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="704" y="20" width="52" height="20" uuid="cf1bcbcf-84b8-4d90-bbc7-22d9c7186952"/>
+				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement x="704" y="0" width="98" height="20" uuid="efdae9bf-3550-4620-acd0-20c9c7b0e3b1"/>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="756" y="20" width="24" height="20" uuid="4070d457-cdcc-434e-8e50-5494a05815f9"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="780" y="20" width="22" height="20" uuid="26156964-8733-4ad1-96fd-2ae8414636b7"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="60" width="802" height="1" uuid="27a77abc-db13-4836-9261-8208f3825802"/>
+			</line>
+			<textField>
+				<reportElement x="0" y="61" width="780" height="20" uuid="06a43567-1fd2-4c86-a0cc-443618ddf965"/>
+				<textElement>
+					<font size="11"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.filtro} + $R{header.filtro.empresa} +  "   ( " + $P{NOME_EMPRESA} + " )  " + $R{header.filtro.agencia} +  "   ( " + $P{NOME_AGENCIA} + " )  " + $R{header.filtro.estacao}  +  "   ( " + $P{ESTACAO} + " )  "+ $R{header.filtro.bilheteiro}  +  "   ( " + $P{NOME_USUARIO} + " )  "]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="85" width="803" height="1" uuid="48a39edc-ed2a-40cb-8bfb-6e97bcb9088a"/>
+			</line>
+			<textField>
+				<reportElement x="0" y="86" width="179" height="23" uuid="c0f124b2-3691-4f49-9b86-69d76f249584"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.dataOperacao}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="179" y="86" width="170" height="23" uuid="5faeb20b-f423-4bfa-bb2e-1f4f4aed6627"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.autorizacao}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="349" y="86" width="131" height="23" uuid="824877eb-7028-4256-9503-7045d7eaee3c"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtdParcelas}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="480" y="86" width="168" height="23" uuid="b9d303b2-5ea9-4cf0-845b-142089ac8f4d"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="480" y="86" width="300" height="23" uuid="c5d483c4-89a2-4724-ad57-731676551f0f"/>
+				<textElement textAlignment="Right" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="112" y="40" width="237" height="20" uuid="cb391edc-e0b3-4fbb-a58f-f26191bc1c16"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL} + "  a  " + $P{DATA_FINAL}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="648" y="0" width="132" height="15" uuid="80a57c70-9f34-49b9-86f9-14bb27c462ca"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valor}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="480" y="0" width="168" height="15" uuid="70f7c504-926b-4c12-ae8a-5c7fe4a9e45f"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="0" y="0" width="179" height="15" uuid="ec2db54b-37be-4aba-95a3-d2e3067ee3e5"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataOperacao}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement x="179" y="1" width="170" height="14" uuid="9e67df94-d0f8-4a04-86c0-4862a331d448"/>
+				<textElement textAlignment="Center">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{autorizacao}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement x="349" y="1" width="131" height="14" uuid="e2737ee4-a6ee-4f1f-9a57-974c926a5d0d"/>
+				<textElement textAlignment="Center">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{qtdParcelas}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<lastPageFooter>
+		<band/>
+	</lastPageFooter>
+	<summary>
+		<band height="22" splitType="Stretch">
+			<textField>
+				<reportElement x="0" y="1" width="112" height="21" uuid="6813f5a3-1810-4b53-82ea-3df08df9548f"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{group.total}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement positionType="Float" x="0" y="0" width="803" height="1" uuid="d9792af6-b583-4b6e-bb69-7edd7f78fdfa"/>
+			</line>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="648" y="1" width="132" height="21" uuid="7ef31b82-e8a2-4baa-821a-174d5ca113fe"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL}]]></textFieldExpression>
+			</textField>
+		</band>
+	</summary>
+	<noData>
+		<band height="20">
+			<textField>
+				<reportElement x="0" y="0" width="780" height="20" uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2"/>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

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

@@ -1,5 +1,5 @@
 <?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="Relatório Vendas Conexão por Linha" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<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="Relatório Vendas Conexão por Linha" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="78272a24-3862-4ccd-8519-ba449601ff69">
 	<property name="ireport.zoom" value="3.536921536500051"/>
 	<property name="ireport.x" value="818"/>
 	<property name="ireport.y" value="119"/>
@@ -18,8 +18,8 @@
 	<field name="bilhete" class="java.lang.String"/>
 	<field name="descricaoLinha" class="java.lang.String"/>
 	<field name="servico" class="java.lang.Integer"/>
-	<field name="codOrigem" class="java.lang.Integer"/>
+	<field name="codOrigem" class="java.lang.String"/>
-	<field name="codDestino" class="java.lang.Integer"/>
+	<field name="codDestino" class="java.lang.String"/>
 	<field name="descricaoOrigem" class="java.lang.String"/>
 	<field name="descricaoDestino" class="java.lang.String"/>
 	<field name="nomeAgencia" class="java.lang.String"/>
@@ -46,404 +46,460 @@
 	<title>
 		<band height="32">
 			<textField>
-				<reportElement x="0" y="0" width="802" height="32"/>
+				<reportElement uuid="cf19e107-c7c8-410c-8957-a0bd2259aa5c" x="0" y="0" width="802" height="32"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="18" isBold="true"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
 			</textField>
 		</band>
 	</title>
 	<pageHeader>
 		<band height="78">
 			<textField>
-				<reportElement x="212" y="27" width="91" height="31"/>
+				<reportElement uuid="5348885a-127d-42ee-9a31-9863ef4636ce" x="212" y="27" width="91" height="31"/>
-				<textElement lineSpacing="Single">
+				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataFinal}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.dataFinal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="27" width="70" height="31"/>
+				<reportElement uuid="4a051fb1-93b0-4129-8825-a217996f8467" x="0" y="27" width="70" height="31"/>
-				<textElement lineSpacing="Single">
+				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataInicial}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.dataInicial}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement x="303" y="27" width="163" height="31" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="1003c077-29f1-4666-9991-9703c0c6fe80" x="303" y="27" width="163" height="31" isPrintWhenDetailOverflows="true"/>
-				<textElement lineSpacing="Single">
+				<textElement>
 					<font size="10" isBold="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement x="70" y="27" width="72" height="31" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="50ae4da3-cc23-4f79-82de-9db43e1e521a" x="70" y="27" width="72" height="31" isPrintWhenDetailOverflows="true"/>
-				<textElement lineSpacing="Single">
+				<textElement>
 					<font size="10" isBold="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="212" y="0" width="360" height="27" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="b20e7461-2711-4ecb-a4e2-c276235b70a2" mode="Transparent" x="212" y="0" width="360" height="27" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="572" y="0" width="98" height="27"/>
+				<reportElement uuid="647dbc53-46b2-401c-b6cb-72468aa7b911" x="572" y="0" width="98" height="27"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" lineSpacing="Single">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="670" y="0" width="132" height="27" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="e7aa48d9-edf1-4ada-bf6d-5bc938ca91bc" mode="Transparent" x="670" y="0" width="132" height="27" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="378" y="58" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="45658d2d-7ea3-42a1-861f-18eb057f9515" mode="Transparent" x="378" y="58" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataEmbarque}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.dataEmbarque}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="0" y="58" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="e3a2d72f-4054-481b-86f6-6377cde2259e" mode="Transparent" x="0" y="58" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.bilhete}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.bilhete}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="466" y="58" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="31be8f80-62ab-4370-a062-1d8b77af1089" mode="Transparent" x="466" y="58" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.preco}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.preco}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="485" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="5db3bf2d-d0fa-4a5c-87db-94c7e4326bcb" mode="Transparent" x="485" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.taxaEmbarque}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.taxaEmbarque}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="240" y="58" width="63" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="7c8dff95-9ccb-4c5c-ba6c-16bd6f5a9b55" mode="Transparent" x="240" y="58" width="63" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.descricaoLinha}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.descricaoLinha}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="70" y="58" width="72" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="93e5cfbb-551d-4a54-99f0-cf91cae4d056" mode="Transparent" x="70" y="58" width="72" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.origem}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="142" y="58" width="70" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="16298758-b85f-4b74-8672-9aa13081e942" mode="Transparent" x="142" y="58" width="70" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.destino}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="444" y="58" width="22" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="a883d3e2-6144-4fbe-bffb-0f73261e02c2" mode="Transparent" x="444" y="58" width="22" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<textElement verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.poltrona}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.poltrona}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="50" y="58" width="20" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="4c27a765-48a7-40a4-8312-d0b9a4f9fa79" mode="Transparent" x="50" y="58" width="20" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.bpe}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.bpe}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="212" y="58" width="28" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="79cccbb0-46c2-4103-a53a-fc7e57c5b583" mode="Transparent" x="212" y="58" width="28" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.numLinha}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.numLinha}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="303" y="58" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="3853e99e-fb91-42a3-8cd0-eaf9d604155c" mode="Transparent" x="303" y="58" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.servico}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.servico}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="335" y="58" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f1388ba9-1ac4-4727-a796-951d1def564f" mode="Transparent" x="335" y="58" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.classeServico}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.classeServico}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="414" y="58" width="30" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="b49c407d-5c18-4517-8f42-2cd7214cf45d" mode="Transparent" x="414" y="58" width="30" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataVenda}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="514" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="533f3beb-7b77-4f10-8313-07692539e8b7" mode="Transparent" x="514" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.pedagio}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.pedagio}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="543" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="65f377c5-8d25-42da-aa80-ebcbd3011584" mode="Transparent" x="543" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.seguro}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.seguro}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="601" y="58" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="33664a4d-d451-4dc9-9322-4011c52558ce" mode="Transparent" x="601" y="58" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.numeroAgencia}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.numeroAgencia}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="627" y="58" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="9c103dba-be47-4d86-aeac-5de1f8ec5d50" mode="Transparent" x="627" y="58" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.nomeAgencia}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.nomeAgencia}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="670" y="58" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="38303905-fb7f-4e84-b9f1-bd6c489bf496" mode="Transparent" x="670" y="58" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.cveusuario}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.cveusuario}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="25" y="58" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="a0d17f3d-0143-4f1c-b94b-0f8144fbc316" mode="Transparent" x="25" y="58" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.subSerie}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.subSerie}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="696" y="58" width="38" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="40f337fc-eda0-4089-b93a-47411e64027a" mode="Transparent" x="696" y="58" width="38" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.IDCesta}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.IDCesta}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="734" y="58" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="c7b15e20-17cc-40c1-a0cc-31ad19bb6231" mode="Transparent" x="734" y="58" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.IDCadastroConexao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.IDCadastroConexao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="766" y="58" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="7985c3b5-07c5-4432-932f-54f94515a7e1" mode="Transparent" x="766" y="58" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.descricaoConexao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.descricaoConexao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="572" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="e97a9895-77bd-4db7-853f-2a848daee6e3" mode="Transparent" x="572" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none">
+				<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>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.descricaoDesconto}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.descricaoDesconto}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="20">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="240" y="0" width="63" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="5d9dcab5-fb16-4c44-a1ac-4b96774b72c4" x="240" y="0" width="63" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoLinha}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{descricaoLinha}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="378" y="0" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="4905830d-3dcb-4c76-9afe-74de416935cc" x="378" y="0" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{dataEmbarque}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{dataEmbarque}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="0" y="0" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="0cc4a486-b740-48e7-8f2a-e18c5eea0d31" x="0" y="0" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{bilhete}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="466" y="0" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="20dc3afd-bfb8-4e2c-85e3-428d8711034f" x="466" y="0" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{preco}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="485" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="18f62d4c-d348-47b1-b303-59084c8fce2a" x="485" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{taxaEmbarque}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{taxaEmbarque}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="444" y="0" width="22" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="a9a8748b-7cf2-4680-8c40-d479bb4e1faa" x="444" y="0" width="22" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{poltrona}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement x="50" y="0" width="20" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="e6652df5-0600-4280-b47c-137fd0ed53ba" x="50" y="0" width="20" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{numBpe}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{numBpe}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement x="70" y="0" width="17" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="b0fc4161-7cee-4704-8fd5-a5f52559da97" x="70" y="0" width="17" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{codOrigem}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{codOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="87" y="0" width="55" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="36e17553-3bdf-4d11-8e86-a7fe33d0a6d1" x="87" y="0" width="55" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoOrigem}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{descricaoOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement x="142" y="0" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="bc597a26-f05a-4783-8273-9b9b1e71f2c6" x="142" y="0" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{codDestino}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{codDestino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="161" y="0" width="51" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="666a8f42-4644-4d1e-b6f7-37da434a5209" x="161" y="0" width="51" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoDestino}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{descricaoDestino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement x="212" y="0" width="28" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="b687835d-a644-4c51-b28f-50cb4eb0d4ca" x="212" y="0" width="28" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{numLinha}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{numLinha}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="303" y="0" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="84911fa1-a90c-4522-acb6-440e3ff67481" x="303" y="0" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{servico}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="335" y="0" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="4993409c-6501-449a-b84c-8cb41ac5f1f6" x="335" y="0" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{classeServico}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{classeServico}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="414" y="0" width="30" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="67d22345-0bf6-4f13-aa7d-50c0318edf9e" x="414" y="0" width="30" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="5"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{dataVenda}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="514" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="9fe0ffa9-5eab-409e-8060-93598464156a" x="514" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{pedagio}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="543" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="5fc2b3fc-012e-4c58-b6a4-fd346683ff5b" x="543" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{seguro}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement x="601" y="0" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="3ef0bd1d-1b65-4fe6-a429-c35d77e63fdf" x="601" y="0" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{numeroAgencia}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{numeroAgencia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="627" y="0" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="c009830f-edb0-407c-bbd4-39ce1d903a20" x="627" y="0" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{nomeAgencia}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{nomeAgencia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="670" y="0" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="4dddd9a1-19ac-41d0-ba85-5a8c5d637530" x="670" y="0" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{cveusuario}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{cveusuario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="25" y="0" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="e118b8f0-d452-4bef-83bc-bbb7f364401a" x="25" y="0" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{subSerie}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{subSerie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="696" y="0" width="38" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="2ca17b0f-50c5-4403-af92-4abe706540be" x="696" y="0" width="38" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="5"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{numoperacion}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement x="734" y="0" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="170ecd37-897b-4bf2-8fdc-3ec8452742d1" x="734" y="0" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{idCadastroConexao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{idCadastroConexao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="766" y="0" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="75fa870a-2532-4db6-a0c7-0adb709c4239" x="766" y="0" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoConexao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{descricaoConexao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="572" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="3e5de2ce-0867-426c-b1bb-68451b51ee6b" x="572" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{descuento}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{descuento}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -453,39 +509,42 @@
 	<pageFooter>
 		<band height="9" splitType="Stretch">
 			<line>
-				<reportElement x="0" y="0" width="802" height="1" isRemoveLineWhenBlank="true"/>
+				<reportElement uuid="0b247e29-5d34-479d-8614-def156ebeb4d" x="0" y="0" width="802" height="1" isRemoveLineWhenBlank="true"/>
 			</line>
 		</band>
 	</pageFooter>
 	<summary>
 		<band height="17" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="1" width="50" height="16"/>
+				<reportElement uuid="293dc20c-cb39-4340-bd2c-c56990f344d7" x="0" y="1" width="50" height="16"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6" isBold="false" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{label.total}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="50" y="1" width="55" height="16"/>
+				<reportElement uuid="de34f37f-9cdc-4185-9f79-fd5e80ac7cf9" x="50" y="1" width="55" height="16"/>
-				<textElement textAlignment="Center" lineSpacing="Single">
+				<textElement textAlignment="Center">
 					<font size="6"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{TOTAL}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="0" width="802" height="1" isRemoveLineWhenBlank="true"/>
+				<reportElement uuid="c63c53e2-04c8-4bf6-930d-15464e6aa33c" x="0" y="0" width="802" height="1" isRemoveLineWhenBlank="true"/>
 			</line>
 		</band>
 	</summary>
 	<noData>
 		<band height="25">
 			<textField>
-				<reportElement x="0" y="0" width="802" height="25"/>
+				<reportElement uuid="f90b2747-6026-47a8-a0d8-2b2d747ee893" x="0" y="0" width="802" height="25"/>
-				<textElement textAlignment="Center" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Center" markup="none">
 					<font size="12" isBold="true"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$R{msg.noData}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>
 	</noData>

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

@@ -0,0 +1,107 @@
+package com.rjconsultores.ventaboletos.relatorios.utilitarios;
+
+import java.util.Date;
+
+public class LogAuditoriaBean {
+
+	private String idAuditado;
+	private String empresa;
+	private String valorAnterior;
+	private String valorAtual;
+	private String campoAlterado;
+	private String classeAlterada;
+	private String classePrincipal;
+	private String tela;
+	private String tipoAlteracao;
+	private Date dataAlteracao;
+	private String usuario;
+
+	public String getIdAuditado() {
+		return idAuditado;
+	}
+
+	public void setIdAuditado(String idAuditado) {
+		this.idAuditado = idAuditado;
+	}
+
+	public String getEmpresa() {
+		return empresa;
+	}
+
+	public void setEmpresa(String empresa) {
+		this.empresa = empresa;
+	}
+
+	public String getValorAnterior() {
+		return valorAnterior;
+	}
+
+	public void setValorAnterior(String valorAnterior) {
+		this.valorAnterior = valorAnterior;
+	}
+
+	public String getValorAtual() {
+		return valorAtual;
+	}
+
+	public void setValorAtual(String valorAtual) {
+		this.valorAtual = valorAtual;
+	}
+
+	public String getCampoAlterado() {
+		return campoAlterado;
+	}
+
+	public void setCampoAlterado(String campoAlterado) {
+		this.campoAlterado = campoAlterado;
+	}
+
+	public String getClasseAlterada() {
+		return classeAlterada;
+	}
+
+	public void setClasseAlterada(String classeAlterada) {
+		this.classeAlterada = classeAlterada;
+	}
+
+	public String getClassePrincipal() {
+		return classePrincipal;
+	}
+
+	public void setClassePrincipal(String classePrincipal) {
+		this.classePrincipal = classePrincipal;
+	}
+
+	public String getTela() {
+		return tela;
+	}
+
+	public void setTela(String tela) {
+		this.tela = tela;
+	}
+
+	public String getTipoAlteracao() {
+		return tipoAlteracao;
+	}
+
+	public void setTipoAlteracao(String tipoAlteracao) {
+		this.tipoAlteracao = tipoAlteracao;
+	}
+
+	public Date getDataAlteracao() {
+		return dataAlteracao;
+	}
+
+	public void setDataAlteracao(Date dataAlteracao) {
+		this.dataAlteracao = dataAlteracao;
+	}
+
+	public String getUsuario() {
+		return usuario;
+	}
+
+	public void setUsuario(String usuario) {
+		this.usuario = usuario;
+	}
+
+}

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

@@ -0,0 +1,67 @@
+package com.rjconsultores.ventaboletos.relatorios.utilitarios;
+
+public class RelatorioBpeNumeracaoReusoBean {
+
+	private Integer numeroBPE;
+	private Integer finalAutorizado;
+	private String estado;
+	private String serieBPE;
+
+	public Integer getFinalAutorizado() {
+		return finalAutorizado;
+	}
+
+	public void setFinalAutorizado(Integer finalAutorizado) {
+		this.finalAutorizado = finalAutorizado;
+	}
+
+	public String getEstado() {
+		return estado;
+	}
+
+	public void setEstado(String estado) {
+		this.estado = estado;
+	}
+
+	public Integer getNumeroBPE() {
+		return numeroBPE;
+	}
+
+	public void setNumeroBPE(Integer numeroBPE) {
+		this.numeroBPE = numeroBPE;
+	}
+
+	public String getSerieBPE() {
+		return serieBPE;
+	}
+
+	public void setSerieBPE(String serieBPE) {
+		this.serieBPE = serieBPE;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((estado == null) ? 0 : estado.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		RelatorioBpeNumeracaoReusoBean other = (RelatorioBpeNumeracaoReusoBean) obj;
+		if (estado == null) {
+			if (other.estado != null)
+				return false;
+		} else if (!estado.equals(other.estado))
+			return false;
+		return true;
+	}
+
+}

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

@@ -0,0 +1,59 @@
+package com.rjconsultores.ventaboletos.relatorios.utilitarios;
+
+public class RelatorioCheckinAbertoBean {
+	
+	private Integer servico;
+	private String dataServico;
+	private String localidade;
+	private String dataEncerramento;
+	private String usuario;
+	private String imei;
+
+	public Integer getServico() {
+		return servico;
+	}
+
+	public void setServico(Integer servico) {
+		this.servico = servico;
+	}
+
+	public String getDataServico() {
+		return dataServico;
+	}
+
+	public void setDataServico(String dataServico) {
+		this.dataServico = dataServico;
+	}
+
+	public String getLocalidade() {
+		return localidade;
+	}
+
+	public void setLocalidade(String localidade) {
+		this.localidade = localidade;
+	}
+
+	public String getDataEncerramento() {
+		return dataEncerramento;
+	}
+
+	public void setDataEncerramento(String dataEncerramento) {
+		this.dataEncerramento = dataEncerramento;
+	}
+
+	public String getUsuario() {
+		return usuario;
+	}
+
+	public void setUsuario(String usuario) {
+		this.usuario = usuario;
+	}
+
+	public String getImei() {
+		return imei;
+	}
+
+	public void setImei(String imei) {
+		this.imei = imei;
+	}
+}

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

@@ -12,9 +12,9 @@ public class RelatorioVendasConexaoRutaBean {
 	private String bilhete;
 	private Integer numLinha;
 	private String descricaoLinha;
-	private Integer codOrigem;
+	private String codOrigem;
 	private String descricaoOrigem;
-	private Integer codDestino;
+	private String codDestino;
 	private String descricaoDestino;
 	private Integer servico;
 	private String poltrona;
@@ -90,11 +90,11 @@ public class RelatorioVendasConexaoRutaBean {
 		this.descricaoLinha = descricaoLinha;
 	}
 
-	public Integer getCodOrigem() {
+	public String getCodOrigem() {
 		return codOrigem;
 	}
 
-	public void setCodOrigem(Integer codOrigem) {
+	public void setCodOrigem(String codOrigem) {
 		this.codOrigem = codOrigem;
 	}
 
@@ -106,11 +106,11 @@ public class RelatorioVendasConexaoRutaBean {
 		this.descricaoOrigem = descricaoOrigem;
 	}
 
-	public Integer getCodDestino() {
+	public String getCodDestino() {
 		return codDestino;
 	}
 
-	public void setCodDestino(Integer codDestino) {
+	public void setCodDestino(String codDestino) {
 		this.codDestino = codDestino;
 	}
 

src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridCombinacionTramoRutaCoeficiente.java

@@ -281,8 +281,8 @@ public class GridCombinacionTramoRutaCoeficiente extends Grid implements RowRend
 				
 		boolean esTramoEditable = (secuenciaRutaTramoCoeficienteVO.getTramoId() == null);
 		boolean esTramoServicioEditable = (secuenciaRutaTramoCoeficienteVO.getTramoServicioId() == null);
-		boolean esTramoCoeficienteEditable = (secuenciaRutaTramoCoeficienteVO.getOrgaoTramoId() == null);
+		boolean esTramoCoeficienteEditable = secuenciaRutaTramoCoeficienteVO.getClaseServicioRutaOrigemUtilizadaNaPesquisa() || (secuenciaRutaTramoCoeficienteVO.getOrgaoTramoId() == null);
-
+  
 		// Cell Kms Real
 		dKmsReal.setReadonly(!esTramoEditable);
 		dataBinder.addBinding(dKmsReal, "value", row.getUuid() + ".kmReal", null, null, "save", 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java

@@ -258,6 +258,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 	private Checkbox chkIndNaoPermiteTrocaEntreEmpresa;
 	private Checkbox chkIndHabilitarVendaAbertoMovimentoCaixa;
 	private Checkbox cnhIndSeguroOpcionalW2Digital;
+	private Checkbox chkIndLimitaCategoriaPorCorrida;
 	
 	private Checkbox chkIndNaoImprimeCupomEmbarqueVendaEmAberto;
 	private Checkbox chkIndNaoImprimeCupomEmbarqueConfirmacaoDeAberto;
@@ -367,6 +368,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 	private Textbox txtContractId;
 	private byte[] certificado;
 	private Tab tabSafer;
+	private Checkbox chkIndCheckinBloqueadoNoshow;
 
 	private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
 			+ "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
@@ -539,6 +541,8 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 		chkIndNaoImprimeCupomEmbarqueVendaEmAberto.setChecked(BooleanUtils.toBoolean(empresa.getIndNaoImprimeCupomEmbarqueVendaAberto()));
 		chkIndNaoImprimeCupomEmbarqueConfirmacaoDeAberto.setChecked(BooleanUtils.toBoolean(empresa.getIndNaoImprimeCupomEmbarqueConfirmacaoAberto()));
 		cnhIndSeguroOpcionalW2Digital.setChecked(BooleanUtils.toBoolean(empresa.getIndSeguroOpcionalW2Digital()));
+		chkIndLimitaCategoriaPorCorrida.setChecked(BooleanUtils.toBoolean(empresa.getIndLimitaCategoriaPorCorrida()));
+		chkIndCheckinBloqueadoNoshow.setChecked(BooleanUtils.toBoolean(empresa.getIndCheckinBloqueadoRemarcacao()));
 
 		txtUrlBaseSeguro.setText(empresa.getUrlBaseEmpresaSeguro());
 		
@@ -788,6 +792,9 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 		chkIndNaoImprimeCupomEmbarqueVendaEmAberto.getValue();
 		chkIndNaoImprimeCupomEmbarqueConfirmacaoDeAberto.getValue();
 		cnhIndSeguroOpcionalW2Digital.getValue();
+		chkIndLimitaCategoriaPorCorrida.getValue();
+		chkIndCheckinBloqueadoNoshow.getValue();
+		
 		
 		txtIrkPadrao.getValue();
 		rdCst00.getValue();
@@ -918,7 +925,9 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 			empresa.setIndNaoImprimeCupomEmbarqueVendaAberto(chkIndNaoImprimeCupomEmbarqueVendaEmAberto.isChecked());
 			empresa.setIndNaoImprimeCupomEmbarqueConfirmacaoAberto(chkIndNaoImprimeCupomEmbarqueConfirmacaoDeAberto.isChecked());
 			empresa.setIndSeguroOpcionalW2Digital(cnhIndSeguroOpcionalW2Digital.isChecked());
-			
+			empresa.setIndLimitaCategoriaPorCorrida(chkIndLimitaCategoriaPorCorrida.isChecked());
+			empresa.setIndCheckinBloqueadoRemarcacao(chkIndCheckinBloqueadoNoshow.isChecked());
+			 
 			if(rdCst00.isChecked()) {
 				empresa.setCstGratuidade(TipoCstGratuidade.CST00);
 			} else if(rdCst40.isChecked()) {

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java

@@ -17,6 +17,7 @@ import org.zkoss.zul.Button;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Radio;
+import org.zkoss.zul.Row;
 import org.zkoss.zul.Textbox;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
@@ -77,6 +78,9 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 	private Radio rdPenalizacionOrgaoConcedente;
 	private Checkbox chkIndtotalbilhete;
 	private Checkbox chkIndsempregerarapagar;
+	private Checkbox chkIndOCDPorFormadePagamento;
+	private Row rowIndOCDPorFormadePagamento;
+
 	
 	private Radio rdSomenteCartao;
 	private Radio rdTodasFormasPagamento;
@@ -121,6 +125,8 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 		chkOCDTransferencia.setChecked(ocdParamCorrente.getIndOCDTransferencia() == null ? false : ocdParamCorrente.getIndOCDTransferencia());
 		chkIndtotalbilhete.setChecked(ocdParamCorrente.getIndtotalbilhete() == null ? false : ocdParamCorrente.getIndtotalbilhete());
 		chkIndsempregerarapagar.setChecked(ocdParamCorrente.getIndsempregerarapagar() == null ? false : ocdParamCorrente.getIndsempregerarapagar());
+		chkIndOCDPorFormadePagamento.setChecked(ocdParamCorrente.getIndOCDPorFormadePagamento() == null ? false : ocdParamCorrente.getIndOCDPorFormadePagamento());
+		rowIndOCDPorFormadePagamento.setVisible(!ocdParamCorrente.getIndOcdDinheiro());
 		txtPenalizacion.setDisabled(!ocdParamCorrente.getIndPenalizacionOCD());
 		txtTiempoLimitePenalizacion.setDisabled(!ocdParamCorrente.getIndPenalizacionOCD());
 		ptoVtaOCDParamList.setItemRenderer(new RenderOCDPtoVtaParam());
@@ -149,6 +155,19 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 		rdSomenteCartao.setChecked(!ocdParamCorrente.getIndOcdDinheiro());
 		rdTodasFormasPagamento.setChecked(ocdParamCorrente.getIndOcdDinheiro());
 	}
+	
+	public void onClick$rdSomenteCartao(Event ev) throws InterruptedException {
+		if(rdSomenteCartao.isChecked()) {
+			rowIndOCDPorFormadePagamento.setVisible(true);
+		}		
+	}
+	
+	public void onClick$rdTodasFormasPagamento(Event ev)  throws InterruptedException {
+		if(rdTodasFormasPagamento.isChecked()) {
+			rowIndOCDPorFormadePagamento.setVisible(false);
+			chkIndOCDPorFormadePagamento.setChecked(false);			
+		}		
+	}
 
 	public void onClick$btnApagar(Event ev) throws InterruptedException {
 		try {
@@ -205,6 +224,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 			ocdParamCorrente.setIndOCDTransferencia(chkOCDTransferencia.isChecked());
 			ocdParamCorrente.setIndPenalizacionOCD(rdPenalizacionOCD.isChecked());
 			ocdParamCorrente.setIndOcdDinheiro(rdTodasFormasPagamento.isChecked());
+			ocdParamCorrente.setIndOCDPorFormadePagamento(chkIndOCDPorFormadePagamento.isChecked());
 			ocdParamCorrente.setIndtotalbilhete(chkIndtotalbilhete.isChecked());
 			ocdParamCorrente.setIndsempregerarapagar(chkIndsempregerarapagar.isChecked());
 			

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java

@@ -119,7 +119,6 @@ import com.rjconsultores.ventaboletos.entidad.Usuario;
 import com.rjconsultores.ventaboletos.entidad.UsuarioBancario;
 import com.rjconsultores.ventaboletos.entidad.UsuarioPerfil;
 import com.rjconsultores.ventaboletos.enums.TipoAntifraude;
-import com.rjconsultores.ventaboletos.enums.TipoCarteiraDigital;
 import com.rjconsultores.ventaboletos.enums.TipoSocio;
 import com.rjconsultores.ventaboletos.exception.BusinessException;
 import com.rjconsultores.ventaboletos.exception.IntegracionException;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaController.java

@@ -1001,7 +1001,8 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
 
 		if (!existe) {
 			if (((Categoria) cmbCategorias.getSelectedItem().getValue()).getCategoriaId().equals(CategoriaCtrlServiceImpl.CATEGORIA_ADULTO)) {
-				categoriaCtrl = categoriaCtrlService.checarCategoriaAdulto(categoriaCtrl);
+				categoriaCtrl = categoriaCtrlService.checarCategoriaAdulto(categoriaCtrl, rdVendeAbertoSim.isSelected(), 
+						chkCancelaEmAberto.isChecked(), chkDevolveEmAberto.isChecked(), chkCancelaEmergencialEmAberto.isChecked(), chkTrocaTiturlidadeEmAberto.isChecked(), chkTrocaEmAberto.isChecked());
 				List<CategoriaDescuento> aux = lsCategoriaDescuento;
 				lsCategoriaDescuento = categoriaCtrl.getCategoriaDescuentoList();
 				categoriaDescuentoList.setData(lsCategoriaDescuento);

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionGeneralController.java

@@ -17,7 +17,6 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.CheckEvent;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Button;
-import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Radio;
 import org.zkoss.zul.Textbox;
@@ -37,7 +36,9 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxCustom;
 @Scope("prototype")
 public class EditarConfiguracionGeneralController extends MyGenericForwardComposer {
 
-    @Autowired
+	private static final long serialVersionUID = 4628168724521957944L;
+	
+	@Autowired
     private ConstanteService constanteService;
     private Constante constante;
     private MyListbox constanteList;
@@ -51,7 +52,6 @@ public class EditarConfiguracionGeneralController extends MyGenericForwardCompos
     private Radio radMantenimientoUsuarioNo;
     private Button btnApagar;
     private Button btnSalvar;
-    private Checkbox chkCaseSensitive;
 
     public Button getBtnApagar() {
         return btnApagar;
@@ -128,7 +128,8 @@ public class EditarConfiguracionGeneralController extends MyGenericForwardCompos
 
     }
 
-    public void onClick$btnSalvar(Event ev) {
+    @SuppressWarnings("deprecation")
+	public void onClick$btnSalvar(Event ev) {
         valorconstante.getValue();
         nombConstante.getValue();
         //indtipoconstante.getValue();

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java

@@ -42,6 +42,7 @@ import com.rjconsultores.ventaboletos.entidad.ReservacionMercado;
 import com.rjconsultores.ventaboletos.entidad.ReservacionPuntoVenta;
 import com.rjconsultores.ventaboletos.service.CategoriaService;
 import com.rjconsultores.ventaboletos.service.ClaseServicioService;
+import com.rjconsultores.ventaboletos.service.ConstanteService;
 import com.rjconsultores.ventaboletos.service.MarcaService;
 import com.rjconsultores.ventaboletos.service.ParadaService;
 import com.rjconsultores.ventaboletos.service.PuntoVentaService;
@@ -55,6 +56,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionRe
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionReservacionMarca;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionReservacionMercado;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionReservacionPuntoVenta;
+import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
 
 /**
  * 
@@ -266,6 +268,17 @@ public class EditarConfiguracionReservacionController extends MyGenericForwardCo
 			rCategoria.setCategoria((Categoria) cmbCategoria.getSelectedItem().getValue());
 			rCategoria.setFecmodif(Calendar.getInstance().getTime());
 			rCategoria.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+			
+			String CONSTANTE_GRATUIDADE_CRIANCA = buscarConstante("GRATUIDADE_CRIANCA");
+			CONSTANTE_GRATUIDADE_CRIANCA = CONSTANTE_GRATUIDADE_CRIANCA != null ? CONSTANTE_GRATUIDADE_CRIANCA : "";
+			if (CONSTANTE_GRATUIDADE_CRIANCA.equals(rCategoria.getCategoria().getCategoriaId().toString())) {
+				Messagebox.show(
+						Labels.getLabel("editarConfiguracionReservacionController.categoriaCriaca.value"),
+						Labels.getLabel("editarConfiguracionReservacionController.window.title"),
+						Messagebox.OK, Messagebox.EXCLAMATION);
+				return;
+			}
+			
 			boolean existe = false;
 			for (ReservacionCategoria rc : lsReservacionCategoria) {
 				if (rc.getCategoria().equals(rCategoria.getCategoria()) && rc.getActivo()) {
@@ -288,6 +301,11 @@ public class EditarConfiguracionReservacionController extends MyGenericForwardCo
 			log.error(ex);
 		}
 	}
+	
+	private String buscarConstante(String nomeConstante) {
+		ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
+		return constanteService.buscarPorNomeConstante(nomeConstante).getValorconstante();
+	}
 
 	public void onClick$btnAdicionarClase(Event ev) throws InterruptedException {
 		if (cmbClase.getSelectedItem() == null) {

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaConexionController.java

@@ -5,7 +5,6 @@
 package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +14,9 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 
-import com.rjconsultores.ventaboletos.entidad.Conexion;
 import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.service.ConexionService;
 import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO;
@@ -40,11 +39,13 @@ public class BusquedaConexionController extends MyGenericForwardComposer {
 	private Combobox cmbParadaOrigem;
 	private Combobox cmbParadaDestino;
 
+	private Checkbox chcAgrupado;
+
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 		super.doAfterCompose(comp);
 
-		conexionesList.setData(conexionService.buscarConexionesValidas());
+		conexionesList.setData(conexionService.buscarConexiones(true, null, null));
 
 		conexionesList.setItemRenderer(new RenderConexion());
 		conexionesList.addEventListener("onDoubleClick", new EventListener() {
@@ -62,14 +63,14 @@ public class BusquedaConexionController extends MyGenericForwardComposer {
 		Map args = new HashMap();
 		args.put("conexionCtrlId", conexionCtrlId);
 		args.put("conexionesList", conexionesList);
-		
+
-//		if(conexionCtrlId != null && conexionService.buscarPorConexionCtrl(conexionCtrlId).get(0).getRutaId() != null) {
+		// if(conexionCtrlId != null && conexionService.buscarPorConexionCtrl(conexionCtrlId).get(0).getRutaId() != null) {
-//			openWindow("/gui/esquema_operacional/editarConexionRuta.zul",
+		// openWindow("/gui/esquema_operacional/editarConexionRuta.zul",
-//					Labels.getLabel("editarConexionController.window.title"), args, MODAL);
+		// Labels.getLabel("editarConexionController.window.title"), args, MODAL);
-//		}else {
+		// }else {
-//			openWindow("/gui/esquema_operacional/editarConexion.zul",
+		// openWindow("/gui/esquema_operacional/editarConexion.zul",
-//					Labels.getLabel("editarConexionController.window.title"), args, MODAL);
+		// Labels.getLabel("editarConexionController.window.title"), args, MODAL);
-//		}
+		// }
 		openWindow("/gui/esquema_operacional/editarConexion.zul",
 				Labels.getLabel("editarConexionController.window.title"), args, MODAL);
 	}
@@ -98,7 +99,7 @@ public class BusquedaConexionController extends MyGenericForwardComposer {
 		Integer origemId = cmbParadaOrigem.getSelectedItem() != null ? ((Parada) cmbParadaOrigem.getSelectedItem().getValue()).getParadaId() : null;
 		Integer destinoId = cmbParadaDestino.getSelectedItem() != null ? ((Parada) cmbParadaDestino.getSelectedItem().getValue()).getParadaId() : null;
 
-		conexionesList.setData(conexionService.buscarConexiones(origemId, destinoId));
+		conexionesList.setData(conexionService.buscarConexiones(chcAgrupado.isChecked(), origemId, destinoId));
 
 	}
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java

@@ -217,6 +217,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 	private Checkbox chkIndTribTaxaEmbarqueExcecao;
 	private Checkbox chkIndTribPedagioExcecao;
 	private Checkbox chkIndPrecioPorDemanda;
+	private Checkbox chkIndCST41;
 	private List<Parada> lsParadasExcecao;
 	private List<RutaIcmsExcepcion> lsRutaIcmsExcepcions;
 	private MyListbox rutaIcmsExcepcionsList;
@@ -266,6 +267,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 
 		if (ruta.getRutaId() != null) {
 			ruta = rutaService.obtenerID(ruta.getRutaId());
+			ruta.setClaseServicioRutaOrigem(ruta.getClaseServicio());
 
 			lsRutacComb = ruta.getRutaCombinacionList();
 		}
@@ -1033,6 +1035,32 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 			}
 		}
 	}
+	
+	private void atualizarTramosSequenciaTemporaria(RutaCombinacion rc) {
+		List<RutaSecuencia> lsRutaSec = ruta.getRutaSecuenciaList();
+		Tramo tramoRC = rc.getTramo();
+		Parada origemRC = rc.getTramo().getOrigem();
+		Parada destinoRC = rc.getTramo().getDestino();
+		Via viaRC = rc.getTramo().getVia();
+		for (RutaSecuencia rs : lsRutaSec) {
+			Parada origemRS = rs.getTramo().getOrigem();
+			Parada destinoRS = rs.getTramo().getDestino();
+			Via viaRS = rs.getTramo().getVia();
+
+			if ((origemRS.getParadaId().equals(origemRC.getParadaId()))
+					&& (destinoRS.getParadaId().equals(destinoRC.getParadaId()))
+					&& (!viaRS.getViaId().equals(viaRC.getViaId()))) {
+				List<RutaCombinacion> lsRutaCombinacionTemporaria = new ArrayList<RutaCombinacion>(ruta.getRutaCombinacionTemporariaList());
+				for (int i = 0; i < lsRutaCombinacionTemporaria.size(); i++) {
+					if (lsRutaCombinacionTemporaria.get(i).getRutacombinacionId() == rc.getRutacombinacionId()) {
+						ruta.getRutaCombinacionTemporariaList().get(i).setTramo(tramoRC);
+						rs.setTramo(tramoRC);
+						break;
+					}
+				}
+			}
+		}
+	}
 
 	public void onClick$btnSalvar(Event ev) throws InterruptedException {
 		if (ruta.getIndRutaCancelada()) {
@@ -1551,21 +1579,52 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 	}
 	
 	public void defineSecaoDER(String secao, String idCombinacion) {
+		if(!ruta.getIsClone()) {
 		RutaCombinacion rc = carregarRutaCombinacionSelecionada(idCombinacion);
 		rc.setCodigoDerPr(secao);
 		atualizarRutaCombinacion(rc);
+		}else {
+			List<RutaCombinacion> lsRutaCombinacionTemporaria = new ArrayList<RutaCombinacion>(ruta.getRutaCombinacionTemporariaList());
+			for(int i=0; i < lsRutaCombinacionTemporaria.size(); i ++) {
+				if(lsRutaCombinacionTemporaria.get(i).getRutacombinacionId()== Integer.parseInt(idCombinacion)) {
+					ruta.getRutaCombinacionTemporariaList().get(i).setCodigoDerPr(secao);;
+					break;
+				}
+			}			
+		}
 	}
 
 	public void vendeSiNo(String venda, String idCombinacion) {
+		if(!ruta.getIsClone()) {
 		RutaCombinacion rc = carregarRutaCombinacionSelecionada(idCombinacion);
 		rc.setIndventa(venda.equals(SIM));
 		atualizarRutaCombinacion(rc);
+		}else {	
+			List<RutaCombinacion> lsRutaCombinacionTemporaria = new ArrayList<RutaCombinacion>(ruta.getRutaCombinacionTemporariaList());
+			for(int i=0; i < lsRutaCombinacionTemporaria.size(); i ++) {
+				if(lsRutaCombinacionTemporaria.get(i).getRutacombinacionId()== Integer.parseInt(idCombinacion)) {
+					ruta.getRutaCombinacionTemporariaList().get(i).setIndventa(venda.equals(SIM));
+					break;
+				}
+			}			
+		}
 	}
 	
 	public void defineUsoDoPricing(String usaPrincing, String idCombinacion) {
+		if(!ruta.getIsClone()) {
 		RutaCombinacion rc = carregarRutaCombinacionSelecionada(idCombinacion);
 		rc.setIndUsaPricing(usaPrincing.equals(SIM));
 		atualizarRutaCombinacion(rc);
+		}else {		
+			List<RutaCombinacion> lsRutaCombinacionTemporaria = new ArrayList<RutaCombinacion>(ruta.getRutaCombinacionTemporariaList());
+			for(int i=0; i < lsRutaCombinacionTemporaria.size(); i ++) {
+				if(lsRutaCombinacionTemporaria.get(i).getRutacombinacionId()== Integer.parseInt(idCombinacion)) {
+					ruta.getRutaCombinacionTemporariaList().get(i).setIndUsaPricing(usaPrincing.equals(SIM));
+					break;
+				}
+			}	
+		}		
+		
 	}
 
 	private void atualizarRutaCombinacion(RutaCombinacion rc) {
@@ -1582,8 +1641,13 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 	public void opcionVia(Via v, String idCombinacion) {
 		RutaCombinacion rc = rutaCombinacionService.obtenerID(Integer.parseInt(idCombinacion));
 		rc.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(rc.getTramo().getOrigem(), rc.getTramo().getDestino(), v));
-		rutaCombinacionService.actualizacion(rc);
+		if (!ruta.getIsClone()) {
-		atualizarTramosSequencia(rc);
+			rutaCombinacionService.actualizacion(rc);
+			atualizarTramosSequencia(rc);
+		} else {
+			atualizarTramosSequenciaTemporaria(rc);
+		}
+
 	}
 
 	public void onClick$tabCombinacion(Event ev) throws SQLException {
@@ -1618,6 +1682,9 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 		if (!clone) {
 			List<RutaCombinacion> rutaCombinacionsAntiga = rutaCombinacionService.obtenerPorRuta(ruta);
 			ruta = Ruta.clone(ruta);
+			 if (ruta.getIsClone()) {
+					ruta.setRutaCombinacionTemporariaList(new ArrayList<RutaCombinacion>(rutaCombinacionsAntiga));
+			}
 			ruta.setRutaId(null);
 
 			List<RutaCombinacion> rutaCombinacions = new ArrayList<RutaCombinacion>();
@@ -1625,12 +1692,49 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 			for (RutaCombinacion rc : rutaCombinacionsAntiga) {
 				RutaCombinacion newrc = (RutaCombinacion) rc.clone();
 				newrc.setRuta(ruta);
-				newrc.setRutacombinacionId(null);
 				rutaCombinacions.add(newrc);
 			}
 			ruta.setRutaCombinacionList(rutaCombinacions);
 
-			carregarParadaSecuencia(ruta.getRutaSecuenciaList());
+			carregarParadaSecuencia(ruta.getRutaSecuenciaList());		
+		
+			
+		   ArrayList<RutaEmbarqueDesembarque> lsRutaEmbarqueDesembarqueAux =new ArrayList<RutaEmbarqueDesembarque>(lsRutaEmbarqueDesembarque);
+		   lsRutaEmbarqueDesembarque = 	new ArrayList<RutaEmbarqueDesembarque>();		
+			for (RutaEmbarqueDesembarque re : lsRutaEmbarqueDesembarqueAux) {
+				RutaEmbarqueDesembarque r =new RutaEmbarqueDesembarque();
+				r.setParada(re.getParada());
+				r.setActivo(true);
+				r.setRuta(ruta);
+				r.setEmbarque(re.getEmbarque());
+				r.setDesembarque(re.getDesembarque());
+				r.setLocalDesembarqueEmbarque(re.getLocalDesembarqueEmbarque());
+				lsRutaEmbarqueDesembarque.add(r);
+			}
+			
+			ruta.setLsRutaEmbarqueDesembarque(lsRutaEmbarqueDesembarque);
+			rutaEmbarqueDesembarqueListbox.setData(lsRutaEmbarqueDesembarque);
+			
+			
+			List<RutaIcmsExcepcion> lsRutaIcmsExcepcionAux =new ArrayList<RutaIcmsExcepcion>(lsRutaIcmsExcepcions);
+			lsRutaIcmsExcepcions = 	new ArrayList<RutaIcmsExcepcion>();
+			for (RutaIcmsExcepcion rc : lsRutaIcmsExcepcionAux) {
+				RutaIcmsExcepcion r =new RutaIcmsExcepcion();
+				r.setRuta(ruta);				
+				r.setOrigen(rc.getOrigen());
+				r.setDestino(rc.getDestino());
+				r.setIndTribTarifa(rc.getIndTribTarifa());
+				r.setIndTribTaxaEmbarque(rc.getIndTribTaxaEmbarque());
+				r.setIndTribPedagio(rc.getIndTribPedagio());
+				r.setActivo(Boolean.TRUE);
+				r.setFecmodif(Calendar.getInstance().getTime());
+				r.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+				r.setIndCST41(rc.getIndCST41());
+				lsRutaIcmsExcepcions.add(r);
+				
+			}
+			ruta.setLsRutaIcmsExcepcions(lsRutaIcmsExcepcions);
+			rutaIcmsExcepcionsList.setData(lsRutaIcmsExcepcions);
 
 			Constraint constNumRuta = txtNumRuta.getConstraint();
 			txtNumRuta.setConstraint("");
@@ -1698,6 +1802,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 			rutaTramoVO.setDescRuta(ruta.getDescruta());
 			rutaTramoVO.setPrefixo(txtPrefixo.getValue());
 			rutaTramoVO.setIndSentidoIda(radIda.isChecked());
+			rutaTramoVO.setClaseServicioRutaOrigem(ruta.getClaseServicioRutaOrigem());
 
 			rutaTramoVO.setLsParadaSecuenciaCombinacaoLinhas(sequenciasAGerar);
 
@@ -1874,9 +1979,9 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 		rutaEmbarqueDesembarque.setActivo(true);
 		rutaEmbarqueDesembarque.setRuta(ruta);
 		rutaEmbarqueDesembarque.setEmbarque(embarque);
-		rutaEmbarqueDesembarque.setDesembarque(desembarque);
+		rutaEmbarqueDesembarque.setDesembarque(desembarque);		
-		lsRutaEmbarqueDesembarque.add(rutaEmbarqueDesembarque);
 		rutaEmbarqueDesembarque.setLocalDesembarqueEmbarque(parada);
+		lsRutaEmbarqueDesembarque.add(rutaEmbarqueDesembarque);
 		ruta.setLsRutaEmbarqueDesembarque(lsRutaEmbarqueDesembarque);
 		rutaEmbarqueDesembarqueListbox.setData(lsRutaEmbarqueDesembarque);
 
@@ -1958,6 +2063,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 			rutaIcmsExcepcion.setActivo(Boolean.TRUE);
 			rutaIcmsExcepcion.setFecmodif(Calendar.getInstance().getTime());
 			rutaIcmsExcepcion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+			rutaIcmsExcepcion.setIndCST41(chkIndCST41.isChecked());
 			
 			lsRutaIcmsExcepcions.add(rutaIcmsExcepcion);
 			ruta.setLsRutaIcmsExcepcions(lsRutaIcmsExcepcions);
@@ -2271,5 +2377,6 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer
 			Messagebox.show(Labels.getLabel("editarCatalogoDeRutaController.MSG.erroAoBloquearLinha"),
 					Labels.getLabel("editarCatalogoDeRutaController.window.title"), Messagebox.OK, Messagebox.ERROR);
 		}
-	}
+	}	
+
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionConfController.java

@@ -71,6 +71,10 @@ public class EditarConexionConfController extends MyGenericForwardComposer {
 		conexionConf = conexionConfHash.get(conexion.getNumgrupo());
 		listBoxDesconto.setData(getConexoesDesconto());
 		cmbClasseServicio.setModel(new ListModelList(claseServicioService.obtenerTodos()));
+
+		for(ConexionDescuento c : conexoesDescontoRemovidas) {
+			listBoxDesconto.removeItem(c);
+		}
 	}
 
 	private List<? extends Object> getConexoesDesconto() {

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionController.java

@@ -167,7 +167,7 @@ public class EditarConexionController extends MyGenericForwardComposer {
 	private Boolean verificarConexionContr(MyComboboxParada combo) throws InterruptedException {
 		if (origemCntrl != null
 				&& destinoCntrl != null && conexionCtrl == null
-				&& !conexionService.buscarConexiones(origemCntrl.getParadaId(), destinoCntrl.getParadaId()).isEmpty()) {
+				&& !conexionService.buscarConexiones(false, origemCntrl.getParadaId(), destinoCntrl.getParadaId()).isEmpty()) {
 			mostraMensagem(Labels.getLabel("editarConexionConfController.MSG.conexionCtrlExistente"));
 			combo.setSelectedIndex(-1);
 			return false;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionRutaController.java

@@ -193,7 +193,7 @@ public class EditarConexionRutaController extends MyGenericForwardComposer {
 	private Boolean verificarConexionContr(MyComboboxParada combo) throws InterruptedException {
 		if (origemCntrl != null
 				&& destinoCntrl != null && conexionCtrl == null
-				&& !conexionService.buscarConexiones(origemCntrl.getParadaId(), destinoCntrl.getParadaId()).isEmpty()) {
+				&& !conexionService.buscarConexiones(false, origemCntrl.getParadaId(), destinoCntrl.getParadaId()).isEmpty()) {
 			mostraMensagem(Labels.getLabel("editarConexionConfController.MSG.conexionCtrlExistente"));
 			combo.setSelectedIndex(-1);
 			return false;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java

@@ -304,6 +304,8 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
 		
 		tramo.setConfRestricaoCanalVenta(confRestricaoCanalVenta);
 		tramo.setActivo(Boolean.TRUE);
+		tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+		tramo.setFecmodif(Calendar.getInstance().getTime());
 		
 		if(!lsConfRestricaoTramo.contains(tramo)) {
 			lsConfRestricaoTramo.add(tramo);
@@ -353,6 +355,10 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
 		for (ConfRestricaoExcecao restricaoExcecao : listaAuxExcecao){
 			excecaoDataList.removeItem(restricaoExcecao);
 			restricaoExcecao.setConfRestricaoExcecaoId(null);
+			restricaoExcecao.setActivo(Boolean.TRUE);
+			restricaoExcecao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+			restricaoExcecao.setFecmodif(Calendar.getInstance().getTime());
+			
 			ConfRestricaoTramo tramo = restricaoExcecao.getConfRestricaoTramo();
 			if(tramo!= null) {
 				tramo.setConfRestricaoTramoId(null);
@@ -375,6 +381,10 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
 		for (ConfRestricaoPtovta restricaoPtovta : listaAuxPtoVta){
 			confRestricaoPtovtaDataList.removeItem(restricaoPtovta);
 			restricaoPtovta.setConfRestricaoPtovtaId(null);
+			restricaoPtovta.setActivo(Boolean.TRUE);
+			restricaoPtovta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+			restricaoPtovta.setFecmodif(Calendar.getInstance().getTime());			
+			
 			restricaoPtovta.setConfRestricaoCanalVenta(confRestricaoCanalVentaNovo);
 			ConfRestricaoTramo tramo = restricaoPtovta.getConfRestricaoTramo();
 			if(tramo!= null) {
@@ -398,6 +408,10 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
 			confRestricaoTramoDataList.removeItem(restricaoTramo);
 			restricaoTramo.setConfRestricaoTramoId(null);
 			restricaoTramo.setConfRestricaoCanalVenta(confRestricaoCanalVentaNovo);
+			restricaoTramo.setActivo(Boolean.TRUE);
+			restricaoTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+			restricaoTramo.setFecmodif(Calendar.getInstance().getTime());
+			
 			confRestricaoCanalVentaNovo.getLsConfRestricaoTramo().add(restricaoTramo);
 			confRestricaoTramoDataList.addItemNovo(restricaoTramo);
 		}

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java

@@ -455,6 +455,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 				txtNumCorrida.setDisabled(false);
 				txtNumCorrida.setText("");
 				txtNumCorrida.setConstraint("no empty");
+				chkCorridaExtra.setDisabled(Boolean.FALSE);
 				isClone = true;
 				
 				esquemaCorrida.setEsquemacorridaId(null);
@@ -750,6 +751,8 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 								esquemaCorrida.setMinutosAutomacaoHEAte(txtMinutosAutomacaoATE.getValue() == null ? 0 : txtMinutosAutomacaoATE.getValue());
 								esquemaCorrida.setTaxaOcupacao(txtOcupacaoHorarioExtra.getValue() == null ? 0 : txtOcupacaoHorarioExtra.getValue() );
 								esquemaCorrida.setNumCorridaServicoExtra(txtNumCorridaExtraAuto.getValue());
+								
+								esquemaCorrida.setHorasalidaExtra(buscarHora(esquemaCorrida.getHorasalidaExtra()));
 							} 
 
 							if (porBloq.isChecked()) {
@@ -790,16 +793,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 							}
 
 							// nao gravar segundos:
-							GregorianCalendar gHoraSalida = new GregorianCalendar();
+							esquemaCorrida.setHorasalida(buscarHora(esquemaCorrida.getHorasalida()));
-							if (esquemaCorrida.getHorasalida() != null) {
-								gHoraSalida.setTime(esquemaCorrida.getHorasalida());
-								gHoraSalida.set(Calendar.SECOND, 0);
-								gHoraSalida.set(Calendar.MILLISECOND, 0);
-								gHoraSalida.set(Calendar.MONTH, 01);
-								gHoraSalida.set(Calendar.DAY_OF_MONTH, 01);
-								gHoraSalida.set(Calendar.YEAR, 1970);
-								esquemaCorrida.setHorasalida(gHoraSalida.getTime());
-							}
 
 							List<EsquemaCorrida> lsEC = Collections.EMPTY_LIST;
 
@@ -980,6 +974,22 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 		}
 	}
 
+	private Date buscarHora(Date horasalidaExtra) {
+		if (horasalidaExtra != null) {
+			GregorianCalendar gHoraSalida = new GregorianCalendar();
+			gHoraSalida.setTime(horasalidaExtra);
+			gHoraSalida.set(Calendar.SECOND, 0);
+			gHoraSalida.set(Calendar.MILLISECOND, 0);
+			gHoraSalida.set(Calendar.MONTH, 01);
+			gHoraSalida.set(Calendar.DAY_OF_MONTH, 01);
+			gHoraSalida.set(Calendar.YEAR, 1970);
+			
+			return  gHoraSalida.getTime();
+		}
+		
+		return null;
+	}
+
 	public void onClick$btnApagar(Event ev) {
 		try {
 			int resp = Messagebox.show(Labels.getLabel("editarConfiguracionCorridaController.MSG.borrarPergunta"),

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java

@@ -47,6 +47,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConexionRuta;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConexionRutaRemoveSelecionada;
+import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEixoConexionRutaRemoveSelecionada;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderGeracaoConexionPorRuta;
 
 @Controller("gerarConexionPorRutaController")
@@ -91,7 +92,7 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 	private MyListbox localidadesComunsDestinoCList;
 	private MyListbox listEspCanal;
 	private MyListbox listPuntoVenta;
-	private List<Parada> lsLocalidadesComuns;
+	private List<Parada> lsLocalidadesComunsAB;
 	private List<Parada> lsLocalidadesComunsLinhasBC;
 	private Combobox cmbTipoPtovta;
 	private Combobox cmbPtovta;
@@ -124,12 +125,6 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 		conexionRutaConf = (ConexionRutaConf) Executions.getCurrent().getArg().get("conexionRutaConf");
 		conexionRutaConfList = (MyListbox) Executions.getCurrent().getArg().get("conexionRutaConfList");
 		
-		Set<Parada> lsParadasOrigemA = new HashSet<Parada>();
-		Set<Parada> lsParadasTodasOrigemA = new HashSet<Parada>();
-		Set<Parada> lsParadasDestinoB = new HashSet<Parada>();
-		Set<Parada> lsParadasTodasDestinoB = new HashSet<Parada>();
-		Set<Parada> lsParadasDestinoC = new HashSet<Parada>();
-		Set<Parada> lsParadasTodasDestinoC = new HashSet<Parada>();
 		
 		if (conexionRutaConf != null) {
 			
@@ -140,46 +135,23 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 			txtTiempoMin.setValue(conexionRutaConf.getTiempoMin());
 			txtTiempoMax.setValue(conexionRutaConf.getTiempoMax());
 			
-			for (ConexionRutaExcepcionPtoVta conexionRutaExcepcionPtoVta : conexionRutaRestricaoPtoVtaService.buscarPorConexionConf(conexionRutaConf)) {
-				listPuntoVenta.addItemNovo(conexionRutaExcepcionPtoVta.getPuntoVenta());
-			}
 			
-			for (ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionTipoPtoVta: conexionRutaExcepcionTipoPtoVtaService.buscarPorConexionConf(conexionRutaConf)) {
+			configuraExcecaoPorPontoVenda();
-				listEspCanal.addItemNovo(conexionRutaExcepcionTipoPtoVta.getTipoPtovta());
-			}
-			
-			List<List<Ruta>> rutas = conexionRutaConfService.buscarRutasPorConexionConf(conexionRutaConf.getConexionRutaConfId());
-			List<Ruta> lsRutaA = rutas.get(0);
-			List<Ruta> lsRutaB = rutas.get(1);
-			List<Ruta> lsRutaC = rutas.get(2);
 
-			lsParadasOrigemA.addAll(conexionRutaTramoCtrlService.buscarLocalidadesOrigem(conexionRutaConf.getConexionRutaConfId()));
+			configuraExcecaoPorTipoVenda();
-			lsParadasDestinoB.addAll(conexionRutaTramoCtrlService.buscarLocalidadesDestino(conexionRutaConf.getConexionRutaConfId()));
-			lsParadasDestinoC.addAll(conexionRutaTramoCtrlService.buscarLocalidadesDestinoC(conexionRutaConf.getConexionRutaConfId()));
 			
-			lsParadasTodasOrigemA.addAll(conexionRutaTramoCtrlService.buscarTodasLocalidadesOrigem(conexionRutaConf.getConexionRutaConfId()));
+			configuraRutasPorEixo();
-			lsParadasTodasOrigemA.removeAll(lsParadasOrigemA);
+
-			
+			//Eixo A
-			lsParadasTodasDestinoB.addAll(conexionRutaTramoCtrlService.buscarTodasLocalidadesDestino(conexionRutaConf.getConexionRutaConfId()));
+			configuraLocalidadesEixoA();
-			lsParadasTodasDestinoB.removeAll(lsParadasDestinoB);
+			
-			
+			//Eixo B
-			lsParadasTodasDestinoC.addAll(conexionRutaTramoCtrlService.buscarTodasLocalidadesDestinoC(conexionRutaConf.getConexionRutaConfId()));
+			configuraLocalidadesEixoB();
-			lsParadasTodasDestinoC.removeAll(lsParadasDestinoC);
+			
-			
+			//Eixo C
-			localidadesLinhaASelecionadaList.setData(new ArrayList<Parada>(lsParadasOrigemA));
+			configuraLocalidadesEixoC();
-			localidadesOrigemlList.setData(new ArrayList<Parada>(lsParadasTodasOrigemA));
-			localidadesLinhaBSelecionadaList.setData(new ArrayList<Parada>(lsParadasDestinoB));
-			localidadesDestinoList.setData(new ArrayList<Parada>(lsParadasTodasDestinoB));
-			localidadesLinhaCSelecionadaList.setData(new ArrayList<Parada>(lsParadasDestinoC));
-			localidadesDestinoLinhaCList.setData(new ArrayList<Parada>(lsParadasTodasDestinoC));
 
-			executarPesquisaLocalidadesOrigen();
-			executarPesquisaLocalidadesDestino();
-			executarPesquisaLocalidadesDestinoLinhasC();
 			
-			rutasAList.setData(lsRutaA);
-			rutasBList.setData(lsRutaB);
-			rutasCList.setData(lsRutaC);
 			
 			gerarCombinacao(true);
 		}else{
@@ -187,23 +159,37 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 			btnApagar.setDisabled(true);
 		}
 
-		localidadesLinhaASelecionadaList.setItemRenderer(new RenderConexionRutaRemoveSelecionada(new EventListener() {
+		configuraRendererListaLocalidadesSelecionadasEixoA();
+		
+		configuraRendererListaLocalidadesSelecionadasEixoB();
+		
+		configuraRendererListaLocalidadesSelecionadasEixoC();
+		
+		resultadoCombinacao.setSelected(false);
+		
+	}
+
+	private void configuraRendererListaLocalidadesSelecionadasEixoC() {
+		localidadesLinhaCSelecionadaList.setItemRenderer(new RenderConexionRutaRemoveSelecionada(new EventListener() {
 
 			@Override
 			public void onEvent(Event arg0) throws Exception {
 
 				Parada conexionRutaVO = (Parada) arg0.getTarget().getAttribute("data");
-				for (Object objectParada : localidadesLinhaASelecionadaList.getListData()) {
+				for (Object objectParada : localidadesLinhaCSelecionadaList.getListData()) {
 					if (((Parada) objectParada).equals(conexionRutaVO)) {
-						localidadesLinhaASelecionadaList.removeItem(conexionRutaVO);
+						localidadesLinhaCSelecionadaList.removeItem(conexionRutaVO);
-						if(!localidadesOrigemlList.getListData().contains(conexionRutaVO)) {
+						if(!localidadesDestinoLinhaCList.getListData().contains(conexionRutaVO)) {
-							localidadesOrigemlList.addItemNovo(conexionRutaVO);
+							localidadesDestinoLinhaCList.addItemNovo(conexionRutaVO);
 						}
 						break;
 					}
 				}
 			}
 		}));
+	}
+
+	private void configuraRendererListaLocalidadesSelecionadasEixoB() {
 		localidadesLinhaBSelecionadaList.setItemRenderer(new RenderConexionRutaRemoveSelecionada(new EventListener() {
 
 			@Override
@@ -222,26 +208,107 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 				gerarLocalidadesComunsBC();
 			}
 		}));
-		localidadesLinhaCSelecionadaList.setItemRenderer(new RenderConexionRutaRemoveSelecionada(new EventListener() {
+	}
+
+	private void configuraRendererListaLocalidadesSelecionadasEixoA() {
+		localidadesLinhaASelecionadaList.setItemRenderer(new RenderConexionRutaRemoveSelecionada(new EventListener() {
 
 			@Override
 			public void onEvent(Event arg0) throws Exception {
 
 				Parada conexionRutaVO = (Parada) arg0.getTarget().getAttribute("data");
-				for (Object objectParada : localidadesLinhaCSelecionadaList.getListData()) {
+				for (Object objectParada : localidadesLinhaASelecionadaList.getListData()) {
 					if (((Parada) objectParada).equals(conexionRutaVO)) {
-						localidadesLinhaCSelecionadaList.removeItem(conexionRutaVO);
+						localidadesLinhaASelecionadaList.removeItem(conexionRutaVO);
-						if(!localidadesDestinoLinhaCList.getListData().contains(conexionRutaVO)) {
+						if(!localidadesOrigemlList.getListData().contains(conexionRutaVO)) {
-							localidadesDestinoLinhaCList.addItemNovo(conexionRutaVO);
+							localidadesOrigemlList.addItemNovo(conexionRutaVO);
 						}
 						break;
 					}
 				}
 			}
 		}));
-		
+	}
-		resultadoCombinacao.setSelected(false);
+
-		
+	/**
+	 * Configura localidades eixo C
+	 * @throws InterruptedException
+	 */
+	private void configuraLocalidadesEixoC() throws InterruptedException {
+		Set<Parada> lsParadasTodasPossiveisEixoC = new HashSet<Parada>();
+		Set<Parada> lsParadasCadastradasEixoC = new HashSet<Parada>();
+		lsParadasCadastradasEixoC.addAll(conexionRutaTramoCtrlService.buscarLocalidadesEixoC(conexionRutaConf.getConexionRutaConfId()));			
+		lsParadasTodasPossiveisEixoC.addAll(conexionRutaTramoCtrlService.buscarTodasLocalidadesDestinoC(conexionRutaConf.getConexionRutaConfId()));
+		lsParadasTodasPossiveisEixoC.removeAll(lsParadasCadastradasEixoC);
+		localidadesLinhaCSelecionadaList.setData(new ArrayList<Parada>(lsParadasCadastradasEixoC));
+		localidadesDestinoLinhaCList.setData(new ArrayList<Parada>(lsParadasTodasPossiveisEixoC));
+		executarPesquisaLocalidadesDestinoLinhasC();
+	}
+
+	/**
+	 * Configura localidades eixo B
+	 * @throws InterruptedException
+	 */
+	private void configuraLocalidadesEixoB() throws InterruptedException {
+		Set<Parada> lsParadasTodasPossiveisEixoB = new HashSet<Parada>();
+		Set<Parada> lsParadasCadastradasEixoB = new HashSet<Parada>();
+		lsParadasCadastradasEixoB.addAll(conexionRutaTramoCtrlService.buscarLocalidadeEixoB(conexionRutaConf.getConexionRutaConfId()));
+		lsParadasTodasPossiveisEixoB.addAll(conexionRutaTramoCtrlService.buscarTodasLocalidadesDestino(conexionRutaConf.getConexionRutaConfId()));
+		lsParadasTodasPossiveisEixoB.removeAll(lsParadasCadastradasEixoB);
+		localidadesLinhaBSelecionadaList.setData(new ArrayList<Parada>(lsParadasCadastradasEixoB));
+		localidadesDestinoList.setData(new ArrayList<Parada>(lsParadasTodasPossiveisEixoB));
+		executarPesquisaLocalidadesDestino();
+	}
+
+	/**
+	 * Configura localidades eixo A
+	 * @throws InterruptedException
+	 */
+	private void configuraLocalidadesEixoA() throws InterruptedException {
+		Set<Parada> lsParadasTodasPossiveisEixoA = new HashSet<Parada>();
+		Set<Parada> lsParadasCadastradasEixoA = new HashSet<Parada>();
+		lsParadasCadastradasEixoA.addAll(conexionRutaTramoCtrlService.buscarLocalidadesEixoA(conexionRutaConf.getConexionRutaConfId()));
+		lsParadasTodasPossiveisEixoA.addAll(conexionRutaTramoCtrlService.buscarTodasLocalidadesOrigem(conexionRutaConf.getConexionRutaConfId()));
+		lsParadasTodasPossiveisEixoA.removeAll(lsParadasCadastradasEixoA);
+		localidadesLinhaASelecionadaList.setData(new ArrayList<Parada>(lsParadasCadastradasEixoA));
+		localidadesOrigemlList.setData(new ArrayList<Parada>(lsParadasTodasPossiveisEixoA));
+		executarPesquisaLocalidadesOrigen();
+	}
+
+	/**
+	 * Configura as rutas (linhas) para cada eixo
+	 */
+	private void configuraRutasPorEixo() {
+		//Busca uma lista de linhas (rutas), esta lista contem 3 sub-listas (1 para cada eixo de conexão A, B e C)
+		List<List<Ruta>> rutas = conexionRutaConfService.buscarRutasPorConexionConf(conexionRutaConf.getConexionRutaConfId());
+		List<Ruta> lsRutaA = rutas.get(0);
+		List<Ruta> lsRutaB = rutas.get(1);
+		List<Ruta> lsRutaC = rutas.get(2);
+		rutasAList.setData(lsRutaA);
+		rutasBList.setData(lsRutaB);
+		rutasCList.setData(lsRutaC);
+	}
+
+	/**
+	 * Configura a lista de exceções por tipo de venda (canal de venda)
+	 */
+	private void configuraExcecaoPorTipoVenda() {
+		//Busca a lista de exceções por tipo de venda (canal de venda)
+		List<ConexionRutaExcepcionTipoPtoVta> conexionRutaExcepcionTipoPtoVtaList =  conexionRutaExcepcionTipoPtoVtaService.buscarPorConexionConf(conexionRutaConf);
+		for (ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionTipoPtoVta:conexionRutaExcepcionTipoPtoVtaList ) {
+			listEspCanal.addItemNovo(conexionRutaExcepcionTipoPtoVta.getTipoPtovta());
+		}
+	}
+
+	/**
+	 * Configura a lista de exceções por ponto de venda
+	 */
+	private void configuraExcecaoPorPontoVenda() {
+		//Busca a lista de exceções por ponto de venda
+		List<ConexionRutaExcepcionPtoVta> conexionRutaExcepcionPtoVtaList = conexionRutaRestricaoPtoVtaService.buscarPorConexionConf(conexionRutaConf);
+		for (ConexionRutaExcepcionPtoVta conexionRutaExcepcionPtoVta : conexionRutaExcepcionPtoVtaList) {
+			listPuntoVenta.addItemNovo(conexionRutaExcepcionPtoVta.getPuntoVenta());
+		}
 	}
 
 	@SuppressWarnings("unchecked")
@@ -310,6 +377,42 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 	public void onClick$btnPesquisaLocalidadesDestino(Event ev) throws InterruptedException {
 		executarPesquisaLocalidadesDestino();
 	}
+	
+	public void renderizarLinhasAB() {
+		localidadesComunsList.setItemRenderer(new RenderEixoConexionRutaRemoveSelecionada(new EventListener() {
+	
+			@Override
+			public void onEvent(Event arg0) throws Exception {
+	
+				Parada conexionRutaVO = (Parada) arg0.getTarget().getAttribute("data");
+				for (Object objectParada : localidadesComunsList.getListData()) {
+					if (((Parada) objectParada).equals(conexionRutaVO)) {
+						localidadesComunsList.removeItem(conexionRutaVO);
+						lsLocalidadesComunsAB.remove(conexionRutaVO);
+						break;
+					}
+				}
+			}
+		}));
+	}
+
+	public void renderizarLinhasBC() {
+		localidadesComunsDestinoCList.setItemRenderer(new RenderEixoConexionRutaRemoveSelecionada(new EventListener() {
+	
+			@Override
+			public void onEvent(Event arg0) throws Exception {
+	
+				Parada conexionRutaVO = (Parada) arg0.getTarget().getAttribute("data");
+				for (Object objectParada : localidadesComunsDestinoCList.getListData()) {
+					if (((Parada) objectParada).equals(conexionRutaVO)) {
+						localidadesComunsDestinoCList.removeItem(conexionRutaVO);
+						lsLocalidadesComunsLinhasBC.remove(conexionRutaVO);
+						break;
+					}
+				}
+			}
+		}));
+	}
 
 	private void executarPesquisaLocalidadesOrigen() throws InterruptedException {
 
@@ -435,16 +538,17 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 		localidadesLinhaASelecionadaList.getListData().removeAll(paradasDuplicadas);
 		localidadesLinhaBSelecionadaList.getListData().removeAll(paradasDuplicadas);
 
-		if(lsLocalidadesComuns!=null) {
+		if(lsLocalidadesComunsAB!=null) {
 			for (Parada parada : paradasDuplicadas) {
-				if(!lsLocalidadesComuns.contains(parada)){
+				if(!lsLocalidadesComunsAB.contains(parada)){
-					lsLocalidadesComuns.add(parada);
+					lsLocalidadesComunsAB.add(parada);
 				}
 			}
 		}else {
-			lsLocalidadesComuns = new ArrayList<Parada>(paradasDuplicadas);						
+			lsLocalidadesComunsAB = new ArrayList<Parada>(paradasDuplicadas);						
 		}
-		localidadesComunsList.setModel(new ListModelList(lsLocalidadesComuns));
+		localidadesComunsList.setData(lsLocalidadesComunsAB);
+		renderizarLinhasAB();
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -463,7 +567,8 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 		}else {
 			lsLocalidadesComunsLinhasBC = new ArrayList<Parada>(paradasDuplicadas);			
 		}
-		localidadesComunsDestinoCList.setModel(new ListModelList(lsLocalidadesComunsLinhasBC));
+		localidadesComunsDestinoCList.setData(new ListModelList(lsLocalidadesComunsLinhasBC));
+		renderizarLinhasBC();
 		
 	}
 	
@@ -474,7 +579,7 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 	}
 
 	public void onClick$btnCombinarTrechos(Event ev) throws InterruptedException {
-		if (lsLocalidadesComuns == null || lsLocalidadesComuns.isEmpty()) {
+		if (lsLocalidadesComunsAB == null || lsLocalidadesComunsAB.isEmpty()) {
 			Messagebox.show(Labels.getLabel("editarConexionPorRutaController.MSG.selecionarConexion"),
 					Labels.getLabel("editarConexionPorRutaController.window.title"),
 					Messagebox.OK, Messagebox.INFORMATION);
@@ -649,6 +754,7 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	public void onClick$btnNovoRutaB(Event ev) throws InterruptedException {
 
 		if (!validarLinhaJaSelecionada()) {
@@ -672,7 +778,6 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 			if(rutaB.getRutaId() == -1){
 				rutasBList.clear();
 			}else {
-				@SuppressWarnings("unchecked")
 				List<Ruta> canaisVenta = rutasBList.getListData();
 				for (Ruta rutaAux : canaisVenta) {
 					if(rutaB.getRutaId() == -1){
@@ -723,6 +828,7 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 			}
 		}
 	}
+	@SuppressWarnings("unchecked")
 	public void onClick$btnNovoRutaC(Event ev) throws InterruptedException {
 	
 
@@ -747,7 +853,6 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 			if(rutaC.getRutaId() == -1){
 				rutasCList.clear();
 			}else {
-				@SuppressWarnings("unchecked")
 				List<Ruta> canaisVenta = rutasCList.getListData();
 				for (Ruta rutaAux : canaisVenta) {
 					if(rutaC.getRutaId() == -1){
@@ -823,11 +928,11 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 	}
 
 	public List<Parada> getLsLocalidadesComuns() {
-		return lsLocalidadesComuns;
+		return lsLocalidadesComunsAB;
 	}
 
 	public void setLsLocalidadesComuns(List<Parada> lsLocalidadesComuns) {
-		this.lsLocalidadesComuns = lsLocalidadesComuns;
+		this.lsLocalidadesComunsAB = lsLocalidadesComuns;
 	}
 	
 	public List<Parada> getLsLocalidadesComunsLinhasBC() {

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/GerarCombinacionTramoRutaController.java

@@ -88,7 +88,9 @@ public class GerarCombinacionTramoRutaController extends MyGenericForwardCompose
 			rutaDB.setClaseServicio(clase);
 			
 			if (rutaDB.getRutaId() == null) {
-				rutaDB.setIsClone(true);
+				if(!ruta.getIsClone()){
+				rutaDB.setIsCadastro(true);
+				}
 				rutaDB = salvarNovaRuta(rutaDB);	
 			}
 			

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

@@ -18,6 +18,7 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Filedownload;
+import org.zkoss.zul.Radiogroup;
 import org.zkoss.zul.Textbox;
 
 import com.rjconsultores.integracaoreceitadespesa.BGMApplication;
@@ -43,6 +44,7 @@ public class RelatorioArquivoBGMController extends MyGenericForwardComposer {
 	private Datebox datInicial;
 	private Datebox datFinal;
 	private Textbox txtArquivo;
+	private Radiogroup rgLayout;
 
 	@Autowired
 	private ConstanteService constanteService;
@@ -87,6 +89,8 @@ public class RelatorioArquivoBGMController extends MyGenericForwardComposer {
 	private void executarRelatorio() throws Exception {	 		
 		Integer puntoVentaId = ((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue()).getPuntoventaId();
 		Integer empresaId = ((Empresa)cmbEmpresa.getSelectedItem().getValue()).getEmpresaId();
+		String layoutRelatorio = rgLayout.getSelectedItem().getValue();
+		
 		Connection con = dataSource.getConnection();
 		
 		String fileZip = BGMApplication.getInstance().executaExportacao(
@@ -100,7 +104,8 @@ public class RelatorioArquivoBGMController extends MyGenericForwardComposer {
 				ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_INCLUI_TIPO_PAGAMENTO_TURISMO_BGM.getDescricao()),
 				false,
 				ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_COD_RECEITA_FIXO_BGM.getDescricao()),
-				ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_RECEITA_DESPESAS_OURO_PRATA.getDescricao()));
+				ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_RECEITA_DESPESAS_OURO_PRATA.getDescricao()),
+				layoutRelatorio.equals("NOVO"));
 		
 		if(this.getPathExternoGravacaoArquivo() != null){
 			Messagebox.show(Labels.getLabel("relatorioArquivoBGMController.arquivoGeradoNoServidor.value"),

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
@@ -25,6 +26,7 @@ import org.zkoss.zul.Textbox;
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPe;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBpeNumeracaoReuso;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPeRejeitadoEnvioContingencia;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
@@ -100,6 +102,7 @@ public class RelatorioBPeController extends MyGenericForwardComposer {
 		filtro.append("UF: ");
 		String estadosIds = "";
 		String UFs = "";
+		String empresasIds = "";
 		List<Object> lsEstadosSelecionados = estadoList.getItensSelecionados();
 
 		if (!lsEstadosSelecionados.isEmpty()) {
@@ -119,15 +122,30 @@ public class RelatorioBPeController extends MyGenericForwardComposer {
 		filtro.append(UFs).append(";");
 		
 		filtro.append("Empresa: ");
-		Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
+		
-		if (itemEmpresa != null) {
+	
-			Empresa empresa = (Empresa) itemEmpresa.getValue();
+		if (cmbEmpresa.getSelectedItem() == null && rdbGroup.getSelectedItem().getValue().equals("NR")) {
-			parametros.put("EMPRESA_ID", empresa.getEmpresaId());
+			for (int i = 0; i < lsEmpresa.size(); i++) {
-			filtro.append(empresa.getNombempresa()).append(";");
+				Empresa empresa = (Empresa) lsEmpresa.get(i);
-		} else {
+				if(!BooleanUtils.toBoolean(empresa.getIndReaproveitarNumBPeRejeitado())){
+					empresasIds = empresasIds + empresa.getEmpresaId() + ",";
+				}				
+			}
+			empresasIds = empresasIds.substring(0, empresasIds.length() - 1);
+			parametros.put("EMPRESA_ID", empresasIds);	
 			filtro.append(" Todas; ");
+		}else{
+			Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
+			if (itemEmpresa != null) {
+				Empresa empresa = (Empresa) itemEmpresa.getValue();
+				parametros.put("EMPRESA_ID", String.valueOf(empresa.getEmpresaId()));
+				filtro.append(empresa.getNombempresa()).append(";");
+			} else {
+				filtro.append(" Todas; ");
+			}
 		}
 		
+		
 		filtro.append(" Status: ").append(rdbGroup.getSelectedItem().getLabel()).append("; ");
 		parametros.put("STATUS", rdbGroup.getSelectedItem().getValue());
 		
@@ -151,7 +169,10 @@ public class RelatorioBPeController extends MyGenericForwardComposer {
 		Relatorio relatorio = null;
 		if(rdbGroup.getSelectedItem().getValue().equals("RC") || rdbGroup.getSelectedItem().getValue().equals("R")) {
 			relatorio = new RelatorioBPeRejeitadoEnvioContingencia(parametros, dataSourceRead.getConnection());
-		} else {
+		} else if(rdbGroup.getSelectedItem().getValue().equals("NR")) {
+			relatorio = new RelatorioBpeNumeracaoReuso(parametros, dataSourceRead.getConnection());
+		}
+		else {
 			relatorio = new RelatorioBPe(parametros, dataSourceRead.getConnection());
 		}
 
@@ -163,7 +184,29 @@ public class RelatorioBPeController extends MyGenericForwardComposer {
 	}
 
 	private boolean validar() {
+		
+
 		try {
+			if(rdbGroup.getSelectedItem().getValue().equals("NR")){
+				if (cmbEmpresa.getSelectedItem() != null) {
+					Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue();
+					if(BooleanUtils.toBoolean(empresa.getIndReaproveitarNumBPeRejeitado())){
+						Messagebox.show(Labels.getLabel("relatorioBPeController.MSG.NaoPermitirReusoBPE"),
+								Labels.getLabel("relatorioBPeController.window.title"),
+								Messagebox.OK, Messagebox.INFORMATION);
+						return false;
+					}
+				}
+			}
+			if(rdbGroup.getSelectedItem().getValue().equals("T")){				
+				List<Object> lsEstadosSelecionados = estadoList.getItensSelecionados();
+				if ((lsEstadosSelecionados.isEmpty()) || (!lsEstadosSelecionados.isEmpty() && lsEstadosSelecionados.size() > 1)) {
+					Messagebox.show(Labels.getLabel("relatorioBPeController.MSG.NaoPermitirTodasOpcoesEstado"),
+							Labels.getLabel("relatorioBPeController.window.title"),
+							Messagebox.OK, Messagebox.INFORMATION);
+					return false;
+				}
+			}
 			txtChBpe.getValue();
 			txtNumBpe.getValue();
 			

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

@@ -1,5 +1,6 @@
 package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -15,6 +16,7 @@ import org.zkoss.zul.Datebox;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBaixasVendasInternet;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBaixasVendasInternetSintetico;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 
@@ -33,20 +35,32 @@ public class RelatorioBaixasVendasInternetController extends MyGenericForwardCom
 	
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
 		Map<String, Object> args = new HashMap<String, Object>();
+		String title = null;
+		
 		PuntoVenta puntoVenta = (PuntoVenta) cmbPuntoVenta.getSelectedItem().getValue();
-		if (puntoVenta != null && puntoVenta.getPuntoventaId() != null && puntoVenta.getPuntoventaId() != -1) {
+		
-			RelatorioBaixasVendasInternet relatorio = new RelatorioBaixasVendasInternet(dataSourceRead.getConnection(), fecInicio.getValue(), fecFinal.getValue(), puntoVenta);
+		Date datInicial = null;
-			args.put("relatorio", relatorio);
+		if (this.fecInicio.getValue() != null) {
-			openWindow("/component/reportView.zul",
+			datInicial = DateUtil.inicioFecha(this.fecInicio.getValue());
-					   Labels.getLabel("indexController.mniRelatorioBaixasVendasInternet.label"), args, MODAL);
+		}
-		} else {
+
-			// criar o relatorio sintetico com a outra consulta
+		Date datFinal = null;
-			RelatorioBaixasVendasInternetSintetico relatorio = new RelatorioBaixasVendasInternetSintetico(dataSourceRead.getConnection(), fecInicio.getValue(), fecFinal.getValue());
+		if (this.fecFinal.getValue() != null) {
-			args.put("relatorio", relatorio);
+			datFinal = DateUtil.fimFecha(this.fecFinal.getValue());
-			openWindow("/component/reportView.zul",
-					   Labels.getLabel("indexController.mniRelatorioBaixasVendasInternetSintetico.label"), args, MODAL);
 		}
 		
+		if (puntoVenta != null && puntoVenta.getPuntoventaId() != null && puntoVenta.getPuntoventaId() != -1) {
+			RelatorioBaixasVendasInternet relatorio = new RelatorioBaixasVendasInternet(dataSourceRead.getConnection(), datInicial, datFinal, puntoVenta);
+			args.put("relatorio", relatorio);
+			title = Labels.getLabel("indexController.mniRelatorioBaixasVendasInternet.label");
+
+		} else {
+			// criar o relatorio sintetico com a outra consulta
+			RelatorioBaixasVendasInternetSintetico relatorio = new RelatorioBaixasVendasInternetSintetico(dataSourceRead.getConnection(), datInicial, datFinal);
+			args.put("relatorio", relatorio);
+			title = Labels.getLabel("indexController.mniRelatorioBaixasVendasInternetSintetico.label");
+		}
+		
+		openWindow("/component/reportView.zul", title, args, MODAL);
 	}
-	
 }

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

@@ -27,6 +27,7 @@ import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.entidad.Usuario;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioCheckin;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@@ -52,10 +53,11 @@ public class RelatorioCheckinController extends MyGenericForwardComposer {
 	private transient PagedListWrapper<Usuario> plwUsuario;
 	private MyListbox usuarioList;
 	private MyListbox usuarioSelList;
-
 	private MyComboboxParada cmbParadaOrigem;
 	private MyComboboxParadaCve cmbParadaOrigemCve;
 
+	
+
 	@Autowired
 	private DataSource dataSourceRead;
 
@@ -76,7 +78,7 @@ public class RelatorioCheckinController extends MyGenericForwardComposer {
 		
 		usuarioList.setItemRenderer(new RenderRelatorioCheckinUsuario());
 		usuarioSelList.setItemRenderer(new RenderRelatorioCheckinUsuariosSelecionados());
-		
+
 	}
 	
 	public void onClick$btnPesquisa(Event ev) {
@@ -133,7 +135,10 @@ public class RelatorioCheckinController extends MyGenericForwardComposer {
 		parametros.put("DATA_FINAL", datFinal.getValue());
 		parametros.put("ORIGEN_ID", origenId);
 		parametros.put("ORIGEN", origen);
-		parametros.put("NOME_RELATORIO", Labels.getLabel("indexController.mniRelatorioCheckin.label"));
+		parametros.put("nombUsuario", UsuarioLogado.getUsuarioLogado().getNombusuario().toString());
+		String nomeRelatorio = Labels.getLabel("indexController.mniRelatorioCheckin.label");
+		
+		parametros.put("NOME_RELATORIO", nomeRelatorio);
 		
 		String usuariosIds = "";
 		for (int i = 0; i < lsUsuariosSelecionados.size(); i++) {

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

@@ -14,10 +14,12 @@ import org.springframework.stereotype.Controller;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Datebox;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Parada;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioCheckinAberto;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEncerramentoCheckin;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
@@ -31,7 +33,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 @Controller("relatorioEncerramentoCheckinController")
 @Scope("prototype")
 @SuppressWarnings("serial")
-public class RelatorioEncerramentoCheckinController extends MyGenericForwardComposer {
+public class RelatorioCheckinEnacerramentoAbertoController extends MyGenericForwardComposer {
 
 	@Autowired
 	private DataSource dataSourceRead;
@@ -46,11 +48,14 @@ public class RelatorioEncerramentoCheckinController extends MyGenericForwardComp
 	private MyComboboxEstandar cmbEmpresa;
 	private MyComboboxParada cmbLocalidade;
 	private List<Empresa> lsEmpresas;
+	private Checkbox chcEncerrado;
+	private Checkbox chcAberto;
 	
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 		super.doAfterCompose(comp);
 		lsEmpresas = empresaService.obtenerTodos();
+		chcEncerrado.setChecked(Boolean.TRUE);
 	}
 	
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
@@ -59,7 +64,6 @@ public class RelatorioEncerramentoCheckinController extends MyGenericForwardComp
 
 	private void executarRelatorio() throws Exception {
 		Map<String, Object> parametros = new HashMap<String, Object>();
-		parametros.put("TITULO", Labels.getLabel("relatorioEncerramentoCheckinController.window.title"));
 
 		// Datas
 		putParametrosDate(parametros, RelatorioEncerramentoCheckin.DATA_INICIO_SERVICO, this.dataInicioServico.getValue());
@@ -97,12 +101,25 @@ public class RelatorioEncerramentoCheckinController extends MyGenericForwardComp
 			parametros.put("localidade_id", ((Parada) cmbLocalidade.getSelectedItem().getValue()).getParadaId());
 		}
 
-		Relatorio relatorio = new RelatorioEncerramentoCheckin(parametros, dataSourceRead.getConnection());
+		Relatorio relatorio = null;
+		if(chcEncerrado.isChecked()) {
+			parametros.put("TITULO", Labels.getLabel("relatorioEncerramentoCheckinController.window.title"));
+			relatorio = new RelatorioEncerramentoCheckin(parametros, dataSourceRead.getConnection());
+		}else {
+			parametros.put("TITULO", Labels.getLabel("relatorioCheckinAbertoController.window.title"));
+			relatorio = new RelatorioCheckinAberto(parametros, dataSourceRead.getConnection());
+		}
+		
 
 		Map<String, Object> args = new HashMap<String, Object>();
 		args.put("relatorio", relatorio);
 
-		openWindow("/component/reportView.zul", Labels.getLabel("relatorioEncerramentoCheckinController.window.title"), args, MODAL);
+		if(chcEncerrado.isChecked()) {
+			openWindow("/component/reportView.zul", Labels.getLabel("relatorioEncerramentoCheckinController.window.title"), args, MODAL);			
+		}else {
+			openWindow("/component/reportView.zul", Labels.getLabel("relatorioCheckinAbertoController.window.title"), args, MODAL);
+		}
+		
 	}
 
 	private void putParametrosDate(Map<String, Object> parametros, String nomeParametro, Date data) {

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

@@ -38,6 +38,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchOb
 import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderClienteSimples;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioLinhaHorario;
+import com.trg.search.Filter;
 
 @Controller("relatorioGratuidadeAGRController")
 @Scope("prototype")
@@ -108,22 +109,6 @@ public class RelatorioGratuidadeAGRController extends MyGenericForwardComposer {
 		linhaListSelList.addItemNovo(linhaList.getSelected());
 	}
 	
-	public MyListbox getSelectedTipoGratuidadeList() {
-		return selectedTipoGratuidadeList;
-	}
-
-	public void setSelectedTipoGratuidadeList(MyListbox selectedTipoGratuidadeList) {
-		this.selectedTipoGratuidadeList = selectedTipoGratuidadeList;
-	}
-
-	public List<Categoria> getListSelectedTipoGratuidade() {
-		return listSelectedTipoGratuidade;
-	}
-
-	public void setListSelectedTipoGratuidade(List<Categoria> listSelectedTipoGratuidade) {
-		this.listSelectedTipoGratuidade = listSelectedTipoGratuidade;
-	}
-	
 	private void executarPesquisaLinha() {
 
 		String palavraPesquisaRuta = txtPalavraPesquisaLinha.getText();
@@ -263,7 +248,11 @@ public class RelatorioGratuidadeAGRController extends MyGenericForwardComposer {
 		HibernateSearchObject<Cliente> clienteBusqueda =
 				new HibernateSearchObject<Cliente>(Cliente.class, pagingCliente.getPageSize());
 		if(txtCliente.getValue() != null && !txtCliente.getValue().equals("") ){
-			clienteBusqueda.addFilterILike("nombcliente", txtCliente.getValue() + "%");
+			Filter filterNome = new Filter("nombcliente", txtCliente.getValue() + "%", Filter.OP_ILIKE);
+			Filter filterCpf = new Filter("numIdentificaUno", txtCliente.getValue() + "%", Filter.OP_ILIKE);
+			Filter filterCpf2 = new Filter("numIdentificaDos", txtCliente.getValue() + "%", Filter.OP_ILIKE);
+			
+			clienteBusqueda.addFilterOr( filterNome, filterCpf, filterCpf2 );
 			clienteBusqueda.addFilterEqual("activo", Boolean.TRUE);
 			clienteBusqueda.addSortAsc("nombcliente");
 			
@@ -390,5 +379,21 @@ public class RelatorioGratuidadeAGRController extends MyGenericForwardComposer {
 	public void setPagingCliente(Paging pagingCliente) {
 		this.pagingCliente = pagingCliente;
 	}
+	
+	public MyListbox getSelectedTipoGratuidadeList() {
+		return selectedTipoGratuidadeList;
+	}
+
+	public void setSelectedTipoGratuidadeList(MyListbox selectedTipoGratuidadeList) {
+		this.selectedTipoGratuidadeList = selectedTipoGratuidadeList;
+	}
+
+	public List<Categoria> getListSelectedTipoGratuidade() {
+		return listSelectedTipoGratuidade;
+	}
+
+	public void setListSelectedTipoGratuidade(List<Categoria> listSelectedTipoGratuidade) {
+		this.listSelectedTipoGratuidade = listSelectedTipoGratuidade;
+	}
 
 }

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

@@ -214,9 +214,9 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos
 
 		parametros.put("DATA_INICIO", datInicial.getValue());
 		parametros.put("DATA_FINAL", datFinal.getValue());
-		String passagemAberta = "";
+		String passagemAberta = " and (cj.feccorrida is null and cj.corrida_id is null) ";
 		if (!chkPassageiroAberto.isChecked()) {
-			passagemAberta = "T";
+			passagemAberta = " and (cj.feccorrida is not null and cj.corrida_id is not null) ";
 		}
 		parametros.put("PASSAGEM_ABERTA", passagemAberta);
 		Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue();

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

@@ -28,6 +28,7 @@ import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
 import com.rjconsultores.ventaboletos.entidad.Usuario;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasCartoes;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasCartoesAlternativo;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
@@ -40,7 +41,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
 import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
-import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPuntoVentaSimple;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTipoPuntoVenta;
 import com.trg.search.Filter;
 
@@ -51,7 +51,7 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 	private static final long serialVersionUID = 1L;
 
 	private Datebox dataInicial;
-	private Datebox dataFinal;	
+	private Datebox dataFinal;
 	private MyComboboxEstandar cmbEmpresa;
 	private MyComboboxPuntoVenta cmbPuntoVenta;
 	private MyComboboxEstacion cmbEstacion;
@@ -69,16 +69,16 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 	private static final String TODOS_VALUE = new Integer(-1).toString();
 	private static final String TODOS = "TODAS";
 	private Bandbox bbPesquisaPuntoVenta;
-	
+
 	private Radio radioDataVenda;
-	
+
 	@Autowired
-	private DataSource dataSourceRead;	
+	private DataSource dataSourceRead;
-	
+
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 
-		super.doAfterCompose(comp);		
+		super.doAfterCompose(comp);
 		lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
 		lsTipoPuntoVenta = tipoPuntoVentaService.obtenerTodos();
 		tipoPuntoVentaSelList.setItemRenderer(new RenderTipoPuntoVenta());
@@ -89,18 +89,17 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 	 * 
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private void executarRelatorio() throws Exception {
+	private void executarRelatorio(boolean isLayoutAlternatico) throws Exception {
 		Map<String, Object> parametros = new HashMap<String, Object>();
-		
 
-		if(dataInicial.getValue() == null){
+		if (dataInicial.getValue() == null) {
 			return;
 		}
-		if(dataFinal.getValue() == null){
+		if (dataFinal.getValue() == null) {
 			return;
 		}
 		parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioVendasCartoesController.window.title"));
-		
+
 		lsTipoPuntoVenta = new ArrayList(Arrays.asList(tipoPuntoVentaSelList.getData()));
 
 		if (lsTipoPuntoVenta.size() > 0) {
@@ -118,13 +117,13 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 			parametros.put("TIPOPUNTOVENTA_ID", TODOS_VALUE);
 			parametros.put("TIPOPUNTOVENTA", TODOS);
 		}
-		
+
 		StringBuilder filtro = new StringBuilder("Filtros\n");
 
 		Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
 		if (itemEmpresa != null) {
 			Empresa empresa = (Empresa) itemEmpresa.getValue();
-			if(empresa.getEmpresaId() > -1) {
+			if (empresa.getEmpresaId() > -1) {
 				parametros.put("EMPRESA", empresa);
 				parametros.put("NOME_EMPRESA", empresa.getNombempresa());
 				filtro.append(empresa.getNombempresa());
@@ -134,48 +133,56 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 		} else {
 			filtro.append("Todas");
 		}
+
 		Comboitem itemPuntoVenta = cmbPuntoVenta.getSelectedItem();
 		if (itemPuntoVenta != null) {
 			PuntoVenta puntoVenta = (PuntoVenta) itemPuntoVenta.getValue();
-			if(puntoVenta.getPuntoventaId() > -1) {
+			if (puntoVenta.getPuntoventaId() > -1) {
 				parametros.put("PUNTOVENTA", puntoVenta);
 				parametros.put("NOME_AGENCIA", puntoVenta.getNombpuntoventa());
 			} else {
 				parametros.put("NOME_AGENCIA", "Todas");
-			} 
+			}
-		}else {
+		} else {
 			parametros.put("NOME_AGENCIA", "Todas");
 		}
+
 		Comboitem cbiUsuario = cmbUsuario.getSelectedItem();
 		if (cbiUsuario != null) {
 			Usuario usuario = (Usuario) cbiUsuario.getValue();
-			if(usuario.getUsuarioId() > -1) {
+			if (usuario.getUsuarioId() > -1) {
 				parametros.put("USUARIO", usuario);
 				parametros.put("NOME_USUARIO", usuario.getNombUsuarioCompleto());
 			} else {
 				parametros.put("NOME_USUARIO", "Todos");
 			}
-		}else {
+		} else {
 			parametros.put("NOME_USUARIO", "Todos");
 		}
+
 		Comboitem itemEstacion = cmbEstacion.getSelectedItem();
 		if (itemEstacion != null) {
 			Estacion estacion = (Estacion) itemEstacion.getValue();
-			if(estacion.getEstacionId() > -1) {
+			if (estacion.getEstacionId() > -1) {
 				parametros.put("ESTACION", estacion);
 				parametros.put("ESTACAO", estacion.getDescestacion());
-			}
+			} else {
-			else {
 				parametros.put("ESTACAO", "Todas");
 			}
-		}else {
+		} else {
 			parametros.put("ESTACAO", "Todas");
 		}
+
 		parametros.put("DATA_INICIAL", DateUtil.getStringDate(dataInicial.getValue(), "dd/MM/yyyy"));
 		parametros.put("DATA_FINAL", DateUtil.getStringDate(dataFinal.getValue(), "dd/MM/yyyy"));
-		
+
-		parametros.put("FILTROS", filtro.toString());	
+		parametros.put("FILTROS", filtro.toString());
-		Relatorio relatorio = new RelatorioVendasCartoes(parametros, dataSourceRead.getConnection(), radioDataVenda.isSelected());
+		Relatorio relatorio = null;
+		if (isLayoutAlternatico) {
+			relatorio = new RelatorioVendasCartoesAlternativo(parametros, dataSourceRead.getConnection(), radioDataVenda.isSelected());
+		} else {
+			relatorio = new RelatorioVendasCartoes(parametros, dataSourceRead.getConnection(), radioDataVenda.isSelected());
+		}
 
 		Map args = new HashMap();
 		args.put("relatorio", relatorio);
@@ -183,8 +190,7 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 		openWindow("/component/reportView.zul",
 				Labels.getLabel("relatorioVendasCartoesController.window.title"), args, MODAL);
 	}
-	
+
-	
 	public void onClick$btnPesquisa(Event ev) {
 		executarPesquisa();
 	}
@@ -193,7 +199,7 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 
 		HibernateSearchObject<TipoPuntoVenta> tipoPuntoVentaBusqueda = new HibernateSearchObject<TipoPuntoVenta>(TipoPuntoVenta.class,
 				pagingtipoPuntoVenta.getPageSize());
-		
+
 		tipoPuntoVentaBusqueda.addFilterOr(Filter.like("desctipo", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%")), Filter.like("desctipo", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%")));
 
 		tipoPuntoVentaBusqueda.addSortAsc("desctipo");
@@ -211,27 +217,26 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 			}
 		}
 	}
-	public void onClick$btnExecutarRelatorio(Event ev) throws Exception{
-		executarRelatorio();
-	}
-	
-	public void onDoubleClick$tipoPuntoVentaList(Event ev) {
 
+	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
+		executarRelatorio(false);
+	}
+
+	public void onClick$btnExecutarRelatorioAlternativo(Event ev) throws Exception {
+		executarRelatorio(true);
+	}
+
+	public void onDoubleClick$tipoPuntoVentaList(Event ev) {
 		TipoPuntoVenta puntoVentaSel = (TipoPuntoVenta) tipoPuntoVentaList.getSelected();
 		tipoPuntoVentaSelList.addItemNovo(puntoVentaSel);
-
 	}
-	
-	public void onDoubleClick$tipoPuntoVentaSelList(Event ev) {
 
+	public void onDoubleClick$tipoPuntoVentaSelList(Event ev) {
 		TipoPuntoVenta puntoVentaSel = (TipoPuntoVenta) tipoPuntoVentaSelList.getSelected();
 		tipoPuntoVentaSelList.removeItem(puntoVentaSel);
-
 	}
-	
 
 	private void limparPesquisaTipoAgencia() {
-
 		tipoPuntoVentaList.clearSelection();
 		lsTipoPuntoVenta.clear();
 		this.bbPesquisaPuntoVenta.setValue("");
@@ -240,12 +245,11 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer {
 	public Datebox getDatInicial() {
 		return dataInicial;
 	}
-	
+
 	public void onClick$btnLimpar(Event ev) {
 		limparPesquisaTipoAgencia();
 	}
 
-
 	public void setDatInicial(Datebox datInicial) {
 		this.dataInicial = datInicial;
 	}

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/remessa/ImportarRetornoBancarioController.java

@@ -0,0 +1,108 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.remessa;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.media.Media;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zhtml.Filedownload;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.UploadEvent;
+import org.zkoss.zul.Messagebox;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.service.EmpresaService;
+import com.rjconsultores.ventaboletos.service.ImportacaoRetornoBancarioService;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+
+@Controller("importarRetornoBancarioController")
+@Scope("prototype")
+public class ImportarRetornoBancarioController extends MyGenericForwardComposer {
+
+	private static final long serialVersionUID = 1L;
+	@Autowired
+	private ImportacaoRetornoBancarioService importacaoRetornoBancarioService;
+	
+	@Autowired
+	private EmpresaService empresaService;
+	
+	private List<Empresa> lsEmpresa;
+	private MyComboboxEstandar cmbEmpresa;
+	
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+		super.doAfterCompose(comp);
+		
+		lsEmpresa = new ArrayList<Empresa>();		
+		lsEmpresa.addAll(empresaService.obtenerTodos());
+	}
+
+	public void onUpload(UploadEvent event) throws IOException, InterruptedException {
+		final String resultado;
+		
+		if (cmbEmpresa.getSelectedItem() == null){
+			Messagebox.show(Labels.getLabel("relatorioRetornoBancario.MSG.erroSemEmpresa"),
+					Labels.getLabel("importarClientesController.window.title"),
+					Messagebox.OK, Messagebox.INFORMATION);
+			return;
+		}
+				
+		Media media = event.getMedia();
+		if(media.getName().toLowerCase().endsWith(".ret")){
+			Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue();
+			ByteArrayInputStream bais = new ByteArrayInputStream( media.getByteData()) ;
+			resultado = importacaoRetornoBancarioService.lerArquivo(bais, empresa);
+		}else{
+			Messagebox.show(Labels.getLabel("relatorioRetornoBancario.MSG.extensaoInvalida"),
+					Labels.getLabel("importarRetornoBancarioController.window.title"),
+					Messagebox.OK, Messagebox.INFORMATION);
+			return;
+		}
+
+		if (resultado.startsWith("Arquivo Processado com sucesso")) {
+			Messagebox.show("Arquivo Processado com sucesso",
+					Labels.getLabel("importarRetornoBancarioController.window.title"),
+					Messagebox.OK, Messagebox.INFORMATION);
+		}else if (resultado.startsWith("Arquivo Processado com ressalvas")) {
+				Messagebox.show("Arquivo Processado com ressalvas",
+						Labels.getLabel("importarRetornoBancarioController.window.title"),
+						Messagebox.OK, Messagebox.EXCLAMATION);
+		} else {
+			Messagebox.show(resultado,
+					Labels.getLabel("importarRetornoBancarioController.window.title"),
+					Messagebox.OK, Messagebox.ERROR);
+		}
+		
+		Messagebox.show("Deseja baixar arquivo com detalhes do processamento?", 
+				Labels.getLabel("importarRetornoBancarioController.window.title"),
+				Messagebox.OK | Messagebox.CANCEL,
+				Messagebox.QUESTION,
+				 	new org.zkoss.zk.ui.event.EventListener(){
+				 		public void onEvent(Event e){
+				 			if(Messagebox.ON_OK.equals(e.getName())){
+				 				InputStream is = new ByteArrayInputStream(resultado.getBytes());
+				 				Filedownload.save(is, "application/txt", "detalhe_processamento.txt");
+				 			}
+				 		}
+				 	}
+				);
+		
+	}
+
+	public List<Empresa> getLsEmpresa() {
+		return lsEmpresa;
+	}
+
+	public void setLsEmpresa(List<Empresa> lsEmpresa) {
+		this.lsEmpresa = lsEmpresa;
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java

@@ -2,8 +2,13 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,11 +18,18 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Paging;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.LogAuditoria;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPe;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBPeRejeitadoEnvioContingencia;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBpeNumeracaoReuso;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioLogAuditoria;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.LogAuditoriaService;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@@ -31,6 +43,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderLogAuditoria;
 import com.trg.search.Filter;
 
 import br.com.rjconsultores.auditador.enums.AuditadorTipoAlteracao;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 @Controller("busquedaLogAuditoriaController")
 @Scope("prototype")
@@ -63,6 +76,8 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer {
 	private MyTextbox txtValorNovo;
 	private MyTextbox txtValorAnterior;
 	private MyTextbox txtIdAuditado;
+	@Autowired
+	private DataSource dataSourceRead;
 	
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -79,7 +94,7 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer {
 		return lsEmpresa;
 	}
 	
-	private void refreshLista() {
+	private void refreshLista(boolean isGerarRelatorio) throws Exception {
 		HibernateSearchObject<LogAuditoria> sistemaBusqueda = new HibernateSearchObject<LogAuditoria>(LogAuditoria.class, pagingLogAuditoria.getPageSize());
 		
 		Date dataInicio = dtInicio.getValue();
@@ -134,20 +149,89 @@ public class BusquedaLogAuditoriaController extends MyGenericForwardComposer {
 		sistemaBusqueda.addFilterEqual("activo", Boolean.TRUE);
 
 		plwLogAuditoria.init(sistemaBusqueda, logAuditoriaList, pagingLogAuditoria);
+		
 		if (logAuditoriaList.getData().length == 0) {
-			try {
+			if(isGerarRelatorio){
-				Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),
+				throw new Exception(Labels.getLabel("MSG.ningunRegistroRelatorio"));
-						Labels.getLabel("busquedaLogAuditoriaController.window.title"),
+			}else{
-						Messagebox.OK, Messagebox.INFORMATION);
+				try {
-			} catch (InterruptedException ex) {
+					Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),Labels.getLabel("busquedaLogAuditoriaController.window.title"), Messagebox.OK, Messagebox.INFORMATION);
-				log.error("", ex);
+				} catch (InterruptedException ex) {
+					log.error("", ex);
+				}
 			}
 		}
-
 	}
 	
-	public void onClick$btnPesquisa(Event ev) {
+	public void onClick$btnPesquisa(Event ev) throws Exception {
-		refreshLista();
+		refreshLista(false);
+	}
+	@SuppressWarnings("unchecked")
+	public void onClick$btnGerarRelatorio(Event ev) throws Exception {
+		
+		try {
+			refreshLista(true);
+		} catch (Exception e) {
+			Messagebox.show(e.getMessage(), Labels.getLabel("busquedaLogAuditoriaController.window.title"),	Messagebox.OK, Messagebox.INFORMATION);
+			return;
+		}
+		
+		
+		Map<String, Object> parametros = new HashMap<String, Object>();
+		StringBuilder filtro = new StringBuilder();
+
+
+		parametros.put("DATA_INICIAL", (java.util.Date) dtInicio.getValue());
+		parametros.put("DATA_FINAL", (java.util.Date) dtFim.getValue());
+		parametros.put("NOME_RELATORIO", Labels.getLabel("busquedaLogAuditoriaController.window.title"));
+		parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
+		parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
+
+
+		
+		filtro.append("Empresa: ");
+		Comboitem item = null;
+	
+		if (cmbEmpresa.getSelectedItem() != null) {
+			 item = cmbEmpresa.getSelectedItem();
+			if (item != null) {
+				Empresa empresa = (Empresa) item.getValue();
+				filtro.append(empresa.getNombempresa()).append(";");	
+			}
+		} else {
+			filtro.append(" Todas; ");
+		}
+		if (cmbTela.getSelectedItem() != null) {
+			 item = cmbTela.getSelectedItem();
+			if (item != null) {
+				filtro.append(cmbTela.getValue()).append(";");	
+			}
+		} else {
+			filtro.append(" Todas; ");
+		}
+		
+		if (cmbTipoAlteracao.getSelectedItem() != null) {
+			 item = cmbTipoAlteracao.getSelectedItem();
+			if (item != null) {
+				filtro.append(cmbTipoAlteracao.getValue()).append(";");	
+			}
+		} else {
+			filtro.append(" Todas; ");
+		}
+		
+		
+		parametros.put("FILTROS", filtro.toString());
+		
+		Relatorio relatorio = null;
+		relatorio = new RelatorioLogAuditoria(parametros, dataSourceRead.getConnection(), logAuditoriaList.getListData());
+
+
+		@SuppressWarnings("rawtypes")
+		Map args = new HashMap();
+		args.put("relatorio", relatorio);
+
+		openWindow("/component/reportView.zul",	Labels.getLabel("busquedaLogAuditoriaController.window.title"), args, MODAL);
+
 	}
 	
 	public List<AuditadorTipoAlteracao> getTipoAlteracaoList() {

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioRetornoBancario.java

@@ -0,0 +1,25 @@
+package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios;
+
+import org.zkoss.util.resource.Labels;
+
+import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
+import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
+
+public class ItemMenuRelatorioRetornoBancario extends DefaultItemMenuSistema {
+
+	public ItemMenuRelatorioRetornoBancario() {
+		super("indexController.mniRelatorioRetornoBancario.label");
+	}
+
+	@Override
+	public String getClaveMenu() {
+		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIORETORNOBANCARIO";
+	}
+
+	@Override
+	public void ejecutar() {
+		PantallaUtileria.openWindow("/gui/relatorios/importarRetornoBancario.zul",
+                Labels.getLabel("relatorioRetornoBancario.window.title"), getArgs(), desktop);
+		
+	}
+}

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties

@@ -262,6 +262,7 @@ analitico.integracion.integracaoAntiFraude=com.rjconsultores.ventaboletos.web.ut
 analitico.integracion.bgm=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.integracion.bgm.SubMenuBgm
 analitico.integracion.bgm.arquivo=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioArquivoBGM
 analitico.integracion.bgm.erro=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioErrosIntegracaoBGM
+analitico.integracion.retornoBancario=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioRetornoBancario
 analitico.integracion.receitasDespesasDiversas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioReceitasDespesasDiversas
 analitico.integracion.logReceitasDespesasDiversas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuLogReceitasDespesasDiversas
 analitico.integracion.exportacaoFiscal=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.SubMenuExportacaoFiscal

src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConexion.java

@@ -75,7 +75,7 @@ public class RenderConexion implements ListitemRenderer {
 		setStyle(lc, conexionConf);
 		lc.setParent(lstm);
 
-		lc = new Listcell(conexion.getGrupo().toString());
+		lc = new Listcell(conexion.isBuscaAgruapada() ? " - " : conexion.getGrupo().toString());
 		setStyle(lc, conexionConf);
 		lc.setParent(lstm);