From 5ba35ef12c04f42ef80671aff3bc8dbf29e5d00e Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 12 Jun 2018 19:19:53 +0000 Subject: [PATCH] fixes bug#11350 dev: Julio qua: Wallysson git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@82571 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFinanceiroAnalitico.java | 4 ++-- .../relatorios/impl/RelatorioFinanceiroSintetico.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java index 8b6774003..802750149 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java @@ -359,7 +359,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio { sql.append(" AND c.numfoliosistema IS NOT NULL) OR (c.indstatusboleto = 'E' AND c.indreimpresion = 1)) "); sql.append(" AND (COALESCE(c.preciopagado,0) + COALESCE(c.importetaxaembarque,0) + COALESCE(c.importeseguro,0) + COALESCE(c.importepedagio,0) + COALESCE(c.importeoutros,0)) > 0 "); sql.append(" AND c.feccreacion >= :DATE_INICIO AND c.feccreacion <= :DATE_FIM "); - sql.append(" AND c.empresacorrida_id = 10 "); + sql.append(" AND e.empresa_id = :EMPRESA_ID "); sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) "); sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) "); @@ -398,7 +398,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio { sql.append(" AND (c.motivocancelacion_id IS NULL "); sql.append(" OR c.motivocancelacion_id <> 35) "); sql.append(" AND c.indcancelacion = 0 "); - sql.append(" AND c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" AND e.empresa_id = :EMPRESA_ID "); sql.append(" AND c.feccreacion BETWEEN :DATE_INICIO AND :DATE_FIM "); sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java index 3c2171f78..8034fe0e0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -383,10 +383,10 @@ public class RelatorioFinanceiroSintetico extends Relatorio { sql.append(" AND eo.activo = 1 "); sql.append(isBpe ? " and bpe.bpe_id is not null " : " AND c.serieimpfiscal IS NOT NULL "); sql.append(" AND ((c.indreimpresion = 0 AND c.motivocancelacion_id IS NULL "); - sql.append(" AND c.numfoliosistema IS NOT NULL) OR (c.indstatusboleto = 'E' AND c.indreimpresion = 1)) "); + sql.append(" AND c.numfoliosistema IS NOT NULL) OR (c.indstatusboleto = 'E' AND c.indreimpresion = 1)) "); sql.append(" AND (COALESCE(c.preciopagado,0) + COALESCE(c.importetaxaembarque,0) + COALESCE(c.importeseguro,0) + COALESCE(c.importepedagio,0) + COALESCE(c.importeoutros,0)) > 0 "); sql.append(" AND c.feccreacion >= :DATE_INICIO AND c.feccreacion <= :DATE_FIM "); - sql.append(" AND c.empresacorrida_id = 10 "); + sql.append(" AND e.empresa_id = :EMPRESA_ID "); sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) "); sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) "); @@ -426,7 +426,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio { sql.append(" AND (c.motivocancelacion_id IS NULL "); sql.append(" OR c.motivocancelacion_id <> 35) "); sql.append(" AND c.indcancelacion = 0 "); - sql.append(" AND c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" AND e.empresa_id = :EMPRESA_ID "); sql.append(" AND c.feccreacion BETWEEN :DATE_INICIO AND :DATE_FIM "); sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) ");