diff --git a/pom.xml b/pom.xml
index c7af56edf..b95795cf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.90.1</version>
-	 <packaging>war</packaging> 
+	<version>1.91.0</version>
+	<packaging>war</packaging> 
   
 	<properties>
-		<modelWeb.version>1.67.0</modelWeb.version>
-		<flyway.version>1.50.0</flyway.version>
+		<modelWeb.version>1.68.0</modelWeb.version>
+		<flyway.version>1.51.0</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java
index c4aaf01e3..700395074 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java
@@ -25,10 +25,12 @@ import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Textbox;
 
+import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino;
 import com.rjconsultores.ventaboletos.entidad.EmpresaImposto;
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.service.AliquotaEstadoDestinoService;
+import com.rjconsultores.ventaboletos.service.ConstanteService;
 import com.rjconsultores.ventaboletos.service.EmpresaImpostoService;
 import com.rjconsultores.ventaboletos.service.EstadoService;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@@ -60,6 +62,9 @@ public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
 	@Autowired
 	private AliquotaEstadoDestinoService aliquotaEstaDestinoService;
 	
+	@Autowired
+	private ConstanteService constanteService;
+	
 	private MyListbox empresaImpostoList;
 	
 	private Textbox txtAliquotaEstadoDestino;
@@ -73,6 +78,11 @@ public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
 	private MyListbox aliquotaEstadoDestinoList;
 	private List<AliquotaEstadoDestino> lsAliquotaEstadoDestino;
 	
+	private Textbox txtIcms;
+	private Textbox txtIcmsIntermunicipal;
+	
+	boolean desativaObrCamEmpresaImposto = false;
+	
 
 	/**
 	 * @return the empresaImposto
@@ -103,22 +113,40 @@ public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
 		aliquotaEstadoDestinoList.setData(lsAliquotaEstadoDestino);
 		boolean isChecked=empresaImposto.getIndAliquotaBPeUfDestino() != null ? empresaImposto.getIndAliquotaBPeUfDestino() : false ;
 		chkIndAliquotaBPeUfDestino.setChecked(isChecked);
-			cmbEstadoAliquotaEstadoDestino.setDisabled(!isChecked);
-			txtAliquotaEstadoDestino.setDisabled(!isChecked);
-			btnAdicionarAliquotaEstadoDest.setDisabled(!isChecked);
-			btnRemoverAliquotaEstadoDest.setDisabled(!isChecked);
+		cmbEstadoAliquotaEstadoDestino.setDisabled(!isChecked);
+		txtAliquotaEstadoDestino.setDisabled(!isChecked);
+		btnAdicionarAliquotaEstadoDest.setDisabled(!isChecked);
+		btnRemoverAliquotaEstadoDest.setDisabled(!isChecked);
 		 
+		ajustarCamposObrigatorios();
+	}
 
-		
-
-
+	/**
+	 * Ajusta obrigatoriedade dos campos conforme definição da constante
+	 * AL-4468
+	 */
+	private void ajustarCamposObrigatorios() {		
+		try {
+			txtIcms.setConstraint("no empty");
+			txtIcmsIntermunicipal.setConstraint("no empty");
+			txtAliquotaEstadoDestino.setConstraint("no empty");
+			
+			desativaObrCamEmpresaImposto = constanteService.buscarValorConstantePorNomeConstanteBoolean(Constantes.DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO.toString());		
+			if (desativaObrCamEmpresaImposto) {
+				txtIcms.setConstraint("");
+				txtIcmsIntermunicipal.setConstraint("");
+				txtAliquotaEstadoDestino.setConstraint("");			
+			}			
+		} catch (Exception e) {
+			log.error(e);			
+		}
 	}
 
 	public void onClick$btnEmpresaImpostoSalvar(Event ev) throws InterruptedException {
 		try {
 			
 			
-			if(empresaImposto.getPorctributo() == null) {
+			if(!desativaObrCamEmpresaImposto && empresaImposto.getPorctributo() == null) {
 				Messagebox.show(
 						Labels.getLabel("editarEmpresaImpostoController.window.obrigatorioOutrosTributos"),
 						Labels.getLabel("editarEmpresaController.window.title"),
diff --git a/web/gui/catalogos/editarEmpresaImposto.zul b/web/gui/catalogos/editarEmpresaImposto.zul
index f2ae27080..ee12063a5 100644
--- a/web/gui/catalogos/editarEmpresaImposto.zul
+++ b/web/gui/catalogos/editarEmpresaImposto.zul
@@ -67,7 +67,6 @@
 						<textbox id="txtIcms" width="50px" precision="7"
 							scale="2"
 							use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-							constraint="no empty"
 							value="@{winEditarEmpresaImposto$composer.empresaImposto.icms,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
 						<intbox id="txtIndIcms" width="50px"
 							maxlength="2"
@@ -75,7 +74,6 @@
 						<textbox id="txtIcmsIntermunicipal" width="50px"
 							precision="7" scale="2"
 							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"
@@ -394,7 +392,6 @@
 										<textbox id="txtAliquotaEstadoDestino" width="50px"
 											precision="7" scale="2"
 											use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-											constraint="no empty"
 											value="@{winEditarEmpresaImposto$composer.aliquotaDest,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
 											
 										<label value="%"/>