From 120dee8328dd0109578cf677c0f778c9f0eb7a7d Mon Sep 17 00:00:00 2001
From: "lucas.calixto" <lucas.calixto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 19 Apr 2017 17:46:24 +0000
Subject: [PATCH] fixes bug#8885

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68167 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioVendasComissao.java         | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
index 00796bc81..bed21efb5 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
@@ -228,31 +228,33 @@ public class RelatorioVendasComissao extends Relatorio {
 	}
 
 	protected String getSql() {
-		StringBuilder sQuery = new StringBuilder();
 		
-		sQuery.append("SELECT PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA as NUMPTOVTAVENTA, PV1.NOMBPUNTOVENTA AS NOMBPTOVTAVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION, ")
-			  .append("SUM(COALESCE (C.PRECIOPAGADO,0) + COALESCE (C.IMPORTETAXAEMBARQUE,0) + COALESCE (C.IMPORTESEGURO,0) + COALESCE (C.IMPORTEPEDAGIO,0) + COALESCE (C.IMPORTEOUTROS,0)) AS TOTAL, ")
-			  .append("SUM(COALESCE (C.IMPORTETAXAEMBARQUE,0) + COALESCE (C.IMPORTESEGURO,0) + COALESCE (C.IMPORTEPEDAGIO,0) + COALESCE (C.IMPORTEOUTROS,0)) AS TOTAL_TAXAS ")
-			  .append("FROM CAJA C ")
-			  .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
-			  .append("JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID ")
-			  .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ")
-			  .append("WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) ")
-			  .append("OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) ")
-			  .append("OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) ");
+		String query = "SELECT PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA as NUMPTOVTAVENTA, PV1.NOMBPUNTOVENTA AS NOMBPTOVTAVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION, "
+				+ "SUM(COALESCE (C.PRECIOPAGADO,0) + COALESCE (C.IMPORTETAXAEMBARQUE,0) + COALESCE (C.IMPORTESEGURO,0) + COALESCE (C.IMPORTEPEDAGIO,0) + COALESCE (C.IMPORTEOUTROS,0)) AS TOTAL, "
+				+ "SUM(COALESCE (C.IMPORTETAXAEMBARQUE,0) + COALESCE (C.IMPORTESEGURO,0) + COALESCE (C.IMPORTEPEDAGIO,0) + COALESCE (C.IMPORTEOUTROS,0)) AS TOTAL_TAXAS "
+				+ "FROM CAJA C "
+				+ "JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID "
+				+ "JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID "
+				+ "LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID "
+				+ "WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) "
+				+ "OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) "
+				+ "OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) "
+				+ "AND C.MOTIVOCANCELACION_ID != 99 "
+				+ "AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ";
 		
 		if (StringUtils.isNotBlank(stringLsPuntoVentaId)) {
-			sQuery.append("AND C.PUNTOVENTA_ID IN(" + stringLsPuntoVentaId + ") ");
+			query += "AND C.PUNTOVENTA_ID IN(" + stringLsPuntoVentaId + ") ";
 		}
 		
-		sQuery.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ");
 		if(parametros.get("EMPRESA_ID")!= null){
-			sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID ");
+			query += "AND M.EMPRESA_ID =:EMPRESA_ID ";
 		}
-		sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION ")
-			.append("ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO");
 		
-		return sQuery.toString();
+		query += "GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION "
+				+ "ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO";
+		
+		return query;
+		
 	}
 	
 	protected String getSqlCancelados() {