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

Merge pull request 'bug#AL-3866' (!462) from AL-3866 into master 

Reviewed-on: adm/VentaBoletosAdm#462
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master
wallace 2024-03-27 13:56:34 +00:00
parent a0faf8a6f3 86d3d2c504
commit d7ae933427
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<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.61.5</version> <version>1.61.6</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.43.1</modelWeb.version> <modelWeb.version>1.43.2</modelWeb.version>
<flyway.version>1.35.0</flyway.version> <flyway.version>1.35.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>

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java
View File

@ -93,7 +93,7 @@ public class BusquedaBpeRdiController extends MyGenericForwardComposer {
return; return;
} }
List<FiscalRdi> list = bpeService.buscarBpeRDI(datInicial.getValue(), datFinal.getValue(), empresa, estados, radSim.isChecked(), consultaOtimizada.isChecked()); List<FiscalRdi> list = bpeService.buscarBpeRDI(datInicial.getValue(), datFinal.getValue(), empresa, estados, radSim.isChecked(), true);
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
parametros.put("list", list); parametros.put("list", list);

5
web/gui/bpe/busquedaBpeRdi.zul
View File

@ -60,11 +60,6 @@
label="${c:l('busquedaRelatorioRDIController.labelRadio.radNao')}" /> label="${c:l('busquedaRelatorioRDIController.labelRadio.radNao')}" />
</radiogroup> </radiogroup>
</row> </row>
<row spans="4">
<checkbox id="consultaOtimizada" checked="false" label="Consulta Otimizada" />
</row>
</rows> </rows>
</grid> </grid>