bug#AL-1518

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

@@ -80,6 +80,9 @@ public class RelatorioEstornoCartao extends Relatorio {
 					dataResult.put("formaPago", rset.getString("formaPago"));
 					dataResult.put("nombempresa", rset.getString("nombempresa"));
 					dataResult.put("descmotivo", rset.getString("descmotivo"));
+					dataResult.put("adquirente", rset.getString("adquirente"));
+					dataResult.put("estabelecimento", rset.getString("estabelecimento"));
+					
 
 					this.dados.add(dataResult);
 				}
@@ -118,6 +121,8 @@ public class RelatorioEstornoCartao extends Relatorio {
 		sql.append("   pvBoleto.NUMPUNTOVENTA agenciaVenda,                    ");
 		sql.append("   fp.descpago formaPago,                                  ");
 		sql.append("   e.nombempresa,                                          ");
+		sql.append("   DEC.adquirente,										   ");		
+		sql.append("   DEC.estabelecimento,                                    ");
 		
 		//SubSelect para evitar duplicacao dos registros por causa do join com a caja
 		sql.append(" COALESCE(( select  mc.descmotivo                          ");
@@ -133,6 +138,7 @@ public class RelatorioEstornoCartao extends Relatorio {
 		sql.append(" 		AND c.indreimpresion = 1                           ");
 		sql.append(" 		AND rownum = 1), 'CANCELAMENTO') as descmotivo     ");
 		
+		
 		sql.append(" FROM                                                      ");
 		sql.append("   DADOS_ESTORNO_CARTAO DEC                                ");
 		sql.append(" JOIN punto_venta pv                                       ");

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioEstornoCartao" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
-	<property name="ireport.x" value="7"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.columns" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.rows" value="true"/>
@@ -38,6 +38,12 @@
 	<field name="formaPago" class="java.lang.String"/>
 	<field name="nombempresa" class="java.lang.String"/>
 	<field name="descmotivo" class="java.lang.String"/>
+	<field name="adquirente" class="java.lang.String">
+		<fieldDescription><![CDATA[Adquirente]]></fieldDescription>
+	</field>
+	<field name="estabelecimento" class="java.lang.String">
+		<fieldDescription><![CDATA[Estabelecimento]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -161,112 +167,112 @@
 				<textFieldExpression><![CDATA[$R{data.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="801625b5-a4f7-4052-80cb-ced378ba6756" stretchType="RelativeToTallestObject" x="205" y="0" width="45" height="20"/>
+				<reportElement uuid="801625b5-a4f7-4052-80cb-ced378ba6756" stretchType="RelativeToTallestObject" x="194" y="0" width="30" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cpf.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="fdefd76d-7c9d-4674-ae4b-24e3bc6b1e8f" stretchType="RelativeToTallestObject" x="155" y="0" width="50" height="20"/>
+				<reportElement uuid="fdefd76d-7c9d-4674-ae4b-24e3bc6b1e8f" stretchType="RelativeToTallestObject" x="155" y="0" width="39" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cliente.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="26e5eeeb-ff3d-41ea-9978-2c04418120b2" stretchType="RelativeToTallestObject" x="250" y="0" width="40" height="20"/>
+				<reportElement uuid="26e5eeeb-ff3d-41ea-9978-2c04418120b2" stretchType="RelativeToTallestObject" x="224" y="0" width="40" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{email.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="bb82a4ef-15b6-4284-9160-9714da3579bb" stretchType="RelativeToTallestObject" x="290" y="0" width="35" height="20"/>
+				<reportElement uuid="bb82a4ef-15b6-4284-9160-9714da3579bb" stretchType="RelativeToTallestObject" x="264" y="0" width="28" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{telefone.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="b5679ed7-3404-4a11-ad22-d1460be15ba1" stretchType="RelativeToTallestObject" x="387" y="0" width="35" height="20"/>
+				<reportElement uuid="b5679ed7-3404-4a11-ad22-d1460be15ba1" stretchType="RelativeToTallestObject" x="354" y="0" width="35" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cartao.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="ee1b4575-d301-457c-bfc3-0c78550ac894" stretchType="RelativeToTallestObject" x="422" y="0" width="56" height="20"/>
+				<reportElement uuid="ee1b4575-d301-457c-bfc3-0c78550ac894" stretchType="RelativeToTallestObject" x="389" y="0" width="56" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{numeroCartao.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="58d1a7ea-be04-49b9-b7bb-913fafaf7a76" stretchType="RelativeToTallestObject" x="478" y="0" width="35" height="20"/>
+				<reportElement uuid="58d1a7ea-be04-49b9-b7bb-913fafaf7a76" stretchType="RelativeToTallestObject" x="445" y="0" width="35" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{nsu.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7eaf1a6c-5182-4b0e-aa4f-20af519c69f8" stretchType="RelativeToTallestObject" x="513" y="0" width="40" height="20"/>
+				<reportElement uuid="7eaf1a6c-5182-4b0e-aa4f-20af519c69f8" stretchType="RelativeToTallestObject" x="480" y="0" width="40" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{autorizacao.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="ac3fbe18-d2c6-4fc1-aa4c-b3c8c91b1174" stretchType="RelativeToTallestObject" x="553" y="0" width="42" height="20"/>
+				<reportElement uuid="ac3fbe18-d2c6-4fc1-aa4c-b3c8c91b1174" stretchType="RelativeToTallestObject" x="520" y="0" width="42" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{dataTransacao.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="da0677b0-a380-4686-ad53-61ddf129e143" stretchType="RelativeToTallestObject" x="595" y="0" width="30" height="20"/>
+				<reportElement uuid="da0677b0-a380-4686-ad53-61ddf129e143" stretchType="RelativeToTallestObject" x="562" y="0" width="30" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{valorEstorno.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="f1442d1b-8590-4deb-8bc5-96b2316462b7" stretchType="RelativeToTallestObject" x="626" y="0" width="23" height="20"/>
+				<reportElement uuid="f1442d1b-8590-4deb-8bc5-96b2316462b7" stretchType="RelativeToTallestObject" x="593" y="0" width="23" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{origem.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="c61f1d44-90da-401f-a832-b8c06682bde8" stretchType="RelativeToTallestObject" x="649" y="0" width="23" height="20"/>
+				<reportElement uuid="c61f1d44-90da-401f-a832-b8c06682bde8" stretchType="RelativeToTallestObject" x="616" y="0" width="23" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{destino.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="67b880a8-7be7-42d7-889a-78c9b2113a4c" stretchType="RelativeToTallestObject" x="672" y="0" width="23" height="20"/>
+				<reportElement uuid="67b880a8-7be7-42d7-889a-78c9b2113a4c" stretchType="RelativeToTallestObject" x="639" y="0" width="23" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{servico.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="07f1f00b-329c-4b23-bc9e-bf9064ccd147" stretchType="RelativeToTallestObject" x="695" y="0" width="42" height="20"/>
+				<reportElement uuid="07f1f00b-329c-4b23-bc9e-bf9064ccd147" stretchType="RelativeToTallestObject" x="662" y="0" width="42" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{dataServico.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="84ffd875-2c40-418f-916d-305d98a04dfc" stretchType="RelativeToTallestObject" x="737" y="0" width="35" height="20"/>
+				<reportElement uuid="84ffd875-2c40-418f-916d-305d98a04dfc" stretchType="RelativeToTallestObject" x="704" y="0" width="35" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{bilhete.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="53e910c5-7876-4cad-96c8-8bebeabcc0b6" stretchType="RelativeToTallestObject" x="772" y="0" width="30" height="20"/>
+				<reportElement uuid="53e910c5-7876-4cad-96c8-8bebeabcc0b6" stretchType="RelativeToTallestObject" x="739" y="0" width="30" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
@@ -280,14 +286,14 @@
 				<textFieldExpression><![CDATA[$R{empresa.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="4dbb8177-8d50-4b80-9a61-1991b940fd06" stretchType="RelativeToTallestObject" x="325" y="0" width="31" height="20"/>
+				<reportElement uuid="4dbb8177-8d50-4b80-9a61-1991b940fd06" stretchType="RelativeToTallestObject" x="292" y="0" width="31" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{formaPago.label}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="99bce7f3-8e93-41c0-ba75-ee5e1ad183e1" stretchType="RelativeToTallestObject" x="356" y="0" width="31" height="20"/>
+				<reportElement uuid="99bce7f3-8e93-41c0-ba75-ee5e1ad183e1" stretchType="RelativeToTallestObject" x="323" y="0" width="31" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
@@ -300,6 +306,20 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{motivoCancelamento.label}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="468fff71-1268-4136-9d45-c81f154addae" stretchType="RelativeToTallestObject" x="768" y="0" width="34" height="10"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="6" isPdfEmbedded="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{adquirente.label}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="5efb0333-63a8-44be-9eb0-786a3852c1be" stretchType="RelativeToTallestObject" x="768" y="10" width="34" height="10"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="6" isPdfEmbedded="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{estabelecimento.label}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
@@ -320,14 +340,14 @@
 				<textFieldExpression><![CDATA[$F{bilheteiro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="011f18ad-4c98-419f-a100-9a4ddb25e255" stretchType="RelativeToTallestObject" x="205" y="0" width="45" height="27"/>
+				<reportElement uuid="011f18ad-4c98-419f-a100-9a4ddb25e255" stretchType="RelativeToTallestObject" x="194" y="0" width="30" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cpf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="66bbaaa2-f05a-474e-b37a-32ef7e148226" stretchType="RelativeToTallestObject" x="250" y="0" width="40" height="27"/>
+				<reportElement uuid="66bbaaa2-f05a-474e-b37a-32ef7e148226" stretchType="RelativeToTallestObject" x="224" y="0" width="40" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 					<paragraph leftIndent="2"/>
@@ -335,98 +355,98 @@
 				<textFieldExpression><![CDATA[$F{email}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="aeba3ac4-bb56-4bd3-9c2f-497a3f11cd9c" stretchType="RelativeToTallestObject" x="290" y="0" width="35" height="27"/>
+				<reportElement uuid="aeba3ac4-bb56-4bd3-9c2f-497a3f11cd9c" stretchType="RelativeToTallestObject" x="264" y="0" width="28" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{telefone}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="1bbe289d-cf99-4ce3-99b6-bea9ea555dd2" stretchType="RelativeToTallestObject" x="387" y="0" width="35" height="27"/>
+				<reportElement uuid="1bbe289d-cf99-4ce3-99b6-bea9ea555dd2" stretchType="RelativeToTallestObject" x="354" y="0" width="35" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cartao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="419dc8fd-3ace-4305-bb9f-f8e5e73028db" stretchType="RelativeToTallestObject" x="422" y="0" width="56" height="27"/>
+				<reportElement uuid="419dc8fd-3ace-4305-bb9f-f8e5e73028db" stretchType="RelativeToTallestObject" x="389" y="0" width="56" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numeroCartao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="6e9ab248-fff5-48f5-9c4a-abdf192dac72" stretchType="RelativeToTallestObject" x="478" y="0" width="35" height="27"/>
+				<reportElement uuid="6e9ab248-fff5-48f5-9c4a-abdf192dac72" stretchType="RelativeToTallestObject" x="445" y="0" width="35" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nsu}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="a34f17c2-9306-4af1-835c-2e80b9acbb1e" stretchType="RelativeToTallestObject" x="513" y="0" width="40" height="27"/>
+				<reportElement uuid="a34f17c2-9306-4af1-835c-2e80b9acbb1e" stretchType="RelativeToTallestObject" x="480" y="0" width="40" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="838657a0-d5bf-4a28-aea4-b8b6f19fed96" stretchType="RelativeToTallestObject" x="553" y="0" width="42" height="27"/>
+				<reportElement uuid="838657a0-d5bf-4a28-aea4-b8b6f19fed96" stretchType="RelativeToTallestObject" x="520" y="0" width="42" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dataTransacao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="bacf4384-5350-446b-b0d5-7e013114e25d" stretchType="RelativeToTallestObject" x="595" y="0" width="30" height="27"/>
+				<reportElement uuid="bacf4384-5350-446b-b0d5-7e013114e25d" stretchType="RelativeToTallestObject" x="562" y="0" width="30" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorEstorno}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="20a5d436-c6ba-45cc-9fd5-03aaff8a98ba" stretchType="RelativeToTallestObject" x="626" y="0" width="23" height="27"/>
+				<reportElement uuid="20a5d436-c6ba-45cc-9fd5-03aaff8a98ba" stretchType="RelativeToTallestObject" x="593" y="0" width="23" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="4cd32cee-a081-4c86-970c-912891f1ba86" stretchType="RelativeToTallestObject" x="649" y="0" width="23" height="27"/>
+				<reportElement uuid="4cd32cee-a081-4c86-970c-912891f1ba86" stretchType="RelativeToTallestObject" x="616" y="0" width="23" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7bd19ec9-ea19-44e6-96c1-b8e1c191538d" stretchType="RelativeToTallestObject" x="672" y="0" width="23" height="27"/>
+				<reportElement uuid="7bd19ec9-ea19-44e6-96c1-b8e1c191538d" stretchType="RelativeToTallestObject" x="639" y="0" width="23" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="3035abfe-7fee-47f1-90d0-df1b33113e2d" stretchType="RelativeToTallestObject" x="695" y="0" width="42" height="27"/>
+				<reportElement uuid="3035abfe-7fee-47f1-90d0-df1b33113e2d" stretchType="RelativeToTallestObject" x="662" y="0" width="42" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dataServico}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="ca18697e-f3ef-4b34-a10d-9c92b281be56" stretchType="RelativeToTallestObject" x="737" y="0" width="35" height="27"/>
+				<reportElement uuid="ca18697e-f3ef-4b34-a10d-9c92b281be56" stretchType="RelativeToTallestObject" x="704" y="0" width="35" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="bd34bccf-8a59-452a-8030-425e4974acae" stretchType="RelativeToTallestObject" x="772" y="0" width="30" height="27"/>
+				<reportElement uuid="bd34bccf-8a59-452a-8030-425e4974acae" stretchType="RelativeToTallestObject" x="739" y="0" width="30" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorTransacao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="ba083af3-9665-4b37-89bb-2177fc2c235e" stretchType="RelativeToTallestObject" x="155" y="0" width="50" height="27"/>
+				<reportElement uuid="ba083af3-9665-4b37-89bb-2177fc2c235e" stretchType="RelativeToTallestObject" x="155" y="0" width="39" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 					<paragraph leftIndent="2"/>
@@ -449,14 +469,14 @@
 				<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="13be6e84-b384-4d18-81e7-3315e076a068" stretchType="RelativeToTallestObject" x="325" y="0" width="31" height="27"/>
+				<reportElement uuid="13be6e84-b384-4d18-81e7-3315e076a068" stretchType="RelativeToTallestObject" x="292" y="0" width="31" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{formaPago}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="13c48bbf-eb96-4334-916a-dfc7e08b51da" stretchType="RelativeToTallestObject" x="356" y="0" width="31" height="27"/>
+				<reportElement uuid="13c48bbf-eb96-4334-916a-dfc7e08b51da" stretchType="RelativeToTallestObject" x="323" y="0" width="31" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="6" isPdfEmbedded="true"/>
 				</textElement>
@@ -470,6 +490,20 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descmotivo}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="3c56f360-8ffd-451c-9287-b401874fa805" stretchType="RelativeToTallestObject" x="768" y="0" width="34" height="13"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="6" isPdfEmbedded="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{adquirente}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="aec06746-db94-40a9-8923-4a6b1fe8022c" stretchType="RelativeToTallestObject" x="768" y="13" width="34" height="13"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="6" isPdfEmbedded="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{estabelecimento}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>

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

@@ -528,6 +528,9 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 	private Tab tabHistorico;
 	private Paging pagingHistoricoFormaPago;
 	private Paging pagingFormaPago;
+	private Textbox txtLatitudeLongitude;
+	private Textbox txtLatitude;
+	private Textbox txtLongitude;
 	@Autowired
 	private transient PagedListWrapper<HistoricoFormaPagoPuntoVenta> plwHistoricoFormaPagoPuntoVenta;
 	@Autowired
@@ -1055,6 +1058,31 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		ptovtaExcecaoMultaCancList.setItemRenderer(new RenderPtovtaExcecaoMultaCanc());
 		ptovtaExcecaoMultaCancList.setData(puntoVenta.getPtovtaExcecaoMultaCancList() == null ? Collections.emptyList() : puntoVenta.getPtovtaExcecaoMultaCancList());
 		validaPerfilFuncionBloqueiaDesbloqueiaPontoVenda();
+		
+		txtLatitudeLongitude.addEventListener("onChanging", new EventListener() {
+
+			@Override
+			public void onEvent(Event event) throws Exception {
+				if (event instanceof InputEvent) {
+					InputEvent inputEvent = (InputEvent) event;
+					if (inputEvent.getValue() != null) {
+						List<String> coordinates = Arrays.asList(inputEvent.getValue().split("\\s*,\\s*"));
+						if (!coordinates.isEmpty() && coordinates.size() == 2) {
+							Float latitude = new BigDecimal(coordinates.get(0)).floatValue();
+							Float longitude = new BigDecimal(coordinates.get(1)).floatValue();
+							txtLatitude.setValue(String.valueOf(latitude));
+							txtLongitude.setValue(String.valueOf(longitude));
+							txtLatitudeLongitude.setValue(null);
+							txtLatitudeLongitude.setText(null);
+							puntoVenta.setLatitude(latitude);
+							puntoVenta.setLongitude(longitude);
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+
+		});
 	}
 
 	/**

src/java/com/rjconsultores/ventaboletos/web/utilerias/StringToFloatConverter.java

@@ -0,0 +1,28 @@
+package com.rjconsultores.ventaboletos.web.utilerias;
+
+import java.math.BigDecimal;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zkplus.databind.TypeConverter;
+
+public class StringToFloatConverter implements TypeConverter {
+
+	public Object coerceToUi(Object val, Component comp) {
+		if (val != null) {
+			return val;
+		}
+		return null;
+	}
+
+	public Object coerceToBean(Object val, Component cmpnt) {
+		if (val == null) {
+			return null;
+		}
+
+		if (val instanceof String) {
+
+			return (val.toString().trim().isEmpty()) ? null : new BigDecimal(val.toString()).floatValue();
+		}
+		return null;
+	}
+}

web/WEB-INF/i3-label_es_MX.label

@@ -8653,6 +8653,17 @@ editarEmpresaController.exibeComissaoZeradaAgencia.ajuda = Exibir no Relatório
 editarEmpresaController.permiteReativacaoPassagemBpeEstacaoNaoBpe.ajuda = Permite Reativação de Passagem BP-e em Estação Não BP-e, para ativação desse parâmetro a opção: "Emite BP-e na Venda de Bilhete com Impressão Posterior" deve estar marcada
 editarEmpresaController.realizaCalculoComissaoPeriodo.ajuda = Realiza o calculo da comissão por período
 
+editarEmpresaController.configuracaoCieloLink.label= CieloLink
+editarEmpresaController.lblCieloUrl.value=URL Cielo
+editarEmpresaController.lblSecret.value=Secret
+editarEmpresaController.lblMerchantId.value=Merchant ID
+editarEmpresaController.lblClientId.value=Cliente ID
+
+editarEmpresaController.configuracaoRede.label= eRede
+editarEmpresaController.lblProducao.value=Ambiente Produção?
+editarEmpresaController.lblToken.value=Token
+editarEmpresaController.lblFiliation.value=Filiation
+
 # Reporte Operacional Financeiro
 relatorioOperacionalFinanceiroController.window.title = Reporte Operacional Financiero
 relatorioOperacionalFinanceiroController.data.obrigatoria = Es necesario rellenar la fecha inicial y final

web/WEB-INF/i3-label_pt_BR.label

@@ -9444,6 +9444,17 @@ editarEmpresaController.habilitaAgrupamentoLocalidadesConexaoTooltip= Habilita a
 editarEmpresaController.limitaCategoriaPorCorrida= Limita tipos de passagem por corrida 
 editarEmpresaController.limitaCategoriaPorCorridaTooltip= Limita os tipos de passagem configurados por corrida
 
+editarEmpresaController.configuracaoCieloLink.label= CieloLink
+editarEmpresaController.lblCieloUrl.value=URL Cielo
+editarEmpresaController.lblSecret.value=Secret
+editarEmpresaController.lblMerchantId.value=Merchant ID
+editarEmpresaController.lblClientId.value=Cliente ID
+
+editarEmpresaController.configuracaoRede.label= eRede
+editarEmpresaController.lblProducao.value=Ambiente Produção?
+editarEmpresaController.lblToken.value=Token
+editarEmpresaController.lblFiliation.value=Filiation
+ 
 
 # Relatório Exportacao Operacional Financeiro
 relatorioOperacionalFinanceiroController.window.title = Relatório Operacional Financeiro

web/gui/catalogos/editarPuntoVenta.zul

@@ -567,21 +567,26 @@
 							<column width="70%" />
 						</columns>
 						<rows>
+						<row>
+							<!--Latitude/Longitude-->
+								<label
+									value="Latitude/Longitude (Google Maps Clipboard)" />
+									<textbox id="txtLatitudeLongitude"  width="70%"/>
+
+							</row>
 							<row>
 								<!--Latitude-->
 								<label
 									value="Latitude" />
-								<textbox  constraint="/^((\-?|\+?)?\d+(\.\d+)?),\s*((\-?|\+?)?\d+(\.\d+)?)$/: wrong longitude value"  id="txtLatitude"
-									maxlength="9"
-									value="@{winEditarPuntoVenta$composer.puntoVenta.latitude}" />
+									<textbox id="txtLatitude" width="30%"
+							value="@{winEditarPuntoVenta$composer.puntoVenta.latitude,converter=com.rjconsultores.ventaboletos.web.utilerias.StringToFloatConverter}" />
 							</row>
 							<row>
 								<!--Longitude-->
 								<label
 									value="Longitude" />								
-								<textbox constraint="/^((\-?|\+?)?\d+(\.\d+)?),\s*((\-?|\+?)?\d+(\.\d+)?)$/: wrong longitude value"  id="txtLongitude"
-									maxlength="9"
-									value="@{winEditarPuntoVenta$composer.puntoVenta.longitude}" />
+									<textbox id="txtLongitude" width="30%"
+							value="@{winEditarPuntoVenta$composer.puntoVenta.longitude,converter=com.rjconsultores.ventaboletos.web.utilerias.StringToFloatConverter}" />	
 							</row>
 						</rows>
 						</grid>