From 6d4d722b8a2f27a9391faca60448481d720d567c Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 17 Oct 2017 18:00:56 +0000
Subject: [PATCH] fixes bug #9950

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75057 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioCancelamentoTransacao.java  |  36 +++++++++---------
 .../RelatorioCancelamentoTransacao.jasper     | Bin 39002 -> 38994 bytes
 .../RelatorioCancelamentoTransacao.jrxml      |   4 +-
 ...atorioCancelamentoTransacaoController.java |   2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java
index f21af1b73..724921846 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java
@@ -90,29 +90,29 @@ public class RelatorioCancelamentoTransacao extends Relatorio {
 		   .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
 		   .append("WHERE OCD.FECINC BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') ");
 
-		Constante constante = constanteService.buscarPorNomeConstante("PUNTO_VENTA_J3");
-		if(constante != null
-				&& constante.getActivo()
-				&& constante.getValorconstante() != null
-				&& !constante.getValorconstante().isEmpty()){
-			sql.append("AND (B.PTOVTAVENTA_ID = ")
-			   .append(constante.getValorconstante())
-			   .append(" OR B.PUNTOVENTA_ID = ")
-			   .append(constante.getValorconstante())
-					.append(" OR OCD.INDPUNTOVENTAESTORNO = 1 ")
-			   .append(") ");
-		}else{
-			sql.append("AND (B.PTOVTAVENTA_ID = 99999 ")
-			   .append("OR B.PUNTOVENTA_ID = 99999) ");
+		
+		if (parametros.get("PUNTOVENTA_ID") != null) {
+			sql.append(" AND ((B.PUNTOVENTA_ID = :puntoventaId  AND (B.PTOVTAVENTA_ID IS NULL OR B.PUNTOVENTA_ID = B.PTOVTAVENTA_ID)) OR B.PTOVTAVENTA_ID = :puntoventaId) ");
+		} else {
+			Constante constante = constanteService.buscarPorNomeConstante("PUNTO_VENTA_J3");
+			if(constante != null
+					&& constante.getActivo()
+					&& constante.getValorconstante() != null
+					&& !constante.getValorconstante().isEmpty()){
+				sql.append("AND ((B.PTOVTAVENTA_ID = ")
+				   .append(constante.getValorconstante())
+				   .append("  AND (B.PTOVTAVENTA_ID IS NULL OR B.PUNTOVENTA_ID = B.PTOVTAVENTA_ID)) ")
+				   .append(" OR B.PUNTOVENTA_ID = ")
+				   .append(constante.getValorconstante())
+				   .append(") ");
+			}else{
+				sql.append("AND OCD.INDPUNTOVENTAESTORNO = 1 ");
+			}
 		}
 
 		if (parametros.get("EMPRESA_ID") != null) {
 			sql.append(" AND E.EMPRESA_ID = :empresaId ");
 		}
-		
-		if (parametros.get("PUNTOVENTA_ID") != null) {
-			sql.append(" AND B.PUNTOVENTA_ID = :puntoventaId");
-		}
 
         return sql.toString();
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jasper
index 95dee806e8add2a3eda2e9e6555516faf68331ee..43d1d96ff610d2ec016a6ced13f093e701c26987 100644
GIT binary patch
delta 4806
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
Q*4+@{|2!(7+Yed(13Qyj7ytkO

delta 4840
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
QH$BdOMZzyy%g&_y2gW2~LjV8(

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jrxml
index 4bf949a33..c87341e1f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jrxml
@@ -131,7 +131,7 @@
 				<box>
 					<bottomPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<textElement verticalAlignment="Top">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
@@ -171,7 +171,7 @@
 				<box>
 					<bottomPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+				<textElement verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoTransacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoTransacaoController.java
index 4bf6a4935..2579bd7de 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoTransacaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoTransacaoController.java
@@ -114,7 +114,7 @@ public class RelatorioCancelamentoTransacaoController extends MyGenericForwardCo
 					parametros.put("PUNTOVENTA_ID", puntoventa.getPuntoventaId());
 					filtro.append(puntoventa.getNombpuntoventa() + ";");
 				} else {
-					filtro.append("Todas;");
+					filtro.append("J3;");
 				}
 					
 				parametros.put("FILTROS", filtro.toString());