From 9ea28d5a0778753ade3df8949e5c2c69db7a87a8 Mon Sep 17 00:00:00 2001 From: gleimar Date: Tue, 27 Aug 2013 14:30:46 +0000 Subject: [PATCH] =?UTF-8?q?-=20ajustes=20homologa=C3=A7a=C3=B5?= 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@30152 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioTrechoVendido.jasper | Bin 38186 -> 40963 bytes .../templates/RelatorioTrechoVendido.jrxml | 56 ++++++++++++++++-- web/WEB-INF/i3-label_pt_BR.label | 2 +- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper index 31ec5b709c4b0bfefc472782802994446c9be611..ab85e893f35ecbd50b7de47223b159f124c004a5 100644 GIT binary patch delta 13255 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 D(IY^c diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml index b96704dfc..7b463255b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml @@ -1,7 +1,7 @@ - + @@ -45,22 +45,28 @@ ON ( c.DESTINO_ID = destino.PARADA_ID ) -INNER JOIN CORRIDA cor +LEFT JOIN CORRIDA cor ON ( c.CORRIDA_ID = cor.CORRIDA_ID AND c.FECCORRIDA = cor.FECCORRIDA ) + +LEFT JOIN MARCA m +ON + ( + m.marca_id = c.marca_id + ) LEFT JOIN EMPRESA e ON ( - e.EMPRESA_ID = c.EMPRESAPUNTOVENTA_ID + e.EMPRESA_ID = m.empresa_id ) WHERE c.FECHORVENTA BETWEEN $P{DATA_INICIO} AND $P{DATA_FINAL} AND ((c.PUNTOVENTA_ID IN ( $P!{PUNTOVENTA_ID} )) OR ($P{PUNTOVENTA_ID} = '-1')) - + AND c.motivocancelacion_id is null AND e.NOMBEMPRESA LIKE $P{NOMBEMPRESA_SEARCH} GROUP BY origem.DESCPARADA , @@ -92,6 +98,15 @@ ORDER BY + + + + + + + + + @@ -295,7 +310,7 @@ ORDER BY - + @@ -311,7 +326,36 @@ ORDER BY - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 4c4acb89b..94bac7e10 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7,7 +7,7 @@ # . . = XXX #Versao do VentaBoleto: -versao = ADM_20130827_1RC210 +versao = ADM_20130827_1RC211 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100