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

Merge pull request 'fixes bug#AL-3275' (!290) from AL-3275 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/290
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master 1.25.1
Julio Heredia 2023-10-20 19:23:08 +00:00
parent e430ead06d 07beade7c0
commit da9de3ed64
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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.25.0</version>
<version>1.25.1</version>
<packaging>war</packaging>
<properties>

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

@ -253,9 +253,9 @@ public class RelatorioVendaEmbarcada extends Relatorio {
sql.append(" and bp.codstat in (-1, 100, 102, 150) ");
}
if (vendaEmbarcada == FiltroEnviadosSefaz.SIM) {
sql.append(" and b.IMEI_DISPOSITIVO_EMBARCADA is not null ");
sql.append(" and b.tipoventa_id in (99) ");
} else if (envioSefaz == FiltroEnviadosSefaz.NAO) {
sql.append(" and b.IMEI_DISPOSITIVO_EMBARCADA is null ");
sql.append(" and b.tipoventa_id not in (99) ");
}
if (quebraSequencia){
sql.append("union ");