From 04a25c480f7e09413f179c9d7c1ce6da47e93924 Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 23 Jun 2016 21:01:52 +0000 Subject: [PATCH] bug #7600 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57238 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendaPacoteVoucher.java | 4 +- ...ReportePacoteTarifasVouchers_es.properties | 26 +-- ...ortePacoteTarifasVouchers_pt_BR.properties | 26 +-- .../SubReporteItemAdicionalVouchers.jasper | Bin 18752 -> 18849 bytes .../SubReporteItemAdicionalVouchers.jrxml | 14 +- .../SubReportePacoteTarifasVouchers.jasper | Bin 26210 -> 31610 bytes .../SubReportePacoteTarifasVouchers.jrxml | 177 +++++++++++++----- .../pacote/PacoteTarifaVoucher.java | 9 + .../BusquedaManutencaoPacoteController.java | 1 + 9 files changed, 177 insertions(+), 80 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java index 074385aa0..357095f10 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java @@ -256,7 +256,7 @@ public class RelatorioVendaPacoteVoucher extends Relatorio { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT B.NUMASIENTO, CONCAT(DEST.CVEPARADA,CONCAT(' - ',DEST.DESCPARADA)) AS DESTINO, CONCAT(ORI.CVEPARADA,CONCAT(' - ',ORI.DESCPARADA)) AS ORIGEM, ") .append("TVP.DESCEMAIL,TTP.DESCTIPOTARIFA,TO_CHAR(B.FECHORVIAJE,'DD/MM/YYYY HH24:MI') AS FECHORVIAJE,TVP.IDIOMA,PC.NOMCONVENIO,TVP.NOMEPASSAGEIRO, ") - .append("TVP.TIPODOC,TVP.DOCUMENTO,TVP.DESCTELEFONE,CT.DESCCATEGORIA,C.CORRIDA_ID,C.MARCA_ID ") + .append("TVP.TIPODOC,TVP.DOCUMENTO,TVP.DESCTELEFONE,CT.DESCCATEGORIA,C.CORRIDA_ID,C.MARCA_ID,R.DESCRUTA ") .append("FROM TARIFA_VENDA_PACOTE TVP ") .append("JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ") .append("JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ") @@ -266,6 +266,7 @@ public class RelatorioVendaPacoteVoucher extends Relatorio { .append("LEFT JOIN CORRIDA C ON C.CORRIDA_ID = B.CORRIDA_ID AND C.FECCORRIDA = B.FECCORRIDA ") .append("LEFT JOIN CATEGORIA CT ON CT.CATEGORIA_ID = B.CATEGORIA_ID ") .append("LEFT JOIN PACOTE_CONVENIO PC ON PC.PACOTECONVENIO_ID = TVP.PACOTECONVENIO_ID ") + .append("LEFT JOIN RUTA R ON R.RUTA_ID = B.RUTA_ID ") .append("WHERE TVP.VENDAPACOTE_ID = :vendapacoteId "); log.info(sQuery); stmt = new NamedParameterStatement(conexao, sQuery.toString()); @@ -288,6 +289,7 @@ public class RelatorioVendaPacoteVoucher extends Relatorio { pacoteTarifaVoucher.setTipoDoc(rset.getString("tipodoc")); pacoteTarifaVoucher.setNumTelefone(rset.getString("desctelefone")); pacoteTarifaVoucher.setDesccategoria(rset.getString("desccategoria")); + pacoteTarifaVoucher.setDescRuta(rset.getString("descruta")); if(rset.getInt("corrida_id") > 0) { pacoteTarifaVoucher.setCorridaId(rset.getInt("corrida_id")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_es.properties index 11941d2f1..3e1fa151d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_es.properties @@ -1,13 +1,17 @@ -label.nomPasajero = Passageiro -label.numDoc = Doc +label.nomPasajero = Passageiro: +label.numDoc = Doc: label.tipoDoc = Tipo Doc -label.corrida = Ruta -label.descEmail = E-mail -label.numTelefone = Tel -label.desctipotarifa = Categoria +label.corrida = Ruta: +label.descEmail = E-mail: +label.numTelefone = Tel: +label.desctipotarifa = Categoria: label.nomConvenio = Convênio -label.asiento = Assento -label.descOrigen = Origem -label.descDestino = Destino -label.fecHorViaje = Hora -label.desctipopassagem = Tipo Passagem \ No newline at end of file +label.asiento = Assento: +label.descOrigen = Origem: +label.descDestino = Destino: +label.fecHorViaje = Fecha: +label.desctipopassagem = Clase: +label.dadosPassageiros = Dados Passageiros +label.dadosViagem = Dados da Viagem +label.dadosAssento = Assento +label.vagao = Vagão: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_pt_BR.properties index 4cae4b9f0..035dddc7a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/SubReportePacoteTarifasVouchers_pt_BR.properties @@ -1,13 +1,17 @@ -label.nomPasajero = Passageiro -label.numDoc = Doc +label.nomPasajero = Passageiro: +label.numDoc = Doc: label.tipoDoc = Tipo Doc -label.corrida = Corrida -label.descEmail = E-mail -label.numTelefone = Tel -label.desctipotarifa = Categoria +label.corrida = Rota: +label.descEmail = E-mail: +label.numTelefone = Tel: +label.desctipotarifa = Categoria: label.nomConvenio = Convênio -label.asiento = Assento -label.descOrigen = Origem -label.descDestino = Destino -label.fecHorViaje = Hora -label.desctipopassagem = Tipo Passagem \ No newline at end of file +label.asiento = Assento: +label.descOrigen = Origem: +label.descDestino = Destino: +label.fecHorViaje = Data/Hora: +label.desctipopassagem = Classe: +label.dadosPassageiros = Dados Passageiros +label.dadosViagem = Dados da Viagem +label.dadosAssento = Assento +label.vagao = Vagão: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReporteItemAdicionalVouchers.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReporteItemAdicionalVouchers.jasper index 064b0bc0844c608c17a782865c8ab80636bffe12..e5f80870fd1537409bd57953c31a4e06ce315b9f 100644 GIT binary patch delta 470 zcmX>wiE-g%#tpkzg;N-i0J8)G15?W8v#fF)j8>c9@Uk;XEn%J$V3QWaAK#g}Q~Z}} z3?yMlt^A_lF=6IC@foAS@+5Lo(bdF(8S14kzsC_eUQaQQTOfxN`#KjKr^1!g=w zjJOdkI5wa(=E}QC4z(UU6woNq$jkv0hnfUP)q7eoksh zez9J0YEfBca;jcYYC(QcNvd8}VsSxgkzQGTX>vwtQ9)vIK2UJ7zN)-r0njmp40Q}v z9n70|{ptUbz1k=A@gsBJrp@zpFENY$1G$%hfsp~IhLNS907S7*ZZix};wxcb32=0G z1!>+4F$1o+4y25E@()8-pkg~CKPi4}sz8dQCNDFx1uA-C2ps+qDlE@_GzM7#WN}J`s*LG%+(XH#9aeFfg&Oh&MDfwb-0!HbqDrn@kB% WlcT9BuUBGOVzP67Zb4>FY7qcp@0#}j delta 407 zcmZ2Dneo6R#tpkzg|!)w0J9PU1C#dVv#fF)jM|&u@Uk;XZ8ElPa#{Z5v7>?7d7D`t ziVO_p?+OZvix{*fPgK>|Y|1~MLtsYW_MDa3-~Au$)_wElf|uUp1@aP`|A%I{+atPl6~bPpN!HX2F=O; zoC6jyE(hHa9UeGBY$aHZ+Mhu{1X|G-hXDWMt5p{LxZ*^INlQAxTlJs!AA) NCL6NLOz!p+0|1{^e7gVu diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReporteItemAdicionalVouchers.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReporteItemAdicionalVouchers.jrxml index bdb2f930f..78e017a75 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReporteItemAdicionalVouchers.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReporteItemAdicionalVouchers.jrxml @@ -1,5 +1,5 @@ - + @@ -13,19 +13,21 @@ - + - - + + + - - + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReportePacoteTarifasVouchers.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReportePacoteTarifasVouchers.jasper index 2fb2498c0a59addd771602b0274bd5f1de52201b..6c2df5ad5b2d4c24f183b2702f3990e3d857a19f 100644 GIT binary patch literal 31610 zcmeHQXJA~#wLWuYOKWK*%d&9A^kNHJa=|8Gid9y&#HwT^nb^jN_3BDmyxJAJD_b_E zCX`S@0wMI!;sAk!=0G5r0C@>9fsg`^k`PEjNM1rsPblwwXJ&5GUawa9@qR_HbLY;P z`pr3K&di+|-~BdC&ZKF6(#+Oo`fE>%W`@ml+8j=$vzb~mIS@~pwXHHRA_GbO9sZI* zMPVw7rG|#%39~7hjb>>^__XMjXk9#2*JY;T(L{WEbW_4y8K!AET6=WJ>>BCskB?@l zN<~gYlLK{K*>pTPfQaQfV!AOA&16oev&a}t)1rKJ+Z4^9f{_M1##XSVg=Tklg?gGg zdb>iAmiln-+EApcrK7#Kr=_Wdf}2v=Y-*@2nnojAxGjm1p=4ufB$;jDn($lKa5RRh z+0>Kbec8eFR2d&grqX6-6e*+Gcq+M`rpGhQiBvS(DAP5kQdu+25i?yQLqpN@wsvzX zqMPgK06XZUcy^G()|k;gGhLtTvr<*WGu`oQ!qjP6s5D{rXH`WTs4SI^n@IqUazPrF zIm8DBQR^xEBJ0=y0zl1nq>(kMpXLZwQ>SE8!&Yt;TL;Z#dy0Fod)u%XrqWH(*ye#W zVCc)zAz@%&m+7zb@I{^Ci#moq*@u3cs?chRr_C5wD@)7rCd{Iwy2wbw zcmi_7^$xI*jG$+wK!m9R!jWah@!(W86pbf!W3x0~wH#C?B_WkM=i;Pf1l`n17o)9> zCPskS(!8ye-P+-Br|wnBqMo{Hre(I*WleRsRTs5n{GvK-4wofupyCX7Ex6*a@wme3 z+>(qEPg#u(G$m^e4JV>m&ZBO;Je0oa)+x|Yld~+fx<%8yf~8xveEe3OscOF})3KK(8qMYD+9AyDZ@6sR^?hE-Oq)l2d#&Ei3mHOYE{j_Mjt#IyB@L~5(q z7pCd52f6a0(c!e2$w)m=lefLC5hpJ2D<4j$F#2TUW~MDVoTWwMB<^%aNBSult`V!T zELFP3mxgUw9)>DxvhIwJCCnjc>D5rA=sf;obPY&zY%rea zOM_7rbfwGE!n`#Ee6H9lM~Bht(|HW8TXx?#Qq-6sAdc4&oH4W&w-E`HFBE4&CNxwmEJl zTw<_KelaNDluB*Ju)aBLZZQ)LRAFv`f|NsYcYMffps9nvDV>NXH+RFnFtZI*?u3A} zp7wzNWz%LhHpq5B#}+f)4@nABbu<|pOr_aYa)g7MTZM7fDMm8Z_=A{?2Hv0Uq~r<~ zu8l&ThDj;FfCUE9BCcyT+iqRGtbR__XW9{Xq+9 zr$SrzweyOY{U#(WHnzMl&9UQjr&5V*e0WTa!sJxgtJAEmh-VtW<(s9p9!Vs!G~KOn zkf|9>qB5lp4{%CW05Sv>*Y736(JY#q)UVU@>zE2bw3beQowZ_6BEy>JuzU;+BWF{J zEk&+FHSBuz23r=>0833pw`S{P2wJ6W=LUD8Y092fVKO4;b_CSAB6LRk`d~|Yfoe%+ z%>grwECc>Q^}etnucnC7>AHpGx#`2@6oSc%}sf$7A}vJf7+7>kkcWGW+^WE7DXc@bS%N z_aFv^fk7QN$ic8$`dAC;u(EijCyDL=r^x1`2ss7t;60Tm1-WRKaj?dkvjcP`oKHgv zv##;X!mx@6Jj*zZp8jw);EGCDkjAe7dyuo#`B>Po;v5;~TpITO;tmV8UHIS#FV(jasv8>MoLloVLnCXDhv*^S zl;l}(jP)OPHI!Jjd-4dwb4wiZnWg-oV)p5pa$2dttwFb$$0f`{k(eKv?jnmeo7*%i zPZ~<~NlgGToWg$Hr$>z6r)`L>nXL@61+^&E4QE^urdh5aR=)O#sSBRw22B@Qz}&vm z1+^~RZ+^gqz^vKFo;pZ#rEw6}qbcpV!^TbuIK_0B3woxo%^4*NF&FfN!IcVqQR!j? z-NFLYnzr4TdvpUQjf{YYtkF^$^*vZq}ZYX`GdsvXlBpA6?jLgD)EmbIbY?vCE>`fxbZ)!p0C z&>Cv&hNZ2nemU#lHa~i8(ciBbI=>DRo>mIN63S$|;sXuwY^IgUhEn$1=EXY^(*s5MflDqRkSXiRG6gR&u=9 zl^X3d*`|Z_Gup_e28x0X7;ln>bareWsr&|L9y9TIdT{4Pf4qNwmnzOyznjw`CDHW7xzBa>1N|7TK}2o?yP`%vRgZ zO75_{O2IV<1MaZmB?odE<-A%f(XumMt!B=?gu-VVC^4cLu%IFfpOz!%ZppZXU@I9`mjlAYA&0&CU+hN!~$s%%ud zqsLoCZH?Hqv(vEJkoKsj8o`Vzuf8AiNA6Zswp@obm~2kyz+g7IsS8TLW>rKC=rB3X z&V*XfjJHzy+>UGQk>mnVUhN^rliXDU1+-_3Dr)aIX#%Y64E0W@O==+{-iL+X*x*QV zGfaTR}k$QU4vS#c=mwwIWOGsuXhX*>uItCV04%l1(l*WG{=tl0V?tVHzmi8 zVa7X-Q?h53aLm3ZhiU3t5;eIiKDsxWaK7Ql-f*{qgn8afwSFyubcuR_mQW!5t6WgmXEIRd zDJxGKYuhxhWG?66{kSHD8=LwwpsbW!;1?Tc@+Qn(p^6S2PZi0Jr=!ErB`RtjT_U4i z_3Bw~UHbI-%N+&6HFg%hXUm1}*?VE2M^MS*@vD>VtmLGhQGl>_tgPNM+;RPiqkn(k zvrkptx$EWT@`*CgMVzU0F7RO>MfG7IH^IX|Zi0t_G=aN~i?kW&0@XH`>ylOUHb-`3 zwQMW{6=kWS&&=R!_AnM~(((SNl@lk-C#V+AlMBN6+_&#O?9eObKN>5)Xu)qAnrmG+ zgAJ!TDq5~{zVh~-TYrA+dv8HOH(LriO_ffp_7SW(rZ2ers(EE!eEky1DD?-hYO??K zD)QHG!=!ViPmd|8Pmj3?o*r`(JUylfsFAnFuC(iDdGhsG(5J`BlBpq#bGV! z<8{}G(5vr4ET$LKU00?*^ViDr0_RPe^VPQ5o7dp`ng4W^OZC&MJDDJz+k8M)R3DJt z1P{n=f(K+x00>@?Z?kZ*pZP#8_W^lIER{~j`=TvU2soSZAhsmpz=9zD%5{t13GMks z^o}2pat#=;Q`tn3U{tj11I=g*9R#YF5 z-2@NFZh{A7O#qx;kav3k=9hdRPxS#A8+kIZ7*>@B@PTK-+PyG!@r}DT&aG}Le)5iQ z{O;_{D?4tUD9q0=%+h(<2WCa}f!R&)!0aY?VAg~jn4g{y%#}Vcm+}aTVW}w2{{_`ob;0F5pZW0zv%cRNnjqAI0JU`J<6NjUH5Y0R z!40*C;D*{FJ|I`?WuAX)u5O`S*g$yxZHu4%=%t(X+|Y3RU9a!cF)~rK4`;NcbEps6it2;5 zo8Up)P4J+t2{~vVYJqG&^PxS{2W`E6`ESfm80rrS)*fHq@$%x2XMZoc^N+>9-1g%uh1WAkshdg(1!J-PPeTUUJhwzjJ$3UfQdES<0q%!=v*vzy?7 z*-h}ktO+?Vhi!N*Pd=FE_`s|+NM3`w@Usj2trkiJf4tM9DBqrd2Aa}moln9?KijXr z{^#Gw#h=*fxG?XDC2U?;Uf>tJ)x4!K9?RJzH#uLO@l~%so=BkAdH>}U_Ur2A->@R9 z+l<(HpMu-~ip>UDIymo!F?@QK8(gd%C)J}|^pU!cg|&alI7VSkMFp+sop;2pi5(`rcoGxjNJ4F_if^6qq&ADDCcLf1&1Lf}ec4^*JLqqDcE zj5sri2Fp0-k}=9VDnr!327=~wh~6Q$GV zBfE;~BfD;bM|Rx=kL+p!>Lcr7eGw7%daYe!jR-@RGeeu}BfDBf>IGmc8wNMu2N7#! zvM`t*cy;|>-g>F~XZQT3{zpBh)jv8>n7PgJd#gCz2WCa}f!R&)!0aY?VAg~jm`}HG zv7h;1-ghj_`0y0qmC49Rw%|ocW@O$@cw9l^xHI|7yW$s5*?8gmw|@D7zjvHGQH0N7 zgr#$q55kJ-gRq<6LD)_3Agl>F2%lvmYkBe^JZ~(*SZbK+Od3KsHkq*U8IP5%FByda z{khircfWY%r*HYmy*rOhTpGS*qCj89KuhNmAD|W02WU6J1GJmq0a_DsfWE}S#eU`k zdcUzigO#T+D^CbwOIs8+0sdCet-n3^XU5%2ez5DJSF6|5O%&qm7-H#M;{&mx`atX^ zcp!EYJP>O_4#d~k&|02+5by5;aVbNLL$?EF(#m2yHns-7!Z5x){ORky{mj*Sp4~Y6 z@S-2JJvUK|Z)c39v(pD-MfJhhP4HmsCU`K`gdB`_TDaKHd>9`v7Gvm(N=IM(dq@|i zFfOdze)jo4y7PrA&IvsfD{6miqDb#zq@{De57LV2gS4CALE265Agu{GNZ)TGY?%gSOUr^E?RiDN-2t;ndKJPyNcI|kP(Y{3>Pz6=JLEEo@|wK^{H*mo~XpeMn{ z=bg;TNid)P^5G&mFIGG*2pjMeE9KdMr&!52_O++lYyLEB?ZB(R9<7B1E&#|J966Yb z9o;N|+*>%4#z3L_9RAu1mrQiCGGx}hD+=|^do2VO0Ni&fIMu~vKa+U>yk^!4ef|nJ zHSh%k96EDsjlEZy;6ewSaKIl%Q)j;#&K*InrJ@usgXG#RAm>-V7%zc$7e`@foE=QA z_^#d1`b@G@EBAgJSCTyK7_)bCHSk!cp-DQSh>w@1A;~r6;N(cN009A_odb_@>C~R+>|32~#04xf^a)j|9LJ1x<0_kqBy=;*pksu!k2;JMXiN6DOzgabfCYiww2@F}N2I&A zv7@~^^r>zoTuQtbQs_(Av?ds@>G=|(|=Wma^f2&Ix zD!vu!YK*jWc85cr3f1M~h}KB`CLGztHCncz;>o#OS2x_zSReM(R4Hu958)J!&YPZe zGjzI0NVT!Ip{Kpco53uHp)8|9Szn%vEUdd*+CshSJK8;UsB*I4i&)n47Ejhr7T6Y7 zH+MwZ>brZJ>l?c}BI{%np~NNcL0H*1XbR_|F;DK(bsHPQ^<7=PI3nB>QupWRy!Ua2 zW@$f$Q+!94Ckq?|mV(?93HPq4XM`etwLC!P#Qlhfe7rb1v zHMfMqO`eplBhPFCd5SDXJD`x<1?5$8dX|JQHkhV(alN3H*#2#!7y(tLva{AiGlNjclS^KC;=40W{YeoS%{XQWW>d_8n+&sq znBU+gh`!O`6IRKguxM)lPrkCMh~))0?uf%^Wt0(I$qABx}>B!J5k8 z!ap2@%+$iH!ih&*Es;%SYBOefOFU-Qs+ybn+RNH4YP83xN>~83tzN_)wE&D)42TdDWlm6swhqghze> z%{#lsoflAgu@T&FhZzTMq>3kFX?aT-5Bs?$1-_U9I8$DzhDo$5t)71sa7{v^Q=tA9 znR|Csg7I&j`nRD&DZ1pqtyyyOViQ+l@2_q|>#2q40 z^%*wD$Z}8LN+ovg7V(T-p{ZL_z=`vSl|;8>qVqrg){3utgpaCu?HQgd*N*8d#a5mp zyTx7Wy1GMc@)Yp+A8B*C!Y9W`?L0s#N!q~lu`5*~OS6*ZRyCf;d*$@}Z2po3Y*>~- zgN1tAd)gYH8VkC;&V#8>m5SA1#JZ(UDdQ~`j2yN@u7??CyDBXvTIuq}j&M&~yIpP0 z_W~@haa;V#J&Oa+z_lLIc9Uv{!7?URF0bQx>RnWL`o$9Lpk+Tu6OyyL(6722c7?HjID z>*Yox+&34)Y5EK-ibm%OYyc}>#mLpCt{l##%y8Y&>!sr2DWz(Lw6znI)=njtIm(h` z_z_@f7#kYy{`1U#6bHIr*CxdN>z@Aj5qvwMT5+JDBge5~dY2rzV#QHQmMuH_sAWel z?mcqFvgON`myi&0VRNsSukltST#2Lac}S&8s7TOEdqrH&t1-jiIhYvd-e8>>%-@8w zhT_T2Gnp2&Z%#oj`&iJN9I`zX6S!>3T8YP8*0$^gPJY|rev=WuTj$g7M&U<<^`T~Qp5k?njhVWm(*69csFxSo)rVU_wRt}pxL8pw z`3st+@^I~Ww!=8zCiR(8P_~Lo&cgJ=Qo`Q;xWvl#nK}GWytQ9n=5m(*?sg4$xV!F6ANRz2} z3K?`{kV=$qMUVo@_lY1)QNCk>RH}T(2B}Q>jt^2$`Bnv~T=^P;RH1xLL7J+3%|WVE zzBNIbrhKhI>_wF2hJ!R+`Pze2t$dw9+DG{!L7Jg_-9ehEd~1U=OZh$(q}j^1K8R`e zTyDq7LE2aOP6^UHNgS1fjb_8jW@|_i=TID+jT*rGh z+vNoX-TW;O3>_QE;9p?C@(e-L5?&-su3(emm`SRit2d%q7HQ{p)Y{p zaJ93b!*sDcJE`l~bQ)HXRxWVeQLBT3bR~VUjIN-o&{7z7;|;E!@vwxhMh!e_HbB>+ z$-17d0Wd(J1?Vp5drj~e!2~SeT4?CgufE1u_qX^xAF(Xlcc7y$#VJJY~Da^oP z9*`VcLQkOkT!T=6zKa0Y2o#|20c{R&hMxdE1qjsG6QDh)gER01=!f7aj&F}T0eV)r z_Ur}dIY9Kuktw zt18IzkO5JG0(G6dEGwosc{=xC1Votwm`-4wi3*5vFoDWU8$JOs)y~DuvSOMYQ?q73 zOvl*d)I=Iv0kIF7>jWy}F(78znYsl}%tqrZ=IKcE;SH$5BY_QyeI87~L$s_$e3O>5a}+yAv$K+&bR{_8@GxAy{o#%b~5naR*YL zOH1hjT1J=PDA4C=IbDU^uA`&qCi(<@g^s2>=@|M3a({r1rEk%3v>O+VJxM3fQ>dSy zPt#{qZy>ee?#h}Y9-@nC7CuCm)GT_4KIgQG+e36BcpukpQXA~+cBFv?r*aTK!8r#k zbBK7&5mldmn7(At<8%%F=Z-z1>N-!zQ3$!g6LK^{zU&EEiIAH;A;%%)R!_(Y2>FU9 zq#hw(^@KDc`2SRpvLOzL*2R$KO z2>F&Lqz567ctTD>$fKT+bqIOP6SBeSnzfj)5UoX*o&+}f6j)##t)cb!Zv!RhWPG&Q z2O<-i6=aG7s9!9l0ntQ*VlBnRAf1Npge9)Kw@q~~ zeT0fUt}F87FF4WUB-D@!)@gBvw%dkY@q;2q51A z$hQLWQ9!;8kZ%X%X8`gYfc#8Aeik4<8<4Z^!+b`|-h~?44Jh!Jy1>^Tr`K8098vXa zPskYvdBYQOCPLoygq)3#-+Mw_%4v=qA}&J3KZ}ZAjEY}^ieHL~Uxw=Z4=QL7ZiIla z3woOsb!_?oQ3y-DdZ?A4g%W| z#w&xarW@#bu+a^42i*)-x&;!m6YTU=fc7=8)Lrxp-2=9|7ZS7!to2QLgB}KZJwor% zV_>oGK%%}2Hv2D8Og{jt?GcrjEX|}Ji8=IBu-wnYd`x(j(M!06?H6FZSE1y71@`;3 zh|rs0!QY8f>5pK;w?vZO11r8ScF0Ni3h@}s*(YGA?h)1E88J&d50mpn7?iJx{lu@uLE;bMVDYv%T>L}K7axd)Mv+)# z6pJOsG_lmE7AuVX#ZksVVx>_djx`pERmO5rZ+t?8j7HIhrT)495lCCGCoGWrc?43w zX@T6&Ban(_38a400;%7$KjaVkG6)PZC_2SE-N!%(r#BCxXZWkLN zVyB9`#b)t!kreldZQ_2h1EO}JcnCRtTU;R?6<3MJk@5)$V8$d}=J1p@g?2;^%J$lpL9-+(~=9s>D45XiS7kncbs{{(^jGX(PQ5XgT( zAU}jaeq<~%gt6Q(j87QFMx%lA>0c-RRg@biib|tH%rrX19HUztYV?Tt#yYXgSda1O6pTN;qREJf4x>**j6t!{h>KH= zA+gy=ilmVi+l-9ZVQdu_8l&Q3V~4oHI8$6@oGWfL&J#Bq7l=EI3&mZ=CE@|&Qt_bi zdGVO>1@VM&mDpo^Njzg*C!RO17cUw&iPwyq#jlO8h(8!RA%=HC?7k*GFuq|F8TUZk z9x$dEyNqh%TgLvz!^T0zZllI{3jj`@J0hq(i=q T8dxh*TMAn70U@S8{HOm9&(p~Z delta 7989 zcmc&(d3;nwwm#Jf>6_#dlkS8-7D(9XgzSXHfQ0O!mynG>fTl@0Nkd3N(g9J177#@q zh*%5?>O&N9SVVYXRTJ4peHs*aGvEjcjOYkBEQ2`0D9ov<+ui9T^X8xT^9AelIbWTs z``xPVp1R%M`;q*)o$P+6hc*T}{CV{UP{p*I=+VPV?YqDmd;Dla@0b>E-+6w%c^DFG zs+PrCLIPht{lj@jz;6HP7pLj`+w`O9=7GIi-V9Du(+M>i`f{v9{~n&r2j#OtbWh}< zz}AwIAy+2*oIQ7~V1cnQV+f8(pgSUt(L2LO@KowbU9XuqZdlTmv03l0$}p>pH+X8V zzQ<_nm{i~Cn0DTk`o^us_Y)51{^iKlD-&;D$@_$*`Y)LWi-8*ljqa=U5ivb7MB7ie z4NWX#62R}X8}QGSzJ!uUZ675EJ9t`&GsQt~4v2U@CW!h(2hsJ(6MP@WMH%g)vSZ8G z)|n@#6mKY7el#c{a|x&NESsB~Rh){5IThh{Lq*A9RFs@9R8~2u9PA%N=cfA65lP8x z5sBSJr)^rlW%09LTeEK7oVk-@GYy>1ONryupU#Gl+*!~Y&b*lH4cdmYSd)xsS`^uH9%>WCoD=Um5ac{&9x@uItZxY^1 ztLt926!mS3T4GKfHS2iTw6fd}_`S5Sd*NmezZVhndl7Co_oC#mdr@+_+{+&4y*x1p zcY4HV-!!Ch!$oEN;}NkjS86VfZ`ju(@yqO7PUSG8!c7~eB4SQOxZO}uau^jQrwf%f zCzWpovt1rcf9dN>f~mUSakZp8p=%>UgI)X1g&fGZoTQT?!UA7j*XP!Oz6+Y~^iVJV zswU5ibNvJB=jJr$Dq_x6xZQA7au`=7rwiB9$aOf?4-KYa(IXipQ7<}EdOGp)TZi&| z{`N!@y&bbFe=MhTiBaO_0;eQmPD!}kP*QRjB_*c|r3;+W?qR{Sy?+X)#7j(PO1r%8 zZ(7~dYh3S;@a>lzUP!g%qa=C8%jzJqom|?q4Yhc6ciIo69*;*yXr@0 zN_6tU)?@9>k6c+5u{kj}`#z`i4@QZbyPT4UIVItCLrKYDl$4wg-u>7cw_*2di!77BY;zr9^iI}qz zZa1uy9L7q?>B36OS1Knyh)y4x8tkf2oj66W$hoz3;nw!W`K|FjQJt}h$fFTAIZ6YH78IB}D}If6YzlS(yQR@q z)nSfatk=J;er`p5-F$1Et=>JohIOeeO*U(ty#p-BviVGnwrXpgdw`gW^<-L`?6$fN zgG5)AwIa8^vD9XnZFP+bZSk7;7(uFw^(ktyh>(T`JB_Ohr6=`1;Rakuy#Lvj`Ifk5 zyRA0PU=ar?SwwH?2dG7V0+-nugRE=HsIRkIAGPycQYM3*`RPRkS%v1ptO8SEvFI|; zxrXFuXGW0dGG~~K#;lCuJd@Fxb;QtDh1a@dh(v~bWf##%V?PYW8k3`(;{%oPMHz*8 z1;zR-*F~N)j$y;wjbQ@>)j;>H=<6#iwbqVIsnOb7?Y#0((*QQqU}9IEV~S+KN>hIf z-ZG75!FQ%8415csSP)Y%1cRc27#2KH5Us4taK191nSAKS1%a&Vd;y#8UO~TnCwKoM zToiM5UY0(yNVzs&^neabZB3pl>XV(P$EVmyb+NubT|P;}=HD=htqlXt3E;-0Xas@^ z*=6GkpGhO9>_8HjzCW{rS7ID@PcrOLysYw;G-2D;wJo1MJY_`7l9c|HQ;iFn8(~&?JwA?6+3^~gcteiE%};`nQR(BuG+!7AU!9G^>of&%)kqD=j6-) z^0ji!ay-Yq=-N^p{j|)7#+3zylWX0LW!R5&YFU~Juk>Qs#Bg%^U#Hy{X=zi8A&ihu zhDl#yFp7Mvk7=&@cz8;xiY%lTwS!ywPE8`jNGFx|K|7~>po*NPYs*8$hnBXMhsa^C ze|-O)HY6NJyy;ivgL)^AOi4^iO-vY_ILe%uoRlykr?9;f;{N zS9l|3@Dtu>8T^I!une;B#>&uBc#p^sAiQ)L9ui)L41vPSk|9WVjvN^@!p)OGE4+y^ z1Pjj~Lx}K9GV~JOBpE`5S0qDk;g!hHM|hKE2!n8TBU5CE5MH?qk;0oULto*UW$1^V z0~0MWLa5)`5M(@hor!O!9V zkD4jLbF{4@bm;R0oTaWf&yZ!FYBJ*d>j-o#A`+~pzf|-IebJrls*4hAq{A!2vR@|9 zwdP9jp9BKjrMNh&tXP6q322>|KE0^OtT&}+W)({C8ledV5$O_aA)rw*GSiFG%|)h? z!VKiKl|XP_kvT8NXe!JyV=c%trnA~E!S4ttB}{_t^lD|eYA2yL;C}KD zcn^UNhol5;c-stcpU)B;Ca$Abf}?Cs_Yp0@anj-3m*4~3Fg8KOc;`!k1Ro(y_aiOA z$6}5GOB0^Hjr9_=Bftuz*;rzjz!vmV0`Xi2rkUD&HJrprMZI!moF*VU_rg?S#NGJ= zUWHGRA>uQbp$t-x9?yxU$!?^})Ep^rLd3Z=yTN~AIfq?hWykVs>#KI*%xCnoy z<7+}xaG9>JP8|L%{DsN?JDjuDGRs;UhwF-OM-p5`Y64MSekAyw?x+b1gX?%5SFU>x zZW8)_La*Tx{LM8|d9RV+2iFjfUHXyUuO68B6WsNKLvRoE;HF<>Z?x4_tKnx{LF;@= zZ8NUAskRcMYO5WcQiQNhJm6yq&{~_045TmEesK(8U#?j>;Gb9w_$QVE{)vSEKP5cQ zu=t{l!;{U5`RwPYL%IWypdI{+cxEOrlgUgrGr7z-@|o2$ zV`Qd)nL=iYnJHzajG3v-Ok-vSGc%c)#Y`nLRm{{dGn<)OX6l$}V5X57J2Uf{d2|o5 zC$JFhMimUE@6LI_p+Vp=cwF2fq~I;GAK?OZF$ch*i#-5Kb;A$9a`!+D@6W}PC=XAW zd^|TM;ux%sVg_;wyf6l0)5U0>J_M^(a2VF$e{8j4G;2MO6kUu%Lp`8WO!}<{G76Cw zJdiPnZ16zR5P8W18HdO#9>{n^HhCZu5OHkwfHDz!-2=%+Dm(|}@ES~my)Yd4AptOpL_q~ff=ZGJR#FO8qz0;S zOYx*rw%A{6F?@(j4k%0x9fm_pt1+5)J&7hDRfv4(fz%-K-yXEZ;ZZTB}_F3 z`FY{fxrP|Rx8vtZ2X?c+P;7ItvD&a4+gfa|VB3amAGRadPGCEW?Gm(Gw-cLE$g!71Ft(?kVla3jwW z8P4Hmo+rKFB5vp<5(VGjrhZG}@T4CN*GL-Nz|Fl$^6{`PfjguO?&2ojBUNx8H~Imw z6EET*-ef6}$Z8UZw{-u1)1kvDM7(46_iO9W;S}ZnlMWrIA1=gyqeDVE>d+Yp9kR%+ zLua4Rp)(RXbVfplEOIb$Ga=5{FFHHxkn{l+35N#K4;GRrSVRWGaxw^3kYTWv=ODsetR-z?Uq!*b@BFP*QMe0cmX&`Z^u+gNMq>+Urhdf5| z$zoE1iYp__NCkNkN30<8$TOI=8qsG_htH$85x;_~y3?Vfb3x=P{PlF`=v)wgWgR-8 zQ$hSUI{d$`hmOt#@n6+L@;d794baY!U zcocPb40ZS+>hL4fVLR&Z1nTe<>hLt`@C@qkEI2Ncb11~~_-*AP>hKck@Eg?Ox2VIb zsKaZh!yBl>o2bJdP=|L=hj&qj_fUuTQHKvmn#zmhsJuzON+KmHUs9&(Nh(wUq)MeB w^Hf@5SA`OXsyA7xiXf|115t-~{$gpz|7RLvPD}~u`g4&TlK5{?m5=xOClz-IR{#J2 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReportePacoteTarifasVouchers.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReportePacoteTarifasVouchers.jrxml index ad813c223..bf7239d0b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReportePacoteTarifasVouchers.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/SubReportePacoteTarifasVouchers.jrxml @@ -1,5 +1,5 @@ - + @@ -11,85 +11,160 @@ - - + + + + + - + - - + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + + - - + + + + + - - + + + - - + + + - - + + + - - + + + - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/pacote/PacoteTarifaVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/pacote/PacoteTarifaVoucher.java index 6f3e8f899..c4235633c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/pacote/PacoteTarifaVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/pacote/PacoteTarifaVoucher.java @@ -18,6 +18,7 @@ public class PacoteTarifaVoucher { private String fecHorViaje; private String desccategoria; private Integer corridaId; + private String descRuta; public String getNomPasajero() { return nomPasajero; @@ -146,4 +147,12 @@ public class PacoteTarifaVoucher { this.corridaId = corridaId; } + public String getDescRuta() { + return descRuta; + } + + public void setDescRuta(String descRuta) { + this.descRuta = descRuta; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java index e0c2500dd..d67662a9e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java @@ -80,6 +80,7 @@ public class BusquedaManutencaoPacoteController extends MyGenericForwardComposer } enderecoApanheBusqueda.addFilterEqual("activo", Boolean.TRUE); + enderecoApanheBusqueda.addFilterNull("vendaPacote.motivoCancelVendaPacoteId"); plwEnderecoApanhe.init(enderecoApanheBusqueda, enderecoApanheList, pagingEnderecoApanhe); if (enderecoApanheList.getData().length == 0) {