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

fixes bug#AL-3275

master
Julio Heredia 2023-10-23 11:33:04 -03:00
parent cc313ad2d3
commit 377a6570c0
2 changed files with 6 additions and 6 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.2</version>
<version>1.25.3</version>
<packaging>war</packaging>
<properties>

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

@ -254,7 +254,7 @@ public class RelatorioVendaEmbarcada extends Relatorio {
}
if (vendaEmbarcada == FiltroEnviadosSefaz.SIM) {
sql.append(" and b.tipoventa_id in (99) ");
} else if (envioSefaz == FiltroEnviadosSefaz.NAO) {
} else if (vendaEmbarcada == FiltroEnviadosSefaz.NAO) {
sql.append(" and b.tipoventa_id not in (99) ");
}
if (quebraSequencia){
@ -336,9 +336,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 ");
} else if (envioSefaz == FiltroEnviadosSefaz.NAO) {
sql.append(" and b.IMEI_DISPOSITIVO_EMBARCADA is null ");
sql.append(" and b.tipoventa_id in (99) ");
} else if (vendaEmbarcada == FiltroEnviadosSefaz.NAO) {
sql.append(" and b.tipoventa_id not in (99) ");
}
sql.append(") ");
}