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

Merge pull request 'fixes bug#AL-3909' (!415) from AL-3909 into master 

Reviewed-on: adm/VentaBoletosAdm#415
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.54.5
wallace 2024-02-29 12:10:54 +00:00
parent 91a69d82d5 73bb6c7f48
commit fa8910b542
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<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.54.4</version> <version>1.54.5</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -45,7 +45,7 @@ public class RelatorioEstoque extends Relatorio {
String formfinal = rset.getString("formfinal"); String formfinal = rset.getString("formfinal");
String formInicio = rset.getString("forminicial"); String formInicio = rset.getString("forminicial");
if (tipoVenta.equals(EnumTipoVenda.TPV_MANUAL.getId().toString())) {
String ultimoFolioCaja = rset.getString("ultimoFolioCaja"); String ultimoFolioCaja = rset.getString("ultimoFolioCaja");
@ -66,7 +66,7 @@ public class RelatorioEstoque extends Relatorio {
} else { } else {
formInicio = ultimoFolioCaja != null ? ultimoFolioCaja : formInicio; formInicio = ultimoFolioCaja != null ? ultimoFolioCaja : formInicio;
} }
}
dataResult.put("dataVencimento", rset.getDate("dataVencimento")); dataResult.put("dataVencimento", rset.getDate("dataVencimento"));
dataResult.put("dataAquicision", rset.getDate("dataAquicision")); dataResult.put("dataAquicision", rset.getDate("dataAquicision"));