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

fixes bug#8885 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68185 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2017-04-20 17:54:23 +00:00
parent 6c70ae6cd6
commit 8f994e077a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
View File

@ -239,8 +239,8 @@ 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 != 99 "
+ "AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ";
+ "AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID <> 99) "
+ "AND C.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) ";
if (StringUtils.isNotBlank(stringLsPuntoVentaId)) {
query += "AND C.PUNTOVENTA_ID IN(" + stringLsPuntoVentaId + ") ";
@ -270,7 +270,7 @@ public class RelatorioVendasComissao extends Relatorio {
.append("WHERE C.INDSTATUSBOLETO = 'C' ")
.append("AND (C.MOTIVOCANCELACION_ID IN(32, 10) AND C.INDREIMPRESION = 0) ");
sQuery.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ");
sQuery.append("AND C.FECHORVENTA BETWEEN CAST(:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) ");
if(parametros.get("EMPRESA_ID")!= null) {
sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID ");
}