From ee00563bc961febb3c0eccb3dc516520afc9a3dd Mon Sep 17 00:00:00 2001
From: Fabio <fabio.fbarreto@totvs.com.br>
Date: Thu, 8 Feb 2024 19:54:42 -0300
Subject: [PATCH] Novo layout relatorio forma pagamento feat bug #AL-3565

---
 pom.xml                                       |   2 +-
 .../RelatorioFormaPagamentoAgenciaNovo.java   | 116 ++++
 ...rioFormaPagamentoAgenciaNovo_es.properties |  31 +
 ...FormaPagamentoAgenciaNovo_pt_BR.properties |  31 +
 ...orioFormaPagamentoAgencia_pt_BR.properties |   2 +-
 .../RelatorioFormaPagamentoAgenciaNovo.jasper | Bin 0 -> 57344 bytes
 .../RelatorioFormaPagamentoAgenciaNovo.jrxml  | 582 ++++++++++++++++++
 .../FormaPagamentoAgenciaController.java      | 102 ++-
 web/WEB-INF/i3-label_en.label                 |   3 +-
 web/WEB-INF/i3-label_es_MX.label              |   3 +-
 web/WEB-INF/i3-label_pt_BR.label              |   6 +-
 .../formaPagamentoAgencia.zul                 | 139 ++---
 12 files changed, 907 insertions(+), 110 deletions(-)
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_es.properties
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_pt_BR.properties
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jasper
 create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml

diff --git a/pom.xml b/pom.xml
index af16e7115..344344f64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.48.6</version> 
+	<version>1.49.0</version> 
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
new file mode 100644
index 000000000..e564ca370
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
@@ -0,0 +1,116 @@
+/**
+ * 
+ */
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
+	public RelatorioFormaPagamentoAgenciaNovo(Map<String, Object> parametros, Connection conexao) throws Exception {
+		super(parametros, conexao);
+		this.setCustomDataSource(new ArrayDataSource(this) {
+			@Override
+			public void initDados() throws Exception {
+
+				Connection conexao = this.relatorio.getConexao();
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				Date dataInicial = (Date) parametros.get("DATA_INICIAL");
+				Date dataFinal = (Date) parametros.get("DATA_FINAL");				
+				Integer empresa = (Integer) parametros.get("EMPRESA");
+				Integer agencia = (Integer) parametros.get("AGENCIA");				
+				Short formaPagoId = (Short) parametros.get("FORMA_PAGO");	        
+		        
+		        StringBuilder sql = new StringBuilder();
+		        sql.append(" SELECT " );
+		        sql.append("     c.fechorventa                      AS data, " );
+		        sql.append("     c.numfoliosistema                  AS bilhete, " );
+		        sql.append("     pv.nombpuntoventa                  AS agencia, " );
+		        sql.append("     p_origen.CVEPARADA                 AS origem , " );
+		        sql.append("     p_destino.CVEPARADA                AS destino, " );
+		        sql.append("     fp.descpago                        AS forma_pagamento, " );
+		        sql.append("     coalesce(c.preciopagado, 0)        AS tarifa, " );
+		        sql.append("     coalesce(c.importepedagio, 0)      AS pedagio, " );
+		        sql.append("     coalesce(c.importeseguro, 0)       AS seguro, " );
+		        sql.append("     coalesce(c.importetaxaembarque, 0) AS taxa, " );
+		        sql.append("     coalesce(cfp.importe, 0)           AS valor,  " );
+		        sql.append("     coalesce(seg.valor, 0)             AS seg_opcional " );
+		        sql.append(" FROM " );
+		        sql.append("     caja c " );
+		        sql.append("     JOIN caja_formapago cfp ON c.caja_id = cfp.caja_id " );
+		        sql.append("     JOIN forma_pago     fp ON cfp.formapago_id = fp.formapago_id " );
+		        sql.append("     JOIN punto_venta    pv ON pv.puntoventa_id = c.puntoventa_id " );
+		        sql.append("     JOIN marca          m  ON m.marca_id = c.marca_id AND m.activo = 1 " );
+		        sql.append("     JOIN parada p_origen   ON p_origen.parada_id = c.origen_id  " );
+		        sql.append("     JOIN parada p_destino  ON p_destino.parada_id = c.destino_id  " );
+		        sql.append("     LEFT JOIN segpolv seg ON c.transacao_id = seg.boleto_id " );
+		        sql.append(" WHERE " );
+		        sql.append("     c.activo = 1 " );
+		        sql.append("     AND c.indreimpresion = 0 " );
+	        	sql.append("     AND c.fechorventa >= :dataInicial " );
+	        	sql.append("     AND c.fechorventa <= :dataFinal " );		        
+		        
+		        if (empresa != null) {
+		        	sql.append(" AND c.empresa_id  = :empresaId ");
+		        }
+		        
+		        if (agencia != null) {
+		        	sql.append(" AND c.puntoventa_id = :agenciaId ");
+		        }
+		        
+		        if (formaPagoId != null) {
+		        	sql.append(" AND cfp.FORMAPAGO_ID = :formaPagoId ");
+		        }
+		        
+		        sql.append("  ORDER BY data, agencia, bilhete " );
+
+				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
+								
+				stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
+				stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime()));
+				
+				if (empresa != null) {
+					stmt.setInt("empresaId", empresa);					
+				}
+				
+				if (agencia != null) {
+					stmt.setInt("agenciaId", agencia);					
+				}
+				
+				if (formaPagoId != null ) {
+					stmt.setInt("formapagoId", formaPagoId);
+				}
+
+				ResultSet rset = stmt.executeQuery();
+
+				while (rset.next()) {
+					Map<String, Object> dataResult = new HashMap<String, Object>();
+				        
+					dataResult.put("DATA", rset.getDate("data"));
+					dataResult.put("BILHETE", rset.getString("bilhete"));
+					dataResult.put("ORIGEM", rset.getString("ORIGEM"));
+					dataResult.put("DESTINO", rset.getString("DESTINO"));
+					dataResult.put("AGENCIA", rset.getString("agencia"));
+					dataResult.put("FORMA_PAGAMENTO", rset.getString("forma_pagamento"));
+					dataResult.put("TARIFA", rset.getBigDecimal("tarifa"));
+					dataResult.put("PEDAGIO", rset.getBigDecimal("PEDAGIO"));
+					dataResult.put("SEGURO", rset.getBigDecimal("SEGURO"));
+					dataResult.put("SEG_OPCIONAL", rset.getBigDecimal("seg_opcional"));
+					dataResult.put("TAXA", rset.getBigDecimal("taxa"));
+					dataResult.put("VALOR", rset.getBigDecimal("valor"));
+
+					this.dados.add(dataResult);
+				}
+
+				this.resultSet = rset;
+			}
+		});
+	}
+}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_es.properties
new file mode 100644
index 000000000..f97abf049
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_es.properties
@@ -0,0 +1,31 @@
+TITULO = Relatório de Forma de Pagamento por Agência
+PERIODO = PERÍODO
+header.data.hora=Data/Hora\: 
+cabecalho.impressorPor=Impresso por
+
+DATA = DATA
+AGENCIA = AGÊNCIA:
+FORMA_PAG = FORMA DE PAG.
+VALOR = TARIFA
+PEDAGIO = PEDÁGIO
+SEGURO = SEGURO
+SEGURO_OPCIONAL = SEG. OPCI.
+TAXAS = TAXAS
+TOTAL = TOTAL
+BILHETE = BILHETE
+ORIGEM = ORIGEM
+DESTINO = DESTINO
+TOTAL_GERAL = Total Geral:
+TOTAL_PV = Total Agência:
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impresso por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_pt_BR.properties
new file mode 100644
index 000000000..f97abf049
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_pt_BR.properties
@@ -0,0 +1,31 @@
+TITULO = Relatório de Forma de Pagamento por Agência
+PERIODO = PERÍODO
+header.data.hora=Data/Hora\: 
+cabecalho.impressorPor=Impresso por
+
+DATA = DATA
+AGENCIA = AGÊNCIA:
+FORMA_PAG = FORMA DE PAG.
+VALOR = TARIFA
+PEDAGIO = PEDÁGIO
+SEGURO = SEGURO
+SEGURO_OPCIONAL = SEG. OPCI.
+TAXAS = TAXAS
+TOTAL = TOTAL
+BILHETE = BILHETE
+ORIGEM = ORIGEM
+DESTINO = DESTINO
+TOTAL_GERAL = Total Geral:
+TOTAL_PV = Total Agência:
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impresso por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
index f0f1a5f0c..900a7b6fd 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
@@ -9,7 +9,7 @@ FORMA_PAG = FORMA DE PAG.
 VALOR = TARIFA
 PEDAGIO = PEDÁGIO
 SEGURO = SEGURO
-SEGURO_OPCIONAL = SEGURO OPCIONAL
+SEGURO_OPCIONAL = SEG. OPCIO.
 TAXAS = TAXAS
 TOTAL = TOTAL
 QTDE = QTDE
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..2a9431ac8011a9e31e5df1c93c47fdaf2e230c8b
GIT binary patch
literal 57344
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
P6W_YXj!1{vYM1<fD6bWP

literal 0
HcmV?d00001

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
new file mode 100644
index 000000000..cdfb3bf2c
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
@@ -0,0 +1,582 @@
+<?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="RelatorioFormaPagamentoAgenciaNovo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
+	<property name="ireport.zoom" value="1.3310000000000064"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<parameter name="USUARIO" class="java.lang.String"/>
+	<parameter name="USUARIO_ID" class="java.lang.String"/>
+	<parameter name="FILTROS" class="java.lang.String"/>
+	<queryString language="SQL">
+		<![CDATA[]]>
+	</queryString>
+	<field name="DATA" class="java.util.Date"/>
+	<field name="BILHETE" class="java.lang.String"/>
+	<field name="ORIGEM" class="java.lang.String"/>
+	<field name="DESTINO" class="java.lang.String"/>
+	<field name="FORMA_PAGAMENTO" class="java.lang.String"/>
+	<field name="AGENCIA" class="java.lang.String"/>
+	<field name="TARIFA" class="java.math.BigDecimal"/>
+	<field name="PEDAGIO" class="java.math.BigDecimal"/>
+	<field name="SEGURO" class="java.math.BigDecimal"/>
+	<field name="TAXA" class="java.math.BigDecimal"/>
+	<field name="VALOR" class="java.math.BigDecimal"/>
+	<field name="SEG_OPCIONAL" class="java.math.BigDecimal"/>
+	<variable name="TOTAL_PEDAGIO" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{PEDAGIO}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_SEGURO" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{SEGURO}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_TAXA" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{TAXA}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_VALOR" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{VALOR}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_TARIFA" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{TARIFA}]]></variableExpression>
+	</variable>
+	<variable name="TOTAL_SEG_OPCIONAL" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{SEG_OPCIONAL}]]></variableExpression>
+	</variable>
+	<variable name="PV_PEDAGIO" class="java.math.BigDecimal" resetType="Group" resetGroup="agenciaGroup" calculation="Sum">
+		<variableExpression><![CDATA[$F{PEDAGIO}]]></variableExpression>
+	</variable>
+	<variable name="PV_SEGURO" class="java.math.BigDecimal" resetType="Group" resetGroup="agenciaGroup" calculation="Sum">
+		<variableExpression><![CDATA[$F{SEGURO}]]></variableExpression>
+	</variable>
+	<variable name="PV_TAXA" class="java.math.BigDecimal" resetType="Group" resetGroup="agenciaGroup" calculation="Sum">
+		<variableExpression><![CDATA[$F{TAXA}]]></variableExpression>
+	</variable>
+	<variable name="PV_VALOR" class="java.math.BigDecimal" resetType="Group" resetGroup="agenciaGroup" calculation="Sum">
+		<variableExpression><![CDATA[$F{VALOR}]]></variableExpression>
+	</variable>
+	<variable name="PV_TARIFA" class="java.math.BigDecimal" resetType="Group" resetGroup="agenciaGroup" calculation="Sum">
+		<variableExpression><![CDATA[$F{TARIFA}]]></variableExpression>
+	</variable>
+	<variable name="PV_SEG_OPCIONAL" class="java.math.BigDecimal" resetType="Group" resetGroup="agenciaGroup" calculation="Sum">
+		<variableExpression><![CDATA[$F{SEG_OPCIONAL}]]></variableExpression>
+	</variable>
+	<group name="agenciaGroup">
+		<groupExpression><![CDATA[$F{AGENCIA}]]></groupExpression>
+		<groupHeader>
+			<band height="30">
+				<textField>
+					<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="0" y="0" width="90" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab" stretchType="RelativeToTallestObject" x="90" y="0" width="711" height="15" isPrintWhenDetailOverflows="true">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.0"/>
+					</box>
+					<textElement textAlignment="Left">
+						<font size="9"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{AGENCIA}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement uuid="333a50a8-5d67-42b5-b3c6-2d70ceabfe25" x="0" y="15" width="100" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box leftPadding="4"/>
+					<textElement textAlignment="Left" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{DATA}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="100" y="15" width="139" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{FORMA_PAG}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="440" y="15" width="60" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{VALOR}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="500" y="15" width="60" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{PEDAGIO}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="560" y="15" width="60" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{SEGURO}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="be9f28a6-e16c-49af-a1ae-a806a4a835d8" x="680" y="15" width="60" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{TAXAS}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="218e15c9-18bd-4ec5-9ff1-36b5e016569e" x="740" y="15" width="60" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{TOTAL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="fd782db0-7497-4596-8ace-8adbd28b895a" x="620" y="15" width="60" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{SEGURO_OPCIONAL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="b079540d-5716-4af8-b64f-243e44fa6f93" x="239" y="15" width="67" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{BILHETE}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="3240b389-a2bf-41c1-81c2-fcf8eb27104e" x="306" y="15" width="67" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{ORIGEM}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="f9446aba-43e2-49cd-8321-4ccdde3d0c67" x="373" y="15" width="67" height="15">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Left" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{DESTINO}]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="15">
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="bea7b6c0-f9a0-485d-80bc-b7763bc4cf18" x="742" y="0" width="60" height="15"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{PV_VALOR}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="fb5086d4-e470-4db4-86f8-0c0ac2bd59e6" x="620" y="0" width="60" height="15"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{PV_SEG_OPCIONAL}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="8490e6d1-a9a0-4ff2-937e-b8b369da4e2b" x="442" y="0" width="60" height="15"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{PV_TARIFA}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="ec1df278-6956-4237-a36b-8b84941bba30" x="502" y="0" width="60" height="15"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{PV_PEDAGIO}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="b6bbd64a-9c36-432c-85b0-82f8d74fe69c" x="560" y="0" width="60" height="15"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{PV_SEGURO}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="3c596c44-6c41-4d89-a75f-d402a2534e3f" x="680" y="0" width="60" height="15"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{PV_TAXA}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement uuid="b8884e47-037e-4e2f-a4ff-e0186a7aed3b" x="0" y="0" width="440" height="15"/>
+					<textElement textAlignment="Right" markup="none">
+						<font isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{TOTAL_PV}]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band height="43">
+			<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.FreeLayout"/>
+			<textField>
+				<reportElement uuid="3152d9c0-592e-4136-b3d8-2a674e779468" mode="Opaque" x="0" y="16" width="59" height="16" backcolor="#FFFFFF">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="50b8071e-9e65-49d2-bd12-b9354502caf3" mode="Opaque" x="0" y="0" width="492" height="16" backcolor="#FFFFFF">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{TITULO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" stretchType="RelativeToTallestObject" mode="Opaque" x="59" y="16" width="573" height="15" backcolor="#FFFFFF">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
+				<reportElement uuid="ca2c2d81-3bdc-4351-b3c5-3c8e492a9251" mode="Transparent" x="673" y="0" width="129" height="16" forecolor="#000000" backcolor="#FFFFFF">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="eb7f6343-8d88-47bc-ad23-92998f284670" x="492" y="0" width="181" height="16">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="20f88429-9716-45bb-8c22-b5c85b175bdf" mode="Transparent" x="632" y="16" width="139" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement uuid="5e1ad619-ea2d-41b4-ac61-1f3d750d4560" mode="Transparent" x="772" y="16" width="30" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box leftPadding="2"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="3e7f1b34-a254-4931-a7d0-2a99f113d73f" stretchType="RelativeToBandHeight" mode="Transparent" x="562" y="31" width="239" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm:ss" isBlankWhenNull="true">
+				<reportElement uuid="66455995-be07-4062-8234-ade8ccfd79c0" x="0" y="0" width="100" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box leftPadding="4"/>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[$F{DATA}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="151a46f2-5c54-4a0e-91c2-a49986a08cff" stretchType="RelativeToTallestObject" x="100" y="0" width="139" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="d2f490c1-e807-4243-a3e0-b86229a83c6b" x="440" y="0" width="60" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{TARIFA}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="dcb305f9-8649-4440-a485-4ada6876b066" x="740" y="0" width="60" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0"/>
+					<leftPen lineWidth="0.0"/>
+					<bottomPen lineWidth="0.0"/>
+					<rightPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{VALOR}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="a3119d26-2d10-40c5-98dc-bf0f6be3fc25" x="500" y="0" width="60" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{PEDAGIO}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="ccad4f84-243a-47cf-904a-15c4ba7feee4" x="560" y="0" width="60" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{SEGURO}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="d098d054-0eef-474a-91d3-c7ea9090ab74" x="680" y="0" width="60" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{TAXA}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="false">
+				<reportElement uuid="48f4dece-76dc-4445-89f3-73c0537c8bf9" x="620" y="0" width="60" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{SEG_OPCIONAL}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="112c980b-43f4-4335-b7e0-a94248f4f516" stretchType="RelativeToTallestObject" x="239" y="0" width="67" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[$F{BILHETE}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="58e6590f-61f3-4cbf-9c0b-326cc6880983" stretchType="RelativeToTallestObject" x="306" y="0" width="67" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="60440f04-2ec6-45eb-b332-5dc48c3b7154" stretchType="RelativeToTallestObject" x="373" y="0" width="67" height="15" isPrintWhenDetailOverflows="true">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Left"/>
+				<textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band/>
+	</columnFooter>
+	<lastPageFooter>
+		<band/>
+	</lastPageFooter>
+	<summary>
+		<band height="63">
+			<textField>
+				<reportElement uuid="f866e6d3-35b9-49b8-9228-a27ea9beae98" x="0" y="0" width="440" height="15"/>
+				<textElement textAlignment="Right" markup="none">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{TOTAL_GERAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="26a2768f-98c4-40d6-8437-a3431e29767d" x="560" y="0" width="60" height="15"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_SEGURO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="c3d56b38-e963-4eb8-8c1d-631bc26d3c68" x="500" y="0" width="60" height="15"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_PEDAGIO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="0fa428cd-c4aa-434a-801a-4c7e78182391" x="680" y="0" width="60" height="15"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_TAXA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="2e8ebe5a-ea49-4132-8b8b-2620bfbd0f60" x="740" y="0" width="60" height="15"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_VALOR}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="6b7dcb42-1af8-4243-89d7-50d6bf0d9ba5" x="440" y="0" width="60" height="15"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_TARIFA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="993c02bc-fc54-4efc-bd4a-5fd5f3226937" x="620" y="0" width="60" height="15"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{TOTAL_SEG_OPCIONAL}]]></textFieldExpression>
+			</textField>
+			<crosstab isRepeatColumnHeaders="false" isRepeatRowHeaders="false">
+				<reportElement uuid="e0606f96-28f5-4064-8e92-ece9376a82f0" x="239" y="24" width="381" height="25"/>
+				<rowGroup name="FORMA_PAGAMENTO" width="210">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Opaque">
+							<textField>
+								<reportElement uuid="15f4cc70-6b11-4b98-b618-672fbe59aba3" style="Crosstab Data Text" x="0" y="0" width="210" height="20"/>
+								<textElement textAlignment="Left"/>
+								<textFieldExpression><![CDATA["Total "+$V{FORMA_PAGAMENTO}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="TOTAL" height="5" totalPosition="End">
+					<bucket class="java.lang.Double">
+						<bucketExpression><![CDATA[$F{VALOR}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Transparent"/>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Opaque"/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="TOTALMeasure" class="java.lang.Double" calculation="Sum">
+					<measureExpression><![CDATA[$F{VALOR}]]></measureExpression>
+				</measure>
+				<crosstabCell width="0" height="20">
+					<cellContents style="Crosstab Data Text"/>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="FORMA_PAGAMENTO">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="2ea76f60-8961-49b5-a689-9a49cafd4731" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{TOTALMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="120" height="20" columnTotalGroup="TOTAL">
+					<cellContents backcolor="#FFFFFF" mode="Opaque" style="Crosstab Data Text">
+						<textField pattern="###0.00">
+							<reportElement uuid="d946453b-6412-4485-b2f8-cf74cebafaa3" style="Crosstab Data Text" x="0" y="0" width="120" height="20"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{TOTALMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="FORMA_PAGAMENTO" columnTotalGroup="TOTAL">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="6961a0e3-e27f-45d8-b6ec-5d4bf93a9862" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{TOTALMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+	<noData>
+		<band height="45">
+			<textField>
+				<reportElement uuid="6c28de84-ceae-409b-bde5-04f66cb9a805" x="0" y="0" width="802" height="45"/>
+				<textElement markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java
index 9e8b525cb..a1b1b0480 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java
@@ -19,14 +19,17 @@ import org.springframework.stereotype.Controller;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Datebox;
+import org.zkoss.zul.Radiogroup;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.Toolbar;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.FormaPago;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFormaPagamentoAgencia;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFormaPagamentoAgenciaNovo;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFormaPagamentoAgenciaRutaTramo;
 import com.rjconsultores.ventaboletos.service.FormaPagamentoAgenciaService;
 import com.rjconsultores.ventaboletos.service.FormaPagoService;
@@ -66,7 +69,6 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 	private List<Empresa> lsEmpresas;
 	
 	private MyComboboxPuntoVenta cmbAgencia;
-	private Checkbox considerarRuta;
 	
 	private MyComboboxEstandar cmbRuta;
 	private MyComboboxEstandar cmbFormaPago;
@@ -76,6 +78,9 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 	private MyListbox selectedRutasList;
 	private List<FormaPago> lsFormaPago;
 	
+	private Radiogroup rgLayout;
+	private Toolbar toolbar;
+	private Row rowLinha;
 	
 	
 	@Override
@@ -155,27 +160,27 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 
 		SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy");
 		
-		Map<String, Object> argsInforme = new HashMap<>();
+		Map<String, Object> parametros = new HashMap<>();
 		
-		if(!considerarRuta.isChecked()){
-			argsInforme.put("DATA_INICIAL", dataInicio);
-			argsInforme.put("DATA_FINAL", dataFinal);
+		if(rgLayout.getSelectedItem().getValue().equals("LINHA")){
+			parametros.put("DATA_INICIAL", dt.format(dataInicio));
+			parametros.put("DATA_FINAL", dt.format(dataFinal));
 		}else{
-			argsInforme.put("DATA_INICIAL", dt.format(dataInicio));
-			argsInforme.put("DATA_FINAL", dt.format(dataFinal));
+			parametros.put("DATA_INICIAL", dataInicio);
+			parametros.put("DATA_FINAL", dataFinal);			
 		}
 		
 		filtro.append("Periodo: ");
 		filtro.append(dt.format(dataInicio)).append(" a ");
 		filtro.append(dt.format(dataFinal)).append("; ");
 		
-		argsInforme.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
-		argsInforme.put("USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
+		parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
+		parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
 		
 		filtro.append("Empresa: ");
 		if (cmbEmpresa.isValid() && cmbEmpresa.getSelectedItem() != null) {
 			Empresa empresa = ((Empresa)cmbEmpresa.getSelectedItem().getValue());
-			argsInforme.put("EMPRESA", empresa.getEmpresaId());
+			parametros.put("EMPRESA", empresa.getEmpresaId());
 			filtro.append(empresa.getNombempresa()).append("; ");
 		}else {
 			filtro.append(TODAS);
@@ -184,14 +189,16 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 		filtro.append("Agência: ");
 		if (cmbAgencia.getSelectedItem() != null) {
 			PuntoVenta agencia = ((PuntoVenta) cmbAgencia.getSelectedItem().getValue());
-			argsInforme.put("AGENCIA", agencia.getPuntoventaId());
+			parametros.put("AGENCIA", agencia.getPuntoventaId());
 			filtro.append(agencia.getNombpuntoventa()).append("; ");
 		}else {
 			filtro.append(TODAS);
 		}
 		
 		filtro.append("Linha: ");
-		if (considerarRuta.isChecked() && listSelectedRutas != null && !listSelectedRutas.isEmpty()) {
+		if( rgLayout.getSelectedItem().getValue().equals("LINHA") 
+				&& listSelectedRutas != null 
+				&& !listSelectedRutas.isEmpty()) {
 			StringBuilder idsRutas = new StringBuilder();
 			StringBuilder linhas = new StringBuilder();
 			for(Ruta r : listSelectedRutas){
@@ -199,7 +206,7 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 				linhas.append(r.getDescruta()).append(", ");
 			}
 			
-			argsInforme.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-2));
+			parametros.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-2));
 			filtro.append(linhas.substring(0, idsRutas.length()-2));
 		}else {
 			filtro.append(TODAS);
@@ -208,29 +215,30 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 		filtro.append("Forma de Pagamento: ");
 		if (cmbFormaPago.getSelectedItem() != null) {
 			FormaPago formaPago= ((FormaPago) cmbFormaPago.getSelectedItem().getValue());
-			argsInforme.put("FORMA_PAGO", formaPago.getFormapagoId());
+			parametros.put("FORMA_PAGO", formaPago.getFormapagoId());
 			filtro.append(formaPago.getDescpago()).append("; ");
 		}else {
 			filtro.append(TODAS);
 		}
 		
-		RelatorioFormaPagamentoAgencia relatorio =null;
-		RelatorioFormaPagamentoAgenciaRutaTramo relatorioRutaTramo =null;
-		argsInforme.put("FILTROS", filtro.toString());
-		if(!considerarRuta.isChecked()){
-			relatorio = new RelatorioFormaPagamentoAgencia(argsInforme, dataSourceRead.getConnection());
-		}else{
-			relatorioRutaTramo = new RelatorioFormaPagamentoAgenciaRutaTramo(argsInforme, dataSourceRead.getConnection());
+		if(rgLayout.getSelectedItem().getValue().equals("DATA_VENDA")) {
+			parametros.put("TIPO_DATA", "DATA_VENDA");			
 		}
 		
+		parametros.put("FILTROS", filtro.toString());
 		
 		Map<String, Object> args = new HashMap<>();
-		if(!considerarRuta.isChecked()){
+		if(rgLayout.getSelectedItem().getValue().equals("PADRAO")){
+			RelatorioFormaPagamentoAgencia relatorio = new RelatorioFormaPagamentoAgencia(parametros, dataSourceRead.getConnection());
 			args.put("relatorio", relatorio);
-		}else{
-			args.put("relatorio", relatorioRutaTramo);
-		}		
-
+		}else if(rgLayout.getSelectedItem().getValue().equals("LINHA")){
+			RelatorioFormaPagamentoAgenciaRutaTramo relatorio = new RelatorioFormaPagamentoAgenciaRutaTramo(parametros, dataSourceRead.getConnection());
+			args.put("relatorio", relatorio);
+		}else if(rgLayout.getSelectedItem().getValue().equals("NOVO")){
+			RelatorioFormaPagamentoAgenciaNovo relatorio = new RelatorioFormaPagamentoAgenciaNovo(parametros, dataSourceRead.getConnection());
+			args.put("relatorio", relatorio);
+		}
+		
 		openWindow("/component/reportView.zul",
 				Labels.getLabel("formaPagamentoAgenciaController.window.title"), args, MODAL);
 
@@ -243,6 +251,24 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 			cmbRuta.setSelectedItem(null);
 		}
 	}
+	
+	public void onClick$rdLinha(Event ev) {
+		habilitaLinha(true);
+	}
+	
+	public void onClick$rdPadrao(Event ev) {
+		habilitaLinha(false);
+	}
+	
+	public void onClick$rdNovo(Event ev) {
+		habilitaLinha(false);
+	}
+	
+	private void habilitaLinha( boolean view) {
+		rowLinha.setVisible(view);
+		toolbar.setVisible(view);
+		selectedRutasList.setVisible(view);
+	}
 
 	public void onClick$btnRemoveRuta(Event ev) {
 		Ruta ruta = (Ruta) selectedRutasList.getSelected();
@@ -258,22 +284,18 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 		this.lsRuta = lsRuta;
 	}
 
-
 	public List<Ruta> getListSelectedRutas() {
 		return listSelectedRutas;
 	}
 
-
 	public void setListSelectedRutas(List<Ruta> listSelectedRutas) {
 		this.listSelectedRutas = listSelectedRutas;
 	}
 
-
 	public MyListbox getSelectedRutasList() {
 		return selectedRutasList;
 	}
 
-
 	public void setSelectedRutasList(MyListbox selectedRutasList) {
 		this.selectedRutasList = selectedRutasList;
 	}
@@ -281,9 +303,25 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
 	public List<FormaPago> getLsFormaPago() {
 		return lsFormaPago;
 	}
+	
 	public void setLsFormaPago(List<FormaPago> lsFormaPago) {
 		this.lsFormaPago = lsFormaPago;
 	}
-	
+
+	public Radiogroup getRgLayout() {
+		return rgLayout;
+	}
+
+	public void setRgLayout(Radiogroup rgLayout) {
+		this.rgLayout = rgLayout;
+	}
+
+	public Toolbar getToolbar() {
+		return toolbar;
+	}
+
+	public void setToolbar(Toolbar toolbar) {
+		this.toolbar = toolbar;
+	}	
 	
 }
diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label
index c83779943..516b44fe4 100644
--- a/web/WEB-INF/i3-label_en.label
+++ b/web/WEB-INF/i3-label_en.label
@@ -103,7 +103,8 @@ relatorio.parametro.msgNoData = Não foi possivel obter dados com os parâmetros
 relatorio.lb.btnExecutarRelatorioEstavel  = Executar Relatório - Versão Estável
 relatorio.parametro.dataMenorDataAtual=Data não pode ser menor do que a Data Atual
 relatorio.lb.btnGerarArquivo=Gerar Arquivo
-
+relatorio.lbPadrao.value=Padrão
+relatorio.lbNovo.label=Novo
 
 # tooltip botões
 tooltiptext.btnFechar = Fechar
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 564321ece..59f768325 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -101,7 +101,8 @@ relatorio.lb.btnSalvarRelatorioXls = Guardar reporte en XLS
 relatorio.parametro.msgNoData = No fue posible obtener datos con los parámetros informados.
 relatorio.parametro.dataMenorDataAtual=Data não pode ser menor do que a Data Atual
 relatorio.lb.btnGerarArquivo=Generar Arquivo
-
+relatorio.lbPadrao.value=Padrão
+relatorio.lbNovo.label=Novo
 
 # tooltip botões
 tooltiptext.btnFechar = Cerrar
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 14617be04..3c1193a3d 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -102,6 +102,8 @@ relatorio.parametro.msgNoData = Não foi possivel obter dados com os parâmetros
 relatorio.lb.btnExecutarRelatorioEstavel  = Executar Relatório - Versão Estável
 relatorio.parametro.dataMenorDataAtual=Data não pode ser menor do que a Data Atual
 relatorio.lb.btnGerarArquivo=Gerar Arquivo
+relatorio.lbPadrao.value=Padrão
+relatorio.lbNovo.label=Novo
 
 
 # tooltip botões
@@ -303,9 +305,9 @@ indexController.mniAnalitico.label = Relatórios
 indexController.mniIntegracion.label = Integração
 indexController.mniRelatoriosBpe.label = Relatórios BPe
 indexController.mniRelatoriosOperacionais.label = Relatórios Operacionais
-indexController.mniRelatoriosFinanceiro.label = Relatórios Financeiro
+indexController.mniRelatoriosFinanceiro.label = Relatórios Financeiros
 indexController.mniRelatoriosEstatisticos.label = Relatórios Estatísticos
-indexController.mniRelatoriosPacote.label = Relatórios Pacote
+indexController.mniRelatoriosPacote.label = Relatórios Pacotes
 indexController.mniIntegracion.bgm.label = BGM
 indexController.mnSubMenuContaCorrente.label = Fechamento Conta Corrente
 indexController.mniRelatorioEmbarqueLocalidade.label=Relatório Embarque por Localidade
diff --git a/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul b/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul
index 086c9fe47..36c19c61d 100644
--- a/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul
+++ b/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul
@@ -10,100 +10,95 @@
 		apply="${formaPagamentoAgenciaController}"
 		contentStyle="overflow:auto" width="560px" border="normal">
 
+	<grid fixedLayout="true">
+			<columns>
+				<column width="20%" />
+				<column width="30%" />
+				<column width="20%" />
+				<column width="30%" />
+			</columns>
+			<rows>
+				<row>
+					<label
+						value="${c:l('formaPagamentoAgenciaController.lbDataIni.value')}" />
+					<datebox id="fecInicio" width="90%"
+						format="dd/MM/yyyy"  constraint="no empty" maxlength="10" />
+					<label
+						value="${c:l('formaPagamentoAgenciaController.lbDataFin.value')}" />
+					<datebox id="fecFinal" width="90%"
+						format="dd/MM/yyyy" constraint="no empty" maxlength="10" />
+				</row>
+			</rows>
+		</grid>
 		<grid fixedLayout="true">
 			<columns>
 				<column width="30%" />
 				<column width="80%" />
 			</columns>
 			<rows>
-				<row>
-					<label value="${c:l('formaPagamentoAgenciaController.lbAgencia.value')}" />
-					<combobox id="cmbAgencia" width="50%" maxlength="60" mold="rounded" buttonVisible="true"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"/>						
-				</row>
-				<row>
-					<label
-						value="${c:l('formaPagamentoAgenciaController.lbDataIni.value')}" />
-					<datebox id="fecInicio" width="50%"
-						format="dd/MM/yyyy"  constraint="no empty"
-						maxlength="10" />
-				</row>
-				<row>
-					<label
-						value="${c:l('formaPagamentoAgenciaController.lbDataFin.value')}" />
-					<datebox id="fecFinal" width="50%"
-						format="dd/MM/yyyy" constraint="no empty"
-						maxlength="10" />
-				</row>
-				<row>
+				<row spans="1,1,2">
 					<label
 						value="${c:l('formaPagamentoAgenciaController.lbEmpresa.value')}" />
-					<combobox id="cmbEmpresa"
+					<combobox id="cmbEmpresa" buttonVisible="true"
+						constraint="no empty"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" constraint="no empty"
-						width="50%" 
-						model="@{winFormaPagamentoAgencia$composer.lsEmpresas}"/>
+						model="@{winFiltroRelatorioRecargaRvhub$composer.lsEmpresa}"
+						width="95%" />
+				</row>
+				<row spans="1,1,2">
+					<label value="${c:l('formaPagamentoAgenciaController.lbAgencia.value')}" />
+					<combobox id="cmbAgencia" width="95%" maxlength="60" mold="rounded" buttonVisible="true"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"/>						
 				</row>
 				
-				<row>
-					<label
-						value="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" />
-						
-						<grid fixedLayout="true">
-							<columns>
-								<column width="10%" />
-								<column width="90%" />
-							</columns>
-							<rows>
-								<row>
-								<checkbox id="considerarRuta">
-									<attribute name="onCheck">
-										cmbRuta.setVisible(!cmbRuta.isVisible());
-										toolbar.setVisible(!toolbar.isVisible());
-										selectedRutasList.setVisible(!selectedRutasList.isVisible());
-									</attribute>
-								</checkbox>
-								<combobox id="cmbRuta" visible="false"
-									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-									mold="rounded" buttonVisible="true" width="50%"
-									model="@{winFormaPagamentoAgencia$composer.lsRuta}" />
-								</row>
-							</rows>
-						</grid>
-				</row>
-				<row>
+				<row spans="1,1,2">
 					<label id="lblFormaPago"
 						value="${c:l('formaPagamentoAgenciaController.lbFormaPagamento.value')}" />
 					<combobox id="cmbFormaPago"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						width="50%" mold="rounded" buttonVisible="true"
+						width="95%" mold="rounded" buttonVisible="true"
 						model="@{winFormaPagamentoAgencia$composer.lsFormaPago}" />
 				</row>
-
+				<row spans="4">       
+					<radiogroup Id="rgLayout" >
+						<radio value="PADRAO" id="rdPadrao" label="${c:l('relatorio.lbPadrao.value')}" checked="true" />						
+						<radio value="NOVO"   id="rdNovo"   label="${c:l('relatorio.lbNovo.label')}"/>
+						<radio value="LINHA"  id="rdLinha"  label="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" />
+					</radiogroup>
+				</row>
+				
+				<row spans="1,1,2" id="rowLinha" visible="false">							
+					<label id="lblRuta" value="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" />								
+					<combobox id="cmbRuta" 
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						mold="rounded" buttonVisible="true" width="80%"
+						model="@{winFormaPagamentoAgencia$composer.lsRuta}" />							
+				</row>
 			</rows>
 		</grid>
 		<toolbar id="toolbar" visible="false">
-							<button id="btnRemoveRuta" height="20"
-								image="/gui/img/remove.png" width="35px"
-								tooltiptext="${c:l('generarTarifaOrgaoController.labelRemoveRuta.value')}" />
-							<button id="btnAddRuta" height="20"
-								image="/gui/img/add.png" width="35px"
-								tooltiptext="${c:l('generarTarifaOrgaoController.labelAddRuta.value')}" />
-						</toolbar>
-						<listbox id="selectedRutasList" visible="false"
-							use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
-							multiple="false">
-							<listhead sizable="true">
-								<listheader image="/gui/img/builder.gif"
-									label="${c:l('generarTarifaOrgaoController.labelRuta.value')}" width="70%"/>
-								<listheader image="/gui/img/builder.gif"
-									label="${c:l('generarTarifaOrgaoController.labelOrgao.value')}" />
-							</listhead>
-						</listbox>
+			<button id="btnRemoveRuta" height="20"
+				image="/gui/img/remove.png" width="35px"
+				tooltiptext="${c:l('generarTarifaOrgaoController.labelRemoveRuta.value')}" />
+			<button id="btnAddRuta" height="20"
+				image="/gui/img/add.png" width="35px"
+				tooltiptext="${c:l('generarTarifaOrgaoController.labelAddRuta.value')}" />
+		</toolbar>
+		<listbox id="selectedRutasList" visible="false"
+			use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
+			multiple="false">
+			<listhead sizable="true">
+				<listheader image="/gui/img/builder.gif"
+					label="${c:l('generarTarifaOrgaoController.labelRuta.value')}" width="70%"/>
+				<listheader image="/gui/img/builder.gif"
+					label="${c:l('generarTarifaOrgaoController.labelOrgao.value')}" />
+			</listhead>
+		</listbox>
 
 		<toolbar>
-            <button id="btnInforme" height="20" image="/gui/img/vis.png" width="35px"/>
-        </toolbar>
+			<button id="btnInforme" image="/gui/img/find.png"
+				label="${c:l('relatorio.lb.btnExecutarRelatorio')}" />
+		</toolbar>
 
 	</window>
 </zk>
\ No newline at end of file