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

fixes bug#14522 

dev: fabio
qua: xxx


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@95740 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucassilverio 2019-07-15 13:16:33 +00:00
parent 5ea8b30b0f
commit c1657753f6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -157,7 +157,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN 'VENDA NORMAL' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
@ -165,7 +165,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN 'VENDA TRANSITO' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
@ -173,7 +173,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" AND c.PORCCATEGORIA > 0 ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18)) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN cat.DESCCATEGORIA ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
@ -185,6 +185,14 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" THEN 'VENDA ANTECIPADA' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (99)) ");
sql.append(" THEN 'VENDA EMBARCADA' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5,18)) ");
sql.append(" THEN 'IMPRESSAO POSTERIOR' ");
sql.append(" ");