Merge branch 'master' into AL-3713
commit
2659a8e701
2
pom.xml
2
pom.xml
|
@ -8,7 +8,7 @@
|
|||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
<modelWeb.version>1.36.1</modelWeb.version>
|
||||
<modelWeb.version>1.36.2</modelWeb.version>
|
||||
<flyway.version>1.28.0</flyway.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
|
|
|
@ -28,10 +28,11 @@ public class RenderBoletoComissao implements ListitemRenderer {
|
|||
Listcell lc = new Listcell();
|
||||
if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {
|
||||
Checkbox chk = new Checkbox();
|
||||
chk.setId(boletoComissao.getCajaId()+"");
|
||||
// chk.setId(boletoComissao.getCajaId()+"");
|
||||
chk.setChecked(boletoComissao.isConferido());
|
||||
chk.setParent(lc);
|
||||
}
|
||||
|
||||
lc.setParent(lstm);
|
||||
|
||||
SimpleDateFormat formato = new SimpleDateFormat("dd/MM/yyyy");
|
||||
|
|
Loading…
Reference in New Issue