From 98e910c33bbcb0fd06344cf1c0f149f3136e3237 Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 23 Feb 2016 17:24:57 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7112=20-=20altera=C3=A7=C3=B5es?=
 =?UTF-8?q?=20relat=C3=B3rio=20de=20tabela=20de=20pre=C3=A7os?=
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@53178 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioTabelaPreco.java |  27 +-
 .../RelatorioTabelaPreco_es.properties        |   3 +-
 .../RelatorioTabelaPreco_pt_BR.properties     |   3 +-
 .../templates/RelatorioTabelaPreco.jasper     | Bin 37005 -> 43669 bytes
 .../templates/RelatorioTabelaPreco.jrxml      | 326 +++++++++++-------
 .../RelatorioTabelaPrecoController.java       | 101 +++---
 web/WEB-INF/i3-label_es_MX.label              |   3 +-
 web/WEB-INF/i3-label_pt_BR.label              |   3 +-
 .../relatorios/filtroRelatorioTabelaPreco.zul |  23 +-
 9 files changed, 263 insertions(+), 226 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
index 5a200b814..437bf8420 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
@@ -2,14 +2,11 @@ package com.rjconsultores.ventaboletos.relatorios.impl;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.Timestamp;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
-import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioTabelaPreco extends Relatorio {
@@ -21,12 +18,8 @@ public class RelatorioTabelaPreco extends Relatorio {
 
 			public void initDados() throws Exception {
 				Connection conexao = this.relatorio.getConexao();
-				Map<String, Object> parametros = this.relatorio.getParametros();
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, getSql());
-
-				stmt.setTimestamp("dataInicial", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime()));
-				stmt.setTimestamp("dataFinal", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
-
+				
 				ResultSet rset = stmt.executeQuery();
 
 				while (rset.next()) {
@@ -43,6 +36,8 @@ public class RelatorioTabelaPreco extends Relatorio {
 					dataResult.put("linha", rset.getString("linha"));
 					dataResult.put("empresa", rset.getString("empresa"));
 					dataResult.put("dataVigencia", rset.getString("dataVigencia"));
+					dataResult.put("idLinha", rset.getInt("idLinha"));
+					dataResult.put("idVigencia", rset.getInt("idVigencia"));
 					
 					this.dados.add(dataResult);
 				}
@@ -69,7 +64,10 @@ public class RelatorioTabelaPreco extends Relatorio {
 		sql.append("       cs.DESCCLASE                                       as tipoClasse, ");
 		sql.append("       r.DESCRUTA                                         as linha, ");
 		sql.append("       e.NOMBEMPRESA                                      as empresa, ");
-		sql.append("       vt.FECINICIOVIGENCIA || ' à ' || vt.FECFINVIGENCIA as dataVigencia ");
+		sql.append("       vt.FECINICIOVIGENCIA || ' à ' || vt.FECFINVIGENCIA as dataVigencia, ");
+		sql.append("       vt.VIGENCIATARIFA_ID                               as idVigencia, ");
+		sql.append("       vt.FECINICIOVIGENCIA                               as dataVigenciaInicial, ");
+		sql.append("       r.RUTA_ID                                          as idLinha ");
 		sql.append("FROM TARIFA t ");
 		sql.append("INNER JOIN PARADA     pOrigem ON t.ORIGEN_ID          = pOrigem.PARADA_ID ");
 		sql.append("INNER JOIN PARADA    pDestino ON t.DESTINO_ID         = pDestino.PARADA_ID ");
@@ -78,9 +76,12 @@ public class RelatorioTabelaPreco extends Relatorio {
 		sql.append("INNER JOIN MARCA            m ON m.MARCA_ID           = t.MARCA_ID ");
 		sql.append("INNER JOIN EMPRESA          e ON e.EMPRESA_ID         = m.EMPRESA_ID ");
 		sql.append("INNER JOIN VIGENCIA_TARIFA vt ON vt.VIGENCIATARIFA_ID = t.VIGENCIATARIFA_ID ");
-		sql.append("WHERE (:dataInicial BETWEEN vt.FECINICIOVIGENCIA AND vt.FECFINVIGENCIA ) ");
-		sql.append("AND   (:dataFinal   BETWEEN vt.FECINICIOVIGENCIA AND vt.FECFINVIGENCIA ) ");
-
+		sql.append("WHERE (1 = 1) AND ROWNUM < 101 ");
+		
+		if(parametros.get("VIGENCIA_ID") != null){
+			sql.append(" AND vt.VIGENCIATARIFA_ID = " + parametros.get("VIGENCIA_ID"));
+		}
+		
 		if (parametros.get("EMPRESA_ID") != null) {
 			sql.append(" AND e.empresa_id = " + parametros.get("EMPRESA_ID"));
 		}
@@ -89,6 +90,8 @@ public class RelatorioTabelaPreco extends Relatorio {
 			sql.append(" AND r.RUTA_ID = " + parametros.get("RUTA_ID"));
 		}
 		
+		sql.append( "ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA ");
+		
         return sql.toString();
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties
index ca8a404a6..b501a1968 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties
@@ -22,4 +22,5 @@ label.outros=Outros
 label.tipoClasse=Classe
 label.linha=Linha
 label.empresa=Empresa
-label.dataVigencia=Vigência
\ No newline at end of file
+label.dataVigencia=Vigência
+label.total = Total
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties
index ca8a404a6..b501a1968 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties
@@ -22,4 +22,5 @@ label.outros=Outros
 label.tipoClasse=Classe
 label.linha=Linha
 label.empresa=Empresa
-label.dataVigencia=Vigência
\ No newline at end of file
+label.dataVigencia=Vigência
+label.total = Total
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper
index 6530b4717a31d6f1f7e3a552414b9fffa688355e..9252c709f1f0b8e4f16e9269e62923c8b0b4ab6b 100644
GIT binary patch
literal 43669
zcmeHw33wdEm48)tOBzdKS+<PN7-VC>r{oiZZNQQ&*)qD2WP|MxF_uQsU`Zp-jC^n!
z2sfAjVPnn^ARK{g0!uIfk`NL@fF<Ef$VCVVWFY}exPwXd_o}M9t7h7xagzUjyZ<lx
z)YaAX>Uj0utM^`2SM}WWCd*4E*tGs=syx|MesUx^5KSba1Mx&ESsv~0j`c^&SBb<H
zk;uf~VJ}+Du4hFZ@xFmrZ*+Mi6-lu%^(RL*M=E0Riq>c%7U_+h64}rjT~g0Rs%(vs
zzG&-US66Inij9()dn5hb6|Jd6tiKx>hpUW<>fT5)xrv>@tgQ()I~#5rB1s_FQiWSO
zf-~ya_~zD{)ytdOTWebCD(l<V)U>qLH8r-cu3KKm!W-hLRJ^Ytl0YZxs4u;Pef`z(
z!TwYoVM0%>1Cb7(=0T5-b*6gOv65JKe>@Rwj-X^D6^r+;W2LcVZErl1sutyH<MC89
zK^c>+gMEFG#J0xh7G#gEV`W~_@v&47rLBxcI-`lo{!X`4aV*&uOZ7%onL1Y38|_L-
zM5|a)JQ0ibgWzZvpaD@sth)zT52FWxV-)}(YN{!Ls)2rjGPqqGmWmI!wH0saiS{?f
ziGyw12BP(>a6_bHV|M~%=uEMx^`L!4va7<7iwY?h6-4&_PVjAnq}K9SBHBS{rP%ze
z1yg9LqGhn(D^Sxv*oS(;vK~nXV!z|1Ng|1~^(@p0bd%9kGR3B?&)U+e7U~(YQth45
zuE=0-sx`H(H=1IH3{g;IL$UnMXetuxRp<<tPpxi84;!i$nGyAj>WU}&BB|O)M=GA!
z=1Vw89_th1tu>lTu@Q1$45nhe7)OM6hz7|ZI4cH3JuAlGNRi+ebSmnL#QIfdQ*0=-
ze5yG87?rB#{C*(_s;ecMpsk7Y4uWR$vi4T6waJ%G#Z@7q2ChnIN$gcyBYbI9P0by;
zsb){YMN8{hev()VsW@~fsc@NFkd(typs}6}OGWzzdLt>SqhhE!q`qlWCBUe>6pdQd
zqf&EVsa`D{x>v^=15)&C>i}avXoKb*jf+baY)_GQnP{~#X0M_Y$}*Y_oRMI2v*}IZ
zReAalbZZ>N81!y2sq=CYzH-7s2M(m5{@YpxU^!-HYemz}q$*?;WIPJ8>*oBPC@HLU
z463kopf{GP?Cp(jiFVerQXwcrqnfP)iD)t@)Xj{nWL?$b=LMUF4<zC+a;aD}*$_cb
zW)D%gS<jC0!;*v%Y0DHV(ac!YwiH>rVh^l%J|}DaV$g^_QjL<`2{u1Rs@C*I`(O-K
zKwm>f=#QvtL1}dK#CkgufVnsdjZz;=3RM`@%B9$>tQdlPTJ9xViR-08HmJ(-%0wcv
zjq2Tc*0YnYek^jm&3GMilCe{wB)4qX76)M=3eCx}Q*F_$soGeySCf|mvdhcx4e|I!
znAwf>(aq7`Dpnlb42303WLvB+TE#~6fVhd?SpUX0*!yUziVgQu09wZmfTX1o(Nsqd
z+2y9q(L@(SuAYsK^mp{c6Xd)2Qbc2X4D6oYjNrh~Mnz<Ukd*o*3Bla8LygffAucc=
zptKqb3bXNE?<xiQ8K{r-GLR)n1FvVL8aRQj!<&IhoIjLGT<KD|IigCTub=ViYKeA5
zA(9>G?bWjhUY@piyf+maNW-X}`3ReX-(^KCSp`+KQE1P>-rf`|)rTf3jYj%`Orb9W
zRFX!DNCD#NxnLlYLU;Ss<4E<Gh7k1Qy!{YoHG*h>${~74Hi3rIu^~>L8{sexeztsq
zZwa^D9nX<1sS1&TUMXL;N-s20`nNJoWTe^-h5nO(=16BJd|Q)Hb^WPmcQk=2LtXIW
zNa__G#B(bKH9a2&3C5s^oq{}(-pXG1!=#23y5j;sO2QA%s%eBSTxr&;L_8n-jrVp^
z3sZqyELn$!V;$;wcr4l6*;UiGA==p)bu*0+BRaM*+SUX0*xjS@hAA0tLMN#il~xo>
zuI>lDAqt{@XhQhh20=%V7oJJZB1%@or0PJM0;;Dfj%m(NeptQC2znP$88zRaYQXjq
zElJTY2M3I*RQ0&DBh5HCK(#{NA>V@W3Rlb-5|QpiWS}R-rf22Osumj6A}irL0D|{-
z#7Tx!&6HGYN{yU&7-TFFbCFCshDEwb$WS6KCpwBE!`){^j*6@Z3vp^uH7Hup+{Zwt
z*h|pINFh>9R7S!gq+%VJ(mo~wppaWIG;(Y7It7N%E9E)rl?<ISF`G`QW1dqr7Ndn+
z=eqvd7}WalJy4G1o(Ur;AaHG?@Pa!<Pm=4{1XY5x>vAz2at$Pau$(Q?zWC-SNgm}8
zinxk}2ja;XO$W)b!Mrso%_}|CvAiubm9AraE3R#Ds%YBTK?;so4J|cVpRK_K+Z@CA
zOtI`l#dJ@b<GH0sLFx_<weT4<i3wR$Z_?fv-KIp@>5F#?O@LuIjN*!?Gl%AB19B^2
zE5g`<S`_MrDlVvJ<Fq8wuAWI$4Ug1`rW(y*GTp3^S~VWzDN`fxTMqD?XyK1k_rS-G
ziuIPs>FzO=7z=+u`OMpVGnk7%pj>CI6nIgh34-cj4r)y~XCytUgU;X}WXLs#!o6LM
zl^r;!YPK|raWz@`k~F-G2_;xUotiWt{&JcprBm0fjpj*I*C-g#+PV|kTWabn+v?WT
zw6`_kznL09{aM{!(oyAUeG90*un~(`Z7nrz)hpph%bA(*zNyC#U2T83v+vvrIR2|x
z7>-Ud)f(%rilvgPSW#cxd)hki`GR+s^*?g&H|L+Z{J<y9TsDgcCCETN{YZblr`&*1
zuiSXchi9FCghd{G-ey_@fPO0R^ED2_<R;F$>#9jbUwrvu3*;b=zmR&pAe$Bwy$&$+
z0X@&Ju4!zmX^~hW1fsbrNYY2J!m?7D7Zs&DKg2xP>tV_xqS;dR5l$0YTK9@?ZH|&V
z3CC+|H90|O3fgI?i4@9txygnGxenw_M1}WRlVPmw0S^*vE@{^6m(H|e`DE8r9a{x4
zbDe1d^(wJoisC*+X`LX~^;t<YzbyA1CE~+$R5c@;&}fSZ1`hez%pRCaUX*UzMS`c3
zq2P-the%NBD2Ew4$(AUhl#!@ZEWM`KNNwgJ7KKSr2BKJ7&RI~<K`*ybXj1k^_=8VW
z{fjprzv-7t_xuS%wALM>M9pJ}&J<bU1q*5HWL*@}C=6!ROG)$@CY4>Ct2DfdR}2W-
z5eUeAnuHcxl=$Y<<PeJ0>`R*v`+e0b&~G|syG}7uIG|Tn<*l{hxyF7Qg;*fyA_t3P
zr4G{zIYENH5pxS8CEfd<fwDp><qHUR-c^rfWH=Dg3HJnKsC8M*arerQ_7M)Zfkrqf
z+pFxt44C)}WQVJ?swnwODlwdjY-oip5fZP`LMlyAb0V}0{s^>C#Iyj`A?w^(SceSP
zSQ3^o&FI=NvdY#IlnZm4RiTNhGuKdp>TYa0em};G?-$9s$lN$}%!+klS-PWVuzw@`
zr8z^bpZK*@QxPz!SXf>0wm_SVkMdJnqLE$?BFyh0gAiNM(!Ss5X)B_#rM|U4c`0`6
z&8uA-&e8Y7bJWIZSo;L9s+dC*ug6VIwymuLc_}z4kqyz_a?JF*v3#!o3E?U89XQ3A
zO2(`&P&~tdBMDnXHBe-+D8BTf3p(3wzvT79&%J)-6^qWOE_F4Q%(QIa49Z)XVtFlf
zD^@B82sMbp%jIpQDnmJ&DG(M}1SiWJ$GNro&;UIsi%9@h@TI$zUSf^b*a;fY#c8eE
zzmqAV|54@>skEXKlU+PXbY%k)4;`c|QN*}N>(;10m`cQxdTkQTGF2bkXH_ex&!3`r
zPSn3{%taqR^w;Q?pWig)vlpDRYN6X}m->WIuh(o=qMu56MX)V^=n@)0bRA$2T?b?k
zT>*iaz{w-}HV;=78ItIS1rU9>6#0Q@C*B&zjVeWR!BoG5sE(m1J$@|tl?zXXe|79R
zC6~<~v{+s(%kPTx4)jD^551mQ9ndusr4vG{gkp{>*9vK2D7pkMy1EkG8-x-`F>8G-
zbX1pkqOM&iv<Ukf{(vT>lu$59pm{za^fz3h2hilxvndIoZruqnm83sSffu#4R5rFY
zSGK^%mrbP)<-30$S@hA<Q+|_o&cK0J6s}m}2~&y<YmM|LX{$jOp|?z6+6!7~^O!2R
z?)y|(V*3l%{pBq<N$XrEX+U^KS5Q$Ii1JsUTUjOYN-7|N^8zGNLIWgH2N)8m12QC1
z0r8H?>5unEJ-N(jQYk!CY0k+<m9#ggpWj;7xT3yBbo@NQ&lJnA9+*3C;XIeSS$%uK
zU44Bmpbe+7sj-G?Bf4ePRMP?mjj|J|2$&oZIH{Vzrxau`Nwt<`=qsA;iz&Z=OOee%
znyIo&gT?UM$Ny^8*Pr<67e0O?apcP1Ruv2(hE-IRCR^e$Hvzkg@`~WL00EQG00Gkh
zhJfjS3;|QX3;`n?t`qp)Ca7-81wn75bc$r<>GS}eDn;0dckHo#PZ3g8U@F~i-4|QQ
z2`DBR6WK~AuUf^SXu9V3k69zuZ(P<r>-_jvI@;fFeA{E0D6Q0m=p6+@Quby0AEf$4
z@a+JeNN500bb!GV9gx8j1$1%p%+R+zTvddS%1Zqi0n{HQ%}^?`HG<bAk;JCKs8R1e
zMii00DQD7u@2^jl*5nl*x8<fi7kp{c3T>H*aNaM{|A<P6;L!lmOK1S;b$~&79gsnK
z1<WA*qXvoaFeK?`29RDUvt+b;5IYL=zkLw>b8x%Lb0+$?7XRYNflto()w%h1t@v3*
z<NHDKUgfo#Ro-8q{)ynZ0HRB10MT`TL3ACEL39NKW&$Tq-k<YuRgocyK5LM&n7(d_
zlK0p^Tuh>Jl6JWE)-yR1{^s8gZoKo>bq}0y(oe%bIi@Kui10c3yRT3OMDTI|;UzSH
z@H)UCybj19yaHwr{^k89{Okb27b(Ky^_$;$s@YqfAC37strTZn&J{j}u|0<PLVubY
zS)i82Q6K!jto3P2Hfj%_tc~XDd_BwCfcIeVo(~ynrY?3qZXLi>TV~BN)fQQ=`t=!q
zy5xy-7y9#SV)X$+<PQW2?k*WhEh7m++GuYA7V!S!eWGQsvvOAF^clN88Q;9B_|qHj
z9<}TWUm#`v>{>u5w~q-A5quaRh!Pqgh&sR!L>=G?qSg@g#2oz}Qj+nfh(hdw;1GWP
zEVn#e0Bv|IL#-~D<P{_q)s|4*S;%|doBV?xTGb2QU;c;KF_%;UANM6nuH@zUXhH@~
zCV3S!le`8%C$9m}$?F0@NQ1oGF-S`f*~nWFK;D8h2ToKd8Yxp%`SgYNz{N~9C;EQ(
zu)m(Z^n$x~-+$1P;|^X_Gdi8VzB&=jr8#ZX1TXc1kpc9T&;a`C0E50dz@V=Jpz}$R
z8rOL7k%An0kd3}`0_dA>PI^#PiiHlIb@0J+%ID0HtpyW0ZJ{QMAa5VJeASK%j(y^y
zwiBnE|G8QeGzB>aLQf__i{PLDLQ7}>p>=>kXdPe>S^+W$eUMIL5zj{GxdDVO$Xt@i
zjne50l36JI<@*ngob~f%^W&Q@pI!WR^>u#-r7MWiBA6XOX$cLWv<@&Rtpf~7D?kRN
zXYUuK=LJwYKc2qgm?NRnCVg25{jG~8+;z*<v+uj>svV8@e|^<Me+QwDB0`H`NdTcG
zG=R`Lz#y~^FbJ&x8H8T4Uxc0?Kxn+337p>LNba<WUKVmcbljg#-hSh*rxWL%*RlD;
zmDPU-xsN4si=Zxm+!7i<ZXIBdTL&2AR)7q0*X<X%7X*+yKVwRl1EB*ZcUcI1)%z=F
z{dhy)u_ND|9o;!~#Rutx9@?ejYl+YzI6i>T5*k2g9bgbz2N;A_fDA$(zh8u27(nPk
zYz!W98t1zm0n@lFB)($rggKGswwn@DrvGH()|%_nNt}Z<q=jfMg3bUEOK1Rzb$~%)
z9bk}H0WwJ3xnCqc+#_*VcrV@LHA}ZcK6C7AD({RB;uzl=+Wa$ZdfCjf;e}pi*L42B
z$ZhDb+!|2hFvrZ&7<rkC&5mk>)CaRUc?G-KTjZEIv@2tO=AP>O73L23qq*nEY@1lt
zF>HTsz#gM2Hg*d(Shhry@xeq#v>}G`Fa6zZc*RO@aOlVc=B`5?eiCOZ@NT)JE7ptm
z{Qm1(>dzR|)J?}pa;eEZ&fp&+TTdqv{SyN-hMGsyz6o)>0Qi^(a|oHSI8=od%EY#z
zPgWd9+31Bi4nhdxRN(}pJdK4-&&A1(L~H=3vr_)SJD}>NqO(Jy+Uiz;_h*Gk?8Fyz
z%&DZC8Tg4^i`2ITcnh}~FE;3qEGn5k6s6Xvyr|<d`w#*#NK@?Sp*N}0Hr)Uz5}TQ%
zjB|#y4Jk@l);6RlSxbNOSmTU854ejP!?6l8E8BZPZ52k;;E#hm>`TGSQji*3hlx;N
zpD$ngkdpn~CV?@l)(3!U)+21#Jfolg@-fBvXNUTs<g{4rkj1GoIt)dr6Vs73Pj}+*
z8Mb!e4|`bsU0v7<iXknm1iuO(cb-j(itijMx2C>T=Fy^R96aqQuZndqk9NfRuplRD
z6V<EPk5>H<B{VIYTNBFd&%FiB%xi_R&?paErFtT{<t@O56R3zBbB8-|e0U9Zsq}Zm
zaxJ1e-x^LskhL(@8PJaQE?e!%)mRtn#5-QC-y|WA4bYn8kmFV=?qxT(pHlzn);HX7
zYwgFl6*c&yp(LCA!hyUlaU$N`NWG4Yr$Yl`8@fE%-PB(b=@7@^*RhcV!<lV5nI?A_
z%ainQO;R`$j~x&=nlI0WswB#}j)gZyqXTVm9PjI)L+@kzV*M+{InuUxtCkU?vV%_f
zy9yPD$g?WURV{8#sNT$@cBN+5ln&0}pszd<?UF?8BP|lP*ElUbN=s5})}&oR(3AqA
z9gWBKKrPA4?CVg^iIME1{UsGSYHODgKI5}GE;#jp6EhuyI8qH|jzgER{*Ht=u}VJ6
zIz~sdwk2`s8pk%UNwTww4a3-sio><=Pqea%tT`MMsP-FFG|l8$v4_VBa&?HDIQcNj
zOC{`7i`fsH(CdkcI=xe>&52%J(S&~F-`lEJ&kov07Gp<WJsT72$0?dfufQkGS2HbR
zp`e}KBXWi$HC1nN*x4+G9uYwGWPeR7V_V+BdN0dqlS&%1ltAk5cJiv5RyVeh9%UN<
z4taAHwVw@hlyUvhEoHt1Rf=-j-085Ez+&jVrWp(jz(Z|h@emo7J0f#{NQxCE22+uC
z(Hm0KPv`XJ%V0(TR(UI0npQVceUHhBCDACHjvD55(nRLCK{it}1vH)C*woTcSudO2
zqZYvTh^F5~cF7+91s7Mxz=@G%G`B_`Z-=2(;WpsCA>e-o_wYyg)3<i)`s>LD9zW~#
z+TVSD;=?V|>kjd!>ViE-qq1U!(B<@!QTz!|(9434h<qY=Pj*J%*(m`ZNr1k?-2fP~
zc3Gb+Va(bU0N4mzyq5*<Nd!}@cxAMAbCgaQ&ZfhzGMPd}FCtRLyRYFMw{1}^&Eg9*
z*MN0nh>R&u!3L6NDdzA~%4U~M!Cc-e;EIRer2n3FlprA{xg@|;g7$*?J5I4bk<#$K
zT#kEs_?f7fWU<i0F1PVYrC(A6qVh$#mzTq=c(d}>yrE_dqe@?+KpP~*=@o-)hPNj~
zkH0B-wdWs`Z(c>Lqd!l+t%;J>Kr2JOZ^`R_b<$I--~Q}1uZ$W0^h#~DPtcX*dzeJe
zdrc|;0n%-ip#d38l3mfITR|m2mu>@~OSb{grP~FdR{|GTx-EZ;7N`BB>Q9rP42d2w
zG;7>yNUwHwRx~tJY{Ors%!XWPNU_l^QMe&^DI9O3&F7J3I{XP=S<d^j%yIoCiYY97
z>5LzoG}%%I-6p|v+Mfd=VxdEbfmrhyCVbf1cmgxbz5(op>(2CuVE@%Y*kJoV#ALa+
zA8QLZ>JD?Rc^-iaE&FTdIrs*Z)l$>k)Y68*hEsYcv<cp;X<^o#!SdrdbQ}c-14Jon
zj;!$jRU>u<S2on(=wEAlLuIpG@o-`5#qmeXp^d`BS5>w)*R<dyCSj!)%J~atMtvjw
z?lsm_x8dVqdY$qsD9KH|*p=PiFTeC;6faT58!Atb>c}tct0TALqg3YQm2H*ntxc<2
zs%!l0n51NL(dBopTE)UwAO@|~Ep^Rp^)&`fvU>fiS}HdrQwe;o%3Js{Y96l8t#7KX
z#3o`I^v3#x;7@%VKD^wx>~?dED%VmY``BK!x^cN#!8o76aDcScJOcrjxNUU}HSOzY
zo3Vz&D8CB&z{)yz`?QOND`mCh#I&{7R#vw)wXD@^$hwV4bPgle|DczFTB+(|b$w-P
zYkPfD<#L>0)v!Cj_g2MvWPO~zg=JJRK~=H3rM`V-B~hp)2utbrl4u|!og<F)t;80l
zUT@Z6R61H!T3c6NgE7+DRF6;M>4;_B?=3rx@BI-|;Ha1gd+exbXvQ(<npVADx%eR}
z!1TR0V5k(ek{YS4tEpdZl+?~T)4H0`oqY6z&IW6g&8l?Ns(Y<i_BLvA$KIN{mbTTE
z^>yp^qgJdB#1g4N`ru(2Nk-STw%4tIpIp=4T)CpI5r@M~1)?qQsG|xlRybb)<=WT;
z(H5u5n_B9c^nM1fhC#YT!GhJTt1I`f1d+0($sm39HVVOKh)`vFopd|I;5W3IL`7xW
z59C``Ljh*5)uB9omE_~>Fi2Ojrfx+|V|5)WYOKRe&Qp|v(qsxE;i)G{bFW}67^W4Y
zHg+0q6nR;Lkwt4HnT+=L<%#J}0enn+B$2-MSAI%7-iJdh?jt@H<Hhm1V_C4a-zti3
z?Zvk_w|4Xnc1Fb+x>$cXEq#@X)28LLg|U3zKVHS$t#EIogo=T?GLr0pz0E85#rJ<O
z=A>tAX4T>(D>Ro}-@xZ5Q$2}j5?>SP+&XZ~GU4asZwcW}S02&tW}G%U{0NGD1z(Vx
zTfUH@Uj<QcL<wtp-b$8r3;enPEb93wH>DV#Lm1`yVnMtR5=h8zqG{(aXAbqQMU-`q
zV4B}w#ELyohs`G!RIqpHl|P&C<Z16cJ^A4)-ahxr1yywZQohZ};#9f|X-hV|cFt)#
zXYE?<`jiDinR&A*I;zNjinkT5Yg^lD8l=~+Pmox;vz&cFB*luLifY;$S2t8a$BF7+
zMfK7!P-AkAWX$KRZ)LX2_qW~Q)lK!Q8yeGFb_kt)w5!b{t^I3`rdh^3($2lSoJWRT
z6Hd!dRGszE&{#UTw<1=j(y`3Ty}Vjf63i5fN&?3p4vk}e?rj9(Sde>pMM=eYiKQoT
zGF9SB;R^_?Lad4{4OV^fTg0^BTAt<Yr5y0a?r^7Zb$vZmK3fde>`PJ;+&$O!6r32l
zma6lo?61pdC+f<WvOkcFzC1Yd;&bAqk4Jvp+_*eoNvcRxR7HIqdfNULAuNJFN-bkd
z+a**2jA^?LFsAJ~z?ilx0F;_}#!!rS>yO?<+l^=wci2lJg})7ZQMzd0uyJ8uvb$V<
zSJtgU+`X3&lf?2;POHUD=C@@7cs;Bhu5xR2Wi!qkqROlj93e{Lb64Uk$+X-ZP-6%l
za$6myIKVnhentwLK3=4jDY_i&$`60stxUj!4k6lN<&2p}YKfxzIE46(!wa_Wc_vy_
zdUA8uGnLg?9#i{u^|P>|HCiDGd&k_J`kLA{A$C-`b}Uh_52x;A#{yQ5>_U`~ft4wS
z3YsZ~20#}>1E7nc3&;>d!dRR{v@IbvFjd+KRf66~=@iL&7Oo^+G_6ecS~MW*3O<TB
z-eoSsr%A1DVz6krgs6nkK!1cu`g--3&Ux_T3$7e_#U0OY`sBb#4cB;#quka(qD(KM
zL+b^5JT)bPu>lN`&;W+$0D~bqz+i|1phrTY+~qubtmvg4WYY*E)5#8vFscLVZ&()S
ziI;cc?K(aKg+(0g&lpcW$$_2qB$51|HlFS|_2EB!W2JS+@UnvDuYIrn4391Pc=9-8
zhXjWZ?B5WYP8<`#)Bui2XaL7_fWa{xU~o(UvJ9cAg35pI5E_-vOL&^2y;pByia@ie
zY4qAn{0UN#yIkTg(Uz@Txwx-S_P0z)&IoT<;YEjq&GBr)KaIyX4lMZQZSVa1?;m*m
zyN_N{bu8XY2Ix#6YK+4D=J8VEu?Q9g@K{0vc&q~q9_s*u#|n^z$3pi2{`aZLQjf=Z
zf(7)s5WI$W$1A2}_{9SW0r&G}PAQu*Q$9N8%px!kDhvCSb$Vwpm7vfq?eMoR8l&-n
z^Wpzg(Kx4V=|PFgJI<ZkICs`%Q>$JYLNuh~w%?+$hD1XI#|4Onga(L)4lqPR2N<HE
z09i!iI58@77Y*^5oOa}wQz5}pI2~-XCnV~fUK;P!@E2w+*pT{cB}4ih)Hy@c{?G7|
zZur{WU%q+Ru+5Eje(7~@Er%-<FycjP<Ruk&##h(sQXplR#XH(aycL05Lt?s<E&&?@
zcq@xZfWccGVDMG}vhY@prQCT-ee)gn13ZqZcgPs2WBied->1OB4z|2D#}k1A8_txs
z<fyo>h)1`yG3|ervkMHMzas?`N{E_Syr><^uDa;^#~oPMX>Iw^hF>*e!NfhTMvbVi
z3Lu)@ixT*Y6E4&oiMR|-3mBae8o)svU~o_e7#vgp5Jw>3xl^Y}auM48+fh6j-YjNF
zl;rbkjK?oa@&o)*-__8zH;Om^`FPDgW$_euOp3cGQ%3Xy@%>F098biO+}QDNzwEnk
z+i@2>_t5iaj{D-T8s_`#(AyGC1<fpW5amU1NdV;~G=TCtz@WSiFetA8K+2^2B|4fS
zt_T7Oz^_lE_*jqP`I6!gd2Iz;rqR+{*-=N8_2UEdWycIJoYEHWj3lR&EgoJtEo-T)
z+cRizsYP_J8Ebl(fxZBg`5Yxy;?Esm$L2J^uDbiK@`GMkQsV5K_x1-1sy_BPO466>
z03*I`r{JqzaB~2MB{YD;I>6wt4lp>Z02v&<S&|57?9bR5=W*H}Tk2y5-Zta?99f(`
zm_@wEjSoBi_@n2;UrZkRn~fLN?!07$aaz>px?p+G$hw#4E`oak=q{lFbk_j}-F1LL
zcLm6x`#nCADwb_zjrZv7kE{aq3doc9p@&sQk)g(vc!lIOz`a?EKzWGqbYf29>0WE_
z?V}d5=Vv?TlpMHw#mIkfJUvN#6~W^He3j4uzUlyjuR6fss{&;3^>N9~{TxpdJpTIQ
zNqvQgrvLh;_x&7J><Bfi_Q4LpL~>XsdMGIO28udNGgtM})mP5?D?Lv(hLug0I$g>L
z`tN>d@|FkxG_9dAzINFUPffmk-m#l~4lBX;g(+yH(id245xf|{Q3(y;s17hVssjv;
zDnJHDU)0eQ@oXdYGaeb0-w(@_`JUCU(%hSsKBT}G`Xe5G6W35Yoa8nBPv+rQK7a5%
zOTJq4<ft`G^L~C_?XCOCL)z47i{PyQ9!h8c4|RaSLmgo7PysS{hy#def7y6=phrfZ
zhsEA|Z28LDuP%*)xqm(y=Pj^}m40D`cr1@N;(OoPXJBa*iH*B}dM+q!{AM@c8cG@t
z^1AU)mWH!p&5xe)vv<aPXYYhrH*BfAOqT{idFX@I&Isg_L0+arC}^fc7yw-&41g{X
zE&%KjW6PaWIC(w;RSd7)e{dsZavUWbKFQApxyd&fisWVgD9M#$oS{VTere>5y9ahZ
zHt~Vh@0@;C-9(+_eosUf1C*#kUj~suz>2tn29R48lK_L<I=~>e0%VXob4460W5V;_
zhswi?3M&_tH`$}O8mqMAhL61_<z%14QGM|Eu8%){KOS1Z&i=#d=D+-*{tcgmlu3H-
z*(I0qH4`Q2^B*#pE{UVBX((s_Ic2c`a_Rt=oYdF}UON@UWK)7oXAEE}k@fw~lyq8U
z%!sKK@6X_j|HS~8GyCw<MJaM94o+`vpPbowcK5-%N38noogdbI_}!CMe#7UC>{NEH
zP`{mJUa&ZTBN7_G5glL%xDIeRqBTS`GP$wXBbyshN(7Y1JdZFnoi=nHL9I%-<;C55
z1ALnM26*UCx6_+{|JQ2w@yd1tek?_9qLo{Av1uslr_6EQ7(ZZ!UlDdUC3`<=OdXWQ
z3#WZcJMg*eBtCLq?f>dASi`Tz$uaU|andRiGDiDZRuhV!J`!}cZarq1XeKQ7N|jK2
zD={DtfW1Z5`l`F$9s5y!sO@E}fe{twob|+CANVfHmGdufHa%#gd;8o43lE<+f5F_t
z7cM+<e*63*7aYE5VFCR>4(+Gf=TH3N3jw|Oy%Y7t{CJ{(*_@5_PWZPQ+pYN!zYnV_
z!}iNwe@{JU6a4Dbo*QpRFJ}j40FAw?oZ<KR)E5NW)glRJqchU5oshGG{AAUTxyRf<
z#q){O{y{E&x=DVkKy5E~H@$OwhSo#E-8Q7{{N-$F20UO}FK3_0$foTDH)s*GvD83c
zq2X;j4+3I8ncS&sP*F|2IgU{Iox*NQg8=5nRE}Si^78tG1IaZ}Q5ebX;z51Y_TCy5
zY8!(M9K42v*BaD8Z__(x6MY0-4mCBZE&ZI8_)xi}I7nE`t>OmF)OK4VO>L;<tjw=m
zHJ!Hgo#VHm>DwLc`pI$5%CnwI)&`UO2m^YdYVkgj!`X0|qz?Ie&+2%XSHwSi&RN*S
zg}%A%l~7;%^H9~N?p_)B9VG8jeqn{PB3YwYJ@YD57QxRfehUI)ceDD=1#Ovj_bGCg
z{pX-HVt5-XIUD0uWo$i!aCrbv7O=^Wvr;eJ-&UvR);F^0x&4!!ka({S_vn#4`N3KK
zQaZ_dG-vj->1#N1s_{c{VRj^2T*w@@G|ci?{xD{-qr<E~#+HS#b5^8Ph1oC}TOMYG
zGFBUAMKZQB%)&CZD$It<Sbdlk%UENWjgYbCFe{O<mM|MBV{Ku~xkMXl!mL!rP6)Hn
zGPW+v4v?|WhS?Yy`&^ifm9dk;Y@Cd32($4r)){6KWUMR9Cdyb(n0-dZP7bq4GS(Z$
zwrJ6Af0!L4V*_EF3>9gKFq<r6sW6)&W1GY5U^bN~v^9*GqlldnW{1kyX<>GljGYl?
z(`0OWm`#_lv%_qLjD0@LX3E%kVKz&~E(o*PGImjzmCM*AVOAkyJHl*^jC~=@=CXN&
z!4+XPU&g)|W(#EO-@<I6jO`4w!)5H6Fk2*J*M+gtA<Evs@f+_r>@L4-fU{`5QRv!^
z!DK4lhZ6*ybr2HH=1h~n-$2_cD(Fig*&j)u3Q4@0Ne?G6Ow-Fx2Y+v7w-f^Vud2MY
zq;!&DcAHGTo#S^^QN@}_0*POfiFaba8b&_EzK$e1zf$4iR=~aip~hzyI6G7|OTQXk
z(X`=Y9Q0T+UHdsKl@w-ovwMoL?(-k$X%7B};W8AkZ$WXXk?Xk%A+`(3L!}x%LWq5v
zdv8!e>_PNic?$3fLhL&j;i{PF4ushE(2i$ilphdc-v_%qy&+D$h1d_E4%{@&@`u=N
z*d+xBF!>?&7+9s?nynA9$I+P}BOhW<`knWzdx$;dr+Q{R#D0Q~D|;Sd&p_wULx??x
z9+(z9#9n}&_WKID{0wYXm`R%*Vn6qh)r@tB{Ssw0D;;9LMgv}D!aRrAZ+r|ryBuP_
zh0Syc=NaS>`yJG!w8SCys?Q+P1c%rk&_88+L+o`tD5D!<e}wv1^`=?d5PK6wM>n-0
z_I7S=Fo~fUGzIJ(NRj_Fx)6I8jVmh~V(;TYnb;8fkVc#LZI=-H7+sSeSqrgGkWpFI
z5c?Ep>1H*={)Vj5riM62TpH96hYv0fY=?LrYEY&$#0w~ou%jV93_Q^+Xoweau^o0O
zSD*R_4In;CRltWs2n^#H;v;~j$1#}A5Fd#i`UW$^OOZo2l_7ora`;9v#K%HDO!FAx
z<Dq_{o5jzzN5S!Fbpd(<)zob5h~lhlyg!K{C)AM8HS`<LTS%7{@B<-IK0tj9qJWn{
z{81^?;E{YvA)m|-MuSjV;#@68+q8i8!u$|^Xd(MEKMca_*C|iZ7x3v2vh>ud!7lvB
zc>$k^+TAnv>9x!9OTv6MFDFbYz(neKw5e-o73vk9%jXsH8GJqwOH;85E<3ugkk8_W
zLp$TZe~2Fe`M_SwXn!Z<J*Z4ZHL^FrbTMB-RV}5UqLAH36babK8RE;(STdDJ>xYX}
zMgyq2idVxbam*IPxh!c`mSZPj0k19OE7(%d-rtKNx1fc19cLU}I<}A(6D~$~0t}Bt
zK<iE;^`r@s>Q~(v4e{f^Qa?rC_!8o+7!2~O_TGqF4J;Oi`0*H!V#P1S*J9ksOv2v{
z@%12-OfUvFKhY3V^(Lx-x09HzliZ6G@{{-mV1xvXaw;!KH<x!(7K|6;7u7<%+fNbS
z+zs)VhrFw%_(m_2(nq|{%j9Y$9{12UR3_i#6?Qcg24u#sErj@>M~@W!6hMe?!DtYJ
zhQ3Kw;eV5?fNw)q?Q4?|q-oQahxw`ev_gIgKiwFD%f(kI3;3BN{mXUgNQfZLS%rK%
zKO0KJKZ6kBpGPaMo@wgENGO65Kt$+)Fh5@o_zOs`E&z+%tTp(#8ekknfsrWSJ*r}t
zpcqPAipJzAZ0OM_oLKw{Al7B(;tuy7F^imgaffR!?r`kI9d5n2!>Jc{xb)%<hhE&_
z&Wk&od2xp;FYa*U#T{<ExWkDTcewE44hLS`;l7JIoOf}D>n`qa+{GPkyST$?7k9Yq
z;tq#h+~KZ^JDhcKhpR5`lhqw=x_E|@F79yA#T^d1xWhdccR1(b4%b}V;h2j%+;VY;
zQ!egs$;BNGxwyj}7k4=0;tp3_+~J6eJKS(_hZ8RDaKXhL4!F3({l-0ny~dbwA;eFK
z@n3)+v{mLWGj_3~X7F#ZV<@Pkpqhdj3RX~1N5QcaG*Hk)!EqF{Qm~qW<0)86!Fmc#
zq@bOG2n8J!L@DT|AV$GP3i>FBQ?QAGBn5*MY@uKq1*cMQIt6D^a25sUP;f2<=TmSY
z1s79rDFv5Na5)86Qg9UoU!ve@3a+K#dJ4XLH+s+6jR=2?DGj}fb1;<~hDls8rf;Q~
zxQ)Y<Z4xGHQ!q_C3=_0jkm|X3IvmrnCE&#}OvY+34O<0h6Q*8mm~^ehbnA1NXmucW
z4<=WAm{#F54%>pM)M+Sv7I<+U+PfH&r!QdIbQNm522-UkW0G_W_;Uw1^zW$sKiE=s
zKRb$jhaJrx!Ef3=hSvU*RkCMT75gcxX1`?1*~@7CRaVR1U@O?$Y$bb-)v=GoE5)y{
zn<SsniX4X}GiL5$x6YWgi`_9}_AYjp-+SseW2-Sr*I<HuJf_SipbREVvIgr*4Ch@j
ze2Zqx9QE(tX7^g`VRj$>Nn~b@y5C5tM9Kq3N;Og*GE!=g@?9fk1yUY1QtFWMh>>zE
zQhsQpG$7?sBc%x`KQdB|L&_6IN-I+S(@0s3lph-@$0OxwBV{d8o;6a|BjtG`<wT_X
z)JSPZ%8N!y1S!8TQaX_GD<dU}l$VT@Zlt_yq{NW&ijlGrDZe*T`jGOPkrGGBe;Fy8
zkn)C+l0?d%jFds7yk(?p@rCCUam4#12wemNVgrP^1A^Ge*5Sv9dhv4g4Au=X?}0eR
z*uCsz_9)xPUIgR~42-?3pBJ+@FJl9I9^1s1vjktmlDvnd_$h1<znig{-@vx;Z?diY
z5w?v#&rad5u~Yd+>@=&8oerVI^j!)mKS~NIdk4twQON%JVfJTIBQr<6XQZ5pln;!Q
z(~<I#k#Z(d{$iw@g_ONU$~j2+tC4c<jG3jJ8A<0;l4T@aNJ);7bTK968%dW^QpiZU
zjFJkCq|1F)EQa1<>|C(oJh0+?u;K!+;zF?EA`tvyu;LPSIlB}j+rf6R%h(fO%&(EM
zhg|_uV$nlsj0Y4c&!g7DvNc}(FfS&Jilh=F=_*PZWh8xxl13XzS5wj$Bk5X78fPS3
zPe~JuBuz_C5r^rofo8rII`=y0%IjG@woJ4`cP606&t+f1OPz`QGw`S<ff5d$4kBAu
z5JB9=Is6*lF!5`+F9VeR7U6mm7q)xyJX|Ajp(LM<3%}jUD{(d8T8k@+YZI>1ab1iH
zzpucb!1W@o*KoaqYcI4U>a=Qb;oX$A1J|>-_TT`=0$eS);<!+UjgxTp?YMU1dIc9=
zT-*5JGW$~?UW985uF1IY3vv$XbgFOx7v}_A9k}{&ordcoTsv{yitAonkKlS5*GuT<
z5fAdoYn@$uYQt^LDlLAr7N19PTjn`bOP`>n7i;O3pKgEPr`vC6=`U&N&uZz9&bXId
zdLN(mFrU$In|=R-eAZf|oGDT!-^b_N&ll|Ci%R*C_wl3rta!MOAB_U%Bkg>z_%`Ed
zBc9st<HyLVPn=Q8EAQhqDAe*GU$J%<Uy0}n(O@ZG1&G^Jy=>~r`*_2{95^(Wa*<TZ
zTae3ZI*jU7o`&13zp9GbGAl|-9NdD|b1Lf^E$ay$^joNQg(xxkF*dA}ue*)SQB+aM
znN$H%)Jw09O{#^@2DZ?O7S;#1ppr9NI5Dk-5vqmH1+~E6d61t(Y>dcO9%Tj2ZOnm0
zbu`?@p9kPr0a$^jN3&(U16gBU)@!q6J;MY(W;7YG@8?};Y%OGfsE%l(N~%Q@m$?GO
zk3fbVnPE1fC(Gy*M0;g)ETa7~8b)+LMmeGh5oI4Bnv&5!BDz^dUq*DRjJ|*dFLxVc
zkKyTD@9EokI!8R6(r_EQ6HljmPuJt=V(;lPJZ<xy&cf4$-cu4!r-~;GDLC0)o%iuG
z@Sv*1Lr2Dws#3vJmFh_~PEYsqb5L^;ItAQo8fJYH3RAevu)${|eg}-loiHNbfExWK
zZ2G-WrQhPT@;s6~z(=$1LZyC>mtmcFI{P7?#eM|U`ZzxV%eIy5$FTX&Ld8DEo3ZG+
zmc7V7%YFq_`)l|BzlFMe1)ED=gUbB_-;QO?i`k#}4z>rX_Z|K{tTaBsKEU@F{{j{K
z3I8Ql3}3^F#OvJQ?_g>0J*)!m<%Rrjyx3aAM_7w_sa3;ATPyiEYk-fpl6;c2gCA&J
z&Zk&6@Tt}<{7~x|#GmDdSugOJ)*e2~dY8|!8J}n8^9A;N#24^|_9A|y-NF~!tNGD(
zoF8K+c(r{xUv6*bEA4A|oqauTuy2RJ-N{?*-MrQQ5kKC3g`Z%*%0Fwr!B4c`<PrOQ
zzQO*8ciErvZrG@eP7&{Qiur&uhHrAl^Fe1a-|S4~r#Q3tsZIqy(^<r~JB#_}ohp8=
zQ^PNG8u&#{GvDEyz%O&w^DCVW{za#Y?{xb4)y^h<y>lAB!8w!P<XpsWb}r?&IXn67
z&b9n5=T`o8=MH|ib1%OKM&Ul^5x&dW%^!50<_|f~@rRw4`1hUP^4-o`{4wVf-1qXw
z^M>)=d4>GRys@~C<4@%sg8QNTCwcR6KY~A<w}d~RSIvI~Q+wXO4DbJT!+T+d;YA9J
zUV!1HtgeZ14X-M$46l0n#|`gAIT&8b^Do0ozLDoV{2w&DQe^%I4X<p_HN5Ic8D2bT
zhF3i)!>gW@;Z;w{@Tw<ec=4neUV_19N>i&Il;PE$V0g7B7+&oOhSz->!tnA}G0*t}
z%;6vLUhPk8FW&>R_YM#7_wiQh13sGng-_z2@G_Xd=~(KUWjTDImB){;hVe?PkT182
zd4n~AH(RBAtu>l|)*8p7)_C4yP2!uZ19{4t!cVsj=G(2q_{G*VzQdZuAF^ii?^$#C
z6V^Qblyx|N5vKK*))M}jwUobZE#vQ4mHa)J*}YaR|C_bST4Wt-Ew-Ah8mrk_X|-7c
z)@mzht+jSo>#WPI&sjHECt0^x8?0v#f7a@-Ua-2YJywtPuGNbrr+z!%8nEXhzQEdK
zFR}*h7HhM;+B(IKTc_Fy>rDG}YrDPO`n-LOb*_EAb)kK`b&-9iwZq<RU1tBty3&5d
z`l9`+wbOpXy4rrzy54@@y21X)y2<|3y4hjYZBCJOyHjl4<&3eu?u@tYb|zc*I8&|r
zoLSZ`r^0&BS!6xrEVdqYs;uujHP&vY!Ftqbww`cKu%2|*TR(9+tf!qW>v^Z&dcoOb
z{oFat`h|0*^^$Xu^&96>>vzsh>-WyJ)_*y-TCY2ISZ_M_T5mbKtUo)CSnoQ!tq+~2
zt&g1Nti8@l)~C*IZSK5f+s-Gr@3r&thS@x?&@RXui~BfxSl%JHA8Hrn&By%+JDj(~
zF3GF5$HDMk{4c}%zuoZu@0{`O$ieVZo_`tM|LcZV%HRK>;gt=#hF3lPe=_5>@oLjP
znC-C-V;|eo*j{@U&$DOqkUf`=wCC~B_ThXI=80wY5<cBt%4gZjFmJ5nN7yyI(yql^
zaTVr>$MR;oiLbSrF)wW6QOqZM?6rK8y^g2s&+*gkcD~*2;1}DSe23k`AF^Zodv+gx
z!tUo!Vb1xYo#el?xA52Ot^9TSH2x0epzqmd@xAuh{BQPo)*}0SYq5Q?RbyXbt+c-Y
zGkUp|w6B6`{5R`zn9CdN>#SSs8?0v#f7br8^@4q~wa322de^?)X7<<YeETkYKH>}P
zuiK04yX_YH9(%QYpB=Y%*$MkW`*iyud%OLxeU1Hn`+9pfaz1L`X+MG3llG77pV+V1
zPus8B&)aX<FW7I|Keykve_?-Qzhr-E{{}0uzjKQ0-#f+je>r39*PZe9o6cnWEoZ9z
zXJ?lEu2W%u=q$27au(ZrohtiNr^ew<gJU_(PQG)3Q{b$3ikuE7>~uLLPQNqK+2kDH
zoaT&i&U7X?7daE1OPzz9olco^tuxiR)j7nu!<p{f>&$R=IpxkHPKC4EneRO9EO4H4
zj&NRbj&y$O9Ob;_9OHa~`(CFqZ<upbUZGQ+Hx~DCPEFn+xF71Q$eWM*5zflIB~E=_
lwbKT}ixYBK`@j;#0f9#hQrUlg#XEYj3L6SL)B%aae*-=auPFck

literal 37005
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
SHX1u#P)+#o*`s}xlK&5iqM;=K

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml
index c33641763..d45db442e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml
@@ -1,15 +1,20 @@
 <?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="RelatorioTabelaPreco" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
-	<property name="ireport.zoom" value="1.2100000000000055"/>
-	<property name="ireport.x" value="112"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="68"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
-	<parameter name="DATA_INICIAL" class="java.util.Date"/>
-	<parameter name="DATA_FINAL" class="java.util.Date"/>
 	<parameter name="USUARIO" class="java.lang.String"/>
 	<parameter name="FILTROS" class="java.lang.String"/>
+	<parameter name="EMPRESA_ID" class="java.lang.Integer"/>
+	<parameter name="EMPRESA" class="java.lang.String"/>
+	<parameter name="RUTA_ID" class="java.lang.Integer"/>
+	<parameter name="RUTA" class="java.lang.String"/>
+	<parameter name="VIGENCIA_INICIAL" class="java.util.Date"/>
+	<parameter name="VIGENCIA_FINAL" class="java.util.Date"/>
+	<parameter name="VIGENCIA_ID" class="java.lang.Integer"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -24,11 +29,38 @@
 	<field name="empresa" class="java.lang.String"/>
 	<field name="dataVigencia" class="java.lang.String"/>
 	<field name="taxaEmbarque" class="java.math.BigDecimal"/>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<pageHeader>
-		<band height="75" splitType="Stretch">
+	<field name="idVigencia" class="java.lang.Integer"/>
+	<field name="idLinha" class="java.lang.Integer"/>
+	<group name="ruta">
+		<groupExpression><![CDATA[$F{linha}]]></groupExpression>
+		<groupHeader>
+			<band height="18">
+				<textField isStretchWithOverflow="true">
+					<reportElement uuid="e3c11bc0-5229-4925-b7fe-6a1e572ce946" x="0" y="0" width="559" height="18"/>
+					<textElement>
+						<font size="14" isBold="true" pdfFontName="Helvetica-Bold"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{idLinha}.toString() + " - " + $F{linha}]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupHeader>
+	</group>
+	<group name="vigencia">
+		<groupExpression><![CDATA[$F{dataVigencia}]]></groupExpression>
+		<groupHeader>
+			<band height="18">
+				<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy">
+					<reportElement uuid="5c9ae216-19d0-48f6-a405-6ee51dcd55ef" x="0" y="0" width="322" height="18"/>
+					<textElement>
+						<font size="9" isBold="true" pdfFontName="Helvetica-Bold"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{dataVigencia}]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupHeader>
+	</group>
+	<title>
+		<band height="124">
 			<textField pattern="" isBlankWhenNull="false">
 				<reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" height="35" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
@@ -37,38 +69,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="3dca1764-758d-4e1c-80c0-85cc02e47813" mode="Transparent" x="0" y="42" width="46" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
-			</textField>
-			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="8948c0fc-e878-45e2-8505-7934add98ab9" mode="Transparent" x="116" y="42" width="10" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement uuid="7f1b9715-baaf-4e20-9a9d-a7ec4c696587" mode="Transparent" x="46" y="42" width="62" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement uuid="64632058-9466-479c-ae28-0a11c9ed2c7f" mode="Transparent" x="132" y="42" width="62" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
-					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="615" y="0" width="100" height="25"/>
 				<textElement textAlignment="Right">
@@ -108,27 +108,107 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="59" width="801" height="14"/>
-				<box leftPadding="2">
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="64027797-62dc-4e02-8e40-958ac1511e0a" x="0" y="57" width="102" height="18" isPrintWhenDetailOverflows="true"/>
+				<box>
+					<bottomPen lineWidth="0.0"/>
 				</box>
-				<textElement verticalAlignment="Middle">
-					<font size="8"/>
+				<textElement textAlignment="Right" verticalAlignment="Top">
+					<font size="10" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.empresa} + ":"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="102" y="57" width="513" height="18"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{EMPRESA_ID} == null ?
+"Todas" :
+($P{EMPRESA_ID}.toString() + " - " + $P{EMPRESA}) ]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="049832ef-f634-42f9-95b1-ac2e1fe23b10" x="0" y="75" width="102" height="18" isPrintWhenDetailOverflows="true"/>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top">
+					<font size="10" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.linha} + ":"]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="102" y="75" width="511" height="18"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{RUTA_ID} == null ?
+"Todas" :
+($P{RUTA_ID}.toString() + " - " + $P{RUTA})]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="2d048310-1ec5-4711-b402-75ef3d3500d4" x="0" y="93" width="102" height="18" isPrintWhenDetailOverflows="true"/>
+				<box>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top">
+					<font size="10" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataVigencia} + ":"]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="102" y="93" width="56" height="18">
+					<printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression>
+				</reportElement>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{VIGENCIA_INICIAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="176" y="93" width="56" height="18">
+					<printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression>
+				</reportElement>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{VIGENCIA_FINAL}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="158" y="93" width="18" height="18">
+					<printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression>
+				</reportElement>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[à]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="102" y="93" width="130" height="18">
+					<printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} == null)]]></printWhenExpression>
+				</reportElement>
+				<textElement/>
+				<text><![CDATA[Todas]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="82e75550-fae7-4cea-acf9-f9f56f083400" x="688" y="93" width="93" height="18">
+					<printWhenExpression><![CDATA[false]]></printWhenExpression>
+				</reportElement>
+				<box>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Top">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="abf746f7-be60-48af-9882-6723c50f4ae1" x="688" y="75" width="93" height="20">
+					<printWhenExpression><![CDATA[false]]></printWhenExpression>
+				</reportElement>
+				<textElement textAlignment="Center"/>
+				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 		</band>
-	</pageHeader>
+	</title>
 	<columnHeader>
-		<band height="18" splitType="Stretch">
+		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="337f441e-ca7f-402c-8407-f3406ec2b4b0" x="0" y="0" width="102" height="18" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="337f441e-ca7f-402c-8407-f3406ec2b4b0" x="0" y="0" width="151" height="18" isPrintWhenDetailOverflows="true"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font size="10"/>
@@ -136,29 +216,10 @@
 				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0ddedacd-7ebc-4aa7-9535-2f5695ee9c8c" x="568" y="0" width="88" height="18"/>
+				<reportElement uuid="859d4892-377e-4313-8a88-6454a88ce936" x="656" y="0" width="65" height="18"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.linha}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="8506ac47-d72f-4ef5-b53a-da3970fb7edc" x="479" y="0" width="89" height="18"/>
-				<box>
-					<bottomPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.tipoClasse}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="859d4892-377e-4313-8a88-6454a88ce936" x="424" y="0" width="55" height="18"/>
-				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font size="10"/>
@@ -166,9 +227,10 @@
 				<textFieldExpression><![CDATA[$R{label.outros}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d9a2225c-8883-4a35-9c16-8af9bcfe6577" x="259" y="0" width="55" height="18"/>
+				<reportElement uuid="d9a2225c-8883-4a35-9c16-8af9bcfe6577" x="461" y="0" width="65" height="18"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font size="10"/>
@@ -176,9 +238,10 @@
 				<textFieldExpression><![CDATA[$R{label.pedagio}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="0583701e-920a-473b-b1e4-6137f8d022df" mode="Transparent" x="204" y="0" width="55" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0583701e-920a-473b-b1e4-6137f8d022df" mode="Transparent" x="396" y="0" width="65" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
@@ -186,20 +249,11 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.tarifa}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="82e75550-fae7-4cea-acf9-f9f56f083400" x="656" y="0" width="93" height="18"/>
-				<box>
-					<bottomPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
-			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="f9ea7239-48e1-4207-b957-dc4aadcaa590" mode="Transparent" x="102" y="0" width="102" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f9ea7239-48e1-4207-b957-dc4aadcaa590" mode="Transparent" x="151" y="0" width="151" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
@@ -208,9 +262,10 @@
 				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="876fa163-5ff5-4eef-b32c-0f5b6b40672c" x="314" y="0" width="55" height="18"/>
+				<reportElement uuid="876fa163-5ff5-4eef-b32c-0f5b6b40672c" x="526" y="0" width="65" height="18"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font size="10"/>
@@ -218,9 +273,10 @@
 				<textFieldExpression><![CDATA[$R{label.taxaEmbarque}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="77a2f088-9771-472c-bffe-cd1345050e51" x="369" y="0" width="55" height="18"/>
+				<reportElement uuid="77a2f088-9771-472c-bffe-cd1345050e51" x="591" y="0" width="65" height="18"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font size="10"/>
@@ -228,83 +284,87 @@
 				<textFieldExpression><![CDATA[$R{label.seguro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2daa8450-9151-4464-abd8-29d744df1e26" x="749" y="0" width="53" height="18"/>
+				<reportElement uuid="8506ac47-d72f-4ef5-b53a-da3970fb7edc" x="302" y="0" width="94" height="18"/>
 				<box>
-					<bottomPen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
 				</box>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.dataVigencia}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.tipoClasse}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="5860d60c-cf3f-4f05-a3e4-756baba65aba" x="721" y="0" width="81" height="18"/>
+				<box>
+					<topPen lineWidth="1.0"/>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Top">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="4a0efda0-b112-4092-8164-292ab7fb1950" x="0" y="0" width="102" height="20"/>
+				<reportElement uuid="4a0efda0-b112-4092-8164-292ab7fb1950" x="0" y="0" width="151" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="f544e769-3f8c-4200-86ed-01f6c4024334" x="102" y="0" width="102" height="20"/>
+				<reportElement uuid="f544e769-3f8c-4200-86ed-01f6c4024334" x="151" y="0" width="151" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="">
-				<reportElement uuid="b81fcb18-2337-4514-be27-fe7d3c88acc5" x="204" y="0" width="55" height="20"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+				<reportElement uuid="b81fcb18-2337-4514-be27-fe7d3c88acc5" x="396" y="0" width="65" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="">
-				<reportElement uuid="8a545d22-875e-46cd-8011-444a8e884bca" x="259" y="0" width="55" height="20"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+				<reportElement uuid="8a545d22-875e-46cd-8011-444a8e884bca" x="461" y="0" width="65" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="">
-				<reportElement uuid="6f76912d-0eef-439c-9fb8-236181d94033" x="424" y="0" width="55" height="20"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+				<reportElement uuid="6f76912d-0eef-439c-9fb8-236181d94033" x="656" y="0" width="65" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="">
-				<reportElement uuid="ac958e4e-b8ad-4abc-b58a-1aaca4992db6" x="314" y="0" width="55" height="20"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+				<reportElement uuid="ac958e4e-b8ad-4abc-b58a-1aaca4992db6" x="526" y="0" width="65" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{taxaEmbarque}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="">
-				<reportElement uuid="72858663-765d-4843-bc51-ec6a80a0b7d0" x="369" y="0" width="55" height="20"/>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+				<reportElement uuid="72858663-765d-4843-bc51-ec6a80a0b7d0" x="591" y="0" width="65" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="11f32d65-9824-47f6-95f5-482cce626d4b" x="479" y="0" width="89" height="20"/>
+				<reportElement uuid="11f32d65-9824-47f6-95f5-482cce626d4b" x="302" y="0" width="94" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{tipoClasse}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="e3c11bc0-5229-4925-b7fe-6a1e572ce946" x="568" y="0" width="88" height="20"/>
-				<textElement textAlignment="Center"/>
-				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="abf746f7-be60-48af-9882-6723c50f4ae1" x="656" y="0" width="93" height="20"/>
-				<textElement textAlignment="Center"/>
-				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy">
-				<reportElement uuid="5c9ae216-19d0-48f6-a405-6ee51dcd55ef" x="749" y="0" width="52" height="20"/>
-				<textElement textAlignment="Center"/>
-				<textFieldExpression><![CDATA[$F{dataVigencia}]]></textFieldExpression>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00">
+				<reportElement uuid="722229cf-1b78-459d-92fc-1a30615054a2" x="721" y="0" width="81" height="20"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$F{tarifa}.doubleValue() +
+$F{pedagio}.doubleValue() +
+$F{pedagio}.doubleValue() +
+$F{taxaEmbarque}.doubleValue() +
+$F{seguro}.doubleValue() +
+$F{outros}.doubleValue()]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
-	<summary>
-		<band splitType="Stretch"/>
-	</summary>
 	<noData>
-		<band height="26">
+		<band height="29">
 			<textField>
-				<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="0" y="0" width="802" height="26"/>
+				<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="-101" y="0" width="802" height="26"/>
 				<textElement textAlignment="Center" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
index 2aea0c66d..5a82aea0f 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
@@ -1,6 +1,5 @@
 package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
 
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,18 +10,18 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 import org.zkoss.util.resource.Labels;
-import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Comboitem;
-import org.zkoss.zul.Datebox;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
+import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioTabelaPreco;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.RutaService;
+import com.rjconsultores.ventaboletos.service.VigenciaTarifaService;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@@ -33,13 +32,15 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
 
-	private Datebox datInicial;
-	private Datebox datFinal;
+	private MyComboboxEstandar cmbVigencia;
+	private List<VigenciaTarifa> lsVigencia;
 	private MyComboboxEstandar cmbEmpresa;
 	private List<Empresa> lsEmpresa;
 	private MyComboboxEstandar cmbRuta;
 	private List<Ruta> lsRuta;
 
+	@Autowired
+	private VigenciaTarifaService vigenciaTarifaService;
 	@Autowired
 	private EmpresaService empresaService;
 	@Autowired
@@ -49,6 +50,7 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 	
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
+		lsVigencia = vigenciaTarifaService.obtenerTodos();
 		lsEmpresa = empresaService.obtenerTodos();
 		lsRuta = rutaService.obtenerTodos();
 		super.doAfterCompose(comp);	
@@ -61,72 +63,45 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private void executarRelatorio() throws Exception {
 		{
-			if (datInicial != null && datFinal != null && datFinal.getValue().compareTo(datInicial.getValue()) < 0) {
-				try {
-					Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),
-							Labels.getLabel("relatorioTabelaPrecoController.window.title"),
-							Messagebox.OK, Messagebox.INFORMATION);
-				} catch (InterruptedException ex) {
-					ex.printStackTrace();
-				}
-			} else
-			{
 				Relatorio relatorio;
 	
 				Map<String, Object> parametros = new HashMap<String, Object>();
-	
-				StringBuilder filtro = new StringBuilder();
-	
-				filtro.append("Início período: ");
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(datInicial.getValue());
-				filtro.append(cal.get(Calendar.DATE) + "/");
-				filtro.append((cal.get(Calendar.MONTH) + 1) + "/");
-				filtro.append(cal.get(Calendar.YEAR) + "; ");
-	
-				filtro.append("Fim período: ");
-				cal.setTime(datFinal.getValue());
-				filtro.append(cal.get(Calendar.DATE) + "/");
-				filtro.append((cal.get(Calendar.MONTH) + 1) + "/");
-				filtro.append(cal.get(Calendar.YEAR) + "; ");
-	
-				parametros.put("DATA_INICIAL", (java.util.Date) datInicial.getValue());
-				parametros.put("DATA_FINAL", (java.util.Date) datFinal.getValue());		
+		
 				parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioTabelaPrecoController.window.title"));
 				parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
 				parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario());
 				
-				filtro.append("Empresa: ");
+				Comboitem itemVigencia = cmbVigencia.getSelectedItem();
+				if(itemVigencia != null){
+					VigenciaTarifa vigencia = (VigenciaTarifa) itemVigencia.getValue();
+					parametros.put("VIGENCIA_ID", vigencia.getVigenciatarifaId());
+					parametros.put("VIGENCIA_INICIAL", vigencia.getFeciniciovigencia());
+					parametros.put("VIGENCIA_FINAL", vigencia.getFecfinvigencia());
+				}
+				
 				Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
 				if (itemEmpresa != null) {
 					Empresa empresa = (Empresa) itemEmpresa.getValue();
 					parametros.put("EMPRESA_ID", empresa.getEmpresaId());
-					filtro.append(empresa.getNombempresa() + ";");
-				} else {
-					filtro.append(" Todas;");
+					parametros.put("EMPRESA", empresa.getNombempresa());
 				}
 				
-				filtro.append("Linha: ");
 				Comboitem itemRuta = cmbRuta.getSelectedItem();
 				if (itemRuta != null) {
 					Ruta ruta = (Ruta) itemRuta.getValue();
 					parametros.put("RUTA_ID", ruta.getRutaId());
-					filtro.append(ruta.getDescruta() + ";");
-				} else {
-					filtro.append(" Todas;");
+					parametros.put("RUTA", ruta.getDescruta());
 				}
-				
-				parametros.put("FILTROS", filtro.toString());
-				
+			
 				relatorio = new RelatorioTabelaPreco(parametros, dataSourceRead.getConnection());
-								
+				
 				Map args = new HashMap();
 				args.put("relatorio", relatorio);
 	
 				openWindow("/component/reportView.zul",
 						Labels.getLabel("relatorioTabelaPrecoController.window.title"), args, MODAL);
 		   }
-		}
+		
 	}
 
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception{
@@ -134,22 +109,6 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 	}
 	
 
-	public Datebox getDatInicial() {
-		return datInicial;
-	}
-
-	public void setDatInicial(Datebox datInicial) {
-		this.datInicial = datInicial;
-	}
-
-	public Datebox getDatFinal() {
-		return datFinal;
-	}
-
-	public void setDatFinal(Datebox datFinal) {
-		this.datFinal = datFinal;
-	}
-
 	public List<Empresa> getLsEmpresa() {
 		return lsEmpresa;
 	}
@@ -180,6 +139,24 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 
 	public void setLsRuta(List<Ruta> lsRuta) {
 		this.lsRuta = lsRuta;
+	}
+
+	public MyComboboxEstandar getCmbVigencia() {
+		return cmbVigencia;
+	}
+
+	public void setCmbVigencia(MyComboboxEstandar cmbVigencia) {
+		this.cmbVigencia = cmbVigencia;
+	}
+
+	public List<VigenciaTarifa> getLsVigencia() {
+		return lsVigencia;
+	}
+
+	public void setLsVigencia(List<VigenciaTarifa> lsVigencia) {
+		this.lsVigencia = lsVigencia;
 	}	
 	
+	
+	
 }
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 2bf218037..f6ecb12d8 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -4191,8 +4191,7 @@ relatorioCancelamentoTransacaoController.lbBilheteiro.value = Bilheteiro
 
 #Relatorio de Tabela Preco
 relatorioTabelaPrecoController.window.title = Relatório de Tabela de Preços
-relatorioTabelaPrecoController.dataInicial.value = Data Inicial
-relatorioTabelaPrecoController.dataFinal.value = Data Final
+relatorioTabelaPrecoController.vigencia = Vigência
 relatorioTabelaPrecoController.lbEmpresa.value = Empresa
 relatorioTabelaPrecoController.lbLinha.value = Linha
 
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index d5aefafb0..35e32e81a 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -4253,8 +4253,7 @@ relatorioCancelamentoTransacaoController.lbBilheteiro.value = Bilheteiro
 
 #Relatorio de Tabela Preco
 relatorioTabelaPrecoController.window.title = Relatório de Tabela de Preços
-relatorioTabelaPrecoController.dataInicial.value = Data Inicial
-relatorioTabelaPrecoController.dataFinal.value = Data Final
+relatorioTabelaPrecoController.vigencia = Vigência
 relatorioTabelaPrecoController.lbEmpresa.value = Empresa
 relatorioTabelaPrecoController.lbLinha.value = Linha
 
diff --git a/web/gui/relatorios/filtroRelatorioTabelaPreco.zul b/web/gui/relatorios/filtroRelatorioTabelaPreco.zul
index df678efd7..a2b0b0da2 100644
--- a/web/gui/relatorios/filtroRelatorioTabelaPreco.zul
+++ b/web/gui/relatorios/filtroRelatorioTabelaPreco.zul
@@ -7,7 +7,7 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioTabelaPreco"
 		apply="${relatorioTabelaPrecoController}" contentStyle="overflow:auto"
-		height="285px" width="550px" border="normal">
+		height="150px" width="550px" border="normal">
 		<grid fixedLayout="true">
 			<columns>
 				<column width="25%" />
@@ -16,19 +16,16 @@
 				<column width="30%" />
 			</columns>
 			<rows>
-				<row>
+				<row spans="1,3">
 					<label
-						value="${c:l('relatorioTabelaPrecoController.dataInicial.value')}" />
-					<datebox id="datInicial" format="dd/MM/yyyy" 
-						width="90%" lenient="true" constraint="no empty"
-						maxlength="10" />
-
-					<label
-						value="${c:l('relatorioTabelaPrecoController.dataFinal.value')}" />
-					<datebox id="datFinal" format="dd/MM/yyyy"
-						width="90%" lenient="true" constraint="no empty"
-						maxlength="10" />
-				</row>	
+						value="${c:l('relatorioTabelaPrecoController.vigencia')}" />
+					<combobox id="cmbVigencia" 
+						buttonVisible="true" 
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						model="@{winFiltroRelatorioTabelaPreco$composer.lsVigencia}"
+						width="100%" />
+				</row>
+	
 				<row spans="1,3">
 					<label
 						value="${c:l('relatorioTabelaPrecoController.lbEmpresa.value')}" />