From 79c3f62f1192a3c2869bf81966502e3e91365118 Mon Sep 17 00:00:00 2001
From: "eduardo.dicarde" <eduardo.dicarde@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 31 Mar 2017 20:30:21 +0000
Subject: [PATCH] fixes bug #8839

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67537 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/relatorios/impl/RelatorioDescontos.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
index af66f19c5..5db43cf68 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
@@ -41,7 +41,8 @@ public class RelatorioDescontos extends Relatorio {
 				NamedParameterStatement statement = new NamedParameterStatement(coneConnection, query);
 				statement.setTimestamp("fecVentaInicial", fecVentaInicial);
 				statement.setTimestamp("fecVentaFinal", fecVentaFinal);
-				if(idPuntoVenta != null) {
+				
+				if(idPuntoVenta != null && idPuntoVenta != -1) {
 					statement.setInt("idPuntoVenta", idPuntoVenta);
 				}
 				if(codconvenio != null && !codconvenio.isEmpty()) {
@@ -119,7 +120,7 @@ public class RelatorioDescontos extends Relatorio {
 			query +=" AND BOL.EMPRESACORRIDA_ID IN ( " + (String)parametros.get("EMPRESAIDS") + ")" ;	
 		}				
   
-  		if(idPuntoVenta != null) {
+  		if(idPuntoVenta != null && idPuntoVenta != -1) {
   			query += " AND (BOL.PUNTOVENTA_ID = :idPuntoVenta) ";
   		}
   		if (codconvenio != null && !codconvenio.isEmpty()) {