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

Merge branch 'master' into AL-3713

master
Gleison da Cruz 2024-02-02 21:10:34 +00:00
parent fa70eff1c2 07582d4635
commit 2659a8e701
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -8,7 +8,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.36.1</modelWeb.version> <modelWeb.version>1.36.2</modelWeb.version>
<flyway.version>1.28.0</flyway.version> <flyway.version>1.28.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java
View File

@ -28,10 +28,11 @@ public class RenderBoletoComissao implements ListitemRenderer {
Listcell lc = new Listcell(); Listcell lc = new Listcell();
if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) { if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {
Checkbox chk = new Checkbox(); Checkbox chk = new Checkbox();
chk.setId(boletoComissao.getCajaId()+""); // chk.setId(boletoComissao.getCajaId()+"");
chk.setChecked(boletoComissao.isConferido()); chk.setChecked(boletoComissao.isConferido());
chk.setParent(lc); chk.setParent(lc);
} }
lc.setParent(lstm); lc.setParent(lstm);
SimpleDateFormat formato = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat formato = new SimpleDateFormat("dd/MM/yyyy");