diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java index 8990bc611..fb5352e54 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java @@ -188,9 +188,9 @@ public class RelatorioTaxasLinha extends Relatorio { sql.append(" ELSE "); sql.append(" 'N' "); sql.append(" END INTERESTADUAL, "); - sql.append(" SUM(CJ.IMPORTETAXAEMBARQUE) TOTAL_EMBARQUE, "); - sql.append(" SUM(CJ.IMPORTEPEDAGIO) TOTAL_PEDAGIO, "); - sql.append(" SUM(CJ.IMPORTESEGURO) TOTAL_SEGURO "); + sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTETAXAEMBARQUE) TOTAL_EMBARQUE, "); + sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTEPEDAGIO) TOTAL_PEDAGIO, "); + sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTESEGURO) TOTAL_SEGURO "); sql.append(" FROM CORRIDA CR, "); sql.append(" RUTA RT, "); sql.append(" PUNTO_VENTA PV, "); @@ -212,7 +212,6 @@ public class RelatorioTaxasLinha extends Relatorio { sql.append(" AND CD.CIUDAD_ID = PD.CIUDAD_ID "); sql.append(" AND CJ.INDSTATUSOPERACION = 'F' "); sql.append(" AND CJ.INDREIMPRESION = 0 "); - sql.append(" AND CJ.INDCANCELACION = 0 "); sql.append(" AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN "); sql.append(" :DATA_INICIAL AND :DATA_FINAL "); sql.append(" AND EM.EMPRESA_ID = NVL(:EMPRESA_ID, EM.EMPRESA_ID) ");