From 1654880f55ef7db34daf08eeda9ab345217c9a2b Mon Sep 17 00:00:00 2001
From: celio <celio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 19 Oct 2021 13:54:32 +0000
Subject: [PATCH] fixes bug#23137 dev: VALDEVIR qua: Juliane

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109215 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioDescontos.java   | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

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, "