From d58760b43332ab4ae3bc6e595ee3b62cf54ef7de Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 28 Jun 2016 14:35:26 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7323=20-=20corre=C3=A7=C3=B5es?=
 =?UTF-8?q?=20relat=C3=B3rio=20de=20gratuidade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57383 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioGratuidade.java  |   4 +-
 .../RelatorioGratuidade_es.properties         |   3 +-
 .../RelatorioGratuidade_pt_BR.properties      |   3 +-
 .../templates/RelatorioGratuidade.jasper      | Bin 43796 -> 44869 bytes
 .../templates/RelatorioGratuidade.jrxml       | 113 ++++++++++--------
 .../utilitarios/RelatorioGratuidadeBean.java  |   8 ++
 6 files changed, 80 insertions(+), 51 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
index 47098aebc..220510eff 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
@@ -89,6 +89,7 @@ public class RelatorioGratuidade extends Relatorio {
 					gratuidadeBean.setPreciooriginal(rset.getBigDecimal("preciooriginal"));
 					gratuidadeBean.setPreciopagado(rset.getBigDecimal("preciopagado"));
 					gratuidadeBean.setNombempresa(rset.getString("nombempresa"));
+					gratuidadeBean.setCvecategoria(rset.getString("cvecategoria"));
 					lsDadosRelatorio.add(gratuidadeBean);
 				}
 				
@@ -113,7 +114,7 @@ public class RelatorioGratuidade extends Relatorio {
 		sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, ");
 		sql.append("b.numkmviaje, r.descruta, b.corrida_id, b.fechorviaje, ");
 		sql.append("tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, ");
-		sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa ");
+		sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa, cat.cvecategoria ");
 		sql.append("FROM boleto b ");
 		sql.append("JOIN categoria c ON b.categoria_id = c.categoria_id ");
 		sql.append("JOIN parada ori ON ori.parada_id = b.origen_id ");
@@ -130,6 +131,7 @@ public class RelatorioGratuidade extends Relatorio {
 		sql.append("    AND tar.origen_id = b.origen_id ");
 		sql.append("    AND tar.destino_id = b.destino_id) ");
 		sql.append("JOIN empresa e ON e.empresa_id = b.empresacorrida_id ");
+		sql.append("JOIN categoria cat ON cat.categoria_id = b.categoria_id ");
 		sql.append("WHERE ");
 		sql.append(" b.feccorrida BETWEEN :fecInicio AND :fecFinal ");
 		sql.append("AND b.motivocancelacion_id IS NULL ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
index f575e99c0..900c89969 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
@@ -21,7 +21,8 @@ detail.km=Km
 detail.linha=Linha
 detail.servicio=Serviço
 detail.hora=Hora
-detail.tipobilhete=Tipo Bilhete
+detail.tipobilhete=Tipo Venda
+detail.tipopassagem=Tipo Passagem
 detail.pasajero=Passageiro
 detail.documento=Doc
 detail.precio=Preço
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
index 73a359db9..edb0e7d61 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
@@ -21,7 +21,8 @@ detail.km=Km
 detail.linha=Linha
 detail.servicio=Serviço
 detail.hora=Hora
-detail.tipobilhete=Tipo Bilhete
+detail.tipobilhete=Tipo Venda
+detail.tipopassagem=Tipo Passagem
 detail.pasajero=Passageiro
 detail.documento=Doc
 detail.precio=Preço
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper
index 713b4d3d84beeee4ded75a9ec76f67bef6101ffa..68a726a5ebe566c336ba815fd3e9f026e3198c95 100644
GIT binary patch
literal 44869
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
bPqMktwd(g;A#9*4CH$pO?rPDh^6~!zBl+je

literal 43796
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
L_0*`9#N+=BwdaX(

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
index 30f0bb7f5..471f4f0e7 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
@@ -1,8 +1,8 @@
 <?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="RelatorioEmpresaCorrida" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="1.650000000000001"/>
-	<property name="ireport.x" value="368"/>
-	<property name="ireport.y" value="14"/>
+	<property name="ireport.zoom" value="2.196150000000002"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<parameter name="fecInicio" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
@@ -31,6 +31,7 @@
 	<field name="cveusuario" class="java.lang.String"/>
 	<field name="nombpuntoventa" class="java.lang.String"/>
 	<field name="nombempresa" class="java.lang.String"/>
+	<field name="cvecategoria" class="java.lang.String"/>
 	<variable name="qtde" class="java.lang.Integer" calculation="Count">
 		<variableExpression><![CDATA[$F{km}]]></variableExpression>
 	</variable>
@@ -43,9 +44,9 @@
 	<group name="empresa">
 		<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
 		<groupHeader>
-			<band height="67">
+			<band height="68">
 				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement uuid="d15af518-c902-4903-bf8a-d4cf3ff6c05e" x="50" y="10" width="144" height="16"/>
+					<reportElement uuid="d15af518-c902-4903-bf8a-d4cf3ff6c05e" x="121" y="10" width="144" height="16"/>
 					<textElement textAlignment="Left">
 						<font size="10"/>
 					</textElement>
@@ -72,68 +73,77 @@
 					<textFieldExpression><![CDATA[$R{detail.km}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="164" y="51" width="142" height="16"/>
+					<reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="164" y="51" width="114" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="306" y="51" width="44" height="16"/>
+					<reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="278" y="51" width="44" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="350" y="51" width="42" height="16"/>
+					<reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="322" y="51" width="42" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="392" y="51" width="44" height="16"/>
-					<textElement/>
+					<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="364" y="40" width="44" height="27"/>
+					<textElement>
+						<font size="9"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="436" y="51" width="72" height="16"/>
+					<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="452" y="51" width="66" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="508" y="51" width="46" height="16"/>
+					<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="518" y="51" width="44" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="554" y="51" width="41" height="16"/>
+					<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="562" y="51" width="41" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="595" y="51" width="48" height="16"/>
+					<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="603" y="51" width="46" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="643" y="51" width="53" height="16"/>
-					<textElement/>
+					<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="649" y="51" width="51" height="16"/>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$R{detail.tarifadesconto}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="696" y="51" width="54" height="16"/>
+					<reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="701" y="51" width="51" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e727feec-a329-4f8c-af2a-c89c3c2e9606" x="750" y="51" width="72" height="16"/>
+					<reportElement uuid="e727feec-a329-4f8c-af2a-c89c3c2e9606" x="752" y="51" width="70" height="16"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="1" y="66" width="821" height="1"/>
+					<reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="1" y="67" width="821" height="1"/>
 				</line>
 				<textField>
-					<reportElement uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0" x="1" y="10" width="48" height="20"/>
+					<reportElement uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0" x="1" y="10" width="120" height="20"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
 				</textField>
+				<textField>
+					<reportElement uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173" x="408" y="40" width="44" height="27"/>
+					<textElement>
+						<font size="9"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{detail.tipopassagem}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupHeader>
 	</group>
@@ -158,7 +168,7 @@
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="732" y="20" width="42" height="20"/>
+				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="734" y="20" width="37" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
 			</textField>
@@ -178,7 +188,7 @@
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="774" y="20" width="24" height="20"/>
+				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="771" y="20" width="27" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
@@ -188,112 +198,119 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="17" splitType="Stretch">
+		<band height="16" splitType="Prevent">
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToBandHeight" x="143" y="1" width="21" height="16"/>
+				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToBandHeight" x="143" y="0" width="21" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{km}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToBandHeight" x="306" y="0" width="44" height="16"/>
+				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToBandHeight" x="278" y="0" width="44" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="HH:mm:ss" isBlankWhenNull="true">
-				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToBandHeight" x="350" y="0" width="42" height="16"/>
+				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToBandHeight" x="322" y="0" width="42" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{fechorviaje}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToBandHeight" x="164" y="1" width="142" height="16"/>
+				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToBandHeight" x="164" y="0" width="114" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToBandHeight" x="0" y="1" width="49" height="16"/>
+				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToBandHeight" x="0" y="0" width="49" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{feccorrida}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c" stretchType="RelativeToBandHeight" x="392" y="0" width="44" height="16"/>
-				<textElement textAlignment="Left">
+				<reportElement uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c" stretchType="RelativeToBandHeight" x="364" y="0" width="44" height="16"/>
+				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{desctipoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="436" y="0" width="72" height="16"/>
+				<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="452" y="0" width="66" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpasajero}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="508" y="0" width="46" height="16"/>
+				<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="518" y="0" width="44" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descnumdoc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed" stretchType="RelativeToBandHeight" x="554" y="0" width="41" height="16"/>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{preciooriginal}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60" stretchType="RelativeToBandHeight" x="595" y="0" width="48" height="16"/>
+				<reportElement uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60" stretchType="RelativeToBandHeight" x="603" y="0" width="46" height="16"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{porccategoria}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="f0161d55-b853-4318-8028-8aec04c0487d" stretchType="RelativeToBandHeight" x="643" y="0" width="43" height="16"/>
+				<reportElement uuid="f0161d55-b853-4318-8028-8aec04c0487d" stretchType="RelativeToBandHeight" x="649" y="0" width="51" height="16"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciopagado}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="1f3bab43-ae23-41b1-b5a6-a6c4c09fd359" stretchType="RelativeToBandHeight" x="696" y="0" width="54" height="16"/>
+				<reportElement uuid="1f3bab43-ae23-41b1-b5a6-a6c4c09fd359" stretchType="RelativeToBandHeight" x="701" y="0" width="51" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cveusuario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="24dcce32-309b-48f9-8543-1e1bffdef942" isPrintRepeatedValues="false" x="750" y="0" width="72" height="16"/>
+				<reportElement uuid="24dcce32-309b-48f9-8543-1e1bffdef942" isPrintRepeatedValues="false" x="752" y="0" width="70" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToBandHeight" x="99" y="1" width="44" height="16"/>
+				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToBandHeight" x="99" y="0" width="44" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToBandHeight" x="49" y="1" width="50" height="16"/>
+				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToBandHeight" x="49" y="0" width="50" height="16"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origen}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
+				<reportElement uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed" stretchType="RelativeToBandHeight" x="562" y="0" width="41" height="16"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{preciooriginal}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2" stretchType="RelativeToBandHeight" x="408" y="0" width="44" height="16"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cvecategoria}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
@@ -309,19 +326,19 @@
 				<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="c3632bd6-baee-4919-880b-1e0f94fe44c0" x="510" y="24" width="65" height="16"/>
+				<reportElement uuid="c3632bd6-baee-4919-880b-1e0f94fe44c0" x="530" y="24" width="73" height="16"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="5bb15b93-745c-48fd-8803-3047a49c358c" x="601" y="24" width="65" height="16"/>
+				<reportElement uuid="5bb15b93-745c-48fd-8803-3047a49c358c" x="635" y="24" width="65" height="16"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression>
 			</textField>
 		</band>
 	</summary>
 	<noData>
-		<band height="20">
+		<band height="22">
 			<textField>
 				<reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="803" height="20"/>
 				<textElement/>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
index 12bda27dc..501652b0c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
@@ -20,6 +20,7 @@ public class RelatorioGratuidadeBean {
 	private String cveusuario;
 	private String nombpuntoventa;
 	private String nombempresa;
+	private String cvecategoria;
 	
 	public Date getFeccorrida() {
 		return feccorrida;
@@ -116,5 +117,12 @@ public class RelatorioGratuidadeBean {
 	}
 	public void setNombempresa(String nombempresa) {
 		this.nombempresa = nombempresa;
+	}
+	public String getCvecategoria() {
+		return cvecategoria;
+	}
+	public void setCvecategoria(String cvecategoria) {
+		this.cvecategoria = cvecategoria;
 	}	
+	
 }