diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
index aa044b486..cf4e7c313 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
@@ -183,12 +183,32 @@ public class RelatorioOrigemDestino extends Relatorio {
sql.append(" AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
sql.append(" AND ca.indreimpresion = 0 ");
sql.append(" AND CA.PRECIOBASE IS NOT NULL ");
+ sql.append(" AND CO.ACTIVO = 1 ");
if (bilhetesGratuitos) {
sql.append(" AND CA.PRECIOBASE >= 0 ");
} else {
sql.append(" AND CA.PRECIOBASE > 0 ");
}
- sql.append(" ) ABSOLUTO_TOTAL_CORRIDA ");
+ sql.append(" ) ABSOLUTO_TOTAL_CORRIDA, ");
+
+ sql.append(" (RESULTADO.KM_TRAMO/SUM(TR.CANTKMREAL))*");
+ sql.append(" ( SELECT COUNT(*) ");
+ sql.append(" FROM caja ca ");
+ sql.append(" INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
+ sql.append(" WHERE CA.ACTIVO = 1 ");
+ sql.append(" AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+ sql.append(" AND CA.CORRIDA_ID = RESULTADO.CORRIDA_ID ");
+ sql.append(" AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+ sql.append(" AND ca.indreimpresion = 0 ");
+ sql.append(" AND CA.PRECIOBASE IS NOT NULL ");
+ sql.append(" AND CO.ACTIVO = 1 ");
+ if (bilhetesGratuitos) {
+ sql.append(" AND CA.PRECIOBASE >= 0 ");
+ } else {
+ sql.append(" AND CA.PRECIOBASE > 0 ");
+ }
+ sql.append(" ) EQUIVALENTE_TOTAL_CORRIDA ");
+
sql.append(" FROM ");
sql.append(" ( ");
sql.append(" SELECT ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper
index 8e295df13..e1c3f69ad 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
index 1db3931f5..c5c85938e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
@@ -34,6 +34,7 @@
+
@@ -56,7 +57,7 @@
-
+
@@ -70,9 +71,6 @@
-
-
-
@@ -82,6 +80,9 @@
+
+
+
@@ -164,45 +165,45 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -228,19 +229,19 @@
-
+
-
+
-
+
@@ -258,35 +259,35 @@
-
+
-
+
-
+
-
+
-
+
@@ -366,17 +367,12 @@
-
-
-
-
-
-
+
-
+
-
+
@@ -386,19 +382,14 @@
-
-
-
-
-
-
+
-
+
@@ -460,28 +451,28 @@
-
+
-
+
-
+
-
+
@@ -498,6 +489,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -605,27 +611,27 @@
-
+
-
+
-
+
-
+
-
+