bug#10637

dev:julio
qua:marcelo


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

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

@@ -14,7 +14,6 @@ import org.apache.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
-import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -51,14 +50,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 							ufs = ufs + "," + estado.getEstadoId().toString();
 					}
 
-					List<PuntoVenta> agencias = (List<PuntoVenta>) parametros.get("agencias");
+					String pdvs = (String)parametros.get("agencias");
-					String pdvs = null;
-					for (PuntoVenta pv : agencias) {
-						if (pdvs == null)
-							pdvs = pv.getPuntoventaId().toString();
-						else
-							pdvs = pdvs + "," + pv.getPuntoventaId().toString();
-					}
 
 					NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql(ufs, pdvs, tipoPuntoVenta == null ? -1 : tipoPuntoVenta.getTipoptovtaId().intValue()));
 					stmt.setInt("EMPRESA_ID", empresa.getEmpresaId());
@@ -171,7 +163,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 		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 = 'V' 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 = 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 ");
@@ -403,8 +395,8 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 		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 (ee.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 (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 (ee.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("   	  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 ");
@@ -416,7 +408,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 		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 = b.origen_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 ");
@@ -447,7 +439,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 		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(fb.fecmodif) as fechorVenta ");
+		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 ");
@@ -458,8 +450,8 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
 		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 fb.fecmodif between :DATE_INICIO and :DATE_FIM ");
+		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(fb.fecmodif) ");
+		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 ");
 
 		return sql.toString();

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

@@ -14,7 +14,6 @@ import org.apache.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
-import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -51,14 +50,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 							ufs = ufs + "," + estado.getEstadoId().toString();
 					}
 
-					List<PuntoVenta> agencias = (List<PuntoVenta>) parametros.get("agencias");
+					String pdvs = (String)parametros.get("agencias");
-					String pdvs = null;
-					for (PuntoVenta pv : agencias) {
-						if (pdvs == null)
-							pdvs = pv.getPuntoventaId().toString();
-						else
-							pdvs = pdvs + "," + pv.getPuntoventaId().toString();
-					}
 
 					NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql(ufs, pdvs, tipoPuntoVenta == null ? -1 : tipoPuntoVenta.getTipoptovtaId().intValue()));
 					stmt.setInt("EMPRESA_ID", empresa.getEmpresaId());
@@ -177,7 +169,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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 = 'V' 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 = 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 ");
@@ -331,7 +323,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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 (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 ( ");
@@ -386,10 +378,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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("where (c.motivocancelacion_id IN (31,32,10,37,99,36) or c.motivocancelacion_id is null) ");
-		sql.append("  and c.indcancelacion = 1 ");
+		sql.append(" and c.feccorte >= :DATE_INICIO and c.feccorte <= :DATE_FIM ");
-		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 + " ) ");
@@ -409,8 +399,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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 (ee.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 (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 (ee.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("   	  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 ");
@@ -422,7 +412,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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 = b.origen_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 ");
@@ -453,7 +443,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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(fb.fecmodif) as fechorVenta ");
+		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 ");
@@ -464,8 +454,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
 		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 fb.fecmodif between :DATE_INICIO and :DATE_FIM ");
+		sql.append("        and fcc.fecinifechamento >= :DATE_INICIO and fcc.fecfinfechamento <= :DATE_FIM ");
-		sql.append("      group by  pv.puntoventa_id, fcc.empresa_id, eo.estado_id, trunc(fb.fecmodif) ");
+		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 ");
 
 		return sql.toString();

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioFinanceiroSintetico" pageWidth="1395" pageHeight="595" orientation="Landscape" columnWidth="1395" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
+<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="RelatorioFinanceiroSintetico" pageWidth="1590" pageHeight="595" orientation="Landscape" columnWidth="1590" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
-	<property name="ireport.zoom" value="1.10000000000001"/>
+	<property name="ireport.zoom" value="0.8264462809917433"/>
-	<property name="ireport.x" value="258"/>
+	<property name="ireport.x" value="333"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="nombempresa" class="java.lang.String"/>
 	<parameter name="inicio" class="java.util.Date"/>
 	<parameter name="fim" class="java.util.Date"/>
 	<parameter name="usuario" class="java.lang.String"/>
+	<parameter name="FILTROS" class="java.lang.String"/>
 	<field name="uf" class="java.lang.String"/>
 	<field name="codigoAgencia" class="java.lang.String"/>
 	<field name="receitaBPR" class="java.math.BigDecimal"/>
@@ -116,14 +117,17 @@
 	<pageHeader>
 		<band height="109" splitType="Stretch">
 			<textField>
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="251" height="22" uuid="ebd40d02-7a37-4edb-a630-695202044646"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="22" width="251" height="20" uuid="ebd40d02-7a37-4edb-a630-695202044646"/>
 				<textElement>
-					<font size="12" isBold="true"/>
+					<font size="12" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{nombempresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="22" width="251" height="20" uuid="c6fa12a7-995b-481a-819c-151057881053"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="251" height="22" uuid="c6fa12a7-995b-481a-819c-151057881053"/>
+				<textElement>
+					<font size="14" isBold="true"/>
+				</textElement>
 				<textFieldExpression><![CDATA["Resumo de Venda"]]></textFieldExpression>
 			</textField>
 			<textField>
@@ -163,7 +167,7 @@
 				<text><![CDATA[UF]]></text>
 			</staticText>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="186" y="84" width="50" height="25" backcolor="#FFFF00" uuid="042fd8eb-212d-443f-86d9-88dafb50af93"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="198" y="84" width="56" height="25" backcolor="#FFFF00" uuid="042fd8eb-212d-443f-86d9-88dafb50af93"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -174,7 +178,7 @@
 				<textFieldExpression><![CDATA["GAP Impresa (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="236" y="84" width="60" height="25" backcolor="#FFFF00" uuid="e59e6ec2-b5fc-436e-96ab-8e74d33dd568"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="254" y="84" width="60" height="25" backcolor="#FFFF00" uuid="e59e6ec2-b5fc-436e-96ab-8e74d33dd568"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -185,7 +189,7 @@
 				<textFieldExpression><![CDATA["Tot.Venda Passagem"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="296" y="84" width="46" height="25" backcolor="#FFFF00" uuid="07c8fd49-a84f-4681-a015-2f5223e9ec40"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="314" y="84" width="56" height="25" backcolor="#FFFF00" uuid="07c8fd49-a84f-4681-a015-2f5223e9ec40"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -197,7 +201,7 @@
 				<textFieldExpression><![CDATA["Receita EB (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="342" y="84" width="46" height="25" backcolor="#FFFF00" uuid="bb9002db-6596-4b85-b309-b8fe90777a29"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="370" y="84" width="56" height="25" backcolor="#FFFF00" uuid="bb9002db-6596-4b85-b309-b8fe90777a29"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -208,7 +212,7 @@
 				<textFieldExpression><![CDATA["Multa Comp (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="388" y="84" width="46" height="25" backcolor="#FFFF00" uuid="69480127-f659-48ce-834d-663b421af2d2"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="426" y="84" width="56" height="25" backcolor="#FFFF00" uuid="69480127-f659-48ce-834d-663b421af2d2"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -219,7 +223,7 @@
 				<textFieldExpression><![CDATA["Dif. Troca OCD (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="434" y="84" width="46" height="25" backcolor="#FFFF00" uuid="c32cc0d9-5a3a-4bdf-9730-b9ce4fec8074"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="482" y="84" width="56" height="25" backcolor="#FFFF00" uuid="c32cc0d9-5a3a-4bdf-9730-b9ce4fec8074"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -230,7 +234,7 @@
 				<textFieldExpression><![CDATA["Dif.Tarifa maior (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="480" y="84" width="54" height="25" backcolor="#FFFF00" uuid="cb9cba88-040b-401b-9e71-20b358e3c016"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="538" y="84" width="54" height="25" backcolor="#FFFF00" uuid="cb9cba88-040b-401b-9e71-20b358e3c016"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -241,7 +245,7 @@
 				<textFieldExpression><![CDATA["Total de outras receitas"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="534" y="84" width="46" height="25" backcolor="#FFFF00" uuid="acef366c-3807-4ce8-9a10-7490821d51cd"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="592" y="84" width="56" height="25" backcolor="#FFFF00" uuid="acef366c-3807-4ce8-9a10-7490821d51cd"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -252,7 +256,7 @@
 				<textFieldExpression><![CDATA["Tx. Emb (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="580" y="84" width="46" height="25" backcolor="#FFFF00" uuid="4ed4ed77-88a6-4ee2-9cc6-b1fd8c744f4a"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="648" y="84" width="56" height="25" backcolor="#FFFF00" uuid="4ed4ed77-88a6-4ee2-9cc6-b1fd8c744f4a"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -263,7 +267,7 @@
 				<textFieldExpression><![CDATA["Pedágio (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="626" y="84" width="46" height="25" backcolor="#FFFF00" uuid="08b7af94-859a-4acd-9e9c-03b9edff8280"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="704" y="84" width="56" height="25" backcolor="#FFFF00" uuid="08b7af94-859a-4acd-9e9c-03b9edff8280"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -274,7 +278,7 @@
 				<textFieldExpression><![CDATA["Seg.Facult. (+)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="672" y="84" width="46" height="25" backcolor="#FFFF00" uuid="2031f635-d825-43d5-abef-9239bf8a4c05"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="760" y="84" width="46" height="25" backcolor="#FFFF00" uuid="2031f635-d825-43d5-abef-9239bf8a4c05"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -285,7 +289,7 @@
 				<textFieldExpression><![CDATA["Total Terceiros"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="718" y="84" width="54" height="25" backcolor="#FFCCFF" uuid="ed58cc6b-450c-4830-bebd-19785a19db03"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="806" y="84" width="74" height="25" backcolor="#FFCCFF" uuid="ed58cc6b-450c-4830-bebd-19785a19db03"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -296,7 +300,7 @@
 				<textFieldExpression><![CDATA["Receita Bruta"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="772" y="84" width="46" height="25" backcolor="#FFFF00" uuid="6f4fd17a-543f-4e55-8816-5e326d108b1b"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="880" y="84" width="56" height="25" backcolor="#FFFF00" uuid="6f4fd17a-543f-4e55-8816-5e326d108b1b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -307,7 +311,7 @@
 				<textFieldExpression><![CDATA["Devol.BPR (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="818" y="84" width="46" height="25" backcolor="#FFFF00" uuid="bd2f1ca2-86cd-4bfa-96d9-bc3c900d10c4"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="936" y="84" width="56" height="25" backcolor="#FFFF00" uuid="bd2f1ca2-86cd-4bfa-96d9-bc3c900d10c4"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -318,7 +322,7 @@
 				<textFieldExpression><![CDATA["Devol. GAP (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="864" y="84" width="54" height="25" backcolor="#FFFF00" uuid="d0ea4167-8e14-4e43-bb02-0907b16b432f"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="992" y="84" width="76" height="25" backcolor="#FFFF00" uuid="d0ea4167-8e14-4e43-bb02-0907b16b432f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -329,7 +333,7 @@
 				<textFieldExpression><![CDATA["Receita Liquida"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="918" y="84" width="46" height="25" backcolor="#FFFF00" uuid="ca60cf6f-d4c0-4608-b99e-a5892db0ce6a"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1068" y="84" width="58" height="25" backcolor="#FFFF00" uuid="ca60cf6f-d4c0-4608-b99e-a5892db0ce6a"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -340,7 +344,7 @@
 				<textFieldExpression><![CDATA["Despesas (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="964" y="84" width="46" height="25" backcolor="#FFFF00" uuid="e00b1c6b-5ef0-4b3a-97b9-8477010b00df"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1126" y="84" width="56" height="25" backcolor="#FFFF00" uuid="e00b1c6b-5ef0-4b3a-97b9-8477010b00df"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -351,7 +355,7 @@
 				<textFieldExpression><![CDATA["Pg. OCD (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1010" y="84" width="46" height="25" backcolor="#FFFF00" uuid="9fb9a26b-8d27-40ae-910e-ae62743ace29"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1182" y="84" width="56" height="25" backcolor="#FFFF00" uuid="9fb9a26b-8d27-40ae-910e-ae62743ace29"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -362,7 +366,7 @@
 				<textFieldExpression><![CDATA["Dif.Tarifa Menor (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1056" y="84" width="46" height="25" backcolor="#FFFF00" uuid="8c3da71d-0ff8-4ba4-9fd2-b7f2e59ae891"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1238" y="84" width="56" height="25" backcolor="#FFFF00" uuid="8c3da71d-0ff8-4ba4-9fd2-b7f2e59ae891"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -373,7 +377,7 @@
 				<textFieldExpression><![CDATA["Cartão Créd.  (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1102" y="84" width="55" height="25" backcolor="#FFFF00" uuid="5552a5d9-a92e-43e8-a381-c17002701c37"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1294" y="84" width="56" height="25" backcolor="#FFFF00" uuid="5552a5d9-a92e-43e8-a381-c17002701c37"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -384,7 +388,7 @@
 				<textFieldExpression><![CDATA["Cartão Débito (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1157" y="84" width="46" height="25" backcolor="#FFFF00" uuid="88c99bfb-ea13-41ff-962b-6dd97af41b16"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1350" y="84" width="56" height="25" backcolor="#FFFF00" uuid="88c99bfb-ea13-41ff-962b-6dd97af41b16"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -395,7 +399,7 @@
 				<textFieldExpression><![CDATA["Boleto (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1203" y="84" width="55" height="25" backcolor="#FFFF00" uuid="a37d6775-aaa5-44ca-965c-21011debdb63"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1406" y="84" width="56" height="25" backcolor="#FFFF00" uuid="a37d6775-aaa5-44ca-965c-21011debdb63"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -406,7 +410,7 @@
 				<textFieldExpression><![CDATA["Depósito (-)"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1258" y="84" width="74" height="25" backcolor="#FFFF00" uuid="fc2efc7c-e18e-4309-b0d1-a586e1255b4f"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1462" y="84" width="70" height="25" backcolor="#FFFF00" uuid="fc2efc7c-e18e-4309-b0d1-a586e1255b4f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -417,7 +421,7 @@
 				<textFieldExpression><![CDATA["Total Detalhamento"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1332" y="84" width="46" height="25" backcolor="#FFFF00" uuid="a7589c35-a661-44af-86f2-f299015ab6ee"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1532" y="84" width="56" height="25" backcolor="#FFFF00" uuid="a7589c35-a661-44af-86f2-f299015ab6ee"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -428,7 +432,7 @@
 				<textFieldExpression><![CDATA["Saldo"]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="86" y="63" width="210" height="20" uuid="75726801-8433-4d31-8712-1cd6364e6c68"/>
+				<reportElement x="86" y="63" width="228" height="20" uuid="75726801-8433-4d31-8712-1cd6364e6c68"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -439,7 +443,7 @@
 				<text><![CDATA[Receitas BPR]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="296" y="63" width="238" height="20" uuid="13b344e7-9eab-4f7c-a391-b7c303d46380"/>
+				<reportElement x="314" y="63" width="278" height="20" uuid="13b344e7-9eab-4f7c-a391-b7c303d46380"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -451,7 +455,7 @@
 ]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="534" y="63" width="184" height="20" uuid="75371ada-e71f-4345-86ab-05feb01f06a5"/>
+				<reportElement x="592" y="63" width="214" height="20" uuid="75371ada-e71f-4345-86ab-05feb01f06a5"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -462,7 +466,7 @@
 				<text><![CDATA[Receita de Terceiros]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Opaque" x="718" y="63" width="54" height="20" backcolor="#FFCCFF" uuid="bce00659-e3f4-42e8-82cf-f596bfa515af"/>
+				<reportElement mode="Opaque" x="806" y="63" width="74" height="20" backcolor="#FFCCFF" uuid="bce00659-e3f4-42e8-82cf-f596bfa515af"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<leftPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -474,7 +478,7 @@
 				<text><![CDATA[Receita Bruta]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="772" y="63" width="92" height="20" uuid="ab4ce332-f86d-4a62-9c84-cecd2aae502d"/>
+				<reportElement x="880" y="63" width="112" height="20" uuid="ab4ce332-f86d-4a62-9c84-cecd2aae502d"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -485,7 +489,7 @@
 				<text><![CDATA[Devoluções]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="864" y="63" width="54" height="20" uuid="05c949bb-dc08-432f-8144-32bd89a12a9f"/>
+				<reportElement x="992" y="63" width="76" height="20" uuid="05c949bb-dc08-432f-8144-32bd89a12a9f"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -496,7 +500,7 @@
 				<text><![CDATA[Receita Liquida]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="918" y="63" width="460" height="20" uuid="fd4acb36-3047-4fbf-b292-4cd5048ddbad"/>
+				<reportElement x="1068" y="63" width="520" height="20" uuid="fd4acb36-3047-4fbf-b292-4cd5048ddbad"/>
 				<box>
 					<topPen lineWidth="1.0"/>
 				</box>
@@ -506,7 +510,7 @@
 				<text><![CDATA[Detalhamento]]></text>
 			</staticText>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="86" y="84" width="50" height="25" isPrintWhenDetailOverflows="true" backcolor="#FFFF00" uuid="36e08439-d260-4fa1-a471-b3eeab1d1c50"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="86" y="84" width="56" height="25" isPrintWhenDetailOverflows="true" backcolor="#FFFF00" uuid="36e08439-d260-4fa1-a471-b3eeab1d1c50"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -528,7 +532,7 @@
 				<text><![CDATA[Código]]></text>
 			</staticText>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="136" y="84" width="50" height="25" backcolor="#FFFF00" uuid="8e52fe3f-bc61-451a-8ff3-b8633aebe4e5"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="142" y="84" width="56" height="25" backcolor="#FFFF00" uuid="8e52fe3f-bc61-451a-8ff3-b8633aebe4e5"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
@@ -548,11 +552,18 @@
 				</textElement>
 				<text><![CDATA[]]></text>
 			</staticText>
+			<textField>
+				<reportElement stretchType="RelativeToTallestObject" x="251" y="22" width="1290" height="20" uuid="47ce8e4a-d255-4131-bb5e-811df5068b88"/>
+				<textElement>
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="15" splitType="Stretch">
-			<textField isStretchWithOverflow="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="20" height="15" uuid="570e4073-642b-4e2c-b851-b5e4fc7196d1"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -562,7 +573,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{uf}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="20" y="0" width="66" height="15" uuid="818cda93-4bdf-4049-ac7d-e291322b3b4f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -574,7 +585,7 @@
 				<textFieldExpression><![CDATA[$F{codigoAgencia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="86" y="0" width="50" height="15" uuid="ff462c88-2038-41b7-8058-aaec05c3d47b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="86" y="0" width="56" height="15" uuid="ff462c88-2038-41b7-8058-aaec05c3d47b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -584,7 +595,7 @@
 				<textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="186" y="0" width="50" height="15" uuid="41651a0b-2369-4dbe-94e9-3d3204c34b09"/>
+				<reportElement stretchType="RelativeToTallestObject" x="198" y="0" width="56" height="15" uuid="41651a0b-2369-4dbe-94e9-3d3204c34b09"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -594,7 +605,7 @@
 				<textFieldExpression><![CDATA[$F{gapImpressa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="236" y="0" width="60" height="15" backcolor="#FFFF00" uuid="831594cd-b7d3-4a74-8f50-dd2b23886b65"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="254" y="0" width="60" height="15" backcolor="#FFFF00" uuid="831594cd-b7d3-4a74-8f50-dd2b23886b65"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -605,7 +616,7 @@
 				<textFieldExpression><![CDATA[$F{totalVendaPassagens}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="296" y="0" width="46" height="15" uuid="93466d98-b5c0-420f-ac3b-0d7db828a725"/>
+				<reportElement stretchType="RelativeToTallestObject" x="314" y="0" width="56" height="15" uuid="93466d98-b5c0-420f-ac3b-0d7db828a725"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -615,7 +626,7 @@
 				<textFieldExpression><![CDATA[$F{receitaEb}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="342" y="0" width="46" height="15" uuid="400a96ea-07c5-4758-b2e3-f0688be71d1d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="56" height="15" uuid="400a96ea-07c5-4758-b2e3-f0688be71d1d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -625,7 +636,7 @@
 				<textFieldExpression><![CDATA[$F{multaComp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="388" y="0" width="46" height="15" uuid="8844d9af-78ca-4e20-8e84-9b9b1b1ec8b0"/>
+				<reportElement stretchType="RelativeToTallestObject" x="426" y="0" width="56" height="15" uuid="8844d9af-78ca-4e20-8e84-9b9b1b1ec8b0"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -635,7 +646,7 @@
 				<textFieldExpression><![CDATA[$F{difTrocaOCD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="434" y="0" width="46" height="15" uuid="9e50f90e-ca03-4e8c-95ab-22d616f45615"/>
+				<reportElement stretchType="RelativeToTallestObject" x="482" y="0" width="56" height="15" uuid="9e50f90e-ca03-4e8c-95ab-22d616f45615"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -645,7 +656,7 @@
 				<textFieldExpression><![CDATA[$F{difTarifaMaior}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="480" y="0" width="54" height="15" backcolor="#FFFF00" uuid="e509fbb7-f777-4107-bb5c-43864b752d0b"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="538" y="0" width="54" height="15" backcolor="#FFFF00" uuid="e509fbb7-f777-4107-bb5c-43864b752d0b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -656,7 +667,7 @@
 				<textFieldExpression><![CDATA[$F{totalOutrasReceitas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="534" y="0" width="46" height="15" uuid="0f052d2d-5844-4998-add9-e3304688209a"/>
+				<reportElement stretchType="RelativeToTallestObject" x="592" y="0" width="56" height="15" uuid="0f052d2d-5844-4998-add9-e3304688209a"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -666,7 +677,7 @@
 				<textFieldExpression><![CDATA[$F{txEmb}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="580" y="0" width="46" height="15" uuid="3246d9dd-8024-46be-b46c-34200f1e0ec1"/>
+				<reportElement stretchType="RelativeToTallestObject" x="648" y="0" width="56" height="15" uuid="3246d9dd-8024-46be-b46c-34200f1e0ec1"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -676,7 +687,7 @@
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="626" y="0" width="46" height="15" uuid="c75eb131-785a-4a2e-97f8-0ba9a39b6991"/>
+				<reportElement stretchType="RelativeToTallestObject" x="704" y="0" width="56" height="15" uuid="c75eb131-785a-4a2e-97f8-0ba9a39b6991"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -686,7 +697,7 @@
 				<textFieldExpression><![CDATA[$F{segFacult}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="672" y="0" width="46" height="15" backcolor="#FFFF00" uuid="1f364902-b455-4082-891f-d90271cb7d79"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="760" y="0" width="46" height="15" backcolor="#FFFF00" uuid="1f364902-b455-4082-891f-d90271cb7d79"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -697,7 +708,7 @@
 				<textFieldExpression><![CDATA[$F{totalTerceiros}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="718" y="0" width="54" height="15" backcolor="#FFCCFF" uuid="97a10e1d-f51e-42e8-9ce3-7ed6b8e592db"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="806" y="0" width="74" height="15" backcolor="#FFCCFF" uuid="97a10e1d-f51e-42e8-9ce3-7ed6b8e592db"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -708,7 +719,7 @@
 				<textFieldExpression><![CDATA[$F{receitaBruta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="772" y="0" width="46" height="15" uuid="e9a2e27f-ea1c-44d5-8476-726df0cacce5"/>
+				<reportElement stretchType="RelativeToTallestObject" x="880" y="0" width="56" height="15" uuid="e9a2e27f-ea1c-44d5-8476-726df0cacce5"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -718,7 +729,7 @@
 				<textFieldExpression><![CDATA[$F{devolBPR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="818" y="0" width="46" height="15" uuid="d6df43c5-0b3e-46a5-bae2-9c718ed6a95b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="936" y="0" width="56" height="15" uuid="d6df43c5-0b3e-46a5-bae2-9c718ed6a95b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -729,7 +740,7 @@
 				<textFieldExpression><![CDATA[$F{devolGAP}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="864" y="0" width="54" height="15" backcolor="#FFFF00" uuid="e2e7db09-8606-4d9d-9feb-0987e29b0eb5"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="992" y="0" width="76" height="15" backcolor="#FFFF00" uuid="e2e7db09-8606-4d9d-9feb-0987e29b0eb5"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -740,7 +751,7 @@
 				<textFieldExpression><![CDATA[$F{receitaLiquida}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="918" y="0" width="46" height="15" uuid="6af29431-bbae-4bfe-89d6-df54b17adc47"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1068" y="0" width="58" height="15" uuid="6af29431-bbae-4bfe-89d6-df54b17adc47"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -750,7 +761,7 @@
 				<textFieldExpression><![CDATA[$F{despesas}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="964" y="0" width="46" height="15" uuid="590fc622-ada2-4950-aba6-253d9176a69a"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1126" y="0" width="56" height="15" uuid="590fc622-ada2-4950-aba6-253d9176a69a"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -760,7 +771,7 @@
 				<textFieldExpression><![CDATA[$F{pgOCD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1010" y="0" width="46" height="15" uuid="925cc56f-7c1b-42ff-bada-4c1d96107f11"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1182" y="0" width="56" height="15" uuid="925cc56f-7c1b-42ff-bada-4c1d96107f11"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -770,7 +781,7 @@
 				<textFieldExpression><![CDATA[$F{difTarifaMenor}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1056" y="0" width="46" height="15" uuid="255bc8ed-c770-4ceb-9f29-7d0157a0819b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1238" y="0" width="56" height="15" uuid="255bc8ed-c770-4ceb-9f29-7d0157a0819b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -780,7 +791,7 @@
 				<textFieldExpression><![CDATA[$F{cartaoCredito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1102" y="0" width="55" height="15" uuid="1f6695fb-3354-48cd-8194-67ebba651015"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1294" y="0" width="56" height="15" uuid="1f6695fb-3354-48cd-8194-67ebba651015"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -790,7 +801,7 @@
 				<textFieldExpression><![CDATA[$F{cartaoDebito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1157" y="0" width="46" height="15" uuid="4b5fc7bc-a2bc-47ae-8baa-3f5a1e4f45f2"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1350" y="0" width="56" height="15" uuid="4b5fc7bc-a2bc-47ae-8baa-3f5a1e4f45f2"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -800,7 +811,7 @@
 				<textFieldExpression><![CDATA[$F{boletoBancario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1203" y="0" width="55" height="15" uuid="7817640d-d4cf-49ac-ade5-a6a77b1d0cde"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1406" y="0" width="56" height="15" uuid="7817640d-d4cf-49ac-ade5-a6a77b1d0cde"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -810,7 +821,7 @@
 				<textFieldExpression><![CDATA[$F{deposito}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1258" y="0" width="74" height="15" backcolor="#FFFF00" uuid="cf19637a-d07d-46a4-8510-b4e7fd6b5e23"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1462" y="0" width="70" height="15" backcolor="#FFFF00" uuid="cf19637a-d07d-46a4-8510-b4e7fd6b5e23"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -821,7 +832,7 @@
 				<textFieldExpression><![CDATA[$F{totalDetalhamento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1332" y="0" width="46" height="15" uuid="51a512ea-0eda-4ecf-964c-28bebabe974f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1532" y="0" width="56" height="15" uuid="51a512ea-0eda-4ecf-964c-28bebabe974f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -831,7 +842,7 @@
 				<textFieldExpression><![CDATA[$F{saldo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="136" y="0" width="50" height="15" uuid="6bd836cc-534f-4d65-8bff-ffc318adbc2f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="142" y="0" width="56" height="15" uuid="6bd836cc-534f-4d65-8bff-ffc318adbc2f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -844,8 +855,8 @@
 	</detail>
 	<columnFooter>
 		<band height="15" splitType="Stretch">
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1157" y="0" width="46" height="15" uuid="3bb307d1-503a-41b4-96a6-9185c16534fb"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1350" y="0" width="56" height="15" uuid="3bb307d1-503a-41b4-96a6-9185c16534fb"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -854,8 +865,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaBoletoBancario}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="626" y="0" width="46" height="15" uuid="df7f5926-0229-4c31-ba27-a9036295daee"/>
+				<reportElement stretchType="RelativeToTallestObject" x="704" y="0" width="56" height="15" uuid="df7f5926-0229-4c31-ba27-a9036295daee"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -864,8 +875,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaSegFacult}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="342" y="0" width="46" height="15" uuid="78051f51-c549-461d-882c-e0f3ab3c6fb8"/>
+				<reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="56" height="15" uuid="78051f51-c549-461d-882c-e0f3ab3c6fb8"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -874,8 +885,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaMultaComp}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1102" y="0" width="55" height="15" uuid="34af58b3-3aa9-48e3-ac46-1db92477c5bf"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1294" y="0" width="56" height="15" uuid="34af58b3-3aa9-48e3-ac46-1db92477c5bf"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -884,8 +895,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaCartaoDebito}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="672" y="0" width="46" height="15" backcolor="#FFFF00" uuid="0509388f-d69e-4260-a23b-746d42668a9d"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="760" y="0" width="46" height="15" backcolor="#FFFF00" uuid="0509388f-d69e-4260-a23b-746d42668a9d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -894,8 +905,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaTotalTerceiros}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="388" y="0" width="46" height="15" uuid="8977a2ff-3e52-4552-a93a-10d72a7b2cb7"/>
+				<reportElement stretchType="RelativeToTallestObject" x="426" y="0" width="56" height="15" uuid="8977a2ff-3e52-4552-a93a-10d72a7b2cb7"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -904,8 +915,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDifTrocaOCD}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="964" y="0" width="46" height="15" uuid="a3b2c994-cc3f-45b1-b130-5d5ee11a345b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1126" y="0" width="56" height="15" uuid="a3b2c994-cc3f-45b1-b130-5d5ee11a345b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -914,8 +925,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaPgOCD}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="772" y="0" width="46" height="15" uuid="565e4f58-d35e-4e3e-aef8-687e06caab65"/>
+				<reportElement stretchType="RelativeToTallestObject" x="880" y="0" width="56" height="15" uuid="565e4f58-d35e-4e3e-aef8-687e06caab65"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -924,8 +935,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDevolBPR}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1010" y="0" width="46" height="15" uuid="4acffe71-3e19-4bd4-b08a-0d083d06703e"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1182" y="0" width="56" height="15" uuid="4acffe71-3e19-4bd4-b08a-0d083d06703e"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -934,8 +945,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDifTarifaMenor}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="864" y="0" width="54" height="15" backcolor="#FFFF00" uuid="f0fff871-c093-4aa2-8493-fb15dc4fce4c"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="992" y="0" width="76" height="15" backcolor="#FFFF00" uuid="f0fff871-c093-4aa2-8493-fb15dc4fce4c"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -944,8 +955,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaReceitaLiquida}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1332" y="0" width="46" height="15" uuid="471e76a9-5c4b-4b45-9f4d-aea49c4c6dca"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1532" y="0" width="56" height="15" uuid="471e76a9-5c4b-4b45-9f4d-aea49c4c6dca"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -954,8 +965,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaSaldo}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1056" y="0" width="46" height="15" uuid="8ff21686-9678-4d8d-a5a1-83fdb9d7371d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1238" y="0" width="56" height="15" uuid="8ff21686-9678-4d8d-a5a1-83fdb9d7371d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -964,8 +975,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaCartaoCredito}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="534" y="0" width="46" height="15" uuid="75c080e7-cb5e-490b-a4ec-976e922f3f05"/>
+				<reportElement stretchType="RelativeToTallestObject" x="592" y="0" width="56" height="15" uuid="75c080e7-cb5e-490b-a4ec-976e922f3f05"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -974,8 +985,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaTxEmb}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="918" y="0" width="46" height="15" uuid="bc5a39d9-f669-464d-9af9-1460cc132088"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1068" y="0" width="58" height="15" uuid="bc5a39d9-f669-464d-9af9-1460cc132088"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -984,8 +995,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDespesas}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="86" y="0" width="50" height="15" uuid="1cd0c607-f6e3-4379-8429-28d4d3ab44f3"/>
+				<reportElement stretchType="RelativeToTallestObject" x="86" y="0" width="56" height="15" uuid="1cd0c607-f6e3-4379-8429-28d4d3ab44f3"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -994,8 +1005,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaReceitaBPR}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="580" y="0" width="46" height="15" uuid="c8408169-8514-478a-a2ee-74228a287c1b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="648" y="0" width="56" height="15" uuid="c8408169-8514-478a-a2ee-74228a287c1b"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1004,8 +1015,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaPedagio}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="818" y="0" width="46" height="15" uuid="73e641ea-d232-414c-a154-ae699c8320d9"/>
+				<reportElement stretchType="RelativeToTallestObject" x="936" y="0" width="56" height="15" uuid="73e641ea-d232-414c-a154-ae699c8320d9"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1014,8 +1025,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDevolGAP}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="296" y="0" width="46" height="15" uuid="0b968319-2cab-4d6e-8a84-fab85cfeec6c"/>
+				<reportElement stretchType="RelativeToTallestObject" x="314" y="0" width="56" height="15" uuid="0b968319-2cab-4d6e-8a84-fab85cfeec6c"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1024,8 +1035,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaReceitaEb}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="236" y="0" width="60" height="15" backcolor="#FFFF00" uuid="b0da6ae7-d21d-4abf-929b-107c1eea8f72"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="254" y="0" width="60" height="15" backcolor="#FFFF00" uuid="b0da6ae7-d21d-4abf-929b-107c1eea8f72"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 					<rightPen lineWidth="0.25" lineStyle="Dashed"/>
@@ -1035,8 +1046,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaTotalVendaPassagens}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="136" y="0" width="50" height="15" uuid="512223c6-1cc0-416c-a54d-67dcc673f33f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="142" y="0" width="56" height="15" uuid="512223c6-1cc0-416c-a54d-67dcc673f33f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1045,8 +1056,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaGapVenda}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1258" y="0" width="74" height="15" backcolor="#FFFF00" uuid="8e8a8960-6e08-4ebb-a1fc-61af0f98b916"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1462" y="0" width="70" height="15" backcolor="#FFFF00" uuid="8e8a8960-6e08-4ebb-a1fc-61af0f98b916"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1055,8 +1066,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaTotalDetalhamento}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="480" y="0" width="54" height="15" backcolor="#FFFF00" uuid="869f51ff-5a72-4ef9-9add-bca1e85b02e4"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="538" y="0" width="54" height="15" backcolor="#FFFF00" uuid="869f51ff-5a72-4ef9-9add-bca1e85b02e4"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1065,8 +1076,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaTotalOutrasReceitas}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="434" y="0" width="46" height="15" uuid="b4609c03-9811-4d17-b9d7-3e99f0ae34ec"/>
+				<reportElement stretchType="RelativeToTallestObject" x="482" y="0" width="56" height="15" uuid="b4609c03-9811-4d17-b9d7-3e99f0ae34ec"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1075,8 +1086,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDifTarifaMaior}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="186" y="0" width="50" height="15" uuid="e4e3afe9-e83b-4e56-99aa-7af91ae2548d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="198" y="0" width="56" height="15" uuid="e4e3afe9-e83b-4e56-99aa-7af91ae2548d"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1085,8 +1096,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaGapImpressa}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1203" y="0" width="55" height="15" uuid="684daa7c-ba34-4923-8143-6241e2d242b2"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1406" y="0" width="56" height="15" uuid="684daa7c-ba34-4923-8143-6241e2d242b2"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1095,8 +1106,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaDeposito}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="718" y="-1" width="54" height="16" backcolor="#FFCCFF" uuid="b361c91d-04b9-4e19-90b9-600eb787453f"/>
+				<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="806" y="-1" width="74" height="16" backcolor="#FFCCFF" uuid="b361c91d-04b9-4e19-90b9-600eb787453f"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>
 				</box>
@@ -1105,7 +1116,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sumReceitaBruta}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="86" height="15" uuid="6c012fbc-91dd-4c84-b153-8a9fbdf85312"/>
 				<box>
 					<topPen lineWidth="0.25" lineStyle="Dashed"/>

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioFinanceiroController.java

@@ -101,22 +101,45 @@ public class BusquedaRelatorioFinanceiroController extends MyGenericForwardCompo
 		try {
 			Empresa empresa = cmbEmpresa == null ? null : (cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue());
 			TipoPuntoVenta tipoPuntoVenta = cmbTipoPuntoVenta == null ? null : (cmbTipoPuntoVenta.getSelectedItem() == null ? null : (TipoPuntoVenta) cmbTipoPuntoVenta.getSelectedItem().getValue());
-			List<PuntoVenta> agencias = new ArrayList(Arrays.asList(puntoVentaSelList.getData()));
+			List<PuntoVenta> lsPuntoVentaSelecionados = new ArrayList(Arrays.asList(puntoVentaSelList.getData()));
+			Map<String, Object> parametros = new HashMap<String, Object>();
 
 			List<Estado> estados = new ArrayList<Estado>();
 			for (Object ob : estadoList.getSelectedItemsByIndex()) {
 				estados.add((Estado) ob);
 			}
 			
-			Map<String, Object> parametros = new HashMap<String, Object>();
+			StringBuilder filtro = new StringBuilder();
+
+			filtro.append("Agência: ");
+			String puntoVentaIds = "";
+			String puntoVentas = "";
+			if (lsPuntoVentaSelecionados.isEmpty()) {
+				puntoVentas = "Todas";
+			} else {
+				for (int i = 0; i < lsPuntoVentaSelecionados.size(); i++) {
+					PuntoVenta puntoVenta = lsPuntoVentaSelecionados.get(i);
+					puntoVentas = puntoVentas + puntoVenta.getNombpuntoventa() + ",";
+
+					puntoVentaIds = puntoVentaIds + puntoVenta.getPuntoventaId() + ",";
+				}
+
+				// removendo ultima virgula
+				puntoVentaIds = puntoVentaIds.substring(0, puntoVentaIds.length() - 1);
+				puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1);
+				parametros.put("agencias", puntoVentaIds);
+			}
+			filtro.append(puntoVentas).append(";");
+
 			parametros.put("empresa", empresa);
 			parametros.put("nombempresa", empresa.getNombempresa());
 			parametros.put("tipoPuntoVenta", tipoPuntoVenta);
-			parametros.put("agencias", agencias);
+			
 			parametros.put("estados", estados);
 			parametros.put("inicio", datInicial.getValue());
 			parametros.put("fim", datFinal.getValue());
 			parametros.put("usuario", UsuarioLogado.getUsuarioLogado().getClaveUsuario());
+			parametros.put("FILTROS", filtro.toString());
 
 			Relatorio relatorio = null;
 			if (isSintetico)

web/gui/impressaofiscal/busquedaRelatorioFinanceiro.zul

@@ -79,7 +79,7 @@
 								<listbox id="puntoVentaList"
 									mold="paging"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
-									vflex="true" multiple="false" height="100%" width="360px">
+									vflex="true" multiple="false" height="100%" width="300px">
 									<listhead>
 										<listheader
 											label="${c:l('busquedaRelatorioFinanceiroController.puntoVentaSelList.codigo')}" />