From 800faa4bf1736523abe27671a304d7a3f43a7506 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 10 Sep 2013 19:14:20 +0000
Subject: [PATCH] =?UTF-8?q?=20RLH=20-=20Homologa=C3=A7=C3=A3o=20de=20Itens?=
 =?UTF-8?q?=20(2908)?=
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@30813 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioLinhasHorario.java          |  23 +++++++++++++++---
 .../templates/RelatorioLinhasHorario.jasper   | Bin 110006 -> 110610 bytes
 .../templates/RelatorioLinhasHorario.jrxml    |   8 +++---
 src/java/versionADM.info                      |   2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
index 01c323e54..195fd0813 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
@@ -16,7 +16,6 @@ import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.GrupoRuta;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
-import com.rjconsultores.ventaboletos.relatorios.utilitarios.ProcessadorParametros;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
@@ -76,8 +75,6 @@ public class RelatorioLinhasHorario extends Relatorio {
 				Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID");
 				String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta);
 
-				System.out.println(sql);
-
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
 				ResultSet rset = null;
 
@@ -195,7 +192,10 @@ public class RelatorioLinhasHorario extends Relatorio {
 
 					totalPaxKMOfertado = totalPaxKMOfertado.add(horarioBean.getPaxKmOfertado() != null ? horarioBean.getPaxKmOfertado() : BigDecimal.ZERO);
 					totalPaxKMTransportado = totalPaxKMTransportado.add(horarioBean.getPaxKmTransportado() != null ? horarioBean.getPaxKmTransportado() : BigDecimal.ZERO);
-					totalIAP = totalIAP.add(horarioBean.getIap() != null ? horarioBean.getIap() : BigDecimal.ZERO);
+
+					// totalIAP = totalIAP.add(horarioBean.getIap() != null ? horarioBean.getIap() : BigDecimal.ZERO);
+
+					totalIAP = calcTotalIap(totalPaxKMTransportado, totalPaxKMOfertado);
 
 				}
 
@@ -367,6 +367,21 @@ public class RelatorioLinhasHorario extends Relatorio {
 		return horarioBean;
 	}
 
+	private BigDecimal calcTotalIap(BigDecimal totalPaxKMTransportado, BigDecimal totalPaxKMOfertado) {
+		BigDecimal iap = null;
+		BigDecimal CENTO = BigDecimal.TEN.multiply(BigDecimal.TEN);
+		try {
+			iap = (totalPaxKMTransportado.multiply(CENTO)).divide(totalPaxKMOfertado, 2, RoundingMode.HALF_EVEN);
+		} catch (ArithmeticException e) {
+			iap = BigDecimal.ZERO;
+		} catch (NullPointerException nex) {
+			iap = BigDecimal.ZERO;
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+		return iap;
+	}
+
 	@Override
 	protected void processaParametros() throws Exception {
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper
index 48eecfdcbfc9cfcd0ff5bb9af739acc63ea1238c..d4ea598aa10be5738f1c1b3f1bdc0f9bd39bfae6 100644
GIT binary patch
delta 20165
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
F{~x*(mB#=8

delta 19721
zcmeHt3v?F6`TovjXTQvHO(0w%5FlIx3<Ly3fdKK=NVtPs#h42OA$KlX^{Z4st5V<t
zzqVKut3@q;!HS83A{Q@+C<uz00t%&yfT9Q}p!j=d-q}s!x7z;BucxQ~bF62k&$G|$
z`@B25-|V~_mV6{C{wCIbUm01uwjOB}d3sa=X9d~Ck!PQKA@Y4?vq<>)Ps#R3!TO`n
zkJ@mAY=5TT3u_7Ck<VY8XY=CX;__&>ERq;mxN#aBJiBo&^tZiq2lVH4f9t0CfXU|H
zK!4xnUqjzu%Y3d*jI=6f9&tAIkDT0cF&w^V>uu2ge(Rkmu6eDA7Rz4l2!|hhS&7YF
zSpfaYS0cvvp&_KD8bo?W22M(dY>3p6CDtA6ICKt=WWM$b$ad*#j6mwY+jbuMrLUib
zLkqWeQy1{k8}E~sBTsi|9{KBz^zb%ylI~tDE(2^$vaGG6AkAW5*oMOOKPKGxW5P`V
z0tD7JxoE-ea9)jUZgWZG;Wtl{_jOil-x?g=ugrB<6_6FG0a?`)YGqYZsFjrwVza8!
zS^Z__^(LzpyVAo)RaUw?5|9<D0a?`)YGqYZsFjrwVzWA;vvS|gF<IU7cK@*RwMt8O
zrvuVLH6X2;LanrF3boQQLhZCTn4i{Z&E7rUq;-6Ey2~M}knU*Y%c_J{$Yb-sF+8$)
zZ-T%vkvsP!G&93%dqG61t*Z7MGgcqHlkPTCR=R7Vt&j&;p`fh{R90qqj8&7!%6IPp
zo5i;!MXui4-)*mKbeE!SkO$bHplu9PHfDH?O^Uvv9`B7aSG4NA47Z1}(p{RiLLOj+
zg0?bHS()K6R%zPm_wSb)tM(rZb~BWf?$Wgt@&GFow3UI%$_$UOO4nActEPYznVJ-N
zw5k;u7}<QVjXOda>TZ}eL>^#>f;Kcz8JgiShQq+HRb;{6!s?FoPKvbI*MVe557s43
zBcHz?7rA*~BXiMz*q83+s~mKft8+jekOK-j2Ln|OW_U~vx$2^yxqJWJ1iTu4IEdVf
z33U61jLiBl!6fkLhlAb4DgoUs)CnLDNB{+$fPpFjGdw1Ng?iQ>`ltY`4$e%9q#W!(
z9<0ux@SvB&g9lrZMUl6scW^^1RVuoR+<87B+3<i=aG*}bK$QwY$OO+Y>-rs`hjc1S
z4&4B$e0gXPSzVpRn7?BhNs)PfZ-Hsl2|caS(A^q6Bgg~NKtZQrpi09Gk4a;VPUF_Y
z-qLj9a7Xfjmr4tBN2dP6%toEiW|fBSUeakG4@d(AorZxb4Kq9@jh7;6A1^R&dp_<+
zcBmBEL|T60-H^ebWVmlDZ{6+G-pB*IQPAE7g10bm;PECjv{PU9l}FU;ORZm(M+Uhc
zs_?qoufrn`2#<meZ=ecqpbo!3a_6Vs<+MGT;eMt<>+YBijXWSU3OclbDzt$*^f8@z
z(lKv2{Oz$pbwcM=eBGVZ@sS6_M?uFoP{lV;$3Ls%FF3B^A3Q!OB@RNz>CVA;H8(&g
z#6|8rl^}3nWcU{zjIOkaha&@zHzke^{nck<%#F_dJR_xv3a`7y0pU^A;SE&b5n_0A
zScPw_!%sZng@5zJH7V^>c-^%P2#=}`Z=ec~5W}0pDtucV{`D^=nC#QP%t%o$k~rO^
z1%yXchc{4#M~LCgVHF<VJ-tt=d0%{TQp!LTT6gIIp;6VL4OF2KVrX+%g~oTypT3%C
zGH-q=BW0)xue+>(@TltW2CDD~F}yjf!e{A;i9hW<k@HVyq)bxbbvGd(JgPdpfhs&g
z3~vsr@Dn1#&)jV?KXoP}<z^LHcLf2VQPrUhRG|@KXmePFF3_1D|Juv^#&0rGZc*WN
zH#;Casye)ZDm+3AZw{;Qvvv5fXUD4S&rV8NphD|zUO;G6b!Y=sXoMKr99E&{>Cjux
zdC&T#=QC24sqngs1cXObhc{4#M~LCgVHG~2!*}^sXAYInL*Hhk{7Hq^-O7OQsOs<r
zs_+PP_-2S>UW9Qgwb$bB)QeD6UGhRk%39^6yQc!YP}N=rDldfSg*evhDed*`1@AXp
z`h7;qi^@xP8v?vg)m{cFFNElYIM!=}@>-Tl%p5Lzk7T55S6;d^MPseS6jkkIpz=b9
zUWjA8wkfaZ>x7s|j1HpU_MURn-Max-hN^ZmP`M#QH^i}S??%%c(w2;ic4lNU-nHms
z3=9t|L){$;Fho@w8mJ5rq9Ni~!$Y3oLhc)eY%u&%8S3stfFY{d&_HE~5DgK>8lLbB
zzqHAXaD}i#kIoQeV7s^r%29XU1~{Us9Su~D2+<L7tmC)Z(H&O?@vUi=Wi5)Vd@~_h
z>X3oPf2TtRrMMtV-NnV)qu@qcw}SUBj*PZ;NkVtTctXvJ)tnHMjg0fIzcNH}%^mI)
z2NT{@`Rgt*z#mog_ptIu9N=#RNI+k=w>g%Ho_{MzOf4V%qa^q~m+GY~1K#H-v_pSA
z2(a=;9N=$+82`4>e3ul}xEqn^<`7AWo_9&QnU2wQU^;rLOmx>HU^-C6bUdumK^%~d
z5n|Hm;Y~;Xy8iS3TwT(U3{czTo+hKTdXUjoDkI%x1Z0FNX5?X&5#oT1j1ZGihF);m
z)+c+&$Y|^Kq<OSq1GqicD|g+E4sb^m-94<_5eK*%A;x{Qc6S<*GS7WkL%8-l<*vJ&
z0C!Z;-NVWqae%uKV%&4I`+|5<?77D$fV+BvrS3`s+)+h$4=Z=X0q#bKaWB#Cyb&q&
z+!r?j_dAul?!p1?sG_@vl{?}9cO%5Ohqe2!8<RPndtxHE|5mx{?*0IGRMFkT${lfl
zyAfjC@7M03CZx!7U(y8J|ESz`w>-cdRdn|-xThfwa5qAXdt_6a)aYGJ;TLEg`3p_K
z{7Gf5yT=2}QAKkPt4l{5U~YsM^T+k2f6<Ig@Z9s8lMGp@+;taOJTAd89Q{zk6%cWN
zpAlmGp4EP1lgLERZ)Xx*?aRtfcUuCk7FBfju)12r0q#bKao?idH(yl!10UJ~+;=N?
z-R%l+M-|;YtlSX?xEmqHeV2A0*b;VA=1#9~3GS-Em%7^@;EpP~dsw+64sbU@jQf7=
zzPc5e>ACk!hNV?~1CY8q7T}I5x_el;BMxvkLX5lqyb$f)n#}Or*S98Dx0C7<0d{8t
z>`_H~4=a1b0rp0SvDaT8qHEh!+h5j}T-Q&1TX1z3@DTz9vmdJYR~REi-@X`9!4R>j
zcxV4G6<2?)h;~n@eg-$CkZbxiQK{%I;DZGUP0*!QDtH>Ef;b=*BgCYlzidP++L38^
zQ?mQDQ(5RPU>}4+yMQe4G|U2VKo&-b$wGesiKcZRv%N=SYX_K+9x4^x1$+ZR!EBCd
zO$eTbsUQwW#RxH}=#M4Q=R1;Hyi~F-hExWsRCE{c%>;#k0keXqVJe6NQZYhID*EF}
zG@}!_9a7ociDdU1s<O~sz^4@yh6ZGTr(qU|1F|qeOcweZO!V!}>UX26=;*jEB%|LX
zm5J^GzQUj|DIgO(4KqO;kckmuGMS*4uj?)$*PBdUyaY0trZUmpRE$-#@I_%-Kqhz^
zW`Z~%6C=cAGF4?#xh9poMCwD;ePR7ZD63N0?ZoOFy}cW0-lX?s-7f2MX`f!bdrt1z
zJFREWUXDeG)g^joCTUx_s~Z{8D!OMFi4VO&cSyR4z8U>&80i?=Nq0&5I(<9ZVmL`6
zd!l`YlZzX_OZUdncj$Y>61fGl3Uc#^b#=$+)5Az&^seC~t<wjzN}cpKVl|kSJuAEG
z^z6bZT}PIe78Fi#=zchBdO_jT?6MI3F!~{k?|+aUk`|?ZCsth9%$rini^{X7hv+|u
z<xVLrnpx}}_yqL4S=rNPW|!xs)uEr#4eG3;(IF#9>$J~^Rc~ruc5Ys2YH?m^K~Zi|
zh@K!;;tvxTG&4UxuhgMmMjswQS~dKNSTZ-aYgSg*Ti|~odOEsm1W9T|zn1hA{f1ca
z`uwtz>0L(^%*ZP%&z@22&~s5al0XLE((lx;3&d(4?LUgNYkox?x|3Ow9$-Y$lj?k)
zy!GMa5aZGLBgy3<!5lcwLeXs_NlKPvu3~jynoQ=o+2z@(Q;SNoL#!UL>U!6cJ*A)!
z4mE&F)alGDFPPr-N|*(Q#Y>i8{T9MR`-~zzx(Jr2LN*~5OU}&;v1Y^~V4qYSEWcoS
zd1+CIwIGp~_BU=8Vy%c}CnqO&gkh~!z85D0YD*%?2b!=DYZv`!6lqF2M9+>QZNeAB
zgyiOxXBSLQEzT}0%bt=~P+C+LVx1u~b9`0-94&-nmsB4s&CAIvD2FTP3b)jZ!>dfI
z9#ocBI;$WDGV1}!nnC4o=2SS;6Az76#$|cs1#oj&Z*}J|m+3|2A=amw=fLB`t{_%@
zqvy>jhm^A6q<%GGXO|Y_Lr&?@6QfDv@W5)NEN{w8HANZK5pK$!VlL~dTH}Tm=Y-fb
z#H!;ZtRG$Wi|Sm8N^?W(y6O>-i@Lp8)ibFd_wX1sZ!<z{Xtn9hGg3>7a<k$5;nnA7
z-&9rvS2wcy{JfHx1@NoLD=dc_KDyd@MltwYUz3AAuKEs?mR$#a6W~V$$%oa{=9Prl
zq-y`tGB2sg)wiiQd(Ke!0fkt0^*}f_sx({O^qgut`1dm*1}lU2U=-)&!gCDMIt5bD
z*PJ>fuT<Ts0ywGejIt@Ig+=gCL((@#7hX?VwlAcwNLrT_Nt(rqU<SP3{?O^UX?0ks
z{`s@A=<e%Drw+5!*eo_1ro|g}Ratq#4ET|#!MEVxTPxd+CC@gFmq#rI|5?tTNmkO6
z@c+xBM`w_G!+kA_WkM^2wgg%Qv?^#vpq;TS&Y{IaONN#T4aRdA&&NW`hgJ@4F0@6^
zRzO<~Z9TMY(Dp(*Y*}^)S{G=;puu<>#@jI7UT#@o`w0N+plyM+3)%r_$Dy6GECDBq
zL})3{x<eZPZ3wi9(BK=Im;-G-w58A<fwmSJyadD!XmAk%E<$_-*Giz(ht>jGXJ~z(
zT?1{j6}Frl0431E(C#N$s|4LZH;v<!bZgcs`%Dddv<5z)FvBssYaD;I#_{zvjz3l7
z_#-urhaadR{HBI*M~&m9oz_`jRM6Kp(bplR+)nFAiqFP?cFt$lf>y_8mxK1X&$<A+
z;Io!6@}deFHbEPJ_>C`85F2@np902x_A#*LK6@WnN1ttnC}({30<e=ldkRK&^4Y_{
zLcntLHSr}d^pr2&1tRs?EYQC7*;LRHeKsE0*b2HGq5!%~qfHg`t>@_OztZ<B=)SB~
zyjQfagd~P*9gBz2!+!ca_Bo6h@lVFU1(VBhOx7v}7fky4OkHq)pM}*G5AZ2mFd5`C
zb-`Eq3@(^l?K5@3*ZNFdaHh`&0~_qK{=kO#tQ#<MiI7^G8-SXt0on+dnKxhp*ck6b
z`VFvAK069*ywCOlo9MH*fZc#BdcKr2m(_C|ZB<5^kErHZtLPjU{VN;|sFy}RxL0%(
zD06>mO!VF|lGN@1glp6(fqqm$4+D&Yv*PtL0RlM>!p9&~zEMWnk>+s7QnyKX1FRQd
zz!4Y_l{3j&a;$R0Owx#i`;sqNIyucU$r*T6onwXMJS!pJvnAAG%P40R)Mn4qI95d^
z+fVDUBeXs{MibZ>+K8Q{O*yB{xI<g;c-oRTrfqmKZOhxz4m_21<Y}}E?@KS?=`@XJ
z((XKq_Tpn{Z$5!u!SiWfUO)$gc{v@(XVa_rTzWO1M>F{%dL56@p?n1$##ho&d^H`-
z*U)i%Jsr<qq&M(wbTWT~=J35Vmw!N~^24-%e?n*2AzEm=wAAiG%j~Xnwmpo_u}9L|
z>~ea$J)7QX&!uzid33(Lh%T@r^j>>8z0Y1j!;9=E=wf>{U1qPN57?FT5B3(i+<t{V
zWbdL6+k5Dv_5u2seULt3AE!^+C+Ji5Il9LFjy@wobe(YNb0U#GFPhO8MGD<0I?yem
zJKZXJ($~ZQx=m!z9byQ5Qw*nXi-~l%m`wMIY4klYgZ@p-q5H%y!}KFDpB@zV(0_=f
z^kWgFN5v!bn0Sny5Nqid;u(5MY^0~fW_niapy$L+dO=jt@5O$`#1Y2DF%}YEu{d#t
z)pZD~=WrJ9)Mp7!JZs{#U`?H5c9GMWwQy2dYo`xu<Md_iooiSJCzEw{MzbzXkFl(q
zlf%-SeAd$`VZEGkcDWN~S2%N7x^q7p;4ETSI?LHr&I<Mm=TVjg+we~-FU%p`Y54di
z3J;k*8XhZHZQ+5mGXcVatzh~FdUD(bdTLw(JyS`~!dkYzg2EZ+E9m#nF<Qx30<$Yv
zT&*F0_J@E{!Ro>)_I0NOR$qtY#{o7(cyI$t2#>2|jbOxH<y6TU!?WJS{J2=t1lHUS
z@vIt<z%ByMT4T^4s#J*F5+Y+_K$3yL`3bBI^pN{uo!9|=C`BDgVC};{7_%#O47?#~
zg@Kh>O`0DDGf0GJ@P>d{<1RqB2n8*GsT#7=0J|YP3a~rE@P~jeMf?sxSXtma_Bud#
zAt<;JAgs~~J_8VzXaye!2<x+ge*`!H;SzwbFsq{r0K%%Q;B5e5Nmj4~Agsp<<^#;E
z2x~k6Ff7ID@GyX|4l8&SKv;woyc{4bzzTK+2rI0DDF9*VRj?UASd$g32M`ur1sOnC
zaRI`@oWNkYRq!)_HzGXL3-C>d-vgM7a0kGAgqs0QMOXnhUgAO+J$O5LwuM?SPr{A;
z#(Slb!!QJHJM0S%MAtk?vdMvH!@rPW>M4ia2T6v(uj<>U7`#WV2YtqY?emy*2G}2b
zb_Cb~pH%@n>a!id*7|HCuq8fQ3+xcEu(r1z0b1dUOMz|o*?eGId<L%@>k*$#1Gd9w
z6M;SFvmwB$d^P~sZl84r2JedFo7$_Zx76*Lrl-<s2FfOXoO)oVgHU<TugK-B-3+<`
z7Kj(%djz)#-DoYete-dFu)qHQdIQdi^)qNT;2s+T&%wD0kKqQ~W4HnL7;eBlh8u7e
zHbHR%?uoboH_U9nJ%$@_kKqQ~W3bVI4Y<c}1MV@kAMNC8xB+Ly_`5P2aBnDXz&!^0
zQP_Zc3^(8&!wonq@iyQJ!LOp`#*g;`<53kqGA8^!?$Ti;f$i##48k#HNB+}e)K>3u
zj03AD?#T5Sz;H+IG2D=cJ-P%=9OR#fJ91Bh8Gs$R$8bmPG2D@R40q%n!yUQDa7XU3
zHV|_}1q-XGgWPaO?uob~H_YtFJ$4jM9PcGVaYycHxFh%2CK!1ajs(<8qaWNH8h#L@
zyZ^}`+`8+qKN<+P?ms<7&A^R*>S_k!!}`I3*HG++UOi*#{p4-v0e%6eO!ESeL%^o{
z>>Xf*K6@2dvCp0ZR_e1Sft4E;UPaUl%<{#Bz~=buSHN!dSt+pFe3lFB4xhm~K<4{Q
ztpmUD8LR{3KA*ulKo)u|Ow>ZK#G?e(0kX(vY8_bWG3ykt2Yja1f#3N|tpmcFOH=Te
z3G@pdc!50)!~CCz^`}nj!ceiA=fzqEVt=1405-s9w*d2h9@fpkuJpA@!2F+wH5Ayj
zzBUk8rq6l+8|<@oz*-LRX%nDhd=}R!sgjjfK7X$+&g=^;T~L-O7|Rk4D-<DCBI>Xu
zqApt|8nOxz&z={FtV%Rt`$ZBvA}(UbL^3-gTC=mF9p|DwcSI*1FFNzaqAO1p-FRDZ
zDNhwWd79|M`-;nXy6Dd{MLN$C8GNj`l1~uV@_g|NULdldI1@woY%zk*6(jjPaXnuo
z#`1`m$XAF-e5J_dtHn)xjmYQg#T5RcxS4Mg)A<{snC}%O`~xwQ9~QItC*oE+Bz|eT
zB5ZdNzp}fEyX;|No;_0BW0#BH*t5k#d#?DcJx@gJMPjKP5x=vSi{INTMEH;P6JmwE
zT0CN}6MwQR#VUJ?c-($PthRTF|7Y(JPumB?U+sgU!ago4?Gs{yeNMb!e<wDHkk~9-
z@rp<kuZm`3yGRjlhz??>=q`4Np5h%bK)fq5#0O%Cs1n1)0Wnd0C?<=)i)rGpm?4gc
zIpR|&&ctV8zW7|+BTkB?;wupqUyDb?H{vnztyn9*6VEtAY;>sD><F>Lal}r?6;)0h
zvEOMRjyMg)F{iQk%1IPwoaPR3k{s@|a_T$DPP~)iv~b!1y4dOLbaGPRzdlY^r?1n)
zxyHHF$#gDrM#GUFW1W6Zj?>@CcLq5nPKHwsa@e`nnd=O8?su}BMb2<%xii99;f!$}
zb;etim8#-wGx3&p`xSV&CVCH-T?y<4pFIKWCZ8<_mg}?of#v%w3~Z{;N`U#xnVkc#
z$&GqLSfd&Y!*2aQTMpK)2E$kms$ck~ik~hAy)pmCau7Dbx~{{DF>L*(%fZ^!VE8{?
z4(h7SuLi^a@p2Ffks8%t_+Kao&1-@_4iE6>-ae210Uqv)e0CqO6rbHub4N&vL8HEQ
z6KJP=7FOE=f7eN`1{U(g%V6k9pLGIu#%CA7$c{d%2dt6LEMQGFt1e&7hSZd=-qvBS
z`oY4Jh?{J(4OnxZtp~<^wi@ie@YxE`>iBFCXcv4o7qkYNDf@C@?R_mDSWBOc?G&z2
z9FR;96MeBSuzEgA1&fcpa`N9-WrzQlW%j?j${zi{EVKW`Dto~Ls>+`EbCvz`pSf1q
zu)F?m|1(#uD%<=ak7JeXF|4vZrfSSY@0%PS4{U4&o8wp6fPPTOc~y4sm>*Qx!Gmg7
z**`gEJ0t{Ugc?&_WgGSsXi!BM=2h8-nkw5cQ)L@ws%*p53_uxSn3@47BMdWDwqd5q
zHmn<r9OjQ~158!fMr;JsOeEwjfI-25npb5Tb`-SnzP1k->>iEw7BJX78fL0&#o%}^
zef$SE$FH(~a*(OAe{zg^oz6w;A2m}m0NYZNo|*xuvh@eupeox40aZ2z@TzRX-hpt1
zUU2d%uwtK?D%*^F5;Ul?HLI?&jkplRIsS>J$~Ky*vJEp;wqd5qHtbr60#&wQunwpy
z+b~mQBlD|lBQ}7ci~OM!7*yG)c~!PyAA|NgU&AWfOxch8S+TmxHX*z!+fY+w8)m9(
z!%UTJn5nW2GgY=>rph+VRN01^D%&ux$~M$g*@o#V`<IoKD|MAEU6wBEvrO55WywaY
zP&Q^IvKd<<o3mxIC99CF*z>Y2tCA^fzwF44$cx!Ac?mlsQ`uSBopafPJF+*AmzVLz
zvM*1T{dikBkf+K)JWXEB`^sy0y1b5O%E3HK4&!6xa6Unf=J|3AFOcJ*%9a!OY&n_F
zl{fNvGM6usc|0Nu_zF3Vuat#+wJhRmWEo#C%lV6P4&Nqk;cv*>`CfSk|3J>=hvl#N
zCvt%ul6Tv#ywC0;@3*_k#r80{#2zUhu*+rCo-LQ#bLE5fJo&J_NUpRa@-ch4{Ik76
zhM%;bkbkjP%Qf~oxz?_f>+CJ^S^E|FyuC}VxA(}6_5t~leNb+-kIR?s6LOn<PQGq`
zC*Kqy`Id0yZjmVWh-UIVks{w09ppaIUG5h><v}q(9ugVyV=+X2B8JOjVxl}QCd)6x
zH2I~NAy11r@(fhj@|>72&x?EH_hPAQiKxrPBd#qTbK}HXSBhucdSatnUu<?0#16NS
z*y%PERc<q}-)$j|xGlvow~hG9Z7a^W9US6zbhz8asqbFm#Jg!u3%9$I?DldxyS<%M
z_X?+v+t=yq4sfn<2RfPVRnBPlYN)c^Oee>^&dGO&IwkHfr`#Rogx%53Tz8yvzdPPp
z<lf*ccPBe5+#KgocM4S5w|G@HK2BbhZJ4RD4Kr1?VW!G9%v9NinJU{bQ)L_WUtMKG
zj{mgEHe-ISvj0zibp7wDvOE3@RknU<{QO5(^@o4;m((G!Y5%wV(RJQxC<oiz27hj)
n7AdzHPfqL6JLVsMms{PVi@TC`bu-}~Xy;@U%_uIIo>%%m-%<Zm

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
index 4da189670..47b38e0ac 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
@@ -120,8 +120,8 @@
 	<variable name="paxKmTransportad_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
 		<variableExpression><![CDATA[$F{paxKmTransportado}]]></variableExpression>
 	</variable>
-	<variable name="iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
-		<variableExpression><![CDATA[$F{iap}]]></variableExpression>
+	<variable name="iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta">
+		<variableExpression><![CDATA[$V{paxKmTransportad_group}.multiply(BigDecimal.TEN.multiply(BigDecimal.TEN)).divide($V{paxKmOfertado_group}, 2, 4)]]></variableExpression>
 	</variable>
 	<variable name="pedagio_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" calculation="Sum">
 		<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
@@ -192,8 +192,8 @@
 	<variable name="linha_paxKmTransportad_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta" calculation="Sum">
 		<variableExpression><![CDATA[$V{paxKmTransportad_group}]]></variableExpression>
 	</variable>
-	<variable name="linha_iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta" calculation="Sum">
-		<variableExpression><![CDATA[$V{iap_group}]]></variableExpression>
+	<variable name="linha_iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta">
+		<variableExpression><![CDATA[$V{linha_paxKmTransportad_group}.multiply(BigDecimal.TEN.multiply(BigDecimal.TEN)).divide($V{linha_paxKmOfertado_group}, 2, 4)]]></variableExpression>
 	</variable>
 	<variable name="linha_media_rsViagem_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha">
 		<variableExpression><![CDATA[$V{linha_rsViagem_group}.divide( BigDecimal.valueOf($V{groupTipoLinha_COUNT}.longValue()), RoundingMode.HALF_EVEN )]]></variableExpression>
diff --git a/src/java/versionADM.info b/src/java/versionADM.info
index fa5dba29b..1774df3b3 100644
--- a/src/java/versionADM.info
+++ b/src/java/versionADM.info
@@ -1 +1 @@
-ADM_20130910_1RC230
\ No newline at end of file
+ADM_20130910_1RC231