From c69c58e9a754bd91a6effad1165157e1e0ee6588 Mon Sep 17 00:00:00 2001
From: "igor.rodrigo" <igor.rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 15 Dec 2016 12:01:31 +0000
Subject: [PATCH] fixes bug #8225

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@63708 d1611594-4594-4d17-8e1d-87c2c4800839
---
 web/gui/catalogos/editarEmpresaImposto.zul | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/web/gui/catalogos/editarEmpresaImposto.zul b/web/gui/catalogos/editarEmpresaImposto.zul
index 7edb76f45..580bbab93 100644
--- a/web/gui/catalogos/editarEmpresaImposto.zul
+++ b/web/gui/catalogos/editarEmpresaImposto.zul
@@ -35,16 +35,17 @@
 			</caption>
 			<grid fixedLayout="true">
 				<columns>
-					<column width="10%" />
-					<column width="15%" />
-					<column width="15%" />
-					<column width="15%" />
-					<column width="15%" />
-					<column width="19%" />
-					<column width="19%" />
-					<column width="18%" />
-					<column width="15%" />
-					<column width="15%" />			
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />
+					<column width="12%" />			
 				</columns>
 				<rows>
 					<row>
@@ -53,7 +54,8 @@
 						<label value="${c:l('editarEmpresaImpostoController.labelIndIcms.value')}" />											
 						<label value="${c:l('editarEmpresaImpostoController.labelIcmsMunicipal.value')}" />						
 						<label value="${c:l('editarEmpresaImpostoController.labelIndIcmsMunicipal.value')}" />
-						<label value="${c:l('editarEmpresaImpostoController.labelIcmsMunicipalMatricial.value')}" />	
+						<label value="${c:l('editarEmpresaImpostoController.labelIcmsMunicipalMatricial.value')}" />
+						<label value="${c:l('editarEmpresaImpostoController.labelIcmsEstadualMatricial.value')}" />	
 						<label value="${c:l('editarEmpresaImpostoController.labelRedMunicial.value')}" />
 						<label value="${c:l('editarEmpresaImpostoController.labelRedEstadual.value')}" />
 						<label value="${c:l('editarEmpresaImpostoController.labelRedIcms.value')}" />
@@ -82,6 +84,11 @@
 							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"							
 							value="@{winEditarEmpresaImposto$composer.empresaImposto.icmsIntermunicipalMatricial,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
 						
+				  		<textbox id="txtIcmsInterestadualMatricial" width="50px" precision="7"
+							scale="2"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"							
+							value="@{winEditarEmpresaImposto$composer.empresaImposto.icmsMatricial,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
+						
 						<textbox id="txtPorCredMunicipal" width="50px"
 							precision="7" scale="2"
 							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"