diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java
index 18389b4ec..050f2ba8c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java
@@ -61,8 +61,6 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 					ResultSet rset = stmt.executeQuery();
 					while (rset.next()) {
 						FinanceiroAnalitico fs = new FinanceiroAnalitico();
-						fs.setUf(rset.getString("uf"));
-						fs.setCodigoAgencia(rset.getString("codigo"));
 						fs.setFechorVenta(rset.getDate("fechorVenta"));
 						
 						BigDecimal receitaBPR = getBigDecimal(rset, "receita_bpr");
@@ -108,9 +106,19 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 						fs.setDespesas(getBigDecimal(rset, "despesas"));
 						fs.setPgOCD(getBigDecimal(rset, "receita_ocd_deb"));
 						fs.setDifTarifaMenor(getBigDecimal(rset, "receita_dif_dif_tarifa_menor"));
-						fs.setCartaoCredito(getBigDecimal(rset, "cartao_credito"));
-						fs.setCartaoDebito(getBigDecimal(rset, "cartao_debito"));
-						fs.setBoletoBancario(getBigDecimal(rset, "boleto_bnc"));
+						
+						BigDecimal cartaoCredito = getBigDecimal(rset, "cartao_credito");
+						cartaoCredito = cartaoCredito.add(getBigDecimal(rset, "cartao_credito_ee"));
+						fs.setCartaoCredito(cartaoCredito);
+						
+						BigDecimal cartaoDebito = getBigDecimal(rset, "cartao_debito");
+						cartaoDebito = cartaoDebito.add(getBigDecimal(rset, "cartao_debito_ee"));
+						fs.setCartaoDebito(cartaoDebito);
+						
+						BigDecimal boleto = getBigDecimal(rset, "boleto_bnc");
+						boleto = boleto.add(getBigDecimal(rset, "boleto_bnc_ee"));
+						fs.setBoletoBancario(boleto);
+						
 						fs.setDeposito(getBigDecimal(rset, "deposito"));
 
 						BigDecimal totalDetalhamento = fs.getDespesas().add(fs.getPgOCD()).add(fs.getDifTarifaMenor())
@@ -150,310 +158,218 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 
 	private String getSql(String ufs, String pdvs, Integer tipoptovtaId) {
 
-		StringBuilder sql = new StringBuilder();
-		sql.append("select * from ");
-		sql.append(" ");
-		sql.append("(select ");
-		sql.append("  cdv.estadoOrigem as uf, ");
-		sql.append("  cdv.estadoId, ");
-		sql.append("  cdv.codigo, ");
-		sql.append("  cdv.puntoventaId, ");
-		sql.append("  cdv.empresaId, ");
-		sql.append("  cdv.fechorVenta, ");
-		sql.append("  sum(case when (cdv.indreimpresion = 0 and cdv.indstatusoperacion = 'F' and cdv.motivocancelacion_id is null) then cdv.pedagio else 0 end) as pedagio, ");
-		sql.append("  sum(case when (cdv.indreimpresion = 0 and cdv.indstatusoperacion = 'F' and cdv.motivocancelacion_id is null) then cdv.taxaEmbarque else 0 end) as taxaEmbarque, ");
-		sql.append("  sum(case when (cdv.indreimpresion = 0 and cdv.indstatusoperacion = 'F' and cdv.motivocancelacion_id is null) then cdv.valorpago else 0 end) as receita_bpr, ");
-		sql.append("  sum(case when (cdv.indreimpresion = 0 and cdv.indstatusboleto in ('V', 'T') and cdv.tipoventa_id in (5,12,18,49)) then cdv.valorpago else 0 end) as receita_gap, ");
-		sql.append("  sum(case when (cdv.indreimpresion = 1 and cdv.indstatusboleto = 'E' and cdv.tipoventa_id in (5,12,18,49)) then cdv.valorpago else 0 end) as entrega_gap, ");
-		sql.append("  sum((select sum(cfp.importe) from caja_formapago cfp where cfp.caja_id = cdv.cajaid and cfp.activo = 1 and cfp.FORMAPAGO_ID in (2,25) and (cdv.motivocancelacion_id IS NULL AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F')) ) as cartao_credito, ");
-		sql.append("  sum((select sum(cfp.importe) from caja_formapago cfp where cfp.caja_id = cdv.cajaid and cfp.activo = 1 and cfp.FORMAPAGO_ID in (3,26) and (cdv.motivocancelacion_id IS NULL AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F')) ) as cartao_debito ");
-		sql.append("from ( ");
-		sql.append("      select distinct ");
-		sql.append("        c.caja_id as cajaid, ");
-		sql.append("        trunc(c.feccreacion) as fechorVenta, ");
-		sql.append("        e.empresa_id as empresaId, ");
-		sql.append("        pv.puntoventa_id as puntoventaId, ");
-		sql.append("        pv.numpuntoventa as codigo, ");
-		sql.append("        (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoId, ");
-		sql.append("        (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estadoOrigem, ");
-		sql.append("        c.indstatusboleto, ");
-		sql.append("        c.indreimpresion, ");
-		sql.append("        c.indcancelacion, ");
-		sql.append("        c.numfoliosistema, ");
-		sql.append("        coalesce(c.preciopagado, 0) as valorpago, ");
-		sql.append("        coalesce(c.preciobase, 0) as precobase, ");
-		sql.append("        coalesce(c.preciopagado, 0)  as tarifa, ");
-		sql.append("        coalesce(c.importetaxaembarque, 0) as taxaEmbarque, ");
-		sql.append("        coalesce(c.importepedagio, 0) as pedagio, ");
-		sql.append("        coalesce(c.importeseguro, 0) as seguro, ");
-		sql.append("        coalesce(c.importeoutros, 0) as outros, ");
-		sql.append("        ( select min(formapago_id) from caja_formapago cfp where cfp.caja_id = c.caja_id and cfp.activo = 1) as formapago_id , ");
-		sql.append("        c.motivocancelacion_id as motivocancelacion_id, ");
-		sql.append("        c.tipoventa_id as tipoventa_id, ");
-		sql.append("        c.indstatusoperacion ");
-		sql.append(" FROM CONTA_CORRENTE_PTOVTA ccp "); 
-		sql.append(" INNER JOIN marca ma "); 
-		sql.append(" ON ma.empresa_id = ccp.EMPRESA_ID ");
-		sql.append(" INNER JOIN CAJA c ");
-		sql.append(" ON c.FECCORTE = ccp.FECCORTE "); 
-		sql.append(" AND c.TURNO_ID = ccp.TURNO_ID "); 
-		sql.append(" AND c.PUNTOVENTA_ID = ccp.PUNTOVENTA_ID "); 
-		sql.append(" AND c.marca_id = ma.marca_id "); 
-		sql.append(" AND c.USUARIO_ID = ccp.USUARIO_ID ");
-		sql.append(" inner join empresa e on e.empresa_id = c.empresacorrida_id ");
-		sql.append(" join ruta r on r.ruta_id = c.ruta_id ");
-		sql.append(" join parada po on po.parada_id = c.origen_id ");
-		sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id ");
-		sql.append(" join estado eo on eo.estado_id = co.estado_id ");
-		sql.append(" join parada pd on pd.parada_id = c.destino_id ");
-		sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id ");
-		sql.append(" join estado ed on ed.estado_id = cd.estado_id ");
-		sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id AND ei.activo = 1 ");
-		sql.append(" left join fiscal_impressora imp on imp.numserie = c.serieimpfiscal ");
-		sql.append(" left join estado es on es.estado_id = imp.estadolocal_id ");
-		sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id ");
-		sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id ");
-		sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id ");
-		sql.append(" left join estado eos on eos.estado_id = cos.estado_id ");
-		sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id ");
-		sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id ");
-		sql.append(" left join estado eds on eds.estado_id = cds.estado_id ");
-		sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id AND eis.activo = 1 ");
-		sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id ");
-		sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') ");
-		sql.append(" join inscricao_estadual ie on c.empresacorrida_id = ie.empresa_id and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 ");
-		sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id ");
-		sql.append(" join estado eie on eie.estado_id = cie.estado_id ");
-		sql.append(" join empresa ep on ep.empresa_id = ma.empresa_id ");
-		sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id ");
-		sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id ");
-		sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id ");
-		sql.append(" left join estado epv on epv.estado_id = cpv.estado_id ");
+		StringBuilder sql = new StringBuilder(12000);
+		sql.append(" SELECT *   ");
+		sql.append(" FROM ");
+		sql.append("   (SELECT  ");
+		sql.append("     cdv.empresaId, ");
+		sql.append("     cdv.fechorVenta,  ");
+		sql.append("     SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * cdv.pedagio) ELSE 0 END) AS pedagio, ");
+		sql.append("     SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * cdv.taxaEmbarque) ELSE 0 END)  AS taxaEmbarque, ");
+		sql.append("     SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.motivocancelacion_id IS NULL) THEN cdv.valorpago ELSE 0 END) AS receita_bpr, ");
+		sql.append("     SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.tipoventa_id IN (18) ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * (cdv.tarifa+cdv.taxaEmbarque+cdv.pedagio+cdv.seguro+cdv.outros)) ELSE 0 END) AS receita_gap, ");
+		sql.append("     SUM( CASE WHEN (cdv.indreimpresion = 1 AND cdv.indstatusboleto = 'E' ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * (cdv.tarifa+cdv.taxaEmbarque+cdv.pedagio+cdv.seguro+cdv.outros)) ELSE 0 END) AS entrega_gap, ");
+		sql.append("     SUM( (SELECT SUM( CASE WHEN cdv.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * cfp.importe) FROM caja_formapago cfp WHERE cfp.caja_id = cdv.cajaid AND cfp.activo = 1 AND cfp.FORMAPAGO_ID IN (2,31,38) AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.tipoventa_id <> 6 ) ) AS cartao_credito, ");
+		sql.append("     SUM( (SELECT SUM( CASE WHEN cdv.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * cfp.importe) FROM caja_formapago cfp WHERE cfp.caja_id = cdv.cajaid AND cfp.activo = 1 AND cfp.FORMAPAGO_ID IN (3) AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.tipoventa_id <> 6 ) ) AS cartao_debito, ");
+		sql.append("     SUM( (SELECT SUM( CASE WHEN cdv.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * cfp.importe) FROM caja_formapago cfp WHERE cfp.caja_id = cdv.cajaid AND cfp.activo = 1 AND cfp.FORMAPAGO_ID IN (1) AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.tipoventa_id <> 6 ) ) AS boleto_bnc ");
+		sql.append("   FROM ");
+		sql.append("     ( SELECT DISTINCT c.caja_id AS cajaid, ");
+		sql.append("       e.empresa_id              AS empresaId, ");
+		sql.append("       trunc(c.feccreacion)      as fechorVenta,  ");
+		sql.append("       c.indstatusboleto, ");
+		sql.append("       c.indreimpresion, ");
+		sql.append("       c.indcancelacion, ");
+		sql.append("       c.numfoliosistema, ");
+		sql.append("       COALESCE(c.preciopagado, 0)        AS valorpago, ");
+		sql.append("       COALESCE(c.preciobase, 0)          AS precobase, ");
+		sql.append("       COALESCE(c.preciopagado, 0)        AS tarifa, ");
+		sql.append("       COALESCE(c.importetaxaembarque, 0) AS taxaEmbarque, ");
+		sql.append("       COALESCE(c.importepedagio, 0)      AS pedagio, ");
+		sql.append("       COALESCE(c.importeseguro, 0)       AS seguro, ");
+		sql.append("       COALESCE(c.importeoutros, 0)       AS outros, ");
+		sql.append("       (SELECT MIN(formapago_id) FROM caja_formapago cfp WHERE cfp.caja_id = c.caja_id AND cfp.activo = 1) AS formapago_id , ");
+		sql.append("       c.motivocancelacion_id AS motivocancelacion_id, ");
+		sql.append("       c.tipoventa_id         AS tipoventa_id, ");
+		sql.append("       c.indstatusoperacion ");
+		sql.append("     FROM CONTA_CORRENTE_PTOVTA ccp ");
+		sql.append("     INNER JOIN marca ma ");
+		sql.append("     ON ma.empresa_id = ccp.EMPRESA_ID ");
+		sql.append("     INNER JOIN CAJA c ");
+		sql.append("     ON c.FECCORTE       = ccp.FECCORTE ");
+		sql.append("     AND c.TURNO_ID      = ccp.TURNO_ID ");
+		sql.append("     AND c.PUNTOVENTA_ID = ccp.PUNTOVENTA_ID ");
+		sql.append("     AND c.marca_id      = ma.marca_id ");
+		sql.append("     AND c.USUARIO_ID    = ccp.USUARIO_ID ");
+		sql.append("     INNER JOIN empresa e ");
+		sql.append("     ON e.empresa_id = c.empresacorrida_id ");
+		sql.append("     JOIN punto_venta pv ");
+		sql.append("     ON pv.puntoventa_id = c.puntoventa_id ");
+		sql.append("     JOIN parada po ");
+		sql.append("     ON po.parada_id = pv.parada_id ");
+		sql.append("     JOIN ciudad co ");
+		sql.append("     ON co.ciudad_id = po.ciudad_id ");
+		sql.append("     JOIN estado eo ");
+		sql.append("     ON eo.estado_id    = co.estado_id ");
+		sql.append("     WHERE c.activo     = 1 ");
+		sql.append("     AND po.activo      = 1 ");
+		sql.append("     AND co.activo      = 1 ");
+		sql.append("     AND eo.activo      = 1 ");
+		sql.append("     AND ccp.feccorte  >= :DATE_INICIO ");
+		sql.append("     AND ccp.feccorte  <= :DATE_FIM ");
+		sql.append("     AND ccp.empresa_id = :EMPRESA_ID  ");
+		
+		sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " )  "); 
+		sql.append(pdvs == null ? "" : "and ccp.puntoventa_id in ( " + pdvs + " ) "); 
+		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId); 
+		
+		sql.append("     ) cdv ");
+		sql.append("   GROUP BY cdv.empresaId,  ");
+		sql.append("     cdv.fechorVenta ");
+		sql.append("   ) agrc ");
+		sql.append(" LEFT JOIN ");
+		sql.append("   (SELECT cdc.empresaId, ");
+		sql.append("     cdc.fechorVenta,  ");
+		sql.append("     SUM( CASE WHEN (cdc.indstatusboleto IN ('C', 'T') AND cdc.motivocancelacion_id IN (32,10,37)) THEN cdc.valorpago ELSE 0 END) AS receita_devol_bpr, ");
+		sql.append("     SUM( CASE WHEN (cdc.indstatusboleto IN ('C', 'T') AND cdc.motivocancelacion_id IN (31)) THEN cdc.valorpago ELSE 0 END) AS receita_cancel_bpr, ");
+		sql.append("     SUM( CASE WHEN ( (cdc.indstatusboleto = 'C' AND cdc.motivocancelacion_id IN (32,10,37) OR (cdc.indstatusboleto = 'T' AND cdc.motivocancelacion_id IS NULL )) AND cdc.numfoliosistema IS NULL AND cdc.tipoventa_id IN (5,12,18,49)) THEN cdc.valorpago ELSE 0 END) AS receita_devol_gap , ");
+		sql.append("     SUM( CASE WHEN (cdc.indstatusboleto = 'C' AND cdc.motivocancelacion_id IN (35)) THEN cdc.valorpago ELSE 0 END) AS receita_ocd_deb, ");
+		sql.append("     SUM( CASE WHEN (cdc.indstatusboleto = 'C' AND cdc.motivocancelacion_id IN (99) ) THEN cdc.valorpago ELSE 0 END) AS receita_ocd_cred ");
+		sql.append("  FROM ");
+		sql.append("     ( SELECT DISTINCT c.caja_id AS cajaid, ");
+		sql.append("       trunc(c.feccreacion)      AS fechorVenta,  ");
+		sql.append("       e.empresa_id              AS empresaId, ");
+		sql.append("       c.indstatusboleto, ");
+		sql.append("       c.indreimpresion, ");
+		sql.append("       c.indcancelacion, ");
+		sql.append("       c.numfoliosistema, ");
+		sql.append("       COALESCE(cfp.importe, 0)           AS valorpago, ");
+		sql.append("       COALESCE(c.preciobase, 0)          AS precobase, ");
+		sql.append("       COALESCE(c.preciopagado, 0)        AS tarifa, ");
+		sql.append("       COALESCE(c.importetaxaembarque, 0) AS taxaEmbarque, ");
+		sql.append("       COALESCE(c.importepedagio, 0)      AS pedagio, ");
+		sql.append("       COALESCE(c.importeseguro, 0)       AS seguro, ");
+		sql.append("       COALESCE(c.importeoutros, 0)       AS outros, ");
+		sql.append("       cfp.formapago_id, ");
+		sql.append("       c.motivocancelacion_id AS motivocancelacion_id, ");
+		sql.append("       c.tipoventa_id         AS tipoventa_id, ");
+		sql.append("       c.indstatusoperacion ");
+		sql.append("     FROM caja c ");
+		sql.append("     INNER JOIN caja_formapago cfp ");
+		sql.append("     ON cfp.caja_id = c.caja_id ");
+		sql.append("     INNER JOIN forma_pago fp ");
+		sql.append("     ON cfp.formapago_id = fp.formapago_id ");
+		sql.append("     INNER JOIN marca m ");
+		sql.append("     ON m.marca_id = c.marca_id ");
+		sql.append("     AND m.activo  = 1 ");
+		sql.append("     INNER JOIN empresa e ");
+		sql.append("     ON e.empresa_id = m.empresa_id ");
+		sql.append("     INNER JOIN punto_venta pv ");
+		sql.append("     ON pv.puntoventa_id = c.puntoventa_id ");
+		sql.append("     JOIN parada po ");
+		sql.append("     ON po.parada_id = pv.parada_id ");
+		sql.append("     JOIN ciudad co ");
+		sql.append("     ON co.ciudad_id = po.ciudad_id ");
+		sql.append("     JOIN estado eo ");
+		sql.append("     ON eo.estado_id                = co.estado_id ");
+		sql.append("     WHERE (c.motivocancelacion_id IN (31,32,10,37,99,36) ");
+		sql.append("     OR c.motivocancelacion_id     IS NULL) ");
+		sql.append("     AND c.feccorte                >= :DATE_INICIO ");
+		sql.append("     AND c.feccorte                <= :DATE_FIM ");
+		sql.append("     AND c.empresacorrida_id        = :EMPRESA_ID  ");
 
-		sql.append(" where c.activo = 1 AND po.activo = 1 AND co.activo = 1 AND eo.activo = 1 "); 
-		sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 ");
-		sql.append(" and c.motivocancelacion_id is null ");
-		sql.append(" and ccp.feccorte >= :DATE_INICIO and ccp.feccorte <= :DATE_FIM ");
-		sql.append(" and ccp.empresa_id = :EMPRESA_ID ");
-		sql.append(ufs == null ? "" : " and ((case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) in ( " + ufs + " )) ");
-		sql.append(pdvs == null ? "" : "and ccp.puntoventa_id in ( " + pdvs + " ) ");
-		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
-		sql.append("  ");
-		sql.append("union all ");
-		sql.append(" ");
-		sql.append(" select distinct ");
-		sql.append("        c.caja_id as cajaid, ");
-		sql.append("        trunc(c.feccreacion) as fechorVenta, ");
-		sql.append("        e.empresa_id as empresaId, ");
-		sql.append("        pv.puntoventa_id as puntoventaId, ");
-		sql.append("        pv.numpuntoventa as codigo, ");
-		sql.append("        coalesce(ae.estado_id, (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end)) as estadoId, ");
-		sql.append("        coalesce(ae.cveestado,(case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end)) as estadoOrigem, ");
-		sql.append("        c.indstatusboleto, ");
-		sql.append("        c.indreimpresion, ");
-		sql.append("        c.indcancelacion, ");
-		sql.append("        c.numfoliosistema, ");
-		sql.append("        coalesce(cfp.importe, 0) as valorpago, ");
-		sql.append("        coalesce(c.preciobase, 0) as precobase, ");
-		sql.append("        coalesce(c.preciopagado, 0)  as tarifa, ");
-		sql.append("        coalesce(c.importetaxaembarque, 0) as taxaEmbarque, ");
-		sql.append("        coalesce(c.importepedagio, 0) as pedagio, ");
-		sql.append("        coalesce(c.importeseguro, 0) as seguro, ");
-		sql.append("        coalesce(c.importeoutros, 0) as outros, ");
-		sql.append("        cfp.formapago_id, ");
-		sql.append("        c.motivocancelacion_id as motivocancelacion_id, ");
-		sql.append("        c.tipoventa_id as tipoventa_id, ");
-		sql.append("        c.indstatusoperacion ");
-		sql.append("from caja c ");
-		sql.append("  inner join caja_formapago cfp on cfp.caja_id = c.caja_id ");
-		sql.append("  inner join forma_pago fp on  cfp.formapago_id = fp.formapago_id ");
-		sql.append("  join marca m on c.marca_id = m.marca_id ");
-		sql.append("  join empresa e on e.empresa_id = m.empresa_id ");
-		sql.append("  join aidf a on a.aidf_id = c.aidf_id ");
-		sql.append("  join punto_venta pv on pv.puntoventa_id = c.puntoventa_id ");
-		sql.append("  join ciudad ce on ce.ciudad_id = e.ciudad_id ");
-		sql.append("  join estado ee on ee.estado_id = ce.estado_id ");
-		sql.append("  join parada po on po.parada_id = c.origen_id ");
-		sql.append("  join ciudad co on co.ciudad_id = po.ciudad_id ");
-		sql.append("  join estado eo on eo.estado_id = co.estado_id ");
-		sql.append("  join parada pd on pd.parada_id = c.destino_id ");
-		sql.append("  join ciudad cd on cd.ciudad_id = pd.ciudad_id ");
-		sql.append("  join estado ed on ed.estado_id = cd.estado_id ");
-		sql.append("  left join alias_servico s on s.origen_id = c.origen_id ");
-		sql.append("                 and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) ");
-		sql.append("                 and s.ruta_id = c.ruta_id ");
-		sql.append("  left join parada pos on pos.parada_id = s.aliasorigen_id ");
-		sql.append("  left join ciudad cos on cos.ciudad_id = pos.ciudad_id ");
-		sql.append("  left join estado eos on eos.estado_id = cos.estado_id ");
-		sql.append("  left join parada pds on pds.parada_id = s.aliasdestino_id ");
-		sql.append("  left join ciudad cds on cds.ciudad_id = pds.ciudad_id ");
-		sql.append("  left join estado eds on eds.estado_id = cds.estado_id ");
-		sql.append("  left join estado ae on ae.estado_id = a.estado_id ");
-		sql.append("  join inscricao_estadual ie on e.empresa_id = ie.empresa_id ");
-		sql.append("                 and ie.estado_id = coalesce(ae.estado_id, eos.estado_id) and ie.activo = 1 ");
-		sql.append("  join ciudad cie on cie.ciudad_id = ie.ciudad_id ");
-		sql.append("  join estado eie on eie.estado_id = cie.estado_id ");
-		sql.append("  join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id ");
-		sql.append("                 and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 ");
-		sql.append("where ((c.tipoventa_id = 3 and c.indstatusboleto = 'V' and c.indreimpresion = 0) ");
-		sql.append("   or (c.tipoventa_id in (12,18) and c.indstatusboleto = 'E' and c.numfoliosistema = c.numfoliopreimpreso)) ");
-		sql.append("   and (c.motivocancelacion_id is null or c.motivocancelacion_id <> 35) ");
-		sql.append("   and c.indcancelacion = 0 ");
-		sql.append("   and c.indstatusboleto = 'V' and c.indreimpresion = 0 ");
-		sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM ");
-		sql.append(" and c.empresacorrida_id = :EMPRESA_ID ");
-		sql.append(ufs == null ? "" : " and coalesce(ae.estado_id, eos.estado_id) in ( " + ufs + " ) ");
+		sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " )  ");
 		sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
 		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
-		sql.append("      ) cdv ");
-		sql.append("	group by cdv.estadoOrigem, cdv.estadoId, cdv.codigo, cdv.puntoventaId, cdv.empresaId, cdv.fechorVenta ) agrc ");
-		sql.append(" ");
-		sql.append("left join (select ");
-		sql.append("  cdc.estadoOrigem as uf, ");
-		sql.append("  cdc.estadoId, ");
-		sql.append("  cdc.codigo, ");
-		sql.append("  cdc.puntoventaId, ");
-		sql.append("  cdc.empresaId, ");
-		sql.append("  cdc.fechorVenta, ");
-		sql.append("  sum(case when (cdc.indstatusboleto in ('C', 'T') and cdc.motivocancelacion_id in (32,10,37)) then cdc.valorpago else 0 end) as receita_devol_bpr, ");
-		sql.append("  sum(case when (cdc.indstatusboleto in ('C', 'T') and cdc.motivocancelacion_id in (31)) then cdc.valorpago else 0 end) as receita_cancel_bpr, ");
-		sql.append("  sum(case when (cdc.indstatusboleto in ('C', 'T') and cdc.motivocancelacion_id in (32,10,37) and cdc.numfoliosistema is null and cdc.tipoventa_id in (5,12,18,49)) then cdc.valorpago else 0 end) as receita_devol_gap, ");
-		sql.append("  sum(case when (cdc.indstatusboleto = 'C' and cdc.motivocancelacion_id in (35)) then cdc.valorpago else 0 end) as receita_ocd_deb, ");
-		sql.append("  sum(case when (cdc.indstatusboleto = 'C' and cdc.motivocancelacion_id in (99) ) then cdc.valorpago else 0 end) as receita_ocd_cred ");
-		sql.append("  from ( ");
-		sql.append("  select distinct ");
-		sql.append("        c.caja_id as cajaid, ");
-		sql.append("        trunc(c.feccreacion) as fechorVenta, ");
-		sql.append("        e.empresa_id as empresaId, ");
-		sql.append("        ptv.puntoventa_id as puntoventaId, ");
-		sql.append("        ptv.numpuntoventa as codigo, ");
-		sql.append("        coalesce(esaidf.estado_id, eos.estado_id, est.estado_id) as estadoId, ");
-		sql.append("        coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) as estadoOrigem, ");
-		sql.append("        c.indstatusboleto, ");
-		sql.append("        c.indreimpresion, ");
-		sql.append("        c.indcancelacion, ");
-		sql.append("        c.numfoliosistema, ");
-		sql.append("        coalesce(cfp.importe, 0) as valorpago, ");
-		sql.append("        coalesce(c.preciobase, 0) as precobase, ");
-		sql.append("        coalesce(c.preciopagado, 0)  as tarifa, ");
-		sql.append("        coalesce(c.importetaxaembarque, 0) as taxaEmbarque, ");
-		sql.append("        coalesce(c.importepedagio, 0) as pedagio, ");
-		sql.append("        coalesce(c.importeseguro, 0) as seguro, ");
-		sql.append("        coalesce(c.importeoutros, 0) as outros, ");
-		sql.append("        cfp.formapago_id, ");
-		sql.append("        c.motivocancelacion_id as motivocancelacion_id, ");
-		sql.append("        c.tipoventa_id as tipoventa_id, ");
-		sql.append("        c.indstatusoperacion ");
-		sql.append("    ");
-		sql.append("from caja c ");
-		sql.append(" inner join caja_formapago cfp on cfp.caja_id = c.caja_id ");
-		sql.append(" inner join forma_pago fp on  cfp.formapago_id = fp.formapago_id ");
-		sql.append("inner join marca m on m.marca_id = c.marca_id and m.activo = 1 ");
-		sql.append("inner join empresa e on e.empresa_id = m.empresa_id ");
-		sql.append("inner join punto_venta ptv on ptv.puntoventa_id = c.puntoventa_id ");
-		sql.append("inner join parada ori on (c.origen_id = ori.parada_id ) ");
-		sql.append("inner join parada des on (c.destino_id = des.parada_id ) ");
-		sql.append("inner join ciudad co on (co.ciudad_id = ori.ciudad_id ) ");
-		sql.append("inner join ciudad cd on (cd.ciudad_id = des.ciudad_id ) ");
-		sql.append("inner join estado est on est.estado_id = co.estado_id ");
-		sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = c.ptovtaventa_id ");
-		sql.append("left join alias_servico s on s.origen_id = c.origen_id ");
-		sql.append("                 		  and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) ");
-		sql.append("                 		  and s.ruta_id = c.ruta_id ");
-		sql.append("left join parada pos on pos.parada_id = s.aliasorigen_id ");
-		sql.append("left join ciudad cos on cos.ciudad_id = pos.ciudad_id ");
-		sql.append("left join estado eos on eos.estado_id = cos.estado_id ");
-		sql.append("left join parada pds on pds.parada_id = s.aliasdestino_id ");
-		sql.append("left join ciudad cds on cds.ciudad_id = pds.ciudad_id ");
-		sql.append("left join estado eds on eds.estado_id = cds.estado_id ");
-		sql.append("left join aidf aidf on aidf.aidf_id = c.aidf_id and c.tipoventa_id = 3 ");
-		sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id ");
-		sql.append("join inscricao_estadual ie on e.empresa_id = ie.empresa_id ");
-		sql.append("               			   and ie.estado_id = coalesce(aidf.estado_id, eos.estado_id, est.estado_id) and ie.activo = 1 ");
-		sql.append("join empresa_imposto ei on ei.empresa_id = e.empresa_id ");
-		sql.append("               			   and ei.estado_id = coalesce(aidf.estado_id, eos.estado_id, est.estado_id) and ei.activo = 1 ");
-		sql.append("where c.motivocancelacion_id in (31,32,10,37,99,36) ");
-		sql.append("  and c.indcancelacion = 1 ");
-		sql.append("  and c.numfoliopreimpreso is not null ");
-		sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM ");
-		sql.append(" and c.empresacorrida_id = :EMPRESA_ID ");
-		sql.append(ufs == null ? "" : " and coalesce(esaidf.estado_id, eos.estado_id, est.estado_id) in ( " + ufs + " ) ");
-		sql.append(pdvs == null ? "" : "and ptv.puntoventa_id in ( " + pdvs + " ) ");
-		sql.append(tipoptovtaId == -1 ? "" : "and ptv.tipoptovta_id = " + tipoptovtaId);
-		sql.append("  and c.categoria_id not in (select valorconstante from constante where nombconstante = 'GRATUIDADE_CRIANCA') ");
-		sql.append("        ) cdc ");
-		sql.append("	group by cdc.estadoOrigem, cdc.estadoId, cdc.codigo, cdc.puntoventaId, cdc.empresaId, cdc.fechorVenta ");
-		sql.append(") canc on agrc.empresaId = canc.empresaId and agrc.puntoventaId = canc.puntoventaId and agrc.estadoId = canc.estadoId and agrc.fechorVenta = canc.fechorVenta ");
-		sql.append(" left join ( ");
-		sql.append(" 	select ");
-		sql.append(" 	  ee.empresa_id AS empresaId, cd.puntoventa_id AS puntoventaId, eo.estado_id AS estadoId, trunc(ee.fechoringreso) as fechorVenta,  ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id = 2 and indtipo = 1 then cdp.importe else 0 end) as taxaembarque, ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id = 25 and indtipo = 1 then cdp.importe else 0 end) as segurofac, ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id = 82 and indtipo = 1 then cdp.importe else 0 end) as receita_eb, ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id in (41) and indtipo = 1 then cdp.importe else 0 end) as receita_multa, ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id in (103,99978,99999) and indtipo = 1 then cdp.importe else 0 end) as receita_dif_troca_ocd, ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id in (43) and indtipo = 1 then cdp.importe else 0 end) as receita_dif_dif_tarifa_maior, ");
-		sql.append(" 	  sum( case when tee.tipoeventoextra_id in (44) and indtipo = 0 then cdp.importe else 0 end) as receita_dif_dif_tarifa_menor, ");
-		sql.append("	  sum( case when tee.tipoeventoextra_id not in (44) and indtipo = 0 then cdp.importe else 0 end) as despesas, ");
-		sql.append("	  sum( case when (cdp.formapago_id in (2,25) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_credito_ee, ");
-		sql.append("   	  sum( case when (cdp.formapago_id in (3,26) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_debito_ee ");
-		sql.append(" 	from caja_diversos cd ");
-		sql.append("   		join evento_extra ee on ee.eventoextra_id = cd.eventoextra_id ");
-		sql.append("   		join tipo_evento_extra tee on tee.tipoeventoextra_id = ee.tipoeventoextra_id ");
-		sql.append("   		join caja_diversos_pago cdp on cdp.cajadiversos_id = cd.cajadiversos_id ");
-		sql.append("   		join conta_corrente_ptovta ccp on ccp.empresa_id = ee.empresa_id ");
-		sql.append("     		and ccp.puntoventa_id = cd.puntoventa_id ");
-		sql.append("     		and ccp.turno_id = cd.turno_id ");
-		sql.append("     		and ccp.usuario_id = cd.usuario_id ");
-		sql.append("     		and cd.feccorte = ccp.feccorte ");
-		sql.append("   		join punto_venta pv on pv.puntoventa_id = ee.puntoventa_id ");
-		sql.append("   		left join boleto b on b.boleto_id = ee.boleto_id ");
-		sql.append("   		left join parada po on po.parada_id = coalesce(b.origen_id,pv.parada_id) ");
-		sql.append("   		left join ciudad co on co.ciudad_id = po.ciudad_id ");
-		sql.append("   		left join estado eo on eo.estado_id = co.estado_id ");
-		sql.append(" 	where ");
-		sql.append("   		( cd.indreimpresion = 0 or cd.indreimpresion is null ) ");
-		sql.append("        and ee.empresa_id = :EMPRESA_ID ");
-		sql.append(ufs == null ? "" : "and eo.estado_id in ( " + ufs + " ) ");
-		sql.append(pdvs == null ? "" : "and ccp.puntoventa_id in ( " + pdvs + " ) ");
-		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
-		sql.append("            and ccp.FECCORTE between :DATE_INICIO and :DATE_FIM ");
-		sql.append("    group by ee.empresa_id, cd.puntoventa_id, eo.estado_id, trunc(ee.fechoringreso) ");
-		sql.append("   ) eed on agrc.empresaId = eed.empresaId and agrc.puntoventaId = eed.puntoventaId and agrc.estadoId = eed.estadoId AND agrc.fechorVenta = eed.fechorVenta ");
-		sql.append("left join ( ");
-		sql.append("     select coalesce(sum(fd.valor), 0) as deposito, pv.puntoventa_id as puntoventaId, fcc.empresa_id as empresaId, eo.estado_id as estadoId, ");
-		sql.append("        trunc(fd.feccreacion) as fechorVenta ");
-		sql.append("        from fechamento_cntcorrente fcc ");
-		sql.append("        join fechamento_cct_deposito fcd on fcd.fechamentocntcorrente_id = fcc.fechamentocntcorrente_id ");
-		sql.append("        join fechamento_deposito fd on fd.fechamentocntcorrente_id = fcd.fechamentocntcorrente_id ");
-		sql.append("        join punto_venta pv on pv.puntoventa_id = fcc.puntoventa_id ");
-		sql.append("        join parada po on po.parada_id = pv.parada_id ");
-		sql.append("        join ciudad co on co.ciudad_id = po.ciudad_id ");
-		sql.append("        join estado eo on eo.estado_id = co.estado_id ");
-		sql.append("        where fcc.activo = 1 and fcc.empresa_id = :EMPRESA_ID ");
-		sql.append(ufs == null ? "" : "and eo.estado_id in ( " + ufs + " ) ");
-		sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
-		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
-		sql.append("        and fd.feccreacion between :DATE_INICIO and :DATE_FIM ");
-		sql.append("      group by  pv.puntoventa_id, fcc.empresa_id, eo.estado_id, trunc(fd.feccreacion) ");
-		sql.append("   ) depd on agrc.empresaId = depd.empresaId and agrc.puntoventaId = depd.puntoventaId and agrc.estadoId = depd.estadoId and agrc.fechorVenta = depd.fechorVenta ");
-		sql.append("left join ( ");
-		sql.append("     select coalesce(sum(fb.valordocumento), 0) as boleto_bnc , pv.puntoventa_id as puntoventaId, fcc.empresa_id as empresaId, eo.estado_id as estadoId, ");
-		sql.append("        trunc(fcc.fecinifechamento) as fechorVenta ");
-		sql.append("        from fechamento_cntcorrente fcc ");
-		sql.append("        join fechamento_boleto fb on fb.fechamentocntcorrente_id = fcc.fechamentocntcorrente_id ");
-		sql.append("        join punto_venta pv on pv.puntoventa_id = fcc.puntoventa_id ");
-		sql.append("        join parada po on po.parada_id = pv.parada_id ");
-		sql.append("        join ciudad co on co.ciudad_id = po.ciudad_id ");
-		sql.append("        join estado eo on eo.estado_id = co.estado_id ");
-		sql.append("        where fcc.activo = 1 and fcc.empresa_id = :EMPRESA_ID ");
-		sql.append(ufs == null ? "" : "and eo.estado_id in ( " + ufs + " ) ");
-		sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
-		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
-		sql.append("        and and fcc.fecinifechamento >= :DATE_INICIO and fcc.fecfinfechamento <= :DATE_FIM ");
-		sql.append("      group by  pv.puntoventa_id, fcc.empresa_id, eo.estado_id, trunc(fcc.fecinifechamento) ");
-		sql.append("   ) bold on agrc.empresaId = bold.empresaId and agrc.puntoventaId = bold.puntoventaId and agrc.estadoId = bold.estadoId and agrc.fechorVenta = bold.fechorVenta ");
 
+		sql.append(" 	AND c.categoria_id NOT IN (SELECT valorconstante FROM constante WHERE nombconstante = 'GRATUIDADE_CRIANCA' ) ");
+		sql.append("     ) cdc ");
+		sql.append("   GROUP BY cdc.empresaId,  ");
+		sql.append("     cdc.fechorVenta ");
+		sql.append("   ) canc ON agrc.empresaId = canc.empresaId ");
+		sql.append(" and agrc.fechorVenta       = canc.fechorVenta ");
+		sql.append(" LEFT JOIN ");
+		sql.append("   (SELECT ee.empresa_id AS empresaId, ");
+		sql.append("    trunc(ee.fechoringreso) as fechorVenta, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id = 2 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS taxaembarque, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id = 25 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS segurofac, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id = 82 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_eb, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id IN (41) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_multa, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id IN (103,99978,99999) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_dif_troca_ocd, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id IN (43) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_dif_dif_tarifa_maior, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id IN (44) AND tee.indtipo = 0 THEN cdp.importe ELSE 0 END) AS receita_dif_dif_tarifa_menor, ");
+		sql.append(" 	SUM( CASE WHEN ee.tipoeventoextra_id NOT IN (44) AND tee.indtipo = 0 THEN cdp.importe ELSE 0 END) AS despesas, ");
+		sql.append(" 	SUM( CASE WHEN (cdp.formapago_id IN (2,31,38) AND e.indtipo = 1) THEN cdp.importe ELSE 0 END) AS cartao_credito_ee, ");
+		sql.append(" 	SUM( CASE WHEN (cdp.formapago_id IN (3) AND e.indtipo = 1) THEN cdp.importe ELSE 0 END) AS cartao_debito_ee, ");
+		sql.append(" 	SUM( CASE WHEN (cdp.formapago_id IN (1) AND e.indtipo = 1) THEN cdp.importe ELSE 0 END) AS boleto_bnc_ee ");
+		sql.append("   FROM CAJA_DIVERSOS cd ");
+		sql.append("   JOIN CAJA_DIVERSOS_PAGO cdp ");
+		sql.append("   ON cdp.CAJADIVERSOS_ID = cd.CAJADIVERSOS_ID ");
+		sql.append("   INNER JOIN forma_pago fp ");
+		sql.append("   ON fp.formapago_id = cdp.formapago_id ");
+		sql.append("   INNER JOIN EVENTO_EXTRA EE ");
+		sql.append("   ON EE.EVENTOEXTRA_ID = cd.EVENTOEXTRA_ID ");
+		sql.append("   JOIN tipo_evento_extra tee ");
+		sql.append("   ON tee.tipoeventoextra_id = ee.tipoeventoextra_id ");
+		sql.append("   LEFT OUTER JOIN empresa e ");
+		sql.append("   ON ee.empresa_id = e.empresa_id ");
+		sql.append("   INNER JOIN CONTA_CORRENTE_PTOVTA ccp ");
+		sql.append("   ON e.EMPRESA_ID       = ccp.EMPRESA_ID ");
+		sql.append("   AND ccp.PUNTOVENTA_ID = cd.PUNTOVENTA_ID ");
+		sql.append("   AND ccp.FECCORTE      = cd.FECCORTE ");
+		sql.append("   AND ccp.TURNO_ID      = cd.turno_id ");
+		sql.append("   AND cd.USUARIO_ID     = ccp.USUARIO_ID ");
+		sql.append("   JOIN punto_venta pv ");
+		sql.append("   ON pv.puntoventa_id = ee.puntoventa_id ");
+		sql.append("   LEFT JOIN parada po ");
+		sql.append("   ON po.parada_id = pv.parada_id ");
+		sql.append("   LEFT JOIN ciudad co ");
+		sql.append("   ON co.ciudad_id = po.ciudad_id ");
+		sql.append("   LEFT JOIN estado eo ");
+		sql.append("   ON eo.estado_id           = co.estado_id ");
+		sql.append("   WHERE ( cd.indreimpresion = 0 ");
+		sql.append("   OR cd.indreimpresion     IS NULL ) ");
+		sql.append("   AND ee.empresa_id         = :EMPRESA_ID  ");
+		sql.append("   AND ccp.FECCORTE BETWEEN :DATE_INICIO AND :DATE_FIM ");
+
+		sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " )  "); 
+		sql.append(pdvs == null ? "" : "and ccp.puntoventa_id in ( " + pdvs + " ) "); 
+		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
+
+		sql.append("   GROUP BY ee.empresa_id, ");
+		sql.append("     trunc(ee.fechoringreso)  ");
+		sql.append("   ) eed ON agrc.empresaId = eed.empresaId ");
+		sql.append(" AND agrc.fechorVenta      = eed.fechorVenta ");
+		sql.append(" LEFT JOIN ");
+		sql.append("   (SELECT COALESCE(SUM(fd.valor), 0) AS deposito, ");
+		sql.append("     fcc.empresa_id                   AS empresaId, ");
+		sql.append("     trunc(fd.feccreacion)            AS fechorVenta  ");
+		sql.append("   FROM fechamento_cntcorrente fcc ");
+		sql.append("   JOIN fechamento_cct_deposito fcd ");
+		sql.append("   ON fcd.fechamentocntcorrente_id = fcc.fechamentocntcorrente_id ");
+		sql.append("   JOIN fechamento_deposito fd ");
+		sql.append("   ON fd.fechamentocntcorrente_id = fcd.fechamentocntcorrente_id ");
+		sql.append("   JOIN punto_venta pv ");
+		sql.append("   ON pv.puntoventa_id = fcc.puntoventa_id ");
+		sql.append("   JOIN parada po ");
+		sql.append("   ON po.parada_id = pv.parada_id ");
+		sql.append("   JOIN ciudad co ");
+		sql.append("   ON co.ciudad_id = po.ciudad_id ");
+		sql.append("   JOIN estado eo ");
+		sql.append("   ON eo.estado_id    = co.estado_id ");
+		sql.append("   WHERE fcc.activo   = 1 ");
+		sql.append("   AND fcc.empresa_id = :EMPRESA_ID  ");
+		sql.append("   AND fd.feccreacion BETWEEN :DATE_INICIO AND :DATE_FIM ");
+
+		sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " )  "); 
+		sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) "); 
+		sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId); 
+
+		sql.append("   GROUP BY fcc.empresa_id, ");
+		sql.append("     trunc(fd.feccreacion)  ");
+		sql.append("   ) depd ON agrc.empresaId = depd.empresaId ");
+		sql.append(" AND agrc.fechorVenta       = depd.fechorVenta ");
+		sql.append(" order by agrc.fechorVenta ");
+		
 		return sql.toString();
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jasper
index c4e999837..a1c4c3b31 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jrxml
index d8d4078a6..87a3150e2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jrxml
@@ -1,6 +1,6 @@
 <?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="RelatorioFinanceiroAnalitico" pageWidth="1602" pageHeight="595" orientation="Landscape" columnWidth="1602" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
-	<property name="ireport.zoom" value="0.7513148009015812"/>
+<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="RelatorioFinanceiroAnalitico" pageWidth="2260" pageHeight="595" orientation="Landscape" columnWidth="2260" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
+	<property name="ireport.zoom" value="0.7513148009015815"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="nombempresa" class="java.lang.String"/>
@@ -165,7 +165,7 @@
 				<textFieldExpression><![CDATA["Data"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="41" y="84" width="56" height="25" backcolor="#FFFF00" uuid="f02691ff-5726-4418-8514-afd9bb5a229d"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="41" y="84" width="82" height="25" backcolor="#FFFF00" uuid="f02691ff-5726-4418-8514-afd9bb5a229d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -177,7 +177,7 @@
 				<textFieldExpression><![CDATA["Receita BPR (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="97" y="84" width="56" height="25" backcolor="#FFFF00" uuid="5f4321ff-d0d6-43b5-bb7e-3180000c7e31"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="123" y="84" width="82" height="25" backcolor="#FFFF00" uuid="5f4321ff-d0d6-43b5-bb7e-3180000c7e31"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -188,7 +188,7 @@
 				<textFieldExpression><![CDATA["GAP Venda (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="153" y="84" width="56" height="25" backcolor="#FFFF00" uuid="d2c2f2d8-456e-4a16-a9c7-11c0b3185f10"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="205" y="84" width="82" height="25" backcolor="#FFFF00" uuid="d2c2f2d8-456e-4a16-a9c7-11c0b3185f10"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -199,7 +199,7 @@
 				<textFieldExpression><![CDATA["GAP Impresa (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="209" y="84" width="60" height="25" backcolor="#FFFF00" uuid="12197db9-bffb-4910-b77c-4fe1a74de269"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="287" y="84" width="82" height="25" backcolor="#FFFF00" uuid="12197db9-bffb-4910-b77c-4fe1a74de269"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -211,7 +211,7 @@
 				<textFieldExpression><![CDATA["Tot.Venda Passagem"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="269" y="84" width="56" height="25" backcolor="#FFFF00" uuid="252015f9-2aeb-46ad-b5d2-ea9a263b02f5"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="369" y="84" width="82" height="25" backcolor="#FFFF00" uuid="252015f9-2aeb-46ad-b5d2-ea9a263b02f5"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -223,7 +223,7 @@
 				<textFieldExpression><![CDATA["Receita EB (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="325" y="84" width="56" height="25" backcolor="#FFFF00" uuid="1ab641a0-86aa-49bb-b28b-4e29ccd575b9"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="451" y="84" width="82" height="25" backcolor="#FFFF00" uuid="1ab641a0-86aa-49bb-b28b-4e29ccd575b9"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -234,7 +234,7 @@
 				<textFieldExpression><![CDATA["Multa Comp (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="381" y="84" width="56" height="25" backcolor="#FFFF00" uuid="1670476e-5c19-45bb-9f80-a4967706e724"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="533" y="84" width="82" height="25" backcolor="#FFFF00" uuid="1670476e-5c19-45bb-9f80-a4967706e724"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -245,7 +245,7 @@
 				<textFieldExpression><![CDATA["Dif. Troca OCD (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="437" y="84" width="56" height="25" backcolor="#FFFF00" uuid="9e33b573-691d-412a-ad24-96907b98eef3"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="615" y="84" width="82" height="25" backcolor="#FFFF00" uuid="9e33b573-691d-412a-ad24-96907b98eef3"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -256,7 +256,7 @@
 				<textFieldExpression><![CDATA["Dif.Tarifa maior (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="493" y="84" width="54" height="25" backcolor="#FFFF00" uuid="9b000f9e-e745-4e69-a5eb-7434e02fa459"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="697" y="84" width="82" height="25" backcolor="#FFFF00" uuid="9b000f9e-e745-4e69-a5eb-7434e02fa459"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -268,7 +268,7 @@
 				<textFieldExpression><![CDATA["Total de outras receitas"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="547" y="84" width="56" height="25" backcolor="#FFFF00" uuid="46471d08-42a2-47c3-80e4-ff3de2a16295"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="779" y="84" width="82" height="25" backcolor="#FFFF00" uuid="46471d08-42a2-47c3-80e4-ff3de2a16295"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -280,7 +280,7 @@
 				<textFieldExpression><![CDATA["Tx. Emb (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="603" y="84" width="56" height="25" backcolor="#FFFF00" uuid="8d7ee2e2-cc1f-4460-967f-12c763bcc135"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="861" y="84" width="82" height="25" backcolor="#FFFF00" uuid="8d7ee2e2-cc1f-4460-967f-12c763bcc135"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -291,7 +291,7 @@
 				<textFieldExpression><![CDATA["Pedágio (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="659" y="84" width="56" height="25" backcolor="#FFFF00" uuid="da186e18-e817-4144-a4e9-e10106d0b84c"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="943" y="84" width="82" height="25" backcolor="#FFFF00" uuid="da186e18-e817-4144-a4e9-e10106d0b84c"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -302,7 +302,7 @@
 				<textFieldExpression><![CDATA["Seg.Facult. (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="715" y="84" width="66" height="25" backcolor="#FFFF00" uuid="42e97fbc-d8f6-4f4d-a04b-cb0b931b07b1"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1025" y="84" width="82" height="25" backcolor="#FFFF00" uuid="42e97fbc-d8f6-4f4d-a04b-cb0b931b07b1"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -314,7 +314,7 @@
 				<textFieldExpression><![CDATA["Total Terceiros"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="781" y="84" width="74" height="25" backcolor="#FFCCFF" uuid="1e809436-8594-4456-98e7-21ed45aec496"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1107" y="84" width="82" height="25" backcolor="#FFCCFF" uuid="1e809436-8594-4456-98e7-21ed45aec496"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -327,7 +327,7 @@
 				<textFieldExpression><![CDATA["Receita Bruta"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="855" y="84" width="56" height="25" backcolor="#FFFF00" uuid="3130fa44-8ea8-4df5-9759-13d76611e30c"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1189" y="84" width="82" height="25" backcolor="#FFFF00" uuid="3130fa44-8ea8-4df5-9759-13d76611e30c"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -339,7 +339,7 @@
 				<textFieldExpression><![CDATA["Devol.BPR (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="911" y="84" width="56" height="25" backcolor="#FFFF00" uuid="12bf9250-24fb-4fb3-ba07-56acb7a3c833"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1271" y="84" width="82" height="25" backcolor="#FFFF00" uuid="12bf9250-24fb-4fb3-ba07-56acb7a3c833"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -351,7 +351,7 @@
 				<textFieldExpression><![CDATA["Devol. GAP (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="967" y="84" width="54" height="25" backcolor="#FFFF00" uuid="badfad91-3746-4143-983a-ab10b834a9af"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1353" y="84" width="82" height="25" backcolor="#FFFF00" uuid="badfad91-3746-4143-983a-ab10b834a9af"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -364,7 +364,7 @@
 				<textFieldExpression><![CDATA["Receita Liquida"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1021" y="84" width="56" height="25" backcolor="#FFFF00" uuid="0cd83a3b-25cf-4b34-b9b3-7fcd9294183b"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1435" y="84" width="82" height="25" backcolor="#FFFF00" uuid="0cd83a3b-25cf-4b34-b9b3-7fcd9294183b"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -378,7 +378,7 @@
 				<textFieldExpression><![CDATA["Despesas (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1077" y="84" width="56" height="25" backcolor="#FFFF00" uuid="6881f160-1038-49f7-9121-49c2238228bf"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1517" y="84" width="82" height="25" backcolor="#FFFF00" uuid="6881f160-1038-49f7-9121-49c2238228bf"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -392,7 +392,7 @@
 				<textFieldExpression><![CDATA["Pg. OCD (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1133" y="84" width="56" height="25" backcolor="#FFFF00" uuid="32ab8b8f-4c6f-414a-855f-afb413f13212"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1599" y="84" width="82" height="25" backcolor="#FFFF00" uuid="32ab8b8f-4c6f-414a-855f-afb413f13212"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -406,7 +406,7 @@
 				<textFieldExpression><![CDATA["Dif.Tarifa Menor (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1189" y="84" width="56" height="25" backcolor="#FFFF00" uuid="b1eb45ad-fcb0-40a0-b641-277a34f1f8b1"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1681" y="84" width="82" height="25" backcolor="#FFFF00" uuid="b1eb45ad-fcb0-40a0-b641-277a34f1f8b1"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -420,7 +420,7 @@
 				<textFieldExpression><![CDATA["Cartão Créd.  (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1245" y="84" width="56" height="25" backcolor="#FFFF00" uuid="09f174e8-9560-409d-8ed7-aba85ce840db"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1763" y="84" width="82" height="25" backcolor="#FFFF00" uuid="09f174e8-9560-409d-8ed7-aba85ce840db"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -434,7 +434,7 @@
 				<textFieldExpression><![CDATA["Cartão Débito (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1301" y="84" width="56" height="25" backcolor="#FFFF00" uuid="35df015a-e3bf-426e-8367-188af495c695"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1845" y="84" width="82" height="25" backcolor="#FFFF00" uuid="35df015a-e3bf-426e-8367-188af495c695"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -448,7 +448,7 @@
 				<textFieldExpression><![CDATA["Boleto (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1357" y="84" width="56" height="25" backcolor="#FFFF00" uuid="e9f80560-30c2-4404-9955-f08a5ab9da73"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1927" y="84" width="82" height="25" backcolor="#FFFF00" uuid="e9f80560-30c2-4404-9955-f08a5ab9da73"/>
 				<box>
 					<pen lineStyle="Dashed"/>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -462,7 +462,7 @@
 				<textFieldExpression><![CDATA["Depósito (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1413" y="84" width="74" height="25" backcolor="#FFFF00" uuid="4b285246-a8f8-4b44-ab67-286d37e14ad7"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2009" y="84" width="82" height="25" backcolor="#FFFF00" uuid="4b285246-a8f8-4b44-ab67-286d37e14ad7"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -474,7 +474,7 @@
 				<textFieldExpression><![CDATA["Total Detalhamento"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1487" y="84" width="56" height="25" backcolor="#FFFF00" uuid="f8cd16e6-f772-4890-98ac-086ce35caba2"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2091" y="84" width="82" height="25" backcolor="#FFFF00" uuid="f8cd16e6-f772-4890-98ac-086ce35caba2"/>
 				<box>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -484,7 +484,7 @@
 				<textFieldExpression><![CDATA["Saldo / Dia"]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="41" y="63" width="228" height="20" uuid="75726801-8433-4d31-8712-1cd6364e6c68"/>
+				<reportElement x="41" y="63" width="328" height="20" uuid="75726801-8433-4d31-8712-1cd6364e6c68"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -495,7 +495,7 @@
 				<text><![CDATA[Receitas BPR]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="269" y="63" width="278" height="20" uuid="13b344e7-9eab-4f7c-a391-b7c303d46380"/>
+				<reportElement x="369" y="63" width="410" height="20" uuid="13b344e7-9eab-4f7c-a391-b7c303d46380"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -507,7 +507,7 @@
 ]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="547" y="63" width="234" height="20" uuid="75371ada-e71f-4345-86ab-05feb01f06a5"/>
+				<reportElement x="779" y="63" width="328" height="20" uuid="75371ada-e71f-4345-86ab-05feb01f06a5"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -518,7 +518,7 @@
 				<text><![CDATA[Receita de Terceiros]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="781" y="63" width="74" height="20" backcolor="#FFCCFF" uuid="bce00659-e3f4-42e8-82cf-f596bfa515af"/>
+				<reportElement mode="Opaque" x="1107" y="62" width="82" height="20" backcolor="#FFCCFF" uuid="bce00659-e3f4-42e8-82cf-f596bfa515af"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -530,7 +530,7 @@
 				<text><![CDATA[Receita Bruta]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="855" y="63" width="112" height="20" uuid="ab4ce332-f86d-4a62-9c84-cecd2aae502d"/>
+				<reportElement x="1189" y="62" width="164" height="20" uuid="ab4ce332-f86d-4a62-9c84-cecd2aae502d"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -541,7 +541,7 @@
 				<text><![CDATA[Devoluções]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="967" y="63" width="76" height="20" uuid="05c949bb-dc08-432f-8144-32bd89a12a9f"/>
+				<reportElement x="1353" y="62" width="82" height="20" uuid="05c949bb-dc08-432f-8144-32bd89a12a9f"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -552,7 +552,7 @@
 				<text><![CDATA[Receita Liquida]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="1043" y="63" width="444" height="20" uuid="fd4acb36-3047-4fbf-b292-4cd5048ddbad"/>
+				<reportElement x="1435" y="62" width="656" height="20" uuid="fd4acb36-3047-4fbf-b292-4cd5048ddbad"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -563,7 +563,7 @@
 				<text><![CDATA[Detalhamento]]></text>
 			</staticText>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1543" y="84" width="56" height="25" backcolor="#FFFF00" uuid="777e42f6-78a0-4bca-8191-e79e2487bf7a"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2173" y="84" width="82" height="25" backcolor="#FFFF00" uuid="777e42f6-78a0-4bca-8191-e79e2487bf7a"/>
 				<textElement textAlignment="Center" markup="none">
 					<font size="7"/>
 				</textElement>
@@ -580,7 +580,7 @@
 				<text><![CDATA[]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="1487" y="63" width="112" height="20" uuid="fb2ffc06-a5e3-4d10-bcca-bcdf37eb4764"/>
+				<reportElement x="2091" y="62" width="164" height="20" uuid="fb2ffc06-a5e3-4d10-bcca-bcdf37eb4764"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 				</box>
@@ -603,6 +603,29 @@
 				</textElement>
 				<textFieldExpression><![CDATA["Resumo de Venda"]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" evaluationTime="Report">
+				<reportElement x="2222" y="20" width="22" height="20" uuid="7a511c37-de1d-4cda-8623-c17659a71102"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="2146" y="20" width="42" height="20" uuid="f2f2567c-a631-474d-b1f6-c336b0db83f2"/>
+				<textFieldExpression><![CDATA["Página"]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm">
+				<reportElement x="2146" y="0" width="98" height="20" uuid="16819dee-9bb4-4601-b187-bb541f07fce4"/>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="2090" y="0" width="56" height="20" uuid="b770604c-e5d7-430f-bf26-c8976bb19137"/>
+				<textFieldExpression><![CDATA["Data/Hora"]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="2190" y="20" width="32" height="20" uuid="c76ef621-c5b2-4b12-98bc-746412d95e1e"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<detail>
@@ -619,7 +642,7 @@
 				<textFieldExpression><![CDATA[$F{fechorVenta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="41" y="0" width="56" height="15" uuid="ff462c88-2038-41b7-8058-aaec05c3d47b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="41" y="0" width="82" height="15" uuid="ff462c88-2038-41b7-8058-aaec05c3d47b"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -629,7 +652,7 @@
 				<textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="153" y="0" width="56" height="15" uuid="41651a0b-2369-4dbe-94e9-3d3204c34b09"/>
+				<reportElement stretchType="RelativeToTallestObject" x="205" y="0" width="82" height="15" uuid="41651a0b-2369-4dbe-94e9-3d3204c34b09"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -639,7 +662,7 @@
 				<textFieldExpression><![CDATA[$F{gapImpressa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="209" y="0" width="60" height="15" backcolor="#FFFF00" uuid="831594cd-b7d3-4a74-8f50-dd2b23886b65"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="287" y="0" width="82" height="15" backcolor="#FFFF00" uuid="831594cd-b7d3-4a74-8f50-dd2b23886b65"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -650,7 +673,7 @@
 				<textFieldExpression><![CDATA[$F{totalVendaPassagens}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="269" y="0" width="56" height="15" uuid="93466d98-b5c0-420f-ac3b-0d7db828a725"/>
+				<reportElement stretchType="RelativeToTallestObject" x="369" y="0" width="82" height="15" uuid="93466d98-b5c0-420f-ac3b-0d7db828a725"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -660,7 +683,7 @@
 				<textFieldExpression><![CDATA[$F{receitaEb}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="325" y="0" width="56" height="15" uuid="400a96ea-07c5-4758-b2e3-f0688be71d1d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="451" y="0" width="82" height="15" uuid="400a96ea-07c5-4758-b2e3-f0688be71d1d"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -670,7 +693,7 @@
 				<textFieldExpression><![CDATA[$F{multaComp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="381" y="0" width="56" height="15" uuid="8844d9af-78ca-4e20-8e84-9b9b1b1ec8b0"/>
+				<reportElement stretchType="RelativeToTallestObject" x="533" y="0" width="82" height="15" uuid="8844d9af-78ca-4e20-8e84-9b9b1b1ec8b0"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -680,7 +703,7 @@
 				<textFieldExpression><![CDATA[$F{difTrocaOCD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="437" y="0" width="56" height="15" uuid="9e50f90e-ca03-4e8c-95ab-22d616f45615"/>
+				<reportElement stretchType="RelativeToTallestObject" x="615" y="0" width="82" height="15" uuid="9e50f90e-ca03-4e8c-95ab-22d616f45615"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -690,7 +713,7 @@
 				<textFieldExpression><![CDATA[$F{difTarifaMaior}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="493" y="0" width="54" height="15" backcolor="#FFFF00" uuid="e509fbb7-f777-4107-bb5c-43864b752d0b"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="697" y="0" width="82" height="15" backcolor="#FFFF00" uuid="e509fbb7-f777-4107-bb5c-43864b752d0b"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -701,7 +724,7 @@
 				<textFieldExpression><![CDATA[$F{totalOutrasReceitas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="547" y="0" width="56" height="15" uuid="0f052d2d-5844-4998-add9-e3304688209a"/>
+				<reportElement stretchType="RelativeToTallestObject" x="779" y="0" width="82" height="15" uuid="0f052d2d-5844-4998-add9-e3304688209a"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -711,7 +734,7 @@
 				<textFieldExpression><![CDATA[$F{txEmb}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="603" y="0" width="56" height="15" uuid="3246d9dd-8024-46be-b46c-34200f1e0ec1"/>
+				<reportElement stretchType="RelativeToTallestObject" x="861" y="0" width="82" height="15" uuid="3246d9dd-8024-46be-b46c-34200f1e0ec1"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -721,7 +744,7 @@
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="659" y="0" width="56" height="15" uuid="c75eb131-785a-4a2e-97f8-0ba9a39b6991"/>
+				<reportElement stretchType="RelativeToTallestObject" x="943" y="0" width="82" height="15" uuid="c75eb131-785a-4a2e-97f8-0ba9a39b6991"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -731,7 +754,7 @@
 				<textFieldExpression><![CDATA[$F{segFacult}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="715" y="0" width="66" height="15" backcolor="#FFFF00" uuid="1f364902-b455-4082-891f-d90271cb7d79"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1025" y="0" width="82" height="15" backcolor="#FFFF00" uuid="1f364902-b455-4082-891f-d90271cb7d79"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<rightPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -742,7 +765,7 @@
 				<textFieldExpression><![CDATA[$F{totalTerceiros}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="781" y="0" width="74" height="15" backcolor="#FFCCFF" uuid="97a10e1d-f51e-42e8-9ce3-7ed6b8e592db"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1107" y="0" width="82" height="15" backcolor="#FFCCFF" uuid="97a10e1d-f51e-42e8-9ce3-7ed6b8e592db"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -754,7 +777,7 @@
 				<textFieldExpression><![CDATA[$F{receitaBruta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="855" y="0" width="56" height="15" uuid="e9a2e27f-ea1c-44d5-8476-726df0cacce5"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1189" y="0" width="82" height="15" uuid="e9a2e27f-ea1c-44d5-8476-726df0cacce5"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -764,7 +787,7 @@
 				<textFieldExpression><![CDATA[$F{devolBPR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="911" y="0" width="56" height="15" uuid="d6df43c5-0b3e-46a5-bae2-9c718ed6a95b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1271" y="0" width="82" height="15" uuid="d6df43c5-0b3e-46a5-bae2-9c718ed6a95b"/>
 				<box>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -774,7 +797,7 @@
 				<textFieldExpression><![CDATA[$F{devolGAP}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="967" y="0" width="54" height="15" backcolor="#FFFF00" uuid="e2e7db09-8606-4d9d-9feb-0987e29b0eb5"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1353" y="0" width="82" height="15" backcolor="#FFFF00" uuid="e2e7db09-8606-4d9d-9feb-0987e29b0eb5"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -786,7 +809,7 @@
 				<textFieldExpression><![CDATA[$F{receitaLiquida}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1021" y="0" width="56" height="15" uuid="6af29431-bbae-4bfe-89d6-df54b17adc47"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1435" y="0" width="82" height="15" uuid="6af29431-bbae-4bfe-89d6-df54b17adc47"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -796,7 +819,7 @@
 				<textFieldExpression><![CDATA[$F{despesas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1077" y="0" width="56" height="15" uuid="590fc622-ada2-4950-aba6-253d9176a69a"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1517" y="0" width="82" height="15" uuid="590fc622-ada2-4950-aba6-253d9176a69a"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -806,7 +829,7 @@
 				<textFieldExpression><![CDATA[$F{pgOCD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1133" y="0" width="56" height="15" uuid="925cc56f-7c1b-42ff-bada-4c1d96107f11"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1599" y="0" width="82" height="15" uuid="925cc56f-7c1b-42ff-bada-4c1d96107f11"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -816,7 +839,7 @@
 				<textFieldExpression><![CDATA[$F{difTarifaMenor}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1189" y="0" width="56" height="15" uuid="255bc8ed-c770-4ceb-9f29-7d0157a0819b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1681" y="0" width="82" height="15" uuid="255bc8ed-c770-4ceb-9f29-7d0157a0819b"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -826,7 +849,7 @@
 				<textFieldExpression><![CDATA[$F{cartaoCredito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1245" y="0" width="56" height="15" uuid="1f6695fb-3354-48cd-8194-67ebba651015"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1763" y="0" width="82" height="15" uuid="1f6695fb-3354-48cd-8194-67ebba651015"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -836,7 +859,7 @@
 				<textFieldExpression><![CDATA[$F{cartaoDebito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1301" y="0" width="56" height="15" uuid="4b5fc7bc-a2bc-47ae-8baa-3f5a1e4f45f2"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1845" y="0" width="82" height="15" uuid="4b5fc7bc-a2bc-47ae-8baa-3f5a1e4f45f2"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -846,7 +869,7 @@
 				<textFieldExpression><![CDATA[$F{boletoBancario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1357" y="0" width="56" height="15" uuid="7817640d-d4cf-49ac-ade5-a6a77b1d0cde"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1927" y="0" width="82" height="15" uuid="7817640d-d4cf-49ac-ade5-a6a77b1d0cde"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -856,7 +879,7 @@
 				<textFieldExpression><![CDATA[$F{deposito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1413" y="0" width="74" height="15" backcolor="#FFFF00" uuid="cf19637a-d07d-46a4-8510-b4e7fd6b5e23"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2009" y="0" width="82" height="15" backcolor="#FFFF00" uuid="cf19637a-d07d-46a4-8510-b4e7fd6b5e23"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -867,7 +890,7 @@
 				<textFieldExpression><![CDATA[$F{totalDetalhamento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1487" y="0" width="56" height="15" uuid="51a512ea-0eda-4ecf-964c-28bebabe974f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="2091" y="0" width="82" height="15" uuid="51a512ea-0eda-4ecf-964c-28bebabe974f"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -877,7 +900,7 @@
 				<textFieldExpression><![CDATA[$F{saldo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="97" y="0" width="56" height="15" uuid="6bd836cc-534f-4d65-8bff-ffc318adbc2f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="123" y="0" width="82" height="15" uuid="6bd836cc-534f-4d65-8bff-ffc318adbc2f"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -887,7 +910,7 @@
 				<textFieldExpression><![CDATA[$F{gapVenda}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1543" y="0" width="56" height="15" uuid="cf56e966-f22c-466b-8ba9-b26457b4577a"/>
+				<reportElement x="2173" y="0" width="82" height="15" uuid="cf56e966-f22c-466b-8ba9-b26457b4577a"/>
 				<box>
 					<topPen lineWidth="0.0"/>
 				</box>
@@ -901,7 +924,7 @@
 	<columnFooter>
 		<band height="15" splitType="Stretch">
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1301" y="0" width="56" height="15" uuid="3bb307d1-503a-41b4-96a6-9185c16534fb"/>
+				<reportElement x="1845" y="0" width="82" height="15" uuid="3bb307d1-503a-41b4-96a6-9185c16534fb"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -911,7 +934,7 @@
 				<textFieldExpression><![CDATA[$V{somaBoletoBancario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="659" y="0" width="56" height="15" uuid="df7f5926-0229-4c31-ba27-a9036295daee"/>
+				<reportElement x="943" y="0" width="82" height="15" uuid="df7f5926-0229-4c31-ba27-a9036295daee"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -921,7 +944,7 @@
 				<textFieldExpression><![CDATA[$V{somaSegFacult}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="325" y="0" width="56" height="15" uuid="78051f51-c549-461d-882c-e0f3ab3c6fb8"/>
+				<reportElement x="451" y="0" width="82" height="15" uuid="78051f51-c549-461d-882c-e0f3ab3c6fb8"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -931,7 +954,7 @@
 				<textFieldExpression><![CDATA[$V{somaMultaComp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1245" y="0" width="56" height="15" uuid="34af58b3-3aa9-48e3-ac46-1db92477c5bf"/>
+				<reportElement x="1763" y="0" width="82" height="15" uuid="34af58b3-3aa9-48e3-ac46-1db92477c5bf"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -941,7 +964,7 @@
 				<textFieldExpression><![CDATA[$V{somaCartaoDebito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Opaque" x="715" y="0" width="66" height="15" backcolor="#FFFF00" uuid="0509388f-d69e-4260-a23b-746d42668a9d"/>
+				<reportElement mode="Opaque" x="1025" y="0" width="82" height="15" backcolor="#FFFF00" uuid="0509388f-d69e-4260-a23b-746d42668a9d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -952,7 +975,7 @@
 				<textFieldExpression><![CDATA[$V{somaTotalTerceiros}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="381" y="0" width="56" height="15" uuid="8977a2ff-3e52-4552-a93a-10d72a7b2cb7"/>
+				<reportElement x="533" y="0" width="82" height="15" uuid="8977a2ff-3e52-4552-a93a-10d72a7b2cb7"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -962,7 +985,7 @@
 				<textFieldExpression><![CDATA[$V{somaDifTrocaOCD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1077" y="0" width="56" height="15" uuid="a3b2c994-cc3f-45b1-b130-5d5ee11a345b"/>
+				<reportElement x="1517" y="0" width="82" height="15" uuid="a3b2c994-cc3f-45b1-b130-5d5ee11a345b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -972,7 +995,7 @@
 				<textFieldExpression><![CDATA[$V{somaPgOCD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="855" y="0" width="56" height="15" uuid="565e4f58-d35e-4e3e-aef8-687e06caab65"/>
+				<reportElement x="1189" y="0" width="82" height="15" uuid="565e4f58-d35e-4e3e-aef8-687e06caab65"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -982,7 +1005,7 @@
 				<textFieldExpression><![CDATA[$V{somaDevolBPR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1133" y="0" width="56" height="15" uuid="4acffe71-3e19-4bd4-b08a-0d083d06703e"/>
+				<reportElement x="1599" y="0" width="82" height="15" uuid="4acffe71-3e19-4bd4-b08a-0d083d06703e"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -992,7 +1015,7 @@
 				<textFieldExpression><![CDATA[$V{somaDifTarifaMenor}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Opaque" x="967" y="0" width="54" height="15" backcolor="#FFFF00" uuid="f0fff871-c093-4aa2-8493-fb15dc4fce4c"/>
+				<reportElement mode="Opaque" x="1353" y="0" width="82" height="15" backcolor="#FFFF00" uuid="f0fff871-c093-4aa2-8493-fb15dc4fce4c"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1003,7 +1026,7 @@
 				<textFieldExpression><![CDATA[$V{somaReceitaLiquida}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1487" y="0" width="56" height="15" uuid="471e76a9-5c4b-4b45-9f4d-aea49c4c6dca"/>
+				<reportElement x="2091" y="0" width="82" height="15" uuid="471e76a9-5c4b-4b45-9f4d-aea49c4c6dca"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1013,7 +1036,7 @@
 				<textFieldExpression><![CDATA[$V{somaSaldo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1189" y="0" width="56" height="15" uuid="8ff21686-9678-4d8d-a5a1-83fdb9d7371d"/>
+				<reportElement x="1681" y="0" width="82" height="15" uuid="8ff21686-9678-4d8d-a5a1-83fdb9d7371d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1023,7 +1046,7 @@
 				<textFieldExpression><![CDATA[$V{somaCartaoCredito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="547" y="0" width="56" height="15" uuid="75c080e7-cb5e-490b-a4ec-976e922f3f05"/>
+				<reportElement x="779" y="0" width="82" height="15" uuid="75c080e7-cb5e-490b-a4ec-976e922f3f05"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1033,7 +1056,7 @@
 				<textFieldExpression><![CDATA[$V{somaTxEmb}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1021" y="0" width="56" height="15" uuid="bc5a39d9-f669-464d-9af9-1460cc132088"/>
+				<reportElement x="1435" y="0" width="82" height="15" uuid="bc5a39d9-f669-464d-9af9-1460cc132088"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1043,7 +1066,7 @@
 				<textFieldExpression><![CDATA[$V{somaDespesas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="41" y="0" width="56" height="15" uuid="1cd0c607-f6e3-4379-8429-28d4d3ab44f3"/>
+				<reportElement x="41" y="0" width="82" height="15" uuid="1cd0c607-f6e3-4379-8429-28d4d3ab44f3"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1053,7 +1076,7 @@
 				<textFieldExpression><![CDATA[$V{somaReceitaBPR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="603" y="0" width="56" height="15" uuid="c8408169-8514-478a-a2ee-74228a287c1b"/>
+				<reportElement x="861" y="0" width="82" height="15" uuid="c8408169-8514-478a-a2ee-74228a287c1b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1063,7 +1086,7 @@
 				<textFieldExpression><![CDATA[$V{somaPedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="911" y="0" width="56" height="15" uuid="73e641ea-d232-414c-a154-ae699c8320d9"/>
+				<reportElement x="1271" y="0" width="82" height="15" uuid="73e641ea-d232-414c-a154-ae699c8320d9"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1074,7 +1097,7 @@
 				<textFieldExpression><![CDATA[$V{somaDevolGAP}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="269" y="0" width="56" height="15" uuid="0b968319-2cab-4d6e-8a84-fab85cfeec6c"/>
+				<reportElement x="369" y="0" width="82" height="15" uuid="0b968319-2cab-4d6e-8a84-fab85cfeec6c"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1084,7 +1107,7 @@
 				<textFieldExpression><![CDATA[$V{somaReceitaEb}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Opaque" x="209" y="0" width="60" height="15" backcolor="#FFFF00" uuid="b0da6ae7-d21d-4abf-929b-107c1eea8f72"/>
+				<reportElement mode="Opaque" x="287" y="0" width="82" height="15" backcolor="#FFFF00" uuid="b0da6ae7-d21d-4abf-929b-107c1eea8f72"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1095,7 +1118,7 @@
 				<textFieldExpression><![CDATA[$V{somaTotalVendaPassagens}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="97" y="0" width="56" height="15" uuid="512223c6-1cc0-416c-a54d-67dcc673f33f"/>
+				<reportElement x="123" y="0" width="82" height="15" uuid="512223c6-1cc0-416c-a54d-67dcc673f33f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1105,7 +1128,7 @@
 				<textFieldExpression><![CDATA[$V{somaGapVenda}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Opaque" x="1413" y="0" width="74" height="15" backcolor="#FFFF00" uuid="8e8a8960-6e08-4ebb-a1fc-61af0f98b916"/>
+				<reportElement mode="Opaque" x="2009" y="0" width="82" height="15" backcolor="#FFFF00" uuid="8e8a8960-6e08-4ebb-a1fc-61af0f98b916"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1116,7 +1139,7 @@
 				<textFieldExpression><![CDATA[$V{somaTotalDetalhamento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Opaque" x="493" y="0" width="54" height="15" backcolor="#FFFF00" uuid="869f51ff-5a72-4ef9-9add-bca1e85b02e4"/>
+				<reportElement mode="Opaque" x="697" y="0" width="82" height="15" backcolor="#FFFF00" uuid="869f51ff-5a72-4ef9-9add-bca1e85b02e4"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1127,7 +1150,7 @@
 				<textFieldExpression><![CDATA[$V{somaTotalOutrasReceitas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="437" y="0" width="56" height="15" uuid="b4609c03-9811-4d17-b9d7-3e99f0ae34ec"/>
+				<reportElement x="615" y="0" width="82" height="15" uuid="b4609c03-9811-4d17-b9d7-3e99f0ae34ec"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1137,7 +1160,7 @@
 				<textFieldExpression><![CDATA[$V{somaDifTarifaMaior}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="153" y="0" width="56" height="15" uuid="e4e3afe9-e83b-4e56-99aa-7af91ae2548d"/>
+				<reportElement x="205" y="0" width="82" height="15" uuid="e4e3afe9-e83b-4e56-99aa-7af91ae2548d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1147,7 +1170,7 @@
 				<textFieldExpression><![CDATA[$V{somaGapImpressa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1357" y="0" width="56" height="15" uuid="684daa7c-ba34-4923-8143-6241e2d242b2"/>
+				<reportElement x="1927" y="0" width="82" height="15" uuid="684daa7c-ba34-4923-8143-6241e2d242b2"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1168,7 +1191,7 @@
 				<textFieldExpression><![CDATA["Total geral"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Opaque" x="781" y="0" width="74" height="15" backcolor="#FFCCFF" uuid="b361c91d-04b9-4e19-90b9-600eb787453f"/>
+				<reportElement mode="Opaque" x="1107" y="0" width="82" height="15" backcolor="#FFCCFF" uuid="b361c91d-04b9-4e19-90b9-600eb787453f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1180,7 +1203,7 @@
 				<textFieldExpression><![CDATA[$V{sumReceitaBruta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1543" y="0" width="56" height="15" uuid="b4e5935f-752c-4ff3-91c8-9613a5465a4a"/>
+				<reportElement x="2173" y="0" width="82" height="15" uuid="b4e5935f-752c-4ff3-91c8-9613a5465a4a"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>