diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java
index 013ecb814..bf66f5211 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java
@@ -8,17 +8,20 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-
 import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoBean;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
 public class RelatorioAgenciaFechamento extends Relatorio {
 
+	private static Logger log = org.slf4j.LoggerFactory.getLogger(RelatorioCarteirinha.class);
+	
 	private List<RelatorioAgenciaFechamentoBean> lsDadosRelatorio;
 
 	public RelatorioAgenciaFechamento(Map<String, Object> parametros, Connection conexao) throws Exception {
@@ -37,12 +40,12 @@ public class RelatorioAgenciaFechamento extends Relatorio {
 				String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : "";
 				String empresaNome = parametros.get("empresaNome") != null ? parametros.get("empresaNome").toString() : "";
 				String puntoVenta = parametros.get("NUMPUNTOVENTA") != null ? parametros.get("NUMPUNTOVENTA").toString() : null;
-
+				
 				lsDadosRelatorio = new ArrayList<RelatorioAgenciaFechamentoBean>();
 
 				String sql = carregarDadosTotaisdeVenda(puntoVenta);
 
-				System.out.println(sql);
+				log.debug(sql);
 
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
 				ResultSet rset1 = null;
@@ -59,55 +62,34 @@ public class RelatorioAgenciaFechamento extends Relatorio {
 				rset1= stmt.executeQuery();
 
 				while (rset1.next()) {
+					
+					Integer qtdExcesso = NumberUtils.INTEGER_ZERO; 
+					Integer qtdSeguro = NumberUtils.INTEGER_ZERO;
+					
+					BigDecimal valorExcesso = BigDecimal.ZERO;
+					BigDecimal valorSeguro = BigDecimal.ZERO;
 
 					RelatorioAgenciaFechamentoBean agenciaFechamento = new RelatorioAgenciaFechamentoBean();
-					BigDecimal total = BigDecimal.ZERO;
-					BigDecimal vendido = BigDecimal.ZERO;
-					
-					String puntoVentaId = rset1.getString("codigo");
-
-					Integer qtdevendido = rset1.getInt("qtdevendido");
-					Integer qtdedigitado = rset1.getInt("qtdedigitado");
-					Integer qtdeAnulado = rset1.getInt("qtdeAnulado");
-					Integer qtdeDevolvido = rset1.getInt("qtdeDevolvido");
-					Integer qtdeTotal = null;
-
-					vendido = rset1.getBigDecimal("vendido");
-					BigDecimal digitado = rset1.getBigDecimal("digitado");
-					BigDecimal anulado = rset1.getBigDecimal("anulado");
-					BigDecimal devolvido = rset1.getBigDecimal("devolvido");
 
 					agenciaFechamento.setEmpresa(empresaNome);
-
-					agenciaFechamento.setCodigo(rset1.getString("codigo"));
+					String puntoVentaId = rset1.getString("codigo");
 					agenciaFechamento.setDescricao(rset1.getString("descricao"));
-
-					agenciaFechamento.setQtdeVendido(qtdevendido != null ? qtdevendido : NumberUtils.INTEGER_ZERO);
-					agenciaFechamento.setQtdeDigitado(qtdedigitado != null ? qtdedigitado : NumberUtils.INTEGER_ZERO);
-					agenciaFechamento.setQtdeAnulado(qtdeAnulado != null ? qtdeAnulado : NumberUtils.INTEGER_ZERO);
-					agenciaFechamento.setQtdeDevolvido(qtdeDevolvido != null ? qtdeDevolvido : NumberUtils.INTEGER_ZERO);
-
-					qtdeTotal = ((qtdevendido != null ? qtdevendido : NumberUtils.INTEGER_ZERO) + (qtdedigitado != null ? qtdedigitado : NumberUtils.INTEGER_ZERO))
-							- ((qtdeAnulado != null ? qtdeAnulado : NumberUtils.INTEGER_ZERO) + (qtdeDevolvido != null ? qtdeDevolvido : NumberUtils.INTEGER_ZERO));
-
-					if (qtdeTotal < 0) {
-						qtdeTotal = NumberUtils.INTEGER_ZERO;
-					}
-
-					agenciaFechamento.setQtdeTotal(qtdeTotal);
-
-					agenciaFechamento.setDigitado(digitado != null ? digitado : BigDecimal.ZERO);
-					agenciaFechamento.setAnulado(anulado != null ? anulado : BigDecimal.ZERO);
-					agenciaFechamento.setDevolvido(devolvido != null ? devolvido : BigDecimal.ZERO);
-
-					total = total.add(vendido != null ? vendido : BigDecimal.ZERO);
-					total = total.add(digitado != null ? digitado : BigDecimal.ZERO);
-					total = total.subtract(anulado != null ? anulado : BigDecimal.ZERO);
-					total = total.subtract(devolvido != null ? devolvido : BigDecimal.ZERO);
 					
-					stmt = new NamedParameterStatement(conexao, carregarDadosReceitaDespesa(puntoVentaId));
+					agenciaFechamento.setValorBilhete(rset1.getBigDecimal("valorBilhete"));
+					agenciaFechamento.setValorVch(rset1.getBigDecimal("valorVch"));
+					agenciaFechamento.setValorInternet(rset1.getBigDecimal("valorInternet"));
+					agenciaFechamento.setValorCancelado(rset1.getBigDecimal("valorCancelado"));
+					agenciaFechamento.setValorEstornado(rset1.getBigDecimal("valorEstornado"));
+					valorSeguro = rset1.getBigDecimal("valorSeguro");
 					
-					System.out.println(carregarDadosReceitaDespesa(puntoVentaId));
+					agenciaFechamento.setQtdBilhete(rset1.getInt("qtdBilhete"));
+					agenciaFechamento.setQtdVch(rset1.getInt("qtdVch"));
+					agenciaFechamento.setQtdInternet(rset1.getInt("qtdInternet"));
+					agenciaFechamento.setQtdCancelado(rset1.getInt("qtdCancelado"));
+					agenciaFechamento.setQtdEstornado(rset1.getInt("qtdEstornado"));
+					qtdSeguro = rset1.getInt("qtdSeguro");
+					
+					stmt = new NamedParameterStatement(conexao, carregarEventosExtras(puntoVentaId));
 
 					stmt.setTimestamp("de", new java.sql.Timestamp(sdf.parse(fecInicio).getTime()));
 					stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime()));
@@ -116,35 +98,21 @@ public class RelatorioAgenciaFechamento extends Relatorio {
 						stmt.setInt("empresaId", Integer.parseInt(empresa));
 					}
 					
-					if (puntoVentaId != null ) {
-						stmt.setString("puntoVentaId", puntoVentaId);
-					}
-
 					rset2 = stmt.executeQuery();
-
+					
 					if (rset2.next()) {
 
-						Integer qtdedespesa = rset2.getInt("qtdedespesa");
-						BigDecimal receita = rset2.getBigDecimal("receita");
-						BigDecimal despesa = rset2.getBigDecimal("despesa");
-
-						agenciaFechamento.setQtdeDespesa(qtdedespesa != null ? qtdedespesa : NumberUtils.INTEGER_ZERO);
-						agenciaFechamento.setReceita(receita != null ? receita : BigDecimal.ZERO);
-						agenciaFechamento.setDespesa(despesa != null ? despesa : BigDecimal.ZERO);
-
-						total = total.add(receita != null ? receita : BigDecimal.ZERO);
-						total = total.subtract(despesa != null ? despesa : BigDecimal.ZERO);						
-
-						agenciaFechamento.setVendido(vendido != null ? vendido : BigDecimal.ZERO);
-						agenciaFechamento.setTotal(total.abs());
-
-					} else {
-						agenciaFechamento.setQtdeDespesa(NumberUtils.INTEGER_ZERO);
-						agenciaFechamento.setReceita(BigDecimal.ZERO);
-						agenciaFechamento.setDespesa(BigDecimal.ZERO);
-						agenciaFechamento.setVendido(vendido != null ? vendido : BigDecimal.ZERO);
-						agenciaFechamento.setTotal(total.abs());
+						qtdSeguro += rset2.getInt("qtdSeguro");
+						qtdExcesso = rset2.getInt("qtdExcesso");
+						
+						valorSeguro = valorSeguro.add(rset2.getBigDecimal("valorSeguro"));
+						valorExcesso = valorExcesso.add(rset2.getBigDecimal("valorExcesso"));
 					}
+					
+					agenciaFechamento.setQtdExcesso(qtdExcesso);
+					agenciaFechamento.setQtdSeguro(qtdSeguro);
+					agenciaFechamento.setValorExcesso(valorExcesso);
+					agenciaFechamento.setValorSeguro(valorSeguro);
 
 					lsDadosRelatorio.add(agenciaFechamento);
 					//Estava dando um erro de "máximo de cursores abertos excedido"
@@ -152,9 +120,10 @@ public class RelatorioAgenciaFechamento extends Relatorio {
 					rset2.getStatement().close();
 					rset2.close();
 				}
+				
+				rset1.close();
 
 				if (lsDadosRelatorio.size() > 0) {
-
 					setLsDadosRelatorio(lsDadosRelatorio);
 				}
 
@@ -174,98 +143,142 @@ public class RelatorioAgenciaFechamento extends Relatorio {
 	private String carregarDadosTotaisdeVenda(String puntoVenta) {
 
 		StringBuilder sql = new StringBuilder();
-		sql.append(" SELECT                                                                                                                                                                             ");
-		sql.append("          pv.PUNTOVENTA_ID AS codigo,                                                                                                                                               ");
-		sql.append("		      pv.nombpuntoventa AS descricao,                                                                                                                                       ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		      COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and (c.INDREMOTOINVERSO is null or c.INDREMOTOINVERSO =0) THEN c.caja_id  ELSE NULL END),0) AS qtdevendido,   ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		      COALESCE(COUNT(CASE WHEN c.INDREMOTOINVERSO = 1 THEN 1  ELSE NULL END),0) AS qtdedigitado,                                                                            ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("          COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID = 31  THEN 1  ELSE NULL END),0) AS qtdeAnulado,                                                                           ");
-		sql.append("		      COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID is not null and c.MOTIVOCANCELACION_ID <> 31  THEN 1  ELSE NULL END),0) AS qtdeDevolvido,                             ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		        COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and (c.INDREMOTOINVERSO is null or c.INDREMOTOINVERSO =0) THEN (                                              ");
-		sql.append("            coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0)                                                                                ");
-		sql.append("            +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS vendido,                                                                             ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		        COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and c.INDREMOTOINVERSO = 1 THEN (                                                                             ");
-		sql.append("            coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0)                                                                                ");
-		sql.append("            +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS digitado,                                                                            ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		        COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID = 31  THEN (                                                                                                          ");
-		sql.append("            coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0)                                                                                ");
-		sql.append("            +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS anulado,                                                                             ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		        COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID is not null and c.MOTIVOCANCELACION_ID <> 31  THEN (                                                                  ");
-		sql.append("            coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0)                                                                                ");
-		sql.append("            +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS devolvido                                                                            ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("                                                                                                                                                                                    ");
-		sql.append("		 FROM  CAJA c                                                                                                                                                               ");
-		sql.append("		        INNER JOIN PUNTO_VENTA pv ON c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID                                                                                                     ");
-		sql.append("            inner join marca m on m.marca_id = c.marca_id                                                                                                                           ");
-		sql.append("		 WHERE c.TURNO_ID IS NOT NULL                                                                                                                                               ");
-		sql.append("		        AND c.FECCORTE BETWEEN :de AND :ate                                                                    ");
+		sql.append(" SELECT pv.PUNTOVENTA_ID AS codigo, ");
+		sql.append("   pv.nombpuntoventa AS descricao, ");
+		sql.append("   COALESCE(SUM( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND (c.INDREMOTOINVERSO     IS NULL ");
+		sql.append("     OR c.INDREMOTOINVERSO        =0) ");
+		sql.append("     AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) ");
+		sql.append("     THEN ( COALESCE(c.IMPORTEOUTROS,0) + COALESCE(c.IMPORTEPEDAGIO,0) +COALESCE(IMPORTETAXAEMBARQUE ,0)+COALESCE(c.preciopagado,0)) ");
+		sql.append("     ELSE null ");
+		sql.append("   END),0) AS valorBilhete, ");
+		sql.append("   COALESCE(COUNT( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND (c.INDREMOTOINVERSO     IS NULL ");
+		sql.append("     OR c.INDREMOTOINVERSO        =0) ");
+		sql.append("     AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) ");
+		sql.append("     THEN c.caja_id ");
+		sql.append("     ELSE NULL ");
+		sql.append("   END),0) AS qtdBilhete, ");
+		sql.append("   SUM( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND COALESCE(c.IMPORTESEGURO,0) > 0 ");
+		sql.append("     THEN c.IMPORTESEGURO ");
+		sql.append("     ELSE 0 ");
+		sql.append("   END) AS valorSeguro, ");
+		sql.append("   COALESCE(COUNT( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND COALESCE(c.IMPORTESEGURO,0) > 0 ");
+		sql.append("     THEN 1 ");
+		sql.append("     ELSE NULL ");
+		sql.append("   END),0) AS qtdSeguro, ");
+		sql.append("   COALESCE(SUM( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5,18)) ");
+		sql.append("     THEN ( COALESCE(c.IMPORTEOUTROS,0) + COALESCE(c.IMPORTEPEDAGIO,0) +COALESCE(IMPORTETAXAEMBARQUE ,0)+COALESCE(c.preciopagado,0)) ");
+		sql.append("     ELSE 0 ");
+		sql.append("   END),0) AS valorVch, ");
+		sql.append("   COALESCE(COUNT( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5,18)) ");
+		sql.append("     THEN 1 ");
+		sql.append("     ELSE NULL ");
+		sql.append("   END),0) AS qtdVch, ");
+		sql.append("   COALESCE(SUM( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND c.TIPOVENTA_ID = 12 ");
+		sql.append("     THEN ( COALESCE(c.IMPORTEOUTROS,0) + COALESCE(c.IMPORTEPEDAGIO,0) +COALESCE(IMPORTETAXAEMBARQUE ,0)+COALESCE(c.preciopagado,0)) ");
+		sql.append("     ELSE 0 ");
+		sql.append("   END),0) AS valorInternet, ");
+		sql.append("   COALESCE(COUNT( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("     AND c.TIPOVENTA_ID = 12 ");
+		sql.append("     THEN 1 ");
+		sql.append("     ELSE NULL ");
+		sql.append("   END),0) AS qtdInternet, ");
+		sql.append("   COALESCE(SUM( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID = 31 ");
+		sql.append("     THEN ( COALESCE(c.IMPORTEOUTROS,0) + COALESCE(c.IMPORTEPEDAGIO,0) +COALESCE(IMPORTETAXAEMBARQUE ,0)+COALESCE(c.preciopagado,0)) ");
+		sql.append("     ELSE 0 ");
+		sql.append("   END),0) AS valorCancelado, ");
+		sql.append("   COALESCE(COUNT( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID = 31 ");
+		sql.append("     THEN 1 ");
+		sql.append("     ELSE NULL ");
+		sql.append("   END),0) AS qtdCancelado, ");
+		sql.append("   COALESCE(SUM( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NOT NULL ");
+		sql.append("     AND c.MOTIVOCANCELACION_ID  <> 31 ");
+		sql.append("     THEN ( COALESCE(c.IMPORTEOUTROS,0) + COALESCE(c.IMPORTEPEDAGIO,0) +COALESCE(IMPORTETAXAEMBARQUE ,0)+COALESCE(c.preciopagado,0)) ");
+		sql.append("     ELSE 0 ");
+		sql.append("   END),0) AS valorEstornado, ");
+		sql.append("   COALESCE(COUNT( ");
+		sql.append("   CASE ");
+		sql.append("     WHEN c.MOTIVOCANCELACION_ID IS NOT NULL ");
+		sql.append("     AND c.MOTIVOCANCELACION_ID  <> 31 ");
+		sql.append("     THEN 1 ");
+		sql.append("     ELSE NULL ");
+		sql.append("   END),0) AS qtdEstornado ");
+		sql.append("    ");
+		sql.append(" FROM CAJA c ");
+		sql.append(" INNER JOIN PUNTO_VENTA pv ");
+		sql.append(" ON c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
+		sql.append(" INNER JOIN marca m ");
+		sql.append(" ON m.marca_id     = c.marca_id ");
+		sql.append(" WHERE c.TURNO_ID IS NOT NULL ");
+		sql.append(" AND c.FECCORTE BETWEEN :de AND :ate ");
 		if (puntoVenta != null && !puntoVenta.equals("-1")) {
 			sql.append("        AND c.PUNTOVENTA_ID in (" + puntoVenta + ") ");
 		}
-		sql.append("		        AND c.TIPOVENTA_ID <> 6                                                                                                                                             ");
-		sql.append("		        AND c.INDREIMPRESION     = 0                                                                                                                                             ");
-		sql.append("		        AND m.empresa_id = :empresaId                                                                                                                                               ");
-		sql.append("		 GROUP  BY pv.PUNTOVENTA_ID , pv.nombpuntoventa                                                                                                                             ");
-		sql.append("		 ORDER  BY pv.PUNTOVENTA_ID , pv.nombpuntoventa ");
+		sql.append(" AND c.TIPOVENTA_ID  <> 6 ");
+		sql.append(" AND c.INDREIMPRESION = 0 ");
+		sql.append(" AND m.empresa_id     = :empresaId ");
+		sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa ");
+		sql.append(" ORDER BY pv.nombpuntoventa ");
 
 		return sql.toString();
 
 	}
-
-	private String carregaAgenciasComVenda() {
+	
+	private String carregarEventosExtras(String puntoVenta) {
 
 		StringBuilder sql = new StringBuilder();
-		sql.append(" SELECT DISTINCT cc.PUNTOVENTA_ID ");
-		sql.append(" FROM CONTA_CORRENTE_PTOVTA cc ");
-		sql.append(" WHERE cc.FECHOROPERACION BETWEEN :de AND :ate ");
-		sql.append(" and cc.EMPRESA_ID = :empresaId ");
-
-		return sql.toString();
-
-	}
-
-	private String carregarDadosReceitaDespesa(String puntoVenta) {
-
-		StringBuilder sql = new StringBuilder();
-		sql.append(" SELECT  ");
-		sql.append(" 		COALESCE(COUNT(CASE WHEN cdp.IMPORTE < 0 THEN 1 ELSE NULL END),0) as qtdedespesa,     ");
-		sql.append(" 		COALESCE(SUM(CASE WHEN cdp.IMPORTE > 0 THEN cdp.IMPORTE ELSE NULL END),0) AS receita,    ");
-		sql.append(" 		COALESCE(ABS(SUM(CASE WHEN cdp.IMPORTE < 0 THEN cdp.IMPORTE ELSE NULL END)),0) AS despesa    ");
-		sql.append(" 	FROM CAJA_DIVERSOS cd, ");
-		sql.append(" 		CAJA_DIVERSOS_PAGO cdp, ");
-		sql.append(" 		EVENTO_EXTRA ee ");
-		sql.append("    WHERE cd.MOTIVOCANCELACION_ID IS NULL ");
-		sql.append("  	 AND ee.EVENTOEXTRA_ID = cd.EVENTOEXTRA_ID ");
-		sql.append("   	 AND cdp.CAJADIVERSOS_ID = cd.CAJADIVERSOS_ID ");
+		sql.append(" SELECT ");
+		sql.append("     COALESCE(SUM(CASE WHEN tee.CVETIPOEVENTO = 'EXCESSO_BAGAGEM' THEN cd.PRECIO ELSE NULL END),0) AS valorExcesso,  ");
+		sql.append(" 	  COALESCE(COUNT(CASE WHEN tee.CVETIPOEVENTO = 'EXCESSO_BAGAGEM' THEN 1 ELSE NULL END),0) as qtdExcesso,    ");
+		sql.append("     COALESCE(SUM(CASE WHEN tee.CVETIPOEVENTO = 'SEGURO_OPCIONAL' THEN cd.PRECIO ELSE NULL END),0) AS valorSeguro,  ");
+		sql.append("     COALESCE(COUNT(CASE WHEN tee.CVETIPOEVENTO = 'SEGURO_OPCIONAL' THEN 1 ELSE NULL END),0) as qtdSeguro  ");
+		sql.append(" FROM CAJA_DIVERSOS cd ");
+		sql.append(" INNER JOIN	EVENTO_EXTRA ee ");
+		sql.append("     ON ee.EVENTOEXTRA_ID = cd.EVENTOEXTRA_ID ");
+		sql.append(" INNER JOIN TIPO_EVENTO_EXTRA tee ");
+		sql.append("     ON ee.TIPOEVENTOEXTRA_ID = tee.TIPOEVENTOEXTRA_ID ");
+		sql.append(" WHERE cd.MOTIVOCANCELACION_ID IS NULL ");
 		sql.append("   	 AND ee.activo = 1 ");
 		sql.append("   	 AND cd.TURNO_ID IS NOT NULL ");
+		sql.append("   	 AND tee.CVETIPOEVENTO in ('EXCESSO_BAGAGEM', 'SEGURO_OPCIONAL' ) ");
 		sql.append("     AND cd.FECCORTE BETWEEN :de AND :ate ");
 		if (puntoVenta != null && !puntoVenta.equals("-1")) {
-			sql.append("     AND cd.PUNTOVENTA_ID = :puntoVentaId ");
+			sql.append("     AND cd.PUNTOVENTA_ID = ").append(puntoVenta);
 		}
 		sql.append("     AND ee.EMPRESA_ID=:empresaId ");
+		
+		log.debug(sql.toString());
 
 		return sql.toString();
 
 	}
 
-	private String carregarNomeEmpresa() {
-
-		StringBuilder sql = new StringBuilder();
-		sql.append(" SELECT  ");
-		sql.append(" NOMBEMPRESA  ");
-		sql.append(" FROM EMPRESA ");
-		sql.append(" WHERE EMPRESA_ID=:empresaId ");
-
-		return sql.toString();
-
-	}
 }
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_es .properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_es .properties
deleted file mode 100644
index abaee55bf..000000000
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_es .properties	
+++ /dev/null
@@ -1,23 +0,0 @@
-#geral
-msg.noData=No se pudo obtener datos con los parámetros reportados.
-msg.a=a
-
-#Labels header
-header.data=Data :
-header.empresa=Empresa :
-header.codigo=Código
-header.descricao=Descrição 
-header.vendido=Vendido
-header.digitado=Digitado
-header.anulado=Anulados
-header.devolvido=Devolvidos
-header.receita=Receita
-header.despesa=Despesa
-header.total=Total
-
-detail.agencia=AGÊNCIA
-detail.quantidade=QUANTIDADE
-detail.valor=VALOR
-detail.totalGeral=TOTAL GERAL
-
-linhas=Linhas
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_es.properties
new file mode 100644
index 000000000..5f9d7c2fb
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_es.properties
@@ -0,0 +1,41 @@
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+#geral
+
+detail.agencia          = AG\u00CANCIA
+detail.qtd.bilhete      = Qtd. Bilhete Entrada
+detail.qtd.cancelados   = Qtd. Cancelados
+detail.qtd.estornados   = Qtd. Estornados
+detail.qtd.excesso      = Qtd. Excesso Entrada
+detail.qtd.internet     = Qtd. Internet Entrada
+detail.qtd.itex         = Qtd. Itex Entrada
+detail.qtd.seguro       = Qtd. Seguro Entrada
+detail.qtd.vch          = Qtd. VCH Entrada
+detail.quantidade       = QUANTIDADE
+detail.totalGeral       = TOTAL GERAL
+detail.valor            = VALOR
+detail.valor.bilhete    = Valor Bilhete Entrada
+detail.valor.cancelados = Valor Cancelados
+detail.valor.estornados = Valor Estornados
+detail.valor.excesso    = Valor Excesso Entrada
+detail.valor.internet   = Valor Internet Entrada
+detail.valor.itex       = Valor Itex Entrada
+detail.valor.seguro     = Valor Seguro Entrada
+detail.valor.vch        = Valor VCH Entrada
+
+header.anulado   = Anulados
+header.codigo    = C\u00F3digo
+#Labels header
+header.data      = Data :
+header.descricao = Descri\u00E7\u00E3o 
+header.despesa   = Despesa
+header.devolvido = Devolvidos
+header.digitado  = Digitado
+header.empresa   = Empresa :
+header.receita   = Receita
+header.total     = Total
+header.vendido   = Vendido
+
+linhas = Linhas
+
+msg.a      = a
+msg.noData = No se pudo obtener datos con los par\u00E1metros reportados.
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_pt_BR.properties
index abaee55bf..da8ef5c22 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamento_pt_BR.properties
@@ -1,23 +1,41 @@
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
 #geral
-msg.noData=No se pudo obtener datos con los parámetros reportados.
-msg.a=a
 
+detail.agencia          = Ag\u00EAncia
+detail.qtd.bilhete      = Qtd. Bilhete Entrada
+detail.qtd.cancelados   = Qtd. Cancelados
+detail.qtd.estornados   = Qtd. Estornados
+detail.qtd.excesso      = Qtd. Excesso Entrada
+detail.qtd.internet     = Qtd. Internet Entrada
+detail.qtd.itex         = Qtd. Itex Entrada
+detail.qtd.seguro       = Qtd. Seguro Entrada
+detail.qtd.vch          = Qtd. VCH Entrada
+detail.quantidade       = QUANTIDADE
+detail.totalGeral       = TOTAL GERAL
+detail.valor            = VALOR
+detail.valor.bilhete    = Valor Bilhete Entrada
+detail.valor.cancelados = Valor Cancelados
+detail.valor.estornados = Valor Estornados
+detail.valor.excesso    = Valor Excesso Entrada
+detail.valor.internet   = Valor Internet Entrada
+detail.valor.itex       = Valor Itex Entrada
+detail.valor.seguro     = Valor Seguro Entrada
+detail.valor.vch        = Valor VCH Entrada
+
+header.anulado   = Anulados
+header.codigo    = C\u00F3digo
 #Labels header
-header.data=Data :
-header.empresa=Empresa :
-header.codigo=Código
-header.descricao=Descrição 
-header.vendido=Vendido
-header.digitado=Digitado
-header.anulado=Anulados
-header.devolvido=Devolvidos
-header.receita=Receita
-header.despesa=Despesa
-header.total=Total
+header.data      = Data :
+header.descricao = Descri\u00E7\u00E3o 
+header.despesa   = Despesa
+header.devolvido = Devolvidos
+header.digitado  = Digitado
+header.empresa   = Empresa :
+header.receita   = Receita
+header.total     = Total
+header.vendido   = Vendido
 
-detail.agencia=AGÊNCIA
-detail.quantidade=QUANTIDADE
-detail.valor=VALOR
-detail.totalGeral=TOTAL GERAL
+linhas = Linhas
 
-linhas=Linhas
\ No newline at end of file
+msg.a      = a
+msg.noData = No se pudo obtener datos con los par\u00E1metros reportados.
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jasper
index ecfc27dfc..57d0cab12 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jrxml
index ec964c188..383f58c75 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamento.jrxml
@@ -1,8 +1,13 @@
 <?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="RelatorioAgenciaFechamento" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="2.1961500000000007"/>
-	<property name="ireport.x" value="503"/>
-	<property name="ireport.y" value="99"/>
+<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="RelatorioAgenciaFechamento" pageWidth="898" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="858" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioAgenciaFechamento" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
+	<property name="ireport.zoom" value="1.3636363636363653"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
+	<property name="collapseRowSpan" value="true"/>
 	<parameter name="fecInicio" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
@@ -11,88 +16,91 @@
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="codigo" class="java.lang.String"/>
 	<field name="empresa" class="java.lang.String"/>
 	<field name="descricao" class="java.lang.String"/>
-	<field name="qtdeVendido" class="java.lang.Integer"/>
-	<field name="qtdeDigitado" class="java.lang.Integer"/>
-	<field name="qtdeAnulado" class="java.lang.Integer"/>
-	<field name="qtdeDevolvido" class="java.lang.Integer"/>
-	<field name="qtdeDespesa" class="java.lang.Integer"/>
-	<field name="vendido" class="java.math.BigDecimal"/>
-	<field name="digitado" class="java.math.BigDecimal"/>
-	<field name="anulado" class="java.math.BigDecimal"/>
-	<field name="devolvido" class="java.math.BigDecimal"/>
-	<field name="receita" class="java.math.BigDecimal"/>
-	<field name="despesa" class="java.math.BigDecimal"/>
-	<field name="total" class="java.math.BigDecimal"/>
-	<field name="qtdeTotal" class="java.lang.Integer"/>
-	<variable name="sum.qtdeVendido" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{qtdeVendido}]]></variableExpression>
+	<field name="valorBilhete" class="java.math.BigDecimal"/>
+	<field name="qtdBilhete" class="java.lang.Integer"/>
+	<field name="valorExcesso" class="java.math.BigDecimal"/>
+	<field name="qtdExcesso" class="java.lang.Integer"/>
+	<field name="valorSeguro" class="java.math.BigDecimal"/>
+	<field name="qtdSeguro" class="java.lang.Integer"/>
+	<field name="valorVch" class="java.math.BigDecimal"/>
+	<field name="qtdVch" class="java.lang.Integer"/>
+	<field name="valorInternet" class="java.math.BigDecimal"/>
+	<field name="qtdInternet" class="java.lang.Integer"/>
+	<field name="valorCancelado" class="java.math.BigDecimal"/>
+	<field name="qtdCancelado" class="java.lang.Integer"/>
+	<field name="valorEstornado" class="java.math.BigDecimal"/>
+	<field name="qtdEstornado" class="java.lang.Integer"/>
+	<variable name="sum.qtdBilhete" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdBilhete}]]></variableExpression>
 	</variable>
-	<variable name="sum.qtdeDigitado" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{qtdeDigitado}]]></variableExpression>
+	<variable name="sum.valorBilhete" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorBilhete}]]></variableExpression>
 	</variable>
-	<variable name="sum.qtdeAnulado" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{qtdeAnulado}]]></variableExpression>
+	<variable name="sum.qtdExcesso" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdExcesso}]]></variableExpression>
 	</variable>
-	<variable name="sum.qtdeDespesa" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{qtdeDespesa}]]></variableExpression>
+	<variable name="sum.valorExcesso" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorExcesso}]]></variableExpression>
 	</variable>
-	<variable name="sum.qtdeDevolvido" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{qtdeDevolvido}]]></variableExpression>
+	<variable name="sum.qtdInternet" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdInternet}]]></variableExpression>
 	</variable>
-	<variable name="sum.qtdeTotal" class="java.lang.Integer" calculation="Sum">
-		<variableExpression><![CDATA[$F{qtdeTotal}]]></variableExpression>
+	<variable name="sum.valorInternet" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorInternet}]]></variableExpression>
 	</variable>
-	<variable name="sum.vendido" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{vendido}]]></variableExpression>
+	<variable name="sum.qtdEstornado" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdEstornado}]]></variableExpression>
 	</variable>
-	<variable name="sum.digitado" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{digitado}]]></variableExpression>
+	<variable name="sum.valorEstornado" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorEstornado}]]></variableExpression>
 	</variable>
-	<variable name="sum.anulado" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{anulado}]]></variableExpression>
+	<variable name="sum.qtdCancelado" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdCancelado}]]></variableExpression>
 	</variable>
-	<variable name="sum.devolvido" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{devolvido}]]></variableExpression>
+	<variable name="sum.valorCancelado" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorCancelado}]]></variableExpression>
 	</variable>
-	<variable name="sum.receita" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{receita}]]></variableExpression>
+	<variable name="sum.qtdVch" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdVch}]]></variableExpression>
 	</variable>
-	<variable name="sum.despesa" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{despesa}]]></variableExpression>
+	<variable name="sum.valorVch" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorVch}]]></variableExpression>
 	</variable>
-	<variable name="sum.total" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{total}]]></variableExpression>
+	<variable name="sum.qtdSeguro" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{qtdSeguro}]]></variableExpression>
+	</variable>
+	<variable name="sum.valorSeguro" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{valorSeguro}]]></variableExpression>
 	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="61" splitType="Stretch">
+		<band height="40" splitType="Stretch">
 			<textField>
-				<reportElement x="481" y="20" width="49" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
+				<reportElement x="535" y="20" width="49" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
 				<textElement>
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="647" y="0" width="56" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
+				<reportElement x="701" y="0" width="56" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="779" y="20" width="22" height="20" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
+				<reportElement x="833" y="20" width="22" height="20" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="713" y="20" width="42" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
+				<reportElement x="767" y="20" width="42" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
 				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="530" y="20" width="182" height="20" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/>
+				<reportElement x="584" y="20" width="182" height="20" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/>
 				<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
 			</textField>
 			<textField>
@@ -100,12 +108,12 @@
 				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement x="703" y="0" width="98" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
+				<reportElement x="757" y="0" width="98" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
 				<textElement textAlignment="Left"/>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="755" y="20" width="24" height="20" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
+				<reportElement x="809" y="20" width="24" height="20" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
@@ -124,365 +132,347 @@
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="39" width="802" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/>
+				<reportElement x="0" y="39" width="857" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/>
 			</line>
-			<textField isBlankWhenNull="true">
-				<reportElement x="25" y="41" width="182" height="19" isPrintWhenDetailOverflows="true" uuid="2cbc8ddc-38e5-4914-8189-5761ddeb2ce9"/>
-				<textElement textAlignment="Center" markup="none">
-					<font size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="301" y="41" width="144" height="19" isPrintWhenDetailOverflows="true" uuid="7965e761-2e24-4f17-84eb-9431c98ce72c"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{detail.quantidade}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="642" y="41" width="158" height="19" isPrintWhenDetailOverflows="true" uuid="bbaa5f53-76e0-491e-9145-e522122709e5"/>
-				<textElement textAlignment="Center" markup="none">
-					<font size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{detail.valor}]]></textFieldExpression>
-			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
-		<band height="25" splitType="Stretch">
-			<textField>
-				<reportElement x="739" y="4" width="61" height="17" uuid="0638d013-af03-46b5-850f-8ee3da2bc8b8"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.total}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="691" y="4" width="48" height="17" uuid="dd31dee7-98a4-4b46-a2c4-e79677790bc2"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.despesa}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="642" y="4" width="48" height="17" uuid="e294d86e-22eb-48b8-81c3-fb8e1dea9bae"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.receita}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="61" y="4" width="119" height="17" uuid="c0bf8f56-20d8-47af-a650-4a6ba4442c8c"/>
-				<textElement textAlignment="Center" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.descricao}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="180" y="4" width="45" height="17" uuid="eb16bd4c-e5d9-423e-a089-a9b2bcbe4189"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.vendido}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="225" y="4" width="45" height="17" uuid="2c5f4806-65df-48b0-b3d4-d0912d2c5d73"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.digitado}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="270" y="4" width="45" height="17" uuid="9f25b0f2-c5bd-495a-9ef9-0916c7c07fd3"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.anulado}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="315" y="4" width="45" height="17" uuid="6555f6ff-ca40-4c88-a4b4-fb47871f6d24"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.devolvido}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="360" y="4" width="45" height="17" uuid="6e4f99f7-3a81-4fc4-b647-ab77968fd9c2"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.despesa}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="405" y="4" width="45" height="17" uuid="73004b45-c340-4f04-9697-24fb33e6e608"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.total}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="450" y="4" width="48" height="17" uuid="30ae2209-0899-4dc0-a4f0-bf8c29d6fd70"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.vendido}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="498" y="4" width="48" height="17" uuid="bc4ff148-f663-4c3f-95bd-df48630945e5"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.digitado}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="546" y="4" width="48" height="17" uuid="801f59e8-8ff7-4a8c-bd8f-757126d95d14"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.anulado}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="594" y="4" width="48" height="17" uuid="84490947-1221-4baa-b514-003634254e5c"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.devolvido}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="0" y="4" width="60" height="17" uuid="890b61c9-2195-455a-9c28-316d48ab5fea"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{header.codigo}]]></textFieldExpression>
-			</textField>
+		<band height="38" splitType="Stretch">
 			<line>
-				<reportElement x="0" y="23" width="802" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/>
-			</line>
-			<line>
-				<reportElement x="0" y="0" width="802" height="1" uuid="83809dd0-64dc-4779-9552-440eabef278e"/>
+				<reportElement mode="Transparent" x="0" y="37" width="857" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/>
 			</line>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="99" height="36" isPrintWhenDetailOverflows="true" uuid="2cbc8ddc-38e5-4914-8189-5761ddeb2ce9"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="99" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="7965e761-2e24-4f17-84eb-9431c98ce72c"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.bilhete}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="152" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="bbaa5f53-76e0-491e-9145-e522122709e5"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.bilhete}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="205" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.excesso}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="258" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="ab6b6770-67e8-4224-9304-8de30d3c1384"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.excesso}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="311" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="e3f4df4e-24a9-45b3-8ac3-f8b66d46a15f"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.seguro}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="364" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="79775d53-3de4-4c0c-8ec7-3be13738dc14"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.seguro}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="417" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="746627ad-15b0-4435-93ce-6d370b75e594"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.vch}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="0844b500-feab-477d-ade1-2d943491de32"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.vch}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="523" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="3647e647-81bb-4098-afce-52d942daa341"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.internet}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="576" y="0" width="53" height="36" isPrintWhenDetailOverflows="true" uuid="328a6678-fc02-4845-98e6-a3d3bfaa2c73"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.internet}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="686" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="959d61e9-4311-4fab-8ead-da9c65f00be3"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.cancelados}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="629" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="2cca17d2-47ba-4dba-a8c3-96e4f6d7deff"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.cancelados}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="743" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="eb34f98d-93fe-4dc9-8852-31c12270ae3d"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.valor.estornados}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="800" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="a7c28fc6-e4fc-431b-b5ba-b001a36dcb54"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.qtd.estornados}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
-			<textField isBlankWhenNull="true">
-				<reportElement x="0" y="0" width="60" height="17" uuid="b2a04e5c-f61e-4380-990e-604417465e9d"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="784343f8-f7aa-4997-82e7-312878bd9a27"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{codigo}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdVch}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="180" y="0" width="45" height="17" uuid="5eac8194-63bd-43d7-8da2-8ed75f4f9219"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="99" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="ad46494b-0240-46d1-a775-f91f0035d7f8"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdeVendido}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorBilhete}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="225" y="0" width="45" height="17" uuid="a1102ca6-594a-4e66-8c6e-8d17eeb32005"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="311" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdeDigitado}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorSeguro}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="270" y="0" width="45" height="17" uuid="b371369f-84e7-4121-b00d-5d1430da8a68"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="686" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="617806c3-5059-4e8b-9cb3-5b2bd10e4705"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdeAnulado}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdCancelado}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="360" y="0" width="45" height="17" uuid="fcdf6e5b-55b4-4df1-9115-abe42f6a679a"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="152" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdeDespesa}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdBilhete}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="315" y="0" width="45" height="17" uuid="9840555e-e3b7-4496-a3a2-914f80abe2c8"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="364" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="92017408-1781-4e17-90b7-5ff86457cf6d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdeDevolvido}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdSeguro}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="405" y="0" width="45" height="17" uuid="ca7b87f8-538c-44ca-99a9-58df6d377d33"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="523" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="b7842ed3-aa20-4fe9-996a-c8397aa66c40"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdeTotal}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorInternet}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="450" y="0" width="48" height="17" uuid="7ac7fbc7-49b0-4205-ad7f-e21ae7b5b860"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="417" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{vendido}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorVch}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="498" y="0" width="48" height="17" uuid="a2a6fbc4-5e2c-4183-a638-845493a8e345"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="576" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="c24531bc-66b7-459b-9c60-07bea18e98d9"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{digitado}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdInternet}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="546" y="0" width="48" height="17" uuid="37b92899-0cf9-4390-8daa-7f84b884c9af"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="629" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="e2ad1400-e2c6-48b0-98c8-812d3c8f008d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{anulado}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorCancelado}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="594" y="0" width="48" height="17" uuid="5f34ab58-15a2-4b0c-886e-9e432f24cbb9"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="258" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="7f08e540-2cf9-4da3-b40a-fb7d5275751f"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{devolvido}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdExcesso}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="642" y="0" width="48" height="17" uuid="7f3dee8d-6a9f-4daf-a92a-3cdae3914b24"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="205" y="0" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{receita}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorExcesso}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="691" y="0" width="48" height="17" uuid="414427e1-2de9-47a6-b35b-0a7d5ea6220c"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="743" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="6562d46b-27f9-4bef-a471-8eff982378c5"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{despesa}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{valorEstornado}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="739" y="0" width="61" height="17" uuid="4917968a-5153-4c7d-a52f-ea3886ec1751"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="61" y="0" width="119" height="17" uuid="3f2de0d3-e1e1-4c38-abe4-539529605c34"/>
-				<textElement textAlignment="Center" markup="none">
-					<font size="8" isBold="true"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="99" height="17" isPrintWhenDetailOverflows="true" uuid="16f536ed-9001-4b34-85f4-a01198390b7d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descricao}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="800" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="33d170a8-cd4c-4148-85b7-48a078e68f7d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{qtdEstornado}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
-	<columnFooter>
-		<band height="21">
-			<textField isBlankWhenNull="true">
-				<reportElement x="180" y="3" width="45" height="17" uuid="f9fc3c96-035d-4560-a6b7-4b1694a78d65"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.qtdeVendido}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="225" y="3" width="45" height="17" uuid="ce427a1a-d640-4060-85c9-690eacd95175"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.qtdeDigitado}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="270" y="3" width="45" height="17" uuid="b6810f0c-87c7-42c7-86c7-f011efd30571"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.qtdeAnulado}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="315" y="3" width="45" height="17" uuid="d37852e4-2683-4181-b336-20c1b9e923d7"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.qtdeDespesa}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="360" y="3" width="45" height="17" uuid="54b8507c-0d48-4f4c-860b-b1057ebbcc2c"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.qtdeDevolvido}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="405" y="3" width="45" height="17" uuid="63cd03cf-dfc9-4f36-a19f-e9dda994881b"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.qtdeTotal}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="450" y="3" width="48" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="00457524-e86e-4bb3-b1fe-4abe0b17f187"/>
-				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.vendido}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="498" y="3" width="48" height="17" uuid="e923470b-ac0e-43fa-a70b-1d9a98554d60"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.digitado}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="546" y="3" width="48" height="17" uuid="48f8733b-29be-4a8b-aecf-e064fcbc0a2b"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.anulado}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="594" y="3" width="48" height="17" uuid="0740115f-b366-459a-afd6-a08a277b248e"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.devolvido}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="642" y="3" width="48" height="17" uuid="fa77631c-b045-42d8-a192-091dae493739"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.receita}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="691" y="3" width="48" height="17" uuid="12b45f25-3417-4b90-95e5-1cbd1435030b"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.despesa}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="739" y="3" width="61" height="17" uuid="60cb5ef9-121c-4fb9-b425-7bc9b301d62d"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{sum.total}]]></textFieldExpression>
-			</textField>
+	<lastPageFooter>
+		<band height="18">
 			<line>
-				<reportElement x="0" y="1" width="802" height="1" uuid="1653e342-87ec-40f2-94ad-5d27b1020c3a"/>
+				<reportElement mode="Transparent" x="0" y="0" width="857" height="1" uuid="1653e342-87ec-40f2-94ad-5d27b1020c3a"/>
 			</line>
-			<textField>
-				<reportElement x="3" y="3" width="127" height="17" uuid="f0f7fc52-26be-4c51-8c78-3c55375be4aa"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="7"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="0" y="1" width="99" height="17" uuid="f0f7fc52-26be-4c51-8c78-3c55375be4aa"/>
+				<textElement textAlignment="Left" markup="none">
+					<font size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.totalGeral}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="99" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="5c65a20a-c9d5-4a90-99bc-a388aeaf3b9a"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorBilhete}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="576" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="dfae2822-460b-4e81-be01-a176d7a2aac7"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdInternet}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="311" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="c96675e1-9572-4ab1-9f83-6ec7a6ce6692"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorSeguro}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="31a240a5-8c29-4293-a2e3-844b2ca695ef"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdVch}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="743" y="1" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="91c51dac-2f23-40a3-beca-81d43577e200"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorEstornado}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="417" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="6035409c-38a6-4809-8e25-df5d9fe77cf4"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorVch}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="523" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="a9096947-664a-4340-a0d9-93872e846918"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorInternet}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="364" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="1e646b2f-f00a-47aa-84f2-50f886028a22"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdSeguro}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="686" y="1" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="3070f702-c0c4-41fc-8afc-79d25df8f645"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdCancelado}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="205" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="c40286db-ba4d-46d5-a377-a3b7982affe5"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorExcesso}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="629" y="1" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="b5f5917f-69e4-4408-8961-d9d50f151ede"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.valorCancelado}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="258" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="6f4e820e-a46f-4354-9c67-7535cdf12881"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdExcesso}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="800" y="1" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="c19ad692-5d21-4015-94b4-e67390847023"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdEstornado}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="152" y="1" width="53" height="17" isPrintWhenDetailOverflows="true" uuid="903b955c-d69f-487a-9ebe-5cfe37b174e5"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum.qtdBilhete}]]></textFieldExpression>
+			</textField>
 		</band>
-	</columnFooter>
+	</lastPageFooter>
 	<noData>
 		<band height="20">
 			<textField>
-				<reportElement x="0" y="0" width="803" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/>
+				<reportElement x="0" y="0" width="857" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioAgenciaFechamentoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioAgenciaFechamentoBean.java
index 115f15656..aa441b7fa 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioAgenciaFechamentoBean.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioAgenciaFechamentoBean.java
@@ -4,120 +4,149 @@ import java.math.BigDecimal;
 
 public class RelatorioAgenciaFechamentoBean {
 	protected String empresa;
-	protected String codigo;
 	protected String descricao;
-	protected Integer qtdeVendido;
-	protected Integer qtdeDigitado;
-	protected Integer qtdeAnulado;
-	protected Integer qtdeDevolvido;
-	protected Integer qtdeDespesa;
-	protected Integer qtdeTotal;
+	protected Integer qtdBilhete;
+	protected Integer qtdExcesso;
+	protected Integer qtdSeguro;
+	protected Integer qtdVch;
+	protected Integer qtdInternet;
+	protected Integer qtdCancelado;
+	protected Integer qtdEstornado;
 	
-	protected BigDecimal vendido;
-	protected BigDecimal digitado;
-	protected BigDecimal anulado;
-	protected BigDecimal devolvido;
-	protected BigDecimal receita;
-	protected BigDecimal despesa;
-	protected BigDecimal total;
+	protected BigDecimal valorBilhete;
+	protected BigDecimal valorExcesso;
+	protected BigDecimal valorSeguro;
+	protected BigDecimal valorVch;
+	protected BigDecimal valorInternet;
+	protected BigDecimal valorCancelado;
+	protected BigDecimal valorEstornado;
 	
 	public String getEmpresa() {
 		return empresa;
 	}
+	
 	public void setEmpresa(String empresa) {
 		this.empresa = empresa;
 	}
 	
-	public String getCodigo() {
-		return codigo;
-	}
-	public void setCodigo(String codigo) {
-		this.codigo = codigo;
-	}
 	public String getDescricao() {
 		return descricao;
 	}
+	
 	public void setDescricao(String descricao) {
 		this.descricao = descricao;
 	}
-	public Integer getQtdeVendido() {
-		return qtdeVendido;
+	
+	public Integer getQtdBilhete() {
+		return qtdBilhete;
 	}
-	public void setQtdeVendido(Integer qtdeVendido) {
-		this.qtdeVendido = qtdeVendido;
+	
+	public void setQtdBilhete(Integer qtdBilhete) {
+		this.qtdBilhete = qtdBilhete;
 	}
-
-	public Integer getQtdeDigitado() {
-		return qtdeDigitado;
+	
+	public Integer getQtdExcesso() {
+		return qtdExcesso;
 	}
-	public void setQtdeDigitado(Integer qtdeDigitado) {
-		this.qtdeDigitado = qtdeDigitado;
+	
+	public void setQtdExcesso(Integer qtdExcesso) {
+		this.qtdExcesso = qtdExcesso;
 	}
-	public Integer getQtdeAnulado() {
-		return qtdeAnulado;
+	
+	public Integer getQtdSeguro() {
+		return qtdSeguro;
 	}
-	public void setQtdeAnulado(Integer qtdeAnulado) {
-		this.qtdeAnulado = qtdeAnulado;
+	
+	public void setQtdSeguro(Integer qtdSeguro) {
+		this.qtdSeguro = qtdSeguro;
 	}
-	public Integer getQtdeDevolvido() {
-		return qtdeDevolvido;
+	
+	public Integer getQtdVch() {
+		return qtdVch;
 	}
-	public void setQtdeDevolvido(Integer qtdeDevolvido) {
-		this.qtdeDevolvido = qtdeDevolvido;
+	
+	public void setQtdVch(Integer qtdVch) {
+		this.qtdVch = qtdVch;
 	}
-	public Integer getQtdeDespesa() {
-		return qtdeDespesa;
+	
+	public Integer getQtdInternet() {
+		return qtdInternet;
 	}
-	public void setQtdeDespesa(Integer qtdeDespesa) {
-		this.qtdeDespesa = qtdeDespesa;
+	
+	public void setQtdInternet(Integer qtdInternet) {
+		this.qtdInternet = qtdInternet;
 	}
-	public BigDecimal getVendido() {
-		return vendido;
+	
+	public Integer getQtdCancelado() {
+		return qtdCancelado;
 	}
-	public void setVendido(BigDecimal vendido) {
-		this.vendido = vendido;
+	
+	public void setQtdCancelado(Integer qtdCancelado) {
+		this.qtdCancelado = qtdCancelado;
 	}
-	public BigDecimal getDigitado() {
-		return digitado;
+	
+	public Integer getQtdEstornado() {
+		return qtdEstornado;
 	}
-	public void setDigitado(BigDecimal digitado) {
-		this.digitado = digitado;
+	
+	public void setQtdEstornado(Integer qtdEstornado) {
+		this.qtdEstornado = qtdEstornado;
 	}
-	public BigDecimal getAnulado() {
-		return anulado;
+	
+	public BigDecimal getValorBilhete() {
+		return valorBilhete;
 	}
-	public void setAnulado(BigDecimal anulado) {
-		this.anulado = anulado;
+	
+	public void setValorBilhete(BigDecimal valorBilhete) {
+		this.valorBilhete = valorBilhete;
 	}
-	public BigDecimal getDevolvido() {
-		return devolvido;
+	
+	public BigDecimal getValorExcesso() {
+		return valorExcesso;
 	}
-	public void setDevolvido(BigDecimal devolvido) {
-		this.devolvido = devolvido;
+	
+	public void setValorExcesso(BigDecimal valorExcesso) {
+		this.valorExcesso = valorExcesso;
 	}
-	public BigDecimal getReceita() {
-		return receita;
+	
+	public BigDecimal getValorSeguro() {
+		return valorSeguro;
 	}
-	public void setReceita(BigDecimal receita) {
-		this.receita = receita;
+	
+	public void setValorSeguro(BigDecimal valorSeguro) {
+		this.valorSeguro = valorSeguro;
 	}
-	public BigDecimal getDespesa() {
-		return despesa;
+	
+	public BigDecimal getValorVch() {
+		return valorVch;
 	}
-	public void setDespesa(BigDecimal despesa) {
-		this.despesa = despesa;
+	
+	public void setValorVch(BigDecimal valorVch) {
+		this.valorVch = valorVch;
 	}
-	public Integer getQtdeTotal() {
-		return qtdeTotal;
+	
+	public BigDecimal getValorInternet() {
+		return valorInternet;
 	}
-	public void setQtdeTotal(Integer qtdeTotal) {
-		this.qtdeTotal = qtdeTotal;
+	
+	public void setValorInternet(BigDecimal valorInternet) {
+		this.valorInternet = valorInternet;
 	}
-	public BigDecimal getTotal() {
-		return total;
+	
+	public BigDecimal getValorCancelado() {
+		return valorCancelado;
 	}
-	public void setTotal(BigDecimal total) {
-		this.total = total;
+	
+	public void setValorCancelado(BigDecimal valorCancelado) {
+		this.valorCancelado = valorCancelado;
+	}
+	
+	public BigDecimal getValorEstornado() {
+		return valorEstornado;
+	}
+	
+	public void setValorEstornado(BigDecimal valorEstornado) {
+		this.valorEstornado = valorEstornado;
 	}
 	
 }