From a755d2afe8c9936b4e4507bb9c7cea3d7003b8cc Mon Sep 17 00:00:00 2001 From: bruno Date: Tue, 3 Sep 2013 16:20:56 +0000 Subject: [PATCH] Casos 4448 e 4456 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30530 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTaxasLinha.java | 2 +- .../relatorios/negocio/CalculoImposto.java | 7 ++++- .../templates/RelatorioResumoLinhas.jasper | Bin 111340 -> 111356 bytes .../templates/RelatorioResumoLinhas.jrxml | 26 +++++++++--------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java index 259f3453a..c14e668e1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java @@ -75,7 +75,7 @@ public class RelatorioTaxasLinha extends Relatorio { try { if (fieldName.equals("IMPORTETAXAEMBARQUE") && this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE") != null && !this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").equals(BigDecimal.ZERO)) { - valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), idEstado, puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE"), BigDecimal.ZERO); + valorIcms = CalculoImposto.getValorImpostoRelatorioReceitaDiaria(this.relatorio.getConexao(), idEstado, puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE"), BigDecimal.ZERO); return this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").subtract(valorIcms); } else if (fieldName.equals("IMPORTEPEDAGIO") && this.resultSet.getBigDecimal("IMPORTEPEDAGIO") != null && !this.resultSet.getBigDecimal("IMPORTEPEDAGIO").equals(BigDecimal.ZERO)) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/negocio/CalculoImposto.java b/src/java/com/rjconsultores/ventaboletos/relatorios/negocio/CalculoImposto.java index eaccc2db3..58700e66d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/negocio/CalculoImposto.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/negocio/CalculoImposto.java @@ -138,8 +138,13 @@ public class CalculoImposto { String estado = rs.getString("NOMBESTADO"); String empresa = rs.getString("NOMBEMPRESA"); - if (!isBuscouConfig) + if (!isBuscouConfig) { + if (!rs.isClosed()) + rs.close(); + if (!stmt.isClosed()) + stmt.close(); throw new ExceptionConfiguracao("Não foi possivel obter a configuração de imposto para o estado: " + estado + " empresa: " + empresa); + } } ; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper index 0d6fe00da959b1c48df56b7067da3490b68a4146..75fceb45ea41676f8297631d554bd1e7f7c5e4c4 100644 GIT binary patch delta 3422 zcmchZU2GIp6vyZ6mTuc6E&ZakDHP}yZFgID`?0&V-NFJ(Tc9l2tq3u&w4p*{?FVfM z7@&Sd2n3DJ!;K9_`(TJo#I_nIkyNPoU`#}PQ1qcj0>lRlG12&h#<}O5ZfDyYAKiyD z=idLB`~S_EnLGR2z4V9o(x)8vv(kLEKJSU)W12_zIUfC};r{VD@p?97WH`cmBe8I6 zL`HtbIPH|S{am;!cz_f;&M6E%aZwW=#t0HE;ucZ*XU@pRKQg`tkT1Y5>ZeI zyF!H~O%{f{K_rW6+KtXZ^OqC~NoZd#i0|BxpH54Nx$4FIn@T8#Jbl_#Eefk(9$flF zbB$Q)<#;?5&4-;3wgtw8wB(VNa^Uo&>Vz9PK$r`?FU2^9}GU z+q?Ww32w3556z)>q&V5@c>@EeBbW|;4%0>AG=;GDuS@a zgp#udg0R+vIu!&@XhuR|m{LHIs(>Papg5OMkMIfRUV=Nz-i2Ld3O9zQ8lj&X^Jn8? zV?LJ*7-kg=q$(IlAO_B{F`Q##X044WZ-QBHiQ7%^R{6a2#BfXDiGrScAm2eX^W;J& z(YD7qy4)~G^Aor(Y(AIS_*`~{p_-qG+3-TU z;FR3E8^)ZgB|C;(1v{w7qt;5kY;6{S#Eg%k=BhD`@;hqbd+@;x%yR*ZCY_c7eUyXCCXC;CeC-)GXq zFWaEq6_k7!{0cr&C0~V!q$O*E3QVdcAqA6!<(Pi)MZ~|>d z;8^cKtY>)ixq)51{YSfo6TZ4Y(C2Rq)CIitfkbVczt$HpZnnd$y)3e?GqO7#jwW_? zfR_7AZ%^Oh#GY_GZvJ&`k459gWC!en!U7Uvk*$&T&Tt|gX?-#l73-o;fW>7?DSe$RkGN5h2EPXv>svG|O<4 vmk5p~8P5MU!~LKABRF#WkIo6RbFUf4J_N75s8IPhj)-@&V6FIJ23G$IUv4&Y delta 3486 zcmciEUrbw790&0GYd1jdTrow02xEiJPy{UWFaPOCEevX*)H%&!VWDnhNSVO02bC>4 zA0%03ZsH+E9*8lpvYEdH6knc$1T7iE~h3&uyYc+dHrTh4*2kMi)#J-_ei zJs-~f)Be4dx4D*gEq?>xy1Ma!mt3iU{p7m?aE^49fl7KR`H_CF61D)F-yDK*b_9Oy z>_sOTsDk5|T(5%Dc=SXyoWMCDHm9W;ipl5I;KTT@YV#w{xnLT5KbuGTvxi~X4*Rum zs*F^*p72V~U^rBI|Tx#~%E zEv!NnfhS>6t)nMp#f2+l!(wGIkX9B0X=Mz^BXv*?F6~ZxIXPMf??IKe*w#Rt_2ABT zv;V1dRl!zjXrg-8q}kr+rK3{W&IiZ&YI92Z?_ z+9^6uMXXGr2pbk6F_1)JAc-(Q(Ud5Ci8h-pC7Cc3lJ*cdjmLa21R(?Ub_nX!YZS%GRfZbHh6PFtB$OCP8^iQoG zQxx@fLfY6CdL!NIgq~S25GpN&4{+hQ@TI~66?TiHKom)VC^CZ`_l@0Hm)$toE*Rpj zhOlvi?=x@kdVUdq44eB0uhK6P|EyX}?W{N~?3h~E#Xz!)fn?{wH&_4l2(*C9O-ZcOSdcI!OHnwSxu7Vyxo(^*VQ?-65(WeI@EsMeRSkU-4dUME zk(1-xXg-~4jkY*mM!KR<@@@ozt^i${6`utYQ_8IC!($7d7)U-0cKdwfrwG)8FDD_M zrwvMkQdsG>pkT@m6ZVt4yMS#V+)QL zNE{4ya|X6KjXefuz~DTtpXz}Q2p0VC;LEQSMQO0DfZ|T1$490!uZ(39>8Y8QGyP)| zr$?qzjox6u?`aMMnw$NhlsDMa?A2F$;g-E%AUre_jz)UPtER3%-Y_HeY8if{Y=>&eN0Ds%LU_iaP+o0 z$9~G_ZjYXqMt#QUx7^HjY4j8w=|vyHDCnhc!0-8vJLXJVrID=@bq-#0wiF|~_lN$6qL~+>VxEt>y4x1boS>U+;bN>*B iEB?pM5o6~r>lZ%-kG-_m>IR%vnzY9Ja&mteO8x - +