From 289ffc51820dc4c1d928275681c76cccaff3a1ef Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 18 Oct 2021 11:46:59 +0000 Subject: [PATCH] fixes bug#23073 dev: wallace qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109166 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioAgenciaFechamentoNovo.java | 12 +- .../impl/RelatorioBilhetesVendidos.java | 7 + .../RelatorioBilhetesVendidosNovoLayout.java | 7 + .../impl/RelatorioOperacionalFinanceiro.java | 4 + .../impl/RelatorioReceitaDiariaAgencia.java | 8 +- ...orioOperacionalFinanceiro_pt_BR.properties | 2 + .../RelatorioOperacionalFinanceiro.jasper | Bin 73384 -> 73895 bytes .../RelatorioOperacionalFinanceiro.jrxml | 145 ++++++++++-------- .../catalogos/EditarMonedaController.java | 4 +- .../RelatorioAgenciaFechamentoController.java | 30 ++++ .../RelatorioBilhetesVendidosController.java | 31 +++- ...atorioOperacionalFinanceiroController.java | 15 +- ...latorioReceitaDiariaAgenciaController.java | 21 ++- .../web/utilerias/MyComboboxMoeda.java | 46 ++++++ web/WEB-INF/i3-label_en.label | 3 + web/WEB-INF/i3-label_es_MX.label | 4 +- web/WEB-INF/i3-label_pt_BR.label | 10 +- web/gui/catalogos/editarMoneda.zul | 6 + .../filtroRelatorioAgenciaFechamento.zul | 13 +- .../filtroRelatorioBilhetesVendidos.zul | 22 ++- .../filtroRelatorioOperacionalFinanceiro.zul | 30 ++-- .../filtroRelatorioReceitaDiariaAgencia.zul | 19 ++- 22 files changed, 338 insertions(+), 101 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java index 163d15a03..04d1b19f7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java @@ -41,20 +41,22 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio { String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : ""; String empresaNome = parametros.get("empresaNome") != null ? parametros.get("empresaNome").toString() : ""; String puntoVenta = parametros.get("NUMPUNTOVENTA") != null ? parametros.get("NUMPUNTOVENTA").toString() : null; - lsDadosRelatorio = new ArrayList(); String sql = carregarDadosTotaisdeVenda(puntoVenta, empresa); - log.debug(sql); - NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); ResultSet rset1 = null; ResultSet rset2 = null; SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); + if (parametros.get("MOEDA_ID") != null) + stmt.setInt("MOEDA_ID", (Integer) parametros.get("MOEDA_ID")); + else + stmt.setNull("MOEDA_ID", java.sql.Types.INTEGER); + stmt.setTimestamp("de", new java.sql.Timestamp(sdf.parse(fecInicio).getTime())); - stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); + stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); rset1= stmt.executeQuery(); @@ -241,7 +243,9 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio { if (empresa != null && !empresa.equals("") && !empresa.equals("-1")) { sql.append(" AND m.empresa_id = "+empresa+" "); } + sql.append(" AND C.ACTIVO = 1 "); + sql.append(" AND C.MONEDA_ID = :MOEDA_ID "); sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa "); sql.append(" ORDER BY pv.nombpuntoventa "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java index 86ec5b204..28ec56921 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java @@ -96,12 +96,19 @@ public class RelatorioBilhetesVendidos extends Relatorio { } } } + if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) { sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); } + + if (parametros.get("MOEDA_ID") != null) { + sql.append(" and B.MONEDA_ID = "+parametros.get("MOEDA_ID") ); + } + if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) { sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + ""); } + if (parametros.get("STATUS") != null) { if ( !(parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) ) { if (parametros.get("STATUS").toString().contains("C")) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index 4a1c316ce..bbb9ed930 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -112,12 +112,19 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { sql.append(" and c.FECHORVENTA >= :DATA_INICIAL and c.FECHORVENTA <= :DATA_FINAL "); sql.append(" and c.activo = 1"); sql.append(" and ei.activo = 1"); + if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) { sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); } + if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) { sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + ""); } + + if (parametros.get("MOEDA_ID") != null) { + sql.append(" and c.MONEDA_ID = "+parametros.get("MOEDA_ID") ); + } + if (parametros.get("STATUS") != null) { if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) { sql.append(" and ((c.INDSTATUSBOLETO = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index b54fcd017..e33db8f8b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -45,6 +45,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { String tramoIds = parametros.get("tramoIds").toString(); String linhaIds = parametros.get("linhaIds").toString(); String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : ""; + String moeda = parametros.get("MOEDA_ID") != null ? parametros.get("MOEDA_ID").toString() : ""; String sql = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tramoIds, empresa); @@ -62,6 +63,8 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { if (empresa != null && !empresa.equals("")) { stmt.setInt("empresa_id", Integer.parseInt(empresa)); } + + stmt.setInt("MOEDA_ID", Integer.parseInt(moeda)); ResultSet rset = null; @@ -220,6 +223,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" AND c.tipoventa_id <> 6 "); //sql.append(" AND c.indreimpresion = 0 "); sql.append(" AND c.feccorte BETWEEN :fecInicioVenda AND :fecFinalVenda "); + sql.append(" AND c.MONEDA_ID = :MOEDA_ID "); if (tramo != null && !tramo.equals("Todas") ) { sql.append(" AND t.TRAMO_ID in (").append(tramo).append(") "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java index 386e89a78..a4421dd0e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java @@ -135,7 +135,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio { stmt.setString("ISESTADOTODOS", "N"); } else { - stmt.setNull("ESTADO_ID", java.sql.Types.INTEGER); + stmt.setNull("ESTADO_ID", java.sql.Types.INTEGER); stmt.setString("ISESTADOTODOS", "S"); } @@ -143,11 +143,16 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio { stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID")); else stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER); + if (parametros.get("TIPOPTOVTA_ID") != null) stmt.setInt("TIPOPTOVTA_ID", (Integer) parametros.get("TIPOPTOVTA_ID")); else stmt.setNull("TIPOPTOVTA_ID", java.sql.Types.INTEGER); + if (parametros.get("MOEDA_ID") != null) + stmt.setInt("MOEDA_ID", (Integer) parametros.get("MOEDA_ID")); + else + stmt.setNull("MOEDA_ID", java.sql.Types.INTEGER); if ((Boolean) parametros.get("B_DATA_FECHAMENTO")){ stmt.setDate("DATA_INICIO", new java.sql.Date(((java.util.Date) parametros.get("DATA_INICIO")).getTime())); @@ -808,6 +813,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio { sql.append(" AND PO.CIUDAD_ID = CO.CIUDAD_ID "); sql.append(" AND PD.CIUDAD_ID = CD.CIUDAD_ID "); sql.append(" AND CJ.INDSTATUSOPERACION = 'F' "); + sql.append(" AND CJ.MONEDA_ID = :MOEDA_ID "); sql.append(" AND ((CJ.TIPOVENTA_ID <> 18 AND CJ.INDREIMPRESION = 0) OR (CJ.TIPOVENTA_ID = 18)) "); sql.append(" AND PV.TIPOPTOVTA_ID = NVL(:TIPOPTOVTA_ID, PV.TIPOPTOVTA_ID) "); sql.append(" AND TP.TIPOPTOVTA_ID = PV.TIPOPTOVTA_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties index d274ad6bf..c598ba7b8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties @@ -14,6 +14,8 @@ header.filtro.grupo=Grupo de Linhas\: header.empresa=Empresa\: header.periodo.viagem=Período Viagem\: header.periodo.venda=Período Venda\: +header.periodo.corte=Período Corte\: +header.moeda=Moeda\: header.tipopassagem=Tipo Passagem\: header.filtro.total.trecho=Total Trecho: header.filtro.total.linha=Total Linha: diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper index 24421ed3cb4cd2f044312b58411a93ac23124d1e..33e7c3b5578e0104757bd48e5f403c0da195c36c 100644 GIT binary patch literal 73895 zcmeHw2Y4LC`Toq7+db(dcVkm!(`;kQ4NNmdvSnLF4M{fG1{+yA+rnx{Cu|cS^xj)c z4H$?+385O(TN1!PLLd-&NvH`O5(9zc|9&&Gdpmb~r<1MU^T7W>k8XDNo7vf!@163^ zyEC&lf6VNzPByA7o+$2GQhazrS4X_FGv3kOndmBxw=HdMixv5^oB%3f(@-Wyy3`(@y+ey>*Afw4K2+_H7st4?_I$Ls9;qMt?|0G--tXLH+91T0ViJEyfYbafrUj%CKmPBt!E+7>r-A%V4}IHV?UOgS4~ zQ&%=;diA2ZvfA>JibZqFYU|3Ys}{{EpI**li`x^4_SVXVPGqv2^3u}X+BU7dyDd>p zDWR*nj)q1g&G$X1xhb)1KI`ASw5`1}Ueka(8xqa!ZS&cn=B^nn?G1@(;=UQ}?TL6N z1?;NpZf$MoTvZicf#C7^tjHG~)SOsGvRUzlrg&#bTa$NJVRKh~bD|}#?kQ(^E%7A@ znb1;}-`?3AZ-c_|TzGYe7@C(ZL#m^6A<|e14=6QJ-HE7?{7wqsWi^^;@9<(PT(K

+M3?n8E>Ry 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 literal 73384 zcmeHQ2Y6J)_Mf?ZckeDGbOk~YsR>0<1e7EM2&9n&q$n{Y3k1?gHV`aWP*D^WD+($C ziUoOMK@=5i?*>g)4l%$qdrxpfl%S$TC&n=l*5geY4TJd1HC6&R#`dPEe8$zfx z3tUlBH9NI1R9jv(8v^=yz}k$8lDfM2Xfcu+YSDmrd7D{M2N^6#hf8Dz`(~kz`GuL2 zM&}h5W)@_nWfxD*EGW#%%PpRiH98BKGpj?P>dKswS}0@|DN99tWmQIXeN`xnQ6 z)|8Y&)@<&X-Zbf%3Yd@=!&P$H_w8ir}me%V;|C zRo9jWt3crJTwvAE6v}7Mfn0mY4b5XZFhHoGyjn;avR_LASVi@Os%xy&0t@E^t8%Le zf<=pJg4xJBv!rz1>{<{*SqSya2HB_9%}N#OMJlTosYL8mWq?}?CauxswZT%7tq>X# zH)05$lv+?C__QPC!sRMdma2FEQeg*7i+J2|SfiVAtb+MFQiu%;pC3JYs0%0p=t71axaW!Wf+Rum$m%!ZoUU|k*UZu-U*>-d6j zSb)i2Q(Fy#T&O%)ms0{I8PG`Nd}nZo@2Mj>BE4k@wR8+)>5D>SvC;9- z%ScjWaMz+C2}(7yB3KE7!C2_8p^lJ0B3%hOjnX;g6=k)+v+_uLlNI|TmMmVyNqxaQtHaj4U&3`jD-quA=1DE z3sn?s2#qNZRygWQ+xYdxKeM`e9t^YdvV#kP73nAtTmT&w9U_a$D}(8%#T*cBZAE$2 zydoIygQ0Zf4^x0O4Yh@u7OD+~O6QPqId4I*b{15*Y}BTts&r0uEzw=VwTQIwb};UR zA43snd{CjmppqnoW0DLe-aBLp1*6pk1`v=mZwowU9qrPk(diah8+yD41;JTCsFJ0T&&x)g>@Y>u)fJ)gnur`_qi}}B z#&1DUUY8DC)jZmJ)>l-7P?EE0LZZQvD#(mCTn9)@(o!e|GS2VynvxI{w~F7k;9{fo>}bDyu3KoE@x%B#l|1$B|mk@=|{9FR#llo0VBPGgwv@v;wuD4ZeI{uxJkSp0nrhuqGjc7EwleAx`s^*G;Md zIH0D`;=?1TN-oH|1yRzYrR^hRE^Cq;h)yTzq*uc%s4+Dyn*{`U`bZo;9U;j;t!U{W zarq^npOGYaI+pB6$5~%PQibLK)t}Z2o>!Ps)RxSyEvcCkLVe<*GroW{dK#4Ew*~}W zRa#A|7*Cmy#)y@Q%}WF^wxm;)XgQjcE(+49t!DEeE)l&0!%Awaka}M;KM0=xSB;|nS8w4e}jFzNs8tTMjkj{5Boh@18Coo}PEeKXt zF9?#FM?%nkIvtrc)pg}$wn+3InAX;@(U;t1A$1{{X=fqa0KY|`bCFqTDe3$B)Q89uj)zCWd@bmFq&zRUh*xE$vbv1+1kemU z#LqG9*Eps*5SmvuAG9s#7HM}w64tX(2M39CzV?X8AKc0*H2%;8=GyrVQS*npDbnO2 zpw_gtb!@7xWXypnK#-baxCDlDI!ULL9&k9?KY_FY5Gt-sy2xQk+pkw;!K=IK}R zCK5qWF^CR4BGFEWw0RimSeD7u#22Z55COrM=;2BUnXtrfMPyD%Oi$Gf`9Y%5f$r0g zK@<&m6!ZX%&1E2-9h!_&Zo@Mfv4d0r92GSn$~88}eMlk`*Kq9UkwPP52T!A+hD@ds zo$Nu@)2Yo8qK73)rs|2BNSV;WadB7~AvpAfr1~Z}ya;*F;teeTF40t+<0mE9{T_6p z0TO}|c#}_H(oE_Wjlvr|O_W+cNm+VB&8P{2JvZT+0VT3S^In3~dy-hX?F=P=#kH(B zZ64JP*{m*wMUEOsTBEI|Whb0oLwi_PM&fe~0Jwlxz=R&zNcSU_rHEGCMA8MZftcd< zY>uRDy)m4$7be%Ui1tB1&H~+=%^skmpo+IZiBygIL0np$nDO44vp|Jt4Wld5P;H|1z=!f_JVLK86*k_Hn4zLnyGc%G5KsArWOQCDr^olFy+@nRijUe{RYcn0c20A zochLx!KYK&bR0rb?_}neLMSjRSejK;URqu~IapOzVuvx4yNyh) z0vl2C8Ogm92;DEad-C&Z!08uG+Yf1vftP<3V$w#RMV2tmvLRdbut8SoeTk7 z&VYQ;a_5r_5}+0mkMI`{+yWb1Y(r#LRaed|hW9OC>ujX?h!T$0>q&+po6mKpKG*l) zil=@Z_-fkuU(e54(NqavP7;_Cs%&o{vZc-n7uhndi)@_?LAFkY zAY0A=3Dl8C<`Yp6&kEuZ{^H5D$W68(Fo{<;B3tOp;LntqPBbut9mat26Ili`1lI% zc*?8Gs#6w_4qr%>J~5f6Yxlvnq!a6d9~nHgX59n7ub)2kquygvGT=37(+1cFiKMCX zfQzIV*G1A!h9GGtLy$CQfCNNIKOo42+{BagWEV*XxTF*Bg>4xp)>EwCJUa8m&)@9& z(6VkbDrb*}H{MN?@smWx)Y4CThgti(N?1 z#9m(E=}4Uk7GY5FPiRcVr%QwyYCuP4LF4G?H0VtqEdKiHotK>)R?G>YZD}F8!1Jxw z$%LBhXwM{X2xti3MLgl2a~CTy2~S7-#l&}72z3(7acSAvnT18gdFkUbGnk4wa_igp z<-Vz7`tI-i(a0H}roUy^#1QfnmQ>Y|Rc^D$Jhw%7p#**X_1-rxuiZQ1`>!R0#~_tX zUBIx?G8`(m9$rP&UcT|B&b}KzzKWJ~)W?u#um+wKZw^9db1pByNP)>8S+_w-2h%w% zBQv)sv%o@|)%Xa#kjnI5BqE9Qf$h90HXOHLE-i?~XAGeQIT=C=;tW`V!4~e6vB>!( z((nA4vr29AG)N=7VC5 zV8K`j!F=Up2sOgV5NZTx#HF|uFix!}LC7RA45L;ToLvu#dK_tdmk>VR z6Ku#|?B0bujpK81-na+8KC$kpO*`{%n3b7#L8JK4p6Na4r?WH16j`}ra*c-*_QFG% zqlh(6-P2FJ5{o)JS-<#`+_Y&)raxHWW)&V0pUHzzPf}umZygti^~0ELQB| zIzWjF>@*i(6<9bD2`g8DlA{{ibSOOqG$AlI7X0wS_UiL*o_pq)1D~|cUE3&_M8HjG zY`6;nkvg5?G&Ua01rrvZF$7GU3;`3)h>1z3CSx+)4U_qyvY?d`5ejW;h-EYy6;NpK z1VARSCidjj_g*-+*NX9-K3jJ9)V6s$njMuv1QqHGh=&Rb=7NfoA)w-92&iyIOjHI~ zvb3&5rg2-!SuUt(p%PGD>?x9sOQS;+;3NHzFg{x^S@PYE<4<_}>5upMmiC>{tJ(1x zP4J=4sCf9WU@rJL83H~|hJX)e#KdQmg^P7<6rZ!*@Tsl`L$PfvXc|7ZCydVn)0RG+ za_-us#VyypzqmB(jb_K^Oo9(}3gh9!g1O-1WC-{;83I0>5fh(63m5C!C_Xb>@PT(Y z4JE!W+OMq3f+BQlJ+3HEZUD|;l#zxBTQ^Y`aosNA0UNwcFgm!L!)n9mS- zxa$Kfmd8y_K=R+ zFNAef1;M)N`r6W9PC2ZKubN#1FQVXG+$^$?8Yb$EZi%2PuHg+_OY)K`SQ~!HMMU2Y zQkqQ`nJ1Exwa7WVwPZTkrxadC+_y2K0eK@#7ac=>#O3-VGwork1vI5veg;o;7NlaLuOXZkQOe-+t zk1kdsWjh%*p)7#0nQWbdMEW!)smVMnq;Y(VN-&x2-8sGSwP|E^o=YvF>nm7W!3YdF ztSZGZ}(jPD*fd^!Zo&Kyg>%`(#)cpS*=Bm(@;mU zpqDNY9Y0pLry+A* zFj!Mm4Lft@ko~IdE6c0K(Jf#_)rF3L&~i%223@PygZ-azd$sWeR!Ha{qj$+9iACcb zWdeKj*ltEkBz*muj}DN+M#t6;61Sq09>9R^jB=O&2?=((vcQZa1`c<0w#LHXLx6f} zf?cX5i7@bSwF_904XfEp>tQz}^tiBJs=TVSmTop9ip4ZUwofdogZ+}Qq#D*}m8ByO zjIlwwFAkIlM_ew}1QzjTgdfOd8jV@N&Ihf=M0T($xwTCtx#LfazZjgTbE#R*Lh)xF zXQvgcb?(-+R~==et}%iLi<7cZyYebn;SP&L$Os&vP>I8rm&(prBBHS{Y4Xw}up*K+ zJt6>JlBSM-2rc{;>@O&xRml-x@e1kGh1HC_Nx9+mI!2_14zHv-R0S6%hetU+w)7rE z7SJSQ?T-S`B_B#|UT!A01CkeJp2RaU5HbSeFm0@`6md>TF)b4rL!VA)z92y2k~ej1 zLEfZ%*h3X11UAni`Rx~(Uw9Q^kLL-l0gUdkTr#8O<`v|mWwR&0LZA9N1Y?%-L|?&0 z8_DrUM4e$TSnNeN+(`b+l!-;Zued2snmZV>w2x3jL zg#Szsqs}2FZFitpFc+Yl3;`%7Lja01Vghxj$v~w>0tMEHRumfAi{y*%5jj8!ydjJ> z9L0m`qSgKVHS3-z9+#e~AMHZ7SkbZaknizV++V2Oi5gT-SY#(m@~dZnFbL-t|b-iT8Gi zh3Mh}6pPOo0#Htd02F7$1ghz8mj<~2)iMlJ;ZeTSjeZXp52;%&A7frUByZjFEA9-O zR+3ZQ>`0OKKN5A~y>Vh82Du=`;=3T_WC%!cMogrd{>Evr3sU|tQWHawCi9p>6R1BC zuLI+Ov$5u>HfOiUxOLQybAL(;jxA|+a54xu)Zs7WU56$XBEtn77T*ONCqn>-Gh%{s zhSfD$SJFkr)ggwsfa7RJMaS@BP<-(e52?G$F1cgfZsW5Dl!^=HFU+cIcBCc~q^JX@ z)DW4tBgKNbAmwBT9iEdRAjKImkqWQHattPMkvho*sdnLJR0OY};7o&~d<6w9E8<0N zJiJ!ly?4(=pIzs-(UIl+rM!FYJFU@mw$83JBThJY7m#Kg<)qY`de zC%fR~XjyrUz0$RfJM?uF?-OHB!z6mJ4qNk?OaOt24O!Vt|G*555ScuN7g9*)vXYS2 z5IGIIsr7E<>73ikH=o~o-ot2YheYsg$}~*6h~P_|^X+Mv8mD2h@Gd|*83NEwh6OZz zz`xD_DcFy{h)n2R=VQ|O7Sh(0NGfg%?QbJ4(??B*nYnG}MPx&g4|WZ8PafddJtR)v z!;r+Ap-~{?gSnVw7M8WPcP?v9Ps<%$JT5b9>^Q!rb@TIQwm9|nt;)Pkdq2EwV)l%9 zIH&Q-(^h$b9D-mvM2*83-ULnUCsAEiBG+1(&R_yt;#2;knxr#E6RBe7rMy#|TzOFTX^ zbG4#*EuyQ=Z9A8AKS}p3;=IG~B54neOdD!-_>~kj_29iMcc)SXF&qYc{*OjX2D!4wv!=LY$wC2*knl}e`4(J z>S?PUTUUq_zq?9{L=CJGt*Ju6KtF1;MD%Po9#+@xyY-_Z+49o4XUs|d_UG*J&5qUE zM10iQ6%Q*G%mphaL%_<(5U}Emn0?PK3nS~=C|2n%STPF{!|G_KyU=hx#e<3kbAigq5TJ501gJP8CRCqU5Lwqop~`T9 zs=cFGHMgQ353n0fny_+quWSER)45~ETQ0yf$OFlXCpR8yy8bTW}GjD@z&P4w*uYehV$mj2#q<*bLgRkb_xO7D02 zW@*h0mFx#WFvk-IDjqBvDuLmIN?qU2~`a z?f-dI&xtqp?J+PvyR6xvN+wWI=lFO~v0yGxIT->}PKE##XT*f+cnc!y+9*_GT%dyE z^Wb$98?l;T_KSYa5f7bh)xSLbt+8YCzynhc&s&iNr%mxKqvA$AQh=k{2qh0D=ujsm z9y%cwcpK>NaiaKd@YDM1mdTDR%YX9TmT_9r#F@^w{lOaIH88IPCv!JrB zjY2jq5;B;6c5-{$8xl4OlXR&uA!0Jh3KO1=G0Rc-wSHWC5-J8s(m#82q~^9=@b{R`NsxQV&F@&luSemz}Q-d467CxT5*xGb}3$$ zw0+KduXgBg?bYk=dh*rWZ{i_kO`Mz5B&!KN)R_l9X-OQUSWp+FoD2aeC&L{n9wKJ5 zoM$0qT^mK})JUWvY#%Hkl8jp`q{R<6y7)GbXoXT<98Ny6(LFHw>l=Gq?mg|mZ`mz< zJ;tqz2c^~MnzAxOzLY>oor@Sq?wu+N<^rRWA;9QlxWmXp#Do#dy5e7>Fb<1^5qej< z!MVKzi}{i=dJK$*(yEqqmH5#S#{E^TXa3VWChi+#3#BGCxLXKH)VTqCI1s17v7jzU zIT->{PKG;DJVZ>SZV+)|%fjMzjiAvDWQ>NpVAP6ZG{3&2DpXzupL?;A zC5^L@_Z<;0C*vWtYU%h<&-_yOz~w)mS+(b+Jka@K>;G1ZYEr-VG(n0wPsBrt1#>~l z$qclvbxK@YP?x;mBS0 zKXi6hRo)lPj?ylI5_MjUhY}0sf|8RVpyXt@qr^kRMCnxv9qZaCN+VrR3h?$6aS91Z zD_&!YHqOU`Y1Q`6Lw6mhd~jjIn;VN)W=(2#m_8#gQRkz0FtK1RFgY0lOiqS7OguzP znD{zn3#0^wrqf+uvKo`?DI+l(Q?$t=9!gjLZ`i3X8|d59w;cSc?}Hgd&5qJf1SRSm zjE52n=7N%wA)w@BxTC~F#6;;}7$4?qv@xCGf|4~jEhr%$RUuX?E7``{Q}i2@cu3uF zNw=A&|FZti&J^`sPMT@j!l=qsBps2a85ZU^tNy7_LZJAz~q=sFp~rYokbw zazQG|QuShQxv!~-uyw$~3&+ds5b9D8gpEw_>6q#~I3o}~>R1hDw~_-~;bTPQu&)`; zJ#Xv;;qad1?#Nu;_xW?WS$pq}gI!onIqRD4Y^Jsp`n4_(-48dWx)yenR@Q`In`iXy zD%eZJKX~E3m#C55v4JYsObnm2fvrJ~T}-Y!tDCxK2*cKSIBT~cGe57O2v!Zisbf=$ zXf@-TQv1Z)pT@qSM^4s;^O9*S<#?82Tb^QmT0vS)CLCo}Se%oV?@ZWFx6IJb9KfDg zA#%I%X@&Wj1@OfMlB+_uY{do4`Nh*Zx7_)K2RL(;@RwAD47Uo)FBcA=gO8Lt(_~*; ztD9eu0(q%oUz8N0x8%`t(x$M58{yc{(=vY%%+J1-+GTgWNfY)dOZ zb~S7`WGe@)Vz%S)3Nl$4i_<6N!kKT*qIL+^AlRqnI3GaBfF<0bteni^X=E!InNjoF z-8!5E`HMAi8Ry7_&c2*S?k4eiY$}5=aOd;;!5VUa6HH1GLDr7B*moXzdt+22- zJ1=cC9Qo(SUEA=kGJ3*6b~X9trjP_2gGgKMq=M|?aj;x08=8$vF4-nMQZ*nT`5;M2 zkawY|w%1x1t6va_Z&AywGSTwWWhCm&Xh5J{V?!s4v4uz4@D7|#97%7w4Yh#iPy zcOgHe(8?7ey|;H#;iR;Jti0l^(atiuZ)S(~MI%{fMLUGjNQ9!SqDk3#i9aFY0QbZr zil?(D9#1@AJn@3@lbsul0F{)4L0w?**XinA9TpVASCh%-e^bt_uC9bPmewtN9?tf| zNhc?}cgqblYC{Elth=GKqP{Gc0!j{imO6!;&zdqgghn+n9@&Tw-zk7kZ`etk(O43& zFC4z_l>%o1hZd!fPhJF5W(GqGgTbnl+UkXHj7j=2q)0OHhc>^G^aLL2j4C$Yp6M66xFuOg$7((65#_1%5tdq zHE{ZXy$N4g2AlK-r3@Z2Z0OKoCk-BS(y6Bm9e6ScdJVwD@(~VvRS4mMgn1pT`3=?9 z2Z{e`_yobp!-(%%PHmvNFNJ;Nee*s@Z+GIx|D68uj9wk@82=`yo$P>@IA^I?+xCag z{Bp_pEBik_+R{4d#|ZE<*4k0B{ue(FOPdR)78YgZuqBwz<)A21wT{1>R6Ikth9>_e zB+q(w@-Vg>G@JucYB((T*s#(B!rc&bNK#Au8LoNM z6OYd&$$@9Nv}+urviuVFIdG&0XlKi7Kb-qa7*PA=!bv%_t-&N6nRW&`P#RsGPhJ?X zJ5v8sf?%AksO#N5BP}-rKF>BfuX`Ww8D9Qb5O}fYINXM==hwX{@O@0{DM$D` z%#++FGNAMLnpj~R2iC+452(}v@FtXS!CtFA!dbzX?e-{dC-@DVo*S(5pBYB^K--7QDP<=Z>^i2P-t11LlcG-0_U_X(6#0ILA zeW(xxxV?>wSVzNE+B&O=1~-!XCJz`C8|D-29TrZ{?CAQ+-F-VM&*>_zpEw zI3+4Z*;^cY*(00hfP|YuoR*N*sE8VC2{tz2b5_FwbgndI%NLz8Y+!cELt<`Y8!l(0F}yGuBWmhk`s^HiaCUC|e)9C?m(lKb$0a z1_ePn+d5lSer$3~Y6dw*C=h=DDULBNjHex?ZDf=fYC_cd+NNe2!aH<@cJ^cc(r5qDXUQiln4ST(FNQwb z-mWq6^;!5zF}wh!M-!1YM;4tNojTjWeqb}Hvs&N(S7lZ_mBd;0ChD>skGl#T6tWo}V_>X{am0tSayEUEaNMyA z*3uOJxH7eJD2S7(4$foOj!lxsAG;*~l&Y+wrQ4e9F|_o~%^=1^YiJN7*Z z%P>ukl|34pUpHG8f9dgm>G6r^@!jnj6JL*4sUFW>LLE)b>|sCW&!N5>w7g_vF*H); z?wH3YTQ4c;IZ%!nb`ZY+p%^0&`}HU#A6rWpHekv&6%HCa@5l6-3-$E zGiu~adQ2I&#*qX&Lx+Of$Ch4L5$D5k^n2#Mk%43A;7pTeM>E956~09)^5@YQ!@1`{U|4$|oJm23XkPM3&d9Ud5|8l5B|=01>m(rz3V#A)P9*NI z=h$0WH#?=OnyeWW(y@0mw1XA)^eYc>m#kBS^J>e3RU!Jt7V-%Yng?(ksCu$tjc;K_ zT0UFF?D(*{Mq$-x@sfEVdRwqc|FF`cC2C2EegexbDWSC!-GcS1;Ea2|fAg^+tsi-} zc+cdq7dT+0>HjNjhb0`kbB&}F6XU+*VbnR11rji3T*eSEb}|HvoeTkE&VW(f^?XqM zL{?yj8xQNONUSADmoI^JB*AiS3EV!#0hPliB2OhkPe|Z@D>;<>)ylumE%;A<1UWkyf}Az1CjXSNfGM4<|2wWMCrABQMlK-mXb|0M5 zd(lI0tnXKT*~>ZO1o;z#0fO&(s|DmBRx2;;!ET+}I3f({u;tkH+0|4^jOzk~lOX`% zWC%cT2INTW)JEHRv^?>Em|z3JPL!EWUZB$DhPjh+(lZNa+T<);tzY-#vS4>BO?stF ztM=R74Vn+96w)pyA?ZKU;zD)CukUq!@xY8$L*7q&NsxZ{aWQ+CGl{^dGl@w;=wTSw zMc__`AaEx`5IAQ*mPCP13TKl0;t4$47C2WmU=(S|&jl)jVI*Zvb*(s-2vQFBF(Y^% zlUNd6DtIjy!D|h z9?Yd?u=tE2)C?y>s2Q9QQ<1t%fDUemT;d*DagJR#!m}&UXuy*sDS=9vz^9a=Pwk0^ z(jC7W2aL^kttuP1Vct}I?2<%KYRaiS`f7p_byk88@1x*YaY>l%fw)jfc@~eV-Uy7SiU7+PQAYlOJcqJy^*)ajr=ikrUN*>cl&$orQST1tS)p zF$9d93;`p~h>20tk7_SizP;o{~s6MqI zvaXFn6?B10c=2^KAVnNY77wJS9)2y*an&jJf8OK$Q$}5#6KeMM^a}xrIzPq(i3M{3 z$;l8vaxw&vI3p%VKU&~e*G55_6%!=>I-|)Tf%YBo<;8d)tsnLLrp)KgJ^Q1g86!r# zHR{vm2FWl%1k5qwfW(7EgCsDVAPEd7NERa&NJiKc=#Xt(g<*C~koa2@M?w+Gw>>Z8 z-?SoMbsmz?n~Gd&5+_I2#G0Mu=8@wLG7Dj6_|SMsmIdp|XIG_+FR)IVsjPv+C5XWt zW}WbN;%*7S_p*{oVL^3WsAOga9K*u{0C;#gd|sTGRp4{n(VTXbCFNBlsVFYO4HQmg z1>b(&(%ycK8tNcnR|aeem!_w0{Gt8Nno;yI-|Ic|(VhQ&5;oDH6sa>tL*k!hR6OY9 zp(mX*Xvm;pCk;J$a4~FSA39{1jxa|3K}e}}vr^}l)WIQ0?9_p})F6FBlnT0eMe6v1 zOgIm#o}84VBN?L(H6^tr^thtpS;5k*s&Y6uX>zcttOTR@pL6G_!3h`@;d7HPY9CHd zI6w!Zc41Ccb>+-rI79 zh{KL^z^H3f9PuzBK|b~_aC!g|MxCP~I}d5W==dnU<2)XWdPcEb4rmdI<#q;$P^=2_ z{qj0DiQ2~oxiR4|0d~%c03R#KaFlrkvjpO(gx2M_X2VrzvI8s=+{B$It zVC-}jjFQ6w*~h8JC|CiBTXN zzo0$@4T|TH?1Q&&YAJ_DrPV)cw4E|r^$(400jw7)nOPB}y)HkV0i!{Q7Sle-0$RJB zlyKGqR1}+GLp~|D2%{vM9zMsw8QOVr07f0{(BZGIv2(GY%85Mo@dJw)E+So!!kAEN z>^KfGtU7b1=HRf65Kv*)`TOUO2zas;jPq+78Fr@k&dd zk5Ma;K#Ld&J6#tSEn&w5&sq0q!giS=(z1#ZLAFW~uGcgbUI=YOc~yDnbd2QQeI{e1 zWK@?0O_YoByhuS4O{5~tgCtaFBAxjrnaE(iGfm`SzNseiGT(F)`Izr)6Pe6cY$8AN zm6#~Ne5EF8!F=$vmdrQXM6H;w+=O)m^ttm)l*D|MCThcc)h24oeDh6M4MM}!nW#PU z)tjgT^DQ({N9J2(qE5_ro{5fQz6(rrJo8;>qRz~Bu?goT(e##>s4MebW};-~TWX?i zs5_Cyl_u)Jd{>#MC-W^g(Fx3Vt%-Uu-wG3*$b2`Ls5kT7WTHOIcZ-SoGT*Hx>c@Pm zOw^zGZa2{YltP|%r-@RT?=BM!WWIGK8pM2en`kieZ7|Ug=DW{CCo$gxCOVn<9yHNV z=KGt8PGP>yCOVb*9x>4{=6lRUr!n8-CK}FsPnc)~^KCQHNalOmM5i;~b`zb!e9xL_ z6!SfAqBQ1v(M0LY_YV_gFyG528qIvKm?)F^UNg}c=6l0LW0~)tCK|_lZ<+9Bno8px z6OCuSf0<|k^X)NFHuLQ@Q4aHc0OJ{S62aX1%9+91A~Kjj6D_T;3sqObsb*!MVTLdo z*gKn?qmfG9;itkOPs8Kik|yFM4JMx`gP`EFj*Q=DvWY%LpLqed&w1D}WXy#M`XwWO zg^@v$m|Ri|#Qlu;Z!&rcYOjI5h7nfCoQ}SQb~-x<`R>J^TTxOqJ2h|STsVDhcpsK` zC&@(LqXRzl9Xbd_O;AOkMGJ<4pq3wk90=--fqsIq+Nm`g=x0!n_y}sN%Le)t3Ln;! z4fH#N(6dD*( zwT{AbsJ#aELa)msxahkEHX)a8imrhJkV~fF8n|V+^tNhi;MQTPt-Z6;T7HV8<6;4LlHv!&FcM z4+eiV)jth<5=Pb%Ujq+?W<@ktqInwlRLBoeI}Lmq_=wJF;1Lj+dRE2fI7jzNnRj}tTS7$})lC&`gr1|A2^BCJ*#cszt~DwGD! z2B0HVNdxBs(2i4vnG$K>e8@Q+&6)aW-~wnF4g#ng1}=iQ4jNOa3=Caatg}oEJO%2d zBMw(N3_MLti>Vw2K1(DsmBYX@pe&A5sLEmBb3g`^N_98`&ji7R?`f9HtcYCABYS}j zJPRsdIG|JcGw>WM2Q-GA-?>6UR(2}{s+HR+7%{@h^UT&j^&#q=fom~hi);-Xg1SaS z(#$TfL7>W2@Gd#duO?H z`Vb|vp)?4`J6Bi15JgY)O{Jqk(HuA*@og{;!r5pr@#QH*gs{fKNV17n6}|%_ zX}}-@uZhS6%k*$2fVCv#IuL+$=9!7_X3_5fvAUdTW#D^Z2peeN`$3H4057Pptc1}S z*@z$XK=PX)c~~04SqfEnb{S0B9Ep zKzjYGSumF4C%pJcG!cXkYl*9kOF=NB%eGW*}yv@Qm`Z! zFNNnw3eQ7{L)9#JWR2p9nD|BfcM|p=&}8_L>~z32@XPT0x)8KQK?92UaLD*8_*Kxx z@M|zrby*w0KCW)yH=q-;4u7YgxHIrS9VFhe--7mOg`%U&JJ5_cA^hnX1OF==)f%k! zK+nuW)&$F7Q5TF&d&9x3@eR~gD?z}Xe=fklA3=q)9_+B$82A&=V%&-a$0nD~fk%KQ z`Xi|q^vvN@s^)?T89IP3z4$9qA7of3Y2f|Pba^tw{!Ewk8TdbtKTc)K&)!?8t_MKn$G2ZN7#ig^S2VCMi*wqrJ8vY0#5d zo$nx1GVoeqr&pNO(<{vB=@n-5^a}HNdWG3My~13cUSTFr zuP~3NSD3}qE6m~P6=v}C3iEe*h1om3!rYx+VdhS+FmI<Un03=D%(>|mX591&^KE*C**3kxT$^5DrcJLf&!$(HWz#FnvFR0N*z^kXYkGy* zHNC>znqFaMO|LMohN}-65m<-7&4)^J3)CBEbhxzd@xtBQi6K5lFHWB9` z;yg^8M~SnAI9rMHBypZ1&NIZ>L7eA^^8#`HPMnvBvy(Wl66bZ|>>|#a#Ce-I?-FM> zao!`&`^5QhGYB7}kHF~;MiH{nMgjAd2Mk*QFli-$F{=ZZu{whRt2>ykP6VS>e`w}| z;BF`wtA>M_Y7`i#GQl)89=Lg6jw%8})KoA*%>d(5DTJN_2B%5@xfaY#3&GHIKE%El zj7yh;S?MY;C|w7pq?;hM+rWHuCm4>_gURSVFcxis)E@x@(N-`GJq<>o=fE8F4|v+E zC=LA+j6d&!*=H{pd_IP!e*s<2zrnoo9hBh^m~?)D-24|!z%t6l2Fk&H&^ueBJlr1T zV^t%FI0&8p&~pGO~NOm$@nyMCO!jA!K2YsoQ0<0Tr?dQqOB3 zHW;4v3Aj*6A?K{KYuUHoB(7`VEr*y>GwP-#meSkkAhFBm9&4-mmpxfif8=zX+5mK>1CeOasahfpQj5{wGjo z^zD~~u|PV9kYs^0laN$_R7Oa;K$=BJ9)UE6kbDAZE+P2^QUxKk5J**o)Jh=L5K@vr zswJeh0x3jD?FG^TLh2}x8VKn)fpjh*brwkH6H-@!w3v{(38ae%sfR$igpf`UNS6}Q zi2~_zLh2)st_atbT4-ws)kCdW0Ig~vw1@_%&5O`9bS~7L^U#IRa;`@gpu1sl zT~A1-2&5YcX_!E|nUIDHq?Lp;QXt(%NM{J7)r6ELknRY}crd&?KxifOYqvs=bsO|F ztH8v&8a_6BJM>R?pv#~KT8Y-62hd&U8MGGqnROr|FsAYr`wNqiR6?GT!Jm@3180&> z9!O&a(po~w5=iR_X@Wqyhmdjv(!GR~Cy?$Zq=^D)BOw(Eq)mi0NgzE$NM{P9hY4w_ zKzfvrrVFGkgmkt*+Db^p0_jOYDiKIe5mKo@dWMjK0%->!%@#<{5mLE8dV!GU38cRh zQl&t8iIA!V(oRB}FOXg(q&k80Iw92yq+NuxP$1D3u}C1jO+uX~klrPv3k1?`Lb^~O zy+=qF3#9i6X^B7z56du2c7rPW094tHP-P#4D!U1)?BAfuJ_J>EGgR4!p~^l2As&S) z`xsQ&E$DOfI692BVlR3EcScXb5Vs9ypr`O;^fWF<&*1aXc6=?`f!CsEK?isazl5I0 zd(jK{Tl6AKT>dV#LI03WL@!CFp_io`v{O0C31v5{;I{~Vm%{IQ_^pB8Cip!CKiCsx z?uH+f!2~&&uno=cg&*Y0KNNmx@PoYg&xhYq_`L+bcj5Or{0_noWD+po2YCp9+ybfa z133gHzz_Bs1ZKkz${JV#zZLLX4Zr)h;bl{m$MN!<4gL-ezv=KpC0RCAreVxOVY<1` zL4V&t-{qjc;Gl1H&^J2hYaH|&`#y?RZow;d;2Vp#GS$ds;#3d6^$^p*6E~WH` zV?xqhouR`?b5S2f(mZC)2JZ{*Nps+iB558Ik}h{onpcCPNSeolqyz3r^GbCTN%NRF z8$6Fd(wny6tvm24xVxLy70(^f&-;_rdSfpwiSc%HNsgt~8<$3>*G#qE=;NMrGt_$h zb@!y3q1Nkl?nyU8t=BuaC*2ISUV9pne#WZx+TUnh(e4G}F?8%X8?;%`IsTKi8+9F( zg}OSrB*)Tj)a>Z=nyK9=2i%ixhIXUe?4EQpv>Ro(d(zF&Zsd>MlWvA~BVPtd@3PvB zypYxvxdwYTt{pTh7 z?kTvt#>%s_2_F3>eYCVrVB7?Zw;5v@c;98-3&Fdac|+iRk9o_%`#$r|0Ply)TL|8d znRgs`KV{yL@RTifW>VqqN&BuF+&yaFCBfZR`%ZEr0IoYQbh4gC+!h+Ez*?@NRhYVpWum^kjl?2mD3I$)pF4VzL=+)^5VTS)_PTPXv#mvV3iX&UY* z&BmRi5I#;?fjdjaE#;3~*@hEv2PM2@NqvgARwiai~cjGLmKNI9P zagO{2&XW(~iSqA2JAw;fhCf+J!c&w1c$zW_pQYsB8OoVJn}Um#>9|y>!a?Ny0;P{qcR;FrbaZ_iLl@Can-Zq*daFwTtkh+H$-_ zy9H<~@#ESmyiMDLpVnT&+qJ#;S#2MFUONc1AMgv>PxvL>gLmpZ@T>Yz{JNfjcj-Am z%ff7<>`X2nH{x#mG|APN*$oNx3 z!T&LI{GHJne{ZzKhm4N+N8@<>i_r`JY7D`@8Kdy;Mh-q=Oat0<{9j{+BpLH1#W+t= zjVmP0xJlBDwUS|Mm%PTCl4*P-1&sYt3*#rLrAL-pd0I-XJ)Pl=aTh7c(@kpcIYH{+ z=`9`a87_74$nyr!c1eRh zZ%IQvUrMLK8|c%#Nzw>!vUIw)uQb%#PddY!B4v2fq)hL0X{@(O%JQBkP4Hd@w9BPz z@0C)%cePaD-69ovUzR3&-<76#KL*+-(p2x~(%Ig_Qn9a!iiLmC}X2RnijQI_Xm1J<=7v z&C->=N2TSy?b0>A=cMa>uSqxfc1gGR_DU;#A4;oz`=#4`UrTrS4oho&ze@L*s&S%$Hs^r${@^ z>C)?Fsq}_9OM1(!lHNAwOS{cQ(jN1C=>zjp=|gj=^r?Bh^qF~+^p&|r+GnnlzBV^W z-r->UslZnvSuEVz2^U9pI?$&_`PyV zzh7?S?_YERC#(}uv{D%DW4M0%=D-h3TJWY2!COBB3$YO*;}<9hyzf34?m%1{GJJyJ@-M^Z2J`3)pHj;x!zUpz!zcAwhEK=M^;;Y_*V#7_ zW-4a*Bq71F>S7XPhEJLjG?%OGWZ>pT=S_^Kff-RSeDVi54WEPrx}3xCDdZ+>__P8# z4WB}KY${7gt0GFt44*=}f_ax2K50zb@EMgfFZ@v?&12ez�uiD32m(9@92_MkURG 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 - + @@ -14,6 +14,7 @@ + @@ -307,7 +308,7 @@ $F{seguro}]]> - + @@ -319,7 +320,7 @@ $F{seguro}]]> - + @@ -335,7 +336,7 @@ $F{seguro}]]> - + @@ -346,7 +347,7 @@ $F{seguro}]]> - + @@ -357,7 +358,7 @@ $F{seguro}]]> - + @@ -368,7 +369,7 @@ $F{seguro}]]> - + @@ -379,7 +380,7 @@ $F{seguro}]]> - + @@ -390,7 +391,7 @@ $F{seguro}]]> - + @@ -401,7 +402,7 @@ $F{seguro}]]> - + @@ -412,7 +413,7 @@ $F{seguro}]]> - + @@ -430,7 +431,7 @@ $F{seguro}]]> - + @@ -442,7 +443,7 @@ $F{seguro}]]> - + @@ -456,7 +457,7 @@ $F{seguro}]]> - + @@ -468,7 +469,7 @@ $F{seguro}]]> - + @@ -480,7 +481,7 @@ $F{seguro}]]> - + @@ -492,7 +493,7 @@ $F{seguro}]]> - + @@ -504,7 +505,7 @@ $F{seguro}]]> - + @@ -516,7 +517,7 @@ $F{seguro}]]> - + @@ -528,7 +529,7 @@ $F{seguro}]]> - + @@ -540,7 +541,7 @@ $F{seguro}]]> - + @@ -556,7 +557,7 @@ $F{seguro}]]> - + @@ -567,7 +568,7 @@ $F{seguro}]]> - + @@ -578,7 +579,7 @@ $F{seguro}]]> - + @@ -589,7 +590,7 @@ $F{seguro}]]> - + @@ -600,7 +601,7 @@ $F{seguro}]]> - + @@ -611,7 +612,7 @@ $F{seguro}]]> - + @@ -622,7 +623,7 @@ $F{seguro}]]> - + @@ -633,7 +634,7 @@ $F{seguro}]]> - + @@ -649,32 +650,34 @@ $F{seguro}]]> - + - + - + - + + - + + - + @@ -684,43 +687,62 @@ $F{seguro}]]> - + + - + + - + + - + + - + + - - + + + - + + - + + + + + + + + + + + + + - + @@ -731,7 +753,7 @@ $F{seguro}]]> - + @@ -742,7 +764,7 @@ $F{seguro}]]> - + @@ -753,7 +775,7 @@ $F{seguro}]]> - + @@ -764,7 +786,7 @@ $F{seguro}]]> - + @@ -775,7 +797,7 @@ $F{seguro}]]> - + @@ -786,7 +808,7 @@ $F{seguro}]]> - + @@ -797,7 +819,7 @@ $F{seguro}]]> - + @@ -812,7 +834,7 @@ $F{seguro}]]>

- + @@ -823,7 +845,7 @@ $F{seguro}]]> - + @@ -834,7 +856,7 @@ $F{seguro}]]> - + @@ -845,7 +867,7 @@ $F{seguro}]]> - + @@ -856,7 +878,7 @@ $F{seguro}]]> - + @@ -867,7 +889,7 @@ $F{seguro}]]> - + @@ -878,7 +900,7 @@ $F{seguro}]]> - + @@ -889,7 +911,7 @@ $F{seguro}]]> - + @@ -904,7 +926,8 @@ $F{seguro}]]> - + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java index c8e061378..6151d91a6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java @@ -47,6 +47,7 @@ public class EditarMonedaController extends MyGenericForwardComposer { private BusquedaMonedaController busquedaMonedaController; private static Logger log = Logger.getLogger(EditarMonedaController.class); private MyTextbox txtNome; + private MyTextbox txtSimbolo; private Row rowEquivalencia; public Button getBtnApagar() { @@ -112,6 +113,7 @@ public class EditarMonedaController extends MyGenericForwardComposer { public void onClick$btnSalvar(Event ev) throws InterruptedException { txtNome.getValue(); + txtSimbolo.getValue(); try { moneda.setActivo(true); moneda.setFecmodif(Calendar.getInstance().getTime()); @@ -138,7 +140,7 @@ public class EditarMonedaController extends MyGenericForwardComposer { Messagebox.OK, Messagebox.EXCLAMATION); } else { monedaService.suscribir(moneda); - monedaList.addItem(moneda); + monedaList.addItemNovo(moneda); Messagebox.show( Labels.getLabel("editarMonedaController.MSG.suscribirOK"), diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java index ab3944788..ae2a13c14 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java @@ -18,11 +18,13 @@ import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Bandbox; +import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamentoAntigo; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamentoDiario; @@ -31,6 +33,7 @@ import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamento import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @@ -53,6 +56,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos private Datebox datInicial; private Datebox datFinal; private MyComboboxEstandar cmbEmpresa; + private MyComboboxMoeda cmbMoeda; private Bandbox bbPesquisaPuntoVenta; @Autowired private transient PagedListWrapper plwPuntoVenta; @@ -68,6 +72,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos private List lsEmpresas; + @SuppressWarnings({"unchecked", "rawtypes"}) private void executarRelatorio() throws Exception { Map parametros = new HashMap(); @@ -82,6 +87,13 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos } parametros.put("TITULO", Labels.getLabel("indexController.mniRelatorioAgenciaFechamento.label")); + Comboitem itemMoeda = cmbMoeda.getSelectedItem(); + if (itemMoeda != null ) { + Moneda moeda = (Moneda) itemMoeda.getValue(); + parametros.put("MOEDA_ID", moeda.getMonedaId()); + parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo()); + } + String puntoVentaIds = ""; String puntoVentas = ""; List lsPuntoVentaSelecionados = new ArrayList(Arrays.asList(puntoVentaSelList.getData())); @@ -100,6 +112,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1); parametros.put("NUMPUNTOVENTA", puntoVentaIds); } + Relatorio relatorio; Map args = new HashMap(); if (radLayoutNovo.isChecked()) { @@ -155,6 +168,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos Labels.getLabel("relatorioVendasBilheteiroController.window.title"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException ex) { + log.error(ex); } } } @@ -219,4 +233,20 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos public void setRadLayoutDiario(Radio radLayoutDiario) { this.radLayoutDiario = radLayoutDiario; } + + public MyComboboxMoeda getCmbMoeda() { + return cmbMoeda; + } + + public void setCmbMoeda(MyComboboxMoeda cmbMoeda) { + this.cmbMoeda = cmbMoeda; + } + + public Radio getRadLayoutResumo() { + return radLayoutResumo; + } + + public void setRadLayoutResumo(Radio radLayoutResumo) { + this.radLayoutResumo = radLayoutResumo; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java index d6c349e73..61cead200 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java @@ -17,6 +17,7 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Bandbox; import org.zkoss.zul.Checkbox; +import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; @@ -24,6 +25,7 @@ import org.zkoss.zul.Radiogroup; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidos; @@ -59,6 +61,7 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose private Datebox datFinal; private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEstado; + private Combobox cmbMoeda; private List lsEmpresa; private List lsEstado; @Autowired @@ -182,8 +185,18 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose puntoVentaIds = puntoVentaIds.substring(0, puntoVentaIds.length() - 1); puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1); parametros.put("NUMPUNTOVENTA", puntoVentaIds); - } + } + filtro.append(puntoVentas).append(";"); + + filtro.append(" Moeda: "); + Comboitem itemMoeda = cmbMoeda.getSelectedItem(); + if (itemMoeda != null ) { + Moneda moeda = (Moneda) itemMoeda.getValue(); + parametros.put("MOEDA_ID", moeda.getMonedaId()); + parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo()); + filtro.append(moeda.getDescmoneda() + ";"); + } parametros.put("DATA_INICIAL", (java.util.Date) this.datInicial.getValue()); parametros.put("DATA_FINAL", (java.util.Date) this.datFinal.getValue()); @@ -243,4 +256,20 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose openWindow("/component/reportView.zul", Labels.getLabel("relatorioBilhetesVendidosController.window.title"), args, MODAL); } + + public Combobox getCmbMoeda() { + return cmbMoeda; + } + + public void setCmbMoeda(Combobox cmbMoeda) { + this.cmbMoeda = cmbMoeda; + } + + public Checkbox getChkEmitido() { + return chkEmitido; + } + + public void setChkEmitido(Checkbox chkEmitido) { + this.chkEmitido = chkEmitido; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java index 995fe221f..4f47b72a3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java @@ -16,10 +16,12 @@ import org.zkoss.util.resource.Labels; import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.Tramo; @@ -29,6 +31,7 @@ import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.TramoService; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; @@ -52,6 +55,7 @@ public class RelatorioOperacionalFinanceiroController extends MyGenericForwardCo private Datebox datInicialVenda; private Datebox datFinalVenda; private MyComboboxEstandar cmbEmpresa; + private MyComboboxMoeda cmbMoeda; private MyComboboxParada cmbParadaOrigem; private MyComboboxParada cmbParadaDestino; @@ -208,9 +212,18 @@ public class RelatorioOperacionalFinanceiroController extends MyGenericForwardCo parametros.put("nomb_empresa", ((Empresa) cmbEmpresa.getSelectedItem().getValue()).getNombempresa()); } else { parametros.put("nomb_empresa", "Todas"); + } + + Comboitem itemMoeda = cmbMoeda.getSelectedItem(); + if (itemMoeda != null ) { + Moneda moeda = (Moneda) itemMoeda.getValue(); + parametros.put("MOEDA_ID", moeda.getMonedaId()); + parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo()); + parametros.put("descMoeda", moeda.getDescmoneda()); } - parametros.put("TITULO", Labels.getLabel("relatorioOperacionalFinanceiroController.window.title")); + parametros.put("TITULO", Labels.getLabel("relatorioOpe" + + "racionalFinanceiroController.window.title")); Relatorio relatorio = new RelatorioOperacionalFinanceiro(parametros, dataSourceRead.getConnection()); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java index f78e0db22..7c0fb6625 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java @@ -38,6 +38,7 @@ import org.zkoss.zul.api.Row; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.GrupoRuta; +import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioReceitaDiariaAgencia; @@ -61,6 +62,7 @@ import com.trg.search.Filter; */ @Controller("relatorioReceitaDiariaAgenciaController") @Scope("prototype") +@SuppressWarnings({"unchecked", "rawtypes"}) public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; @@ -98,6 +100,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom private Textbox txtPalavraPesquisa; private Combobox cmbEstado; + private Combobox cmbMoeda; private Combobox cmbEmpresa; private Combobox cmbPuntoVenta; private Combobox cmbTipoPuntoVenta; @@ -319,6 +322,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom * @throws Exception * */ + private void executarRelatorio() throws Exception { Map parametros = new HashMap(); @@ -402,7 +406,14 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom else filtro.append("Data da Venda;"); - + filtro.append(" Moeda: "); + Comboitem itemMoeda = cmbMoeda.getSelectedItem(); + if (itemMoeda != null ) { + Moneda moeda = (Moneda) itemMoeda.getValue(); + parametros.put("MOEDA_ID", moeda.getMonedaId()); + parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo()); + filtro.append(moeda.getDescmoneda() + ";"); + } parametros.put("FILTROS", filtro.toString()); @@ -477,4 +488,12 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom estadoList.setData(lsEstado); } + public Combobox getCmbMoeda() { + return cmbMoeda; + } + + public void setCmbMoeda(Combobox cmbMoeda) { + this.cmbMoeda = cmbMoeda; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java new file mode 100644 index 000000000..4554318cf --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java @@ -0,0 +1,46 @@ +package com.rjconsultores.ventaboletos.web.utilerias; + +import java.util.List; + +import org.apache.log4j.Logger; +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zkplus.spring.SpringUtil; +import org.zkoss.zul.Combobox; + +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.service.MonedaService; + +public class MyComboboxMoeda extends Combobox { + + private static final long serialVersionUID = 1L; + + private static Logger log = Logger.getLogger(MyComboboxMoeda.class); + private MonedaService moedaService; + private List lsMoeda; + private Moneda monedaDefault; + + public MyComboboxMoeda() { + super(); + + moedaService = (MonedaService) SpringUtil.getBean("monedaService"); + lsMoeda = getListMoneda(); + + this.setAutodrop(false); + this.setAutocomplete(false); + BindingListModel listModelMoeda = new BindingListModelList(lsMoeda, true); + MyComboboxMoeda.this.setModel(listModelMoeda); + + if(monedaDefault == null) { + monedaDefault = moedaService.obtenerID(1); + if(monedaDefault != null) { + this.setValue(monedaDefault.getDescmoneda()); + } + } + } + + public List getListMoneda() { + return moedaService.obtenerTodosSortedByID(); + } + +} diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index fe03f4741..b4cbb6460 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -1400,6 +1400,7 @@ busquedaMonedaController.btnCerrar.tooltiptext=Fechar busquedaMonedaController.btnPesquisa.label=Pesquisa busquedaMonedaController.lhId.label=ID busquedaMonedaController.lhDesc.label=Descrição +busquedaMonedaController.lhCve.label = Símbolo busquedaMonedaController.txtNombre.label=Moeda # Pantalla Editar Moeda @@ -9319,3 +9320,5 @@ editarOperadoresDispositivoController.btnBorrarUsuario.tooltiptext = Eliminar editarOperadoresDispositivoController.btnSalvar.tooltiptext = Salvar editarOperadoresDispositivoController.MSG.naoAdicionadoItemNovo = Não foi adicionado ítem novo na lista editarOperadoresDispositivoController.MSG.suscribirOK = Usuario do dipositivo alterados com sucesso + +myComboboxMoeda.label.moeda= Moeda \ No newline at end of file diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 9c8aecd7d..da6f02ec2 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1357,6 +1357,7 @@ busquedaMonedaController.btnCerrar.tooltiptext = Cerrar busquedaMonedaController.btnPesquisa.label = Búsqueda busquedaMonedaController.lhId.label = ID busquedaMonedaController.lhDesc.label = Descripción +busquedaMonedaController.lhCve.label = Símbolo busquedaMonedaController.txtNombre.label = Moneda # Pantalla Editar Moneda @@ -1839,7 +1840,6 @@ editarPuntoVentaController.lbCheckDepositoAG.value = Depósito editarPuntoVentaController.lbCheckAdiantamentoAG.value = Adelantes editarPuntoVentaController.lbUTRRepasse.value = Repassa UTR -editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label=Imprimir QR Code Taxa de Embarque Rodoviária TTL # Fechamento Conta Contábil Agencia editarPuntoVentaController.puntoventa.label = Agencia @@ -9266,6 +9266,8 @@ relatorioVendaConexaoRuta.puntoVentaSelectedList.codigo = Código relatorioVendaConexaoRuta.puntoVentaSelectedList.nome = Nombre relatorioVendaConexaoRuta.lbAgencia.value = Punto Venta +myComboboxMoeda.label.moeda= Moeda + # Configuracao Gerador Contrato diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 027d57f5a..b72434fa6 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1552,6 +1552,7 @@ busquedaMonedaController.btnCerrar.tooltiptext = Fechar busquedaMonedaController.btnPesquisa.label = Pesquisa busquedaMonedaController.lhId.label = ID busquedaMonedaController.lhDesc.label = Descrição +busquedaMonedaController.lhCve.label = Símbolo busquedaMonedaController.txtNombre.label = Moeda # Pantalla Editar Moeda @@ -2079,8 +2080,6 @@ editarPuntoVentaController.lbQSA.value = Q.S.A. editarPuntoVentaController.lbTipoSocioAdministrador.value = Sócio Administrador editarPuntoVentaController.lbTipoSocioProprietario.value = Sócio Proprietário editarPuntoVentaController.lbTipoProprietario.value = Proprietário -editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label=Imprimir QR Code Taxa de Embarque Rodoviária TTL - # Fechamento Conta Corrente Agencia editarPuntoVentaController.puntoventa.label = Agencia @@ -9207,8 +9206,8 @@ relatorioOperacionalFinanceiroController.lbDestino.value = Destino relatorioOperacionalFinanceiroController.lbTramo.value = Trecho relatorioOperacionalFinanceiroController.lbNumTramo.value = Num. Trecho relatorioOperacionalFinanceiroController.lbTipoGratuidade.value = Tipos de Passagens -relatorioOperacionalFinanceiroController.lbDataIniVenda.value = Data Inicio -relatorioOperacionalFinanceiroController.lbDataFinVenda.value = Data Fim +relatorioOperacionalFinanceiroController.lbDataIniVenda.value = Data Corte Inicio +relatorioOperacionalFinanceiroController.lbDataFinVenda.value = Data Corte Fim relatorioOperacionalFinanceiroController.btnPesquisa.value = Pesquisar relatorioOperacionalFinanceiroController.btnLimpar.value = Limpar relatorioOperacionalFinanceiroController.lbNumRuta.value = Num. Linha @@ -9943,6 +9942,9 @@ relatorioGratuidadeAGEPANController.lbPrefixo.value = Prefixo relatorioGratuidadeAGEPANController.lvVenda = Venda relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente +myComboboxMoeda.label.moeda= Moeda +relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente + # Configuracao Gerador Contrato configLayoutGeradorContratoController.window.title = Config Layout Gerador Contrato diff --git a/web/gui/catalogos/editarMoneda.zul b/web/gui/catalogos/editarMoneda.zul index e23884528..94cb6d312 100644 --- a/web/gui/catalogos/editarMoneda.zul +++ b/web/gui/catalogos/editarMoneda.zul @@ -36,6 +36,12 @@ value="@{winEditarMoneda$composer.moneda.descmoneda}" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/> + + + + diff --git a/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul b/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul index fba787c52..26060c299 100644 --- a/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul +++ b/web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul @@ -6,7 +6,7 @@ @@ -96,6 +96,8 @@ + + @@ -125,14 +127,28 @@ - + + + + + + + + + + + diff --git a/web/gui/relatorios/filtroRelatorioOperacionalFinanceiro.zul b/web/gui/relatorios/filtroRelatorioOperacionalFinanceiro.zul index 290f34e16..0e4aabb99 100644 --- a/web/gui/relatorios/filtroRelatorioOperacionalFinanceiro.zul +++ b/web/gui/relatorios/filtroRelatorioOperacionalFinanceiro.zul @@ -7,26 +7,26 @@ - - + + + + - - + @@ -37,13 +37,17 @@ maxlength="60" mold="rounded" buttonVisible="true" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" model="@{winFiltroRelatorioOperacionalFinanceiro$composer.lsEmpresas}" /> + +