From 4fcf05a97f91f53dd2c93a439a065be421017224 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 11 Jun 2015 13:36:16 +0000
Subject: [PATCH] =?UTF-8?q?P5=20-=20Criar=20um=20relat=C3=B3rio=20de=20con?=
 =?UTF-8?q?fer=C3=AAncia=20de=20checkin=E2=80=99s=20por=20localidade=20de?=
 =?UTF-8?q?=20partida=20(fixes=20bug=20#6360)=20Tempo:=201=20hora?=
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@44899 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioCheckin.java     |  23 ++---
 .../RelatorioCheckin_es.properties            |  21 +++++
 .../RelatorioCheckin_pt_BR.properties         |  12 ++-
 .../templates/RelatorioCheckin.jasper         | Bin 26863 -> 27760 bytes
 .../templates/RelatorioCheckin.jrxml          |  85 +++++++++---------
 .../RelatorioCheckinController.java           |   9 +-
 web/WEB-INF/i3-label_es_MX.label              |   4 +
 web/WEB-INF/i3-label_pt_BR.label              |   4 +
 web/gui/relatorios/filtroRelatorioCheckin.zul |  15 +---
 9 files changed, 95 insertions(+), 78 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
index fe9c23833..373c98810 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
@@ -27,18 +27,14 @@ public class RelatorioCheckin extends Relatorio {
 		Integer corridaId = (Integer) getParametros().get("CORRIDA_ID");
 		Integer origenId = (Integer) getParametros().get("ORIGEN_ID");
 		String nomeBilheteiro = (String) getParametros().get("NOME_BILHETEIRO");
-		String numVoucher = (String) getParametros().get("NUM_VOUCHER");
 		Date fecInicio = (Date) getParametros().get("DATA_INICIAL");
 		Date fecFinal = (Date) getParametros().get("DATA_FINAL");
 
-		String sql = getSql(fecInicio, fecFinal, corridaId, origenId, nomeBilheteiro, numVoucher);
+		String sql = getSql(corridaId, origenId, nomeBilheteiro);
 
 		NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), sql);
-
-		if (fecInicio != null && fecFinal != null) {
-			stmt.setTimestamp("fecInicio", new java.sql.Timestamp(fecInicio.getTime()));
-			stmt.setTimestamp("fecFinal", new java.sql.Timestamp(fecFinal.getTime()));
-		}
+		stmt.setTimestamp("fecInicio", new java.sql.Timestamp(fecInicio.getTime()));
+		stmt.setTimestamp("fecFinal", new java.sql.Timestamp(fecFinal.getTime()));
 
 		if (corridaId != null) {
 			stmt.setInt("corridaId", corridaId);
@@ -52,10 +48,6 @@ public class RelatorioCheckin extends Relatorio {
 			stmt.setString("nomeBilheteiro", nomeBilheteiro);
 		}
 
-		if (StringUtils.isNotBlank(numVoucher)) {
-			stmt.setString("numVoucher", numVoucher);
-		}
-
 		List<Checkin> checkins = new ArrayList<Checkin>();
 
 		ResultSet rset = stmt.executeQuery();
@@ -82,21 +74,22 @@ public class RelatorioCheckin extends Relatorio {
 		this.setCollectionDataSource(new JRBeanCollectionDataSource(checkins));
 	}
 
-	private String getSql(Date fecInicio, Date fecFinal, Integer corridaId, Integer origenId, String nomeBilheteiro, String numVoucher) {
+	private String getSql(Integer corridaId, Integer origenId, String nomeBilheteiro) {
 
 		StringBuffer sql = new StringBuffer();
-		sql.append("select b.boleto_id, b.numoperacion, o.descparada, b.corrida_id, ");
+		sql.append("select b.boleto_id, o.descparada, b.corrida_id, ");
+		sql.append("case when b.numfoliosistema is not null  ");
+		sql.append("          then b.numfoliosistema else b.numoperacion end  numoperacion, ");
 		sql.append("b.feccorrida, bc.datavenda, bc.datacancelado, bc.dataremarcacao, u.nombusuario ");
 		sql.append("from boleto b ");
 		sql.append("inner join boleto_checkin bc on b.boleto_id = bc.boletooriginal_id ");
 		sql.append("inner join parada o on b.origen_id = o.parada_id ");
 		sql.append("inner join usuario u on b.usuario_id = u.usuario_id ");
 		sql.append(" where b.activo = 1  ");
-		sql.append(fecInicio == null && fecFinal == null ? "" : "and b.feccorrida between :fecInicio and  :fecFinal ");
+		sql.append("and b.feccorrida between :fecInicio and  :fecFinal ");
 		sql.append(corridaId == null ? "" : " and b.corrida_id = :corridaId ");
 		sql.append(origenId == null ? "" : " and b.origen_id = :origenId ");
 		sql.append(StringUtils.isBlank(nomeBilheteiro) ? "" : " and u.nombusuario like :nomeBilheteiro ");
-		sql.append(StringUtils.isBlank(numVoucher) ? "" : " and b.numoperacion = :numVoucher ");
 
 		return sql.toString();
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_es.properties
index e69de29bb..303d6a50e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_es.properties
@@ -0,0 +1,21 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
+#Labels datail
+datail.voucher=Nº Bilhete / Voucher
+datail.origen=Origem
+datail.servicio=Serviço
+datail.data.servicio=Data do Serviço
+datail.data.checkin=Data Checkin
+datail.bilheteiro=Bilheteiro
+datail.data.remarcada=Data Remarcada
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_pt_BR.properties
index 01f6ecc2b..303d6a50e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCheckin_pt_BR.properties
@@ -1,7 +1,6 @@
 #geral
 msg.noData=Não foi possivel obter dados com os parâmetros informados.
 
-
 #Labels cabeçalho
 cabecalho.relatorio=Relatório:
 cabecalho.periodo=Período:
@@ -10,4 +9,13 @@ cabecalho.dataHora=Data/Hora:
 cabecalho.impressorPor=Impressor por:
 cabecalho.pagina=Página
 cabecalho.de=de
-cabecalho.filtros=Filtros:
\ No newline at end of file
+cabecalho.filtros=Filtros:
+
+#Labels datail
+datail.voucher=Nº Bilhete / Voucher
+datail.origen=Origem
+datail.servicio=Serviço
+datail.data.servicio=Data do Serviço
+datail.data.checkin=Data Checkin
+datail.bilheteiro=Bilheteiro
+datail.data.remarcada=Data Remarcada
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper
index 6790b4f8ae30d59871487c9fe00a5b6245b6b88d..d845c6211536886f4346bfea1771690c8b80fde5 100644
GIT binary patch
literal 27760
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

literal 26863
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
CIW=qm

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml
index c91014aef..506dd40c6 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml
@@ -1,13 +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="RelatorioCheckin" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="48d32af4-ba9f-41c2-91a5-5d2fe57e149c">
 	<property name="ireport.zoom" value="1.4641000000000008"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="72"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL" class="java.util.Date"/>
 	<parameter name="CORRIDA_ID" class="java.lang.Long"/>
-	<parameter name="NUM_VOUCHER" class="java.lang.String"/>
 	<parameter name="ORIGEN" class="java.lang.String"/>
 	<parameter name="NOME_BILHETEIRO" class="java.lang.String"/>
 	<queryString>
@@ -26,7 +25,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="24" splitType="Stretch">
+		<band height="21" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
 				<reportElement mode="Transparent" x="0" y="0" width="338" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5ee43799-932b-4ce1-8056-df380a9050a8"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
@@ -45,55 +44,55 @@
 	</pageHeader>
 	<columnHeader>
 		<band height="33" splitType="Stretch">
-			<staticText>
-				<reportElement x="0" y="0" width="100" height="30" uuid="6329d59a-06da-4cb8-afe9-738da0b71867"/>
-				<textElement>
+			<textField>
+				<reportElement x="0" y="0" width="100" height="30" uuid="e4282770-fa67-4c58-a5aa-92e4d6f27166"/>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Nº Bilhete / Voucher]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="100" y="0" width="134" height="30" uuid="9530b934-ab02-49e5-b92d-77012c21301d"/>
-				<textElement>
+				<textFieldExpression><![CDATA[$R{datail.voucher}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="100" y="0" width="134" height="30" uuid="1e0b20c0-f208-4853-8601-73cec6e1992e"/>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Origem]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="234" y="0" width="49" height="30" uuid="31ded62d-1237-4ce0-89ff-392e262b28fd"/>
-				<textElement>
+				<textFieldExpression><![CDATA[$R{datail.origen}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="234" y="0" width="39" height="30" uuid="32e830a3-6303-465c-85aa-12678fe6b80a"/>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Serviço]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="283" y="0" width="55" height="30" isPrintWhenDetailOverflows="true" uuid="7182958d-23c2-491c-b78f-bff5448efbe8"/>
-				<textElement rotation="None">
+				<textFieldExpression><![CDATA[$R{datail.servicio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="273" y="0" width="55" height="30" isPrintWhenDetailOverflows="true" uuid="a5ac8565-1ca0-425b-9d25-97d26753e7ec"/>
+				<textElement rotation="None" markup="none">
 					<font isBold="true" isUnderline="false"/>
 				</textElement>
-				<text><![CDATA[Data do Serviço]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="338" y="0" width="48" height="30" isPrintWhenDetailOverflows="true" uuid="d62d3352-3972-49c3-8848-84b148f091cd"/>
-				<textElement>
+				<textFieldExpression><![CDATA[$R{datail.data.servicio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="328" y="0" width="48" height="30" isPrintWhenDetailOverflows="true" uuid="d937b8b4-5e49-4d0d-a211-42e3d3fb45ba"/>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Data Checkin]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="386" y="0" width="115" height="30" uuid="54769773-b33c-4f10-b4f0-33e38df2326a"/>
-				<textElement>
+				<textFieldExpression><![CDATA[$R{datail.data.checkin}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="376" y="0" width="115" height="30" uuid="44e42972-eac1-40e6-ba0e-7c83b208d41b"/>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Bilheteiro]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="501" y="0" width="54" height="30" isPrintWhenDetailOverflows="true" uuid="b4ca6634-4f46-4452-8a0a-fd5c2736e0ec"/>
-				<textElement>
+				<textFieldExpression><![CDATA[$R{datail.bilheteiro}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="491" y="0" width="64" height="30" isPrintWhenDetailOverflows="true" uuid="29e15a6a-68ff-4f19-832f-ce0d7a7310ae"/>
+				<textElement markup="none">
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[Data Remarcada]]></text>
-			</staticText>
+				<textFieldExpression><![CDATA[$R{datail.data.remarcada}]]></textFieldExpression>
+			</textField>
 			<line>
 				<reportElement x="0" y="30" width="555" height="1" uuid="acc2f86e-4ee2-4e61-807f-27fd740db652"/>
 			</line>
@@ -116,35 +115,35 @@
 				<textFieldExpression><![CDATA[$F{origen}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="234" y="0" width="49" height="20" uuid="d4baaf3d-a171-4b29-8aa8-cef5b56a11b3"/>
+				<reportElement x="234" y="0" width="39" height="20" uuid="d4baaf3d-a171-4b29-8aa8-cef5b56a11b3"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="283" y="0" width="55" height="20" uuid="acbbd64d-1fbd-4b4f-b7d5-5a11005ae98e"/>
+				<reportElement x="273" y="0" width="55" height="20" uuid="acbbd64d-1fbd-4b4f-b7d5-5a11005ae98e"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{feccorrida}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="338" y="0" width="48" height="20" uuid="1ce5d236-a684-450f-8e63-1523f0c7e103"/>
+				<reportElement x="328" y="0" width="48" height="20" uuid="1ce5d236-a684-450f-8e63-1523f0c7e103"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="386" y="0" width="115" height="20" uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c"/>
+				<reportElement x="376" y="0" width="115" height="20" uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombUsuario}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="501" y="0" width="54" height="20" uuid="648d03b0-ee8a-4b2f-af9f-c33c4d01f40e"/>
+				<reportElement x="491" y="0" width="64" height="20" uuid="648d03b0-ee8a-4b2f-af9f-c33c4d01f40e"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java
index 3d0415af3..fda65eb79 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java
@@ -5,7 +5,6 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -22,7 +21,6 @@ import org.zkoss.zul.Textbox;
 import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioCheckin;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
-import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@@ -37,7 +35,6 @@ public class RelatorioCheckinController extends MyGenericForwardComposer {
 	private Datebox datFinal;
 	private Intbox txtCorridaId;
 	private Textbox txtBilheteiro;
-	private Textbox txtVoucher;
 
 	private MyComboboxParada cmbParadaOrigem;
 	private MyComboboxParadaCve cmbParadaOrigemCve;
@@ -68,10 +65,9 @@ public class RelatorioCheckinController extends MyGenericForwardComposer {
 		String origen = cmbParadaOrigemCve.getSelectedItem() == null ? null
 				: ((Parada) cmbParadaOrigemCve.getSelectedItem().getValue()).getDescparada();
 
-		if (origenId == null && txtCorridaId.getValue() == null && StringUtils.isBlank(txtBilheteiro.getValue())
-				&& datInicial.getValue() == null && datFinal.getValue() == null && StringUtils.isBlank(txtVoucher.getValue())) {
+		if (datInicial.getValue() == null && datFinal.getValue() == null) {
 
-			Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),
+			Messagebox.show(Labels.getLabel("relatorioCheckinController.MSG.erroPeriodo"),
 					Labels.getLabel("indexController.mniRelatorioCheckin.label"),
 					Messagebox.OK, Messagebox.INFORMATION);
 			return;
@@ -82,7 +78,6 @@ public class RelatorioCheckinController extends MyGenericForwardComposer {
 		parametros.put("NOME_BILHETEIRO", txtBilheteiro.getValue());
 		parametros.put("DATA_INICIAL", datInicial.getValue());
 		parametros.put("DATA_FINAL", datFinal.getValue());
-		parametros.put("NUM_VOUCHER", txtVoucher.getValue());
 		parametros.put("ORIGEN_ID", origenId);
 		parametros.put("ORIGEN", origen);
 		parametros.put("NOME_RELATORIO", Labels.getLabel("indexController.mniRelatorioCheckin.label"));
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 5049acb1f..6c0d9a6fe 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -4953,6 +4953,10 @@ relatorioOrigemDestinoController.chkBilhetesGratuitos.value = Considerar pasajes
 relatorioOrigemDestinoController.chkTrechoSemMovimento.value = Exibir tramos sin movimiento
 relatorioOrigemDestinoController.MSG.trechoSemMovimento = Para exibir tramos sin movimiento es necesário seleccionar cuales son las corridas deseadas
 
+# Relatorio Checkin
+relatorioCheckinController.lbBilheteiro.label = Bilheteiro
+relatorioCheckinController.MSG.erroPeriodo = Los campos Fecha de inicio y Fecha de finalización deben ser completado 
+
 # Editar Conexion
 #busquedaConexionController.btnNovo.tooltiptext = Nuevo
 #busquedaConexionController.btnPesquisa.label = Búsqueda
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index f9d7fa5d1..7f803afaa 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -5021,6 +5021,10 @@ relatorioOrigemDestinoController.chkBilhetesGratuitos.value = Considerar bilhete
 relatorioOrigemDestinoController.chkTrechoSemMovimento.value = Exibir trechos sem movimento
 relatorioOrigemDestinoController.MSG.trechoSemMovimento = Para exibir trechos sem movimento é necessário selecionar quais são os serviços desejados.
 
+# Relatorio Checkin
+relatorioCheckinController.lbBilheteiro.label = Bilheteiro
+relatorioCheckinController.MSG.erroPeriodo = Os campos Data Inicial e Data Final devem ser preenchidos
+
 # Editar Conexion
 #busquedaConexionController.btnNovo.tooltiptext = Novo
 #busquedaConexionController.btnPesquisa.label = Pesquisa
diff --git a/web/gui/relatorios/filtroRelatorioCheckin.zul b/web/gui/relatorios/filtroRelatorioCheckin.zul
index e17ea7134..0ca57afcf 100644
--- a/web/gui/relatorios/filtroRelatorioCheckin.zul
+++ b/web/gui/relatorios/filtroRelatorioCheckin.zul
@@ -54,22 +54,15 @@
 						value="${c:l('relatorioOrigemDestinoController.lbServico.value')}" />
 					<intbox width="99%" id="txtCorridaId" />
 				</row>
-
-
+				
 				<row>
-					<label id="lbBilheteiro" value="Bilheteiro" />
+					<label id="lbBilheteiro"
+						value="${c:l('relatorioCheckinController.lbBilheteiro.label')}" />
 					<textbox id="txtBilheteiro" width="99%"
 						maxlength="50"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
 				</row>
-
-
-				<row>
-					<label id="lbVoucher" value="Numero Voucher" />
-					<textbox id="txtVoucher" width="99%" maxlength="50"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
-				</row>
-
+				
 			</rows>
 		</grid>
 		<toolbar>