From 500a343d8646f8ab338950d93b9a4620a260d8c3 Mon Sep 17 00:00:00 2001
From: fabio <fabio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 19 Aug 2021 13:40:21 +0000
Subject: [PATCH] fixes bug#23068 dev: Celio qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108385 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioLinhasHorarioSimplificado.java   |   1 -
 .../RelatorioLinhasHorarioSimplificado.jasper | Bin 87969 -> 87973 bytes
 .../RelatorioLinhasHorarioSimplificado.jrxml  |   8 ++++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java
index 8e9964089..fed12cfc4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java
@@ -362,7 +362,6 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio {
 		BigDecimal eq = null;
 		try {
 			eq = horarioBean.getMediaReceitaViagem().divide(horarioBean.getTarifa(), 2, 4);
-			eq = BigDecimal.ZERO;
 		} catch (ArithmeticException e) {
 			eq = BigDecimal.ZERO;
 		} catch (NullPointerException nex) {
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper
index d1e346af347a13c43816541fe150541c13ca774a..fca3f372bc32c046795055d5ac61ad54e5ae06ba 100644
GIT binary patch
delta 195
zcmZ3uo^|PZ)(weWnoJgEg$#8pTS^#&4E4-R4UmA5AxLIx2?MjafknmSIy3Ffo4d~P
zP42wUGg)wQ(&kSyS%WQ;PW{`pkAZ<fk6D?KK|3flC$S{IC^O$DGcO~t*dxCv5y*)*
zG&8a^Hn%h|GBCF=iMKQ~GdH)~to!zu6=VPQFY1i{1wga~l=fsy<&_l0s;7j(XtE)@
K%=GSXMlk?|?>@%>

delta 191
zcmZ3wo^|1R)(weW>Wl`340SA9N*Dx<^^6QnjV+9UqyY$+f+V(<Fff}MSXNA~Gt=I@
zwd*Y3<mEGpHh-AO8f+GS>ff$?3=9l<%*u=m8bPT!i6!|(nfX4Mc^Qet9{ELyKu)}&
znUSTDk%_UXiIJ&syt$#-X1%w^tQhZ3w^e5p-_E1K_(A~Au|(#0G5YZe3t{S?UJ%Y`
F3IIdAJ2(IU

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
index f5cfd6351..79211eb68 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioLinhasHorario" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="812" leftMargin="20" rightMargin="10" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
-	<property name="ireport.zoom" value="3.215383215000005"/>
-	<property name="ireport.x" value="509"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.zoom" value="1.6500000000000021"/>
+	<property name="ireport.x" value="708"/>
+	<property name="ireport.y" value="86"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
 	<parameter name="DATA_INICIO" class="java.util.Date">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -119,7 +119,7 @@
 		<variableExpression><![CDATA[$P{TOTAL_PASSAGENS}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
 	</variable>
 	<variable name="TOTAL_RSKM" class="java.math.BigDecimal">
-		<variableExpression><![CDATA[$P{TOTAL_PASSAGENS}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
+		<variableExpression><![CDATA[$P{TOTAL_TOTAL}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
 	</variable>
 	<variable name="TOTAL_VIAGEM" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{rsViagem}]]></variableExpression>