From a93f205affa75ed52949fe445075018fd53071d1 Mon Sep 17 00:00:00 2001
From: "igor.rodrigo" <igor.rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 17 Nov 2016 16:41:28 +0000
Subject: [PATCH] fixes bug #8225

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@62667 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 | 14 +++++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index c6d364c8e..62db271e5 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -951,6 +951,7 @@ editarEmpresaImpostoController.window.title = Configuración de impuesto por emp
 editarEmpresaImpostoController.labelIcms.value = ICMS Interestadual
 editarEmpresaImpostoController.labelIndIcms.value=Ind. ECF Interestadual
 editarEmpresaImpostoController.labelIcmsMunicipal.value = ICMS Intermunicipal
+editarEmpresaImpostoController.labelIcmsMunicipalMatricial.value = ICMS Intermunicipal Matricial
 editarEmpresaImpostoController.labelIndIcmsMunicipal.value = Ind. ECF Intermunicipal
 editarEmpresaImpostoController.labelRedMunicial.value = Reductor ICMS intermunicipal
 editarEmpresaImpostoController.labelRedEstadual.value = Reductor ICMS interestadual
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 775ff0993..21619e299 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -993,6 +993,7 @@ editarEmpresaImpostoController.window.title = Configuração de Imposto por Empr
 editarEmpresaImpostoController.labelIcms.value = ICMS Interestadual
 editarEmpresaImpostoController.labelIndIcms.value = Ind. ECF Interestadual
 editarEmpresaImpostoController.labelIcmsMunicipal.value = ICMS Intermunicipal
+editarEmpresaImpostoController.labelIcmsMunicipalMatricial.value = ICMS Intermunicipal Matricial
 editarEmpresaImpostoController.labelIndIcmsMunicipal.value = Ind. ECF Intermunicipal
 editarEmpresaImpostoController.labelRedMunicial.value = Redutor ICMS Intermunicipal
 editarEmpresaImpostoController.labelRedEstadual.value = Redutor ICMS Interestadual
diff --git a/web/gui/catalogos/editarEmpresaImposto.zul b/web/gui/catalogos/editarEmpresaImposto.zul
index 9e4b53c3a..7edb76f45 100644
--- a/web/gui/catalogos/editarEmpresaImposto.zul
+++ b/web/gui/catalogos/editarEmpresaImposto.zul
@@ -39,19 +39,21 @@
 					<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="15%" />			
 				</columns>
 				<rows>
 					<row>
 						<label value="${c:l('editarEmpresaImpostoController.lblValidaAliquotaECF.value')}" />
 						<label value="${c:l('editarEmpresaImpostoController.labelIcms.value')}" />
-						<label value="${c:l('editarEmpresaImpostoController.labelIndIcms.value')}" />
-						<label value="${c:l('editarEmpresaImpostoController.labelIcmsMunicipal.value')}" />
+						<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.labelRedMunicial.value')}" />
 						<label value="${c:l('editarEmpresaImpostoController.labelRedEstadual.value')}" />
 						<label value="${c:l('editarEmpresaImpostoController.labelRedIcms.value')}" />
@@ -73,7 +75,13 @@
 							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
 							constraint="no empty"
 							value="@{winEditarEmpresaImposto$composer.empresaImposto.icmsIntermunicipal,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
+									
 						<intbox id="txtIndIcmsIntermunicipal" maxlength="2" width="50px" value="@{winEditarEmpresaImposto$composer.empresaImposto.indiceICMSIntermunicipal}" />
+						<textbox id="txtIcmsIntermunicipalMatricial" width="50px" precision="7"
+							scale="2"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"							
+							value="@{winEditarEmpresaImposto$composer.empresaImposto.icmsIntermunicipalMatricial,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
+						
 						<textbox id="txtPorCredMunicipal" width="50px"
 							precision="7" scale="2"
 							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"