From 78e740e95a0d2c335813980c9352d23638521fd8 Mon Sep 17 00:00:00 2001
From: emerson <emerson@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 15 Jun 2018 18:54:53 +0000
Subject: [PATCH] fixes bug# 0011341 dev: thiago.veloso qua: marcelo.marinho

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@82687 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioBilhetesVendidosNovoLayout.java  |  19 ++-
 ...ioBilhetesVendidosNovoLayout_es.properties |   4 +-
 ...ilhetesVendidosNovoLayout_pt_BR.properties |   4 +-
 ...RelatorioBilhetesVendidosNovoLayout.jasper | Bin 40898 -> 42817 bytes
 .../RelatorioBilhetesVendidosNovoLayout.jrxml | 114 +++++++++++-------
 ...latorioBilhetesVendidosNovoLayoutBean.java |  36 ++++++
 6 files changed, 131 insertions(+), 46 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
index aced64e3c..a74251448 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
@@ -14,6 +14,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndStatusBoleto;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -56,7 +58,11 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 				sql.append("       t.preciopagado AS valorcontabil,");
 				sql.append("       t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))AS valorbasecalculo,");
 				sql.append("       t.valoraliquiotaicms,");
-				sql.append("        ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 AS valoricms ");
+				sql.append("        ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 AS valoricms,");
+				sql.append("        cod_origem,");
+				sql.append("        origem,");
+				sql.append("        cod_destino,");
+				sql.append("        destino ");
 				sql.append("from");
 				sql.append("  (select distinct est.icms,");
 				sql.append("                   c.preciopagado,");
@@ -69,12 +75,17 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 				sql.append("        c.numfoliosistema as formfinal,");
 				sql.append("                   c.numseriepreimpresa as serie,");
 				sql.append("                   c.preciopagado as valorcontabil,");
-				sql.append("                   est.icms as valoraliquiotaicms");
+				sql.append("                   est.icms as valoraliquiotaicms,");
+				sql.append("                   po.parada_id cod_origem, "); 
+				sql.append("                   po.descparada origem,"); 
+				sql.append("                   pd.parada_id cod_destino,"); 
+				sql.append("                   pd.descparada destino");
 				sql.append("   from caja c");
 				sql.append("   left join aidf a on a.aidf_id = c.aidf_id");
 				sql.append("   left join aidf_especie ae on (a.aidfesp_id = ae.aidfesp_id)");
 				sql.append("   join empresa e on e.empresa_id = c.empresacorrida_id");
 				sql.append("   join parada po on po.parada_id = c.origen_id");
+				sql.append("   join parada pd on pd.parada_id = c.destino_id");
 				sql.append("   join ciudad co on co.ciudad_id = po.ciudad_id");
 				sql.append("   join estado est on est.estado_id = co.estado_id");
 				sql.append("   join empresa_imposto ei on ei.empresa_id = e.empresa_id");
@@ -145,6 +156,10 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 					bean.setStatusPassagem((String) (rset.getObject("statuspassagem") != null && rset.getObject("statuspassagem").equals("V") ? "N" : rset.getString("statuspassagem")));
 					bean.setEspecie((String) (rset.getObject("especie") == null ? "" : rset.getObject("especie")));
 					bean.setCodFiscal("5357"); // código fixo indicado pelo cliente mantis 10516
+					bean.setCodOrigem(StringUtils.defaultString(rset.getString("cod_origem")));
+					bean.setOrigem(StringUtils.defaultString(rset.getString("origem")));
+					bean.setCodDestino(StringUtils.defaultString(rset.getString("cod_destino")));
+					bean.setDestino(StringUtils.defaultString(rset.getString("destino")));
 
 					lsDadosRelatorio.add(bean);
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties
index f299de5a2..f473f8da4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties
@@ -23,4 +23,6 @@ label.valorCancelado=Qtd. Cancec
 header.periodo=Período:
 header.tipoLinha=Tipo Linha:
 header.estado=Estado
-label.codFiscal=Cod. Fiscal
\ No newline at end of file
+label.codFiscal=Cod. Fiscal
+label.origem=Fuente
+label.destino=Destino
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties
index 191f2c178..a64e65782 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties
@@ -23,4 +23,6 @@ label.valorCancelado=Qtd. Cancec
 header.periodo=Período:
 header.tipoLinha=Tipo Linha:
 header.estado=Estado:
-label.codFiscal=Cod. Fiscal
\ No newline at end of file
+label.codFiscal=Cod. Fiscal
+label.origem=Origem
+label.destino=Destino
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper
index f397c0c6aa473febd00653fa9c1601da4958ba5a..cd58de81bbfe03817d46c9e5b4c3119eb7d6da0f 100644
GIT binary patch
literal 42817
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
TbbyAp>Ub%Zm$d4&!HNF|sgft%

delta 12405
zcmcIq34B$>)jwx0A(!N`<`KzaNMhKMkOc{W0LmkIfrr^hUIGbVcqA_&kUcN#@I+Z;
zQ|U<6*5yO0v}hF!f;))Tt%9b-E~27Up-^kpmTGOK-<c&Zd4T--eN}YM`=2v2=RY%d
z=G-$Eo<GKp9AbO_ZU*;V+6w>%@bvuH?T14<M)vujACBq>8PeCpO8&@*Q62W!A`Hp`
zz}xxG(W5(Fh|9yE5&)JaRr^&7d*SGgJtLN2(2vN`XxXP=)LV?frwS(*V9*GvdRcVf
zuclqcBT|m?57IM&7LeCtWL?JZNNwS5_HZ7Zmdj72#PQ`<9}Bkh$lRG%aL?E<jOW|4
zWB46o^Fv3pz#5byfv=q&)?4X(`#3+GneK<36a28nJ_HkZea3ixG<_g{JR^I+C>j?w
zlRFq7e8%(V8^ZW)V}p78xKTKqe=sF3biAmLVw@yXx+K$3kZCB$G!$giW10<9`M&gM
zo_qB`o|$R4$+f$XR?KWqW*6l&K`DhpQYu|iYA7f*6qFhYO6uXK{7Ht59~qxBpz=bx
zu34r{=%OqWlv21PrP3v(hJsQ<L8+mjq#l0C;h8o*J<FjV*27s{{;P$5DHcfoN|*jM
z6#g|7{xuZ-sfXYHBjauS#ffFw|Aa|h{@a9qDO#j|rAz-B3jZ1k{~8Ma)Wh$8Y?h7B
zob0g44S(UXiKq0+<Sxn^1*H@>NJ^zkN(}|2hJsQ<K}kLQlzS)I`1{w4w~Zz`@#m8J
zG56Xo+U<f?id!YE(j~2if>uL8tD&H!9+Eb0avHyWN`Knnm03|Xd2TO7ymv~PJ_Pp(
zQYr3{q)L~h8VXVk1*wLDlzRB*`ua6C{)Rog_weRsF92_uGQ>8Km_NM~yEumFQ@f`9
zh!}ws56clKU5-FQF#-+62s9KUpdS7a%$Q>1&TN}WBM=@Rl4FqJ>B2E=&z`1d|BPrU
z#Z!`7>5^MR!L6a-)=+R$4?p+Qb{l^=Cn}Iz2EmKDWB6D{*W6zd{8GFk`IRpDH5B|B
z3Vsa*KlSkQXJp%WUT##!_0Hi2_T$gbP3qX27mZiohx9Z;YnoacoQ-u=b?$n3I8O0>
z`B8&qT^~`GTi4jLW}vJIYV)+#dAi%%q}6O|Ur-WQ5g{x3E^*g4wPrUpdff}^x@e}9
z4^5J_17z(~cbg~MU0>B+-=zFDt4H-svs6Fi=L;gQ#ZwnpX$E~{cV~8f$tC+y3)WuK
zJybolYPZ*2=4q^Uch`i;(FA+inmtuLCl@L0{o1^4Z+lyjyRFS#>uKojrX5x_Rp-{V
zRrOe_EBO6I^DzFgnc>Lr6u-MHo@W(@VGJ)QjuVEK;)tXeL~$m<XV^=M9L1Hzj-tY1
zS4m}dVS&pr+oh&1=In(uo*o>{Un#cww~2-HEc41*7Q?p`N0@S9yf9KX8bmB7imwzb
zUl$K0C9))1DC0}6B&Dn*Ca}YuC8EPaCDC2xRO#nWB@xkjfPK}-D)S1n?RgG8E*|TO
zrhb!M@xr&;mEh2=2k6!=XTGDdqOhQ=gPh2qMeZf;ly+}jeTu8D!Bf%H=+QG#YcZJ5
z^bO`GT|vFor1<u$W4Kv5gqY$=hmO)S9W1@nyBlj$vg_%Y<TbggJ*_<*@ktw^gS$q$
zwKSRfKUo?pMtY)jLivRwb>tW2*<Fqj-9e7j);-efruuqMmA9^`u_pzDmeAv>%yl~Q
za=Lo*hO)@P+I#O@XP(PZ+%<^1%QE70%^<x(WzJ$(sXfnG(X&-Nx6Km!WaKP4+!?dP
zLt8j2L5%(RS&<Pj2x3Qs<k($yA}_G#bumyaam(7?E~l$Budu6TUw(ABt_h~O7CTDp
zJ*xbj93?J$&ZRri2F-SMJxK}@(f)C`oJEC|dCr3AJzdg}e>+=_e@b~QDUs!J{7P|`
z4;PbB%ARt$H<faxd}wz~QbkO+QePoY4TTM|b?mLU7sGx|i_lD`ak@u5d<vIr4|mUv
zus`AjtE#EKy`izYW}g>&d0X2(qSZrQFvg^13iz-WFin8HJ?bCrcyjLTy`sm-6=E*}
zETvZ!f@t=dj7sb%uX7h(#g0>_BKtIlsJXE98ex2upK#|eY96;BKZ?C|sdmElKHs!p
zl4$nwg6pE#yWieybd_wjxT;{VAn%=Bm{*!#pxUo#g-IOUaeV%YUi>3x81G#jhf(~|
zWy#!CZNpxa<wo+Gs<T5)YHvu<n|D@+^;SCnyv7gX+Wc^zH!MOmpfe#C1X=|WK6>-G
zhS9tuXCU9;c^`*Jg0(eyp;wAZDIz6-(j|e0f<Qw-py0&>k&<9lZH0FJdF}MjB;j0&
zk<z)+rE?91a}9-a1uu3!Qab<R!nxXcWnBy=@-=nop;>}LigA)c>5@W2L7}0bQ1D`k
zaXfv|z1scRMZ*2z)`ZaOgnKER(!J89dkuwq4TXCJFLv*gGk9llxuz(p7ZgqPX`vN@
zLW(j;p>#>1p`g%EP$+mYMHx}tC*6+^PLvOQJfGPTAG%NwNKqpRlr9N06a*Ry0tGK7
zsF8E%Y^>FDC}|pr?R-^JhSpziios~PY%2t%6w4%~(j}#af>J|4so=$w%lP)@b=rMe
zOPBkN!o3vhrF*4I_ZkZK8VdIcUhICooKbvhwWiqF+C{NLP)NZgh0-O3hJr#vL80Kq
z6kJm9wgo{$L?z#s5Y7j91<m}}B+J+(c%;}Vd6X`BG!#4<5>FRgJM0Q(?BsEY>D<;n
zuZQog?S9|;gl{PxmA;iOeQPLuYbbncD1ARFec!fZo?aSrY1h&m5^kk<R=QQXbgQ9o
ztD#sL1utHjXX)Xl^YcqTW5ydYAcZU!heEE)uLX$|osvZ9l0-v6qM;yB@M4lqx&FOY
z{3RMs=fNP6OtyKv*-Z`2b@iSc(ufF8^ZqM`MLu@z6iV{}tfeN&0Rk>-qiXgTFIYLU
ze`4@!=bw6xj48McA(a=-i;SvF&loc%Ju_q6*a?~AGAqZXj~|yYAs7%Lna8cas^guN
zw;<oXdMIDCdPK+G)nkz}pKWMVv%A&Z;PHA|bs8zM$O1>U%UM`}5XrZ%3Fo7I5pl8I
z?Jk{lcI5cH$X~g^$z#{P>6;AKgg`HtVnGn}?gI>_S`e&Ijs>Pdxfb+MXu1U<3eB(}
zRG~ZzEQJaz=&MkX1^pB%wxGX4E{oPja+FyxP$A!J3kE4zVL_Neb1kqbbiD<G6`F5B
zxIzmoxI&?73x+6EV?l&M3oVFLXpsd`3e{T>tx%%{S1QzOK@1@u&A8Qqp~~pBAXcFz
z7Q`vE%z}7@R#<SALaQuDP-u+>!xXx~g5e6?Xu$}D)>$wTMu}D3U_qinH(QXT&}Ivg
zeF|>1V6;NFSdgO7Z5E^|^aBgh6uRAlbcKFs!5D?^wBTxmeq_N|h3>W>L!o;u7^l$x
zSda<h#bEBYV1hzFiLoF{!3QmvsL)R>n557iZd<ov)}ydDgnI2m2&rqV^XArh>Z{u<
z=uqbU2&OQXxm(G2Kp78G+wQc{geMXDiflVo+zV3k-Oa)9H2-*Ay7??T7Yfh7As(|n
zBlCG`6|iSbcmd&}+lC3hK+yTG2`?jmt~7jr39lk_rM@QolJ8v~={t%L<|=gA^D4{i
zd4<K5&Jss~%U)u_8wmY$imvZsCUnx6yHjoxevM%3*;zESPj%**@D{o4>YZmVDWPkV
zJ;zaO!fz3}GJoMIq_U*2v^d*g!teRS4MU?&kVj`prE^+AVX>o<5=+YM#ql-aUA}F@
z(3F$ilg+o!rt@7|;4<NZZmX;78e_tT$cL6krke0EEt(#Ty1kijx_cNsE+8hHL7rA&
z%QWFn7;v>Q;m_S1CE3N!B3GV+nExVHRNV_q_?){phEM$~HSD=4;$CjTIeH%IE@Z-&
z_-)r+6aIl9uYYkS{FAz<+lUF@AXswcodwQpr=3>#-~9cJQ4Eo{R9rFGL<6CZ{{n7e
zkcyNec+t(lS;182zwMjY2gUaQ6GLfP0zONa*q2)RKPH&ipKrf8Y`{R;zFprnObkO_
zG}-1eaWJh=k54BieNF-ORm8*yT7wI}X_y#A-u)j`OuUlTuCcwr?##(GaVRPJyMu{w
z<XT)RDho>Ur_!#$tLVkh=<%ku)ub+R)7ObsK7Uif^kFmsmHzu1j-Ykw+IMnq;3(R&
z(wEvRm_#jfCv6$cU*9x+)EI<;^8AS#b*huTFVuQkgK;cEuaVAC6pkn3xDd?1Og?#Y
z!k7t|6#_?aBF(eAQ;D~=uCX>4C)3ecC@*9wG}OAL>LwGf<$QDcLOV{SIDy&JO*atF
zC1qh#tJ_2eZHo(?O>M8K5yO~<fUzbzX?KjwyRgwjHN5LWa60CN;BcJClec7<g;*pk
zGkN2d1V;(Fgi=aN)-^PDEq&NBaTbkMdX#~OUfrHxEDym7m_i+33W5<^?J;ql*im<H
z9>(Ww>9e>HD}}fD<gMPlz*C>%X=rZsw2`+3-2@)`UL>YoO)INf1#FiZg#O)T`H{`U
zh4kc=QGQ=DaS?CcI)v3De{a~3R1+H!hNybEz3laME$wwpUbj4C*i1WB)t1thYUQ0<
zZKYm6O^=Peq<i4%TbGH;XkTb%`I*ba75<(*4%Vs=G--V+w?z!}(avgUt4(Qa68Vma
zYx$;aF@4w3&Y(xIUbI`!_isxax=C3!Q}dFh_SPy-E~QBH?qrly0AzH0v#l@sdJ|;g
zRVaVyMJRviH7I|R^)I~vrB3fZ`Acs<`AhFU`Acs;`AhFT`Acs-`AhFS`Acs+`AhFR
z`Acs*`8&a<0ln#@f!=fSm)>&pYtq%9vLKSz(pP}<G*G19eu)Rco`{b_wh#^>rU~H`
z;yNMng(wtarVu4UlnOCRh;kw32r)0wN3v2tw-8lAc!a1GqE3j#LNo}`Bt(l4Z9=pQ
zu~dlVLaY>GwGcib)(UZx5bK55D8wcqwg|CJh+9b%!FB<;5IcmpLx{VC_^}Z82yvef
zJB8RK!~;U?7UE|@JhYEi3gKar??ER2=(ZESL8Sj29#QK?iHCaP0}_)C!efca2jTI=
z(Ffs)?tX*hjwq)*vx0KSIg}O7r9PBgC=Z4S2I;^SCMFGf>Pa}v;4mDa|HUIn8uVg-
z#gUlg8}w3uX&N<pCBWh&%WDCa>&WtYfF++S#{w*cWO*~dGLtO73b2%r#dkcwR7$4b
z1XyN~<#z#=a<aS~V3|XfcLFT)$nsu*rIIY~2Uy%>`GYUOR7Iwb0xTY~oC>hilI4#9
zmO8SW4X`XG%O?Sr2C{q_U}+-DXHWWiKA{#eeG$;8jVyl)u(Xrq?*W#jWcez<vYaem
z2Uu2;<zE4o)nqyUB=~x45MN?a7(zg+wZg;#Og9NruK?5f?(KOCCHDZ;bQ|$da$iGP
zb1h7Vg|u1gpdJ>{UnVbx+X&qc4X_^?!S@n0!SA3M&eDg&e?cqugEou>FOGqB%z-6X
z21{`vEW;JB9Jj&>ycbsDURZ@kU^O16`{OC_;a6}23xTyP8g67Ma1*n`I_84)tQI!V
zS)dGCoei9$&IX2xDfE_8@Et~z{uig7Y$0k|+O$cStN_y%Vd@uP+9pf`0!+6G)1Uy;
zc44vwn7A<c!UJqOgl$NG=?-Cv3^3g#Owj?R9}81VfaxA#iVZN`Crt4@P5ohK_rtpe
z`t$N1P7=2{x`F7Bv{fw{%olwVbl>5JakvO^WEvS@dO(;G15CSxDLKIOGhs>zF!czH
zKDv6+Ci)3oWFMg0;Day$c0(Tg6e{6obiYr<G|G?CsYNf+t`_f`UPow<27r-*`B8i5
zSG>B!pA;&uQaMKDZ7Qdzd_m<rh2an?;Z)+OP&=GNWg3-YABkovE2(UtvYX1|R9>Lc
zN#z|Xr>UG1uVX5qRLBvFqmoP|lgd;o`BY|8siM+IWjU3NRCZ9=MTHig9inoS$_XlG
zsC-F-_XUv%qY{VtyV><mV@7$egE*dWaSxo^17`_rs5U7*?D0M9;XUjj-F7^mxF4Jc
zaMEGCCVw}6mPmVY$^pzF{4wEN1>b%er<aG}jDwg@&37HZg2R|`0E-V`88v){8qQV?
z_dSgj<p*&NSsxUA4&vN^4q<rx0d%Ww>!~K+&%BhhwNmp{Q13cYOQkBbImA$<7>Wpb
z6m(D<pWi_yRn)4AWP)`H#t~esU^u}B1w#ooDF_5xB!qJW+YX?QCJ$!`w=45Wf=d-V
zPH?$`uM%9T;By35E7(Cpy7d6AIgB@ulLtt<Lu$0PlrQXuZT`AVq}}7MTS?lFb)9cF
zB{BP9hrekhX?OXX&LnM%U&|(KlV8gqZKq!wLE3h|7D3uZzb01TMlt5(y|jmAPJ%bW
ze8T(0`R{<&;UFEGC!mu)EW8cR!n^Q19iJm`2412g^fH`-U(zvp9TDE7qtuCg=|Ue4
zzrhH2n~u~890n)pSiMgN^&>i3ALF%jah?WeaRz*f#dIkyg}>4%`x~~wS9H?;fotdj
zy8+JQCiF4fO_$X@7>tiohWrFt_yS!!U&4XdiG%PshT}VQlRQb6#nTv#XE7Gf(S7hM
z97aj!aAsg43&kYX4^vq<rm+Yd%i=JDCEx^>j9DxduVI;ZEz81eHWhQ21E;fmbh0AM
zXS1<@&GBI|tHKgigR@v8&Sot*mo3M6Y!$lMMqI!)V-4GZwd_t@%ywZtdk~x1K5Sw8
zv7H^lCF}^UU`KH!dy{5z0&igN;W~B(*RxM>6Z;Z3v#;?MBM5IbOyouw-fo2BopjXi
zG7|6}BN-o{7aHF5eaAR@<lh?NMEv`{W8CFJoX;QczP}iExe({mF>b^EHOA=<|4EFy
zT!{1G_aEaf7vg;XS&Z8l5aUSe5#w~7j&Zt9$2eW5L!8!hh?6ZT{^=N}JL(vxH67!$
zremDebd1y5x5hYpgffV|6ukDsF?zLk;*%7#o`QGrIXH!fd=#l(fG_Yx`XcuVMWj~|
z@hFDiF$zMzqTusu`gZkOjK|;MFbYH|_%5d72RI4;fb>sq=rhb|oPmGBV*G?YrF=#o
z96rZ33Q#NY@3;oP#trySigEwO-4v|$uwM8$3&JN@AAEs@;7b&=I+?FO9%o_r4zuA&
zHUv*o1Ut*F#B(eLzhdzW*j3D6BUmUK$@;Nm7S2Yq2$s&`*cg_;#*rnHrLu`6C$TIx
zg-vC4=Ai%bSuQJLGuUi)9h<`nSrutD%*7g6DQjWnY&ol7tJw8yqmNax%~ZXERkJ(U
zLbi+5u?JZL+ec0JvsQM9wXq{?DLcxRu{Wv93AUQO$JVkl>_+wp+rYkL8`;-vixI@O
z8Ya8V2xHrgaJIvUV?Q(!*pG~4c0VO<H-Br0^L<Bo+~s22<w6|AzwacEyIhRBT!{0@
zT<^cn<1QEDbcow>sSxL*gzH=LINjsFjd7O?aTI^PlRWNnG4669j^+>FMIQJ6P2(v3
zeFu3Qdk7f&IlNBSjAQIE=wt`rZFUgeWlzH?_6(e1hv5tMJe*^{fb;AnMD`knuwP<d
z_J$9`DR+rr$1$G0MM>4~F@?R2>6FJzVkaqa`VgnFk8lS2BjrhFu$29o@}Ez!jeS8m
z&tGv3<v1JISCs4gi(=e2xW_<z++g^G(Hmbdg7GCI6gv$Ij~fH<9b+J#GzQ~o%7M-r
zk$BFC!mkY9PzFXUGbmVu8pBvWV-yQF5?O?i!s3inmS9}Xl8vz})fmq*jR`Evn9Qac
z*D!}MmE{}RtjL(gW*gJl93zia8TqWnn8_NAV%B1mvE{}rw#t~pHX3u;W@A1DB{#d%
z@UUG*4SUd7#P%7B+5W{w6FX!yvm=I=9W~n7o5pf>!dSuHGuE&(hL3$>+{C^#*0HaR
zn~fl2lVKX$j4<OCBi#6b5od5C!MMXnHtwSsw^dvZ0lhHzl7Cz6g)#D<5GL&o|6e8W
BMt%SQ

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml
index 882fa04e3..f32047bab 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml
@@ -1,7 +1,7 @@
 <?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="RelatorioDocumentosFiscais" pageWidth="898" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="858" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioDocumentosFiscais" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
 	<property name="ireport.zoom" value="1.0245201830476134"/>
-	<property name="ireport.x" value="207"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -41,13 +41,15 @@
 	<field name="especie" class="java.lang.String"/>
 	<field name="statusPassagem" class="java.lang.String"/>
 	<field name="codFiscal" class="java.lang.String"/>
+	<field name="origem" class="java.lang.String"/>
+	<field name="destino" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
 		<band height="28">
 			<textField>
-				<reportElement x="142" y="2" width="416" height="20" uuid="e15d26de-6873-4576-b49b-8dc546b39dbe"/>
+				<reportElement uuid="e15d26de-6873-4576-b49b-8dc546b39dbe" x="142" y="2" width="416" height="20"/>
 				<textElement textAlignment="Center">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -58,87 +60,87 @@
 	<pageHeader>
 		<band height="91" splitType="Stretch">
 			<textField>
-				<reportElement x="351" y="23" width="111" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
+				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="351" y="23" width="111" height="20"/>
 				<textElement>
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="462" y="6" width="181" height="17" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
+				<reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="462" y="6" width="181" height="17"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="781" y="23" width="76" height="20" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
+				<reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="781" y="23" width="76" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="643" y="23" width="79" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
+				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="643" y="23" width="79" height="20"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement x="643" y="6" width="214" height="17" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
+				<reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="643" y="6" width="214" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="722" y="23" width="59" height="20" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
+				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="722" y="23" width="59" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="89" width="857" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/>
+				<reportElement uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94" x="0" y="89" width="857" height="1"/>
 			</line>
 			<textField>
-				<reportElement x="142" y="23" width="179" height="20" uuid="4d4f219a-3607-4255-b549-fc5ada2ad59e"/>
+				<reportElement uuid="4d4f219a-3607-4255-b549-fc5ada2ad59e" x="142" y="23" width="179" height="20"/>
 				<textElement verticalAlignment="Bottom">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement x="462" y="23" width="96" height="20" uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93"/>
+				<reportElement uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93" x="462" y="23" width="96" height="20"/>
 				<textElement>
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement x="558" y="23" width="85" height="20" uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702"/>
+				<reportElement uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702" x="558" y="23" width="85" height="20"/>
 				<textElement>
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="23" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="e97938f6-a4ba-488b-b53c-50d9420422ac"/>
+				<reportElement uuid="e97938f6-a4ba-488b-b53c-50d9420422ac" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="23" width="142" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="44" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="37578e45-7834-459f-b021-b38fa08df7e4"/>
+				<reportElement uuid="37578e45-7834-459f-b021-b38fa08df7e4" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="44" width="142" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.estado}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="142" y="44" width="179" height="20" uuid="4ace9692-147a-46cb-9ae3-5c7224a3d4d0"/>
+				<reportElement uuid="4ace9692-147a-46cb-9ae3-5c7224a3d4d0" x="142" y="44" width="179" height="20"/>
 				<textElement verticalAlignment="Bottom">
 					<font size="14"/>
 				</textElement>
@@ -149,180 +151,208 @@
 	<columnHeader>
 		<band height="35" splitType="Stretch">
 			<line>
-				<reportElement mode="Transparent" x="0" y="33" width="857" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/>
+				<reportElement uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a" mode="Transparent" x="0" y="33" width="857" height="1"/>
 			</line>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="297" y="0" width="54" height="33" isPrintWhenDetailOverflows="true" uuid="7965e761-2e24-4f17-84eb-9431c98ce72c"/>
+				<reportElement uuid="7965e761-2e24-4f17-84eb-9431c98ce72c" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="363" y="0" width="54" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.formInicial}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="351" y="0" width="53" height="33" isPrintWhenDetailOverflows="true" uuid="bbaa5f53-76e0-491e-9145-e522122709e5"/>
+				<reportElement uuid="bbaa5f53-76e0-491e-9145-e522122709e5" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="417" y="0" width="53" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.formFinal}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="404" y="0" width="58" height="33" isPrintWhenDetailOverflows="true" uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9"/>
+				<reportElement uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="0" width="48" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.serie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="560" y="0" width="83" height="33" isPrintWhenDetailOverflows="true" uuid="e3f4df4e-24a9-45b3-8ac3-f8b66d46a15f"/>
+				<reportElement uuid="e3f4df4e-24a9-45b3-8ac3-f8b66d46a15f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="583" y="0" width="60" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valorContabil}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="0" width="79" height="33" isPrintWhenDetailOverflows="true" uuid="79775d53-3de4-4c0c-8ec7-3be13738dc14"/>
+				<reportElement uuid="79775d53-3de4-4c0c-8ec7-3be13738dc14" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="0" width="79" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valorBaseCalculo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="0" width="59" height="33" isPrintWhenDetailOverflows="true" uuid="746627ad-15b0-4435-93ce-6d370b75e594"/>
+				<reportElement uuid="746627ad-15b0-4435-93ce-6d370b75e594" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="0" width="59" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valorAliquiotaICMS}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="45" height="33" isPrintWhenDetailOverflows="true" uuid="6d6bbde3-210f-4dfb-9b84-2383480eb46f"/>
+				<reportElement uuid="6d6bbde3-210f-4dfb-9b84-2383480eb46f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="27" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.UF}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="45" y="0" width="154" height="33" isPrintWhenDetailOverflows="true" uuid="fc3e1df1-ad7b-45de-ab36-78126000b123"/>
+				<reportElement uuid="fc3e1df1-ad7b-45de-ab36-78126000b123" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="27" y="0" width="64" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="0" width="76" height="33" isPrintWhenDetailOverflows="true" uuid="dc108100-3fd4-4d37-a73b-40f8490b623a"/>
+				<reportElement uuid="dc108100-3fd4-4d37-a73b-40f8490b623a" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="0" width="76" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valorICMS}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="238" y="0" width="59" height="33" isPrintWhenDetailOverflows="true" uuid="97eb7851-4964-4114-acba-015e2bed5ed6"/>
+				<reportElement uuid="97eb7851-4964-4114-acba-015e2bed5ed6" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="304" y="0" width="59" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.especie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="199" y="0" width="39" height="33" isPrintWhenDetailOverflows="true" uuid="cbe72c43-c7dd-4074-9095-aa85726e634f"/>
+				<reportElement uuid="b18ba0f0-ebe6-44bf-9d22-692f77a65d25" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="518" y="0" width="64" height="33" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.codFiscal}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="5325ce65-863f-40fe-89c7-5d1d8bd15e1b" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="91" y="0" width="85" height="33" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="cbe72c43-c7dd-4074-9095-aa85726e634f" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="261" y="0" width="43" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="462" y="0" width="98" height="33" isPrintWhenDetailOverflows="true" uuid="b18ba0f0-ebe6-44bf-9d22-692f77a65d25"/>
+				<reportElement uuid="39babc35-ccd6-45af-8046-85df311d753e" positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="176" y="0" width="85" height="33" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.codFiscal}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="23" splitType="Stretch">
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="1" width="76" height="22" isPrintWhenDetailOverflows="true" uuid="784343f8-f7aa-4997-82e7-312878bd9a27"/>
+				<reportElement uuid="784343f8-f7aa-4997-82e7-312878bd9a27" stretchType="RelativeToTallestObject" mode="Transparent" x="781" y="1" width="76" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorICMS}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="297" y="1" width="54" height="22" isPrintWhenDetailOverflows="true" uuid="ad46494b-0240-46d1-a775-f91f0035d7f8"/>
+				<reportElement uuid="ad46494b-0240-46d1-a775-f91f0035d7f8" stretchType="RelativeToTallestObject" x="363" y="1" width="54" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{formInicial}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="560" y="1" width="83" height="22" isPrintWhenDetailOverflows="true" uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08"/>
+				<reportElement uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08" stretchType="RelativeToTallestObject" mode="Transparent" x="583" y="1" width="60" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="351" y="1" width="53" height="22" isPrintWhenDetailOverflows="true" uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74"/>
+				<reportElement uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74" stretchType="RelativeToTallestObject" x="417" y="1" width="53" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{formFinal}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="1" width="79" height="22" isPrintWhenDetailOverflows="true" uuid="92017408-1781-4e17-90b7-5ff86457cf6d"/>
+				<reportElement uuid="92017408-1781-4e17-90b7-5ff86457cf6d" stretchType="RelativeToTallestObject" mode="Transparent" x="643" y="1" width="79" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorBaseCalculo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="1" width="59" height="22" isPrintWhenDetailOverflows="true" uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6"/>
+				<reportElement uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6" stretchType="RelativeToTallestObject" mode="Transparent" x="722" y="1" width="59" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorAliquiotaICMS}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="404" y="1" width="58" height="22" isPrintWhenDetailOverflows="true" uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32"/>
+				<reportElement uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32" stretchType="RelativeToTallestObject" mode="Transparent" x="470" y="1" width="48" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="45" height="22" isPrintWhenDetailOverflows="true" uuid="16f536ed-9001-4b34-85f4-a01198390b7d"/>
+				<reportElement uuid="16f536ed-9001-4b34-85f4-a01198390b7d" stretchType="RelativeToTallestObject" x="0" y="1" width="27" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{uf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
-				<reportElement stretchType="RelativeToTallestObject" x="45" y="1" width="154" height="22" isPrintWhenDetailOverflows="true" uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7"/>
+				<reportElement uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7" stretchType="RelativeToTallestObject" x="27" y="1" width="64" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
-				<reportElement stretchType="RelativeToTallestObject" x="238" y="1" width="59" height="22" isPrintWhenDetailOverflows="true" uuid="b0c28690-12bf-478c-90ae-a36ee69948f6"/>
+				<reportElement uuid="b0c28690-12bf-478c-90ae-a36ee69948f6" stretchType="RelativeToTallestObject" x="304" y="1" width="59" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{especie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="199" y="1" width="39" height="22" isPrintWhenDetailOverflows="true" uuid="5767fd4a-2a72-45d6-9733-89a155b69895"/>
+				<reportElement uuid="5767fd4a-2a72-45d6-9733-89a155b69895" stretchType="RelativeToTallestObject" mode="Transparent" x="261" y="1" width="43" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{statusPassagem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="462" y="1" width="98" height="22" isPrintWhenDetailOverflows="true" uuid="53bdff45-7508-4ddd-96ef-2eef4cd69207"/>
+				<reportElement uuid="53bdff45-7508-4ddd-96ef-2eef4cd69207" stretchType="RelativeToTallestObject" mode="Transparent" x="518" y="1" width="64" height="22" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codFiscal}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
+				<reportElement uuid="b7f640cf-0dbd-4898-ae1c-7bc530fef102" stretchType="RelativeToTallestObject" mode="Transparent" x="91" y="1" width="85" height="22" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
+				<reportElement uuid="ea62ae06-050b-40e9-9df7-b96b461e6ada" stretchType="RelativeToTallestObject" mode="Transparent" x="176" y="1" width="85" height="22" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -337,7 +367,7 @@
 	<noData>
 		<band height="20">
 			<textField>
-				<reportElement x="0" y="0" width="857" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/>
+				<reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="857" height="20"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java
index d237f7118..7c191e83a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java
@@ -20,6 +20,10 @@ public class RelatorioBilhetesVendidosNovoLayoutBean {
 	private String bilhete;
 	private String dataVenda;
 	private String codFiscal;
+	private String codOrigem;
+	private String codDestino;
+	private String origem;
+	private String destino;
 
 	public String getCodFiscal() {
 		return codFiscal;
@@ -149,4 +153,36 @@ public class RelatorioBilhetesVendidosNovoLayoutBean {
 		this.dataVenda = dataVenda;
 	}
 
+	public String getCodOrigem() {
+		return codOrigem;
+	}
+
+	public void setCodOrigem(String codOrigem) {
+		this.codOrigem = codOrigem;
+	}
+
+	public String getCodDestino() {
+		return codDestino;
+	}
+
+	public void setCodDestino(String codDestino) {
+		this.codDestino = codDestino;
+	}
+
+	public String getOrigem() {
+		return origem;
+	}
+
+	public void setOrigem(String origem) {
+		this.origem = origem;
+	}
+
+	public String getDestino() {
+		return destino;
+	}
+
+	public void setDestino(String destino) {
+		this.destino = destino;
+	}
+
 }