bug#12840

dev:valdevir
qua:

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

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

@@ -42,12 +42,14 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
 			instrucaoSql.append("WHEN CLI.TIPOIDENTIFICADOS_ID = 2 THEN ");
 			instrucaoSql.append("    NUMIDENTIFICADOS  ");
 			instrucaoSql.append("END, 11, '0') CPF_COMPRADOR, CLI.NOMBCLIENTE NOME_COMPRADOR, ");
-			instrucaoSql.append("TO_CHAR(COALESCE(B.FECHORVENTA_H,B.FECHORVENTA), 'DD/MM/YYYY HH24:MI') DATA_HORA_COMPRA,  ");
+			instrucaoSql.append("TO_CHAR(COALESCE(B.FECHORVENTA_H,B.FECHORVENTA), 'DD/MM/YYYY') DATA_COMPRA,  ");
+			instrucaoSql.append("TO_CHAR(COALESCE(B.FECHORVENTA_H,B.FECHORVENTA), 'HH24:MI') HORA_COMPRA,  ");
 			instrucaoSql.append("TK.NSU, TK.NUMAUTORIZACION AUTORIZACAO, ");
 			instrucaoSql.append("COALESCE(B.PRECIOPAGADO,0) + COALESCE(B.IMPORTETAXAEMBARQUE,0) +  ");
 			instrucaoSql.append("COALESCE(B.IMPORTESEGURO,0) + COALESCE(B.IMPORTEPEDAGIO,0) + COALESCE(B.IMPORTEOUTROS,0) AS VALOR_TOTAL, ");
 			instrucaoSql.append("B.CORRIDA_ID SERVICO, ");
-			instrucaoSql.append("TO_CHAR(B.FECHORVIAJE, 'DD/MM/YYYY HH24:MI') DATA_HORA_VIAGEM,  ");
+			instrucaoSql.append("TO_CHAR(B.FECHORVIAJE, 'DD/MM/YYYY') DATA_VIAGEM,  ");
+			instrucaoSql.append("TO_CHAR(B.FECHORVIAJE, 'HH24:MI') HORA_VIAGEM,  ");
 			instrucaoSql.append("PO.DESCPARADA ORIGEM, PD.DESCPARADA DESTINO, ");
 			instrucaoSql.append("B.NUMFOLIOSISTEMA BILHETE, ");
 			instrucaoSql.append("B.NUMASIENTO POLTRONA, ");
@@ -55,10 +57,18 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
 			instrucaoSql.append("TK.STATUSTRANSACAOKONDUTO STATUSTRANSACAOKONDUTO, ");
 			instrucaoSql.append("TK.STATUSTRANSACAO STATUSTRANSACAO, ");
 			instrucaoSql.append("TK.TENTATIVAENVIO TENTATIVAENVIO, ");
-			instrucaoSql.append("TK.STATUSENVIO STATUSENVIO ");
+			instrucaoSql.append("TK.STATUSENVIO STATUSENVIO, ");
+			instrucaoSql.append("E.NOMBEMPRESA NOMBEMPRESA, ");
+			instrucaoSql.append("PV.NOMBPUNTOVENTA NOMBPUNTOVENTA, ");
+			instrucaoSql.append("TO_CHAR(TK.DATA_ENVIO, 'DD/MM/YYYY') DATA_ENVIO,  ");
+			instrucaoSql.append("TO_CHAR(TK.DATA_ENVIO, 'HH24:MI') HORA_ENVIO,  ");
+			instrucaoSql.append("TK.VALOR VALOR, ");
+			instrucaoSql.append("TK.CODIGO_HTTP CODIGO_HTTP ");
 			instrucaoSql.append("FROM BOLETO B ");
 			instrucaoSql.append("INNER JOIN TRANSACAO_KONDUTO TK ON B.BOLETO_ID = TK.BOLETO_ID ");
 			instrucaoSql.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ");
+			instrucaoSql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");
+			instrucaoSql.append("INNER JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = TK.PUNTOVENTA_ID ");
 			instrucaoSql.append("LEFT JOIN CLIENTE CLI ON B.CLIENTECOMPRADOR_ID = CLI.CLIENTE_ID ");
 			instrucaoSql.append("LEFT JOIN PARADA PO ON B.ORIGEN_ID = PO.PARADA_ID ");
 			instrucaoSql.append("LEFT JOIN PARADA PD ON B.DESTINO_ID = PD.PARADA_ID ");
@@ -87,18 +97,26 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
 			dataResult.put("ID_KONDUTO", resultSet.getString("ID_KONDUTO"));
 			dataResult.put("CPF_COMPRADOR", resultSet.getString("CPF_COMPRADOR"));
 			dataResult.put("NOME_COMPRADOR", resultSet.getString("NOME_COMPRADOR"));
-			dataResult.put("DATA_COMPRA", resultSet.getString("DATA_HORA_COMPRA"));
+			dataResult.put("DATA_COMPRA", resultSet.getString("DATA_COMPRA"));
+			dataResult.put("HORA_COMPRA", resultSet.getString("HORA_COMPRA"));
 			dataResult.put("NSU", resultSet.getString("NSU"));
 			dataResult.put("AUTORIZACAO", resultSet.getString("AUTORIZACAO"));
 			dataResult.put("VALOR_TOTAL", resultSet.getBigDecimal("VALOR_TOTAL"));
+			dataResult.put("VALOR", resultSet.getBigDecimal("VALOR"));
 			dataResult.put("SERVICO", resultSet.getString("SERVICO"));
-			dataResult.put("DATA_VIAGEM", resultSet.getString("DATA_HORA_VIAGEM"));
+			dataResult.put("DATA_VIAGEM", resultSet.getString("DATA_VIAGEM"));
+			dataResult.put("HORA_VIAGEM", resultSet.getString("HORA_VIAGEM"));
 			dataResult.put("ORIGEM", resultSet.getString("ORIGEM"));
 			dataResult.put("DESTINO", resultSet.getString("DESTINO"));
 			dataResult.put("BILHETE", resultSet.getString("BILHETE"));
 			dataResult.put("POLTRONA", resultSet.getString("POLTRONA"));
 			dataResult.put("PASSAGEIRO", resultSet.getString("PASSAGEIRO"));
 			dataResult.put("TENTATIVAENVIO", resultSet.getInt("TENTATIVAENVIO"));
+			dataResult.put("NOMBEMPRESA", resultSet.getString("NOMBEMPRESA"));
+			dataResult.put("NOMBPUNTOVENTA", resultSet.getString("NOMBPUNTOVENTA"));
+			dataResult.put("DATA_ENVIO", resultSet.getString("DATA_ENVIO"));
+			dataResult.put("HORA_ENVIO", resultSet.getString("HORA_ENVIO"));
+			dataResult.put("CODIGO_HTTP", resultSet.getString("CODIGO_HTTP"));
 			
 			String statustransacao = resultSet.getString("STATUSTRANSACAO");
 			if(StringUtils.isNotBlank(statustransacao)) {

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

@@ -20,11 +20,14 @@ label.idKonduto=ID Konduto
 label.cpfComprador=CPF Comprador
 label.nomeComprador=Nome Comprador
 label.dataCompra=Data Compra
+label.horaCompra=Hora Compra
 label.nsu=NSU
 label.autorizacao=Autorização
 label.valor=Valor
+label.valorTotal=Valor Total
 label.servico=Serviço
 label.dataViagem=Data Viagem
+label.horaViagem=Hora Viagem
 label.origem=Origem
 label.destino=Destino
 label.bilhete=Bilhete
@@ -32,6 +35,11 @@ label.poltrona=Poltrona
 label.passageiro=Passageiro
 label.tentativasEnvio=Tentativas Envio
 label.statusTotalBus=Status totalBus
-label.statusKonduto=Status Konduto
+label.statusKonduto=Recomendação
 label.total=Total
-label.statusEnvio=Status Envio
+label.statusEnvio=Status Envio
+label.empresa=Empresa
+label.puntoventa=Ponto de Venda
+label.dataEnvio=Data Envio
+label.horaEnvio=Hora Envio
+label.codigoHttp=Código Respostas HTTP

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

@@ -20,11 +20,14 @@ label.idKonduto=ID Konduto
 label.cpfComprador=CPF Comprador
 label.nomeComprador=Nome Comprador
 label.dataCompra=Data Compra
+label.horaCompra=Hora Compra
 label.nsu=NSU
 label.autorizacao=Autorização
 label.valor=Valor
+label.valorTotal=Valor Total
 label.servico=Serviço
 label.dataViagem=Data Viagem
+label.horaViagem=Hora Viagem
 label.origem=Origem
 label.destino=Destino
 label.bilhete=Bilhete
@@ -32,6 +35,11 @@ label.poltrona=Poltrona
 label.passageiro=Passageiro
 label.tentativasEnvio=Tentativas Envio
 label.statusTotalBus=Status totalBus
-label.statusKonduto=Status Konduto
+label.statusKonduto=Recomendação
 label.total=Total
-label.statusEnvio=Status Envio
+label.statusEnvio=Status Envio
+label.empresa=Empresa
+label.puntoventa=Ponto de Venda
+label.dataEnvio=Data Envio
+label.horaEnvio=Hora Envio
+label.codigoHttp=Código Respostas HTTP

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

@@ -1,8 +1,12 @@
 <?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="RelatorioIntegracaoAntiFraude" pageWidth="1390" pageHeight="595" orientation="Landscape" columnWidth="1350" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7e37af0b-caa1-4f25-831c-5cbb2bb78560">
+<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="RelatorioIntegracaoAntiFraude" pageWidth="1980" pageHeight="595" orientation="Landscape" columnWidth="1940" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7e37af0b-caa1-4f25-831c-5cbb2bb78560">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
-	<property name="ireport.x" value="1337"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
-	<property name="ireport.y" value="121"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
+	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
+	<property name="ireport.zoom" value="0.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="empresa" class="java.lang.String"/>
 	<parameter name="statusKonduto" class="java.lang.String"/>
@@ -30,9 +34,18 @@
 	<field name="STATUSTRANSACAO" class="java.lang.String"/>
 	<field name="STATUSTRANSACAOKONDUTO" class="java.lang.String"/>
 	<field name="STATUSENVIO" class="java.lang.String"/>
+	<field name="NOMBEMPRESA" class="java.lang.String"/>
+	<field name="NOMBPUNTOVENTA" class="java.lang.String"/>
+	<field name="VALOR" class="java.math.BigDecimal"/>
+	<field name="DATA_ENVIO" class="java.lang.String"/>
+	<field name="HORA_ENVIO" class="java.lang.String"/>
+	<field name="CODIGO_HTTP" class="java.lang.String"/>
 	<variable name="somaValorTotal" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{VALOR_TOTAL}]]></variableExpression>
 	</variable>
+	<variable name="somaValor" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{VALOR}]]></variableExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -88,7 +101,7 @@
 				<textFieldExpression><![CDATA[$P{periodo}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement positionType="Float" x="0" y="165" width="1350" height="1" uuid="ef42d3b8-d503-4309-a5ea-8f2b934d6ca9"/>
+				<reportElement positionType="Float" x="0" y="165" width="1940" height="1" uuid="ef42d3b8-d503-4309-a5ea-8f2b934d6ca9"/>
 			</line>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement positionType="Float" x="0" y="65" width="130" height="20" uuid="27dd2e10-0e2b-4097-b225-7ab431136158"/>
@@ -133,7 +146,7 @@
 				<textFieldExpression><![CDATA[$P{puntoventa}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement positionType="Float" x="960" y="1" width="310" height="24" uuid="bdf1ee26-9dc5-467a-877a-90019ca01dc6"/>
+				<reportElement positionType="Float" x="1702" y="1" width="239" height="24" uuid="bdf1ee26-9dc5-467a-877a-90019ca01dc6"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
@@ -151,106 +164,107 @@
 	<columnHeader>
 		<band height="16" splitType="Stretch">
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="130" height="15" isPrintWhenDetailOverflows="true" uuid="bc4fa527-08d2-47c0-88e3-2e7573f76082"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="105" height="15" isPrintWhenDetailOverflows="true" uuid="754b9cf0-9bb3-4747-8263-e3b35d3b82ec"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.idKonduto}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="133" y="0" width="70" height="15" isPrintWhenDetailOverflows="true" uuid="df8f2359-9bc6-4240-85b1-fabbd51266e7"/>
+				<reportElement stretchType="RelativeToTallestObject" x="210" y="0" width="70" height="15" isPrintWhenDetailOverflows="true" uuid="df8f2359-9bc6-4240-85b1-fabbd51266e7"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.cpfComprador}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="207" y="0" width="145" height="15" isPrintWhenDetailOverflows="true" uuid="38345db5-0501-48ed-a79a-e5ef4676c0c1"/>
+				<reportElement stretchType="RelativeToTallestObject" x="280" y="0" width="171" height="15" isPrintWhenDetailOverflows="true" uuid="38345db5-0501-48ed-a79a-e5ef4676c0c1"/>
+				<box leftPadding="2" rightPadding="2"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.nomeComprador}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="355" y="0" width="90" height="15" isPrintWhenDetailOverflows="true" uuid="d25a7ba5-0ddf-4b47-b316-9c7dffb3920d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="451" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="d25a7ba5-0ddf-4b47-b316-9c7dffb3920d"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.dataCompra}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="53" height="15" isPrintWhenDetailOverflows="true" uuid="02a11b08-b54f-46c4-8215-cd28b5245bcd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="581" y="0" width="53" height="15" isPrintWhenDetailOverflows="true" uuid="02a11b08-b54f-46c4-8215-cd28b5245bcd"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.nsu}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="498" y="0" width="67" height="15" isPrintWhenDetailOverflows="true" uuid="1b2c6c92-7f44-4d8a-ae91-d2bdd70b2f47"/>
+				<reportElement stretchType="RelativeToTallestObject" x="634" y="0" width="67" height="15" isPrintWhenDetailOverflows="true" uuid="1b2c6c92-7f44-4d8a-ae91-d2bdd70b2f47"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="565" y="0" width="63" height="15" isPrintWhenDetailOverflows="true" uuid="7533d8a1-f1a8-441a-97a0-38c6cc824a95"/>
+				<reportElement stretchType="RelativeToTallestObject" x="773" y="0" width="70" height="15" isPrintWhenDetailOverflows="true" uuid="7533d8a1-f1a8-441a-97a0-38c6cc824a95"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.valor}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.valorTotal}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="629" y="0" width="56" height="15" isPrintWhenDetailOverflows="true" uuid="09f2c725-427d-4357-9ef8-3cbcfdcae0d8"/>
+				<reportElement stretchType="RelativeToTallestObject" x="843" y="0" width="56" height="15" isPrintWhenDetailOverflows="true" uuid="09f2c725-427d-4357-9ef8-3cbcfdcae0d8"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.servico}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="685" y="0" width="90" height="15" isPrintWhenDetailOverflows="true" uuid="135b6ed3-6172-4370-b8b3-adc33c9c3be2"/>
+				<reportElement stretchType="RelativeToTallestObject" x="899" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="135b6ed3-6172-4370-b8b3-adc33c9c3be2"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="775" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="b35a8bb5-69dd-4d81-b7a9-e98af9844c72"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1029" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="b35a8bb5-69dd-4d81-b7a9-e98af9844c72"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="855" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="c7001418-2dff-4fed-a3db-b45eefa27e37"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1109" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="c7001418-2dff-4fed-a3db-b45eefa27e37"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="935" y="0" width="40" height="15" isPrintWhenDetailOverflows="true" uuid="92dd360b-f3a4-40b7-a27d-5fa9faa89d0d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1189" y="0" width="40" height="15" isPrintWhenDetailOverflows="true" uuid="92dd360b-f3a4-40b7-a27d-5fa9faa89d0d"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.bilhete}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="975" y="0" width="41" height="15" isPrintWhenDetailOverflows="true" uuid="8ac0d76a-3a3d-4ce4-bbff-0d6d70f79502"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1229" y="0" width="41" height="15" isPrintWhenDetailOverflows="true" uuid="8ac0d76a-3a3d-4ce4-bbff-0d6d70f79502"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.poltrona}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1016" y="0" width="100" height="15" isPrintWhenDetailOverflows="true" uuid="1259a31a-c3a2-44ba-97c6-5c351bc95d3b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1270" y="0" width="100" height="15" isPrintWhenDetailOverflows="true" uuid="1259a31a-c3a2-44ba-97c6-5c351bc95d3b"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.passageiro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1116" y="0" width="52" height="15" isPrintWhenDetailOverflows="true" uuid="e8e712cc-504e-4c09-9c97-016434df2ec3"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1767" y="0" width="52" height="15" isPrintWhenDetailOverflows="true" uuid="e8e712cc-504e-4c09-9c97-016434df2ec3"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
@@ -258,77 +272,135 @@
 				<textFieldExpression><![CDATA[$R{label.tentativasEnvio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1168" y="0" width="60" height="15" isPrintWhenDetailOverflows="true" uuid="5d87fe51-2795-41b1-a26b-b09068e7acfe"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1819" y="0" width="61" height="15" isPrintWhenDetailOverflows="true" uuid="5d87fe51-2795-41b1-a26b-b09068e7acfe"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.statusTotalBus}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1228" y="0" width="60" height="15" isPrintWhenDetailOverflows="true" uuid="b404b43a-b24e-426c-a420-98e6d4a0eaa5"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1562" y="0" width="75" height="15" isPrintWhenDetailOverflows="true" uuid="b404b43a-b24e-426c-a420-98e6d4a0eaa5"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.statusKonduto}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement positionType="Float" x="0" y="15" width="1350" height="1" uuid="a26eeb8d-4c0a-4456-87af-21e38559cf31"/>
+				<reportElement positionType="Float" x="0" y="15" width="1940" height="1" uuid="a26eeb8d-4c0a-4456-87af-21e38559cf31"/>
 			</line>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1288" y="0" width="62" height="15" isPrintWhenDetailOverflows="true" uuid="c1b5077b-162b-4d10-b8c2-ae334c16123f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1370" y="0" width="62" height="15" isPrintWhenDetailOverflows="true" uuid="c1b5077b-162b-4d10-b8c2-ae334c16123f"/>
 				<textElement verticalAlignment="Top" markup="none">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.statusEnvio}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="105" y="0" width="105" height="15" isPrintWhenDetailOverflows="true" uuid="6c909202-9184-4e8c-93da-2579d313e00a"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.puntoventa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="964" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="fd569a61-00bf-4266-b34f-2c839a2114ec"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.horaViagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="516" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="05528f40-8417-48d4-836d-4a9bdcce7412"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.horaCompra}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="701" y="0" width="72" height="15" isPrintWhenDetailOverflows="true" uuid="04f0128f-d966-4bef-8998-a903f0bdbd6d"/>
+				<box rightPadding="2"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valor}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1432" y="0" width="130" height="15" isPrintWhenDetailOverflows="true" uuid="bc4fa527-08d2-47c0-88e3-2e7573f76082"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.idKonduto}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1637" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="92b1d5ce-d0d0-4936-98b9-88d80836fcd6"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataEnvio}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1702" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="017a9314-263f-42cf-aa2b-638da33b45ca"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.horaEnvio}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1880" y="0" width="61" height="15" isPrintWhenDetailOverflows="true" uuid="2c625bef-6aa5-4a88-ba9f-935ec30e718f"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.codigoHttp}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="16" splitType="Stretch">
+		<band height="15" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="130" height="15" isPrintWhenDetailOverflows="true" uuid="69fbf8f0-42ff-4ac1-b4c3-98cb8981756d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="964" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="75d5190d-883d-405c-ab26-b276c3cf05ac"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{ID_KONDUTO}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{HORA_VIAGEM}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="133" y="0" width="70" height="15" isPrintWhenDetailOverflows="true" uuid="736fff80-1a77-49d3-ac6e-6db0455dea25"/>
+				<reportElement stretchType="RelativeToTallestObject" x="210" y="0" width="70" height="15" isPrintWhenDetailOverflows="true" uuid="736fff80-1a77-49d3-ac6e-6db0455dea25"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{CPF_COMPRADOR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="207" y="0" width="145" height="15" isPrintWhenDetailOverflows="true" uuid="24dc6a67-c61b-455b-92cf-6513bf0dd395"/>
+				<reportElement stretchType="RelativeToTallestObject" x="280" y="0" width="171" height="15" isPrintWhenDetailOverflows="true" uuid="24dc6a67-c61b-455b-92cf-6513bf0dd395"/>
+				<box leftPadding="2" rightPadding="2"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{NOME_COMPRADOR}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="355" y="0" width="90" height="15" isPrintWhenDetailOverflows="true" uuid="1c152ef7-6a39-4213-89f2-6c132b72fec2"/>
+				<reportElement stretchType="RelativeToTallestObject" x="451" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="1c152ef7-6a39-4213-89f2-6c132b72fec2"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{DATA_COMPRA}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="53" height="15" isPrintWhenDetailOverflows="true" uuid="7b56a17d-dce8-44c3-9bfc-4e662ddb039a"/>
+				<reportElement stretchType="RelativeToTallestObject" x="581" y="0" width="53" height="15" isPrintWhenDetailOverflows="true" uuid="7b56a17d-dce8-44c3-9bfc-4e662ddb039a"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{NSU}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="498" y="0" width="67" height="15" isPrintWhenDetailOverflows="true" uuid="50e5e2c2-aa07-40d8-9f9e-bc7317b4b3cc"/>
+				<reportElement stretchType="RelativeToTallestObject" x="634" y="0" width="67" height="15" isPrintWhenDetailOverflows="true" uuid="50e5e2c2-aa07-40d8-9f9e-bc7317b4b3cc"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{AUTORIZACAO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="565" y="0" width="63" height="15" isPrintWhenDetailOverflows="true" uuid="219b202b-d6c8-4a30-8571-184406a093ec"/>
+				<reportElement stretchType="RelativeToTallestObject" x="773" y="0" width="70" height="15" isPrintWhenDetailOverflows="true" uuid="219b202b-d6c8-4a30-8571-184406a093ec"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font size="5"/>
@@ -336,56 +408,56 @@
 				<textFieldExpression><![CDATA[$F{VALOR_TOTAL}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="629" y="0" width="56" height="15" isPrintWhenDetailOverflows="true" uuid="f967b32f-1e8a-4847-9378-a9583ed64eb8"/>
+				<reportElement stretchType="RelativeToTallestObject" x="843" y="0" width="56" height="15" isPrintWhenDetailOverflows="true" uuid="f967b32f-1e8a-4847-9378-a9583ed64eb8"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{SERVICO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="685" y="0" width="90" height="15" isPrintWhenDetailOverflows="true" uuid="e295288e-747b-4c60-ba2c-79a650503a95"/>
+				<reportElement stretchType="RelativeToTallestObject" x="899" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="e295288e-747b-4c60-ba2c-79a650503a95"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{DATA_VIAGEM}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="775" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="6028c261-a71d-406e-a140-3e6a88dd81d6"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1029" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="6028c261-a71d-406e-a140-3e6a88dd81d6"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="855" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="8dfd6984-4f8f-43b2-8f13-7693b3172a73"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1109" y="0" width="80" height="15" isPrintWhenDetailOverflows="true" uuid="8dfd6984-4f8f-43b2-8f13-7693b3172a73"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="935" y="0" width="40" height="15" isPrintWhenDetailOverflows="true" uuid="9782340c-2080-4c8a-94c9-78c62e48a6a3"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1189" y="0" width="40" height="15" isPrintWhenDetailOverflows="true" uuid="9782340c-2080-4c8a-94c9-78c62e48a6a3"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{BILHETE}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="975" y="0" width="41" height="15" isPrintWhenDetailOverflows="true" uuid="9ad8048f-4355-44ef-b14d-e54825347828"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1229" y="0" width="41" height="15" isPrintWhenDetailOverflows="true" uuid="9ad8048f-4355-44ef-b14d-e54825347828"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{POLTRONA}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1016" y="0" width="100" height="15" isPrintWhenDetailOverflows="true" uuid="420a5c3e-4798-4c66-98c8-a6ea957712e0"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1270" y="0" width="100" height="15" isPrintWhenDetailOverflows="true" uuid="420a5c3e-4798-4c66-98c8-a6ea957712e0"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{PASSAGEIRO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1116" y="0" width="52" height="15" isPrintWhenDetailOverflows="true" uuid="4f2454f2-2d38-4ae6-9844-abdcc350bc88"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1767" y="0" width="52" height="15" isPrintWhenDetailOverflows="true" uuid="4f2454f2-2d38-4ae6-9844-abdcc350bc88"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font size="5"/>
@@ -393,32 +465,92 @@
 				<textFieldExpression><![CDATA[$F{TENTATIVAENVIO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1168" y="0" width="60" height="15" isPrintWhenDetailOverflows="true" uuid="e11d547a-4953-4bfa-b9c0-a8841b84ca9b"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1819" y="0" width="61" height="15" isPrintWhenDetailOverflows="true" uuid="e11d547a-4953-4bfa-b9c0-a8841b84ca9b"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{STATUSTRANSACAO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1228" y="0" width="60" height="15" isPrintWhenDetailOverflows="true" uuid="bcb0b169-9e5e-4b1c-a242-9c9c03f755f7"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1562" y="0" width="75" height="15" isPrintWhenDetailOverflows="true" uuid="bcb0b169-9e5e-4b1c-a242-9c9c03f755f7"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{STATUSTRANSACAOKONDUTO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="1288" y="0" width="62" height="15" isPrintWhenDetailOverflows="true" uuid="2acd487c-c9de-4f48-b8c1-4974d49d2799"/>
+				<reportElement stretchType="RelativeToTallestObject" x="1370" y="0" width="62" height="15" isPrintWhenDetailOverflows="true" uuid="2acd487c-c9de-4f48-b8c1-4974d49d2799"/>
 				<textElement verticalAlignment="Top">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{STATUSENVIO}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="105" height="15" isPrintWhenDetailOverflows="true" uuid="12152912-7637-4ddf-96e0-89e2f34539bd"/>
+				<textElement verticalAlignment="Top">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{NOMBEMPRESA}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="516" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="4632fd3e-6e1a-43cb-ab09-4db9b5190af0"/>
+				<textElement verticalAlignment="Top">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{HORA_COMPRA}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="105" y="0" width="105" height="15" isPrintWhenDetailOverflows="true" uuid="6c9077ec-ec7e-4b61-8853-0ffce7452e32"/>
+				<textElement verticalAlignment="Top">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{NOMBPUNTOVENTA}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="701" y="0" width="72" height="15" isPrintWhenDetailOverflows="true" uuid="08ce579f-35d6-4b87-8caa-ee40ff2863f7"/>
+				<box rightPadding="2"/>
+				<textElement textAlignment="Right" verticalAlignment="Top">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{VALOR}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1432" y="0" width="130" height="15" isPrintWhenDetailOverflows="true" uuid="69fbf8f0-42ff-4ac1-b4c3-98cb8981756d"/>
+				<textElement verticalAlignment="Top">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{ID_KONDUTO}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1637" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="e5a43d21-e1c1-4006-8bdc-c0d9e3a70eba"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DATA_ENVIO}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1702" y="0" width="65" height="15" isPrintWhenDetailOverflows="true" uuid="a2018f05-1b75-4098-b811-122505c7a71c"/>
+				<textElement verticalAlignment="Top" markup="none">
+					<font size="5" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{HORA_ENVIO}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1880" y="0" width="61" height="15" isPrintWhenDetailOverflows="true" uuid="595178ad-5ca3-4d79-984f-e9f0451e7658"/>
+				<textElement verticalAlignment="Top">
+					<font size="5"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{CODIGO_HTTP}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
-		<band height="23" splitType="Stretch">
+		<band height="17" splitType="Stretch">
+			<line>
+				<reportElement x="0" y="1" width="1940" height="1" uuid="a05ac3c2-aff5-472f-b942-34f4bd106232"/>
+			</line>
 			<textField pattern="#,##0.00">
-				<reportElement x="564" y="2" width="64" height="15" uuid="ca18f432-671a-4981-9cdb-650412bebc8a"/>
+				<reportElement x="773" y="2" width="70" height="15" uuid="ca18f432-671a-4981-9cdb-650412bebc8a"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6" isBold="true"/>
@@ -426,15 +558,20 @@
 				<textFieldExpression><![CDATA[$V{somaValorTotal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="498" y="2" width="65" height="15" uuid="8173158a-4d47-402b-b255-49336c811b7b"/>
+				<reportElement x="633" y="2" width="68" height="15" uuid="8173158a-4d47-402b-b255-49336c811b7b"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
 					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
 			</textField>
-			<line>
+			<textField pattern="#,##0.00">
-				<reportElement x="0" y="1" width="1350" height="1" uuid="a05ac3c2-aff5-472f-b942-34f4bd106232"/>
+				<reportElement x="701" y="2" width="72" height="15" uuid="3462f5e3-e534-463d-9348-36671c94f8ae"/>
-			</line>
+				<box rightPadding="2"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="6" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{somaValorTotal}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 	<noData>

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

@@ -0,0 +1,131 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
+
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Combobox;
+import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Textbox;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+import com.rjconsultores.ventaboletos.service.PtovtaAntifraudeService;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+
+/**
+ * 
+ * @author wilian
+ * 
+ */
+@Controller("editarPtovtaAntifraudeController")
+@Scope("prototype")
+public class EditarPtovtaAntifraudeController extends MyGenericForwardComposer {
+	
+	private static final long serialVersionUID = 1L;
+
+	private static Logger log = Logger.getLogger(EditarPtovtaAntifraudeController.class);
+	
+	@Autowired
+	private PtovtaAntifraudeService ptovtaAntifraudeService;
+	
+	private Combobox cmbEmpresaPtoVtaAntifraude;
+	private Textbox txtChaveAntifraude;
+	private PtovtaAntifraude ptovtaAntifraude;
+	private List<Empresa> lsEmpresas;
+	private PuntoVenta puntoVenta;
+	private MyListbox ptovtaAntifraudeList;
+	private Empresa empresa;
+	
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+		
+		super.doAfterCompose(comp);
+		ptovtaAntifraude = (PtovtaAntifraude) Executions.getCurrent().getArg().get("ptovtaComissao");
+		this.puntoVenta = (PuntoVenta) Executions.getCurrent().getArg().get("puntoVenta");
+		this.ptovtaAntifraudeList = (MyListbox) Executions.getCurrent().getArg().get("ptovtaAntifraudeList");
+		lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa();
+		empresa = ptovtaAntifraude.getEmpresa();
+		txtChaveAntifraude.setValue(ptovtaAntifraude.getChave());
+		
+	}
+
+	public void onClick$btnSalvarPtovtaAntifraude(Event ev) throws InterruptedException {
+		try {
+			if(verificarCamposAddChaveAntifraude()) {
+				if (cmbEmpresaPtoVtaAntifraude.getSelectedItem() == null) {
+					return;
+				}
+				txtChaveAntifraude.getValue();
+				
+				ptovtaAntifraude.setEmpresa(getEmpresa());
+				ptovtaAntifraude.setChave(txtChaveAntifraude.getValue());
+				ptovtaAntifraude.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+				ptovtaAntifraude = ptovtaAntifraudeService.actualizacion(ptovtaAntifraude);
+				puntoVenta.getPtovtaAntifraudes().set(puntoVenta.getPtovtaAntifraudes().indexOf(ptovtaAntifraude), ptovtaAntifraude);
+				ptovtaAntifraudeList.setData(puntoVenta.getPtovtaAntifraudes());
+				closeWindow();
+			}
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+
+	}
+
+	public List<Empresa> getLsEmpresas() {
+		return lsEmpresas;
+	}
+	
+	private boolean verificarCamposAddChaveAntifraude() throws InterruptedException {
+		if (cmbEmpresaPtoVtaAntifraude.getSelectedItem() == null) {
+			Messagebox.show(
+					Labels.getLabel("editarPuntoVentaController.MSG.empresaAntifraudeNaoInformada"),
+					Labels.getLabel("editarPuntoVentaController.window.title"),
+					Messagebox.OK, Messagebox.EXCLAMATION);
+			return false;
+		}
+		
+		txtChaveAntifraude.getValue();
+		if(StringUtils.isBlank(txtChaveAntifraude.getValue())) {
+			Messagebox.show(
+					Labels.getLabel("editarPuntoVentaController.MSG.chaveAntifraudeNaoInformada"),
+					Labels.getLabel("editarPuntoVentaController.window.title"),
+					Messagebox.OK, Messagebox.EXCLAMATION);
+			return false;
+		}
+		
+		if(ptovtaAntifraudeList.getListData() != null) {
+			Empresa empresa = (Empresa) cmbEmpresaPtoVtaAntifraude.getSelectedItem().getValue();
+			for (Object obj : ptovtaAntifraudeList.getListData()) {
+				PtovtaAntifraude ptovtaAntifraude = (PtovtaAntifraude) obj;
+				if(empresa.equals(ptovtaAntifraude.getEmpresa()) && !ptovtaAntifraude.equals(this.ptovtaAntifraude)) {
+					Messagebox.show(
+							Labels.getLabel("editarPuntoVentaController.MSG.empresaAntifraudeJaCadastrada"),
+							Labels.getLabel("editarPuntoVentaController.window.title"),
+							Messagebox.OK, Messagebox.EXCLAMATION);					
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	public Empresa getEmpresa() {
+		return empresa;
+	}
+
+	public void setEmpresa(Empresa empresa) {
+		this.empresa = empresa;
+	}
+
+}

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

@@ -849,6 +849,14 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		
 		ptovtaAntifraudeList.setItemRenderer(new RenderPtovtaAntifraude());
 		ptovtaAntifraudeList.setData(puntoVenta.getPtovtaAntifraudes());
+		ptovtaAntifraudeList.addEventListener("onDoubleClick", new EventListener() {
+
+            @Override
+            public void onEvent(Event event) throws Exception {
+            	PtovtaAntifraude a = (PtovtaAntifraude) ptovtaAntifraudeList.getSelected();
+                verPtovtaAntifraude(a);
+            }
+        });
 	}
 
 	private void downloadLogIntegracao(Combobox cmb){
@@ -3506,6 +3514,17 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		}
 	}
 	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private void verPtovtaAntifraude(PtovtaAntifraude ptovtaAntifraude) {
+		Map args = new HashMap();
+		args.put("ptovtaComissao", ptovtaAntifraude);
+		args.put("puntoVenta", puntoVenta);
+		args.put("ptovtaAntifraudeList", ptovtaAntifraudeList);
+
+		openWindow("/gui/catalogos/editarPtovtaAntifraude.zul",
+				Labels.getLabel("editarPtovtaAntifraudeController.window.title"), args, MODAL);
+	}
+	
 	public void onClick$radIndvendsegtabelaNo(Event event) {
 		if (radIndvendsegtabelaNo.isChecked()) {
 			radIndestansegtabelaSi.setDisabled(true);

web/WEB-INF/i3-label_es_MX.label

@@ -279,7 +279,7 @@ indexController.mniRelatorioGratuidadeIdosoDeficiente.label = Gratuidades Idoso/
 indexController.mniRelatorioVendasBilheteiro.label = Ventas por agente de pasajes
 indexController.mniRelatorioVendasBilheteiroSintetico.label = Ventas por agentes sintético
 indexController.mniRelatorioAgenciasNaoImportadas.label = Reporte puntos venta no importados
-indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Anti-Fraude
+indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Antifraude
 indexController.mniRelatorioCheckin.label = Checkin's
 indexController.mniFechamentoParamgeral.label = Cierre cuenta 
 indexController.mniFechamentoParamptovta.label = Cierre cuenta contábil punto de venta
@@ -7793,3 +7793,5 @@ relatorioGratuidadeARTESPController.lbDataIni.value = Fecha Inicio
 relatorioGratuidadeARTESPController.lbDataFin.value = Fecha Final
 relatorioGratuidadeARTESPController.lbOrgao.value = Instituición concedente
 editarEmpresaController.usarAliasMapaViagemVenda.ajuda = En la pantalla de Venta o botón de Tarjeta de Viagem deve usar Alias para as Ubicaciones.
+
+editarPtovtaAntifraudeController.window.title=Editar Chave Antifraude

web/WEB-INF/i3-label_pt_BR.label

@@ -288,7 +288,7 @@ indexController.mniRelatorioVendasBilheteiro.label = Vendas por Bilheteiro
 indexController.mniRelatorioVendasBilheteiroSintetico.label = Vendas por Bilheteiro Sintético
 indexController.mniRelatorioCancelamentoAutomaticoECF.label = Relatório de Cancelamento Automatico ECF
 indexController.mniRelatorioAgenciasNaoImportadas.label = Relatório de Agências não Importadas
-indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Anti-Fraude
+indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Antifraude
 indexController.mniRelatorioCheckin.label = Checkin's
 indexController.mniFechamentoParamgeral.label = Configuração de Boleto
 indexController.mniFechamentoParamptovta.label = Fechamento Conta Corrente Agência
@@ -8261,4 +8261,6 @@ relatorioGratuidadeARTESPController.lbPrefixo.value = Prefixo
 relatorioGratuidadeARTESPController.lvVenda = Venda
 relatorioGratuidadeARTESPController.lbOrgao.value = Orgão Concedente
 editarEmpresaController.usarAliasMapaViagemVenda.ajuda = Na tela de Venda o botão de Mapa de Viagem deve usar Alias para as Localidades.
-editarClienteController.MSG.validacaoCPFInvalido = CPF inválido
+editarClienteController.MSG.validacaoCPFInvalido = CPF inválido
+
+editarPtovtaAntifraudeController.window.title=Editar Chave Antifraude

web/gui/catalogos/editarPtovtaAntifraude.zul

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?page contentType="text/html;charset=UTF-8"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winEditarPtovtaAntifraude"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+
+<zk xmlns="http://www.zkoss.org/2005/zul">
+	<window id="winEditarPtovtaAntifraude" border="normal"
+		apply="${editarPtovtaAntifraudeController}" height="105px"
+		width="575px" contentStyle="overflow:auto"
+		xmlns:h="http://www.w3.org/1999/xhtml"
+		title="${c:l('editarPtovtaAntifraudeController.window.title')}">
+
+		<toolbar>
+			<hbox spacing="5px" style="padding:1px" align="right">
+				<button id="btnSalvarPtovtaAntifraude" height="20"
+					image="/gui/img/save.png" width="35px"
+					tooltiptext="${c:l('tooltiptext.btnGuardar')}" />
+				<button id="btnFecharPtovtaAntifraudeController" height="20"
+					image="/gui/img/exit.png" width="35px"
+					onClick="winEditarPtovtaAntifraude.detach()"
+					tooltiptext="${c:l('tooltiptext.btnFechar')}" />
+			</hbox>
+		</toolbar>
+		<grid fixedLayout="true">
+			<columns>
+				<column width="10%" />
+				<column width="30%" />
+				<column width="15%" />
+				<column width="45%" />
+			</columns>
+			<rows>
+				<row>
+					<label
+						value="${c:l('editarPuntoVentaController.lbEmpresa.value')}" />
+					<combobox id="cmbEmpresaPtoVtaAntifraude"
+							  use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+							  mold="rounded"
+							  buttonVisible="true"
+							  width="95%"
+							  model="@{winEditarPtovtaAntifraude$composer.lsEmpresas}"
+							  selectedItem="@{winEditarPtovtaAntifraude$composer.empresa}"/>
+						
+					<label
+						value="${c:l('editarEmpresaController.antiFraude.chave.label')}" />
+					<textbox id="txtChaveAntifraude"
+							 maxlength="50"
+							 width="98%"
+							 use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />									
+				</row>
+			</rows>
+		</grid>				
+						
+	</window>
+</zk>