From a426255acc9754dc85207a6ddcec9012c092600c Mon Sep 17 00:00:00 2001 From: "bruno.neves" Date: Fri, 11 Aug 2017 13:58:14 +0000 Subject: [PATCH] =?UTF-8?q?fix=20bug=20#0009384=20-=20Adicionada=20coluna?= =?UTF-8?q?=20de=20esta=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72551 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioAidfDetalhado.jasper | Bin 30873 -> 31734 bytes .../templates/RelatorioAidfDetalhado.jrxml | 29 +++++++++++++----- .../RelatorioAidfDetalhadoController.java | 1 + 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jasper index a028a06c8a0f1449685c23eaef24665bf8631faf..f27baf436238f658a0aea72d2f77d1f6328a4e98 100644 GIT binary patch delta 10564 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 delta 10054 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 G3jYtOr!AcT diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml index 66a648d01..fe50c85f7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml @@ -22,6 +22,7 @@ + @@ -95,7 +96,7 @@ - + @@ -109,14 +110,14 @@ - + - + @@ -137,25 +138,32 @@ - + + + + + + + + - + - + @@ -170,7 +178,7 @@ - + @@ -190,10 +198,15 @@ - + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java index 76a7bf0c1..517e0edad 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java @@ -180,6 +180,7 @@ public class RelatorioAidfDetalhadoController extends MyGenericForwardComposer { puntoVentaBusqueda.addFilterILike("nombpuntoventa", "%" + txtNombrePuntoVenta.getValue() + "%"); puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); + puntoVentaBusqueda.addFilterNotEqual("puntoventaId", -1); puntoVentaBusqueda.addSortAsc("nombpuntoventa");