diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java index f98fb8ce1..654afd2fa 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java @@ -1501,6 +1501,10 @@ public class ConferenciaController extends MyGenericForwardComposer { } return false; } + + public Boolean isExibirBotaoCancelarChegadaMalote() { + return !isExibirBotaoChegadaMalote(); + } private Boolean isMaloteRecebido() { if (conferencia != null) { @@ -1518,7 +1522,7 @@ public class ConferenciaController extends MyGenericForwardComposer { public void onClick$btnCerrar() throws InterruptedException { validarConferencia(); - this.closeWindow(); + super.closeWindow(); } private void validarConferencia() throws InterruptedException { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 3bcaf3701..4870c2151 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -7442,7 +7442,7 @@ busquedaConferenciaComissaoController.lbCompetencia.label = Competencia busquedaConferenciaComissaoController.lbCompetenciaLayout.label = (MM/YYYY) busquedaConferenciaComissaoController.lbEmpresa.value = Empresa busquedaConferenciaComissaoController.lbPuntoVenta.value = Punto venta -busquedaConferenciaComissaoController.chkDesconsideraPtVendaFechados= Desconsidera Pto Venda Fechados +busquedaConferenciaComissaoController.chkDesconsideraPtVendaFechados= Desconsidera Puntos Venta Fechados busquedaConferenciaComissaoController.lbPuntoVentaInvalido.value=Ponto de Venda Inválido # Conferencia Comissao diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index e6dd80224..b9f1feebe 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7910,7 +7910,7 @@ busquedaConferenciaComissaoController.lbPuntoVenta.value = Ponto de Venda (Agên busquedaConferenciaComissaoController.lbTipoData.value = Tipo Data busquedaConferenciaComissaoController.lbTipoDataMesAno.value = Mês/Ano busquedaConferenciaComissaoController.lbTipoDataDataInicialFinal.value = Data Inicial/Final -busquedaConferenciaComissaoController.chkDesconsideraPtVendaFechados= Desconsidera Ptos Venda Fechados +busquedaConferenciaComissaoController.chkDesconsideraPtVendaFechados= Desconsidera Pontos de Venda Fechados busquedaConferenciaComissaoController.lbPuntoVentaInvalido.value=Ponto de Venda Inválido # Conferencia Comissao diff --git a/web/gui/comissao/busquedaConferenciaComissao.zul b/web/gui/comissao/busquedaConferenciaComissao.zul index ff6b96c3e..d31bccfa4 100644 --- a/web/gui/comissao/busquedaConferenciaComissao.zul +++ b/web/gui/comissao/busquedaConferenciaComissao.zul @@ -8,7 +8,7 @@