From 30f5f752c75787bff3ce460992324dd509a2d048 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 11 Dec 2014 17:40:19 +0000
Subject: [PATCH] bug #5898

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

diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 77bdb0364..13272f734 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -686,6 +686,7 @@ editarEmpresaImpostoController.labelIndIcms.value=Ind. ECF
 editarEmpresaImpostoController.labelRedMunicial.value = Reductor ICMS intermunicipal
 editarEmpresaImpostoController.labelRedEstadual.value = Reductor ICMS interestadual
 editarEmpresaImpostoController.labelRedIcms.value =   Reductor base de cálculo ICMS
+editarEmpresaImpostoController.labelTributo.value = Impuesto
 editarEmpresaImpostoController.btnApagar.tooltiptext = Eliminar
 editarEmpresaImpostoController.btnSalvar.tooltiptext = Guardar
 editarEmpresaImpostoController.btnFechar.tooltiptext = Cerrar
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index ae0b2a857..4742b3900 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -715,6 +715,7 @@ editarEmpresaImpostoController.labelIndIcms.value=Ind. ECF
 editarEmpresaImpostoController.labelRedMunicial.value = Redutor ICMS Intermunicipal
 editarEmpresaImpostoController.labelRedEstadual.value = Redutor ICMS Interestadual
 editarEmpresaImpostoController.labelRedIcms.value =   Redutor Base de Cálculo ICMS
+editarEmpresaImpostoController.labelTributo.value = Tributo
 editarEmpresaImpostoController.btnApagar.tooltiptext = Eliminar
 editarEmpresaImpostoController.btnSalvar.tooltiptext = Salvar
 editarEmpresaImpostoController.btnFechar.tooltiptext = Fechar
diff --git a/web/gui/catalogos/editarEmpresaImposto.zul b/web/gui/catalogos/editarEmpresaImposto.zul
index 7628df714..1811560c9 100644
--- a/web/gui/catalogos/editarEmpresaImposto.zul
+++ b/web/gui/catalogos/editarEmpresaImposto.zul
@@ -35,11 +35,12 @@
 			</caption>
 			<grid fixedLayout="true">
 				<columns>
-					<column width="20%" />
-					<column width="20%" />
-					<column width="20%" />
-					<column width="20%" />
-					<column width="20%" />
+					<column width="15%" />
+					<column width="15%" />
+					<column width="19%" />
+					<column width="19%" />
+					<column width="18%" />
+					<column width="15%" />
 
 				</columns>
 				<rows>
@@ -54,6 +55,8 @@
 							value="${c:l('editarEmpresaImpostoController.labelRedEstadual.value')}" />
 						<label
 							value="${c:l('editarEmpresaImpostoController.labelRedIcms.value')}" />
+						<label
+							value="${c:l('editarEmpresaImpostoController.labelTributo.value')}" />	
 
 					</row>
 					<row>
@@ -76,10 +79,11 @@
 							precision="7" scale="2"
 							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
 							value="@{winEditarEmpresaImposto$composer.empresaImposto.porCredBaseIcms,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
-
+						<textbox id="txtTributo" width="50px"
+							precision="7" scale="2"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
+							value="@{winEditarEmpresaImposto$composer.empresaImposto.tributo,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
 					</row>
-
-
 				</rows>
 			</grid>
 		</groupbox>