bug#10637
dev:julio qua:marcelo git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79313 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
13da57281a
commit
371878bad1
|
@ -240,7 +240,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
|
|||
|
||||
sql.append(" where c.activo = 1 AND po.activo = 1 AND co.activo = 1 AND eo.activo = 1 ");
|
||||
sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 ");
|
||||
sql.append(" and (c.indreimpresion = 0 and c.motivocancelacion_id is null) ");
|
||||
sql.append(" and c.motivocancelacion_id is null ");
|
||||
sql.append(" and ccp.feccorte >= :DATE_INICIO and ccp.feccorte <= :DATE_FIM ");
|
||||
sql.append(" and ccp.empresa_id = :EMPRESA_ID ");
|
||||
sql.append(ufs == null ? "" : " and ((case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) in ( " + ufs + " )) ");
|
||||
|
|
|
@ -246,7 +246,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
|
||||
sql.append(" where c.activo = 1 AND po.activo = 1 AND co.activo = 1 AND eo.activo = 1 ");
|
||||
sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 ");
|
||||
sql.append(" and (c.indreimpresion = 0 and c.motivocancelacion_id is null) ");
|
||||
sql.append(" and c.motivocancelacion_id is null ");
|
||||
sql.append(" and ccp.feccorte >= :DATE_INICIO and ccp.feccorte <= :DATE_FIM ");
|
||||
sql.append(" and ccp.empresa_id = :EMPRESA_ID ");
|
||||
sql.append(ufs == null ? "" : " and ((case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) in ( " + ufs + " )) ");
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue