From b0b46f06077a81f9fbba0a6571ce337e0d76a808 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 8 Jun 2017 18:49:28 +0000 Subject: [PATCH] fixes bug #8977 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69782 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioImpressaoRmd.jasper | Bin 32350 -> 32257 bytes .../templates/RelatorioImpressaoRmd.jrxml | 22 ++++++++-------- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 33090 -> 32997 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 24 +++++++++--------- .../BusquedaImpressaoRMDController.java | 3 ++- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 4d446e1056277e7d2aa466bc537953bb5bd4c98a..45f9d0dd6088a8b007bd8611b50b19b7e7c20d51 100644 GIT binary patch delta 3750 zcmZ{nZA?>F7{~8LDM%ewx*=8+D@8y70fiNnfkNM~K%qtOgl4qBO=lWXXa^c~Vaj8LNnG0;Gxti5msxshjSdx~{fPu|5 z4LGR?r&0qhJOCFS75o~)KPjuofDiN+u$Rk=nPsiRavefoGpP}RR186-MhM}75W=Gh zF^M5e#hLw3-GQzxEe>gOnj3$(Q@^Ok2 z3Pj@RWeUKX6N(2%648ud3KUHyc%HPGHXYrs4Dqw0?K~e1hm-((kU$6g3Ow~y-DI|G zV}{(a)VXI1WcdYlZ>xz-S)I)heox5Q46E-65+WpcGQRdgU_DJn9j(Cpt;Xe4@>_yt zC{F-+81IQ2Ow;g2BxovnR{w~C#g1T;1$G|;4Kph-ZqC;=_(D)b3N-*4_0 zJ0E&Z+4;wS$L5>{o>UDy35XXZ;Dud|P@Q377r zRrpJ(cUx`B&3=EI!u}rE*xb}$ld8cc0okGiwy>+%H(~3kJKHB@d4`>BZ_rK4ax9i$ z-vpMi2kp8QGkgYrxD5Lb`fHMjP`IYkPv07Oni*`RIi%OJx}0Km*|vB|9G*bI@dO6r zo>7~LFWhM_WmjxVdH=d?74P4*mB`a4>?;j09kw~B_^a(D=-*UAK_o-3&C}iM8}hdG zx;#F&%|~0FVISGI@b!MNo60DIA)V134fw-Bu_W$CDrBvLg*nPxtHZ+Q4mwtH)=Q36 zy#CO!hSw90&Ags*tmgG{rz z0A@?aQAqDmg1VZz+RV=;D=5|Men+6hE=h;}k|bF=3}?QBze>Ejygpke zT>~$R?&w;#n~&0wXIz)riLjPcvH!lqW9IgSo^1}>JZ9O=2HefEmz{QZnOf#I{ez~h zooUc_Ga?3I6FcRa`ClWerduRjB1Y)-R#KBJEM>|wugAC+_;W&Q{z z`xz4UWV|L7f$t3uS$QF5o#rERK5(dCupgU?*^%A`@hh>lzlh!KHS%2Wvd;H9^cNr- zHs>)L^)VZj8rd?1IoX83W6aHVeoipnNoULTZOrC9{s#iGy%|3qv)`egf?U|#!d%qHTvTf0$`t105`rq%t@(4kI#5FwH1+jB zk-XxuTPna`jlo1)G!hGigYEn`BwX>w?7^-w(}tE-{+N)Y#fNfvYk+bbZl0_StY&wQ m!P?l^P+woy)G*YzvCi7qlsdNiXsPl4qY0@VpYqPbh5rE_GW}@) delta 3842 zcmZ{nUrbY19LMkNpt#im(oH)Ap_U>jVnKzXc8X9gl~QV36o-ag$~CEJxut*H_8`W` zk(te%2WOlQON`TPiGS+mmdX6Hne9n2&SY7ZF(0=j%a*+?M$FFd{LZDtd+Eb3zjMC7 zb3WhS=`H7S?1}j66YEsa()j>$y*d}?=ETX8m-hT>sC_%@QHpZS&NVZ^ip+Wa}P%)Xw~*EJb& z)w-O`opyOU;T;godbB|lT111Z%8575h$x~orYQW@zj(M9g zpVY6_Gi{`6%~8vbz-3{EadFJJJOwVM23#)axHF79(eSzD5dc`2WdIyA08ascsR4is zI>0OgJZxO|Ok=s?waKE&$H|OPri_m%DJ80U6Umg4mf1rvM{YG&EeF{W9Zw$8NiTu) zd`!^^r64?)N{r>VF+EO_TRW}h{7e}X6=h;cH9uDlbH!;T6;tw)%V5$xo=qsJf>ImI zzIa%UtEnz^JR^_B;(W;tS1p9FJz>+Bzy(Vcilr9-GLj8Ldw`k9K0wL^{7s z1=N-v*eu*NV54flMuD+;3T$4kW8a0=a~F3`i{czfbZ<7#iefUEA#!vDxzTN2 zIY(E}KQ4#l!*X*r6N@+Z%lNAiXUT8fjuO;eq@|>aOnR4=rQt7-@@9q^qcxr0O1g1% zkAocbE~DcU-c@vb$y-D78EM^9em1#5X(iLUqBVVj@Wx+)APSRk;z4?og!hFb-hTWBhRF85z}gWy ziw9ott;{cky*yg^wZ5R8mKOy(CGR4|;%?I5_lQH}pg&OAy?D`GR&bue7TK;g8Ri^$i?6Z@f7LYEql%YnT6B%;1phqD4ao|@LJ>oxgW7gxC7P{ zz6NWHX{YSu572}eISonS2TuAr`N&g621A>ld95PvhSpK5aEm_-NuE!^E(;e7?4oL5 z7X@awux5c>E>L3&?OrIf3VGh{z3@i8T^p&1Sh?l?h~)VSEVFRUz%r@^mQi4q3u_iw z=7P@hwZ$zMv diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index 0a25d92ca..67bc98e8f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -118,35 +118,35 @@ - + - + - + - + - + @@ -160,7 +160,7 @@ - + @@ -171,35 +171,35 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index b5e2fa205754c286ac0fb11846a397ae95c391ca..b84767cddd5164ac64b259984bad71b17f754671 100644 GIT binary patch delta 3886 zcmZ{nS!@$W7{_;Af&*K?#Kf4~2O%NhNCM#qAz7U9vEg+W@Cy9XJ&L z&U;jFCTQTd0Y0;;j)S+=j!8cgIFu=X)3FYm3IOLlDmW7~@F{?&>gqZ8WZi`Hn82Yt z1UMb*z^MRm-lKvuK?8pX@PAiNO3w%m%2UA6u?~(3fa5(X91}FSr+_=y&_JIxd#)ih zuc#oE5thh_eR5ikCT)YMv^*RkheIqx_nJ#AM3$n7)PP1>Mx+HXStBea!b|DFeRInc zlPOaok{LYk6WnGUeA~rL6^`cnpoT7o)AM zE@^^n0hHtDRI9n1js=E}cPrD};`Z9vph_}e#K_{FmL@)Z(87+?r!l5UEAPPsw<{iX$N}x9ow7KYJ zrckZRU4IDA(pSxG@N6Slaj#v)dchMB(Mh~YAc%>Q6noI>89kA0tOBsr7^I?1W3lbjb+$$3GQoC(_G z4{|4er$_nkWwNIM4oNXGzU~|Sm4t>etrME6I-z+%6`B`Rp_!l!J)JwW)VrR0-Ea1q z+39|-*FX9X2@YjOCpcAgg7bnZI4`JzGeH}CCU%7V=rPY}(Y))Y!7QCET*1ar2gqMnM#XHE1ZW1chZ|b|$oNrTIlqMrejx=EuDY R7IopPd_t8iVlx}vv%V~qp_#Erw5%_*I53#Gr_Mca*O+@-!v^;o#Kvh zP%fk1*19%2&J{>Iz;V~ZIsBXVTt$C&)LG=73AKmJfcY;=b1$Q>p5KHHc5T$6__AwS z_?{#{xdjw-tU*BqppbhM6iiT2+`<$QEdt{U)56b$0LncepkoaJDgc4pqaa{{ir^mX zLvY;&HN~gG93g=600`(EB9l9;lGYGu zMN(7=D~a$-K7C+enI_WGXX3?DUVJ_7%Zd4TBA#8)R}p<#F`1L~^rTl&5c5fK!MK_< zmuE_8F)y?74Jg)IkBO%&?UZx7U?^uGn2t4qsQ|%pk0O`}s^BvaoZB_df`8xT6}}+BP|iUx9cu(r z0fOZoMKBXo!RH|O*WFPT9C^_zd_#hvT!dgc)(EBo1j{{&U?!-7FG6r|Ai{#L4S0o{ zBpAvK2&Q9=U@Abc+@lC)f-3k11Ya4PV8MOXpzs3;hH@8z=~yF}3J@&!D1w=w3cg#e ze#s`?(ytDAguh5ClsQPHV~tcQK&srMNM(X5b&i~Fd2;w$9zPBOu1@5z*XndSG;Z(2 zjbrvkGWgJL#Dh!rokpFG=X3Zk{n=4#$ZreAf;PV|7zQTZfEO=v>riiHGn%#6R6-Ze zb~;+|>_d)LveY|{7CkYNb2~0ME;!mM<+C3-RugaaNDFIkhDAq58e8T8XmZT$8?w4> z3;-P;X(AIp8X>$hBgO&Au4neJ(_@Q``MlB$K(0L;KN9aQ6_cs%a5629Wiz5g*6Hl5 z05bHRxfM-18_4q0&UU=~S!a7CTOK_Yo9XG|{sX6(m>Ner82l!HpBSwlQ_#@%cA2r9V~ZHGAS=pP)%bH~UP zOXHVGXkRF7^Uy0;LXX_u4R7Es-QR_)%Fjs%tsf?6kr-<(Rw&OW#{mpz9 zt+uqRoY%2g_dbgIdzwpdrB)S6>6q-zNp5PL=A0k>>z|`@s>mGj>Rj4v4Q#~unLxdE z{`r8pfv#0e)}rs$`PCXxb#Q`ziY9{>_{;e1Xh8j;py@gxgE9km1s9cl0aM{R>fKxC zqDJZ&Q+uc&f3UF0ct5Bny(@Jy=-tQ~eipTd1Bj1R3T*UHgH0|d*qESVdnjX@*}Hl1-u=B-+PfY5f~Kd056Tk_ zKB@vAJ=EZn3kp6asQ8}9_y)$h7x9(zV}pEClbfrBuS&5vluhT7DRCHoV`5gm3Edj+ zGDHUkIr6JHT7|2g9KJ>#6}l*@nF#3n`uqF(xAyf}V*T5;Tefa1rzf_UR9$p_dfWdv Cj?^mv diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index 41e6deb5a..924bd5c0b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -121,35 +121,35 @@ - + - + - + - + - + @@ -163,7 +163,7 @@ - + @@ -173,36 +173,36 @@ - - + + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java index dbb2ae0a6..5cb37113d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.sql.DataSource; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -144,7 +145,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { } String folio = folioInicial.getValue(); - if (folio == null) { + if (StringUtils.isBlank(folio)) { Messagebox.show( Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),