From 2984e78ebfe2a74f8b30e46e40a897a91bffab7f Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 3 Dec 2015 19:01:55 +0000
Subject: [PATCH] fixes bug #6907

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50890 d1611594-4594-4d17-8e1d-87c2c4800839
---
 web/WEB-INF/i3-label_es_MX.label              |  1 +
 web/WEB-INF/i3-label_pt_BR.label              |  1 +
 .../editarConfRestricaoCanalVenta.zul         | 29 ++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index fe5bf54f9..adc2860d7 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -4626,6 +4626,7 @@ confRestricaoCanalVentaController.Sabado.label = Sábado
 confRestricaoCanalVentaController.Domingo.label = Domingo
 confRestricaoCanalVentaController.TempoPermitir.label = Tiempo límite
 confRestricaoCanalVentaController.TempoPermitirOBS.label = El controle se queda sin efecto (HH:mm) antes del horário de la salida
+confRestricaoCanalVentaController.exibeconsultavendaweb.label = Exhibe consulta venta internet
 
 # Editar Conf Restricao Canal Venta
 editarConfRestricaoCanalVentaController.window.title = Bloqueo de tramo por canal de venta
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 3e2e8292c..b4f4dea92 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -4689,6 +4689,7 @@ confRestricaoCanalVentaController.Sabado.label = Sábado
 confRestricaoCanalVentaController.Domingo.label = Domingo
 confRestricaoCanalVentaController.TempoPermitir.label = Tempo Limite
 confRestricaoCanalVentaController.TempoPermitirOBS.label = O controle fica sem efeito (HH:mm) antes do horário de saida.
+confRestricaoCanalVentaController.exibeconsultavendaweb.label = Exibe consulta venda Web
 
 # Editar Conf Restricao Canal Venta
 editarConfRestricaoCanalVentaController.window.title = Bloqueio de Trecho por Canal de Venda
diff --git a/web/gui/esquema_operacional/editarConfRestricaoCanalVenta.zul b/web/gui/esquema_operacional/editarConfRestricaoCanalVenta.zul
index 2a836f0fe..f83f8fa2d 100644
--- a/web/gui/esquema_operacional/editarConfRestricaoCanalVenta.zul
+++ b/web/gui/esquema_operacional/editarConfRestricaoCanalVenta.zul
@@ -7,8 +7,9 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winEditarConfRestricaoCanalVenta" border="normal"
 		apply="${editarConfRestricaoCanalVentaController}" width="600px"
-		height="457x" contentStyle="overflow:auto"
-		title="${c:l('editarConfRestricaoCanalVentaController.window.title')}">
+		height="580px" contentStyle="overflow:auto"
+		title="${c:l('editarConfRestricaoCanalVentaController.window.title')}"
+		xmlns:h="http://www.w3.org/1999/xhtml">
 
 		<toolbar>
 			<hbox spacing="5px" style="padding:1px" align="right">
@@ -103,11 +104,19 @@
 								<label
 									value="${c:l('confRestricaoCanalVentaController.TempoPermitir.label')}" />
 								<vbox>
-									<timebox id="timeTempoPermitir"
-										width="25%" mold="rounded" format="HH:mm"
-										value="@{winEditarConfRestricaoCanalVenta$composer.confRestricaoCanalVenta.tempoPermitir}" />
-									<label
-										value="${c:l('confRestricaoCanalVentaController.TempoPermitirOBS.label')}" />
+									<h:table border="0">
+										<h:tr>
+											<h:td width="20%">
+												<timebox id="timeTempoPermitir"
+													width="70px" mold="rounded" format="HH:mm"
+													value="@{winEditarConfRestricaoCanalVenta$composer.confRestricaoCanalVenta.tempoPermitir}" />
+											</h:td>
+											<h:td>
+												<label
+													value="${c:l('confRestricaoCanalVentaController.TempoPermitirOBS.label')}" />
+											</h:td>
+										</h:tr>
+									</h:table>								
 								</vbox>
 							</row>
 							<row>
@@ -137,6 +146,12 @@
 										checked="@{winEditarConfRestricaoCanalVenta$composer.confRestricaoCanalVenta.domingo}" />
 								</vbox>
 							</row>
+							<row>
+								<label
+									value="${c:l('confRestricaoCanalVentaController.exibeconsultavendaweb.label')}" />
+									<checkbox id="chkExibeconsultavendaweb"
+										checked="@{winEditarConfRestricaoCanalVenta$composer.confRestricaoCanalVenta.indexibeconsultavendaweb}" />
+							</row>															
 						</rows>
 					</grid>
 				</tabpanel>