From 60b419521736df1f1324a0b5280d69a4eccee5dc Mon Sep 17 00:00:00 2001 From: "lucas.calixto" Date: Mon, 5 Jun 2017 20:31:20 +0000 Subject: [PATCH] fixes bug#8534 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69664 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioVendasComissao.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index 2427c32ea..ab9d53b5c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -239,7 +239,7 @@ public class RelatorioVendasComissao extends Relatorio { + "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 IS NULL OR C.MOTIVOCANCELACION_ID NOT IN (32, 99)) " + + "AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID NOT IN (10, 32, 99)) " + "AND C.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) "; if (StringUtils.isNotBlank(stringLsPuntoVentaId)) { @@ -252,13 +252,14 @@ public class RelatorioVendasComissao extends Relatorio { query += "GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION " + "UNION " - + "SELECT PV3.PUNTOVENTA_ID, PV3.NUMPUNTOVENTA, PV3.NOMBPUNTOVENTA, B.PTOVTAVENTA_ID, PV3.NUMPUNTOVENTA as NUMPTOVTAVENTA, PV3.NOMBPUNTOVENTA AS NOMBPTOVTAVENTA, B.INDSTATUSBOLETO, B.MOTIVOCANCELACION_ID, B.INDREIMPRESION, " + + "SELECT PV3.PUNTOVENTA_ID, PV3.NUMPUNTOVENTA, PV3.NOMBPUNTOVENTA, B.PTOVTAVENTA_ID, PV4.NUMPUNTOVENTA as NUMPTOVTAVENTA, PV4.NOMBPUNTOVENTA AS NOMBPTOVTAVENTA, B.INDSTATUSBOLETO, B.MOTIVOCANCELACION_ID, B.INDREIMPRESION, " + "COALESCE (B.PRECIOPAGADO,0) + COALESCE (B.IMPORTETAXAEMBARQUE,0) + COALESCE (B.IMPORTESEGURO,0) + COALESCE (B.IMPORTEPEDAGIO,0) + COALESCE (B.IMPORTEOUTROS,0) AS TOTAL, " + "COALESCE (B.IMPORTETAXAEMBARQUE,0) + COALESCE (B.IMPORTESEGURO,0) + COALESCE (B.IMPORTEPEDAGIO,0) + COALESCE (B.IMPORTEOUTROS,0) AS TOTAL_TAXAS " + "FROM BOLETO B " + "JOIN PUNTO_VENTA PV3 ON PV3.PUNTOVENTA_ID = B.PUNTOVENTA_ID " + + "LEFT JOIN PUNTO_VENTA PV4 ON PV4.PUNTOVENTA_ID = B.PTOVTAVENTA_ID " + "JOIN MARCA M2 ON M2.MARCA_ID = B.MARCA_ID " - + "WHERE (B.MOTIVOCANCELACION_ID IN(32, 99)) " + + "WHERE (B.MOTIVOCANCELACION_ID IN(10, 32, 99)) " + "AND B.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) "; if (StringUtils.isNotBlank(stringLsPuntoVentaId)) {