diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper index 31ec5b709..ab85e893f 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper differ 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