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

fixes bug #8839 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67537 d1611594-4594-4d17-8e1d-87c2c4800839
master
eduardo.dicarde 2017-03-31 20:30:21 +00:00
parent e17d837f02
commit 79c3f62f11
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
View File

@ -41,7 +41,8 @@ public class RelatorioDescontos extends Relatorio {
NamedParameterStatement statement = new NamedParameterStatement(coneConnection, query); NamedParameterStatement statement = new NamedParameterStatement(coneConnection, query);
statement.setTimestamp("fecVentaInicial", fecVentaInicial); statement.setTimestamp("fecVentaInicial", fecVentaInicial);
statement.setTimestamp("fecVentaFinal", fecVentaFinal); statement.setTimestamp("fecVentaFinal", fecVentaFinal);
if(idPuntoVenta != null) {
if(idPuntoVenta != null && idPuntoVenta != -1) {
statement.setInt("idPuntoVenta", idPuntoVenta); statement.setInt("idPuntoVenta", idPuntoVenta);
} }
if(codconvenio != null && !codconvenio.isEmpty()) { if(codconvenio != null && !codconvenio.isEmpty()) {
@ -119,7 +120,7 @@ public class RelatorioDescontos extends Relatorio {
query +=" AND BOL.EMPRESACORRIDA_ID IN ( " + (String)parametros.get("EMPRESAIDS") + ")" ; query +=" AND BOL.EMPRESACORRIDA_ID IN ( " + (String)parametros.get("EMPRESAIDS") + ")" ;
} }
if(idPuntoVenta != null) { if(idPuntoVenta != null && idPuntoVenta != -1) {
query += " AND (BOL.PUNTOVENTA_ID = :idPuntoVenta) "; query += " AND (BOL.PUNTOVENTA_ID = :idPuntoVenta) ";
} }
if (codconvenio != null && !codconvenio.isEmpty()) { if (codconvenio != null && !codconvenio.isEmpty()) {