From dee05cc57d141881fabdfff658a26ea695a0e12b Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 21 Dec 2017 16:57:37 +0000
Subject: [PATCH] fixes bug #10268

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77518 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...torioRemarcacaoPassagensTransferencia.java |   9 +--
 .../RelatorioSegundaVia_pt_BR.properties      |  13 +++
 ...rioRemarcacaoPassagensTransferencia.jasper | Bin 98011 -> 97065 bytes
 ...orioRemarcacaoPassagensTransferencia.jrxml |  74 +++++++-----------
 ...cacaoPassagensTransferenciaController.java |   7 +-
 ...atorioRemarcacaoPassagensTransferencia.zul |   1 -
 6 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java
index 13eba389e..e36e12ce2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoPassagensTransferencia.java
@@ -131,8 +131,9 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio {
 
 		StringBuilder sql = new StringBuilder();
 		
-		sql.append("SELECT tir.DESCTIPO TIPO_DOCUMENTO_REMARCADO,tio.DESCTIPO TIPO_DOCUMENTO_VENDA, r2.CCF CCF_REMARCADO, r2r.CCF CCF_VENDA, E.NOMBEMPRESA EMPRESA_REMARCADO,EV.NOMBEMPRESA EMPRESA_VENDA, ");
-		sql.append("       tp.DESCTIPOVENTA TIPO_VENDA, cao.DESCCATEGORIA TIPO_PASSAGEM_VENDA, car.DESCCATEGORIA TIPO_PASSAGEM_REMARCADO, ");
+		sql.append("SELECT original.DESCTIPODOC TIPO_DOCUMENTO_REMARCADO,remarcado.DESCTIPODOC TIPO_DOCUMENTO_VENDA, r2.CCF CCF_REMARCADO, r2r.CCF CCF_VENDA, E.NOMBEMPRESA EMPRESA_REMARCADO,EV.NOMBEMPRESA EMPRESA_VENDA, ");
+		sql.append("       case when tp.tipoventa_id = 73 then 'VENDA EXTRAVIADA' WHEN tp.tipoventa_id in(5,12,18,41,49)  then 'PTA' WHEN tp.tipoventa_id = 82  then 'CONFIRM.EM ABERT' ELSE tp.DESCTIPOVENTA END TIPO_VENDA, " );
+		sql.append("       cao.DESCCATEGORIA TIPO_PASSAGEM_VENDA, car.DESCCATEGORIA TIPO_PASSAGEM_REMARCADO, ");
 		sql.append("       cao.CVECATEGORIA SIGLA_TIPO_PASSAGEM_VENDA, ");
 		sql.append("       car.CVECATEGORIA SIGLA_TIPO_PASSAGEM_REMARCADO, ");
 		sql.append("       rr.DESCRUTA LINHA_REMARCADO, ");
@@ -205,14 +206,12 @@ public class RelatorioRemarcacaoPassagensTransferencia extends Relatorio {
 		sql.append("LEFT JOIN FISCAL_R2 r2 ON (r4.NUMSERIE20 = r2.NUMSERIE20 and r4.DATAMOV = r2.DATAMOV)  ");
 		sql.append("LEFT JOIN FISCAL_R4 r4r ON r4r.BOLETO_ID = original.BOLETO_ID  ");
 		sql.append("LEFT JOIN FISCAL_R2 r2r ON (r4r.NUMSERIE20 = r2r.NUMSERIE20 and r4r.DATAMOV = r2r.DATAMOV)  ");
-		sql.append("LEFT JOIN TIPO_IDENTIFICACION tir ON (tir.TIPOIDENTIFICACION_ID = remarcado.TIPOIDENTIFICACION_ID)  ");
-		sql.append("LEFT JOIN TIPO_IDENTIFICACION tio ON (tio.TIPOIDENTIFICACION_ID = original.TIPOIDENTIFICACION_ID)  ");
 		sql.append("inner JOIN USUARIO UR ON remarcado.USUARIO_ID = UR.USUARIO_ID ");
 		sql.append("inner JOIN TIPO_VENTA tp ON original.TIPOVENTA_ID = tp.TIPOVENTA_ID ");
 		sql.append("inner JOIN CATEGORIA cao ON original.CATEGORIA_ID = cao.CATEGORIA_ID ");
 		sql.append("inner JOIN CATEGORIA car ON remarcado.CATEGORIA_ID = car.CATEGORIA_ID ");
 		sql.append("WHERE remarcado.TIPOVENTA_ID IN (81) ");
-		sql.append("AND to_date(original.FECHORVENTA,'DD/MM/YY') BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
+		sql.append("AND to_date(remarcado.FECHORVENTA,'DD/MM/YY') BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
 		sql.append(empresaId == null ||  empresaId.equals("-1") ? "" : "  AND original.EMPRESACORRIDA_ID= " + empresaId + " ");
 		sql.append(puntoVentasId == null || puntoVentasId.equals("-1") ? "" : "   AND original.PUNTOVENTA_ID in(" + puntoVentasId + ") ");
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties
index 989002da4..f4ac401f1 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioSegundaVia_pt_BR.properties
@@ -7,6 +7,8 @@ label.servico=Servi
 label.dataViagem=Data Viagem
 label.origem=Origem
 label.destino=Destino
+label.codOrigem=Cod.Origem
+label.codDestino=Cod.Destino
 label.poltrona=Poltrona
 label.dataVenda=Data Venda
 label.bilheteiro=Bilheteiro
@@ -19,4 +21,15 @@ label.pedagio=Ped
 label.coo=Coo
 label.preImpresso=Pre Imp.
 label.serieImpFiscal=Série
+label.nomeEmpresa=Empresa
+label.nomeAgencia=Agência
+label.dataServico=Data Serviço
+label.horaServico=Hora Serviço
+label.horaTransacao=Hora Trans.
+label.linha=Linha
+label.ccf=ccf
+label.ecf=ecf
+label.siglaTipoPassagem=Sigl.Tip.Pass
+label.tipoPassagem=Tp.Pass
+label.valorTotal=Vlr.Tot
 msg.noData=Não foi possivel obter dados com os parâmetros informados.
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jasper
index 967bc914cf023d0d1fc7fe10ef94f31c91b8028a..e543829de2e564968dbef02f31d09cfac8e9d7d9 100644
GIT binary patch
delta 22464
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
O>ajom_wIiVRQNwwwTx8&

delta 23164
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
M3@m@eaiGM10jBB6K>z>%

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jrxml
index c8e440dbe..52b43904d 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoPassagensTransferencia.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="Relatorio Remarcação Passagens Transferência" pageWidth="2500" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="2500" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" uuid="6d46a2d2-555e-4b7f-944f-b25c672e5feb">
-	<property name="ireport.zoom" value="2.662000000000066"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="211"/>
+	<property name="ireport.zoom" value="3.5431220000000914"/>
+	<property name="ireport.x" value="6042"/>
+	<property name="ireport.y" value="404"/>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL" class="java.util.Date"/>
 	<parameter name="codconvenio" class="java.lang.String"/>
@@ -486,7 +486,7 @@
 				<textFieldExpression><![CDATA[$R{label.horaServico}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="1728" y="93" width="73" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="16d80320-b83d-4005-8e0c-e756430b9e00"/>
+				<reportElement mode="Transparent" x="1753" y="93" width="48" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="16d80320-b83d-4005-8e0c-e756430b9e00"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -494,7 +494,7 @@
 				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="1801" y="93" width="73" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="030ca332-b36e-4e75-b0d8-2db9dab52f51"/>
+				<reportElement mode="Transparent" x="1826" y="93" width="48" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="030ca332-b36e-4e75-b0d8-2db9dab52f51"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -637,22 +637,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.tpp}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="2454" y="93" width="22" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="f6dc2969-9537-40cb-9373-a2488fabe423"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.valorMulta}]]></textFieldExpression>
-			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="2476" y="93" width="24" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="cd9aa648-a70d-4582-b2a6-489b54e1ed2c"/>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.valorDiferenca}]]></textFieldExpression>
-			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement mode="Transparent" x="464" y="93" width="24" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8471eaf2-18d7-44c4-9825-950f797e4c54"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
@@ -669,6 +653,22 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
 			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement mode="Transparent" x="1801" y="93" width="25" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="e491a859-8671-4b25-9254-5b6219e52d48"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement mode="Transparent" x="1728" y="93" width="25" height="11" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="9ab96ed7-453f-4b6c-8bdf-1952de438ae8"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.codOrigem}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<columnHeader>
@@ -844,21 +844,21 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipoPassagemRemarcado}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="959" y="0" width="31" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="46c0ecf4-aa5a-41fe-9d9e-966bf4aead34"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorPassagemRemarcado}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="990" y="0" width="31" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="e138cebd-8e9b-429a-b92f-244dcfdcb71a"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{percentualDescontoRemarcado}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="1021" y="0" width="35" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="21829d9d-0434-49f8-8dd2-ade3e4109d1b"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
@@ -1019,42 +1019,42 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{siglaTipoPassagemVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="2191" y="0" width="40" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="39543877-830e-488b-867b-3eea6eef414f"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipoPassagemVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="2231" y="0" width="27" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="6fcc0516-6371-430b-9f82-8cce9ec85539"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorPassagemVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="2258" y="0" width="26" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="74d6ce93-2cb6-454d-9976-635b5b384d19"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{percentualDescontoVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="2284" y="0" width="35" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="38c6dd96-e6ae-4764-8fe0-fc1df49d3115"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorTotalVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="2319" y="0" width="33" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="19b95f00-009f-440f-943a-1e305ae3abef"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tarifaVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="2352" y="0" width="28" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="f8a5565a-a3ca-4135-a852-6eaf66bc2525"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
@@ -1075,20 +1075,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tppVenda}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="2476" y="0" width="24" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="7f8770d1-1257-4fc3-a7f7-714dc3b70e7f"/>
-				<textElement textAlignment="Center">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{diferenca}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="2454" y="0" width="22" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="5bb391fe-01fa-448f-9659-efa968c4d771"/>
-				<textElement textAlignment="Center">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement x="1174" y="0" width="21" height="26" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="78937ff7-1c27-430d-9f19-7736b3f5acbc"/>
 				<textElement textAlignment="Center">
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoPassagensTransferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoPassagensTransferenciaController.java
index db302f85a..05789cb9d 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoPassagensTransferenciaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoPassagensTransferenciaController.java
@@ -82,8 +82,11 @@ public class RelatorioRemarcacaoPassagensTransferenciaController extends MyGener
 
 		parametros.put("DATA_INICIAL", dataInicio);
 		parametros.put("DATA_FINAL", dataFinal);
-
-		Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue();
+		Empresa empresa =null;
+		if(cmbEmpresa.getSelectedItem() != null ){
+			empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue();
+		}
+		 
 		lsNumPuntoVenta = new ArrayList(Arrays.asList(puntoVentaSelList.getData()));
 
 		if (lsNumPuntoVenta.size() > 0) {
diff --git a/web/gui/relatorios/filtroRelatorioRemarcacaoPassagensTransferencia.zul b/web/gui/relatorios/filtroRelatorioRemarcacaoPassagensTransferencia.zul
index df474f971..3e18405b2 100644
--- a/web/gui/relatorios/filtroRelatorioRemarcacaoPassagensTransferencia.zul
+++ b/web/gui/relatorios/filtroRelatorioRemarcacaoPassagensTransferencia.zul
@@ -65,7 +65,6 @@
 					<label
 						value="${c:l('relatorioRemarcacaoPassagensTransferenciaController.lbEmpresa.value')}" />
 					<combobox id="cmbEmpresa" buttonVisible="true"
-						constraint="no empty"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						model="@{winFiltroRelatorioRemarcacaoPassagensTransferencia$composer.lsEmpresa}"
 						width="100%" />