fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AL-4468 - Correção conflito pom

master
Wilian Domingues 2024-06-27 08:41:34 -03:00
parent 270b9a8fcb
commit b176c1561e
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.90.1</version> <version>1.91.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.67.0</modelWeb.version> <modelWeb.version>1.68.0</modelWeb.version>
<flyway.version>1.50.0</flyway.version> <flyway.version>1.51.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

44
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java
View File

@ -25,10 +25,12 @@ import org.zkoss.zul.Combobox;
import org.zkoss.zul.Messagebox; import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.constantes.Constantes;
import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino;
import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; import com.rjconsultores.ventaboletos.entidad.EmpresaImposto;
import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.Estado;
import com.rjconsultores.ventaboletos.service.AliquotaEstadoDestinoService; import com.rjconsultores.ventaboletos.service.AliquotaEstadoDestinoService;
import com.rjconsultores.ventaboletos.service.ConstanteService;
import com.rjconsultores.ventaboletos.service.EmpresaImpostoService; import com.rjconsultores.ventaboletos.service.EmpresaImpostoService;
import com.rjconsultores.ventaboletos.service.EstadoService; import com.rjconsultores.ventaboletos.service.EstadoService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@ -60,6 +62,9 @@ public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
@Autowired @Autowired
private AliquotaEstadoDestinoService aliquotaEstaDestinoService; private AliquotaEstadoDestinoService aliquotaEstaDestinoService;
@Autowired
private ConstanteService constanteService;
private MyListbox empresaImpostoList; private MyListbox empresaImpostoList;
private Textbox txtAliquotaEstadoDestino; private Textbox txtAliquotaEstadoDestino;
@ -73,6 +78,11 @@ public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
private MyListbox aliquotaEstadoDestinoList; private MyListbox aliquotaEstadoDestinoList;
private List<AliquotaEstadoDestino> lsAliquotaEstadoDestino; private List<AliquotaEstadoDestino> lsAliquotaEstadoDestino;
private Textbox txtIcms;
private Textbox txtIcmsIntermunicipal;
boolean desativaObrCamEmpresaImposto = false;
/** /**
* @return the empresaImposto * @return the empresaImposto
@ -103,22 +113,40 @@ public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
aliquotaEstadoDestinoList.setData(lsAliquotaEstadoDestino); aliquotaEstadoDestinoList.setData(lsAliquotaEstadoDestino);
boolean isChecked=empresaImposto.getIndAliquotaBPeUfDestino() != null ? empresaImposto.getIndAliquotaBPeUfDestino() : false ; boolean isChecked=empresaImposto.getIndAliquotaBPeUfDestino() != null ? empresaImposto.getIndAliquotaBPeUfDestino() : false ;
chkIndAliquotaBPeUfDestino.setChecked(isChecked); chkIndAliquotaBPeUfDestino.setChecked(isChecked);
cmbEstadoAliquotaEstadoDestino.setDisabled(!isChecked); cmbEstadoAliquotaEstadoDestino.setDisabled(!isChecked);
txtAliquotaEstadoDestino.setDisabled(!isChecked); txtAliquotaEstadoDestino.setDisabled(!isChecked);
btnAdicionarAliquotaEstadoDest.setDisabled(!isChecked); btnAdicionarAliquotaEstadoDest.setDisabled(!isChecked);
btnRemoverAliquotaEstadoDest.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 { public void onClick$btnEmpresaImpostoSalvar(Event ev) throws InterruptedException {
try { try {
if(empresaImposto.getPorctributo() == null) { if(!desativaObrCamEmpresaImposto && empresaImposto.getPorctributo() == null) {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarEmpresaImpostoController.window.obrigatorioOutrosTributos"), Labels.getLabel("editarEmpresaImpostoController.window.obrigatorioOutrosTributos"),
Labels.getLabel("editarEmpresaController.window.title"), Labels.getLabel("editarEmpresaController.window.title"),

3
web/gui/catalogos/editarEmpresaImposto.zul
View File

@ -67,7 +67,6 @@
<textbox id="txtIcms" width="50px" precision="7" <textbox id="txtIcms" width="50px" precision="7"
scale="2" scale="2"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
constraint="no empty"
value="@{winEditarEmpresaImposto$composer.empresaImposto.icms,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" /> value="@{winEditarEmpresaImposto$composer.empresaImposto.icms,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
<intbox id="txtIndIcms" width="50px" <intbox id="txtIndIcms" width="50px"
maxlength="2" maxlength="2"
@ -75,7 +74,6 @@
<textbox id="txtIcmsIntermunicipal" width="50px" <textbox id="txtIcmsIntermunicipal" width="50px"
precision="7" scale="2" precision="7" scale="2"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
constraint="no empty"
value="@{winEditarEmpresaImposto$composer.empresaImposto.icmsIntermunicipal,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" /> value="@{winEditarEmpresaImposto$composer.empresaImposto.icmsIntermunicipal,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
<intbox id="txtIndIcmsIntermunicipal" <intbox id="txtIndIcmsIntermunicipal"
@ -394,7 +392,6 @@
<textbox id="txtAliquotaEstadoDestino" width="50px" <textbox id="txtAliquotaEstadoDestino" width="50px"
precision="7" scale="2" precision="7" scale="2"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
constraint="no empty"
value="@{winEditarEmpresaImposto$composer.aliquotaDest,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" /> value="@{winEditarEmpresaImposto$composer.aliquotaDest,converter=com.rjconsultores.ventaboletos.web.utilerias.StringPercentToDecimalConverter}" />
<label value="%"/> <label value="%"/>