From db5198a3906d058b9f1c4473cde9c4790d57385f Mon Sep 17 00:00:00 2001 From: frederico Date: Mon, 20 Feb 2017 19:49:23 +0000 Subject: [PATCH] fixed bug #8649 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@66077 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCarteirinha_es.properties | 3 +- .../RelatorioCarteirinha_pt.properties | 3 +- .../templates/RelatorioCarteirinha.jasper | Bin 32903 -> 33907 bytes .../templates/RelatorioCarteirinha.jrxml | 27 ++++++++++++++---- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_es.properties index 78df384e4..9eef777a9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_es.properties @@ -5,4 +5,5 @@ label.endereco = Endere label.escola = Escola: label.trajeto = Trajeto: label.assinatura = Assinatura -label.de = de \ No newline at end of file +label.de = de +label.validade = Validade \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_pt.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_pt.properties index 78df384e4..9eef777a9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_pt.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCarteirinha_pt.properties @@ -5,4 +5,5 @@ label.endereco = Endere label.escola = Escola: label.trajeto = Trajeto: label.assinatura = Assinatura -label.de = de \ No newline at end of file +label.de = de +label.validade = Validade \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jasper index 0a4436945f5f6b7441413728f1cf96677ded4f87..b4cef12e9f8f872a42130ad4c023a1c6ca159148 100644 GIT binary patch delta 7192 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 delta 6549 zcmc&(3wTt;6+UMY$OUc!Eb{>{m(yV zX3m{E|IBRo^h&Yja;O9qyxXE_*q%=Fk}wnhDc zymD_iRwLrU>9eP~s~oO+m!qoE<%u^k7tAfnjtBHtHT9*H6%~$BPg!L}B53p6k*u2s z=gO)77*;paT_b_da21V=H|`g2>@IbcRe79_EI_1k#uOgA; zAoJO!gVGY?4soA`w&%L#xV7#Pz^mM+0^i|22l$XX8~C_;6!0+5>Ab|=5|ki@UMDgKSw>;W$~Q*xG@p+Gs+y!>F)TD-PTHM5}p3mXsjxcV9yz4 zPLIQt$Z&tvsb*XC0QA1LTF!{{Uy1o|SC4|vHFC_6HCK&a5G65j5|*;4jZ*&!c@qk{ z{}jrKI)qFp?0CNB{gkY1HEI*lijRnxWPKnUmLDPW#rajIE{{@b)wG!o$^2_@yCg3( z&#rZF$TVszGFN<4l;l>M@7JD-pfPpMOyk>wuC9|oFV$6^f?<1>RywQ8D^zrQgi6f9 zv@Ekg>tU8Jn3U2h+-~OgA1VEghZpqiX>65&F|#H1OoV58&Vz}LJ&dYV6^-9k;s3UZ z3%_0=HAIdsKBZl3F-sbU^A^+FIKT`yrkd*;w0kdVfp#R9IY4Up%Ss%(IKrh?#QDmL6GVUw>LhUDFGq<4pf% zHu5OHH>FacPCck+FA{X7PH74i>!c|(NvB>4ovl-Eg}$d#ABE1D-29(_I^5tfdj~zLU zt}|ye7i#P1`abj{y1_J>i*s*8lx1_)=*LX9cwaSTE>HC|XW4v*OQW03Bh3SIZ)NJf zcWHDx(<$+A>`xBt@$O1zjcl;q92FdxdKas+B2S}xn7+QzYjht|M!W~?{~pIYk46ue zmj;JqKG>DY^l6@H_3p}QS1F$DAvUu;St%MlV(tqL&G;!(d~eif6Pt#6FsdFi`-TQ) zZedCs4<1K(m2;ZM;nwJJrr2&jOrs~b>*$Ri`WkKT5=p^Z zK43~6S2n&zr#$*&Z#qgJn$eciw2$cH-t-jx*}SV|;DEoN%Yb*WFOa7uOQU1vo|Z!6 zZ}gdz#NUxYyc#p5(dSq>v5|1O%8y;H(&!7kaTVijZS@De(YABXpy^|)`c`Fr3Gf|qeq&Y{L5@{w& zGgX@Nq?s_7Umo98;^Fk1}^DZS7F94#*ANr8NU=W-j2z|Gw$PJ%psf`-9y1Qbr@e6l|A$xqR3|`0R~Z`7;7#Ey_(OccVOt zvJGW7%0ZO3P(DEU4BG&9PVR#;6lF9@Axa6#Oq6OAqXDKx0+ee}ZbR9K(uuMQWiQGh zly^`*LHX)QI(k8BC;h2>1F!6c1Kscs1*Zb0NoZ`K zV&Gniwxj9dWYa8o!K9Y~FC6!BH{tch&Jh+g71+e$xrwf!TVQXcn`u23#+`H@-HXL> zA8n!su|PJ`4tTrir?iJ2!$RqxH>lIVYI%Z=py~r$I6kCjv1)eF=eV0Oy~wHb3Rcgn z*r*O*1s&up`Z-q7FL*32M}>5li|B2vrXxIs-o=XgJ0y4VP^c@xSEdt{7|0Ez8 zal-fp1;v~GTLmRzp1`UMJf85BfD)b(P{LCJN_a{@oNmOj#Jx!>C{d{tl<@w8g1$jO ziIz%02~P<~c}W2oq!h$cN$`32f;fY2!cxAO=g{5k#MiJYdX(ql8&oxI!|}X>=hJSk z#rKqY$YBw_Tr|>K?1KdSSo+K8Lk`ks9Kt2Mm6@ZsF0bT1d=Y2xr970|v65HwX#PG{ z@ER`UE4j$vYq*53m z@S9N3yHHTZcT>>G2}mA0C#Rs36OfTO%l=PCkU>g8@$-)U*GCX`W$Xa|g(Han1Oa^v z0euPq9fN@W4gnp9fKEU_U(zNaXq!l(9U_f(3w+TRIvo`0WV|8z(_6wuN5mldKn$i2 z#W4CzWYOm$n^}zFR56D8h_Rd@>^xNDaF)pD(V~FIiXtu)#atxL<`QuZPZ5)OrkKLB zMJZQ{={!%&;s#O1O`@DzL QD*hkf8~@H|PQIe}pNwcMegFUf diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml index c2b4ed586..c11430d89 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml @@ -1,8 +1,8 @@ - - - + + +