From 140630097d584df71b85eddc75d28b6490326476 Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 25 Aug 2017 00:15:40 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73063 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioImpressaoRmd.jasper | Bin 32779 -> 32943 bytes .../templates/RelatorioImpressaoRmd.jrxml | 56 +++++++++--------- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 33320 -> 33502 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 36 +++++------ .../BusquedaImpressaoRMDController.java | 8 +-- web/WEB-INF/i3-label_es_MX.label | 3 +- web/WEB-INF/i3-label_pt_BR.label | 3 +- 7 files changed, 54 insertions(+), 52 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 0d89fda7593376d04f23b1a4fff150e220f61344..8d3ec0fb7c4ff0ccca2105462ac96c17f904c1b8 100644 GIT binary patch delta 4718 zcmaKwYitx%6vt<_Pbhsqpu2t07xFB-r7bPAw(EAc-FExh-9lRkb!Z1%-0m#9TM&&^ zL`5VR>ortjBqSI=m>4T7A(|i%{DQ;)KE5HK312i35cp=qd+xn6JJT7;hm(8H|J-wa z_ss3gU5>tP`tqP@ZbjkZMLr=E^@)+dE@Uh8@R{-H!pCW9?{w)|RBu^<2Fgxo-RoKp z?&YRAVy44U7>{t=Wq%m|Q-p(5@aY9qQIVfYGa$Y!znBhTF-i5joMsx;TGry~S?HJY zchm&Cm%rMIpb#;~3<#)dKtKgTz=lA;!gU146oT1`PYM$agW5f0t25|STg|iFY48wp z%7BKd1~gP4G;9boEL=x(N};K$`gkFlIM5I?XFx+$0~#s-O$r&J8DGAc=83~Ii9%ZC z>C7oKUsQjz5Y1&+M$AP68mb!5P=WM@4WTzITt{1u3Ct zgPt4aBBu&LIPa>GMK-ww0 za3|?@c1gj241k@q(1aitj~}SJkizdkIq5ZMN7IvnS&rj3bNC;5h99 zUp3cd90rA$L+D0Z{sf)tj|q)AOoi>L?}J9zVIa&uLi{1+Kp)@Ku7GB1LCq+6v!x*M zR|p;A+;~5W&|J&Pj9I`Y1`%vJH^5d48f>+o!DfOE8!6b?EnN!sy7|~|wOFzf*ns&q zA^r@8#GEF?bZ$Vb7Bs|aK|{<09r0;}_-N~M3UQg5`1jTZL)x=IOUxNUOXmi(YC%J* z7BsX>(9xbzX!*7dg| z&&!PNw;P_?EOG{Z1x8|S5JoyTU{nhlMzx?}WP*fr3mPsa=(z67y^A+@oagZ;)EX{#H*w{Wf;&5lV zX7!cMT!_8dS<2k&Nz#(8Wu>Mho`*7-Ugto+*FWazci25nk_Zixbx;WHu5|>3Xw)MK`18xM6Jm5#ETJvIXy@H)0PRnA1)ePFZW@*A*b0a8QP^V|Se2nAv|BXL=9NgFV3H-(Pjri~`=}8EpE1tg9QS7A@iPOO= z3n7;vhueDx*5L5u0eh$ODZxCsV{p6ir^$pSH?B{CxFEXU+h=~^sY}psUn>qe-sdr^ zj;IEL7ty~YXj6axDnNGhdxm=ZXiBi-QLv1gV;e?i`kQd#zxqp%%~qDBs5sPw(1ro4 zB}fiZc64fTOm(vX3X{>2&j(f&&?V`x1a3A;>@sb7;30j;L>E?(>lr=T(Ki~M$uIloY>( zW~xijL!Z3zfPaCNHKw1S1;kt<2Uqj+n5igtIKP|*(irtiP>#7Vl3&bXaIZ;M zME4KS5p&Ogj;e%?4h`s74A8L{9o@Zobe|53>^xMDEbvrcOEO_PVoXo;bWEj!`aeB1 zg8CV21oekb7PREaxHV6-=<&MILEe(*;qu7kU5q)T$#5VjcHpZ#X65tH$!#^};kI`C zLgBb2`_r+_f#FMVl1#(sw{5GMzWL$5Z@OV delta 5131 zcmaKwT})I*6vywSAm9q}?Fu5G_<<2(DM%BW zloD&mw2iGX@u4+sYOBf8w5h2d@u7*eHnzUlRI6!BYGd0pvFS_GcFxS~GQ*wSeK@&i z{%6ko&fM9#bMJ*$QYOb!E-o)L&27~}S|sfC`41pVp-Y_?9WDGTU1)x}^wYEL|O(Z-o5paK!?S)vT zQMjNs( zQhto|qap((aGgYI*>claxFqHbL8QI}krxC+UJwwOU_d-$M9fCpmYzyqqIZrUD zFTvym0h1R5OePpG&&x3HRGvzPc^NQ?xkNCjFTvym0h1R5OePpGFUc@{%im0f`3+za zbAw<~UxLXC0wymAm`pHW-k6Q~V8we24C`_Xz}`Ubu3T%n50}K;C5+UUF!F-H$O{4^ z6AX-ZXEVYM^lH^avZ;Imn8Z9LnADeG@`8ZL3j!t+44984n9;QAbE#??I=|MeW}pts zqN230u9$qG@PK_VJnWBnVVj^*0Z5qvzd^_b;hEvV12eHWWyrFS_L~oKsvZbyGkOlR zrA7S10sl;6E;P;wjSTvSxll8-W*zbdwc#c$qvndz4YvFU+`Kcs71GbPYQbPO;POzYG3$C~goQT~1{7~n|hKnJ|B z!J}7gSJKp7(eX`{YQdDEsPzi|kv%pCX7vbq*j0?at1A&6Re#snOk*Gua}-@`%-5)I zTpcuKj0*hf5Cnd8#Dv+aLp>^49q7^KhB)~A+2EbemhjIpm@mbF3!ID8%_~hOpafzj zND0)Jl)wu@3A`Ybzyw1H6S5Nex3t7dSTnnXAGeg`h?|KzO6X4mJu#;UJ@qB@ydco? zfA$3ar!N@ z>3^tCK>r!g6EjWdsV|}D1%aLy1bQYI=%;1$zclo+zi3~he5GfTwel745_27Rk5OO3 z%L@W8F9^I$Fz{aIc;z!(F4JnRxdrf z#zJrQo3r>(3$ms!LaTNxEM*Z&mb0<5-R|l0*xTKnE*6U_T9%^f9j0T{r{gNQG^Ve~ z-PUGr>TpW^Svs3Mj`l8>oy(%5@_mcZ+b!l4^(ng8QjB|k-BOYn>sf@R`ijySGMeXD z3Sm}9DGqZxO2G*^mSAVfQ3uXVM>%$WbCiQK-?;)i8=ckhoA8sr2px0INvF494Vl*u zoJA0P)d@N8JIlcN&uO;MnCzL`VItY(vH14iJqpbz225=O; zo!qU9CxYA_)*W4HZLh%LsqKwB>AbJXJS9Jj03 zn=l+5azoB(x4Q~(o7}Elt!*?K>|RKxGG>Jpk5;#DT8vA^|Ek=`$Y7svvVvur;zhSR zO0(nLpy@dJxZQ$By5C-`O6AIqszRDH1CqjND{-z99jnbW*hGTqF)VTXKONNzX#8A= zr{}YHxEXbO_NA+T!Ukv|@6dNWFR7o9!&P5rN#axZvfU|BD2|wmWML{j+-p5kslb0B z5CnchWCCj3oo}P5VZVdBpv1ljq+En1_Dz6ZQcwLBo!q?$jdW4=^+~wVbmv4qB!x+# zKkTstx!nO){9E10i@y!U6LU*aJXIyd^MX)36-ep*vA<6%00=s9{@Ko z_axj@m2mTdz)c0h&0-AP_mXihLeKU18T;j){OMo^Mb%m1;Wl^4D3&m zvPbXi?NCcHT}mE#aq;U-+F&>k^l!(nF|epIQA6*tVn=-gY>vvj!x`A-z~vFRvndXA zthZ|8=QsZS;xcZlQJYnz%Ht1ub!|AHImjzy#H)E)xA$4sTWZ(W)>>?}){WM_4OW}Y W8hy}ve5tuWCh3ZeJa66^FZv%W0)65D diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index 12f325723..be4b0f750 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -1,6 +1,6 @@ - + @@ -41,51 +41,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -100,70 +100,70 @@ - + - + - + - + - + - + - + - + - + - + @@ -174,35 +174,35 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index fc9c47fcb1ec6941dedaf8230439a0d062fc5b2a..424361c1256b4a1698f4780e59ee8000db8281c4 100644 GIT binary patch delta 4585 zcmZ{odu&rx9LMkN-i$}LvaahM9eVA@K&Ak(v3o}LRlGN)(Q+dEsS_ibIU)pDow>{%1A_pJY74-(RfpK~pu4(7pt*!} z94@NR5LJbS2$)9dkY^>M2bP^AOSCa9@Q63*g2! zT@E$k`lJuB%j#1>QUAVJ|JRiXSbuocRQtcEFbJV--AwvvXbN*XGFPdDqVBm?nCX@t%TY1nLmCiO?d`wQZu!0bU_2MM6d_G&!H96g6qXTp}6c4|47( zALAyt$h^J`>6wW@RMMtJZCP((o0^TT6k8Gn*0oFq!VuUl6JuPe$aCN;e4O+v7W;PFuZCKg<5dy?vP6d#t zDu6`5fKrbPkO~UGIT3Ju`_43gAGSZkzKsDtM}Rn7QUN5Y3Lp_MpwuG+q=EwQk_hll_He-{}>^8h~T@w=i$VCwIVZZp^ZJCbpDpu$a56>cJ6 zZmCDcO$7z_1IS&TTGZK+?w$5`HGq5N*?`+nSF6c|fFxuo0jUaXgStLqB%Wc()s1?H zAO#eJg@BqYVPaF0_RB0hI$h2x(ABNWHn1$b_ko|MigR!}C>`o95t`5JHssT0m@)y* zmQ;WryNzX}7qi4+^LgyvQLo+O_WFhX1wGBI0c`21fVub{lZ%?Q#5LM)+dkUq9&ibM zm>4bCYq-0HnhUA9%jUO@`rHHFPWycNYVf$H0G7z4Bv$n|51^yAAafL+f;3IkcYYtAx)N`V1D5c9>1@F{9NoI(4wS*=d5QT+SBweB8OhL{b&tR6#Dh+q^jv3G(pr zPCr*)IbW>`CK%R&_S_!$RkoPdSzDW%TdnIXZEcOuwxIUCAl5(8kYJeoe=_i$JBrrh z0Q~U!hJ1c|KUtq+^n39jV_`8KTG9gD3v|n*MjVIFDLA?j%Dx6Y5#z_SQ=M(hdkZ|(b$J22Bw4HF)y_g3vGjLG(5kZ7J!Y2KffJ~51 zu1t_Z3&H~EjH4OoH-(h?uOU7Sbzp};U4p1_&?_gG2qh}iq?>Z8Wj$onw1<*fFQ-l& z-g$s6t#>ko_=e6WIwPTIAjo&Y`#NN0>w$Kp))?B%sA=`F#g delta 4563 zcmaKvd2Ccg9LL{m&uvSurA=9SU(mz4v{boTq-AOMXuIt$HkG!pZMV3v+ue4zwP6_9fzs$_{`+oEJ z&71dT-*@|UZ@-|MdnF5`L=I*R>*GeHDQO6Tf`6uu;3f$Nf+5`Qk)%&tLG-5zN2uUj zOz2%q=obhmF_~ru$^RnUQ`nPn08d9J9KwyMqca82lo$uoi*AEM@TRM5S~`hwNSG0D zQdPjo3LGaZaGbJ$Fl0_lmWC#u!DuoiTDmNl)|3H%DSif=fCDA<3g-uylY~Q)or?pzV0vO%0L&9moL;C_ADi9vl!|}+1hUc`1=fq=MRi2bh3eV@5hlGoShxP?LR3JR8hvSh2 z4bMd_j|1ex9Zk6^(a|P%@;8`;gsX&w_600dAS|qhW03_7%TIsik;%9&&}H zCA-`c?wawi*H_c#rcbC&4+~pM;)o7smgU2H<9gc;@sjv!kQSwcXj=WpTLdW*2cH z&zxmFN^-+u%%_OyQAB%S(CzamDNC&-$lhu#MRvb6548_i^HKX9YcXnnVO@vXiMB%2 zuCNuMw#~KzwL`XQ)PB=elt9xz1Xm^G!dupO_`3~P@}CW7GTI9*GH9|BV{WmS?VFu4 zBU!pshRYjLR)!WAzr|vAnY)ydW?PEkTXqA={*fIo1Mc4={j|0s)L+$x=j>>ExwJ1V z0TWs{-L|llX{uRkV*YDaufa+$yw^5Zuv?OznwKOXP2pum>lyFtak|WHblE52v+eDb z(`b~ga`aXJ^+KF$r(*xJ-BE??v5rkG=0(h4l)S&6lq5+9K}Ss{xxth2YaI{Apy5im z*AWlD@5nTcESd+VI2yntv^wm@iN#HG#5C{dsK9kJci6YKwNp2a^k|cdk>pi?!<}nT z;x{^T!32E2HZN7x(IvXq;IEygSOgq|`??MIOH3zp^>|g zs&lA0nV9LR9rfq%2p@i z;-(=+%Pp%~ZcbpiIf3O?1fDw&O&;?=?nrI#9)J$}cl(y<^X*c$-|ZdQ4CnfmCQ0a7 z!go&B4{!A4fPNU)-|fBN3bG5`Po diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index 4a932ff1f..37c9afd59 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -126,49 +126,49 @@ - + - + - + - + - + - + - + @@ -179,35 +179,35 @@ - + - + - + - + - + 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 a1b2d223f..cf5f4d89f 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 @@ -201,11 +201,11 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, inicioRmd, fimRmd, isCancelarRmd, isInativarRmd, radECF.isChecked(), radBPR.isChecked()); - Messagebox.show( - Labels.getLabel("busquedaImpressaoRMDController.cancel.msg"), - Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), + String msgRmd = isCancelarRmd ? Labels.getLabel("busquedaImpressaoRMDController.cancel.msg") : Labels.getLabel("busquedaImpressaoRMDController.inactivo.msg"); + + Messagebox.show(msgRmd, Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Messagebox.OK, Messagebox.INFORMATION); - + limparFiltro(); return; } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 202e3a549..33e038784 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6551,7 +6551,8 @@ busquedaExportacaoFiscalController.btnView.label = Visualização busquedaExportacaoFiscalController.btnExe.label = Executar Exportação busquedaExportacaoFiscalController.btnCancel.label = Cancelar busquedaExportacaoFiscalController.btnInativar.label = Inativar -busquedaImpressaoRMDController.cancel.msg = O Cancelamento/Inativação do folio foi realizado com sucesso. +busquedaImpressaoRMDController.cancel.msg = O cancelamento do folio foi realizado com sucesso. +busquedaImpressaoRMDController.inactivo.msg = A inativação do folio foi realizado com sucesso. busquedaExportacaoFiscalController.btnReporte.label = Relatório de Formulários #corridaServiceImpl diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 570e46f57..c8c3d1597 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6822,7 +6822,8 @@ busquedaExportacaoFiscalController.btnView.label = Visualização busquedaExportacaoFiscalController.btnExe.label = Executar Exportação busquedaExportacaoFiscalController.btnCancel.label = Cancelar busquedaExportacaoFiscalController.btnInativar.label = Inativar -busquedaImpressaoRMDController.cancel.msg = O Cancelamento/Inativação do folio foi realizado com sucesso. +busquedaImpressaoRMDController.cancel.msg = O cancelamento do folio foi realizado com sucesso. +busquedaImpressaoRMDController.inactivo.msg = A inativação do folio foi realizado com sucesso. busquedaExportacaoFiscalController.btnReporte.label = Relatório de Formulários editarRelgerencialEmpresaController.MSG.suscribirOK=Relatorio Gerencial gravado com sucesso!