diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java index 5db43cf68..1ef37064e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java @@ -95,9 +95,29 @@ public class RelatorioDescontos extends Relatorio { + " BOL.CORRIDA_ID AS codServico, " + " ORIG.CVEPARADA AS codOrigem, " + " DEST.CVEPARADA AS codDestino, " - + " BOL.PRECIOPAGADO AS tarifaComDesconto, " - + " BOL.IMPORTETAXAEMBARQUE AS tut, " - + " BOL.IMPORTEPEDAGIO AS pedagio, " + + + " (case " + + " when ( bol.indcancelacion = 1 ) " + + " then (-1 *(Abs( BOL.PRECIOPAGADO ) )) " + + " else " + + " BOL.PRECIOPAGADO " + + " END) AS tarifaComDesconto, " + + + + " (case " + + " when ( bol.indcancelacion = 1 ) " + + " then (-1 *(Abs( BOL.IMPORTETAXAEMBARQUE ) )) " + + " else " + + " BOL.IMPORTETAXAEMBARQUE " + + " END) AS tut, " + + + " (case " + + " when ( bol.indcancelacion = 1 ) " + + " then (-1 *(Abs( BOL.IMPORTEPEDAGIO ) )) " + + " else " + + " BOL.IMPORTEPEDAGIO " + + " END) AS pedagio, " + + " BOL.NOMBPASAJERO AS nomepassageiro, " + " BOL.DESCNUMDOC AS documento," + " U.CVEUSUARIO AS bilheteiro, "