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

fixes bug #7401 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55385 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-04-29 13:51:46 +00:00
parent 05a85ab06c
commit ed3da1f82c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -132,7 +132,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" EST.ESTADO_ID AS ESTADO_ID, ");
sql.append(" EST.NOMBESTADO AS ESTADO, ");
sql.append(" EST.CVEESTADO AS UF, ");
sql.append(" EST.ICMS AS ICMS, ");
sql.append(" EI.ICMS AS ICMS, ");
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
sql.append(" CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END IS_ESTADUAL, ");
sql.append(" EI.PORCREDMUNICIPAL AS PORC_MUNICIPAL, ");
@ -150,9 +150,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR ");
sql.append(" AIDF.SERIE = SUBSTR(B.NUMSERIEPREIMPRESA,1,INSTR(B.NUMSERIEPREIMPRESA,'-',1)-1)) ");
sql.append(" AND (B.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) ");
sql.append("WHERE B.MOTIVOCANCELACION_ID = 32 ");
sql.append("WHERE B.MOTIVOCANCELACION_ID IN (32,10) ");
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
sql.append("AND B.INDCANCELACION = 1 ");
sql.append("AND B.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') ");
sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") ");
@ -169,7 +168,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" EST.ESTADO_ID, ");
sql.append(" EST.NOMBESTADO, ");
sql.append(" EST.CVEESTADO, ");
sql.append(" EST.ICMS, ");
sql.append(" EI.ICMS, ");
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY'), ");
sql.append(" (CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END), ");
sql.append(" EI.PORCREDMUNICIPAL, ");