From 1d6ed9fb69a8258425428db8eb52f05ee9214f52 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 16 Aug 2018 17:56:01 +0000 Subject: [PATCH] bug#11600 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@84314 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDevolucaoBilhetes.java | 227 +++++++++++++----- ...elatorioDevolucaoBilhetes_pt_BR.properties | 4 +- .../RelatorioDevolucaoBilhetes.jasper | Bin 71172 -> 72062 bytes .../RelatorioDevolucaoBilhetes.jrxml | 35 ++- .../utilitarios/DevolucaoBilhetes.java | 21 +- 5 files changed, 207 insertions(+), 80 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 8d815bc2c..d0d68e944 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -8,6 +8,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Estado; @@ -17,8 +18,10 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import br.inf.portalfiscal.bpe.TBPe; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioDevolucaoBilhetes extends Relatorio { @@ -94,10 +97,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { DevolucaoBilhetes db = new DevolucaoBilhetes(); db.setAidf((String) rset.getObject("AIDF")); db.setNumFolioSistema((String) rset.getObject("NUMFOLIOSISTEMA")); -// db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE")); + // db.setSerieSubSerie((String) rset.getObject("SERIE_SUBSERIE")); db.setSerieSubSerie(isBpe ? (String) rset.getObject("TIPO_SIT") : (String) rset.getObject("SERIE_SUBSERIE")); - + db.setFolio((String) rset.getObject("FOLIO")); db.setUf((String) rset.getObject("UF")); db.setEstado((String) rset.getObject("ESTADO")); @@ -134,84 +137,163 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { db.setIsenta(rset.getInt("ISENTA") == 1); db.setTotalBilhete(rset.getBigDecimal("TOTAL")); + String xml = null; if (isBpe) { db.setChbpe((String) rset.getObject("CHBPE")); db.setChbpeSubstituicao((String) rset.getObject("CHBPE_SUBSTITUICAO")); + + String xml_bpe = rset.getNString("XML_BPE"); + String xml_bpe_2 = rset.getNString("XML_BPE_2"); + String xml_bpe_3 = rset.getNString("XML_BPE_3"); + String[] array = new String[3]; + array[0] = xml_bpe; + array[1] = xml_bpe_2; + array[2] = xml_bpe_3; + + xml = StringUtils.join(array); } db.setValorIcms(BigDecimal.ZERO); db.setValorIsenta(BigDecimal.ZERO); - boolean isEstadual = rset.getInt("IS_ESTADUAL") == 1; - db.setEstadual(isEstadual); - - BigDecimal valorContabil = BigDecimal.ZERO; - if (isEstadual) { - if (db.getIndPedadioEstdual()) { - valorContabil = valorContabil.add(db.getImportepedagio()); - } - if (db.getIndSeguroEstadual()) { - valorContabil = valorContabil.add(db.getImporteseguro()); - } - if (db.getIndTarifaEstadual()) { - valorContabil = valorContabil.add(db.getPrecioPagado()); - } - if (db.getIndTxEmbarqueEstadual()) { - valorContabil = valorContabil.add(db.getImportetaxaembarque()); - } - } else { - if (db.getIndPedagioMunicipal()) { - valorContabil = valorContabil.add(db.getImportepedagio()); - } - if (db.getIndSeguroMunicipal()) { - valorContabil = valorContabil.add(db.getImporteseguro()); - } - if (db.getIndTarifaMunicipal()) { - valorContabil = valorContabil.add(db.getPrecioPagado()); - } - if (db.getIndTxEmbarqueMunicipal()) { - valorContabil = valorContabil.add(db.getImportetaxaembarque()); - } - } - db.setValorContabil(valorContabil); - db.setPorcMunicipal(rset.getBigDecimal("PORC_MUNICIPAL")); db.setPorcEstadual(rset.getBigDecimal("PORC_ESTADUAL")); - BigDecimal baseCalculoIcms = BigDecimal.ZERO; - BigDecimal valorIcms = BigDecimal.ZERO; - if (db.isIsenta()) { - db.setValorIsenta(valorContabil); - } else { + if (isBpe) { - BigDecimal redBaseCalcIcms = BigDecimal.ZERO; + ExportacaoBPEVo exportacaoBPEVo = new ExportacaoBPEVo(); + TBPe tbpe = null; + if (StringUtils.isNotBlank(xml)) + tbpe = exportacaoBPEVo.convertXmlToBpe(xml); - redBaseCalcIcms = db.getPorcredbaseicms() == null ? BigDecimal.ZERO : db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM); + String estadoOrigem = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFIni().value() : db.getUf()); + String estadoDestino = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFFim().value() : db.getUf()); + boolean isEstadual = !estadoOrigem.equals(estadoDestino); - BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms); - baseCalculoIcms = valorContabil.subtract(redutor); + String vBC = null; + String pICMS = null; + String vICMS = null; + String pRedBC = null; + String vBP = null; - BigDecimal aliquota = BigDecimal.ZERO; - if (isEstadual) { - aliquota = db.getTributacaoimportacao() == null ? db.getIcmsInterestadual() : db.getTributacaoimportacao(); - } else { - aliquota = db.getTributacaoimportacao() == null ? db.getIcmsIntermunicipal() : db.getTributacaoimportacao(); + if (StringUtils.isNotBlank(xml)) { + if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) { + vBC = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVBC(); + pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS00().getPICMS(); + vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVICMS(); + } else if (tbpe.getInfBPe().getImp().getICMS().getICMS20() != null) { + vBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVBC(); + pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPICMS(); + vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVICMS(); + pRedBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPRedBC(); + } + + if (tbpe.getInfBPe().getInfValorBPe() != null) { + vBP = tbpe.getInfBPe().getInfValorBPe().getVBP(); + } } - valorIcms = baseCalculoIcms.multiply(aliquota.divide(UtiliteriasFiscal.CEM)); + + // db.setPrecioBase(rset.getBigDecimal("PRECIOBASE")); + // db.setPrecioPagado(rset.getBigDecimal("PRECIOPAGADO")); + // db.setImporteoutros(rset.getBigDecimal("IMPORTEOUTROS")); + // db.setImportepedagio(rset.getBigDecimal("IMPORTEPEDAGIO")); + // db.setImporteseguro(rset.getBigDecimal("IMPORTESEGURO")); + // db.setImportetaxaembarque(rset.getBigDecimal("IMPORTETAXAEMBARQUE")); + + // BigDecimal valorContabil = StringUtils.isNotBlank(xml) && db.getTotalBilhete().floatValue() > 0 ? new BigDecimal(vBP == null ? "0.0" : vBP) : db.getTotalBilhete(); + BigDecimal valorContabil = new BigDecimal(vBC == null ? "0.0" : vBC); + db.setValorContabil(valorContabil); + + BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC); + db.setBaseCalculoIcms(baseCalculoICMS); + + BigDecimal icms = new BigDecimal(pICMS == null ? "0.0" : pICMS); + db.setAliquota(icms); + BigDecimal valorIcms = new BigDecimal(vICMS == null ? "0.0" : vICMS); db.setValorIcms(valorIcms); - } + BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC); + db.setValorOutras(outras); - db.setBaseCalculoIcms(baseCalculoIcms); - db.setEstornoEstadual(BigDecimal.ZERO); - db.setEstornoMunicipal(BigDecimal.ZERO); + db.setEstornoEstadual(BigDecimal.ZERO); + db.setEstornoMunicipal(BigDecimal.ZERO); + + if (isEstadual) { + db.setEstornoEstadual(valorContabil); + } else { + db.setEstornoMunicipal(valorContabil); + } - if (isEstadual) { - db.setEstornoEstadual(valorContabil); } else { - db.setEstornoMunicipal(valorContabil); + + boolean isEstadual = rset.getInt("IS_ESTADUAL") == 1; + db.setEstadual(isEstadual); + + BigDecimal valorContabil = BigDecimal.ZERO; + if (isEstadual) { + if (db.getIndPedadioEstdual()) { + valorContabil = valorContabil.add(db.getImportepedagio()); + } + if (db.getIndSeguroEstadual()) { + valorContabil = valorContabil.add(db.getImporteseguro()); + } + if (db.getIndTarifaEstadual()) { + valorContabil = valorContabil.add(db.getPrecioPagado()); + } + if (db.getIndTxEmbarqueEstadual()) { + valorContabil = valorContabil.add(db.getImportetaxaembarque()); + } + } else { + if (db.getIndPedagioMunicipal()) { + valorContabil = valorContabil.add(db.getImportepedagio()); + } + if (db.getIndSeguroMunicipal()) { + valorContabil = valorContabil.add(db.getImporteseguro()); + } + if (db.getIndTarifaMunicipal()) { + valorContabil = valorContabil.add(db.getPrecioPagado()); + } + if (db.getIndTxEmbarqueMunicipal()) { + valorContabil = valorContabil.add(db.getImportetaxaembarque()); + } + } + db.setValorContabil(valorContabil); + + BigDecimal baseCalculoIcms = BigDecimal.ZERO; + BigDecimal valorIcms = BigDecimal.ZERO; + if (db.isIsenta()) { + db.setValorIsenta(valorContabil); + } else { + + BigDecimal redBaseCalcIcms = BigDecimal.ZERO; + + redBaseCalcIcms = db.getPorcredbaseicms() == null ? BigDecimal.ZERO : db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM); + + BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms); + baseCalculoIcms = valorContabil.subtract(redutor); + + BigDecimal aliquota = BigDecimal.ZERO; + if (isEstadual) { + aliquota = db.getTributacaoimportacao() == null ? db.getIcmsInterestadual() : db.getTributacaoimportacao(); + } else { + aliquota = db.getTributacaoimportacao() == null ? db.getIcmsIntermunicipal() : db.getTributacaoimportacao(); + } + valorIcms = baseCalculoIcms.multiply(aliquota.divide(UtiliteriasFiscal.CEM)); + db.setValorIcms(valorIcms); + } + + db.setBaseCalculoIcms(baseCalculoIcms); + db.setEstornoEstadual(BigDecimal.ZERO); + db.setEstornoMunicipal(BigDecimal.ZERO); + + if (isEstadual) { + db.setEstornoEstadual(valorContabil); + } else { + db.setEstornoMunicipal(valorContabil); + } } lsDev.add(db); + } setLsDadosRelatorio(lsDev); @@ -257,10 +339,20 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" NVL(EI.INDTARIFAMUNICIPAL,0) AS INDTARIFAMUNICIPAL, NVL(EI.INDSEGUROMUNICIPAL,0) AS INDSEGUROMUNICIPAL, NVL(EI.INDTXEMBARQUEMUNICIPAL,0) AS INDTXEMBARQUEMUNICIPAL, NVL(EI.INDPEDAGIOMUNICIPAL,0) AS INDPEDAGIOMUNICIPAL, "); sql.append(" NVL(EI.INDTARIFAESTADUAL,0) AS INDTARIFAESTADUAL, NVL(EI.INDSEGUROESTADUAL,0) AS INDSEGUROESTADUAL, NVL(EI.INDTXEMBARQUEESTADUAL,0) AS INDTXEMBARQUEESTADUAL, NVL(EI.INDPEDAGIOESTDUAL,0) AS INDPEDAGIOESTDUAL, "); sql.append(" NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) AS TOTAL "); - sql.append(isBpe ? ", BPE.CHBPE AS CHBPE " : " "); - sql.append(isBpe ? ", BPE.CHBPE_SUBSTITUICAO as CHBPE_SUBSTITUICAO " : " "); - sql.append(isBpe ? ", CASE WHEN BPE.TIPOEVENTO = 110111 THEN 'CANCELAMENTO' " : " "); - sql.append(isBpe ? " WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL THEN 'SUBTITUIÇÃO' ELSE 'RECUSA' END AS TIPO_SIT " : " "); + + if (isBpe) { + sql.append(", ") + .append(" CASE WHEN BPE.TIPOEVENTO = 110111 THEN 'CANCELAMENTO' "); + sql.append(" WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL AND BPE.TIPOSUBSTITUICAO = 1 THEN 'REMARCACAO' "); + sql.append(" WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL AND BPE.TIPOSUBSTITUICAO = 2 THEN 'TRANSFERENCIA' "); + sql.append(" WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL AND BPE.TIPOSUBSTITUICAO = 3 THEN 'TRANSFERENCIA/REMARCACAO' ELSE '' END AS TIPO_SIT, "); + sql.append(" BPE.CHBPE AS CHBPE, "); + sql.append(" BPE.CHBPE_SUBSTITUICAO AS CHBPE_SUBSTITUICAO, "); + sql.append(" DBMS_LOB.SUBSTR(COALESCE(BPE.XMLREGULAR, BPEORI.XMLREGULAR), 3000) AS XML_BPE, "); + sql.append(" DBMS_LOB.SUBSTR(COALESCE(BPE.XMLREGULAR, BPEORI.XMLREGULAR), 3000, 3001) AS XML_BPE_2, "); + sql.append(" DBMS_LOB.SUBSTR(COALESCE(BPE.XMLREGULAR, BPEORI.XMLREGULAR), 3000, 6001) AS XML_BPE_3 "); + } + sql.append("FROM BOLETO B "); sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 "); sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID "); @@ -275,7 +367,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { /* JOIN COM TABELAS DE ALIAS */ sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID "); sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) "); - sql.append(" AND S.RUTA_ID = B.RUTA_ID "); + sql.append(" AND S.RUTA_ID = B.RUTA_ID AND S.ACTIVO = 1 "); sql.append("LEFT JOIN PARADA POS ON POS.PARADA_ID = S.ALIASORIGEN_ID "); sql.append("LEFT JOIN CIUDAD COS ON COS.CIUDAD_ID = POS.CIUDAD_ID "); sql.append("LEFT JOIN ESTADO EOS ON EOS.ESTADO_ID = COS.ESTADO_ID "); @@ -288,15 +380,20 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 "); sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID AND B.TIPOVENTA_ID = 3 "); sql.append("LEFT JOIN ESTADO ESAIDF ON ESAIDF.ESTADO_ID = AIDF.ESTADO_ID "); - sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID "); + sql.append(isBpe ? "INNER JOIN BPE BPE ON BPE.BOLETO_ID = B.BOLETO_ID " : ""); sql.append(isBpe ? "INNER JOIN ESTADO EST_BPE ON BPE.UF = EST_BPE.CODIBGE " : ""); + + sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = ") + .append(isBpe ? " COALESCE(B.BOLETOANTERIOR_ID, B.BOLETOORIGINAL_ID) " : " B.BOLETOORIGINAL_ID "); + + sql.append(isBpe ? "LEFT JOIN BPE BPEORI ON BPEORI.BOLETO_ID = BORI.BOLETO_ID " : ""); +// sql.append(isBpe ? "LEFT JOIN TIPO_VENTA TP ON TP.TIPOVENTA_ID = B.TIPOVENTA_ID " : ""); + sql.append("WHERE "); sql.append(isBpe ? " " : " B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) AND B.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 "); sql.append(isBpe ? " ( BPE.CHBPE_SUBSTITUICAO IS NOT NULL OR (BPE.CODSTAT = 135 AND TO_CHAR(BORI.FECHORVENTA, 'MM/YYYY') < TO_CHAR(B.FECHORVENTA, 'MM/YYYY'))) " : " "); - sql.append(isBpe ? " AND (BPE.TIPOEVENTO <> 110115 OR BPE.TIPOEVENTO IS NULL) " : " "); - if (isApenasBilhetesImpressos) { sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties index 9db277c43..75c91d5ee 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties @@ -32,5 +32,5 @@ label.fechorDevolucao=Dt Devolu label.impEstornarInterestadual=Receita Interestadual label.impEstornarIntermunicipal=Receita Intermunicipal label.impEstornarTotal=ReceitaTotal -label.chaveBpe=Chave BPE -label.chaveSubstituicaoBpe=Chave Substituição \ No newline at end of file +label.chaveBpe=Chave BPE Substituida +label.chaveSubstituicaoBpe=Chave Substituta \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index e0271251351f1e08a83ac0f3572a35b95bc9c732..bd032103a12d3a21768266f288d9a160fe656e18 100644 GIT binary patch delta 17949 zcmeHOd3aPsw!gPlk`9oVK*$CJf*?ysAix6`$VS)`k`P597$Hg^8%Y3Jn+!`vkVT5f zrYs^N42uxi1ROyHR2&H^?uraLDkF-5iVMC|Rku60?W=Fz_ul*Cec#}BE9cbjRQ-Nc zcR8nTxAV4>>wCykXBxRerV_(2A}TA4P9l-FuOk6{V$E)KeLK!FX&4}dbw@junzS33 z-Nn&PH`R^ql4sH`;7(KS$MKns#8chFX*_g2A-jSfxMRkTa}Q5@Hu>e}AKe|E{-U@X z-z#qNBxAOzn#%G@u#NGC@qBJM{PO~n#qP9FrUS*tUA$&;VrY!+)xj}(0y$O116|-eZX3GTT2yH6Kx7a1m z6|P%bn{&m{BQ3;Jhl%JN(NR>~y4Y;G{I&$wa;Z&@G3SVzZ`%*;x3~3+TPr(Mv)Vz4 zMwJrFlu9fUl=Rl7zmnCG4E`xZS&~QhN~=~R-Wn!)CifFJ^^0@zOesv8{=&8@mfs4~yZX9gBFb{ zEtV;@Sf)H(+Vs~_D+Z>tf~}CJYe|1D)(!|3t5UM!UXXOES>ZsZQAKB&lFl+Eoi^n< zeRqF_h|NwE{n7))=G29O>T=L4E|}3w3`^@PeocQ&EE^Ic_VjNiMx+lgmy3r6M2Z9H z8F8P=K-FAuP^3|%$TFoO%an?=>96R5yh}vkkdl~XZs;72P_(){8xIQ;dxs>2$%nfM zhfxmfhLmn83Lly(P7XUEVu$q%Q^~+7X#TKN(JAYMSen^M&D7l~=(EgJv3~do5t<(+ z7RASktYJJ%B@w6KQNvU7a^yy+X1K#fXw+dN?10ZkXh5ACE5`5K3|E_SGAB%|nb|_j z&hBCD!r!tp@(QFJ)r@hFqfrMrcECrD29z8t#!t=|5i(-1hvPBqUDVkZtcvm5iR)|dC{21L`dJ*+tDnk zO*Jzdv}x2qn;r1crU9kRit*DnL!Gsbe+?AJ^X?Y?hJ}ZzO2py13ZA=r?6dWq&RzV+ zi`$>+`|02+k^gA7+tD(qSv5->G;7pBvmNl!tO2Fjit*FDL=-%i;=)yi>)yh#9hw(7&hs2||hp%jmKg|>BKOr@6m~=u6v~r)r?a@wC^Cq4)_SsfD&TG_z8ij;T$Y2o?sD&m1MZo z?yF{!BG$eGu^sRs)_@|mV*H3<>Iu6^hWyq+BS@?CXDraMx@Dy z(4;8wOl5!9ZmCx_yOdt-JLt6oK6*8v^ja}~dSPnNyQ`|C?Z5DB5Pc`#YDSA$lZU&G zN^$zm7w=3?`t7YAH6_hFqi*%-Q!-pg_=!&FVJ zu!zn3Gh7!Wv1-mMV(mK++W{Y94JcwO#*g^CBL3UQZpK3W zb@%{w9X>#b?em%k@KuF@TwER$t3D1F&zx*2`*~)6H@QJ7Q%$ggGL1SYvjaZL?0}Cl z3-DD&fIL`j*mtvvELqcMXSiESRjO&}ph}|-s_cM|Dm&n#$^v{<8F)5nsV`=CF83tQ z*W77lyt<>}=VZ9MNrkFOa8RgG2ZeUPN1+|?QD_1F3KP_WBd+=`OVyg{4(6?O&sVQ8 z;SrWUw}+V~R?KY^wF5>%F*~7PN# z%we9ujq_T8mZS4xf+ZL1n^miTfJ*?$nUY#rvjkhS40KS<@mxM>T2K$szEu!Dpjb|A9kt z)3ZHf`E%Qdyg!G+@CkpG>y-X>@6RN zgyFp(i1OOy4}{5jH!2d&4!mTnG6K_wW@V@6B##-G<{`doRCKrp<|A@OBxeuIv@jUi z07<#onK=zmglAMh?!c_fF=@%U$+kHWoUus@W4%&#E|jbK+d_FxK3}*n@Nku3_LBF- zGh)`F2zChEg!@ImUY*2Ciw?JLD064aYak3h1>}s($xR=suZd`}`N3fw+d{9t1RAcB zhJkYKmp$Pzi?d=OoMa_ur2kGZZYGv2mI?FJ;$d<1zZ)bgH&t;H$BLVJEAE|3f+OGg z-D$+zOC(qGrJ3F3GEy^#j2JphN6R);HYu_>rbNgC%9b(neBpChb(r~6zyEvU6 z9pPEKVaS0EpADL-5`XWI&=}bdpAXtHvv&)zM(K?!?5r>R|-MWa4D{sGbF z4<)qL!kSKj&)rI!{v;_E`Fp!!BM(#LYAHFPb(jl1@{yc|G~tsi5^6b5gW@|2FgVw%O*~qTEF@4S|QK>vK4Xc4}v~fF&=`3 z)kghM(3)B~(`&VDY|HVzl5BexrS`1v!{IRG_J>=W^&qZ=SoZKJGg;(UwiUrEW6bd? z?G0F&kyi}*scI&u2ZPU-Od2TGfc^cl4`5Gw79cim31xa}A>W?T2{N~t6GZ)vP;tkq zm&_R=L9=l_z2K|5@4ChyQ0L}M_P)BYet#*;zRfpQ(jGi zZj)zOy}6|`)NV9c+reC+ip-H~+k(K2ZR5pX)^>&OtLiuO%zH%2RLx2UnHqJFX$O2{ zYCy@fOpuA_N|Cs?wYfxG9vUs)ePpDR(IZj}do(rgFH(SN9KLYUz+W5$=wTZ05ugDn zAi|1)%Ua#_@K-&O=~gJ2LJ?gelH;RA+PeF!v-a*f&!!xbnpCq-54Bgp8aU*jNe^?- zqye=lmZ>&npKVhDHWXPhHg539cvZ?!%}ECt8g-Ci2Yj|h14@QvDj6p&8FDvHZ=7k# znDLlL#yKfNHSamd(5Qn9JK!Tj14@QvDjDzDWNh0sU0xz>TZy#C_gYu#FH(kTE;-21 zsDlhU;3Go=N`_@B8JBD)<=W=k;LfTa(n4fCp>Lg5LOiiQh&2N(x(O7qTSHrE-=EzI z6dxb-jjps0h?tI8&two!io;4Tm^sITD zRG^wMN`dwr6lg#xu*di)uwtZwF}5|Y-8I|V>j6*Q>zXPVRa2oDweP^F0mW#K@nN)L zBx8kb%~N+TuoyeB;>_z#y7UIh~eHE^7JudaAX1&s*eFr@nPG3SLQ8qj(R7k zey*_WnMl`LQiy8KN+H^OOYAz>*<-?*Gj)`f=R>Ull@RSeVqs@xc7)=bLaA6>s0XSp zNq1JUmmg#Ze!nvI8U4D9U69auB|@1OKt#L7@Lpf`TRn3BwdtTm1O8ghi}XWX%=30q zaVW#}t(;dimldh@?W9%@klw6K2T~1G!d!;W23(e_l?-2s*@q*|%XapIhx@nVa#^Zj z*Y&jas=z{}7`NU5t4D|0Gmj5oKQ|WOFYUTl8hm@F&d-=!{TW*SdPk~OG3tbgmya|R zSbdNxH2KDtT0So`&8n7Hk)DIVyNzoy1T%cZF%(qU;D6~kW&9jr}< zHQ525HCX^CQ|nR+C0nHWvi9QhVd9DBQl*yRC!z#9+CT0liK?c(gBFb{E!uR@Vh4P* zSb(3F_Uawl_!mP&@UbCM%h$n?;{IbDAP;RkmgL!}%f~X}WRBvh>E$3!qe`4M9mLrI zA8{7oC$5(g_s`>D;@9VMJX%U$$cW33T2zznphcrfi#8p!*a06c7T~8PU1=#i875}F zc&A6pH!o(yjgVSYqhHeaeB9E&2&F{_I%u&2K3XimPfL!{a_*(DJoD zswr^T5{)Vu+H{a%2Yh5$fS-&4B_nNBh?sIR*Rv&`p3I1wB(H0gf|pd~nEIHGuu&^rEf*BU}ILw*C{g{zJC@T^*k`9@}Sb ze$L!7bPIKF1b4Y|w}LBt!1>@k;SHVY;}wCo&WqjU;|&FGl^5&l<0XRkq!(-J26vCw zZPws5gzYnT4BbM0gpO^VK=Mx???dpOQP?_&JPqDq<-v-`G4S?zv8NB2yGBCKQyM>D zinp)CxEFK`HIMBxk3;wjFi&c;9O5qQGhb30MeYIbyw}SG?^CbW9|pam2i*+7b}xAs zAFma7pLqv`fcK&DLg7RZ4DM+Uh_8y8t1;u>g1)ofzL&sz*Xtbu&es$tehSQbZEl8` zCHu@X&zZ1xyb^#nH1Hq*qZDu!fZ5=cd%bcI^j*84K@j|b4(=;%{jSALH$ulpx+4nA zkF^;LL+5#iA~}&r{x0-J^tm@2$@4MY6N644GS80OZ=N5z1--cPH3Y8(U;nP9xo~A5 zHam_R1EaoDGb6dD&#CpnSw#K8TcJ1dxDgO)UfyB^LhQFXwgZ?~wHX8E_u9Mx%xl`@ zVE&{`^Jg*V`~%Dg zokerlPpFz*NAr0ATEK(QLLQD5@kq3kw?oT#2eg8BN42~sTFsNu8lHyM@l3RyXQNGg zGV79HTL&|$s_9pO))qi+5JI>t|+6GU2bV~Dh zI;D9$E2Vi{ozj#Cm&cR)lx0t8R-l#AJf2Qz(rZX*(rZX*9;_jyDg1!xuG??!3pL?x zJq(NwE5@zh>@%N(Jo87n4t2EWI*+GwoyYUbbskkZ*Ma9&B6YI!jMB-@-nhay>Si5Bguoho1R_s@?Fh%G-_6T!89+>q6VoE4lc zMq_Xu*AApboj?@?o=%|BlPS}!GpNVa8PwzH4C?W829+M%T2==2cshf6Je@&3o=%`1 zPbX06N%}EvP`XYjm9ESS)*|$Z9`US*g`%bqpp&a-F2CezT?$4($Ef|Ni!GVpZpJCY zz~KhM5#|OQV{XMQ&F#32>E4Umng?)u^C<3MzJNQMui`G|X`E=jgS(mU2JFI*ZgPQ7B%kn7@;RSIzTh*-C0;|m;tR>Qyp~+ytH=+0 z6S>BpAiwYzi2FJ}K@mSgF@KYC{sC>o&(R=$kv8U+Xb8VTn?d~r?-%}0D!_fHqgy`* zQsKt`0$lC&0PhX2*B-q0yqC!cm50_Kt2_kH_AbPl-{)P3r_ZVb^>FN5 z2mb#k0~76Kp#SR-x!{H}Q0?CTv<&?B>kufpbTMaLjmCfXb%^`FcpYM$HC?eK`BiK* z2Oi@i%nfv;xs~2&Zm0R?UOL7+K*yR#={WNRI^KMh7MZ7MiTMsKHQ%Qd<|nk${ESXD zFVp+YE7U#H{Dsa!2CYT`^iL>=EUKa7SX5C5_$lwrU%g@^a$EQpGDi~ zF|?OHj}Fii=y`e)9e2}HsGh!x-k|m9BYFm%r)SZR^eyxYeGfOH?_(D|hnv%naRmJY z$I(x5d-?_LMla$X^efztevMP<6tUbQMI^kcTazQMC z#IQutn)M)^SWglU6-;k-Gr5KJC26c5$zW+D6RMePHjs>FgUH=%7#Ytp$wZbzrm$Qx z4XT@YY$T~+qscaw4^_=QWG@>Fh0J~AZ*07q)U#sp4l5z=vq|Ivt04b?GUyvNm0V>r zsEf^{P1qdToK@2ZHlN0^1++a|NV~E{v>RJWC$MF-gsq^ptd_1~tLX-|hHhf(=uWnt z?q-|lDfT#hjXg=H z*m2gGonT$rE36kg#rm+*EQQsxboM42%FePZ_Aa}Fy~pliAF(Oy9Gk{2uvP36ww8U) z*0V3zW9$+;$i9MEzh$qpD=^{*_7l6tuCrfw0K3kEIO5?P^GMElJ2!8{J3v==-kA5~ zAv~Giz|(kho(Un@Jc^Iz(fn@Snos1hyp*@&)A)^iChy2=cqhJ)cjdJ_fv@68d=u}% zpWwau3%n0M!EfVdcwhb|PvsxLZ0Gm@evuF4m-tYAg%5{<4ZhE@3O4uu?mN4ER$4Kv zf=#Ct!z$P;&nnoI=iXvi6`KYAZpFs$G!P$Ubmn&(NxZ=5#S4uTey@?vCm31qeNqlD zGxB-4QNXK=Vm{d@gYTE7^XbMcKHHej7eK+*1Kt@T!>lrz*}m2bZ1`Sp-W}r?~i7!TYkItuKj&g zr_R}xbNpo|ne`^w{z(-_&8ft)teS-dRuhrH3lcOcgV_ zIhhU=mz%j^Qi3x~_o{&%JqJz^rH@D3Q^fkm|ASZ8V#V1$A!2c7r{hJLT@JAe#rDp7 zpv~#hC3b=AP|eGJglMl4VxSaaAP8xvp|6maB^mrv9)%>2?v-e+NZK1Fws$3VKarEv z-<~htOX?8&nslkA%#RrDRbmX3VhogGH1riyrUX1JM)!J&5#y5DiobX5ANwcSt(v)h zglMl4VxSaapu9X9`U;sV_9sWd+}A%|R~(Ed;z9DL*gcX;HFNw>X|JL(P*NEvsWkLm z>N%o+dV)Pb)JhRm)s@#1wfoi)M^ZY+o|2|&PWWNfUd3vlWHnH-YUs;)Lb8gQDOJV& zepSVX-FwV^#~GsdZrn==w96$+P5X2YJT#=r@e~LK*?vIM=Sz&*Kg^F+SwTR^;KmgT$J})x^7f zx*7q&eN$s=Ndc;<;YWb>iWz;K%s>zjrJ)}ICg$?05QJ)|%e|sckZ7FNN_1RPCD4-3 zFRP|pV14CZPD_rBlKiTP^uw>cir+xF02=z?Hx5_99U~rT`{76SJA28F)?mH#~}3te>h0)>$3xr#k&5- zMC7bc@zcQ8X3oijQey|nIjd%XpE+xs9W4c@W|SWR+N%T@CguPrgjT z7fvd&YD_H7>zoBZIAv#*?82hV zto)u?roYR`$ZE156_2fq43<5PvDssC@(YG!Pb~6a36idWDVe$X1wF^)6`C>YMn!8! zcHX3d?7~dX^tI&(ZXA^yAh*w`Fpvvl^~^w7e!;~26e+McGq*A|gdQ4YW=3T;r?~lv zlU3%@dbOxR5515&RK{0RuH<}}$>{MOi9N=p7Z(*|dQ3-4(o4`SdrE$8@t91HwX7x6 zGQF0SI`p8?nT6TOnYm+%bMw8INMC@=-0_o(^WAF-8uis0lQVi!c4aP@^y$&z>T-sZ z+hev+gl>tNRT_%3Iq%mf)z1&RRBjjh1(Dg=DZW@4B)&KpAWn`CvO`qex<5YEQ5OQR zYQn^hX-=kX(f?UDtd-}6>kFM>Ismq(-n$aWEsMj%fp?pUAD-&o0Ns?2booHh|CHw2 zmNoTz%d#!GAAc4Z6FS*QET1sg5hn*%l}(_yGoe}a+A6P?@|4^J`!S_>QEsxMql{He zd!<<0O0j`bv4K*thEk_gVo9JBw^xc^$eUo22TW{ar;1mn$B2OwgG}GdiOG&Wl2A3h z6rr{ip@EXnKuM^fr12)~r3j1ipEAks<)=C_WOCI!p^|G`B{xteH&7C zb<&F_`SX)g9phwj)nu#W+E&R8l*tX0$u;y%o^6uX5=8~YhJX~NI^_1kswq?i+ExSx z0s&P})OySru49XR2@2f=_X}OuqqHd5@q#2!%?w4LZAD<9oPmLI1{(Sj%us7zP(0eG zzfs)CULZoJMDvI5kxMhHib+$PaA(OHxMoVKW4RQenx#sFwv`A2r3eG12n~HjEL9?w zOwDWdFWe()?@WVRC{V;KYFQ1L-6VUeiOfYU#G0q;I5tUX=I+`5bSr;%k8@grU7_YO za$2fmuN$8&oQr{SE*kpI1%|`8ll=NKsg4sexoVE9zS&_o=)P1s-eey+Bh|qmIZ+J}J7zeuw5^{*V?9pVI)-V-gx_*_ zp3Pk&K!?{;jR29{2r~zH-ATu0CfGr0*EwHEb%aV;stH!IwCzWhr^8E@r^8E@arnpz zR`*)KtUnkTC9@jY4azsqT4lqXojw{f3JFH4$+nxkPJ6LQx8(d9E zLjtlESuI3D=ScBjc36EAQmt3gzJX#mFvvb`PCdvzdrs6K zGqk22GqP{e(2>dMgVQ`l%WV;;k`WVJ+XQz@8k970VEW(z$te$$)e|9eYXVWDxshC} zjRy(!#8Y!aB3x=smOkmpNqt-i#A|aSVAy+e8-TvQ&W(+FNZ+8IeN#q0nV#m3k9nyc z#CLhAzM*LjuZSYVi!X&j@0ypQAYH3@KURM#b4q6O;-c}n&AVk5WxHrTeq~t-ROP z68bfoRe%DK+IcV&UjFd7(V|y}d9ke9vzOg)EXmgBSG)Kk(Z@ z@2jADi_%+4jmhbK2KP`{_@y!SE|0!AkY4s&x zzex%~LzlD&(@6tOQuRm6@1#AoM5cZ4`)N~`K9pAfP4hcx-(Q*tX}@1u_xIGcUnYa{ zmW9C*!4igfEg`w$KE{NIoBf>P^s-Qh{$^Q27AG%FRllqB`0`dnE`YEnM^=?#zY}|W zc@88@SW)-)5MIh0BWwe@Ps3=@H%#IUh zR(7$|M6FesjsXxrRnt%GD04<>Tiu$LXWi8?14P1F?->yn zFaViTi?w@G3(-|{!68`=>YU9?9ft!fS_ zT5bEG)ec4L8RJE3VifHmH|;Bbd`4d722mnz(=NTO9A8OV)tpnb+V(@M9g5a7#*5a( zDB5!#%l!G~$6>eM91<#8ZqYkCN=(_ZCy@Ru*;Vs{V%N4GcI{B?o-tnRCPuOU;K6=p zYl2}<`jcdrx48I|Uia1wSvAn0n<|>v^IMwnikojaUGVaI&L}-bhkI%;F^k`cu&a0| zIQ(XNqoB@PE(PP>ax0MUq?u~M{V330rNBU`Ktn$Yv_mQgcVGBr+e*!aZ}av$v5!eQ z)im=%r@e~KKuM>eA3E)jbj>^_T)y44WS`&pyt&9t%E!hImvpKb>SwartLO}rbQ=1h(+){D)MK(wzB3yLFTb-y zy{Bff+_MRO$dqG}A~R5uY3PScJ0#fz531>T!U@7;Y5B3DxB5D&K6kR!e#E^dRllah83^JMHS{CSI39kgv(->e=NQt=_mX3` z%CxH4?1xl)B`H-K~o)bLQ(5pKh)acOMP54+TYAR?m<0ee`@SSNv)a-eyFuq zQ5y)e?x3L`YVGi)zTmnR{~~$yFmJ_j0z=5b3d=r&}+F=j$8e z5R;EO!*nvq=*7(~^|I`IMlCV>NOu?eH%C&%lZW)D^=gNM#6LdhDP2i_?h5roo<;xo z=i08=bAL`9BFhU`jh~OP+7abPw;rY)Ub?kI={7Mwx+B&5ui_&?;>yv1E-n3!r4DH( zwWy|v&g@yawZl|6uQk-e{Ake*rNzYfXlVjkx{6`Phr4uqdOUSV2dP6f?fmG_UhVMG z;py;N6YWqsOpK3?c4|#NJ{lyx`Y_$4CGAA&ke*VDYEu1Z(Oy4VJRM$Iv_onMH8DO~ z#MxGfqWAG2G3;c2my{1rrVe>RN>R;VKT@>Uj}%XbmlW+#%VJ`DqzqQea{9v{apBaD zb(i$9YRk7$h1o^P`FWGZ=Vrs}oJ>%KmWZn#H4NX-xeL7Ohxh+et3X>*!l&geLpF#8 zA3y5od*YY(_CsHD)Ji<@asA-LwryLtXxrwomLn4r6WXdqY*b z6MCeoorfN=tw4`Z$oZ(w39q|qxg7A7cYGc&W{Fq64vuRkhv%W@wpH6F0LHh_;}gnH ze7!NS*5ekjux0W4cHg>N;lDS^OK+vyB|9yPor2#j=tA&=1?BKRQt+nmYY)F3@EZcZ zEcg|`uM~a@;8zB}eegRDzw_|B{Jy;=gY2=__ua(OJ#exIZYwd?F->%Ti5d{);c$8k z;FbOK=gNM1!=wKzkNyiD{U<&84|w#KH-5)@eYd^wpuMT@CR(x)%*D#w0_Jir=SyJy z(H;7%mz4+B8neX$m(?1q&2C>@buf3j%`oxgo$%COpl_?IkNn_eT>9RSYLiW9#B@T`VgAZEdC`;&t<%oVQ&$2sj-2##UOaUL8q!J6c@io~yX8wRF9 z@PF#yWYOYYXv4|QeqPb*zei~)<3{hfpBquhPE^2lp(*SXn#xY2 zXW1<@o!vpD9HAMUq8E8hG@CooJYEmY=P~G2-V`n5@n{KekCyUIXeIA~R`K3w4IhHm z@(i?rXQ4OvIJB7;pe?)@y~Rt>HvR(I$rqqP;@M0uYzhvpsJNw^8YT`Y9aZUx5nzn zyp;(Up55{fb}I&c@$l;ezuxf6SX#sGklH{lLeuSF+t%NqO|$|n3tfTySFKp|jTMjn zW+kHUtWM~As|)(k>WzM~($F0%1KqWTp?_Lg7}!zl()G6U-$h1OH>!&ait{Qm(yS~p zE~hRsE=v~~m!*r0%hE;0W$7a0vUHJgS-Qx$thf@`-#d4^%&Fy5_koUGiL(E_u?D^t$AsxDss+ ztDJEQD*=>#)<_f`jam zH*u)F3y0YiIMP0Z>)9XR`u0b-fqe$Y*%xsm`*YmXzJ{CG-{1uMCQh_(;WqXI+!l&e z2NZxiqCngQ)xk+96sMpV+#SW@UZ@%FjauMz)DHJU9q}NPf(N4>I0FsDPog1s1j@uC zQ5GJ9@^MxPD!@7DIXoVf;yg4TPecoF0a}R*Q5l|!HsPnyRy-Z;!q1@!JOdrUGtp5z z8=b{-&^bIGeSu#_SMWk~A1^`=@KRg_FT)PJ3J2rWI1I1Fv3MPh!*Ae3yb-s?TW}Y= z6({3ucp`oqPsZhV8ZLPUPsbH_7Je7c!Ta!HydTmWhG9qW27C-ckK-Nq6nHBx9~OmE51$;{+2}IzmsTugEYZEkmmRnX@_r< zj`$wwhVPS9{0m9Pzmfq2li?+VkWr)x$sqw`0;xu(km_U_sZC}PCz(S+$W{_c-XalX z7l|YlB!+xU>XWnN5pt2lknZe@8i>xh~&DxWBtSgz% zQpl^UFImX?ktJ*>S<3!ERHAw|`lD)hh*~eqZA>Nc6=JDhxZ%>Z#PUIx-K~C}BgsvqS00t8f*2Y4Xrf#sFgt*Tf=B`D~q;)qh8a0 zANBtIKEcoX1Qf4|ka?frvdpo~_~%E7 z-a@}zyniTw>7W8b7%_AQ!Y zKcM50Me|SqornTy0jfg_Q7D~?V(8N-mQF{_=yRwAoq^iXnW!V3jZ)|w)Pv4P1L@0X z2wjLW=^~Uxm!f>S3>DB-=sCI?mD06nK3#_v&^ORZx)GJpEoc+ninh{iXcsMc8&%M9 zbcDWxj?xNrmcEP5(S7I(x*uJkhtYj{1U;a~a20wSJLoAKOh3Y5^em30pWrxp9w*WZ zxHY|myU@>ZGW`-yq?hqzdJRvb*YR}vEuKaHj_1%DcrpC}FQvEeI(i##p!e`LdLQqg zzugsQnHJslL|JFe9Q)svv44}$TG<1Y&f~fMv$-BX!0W)LvFKi)WLFSb(Twm zSso2zlW8m~pmA&pjb~G7B72rT#ir9dR!Wz$8FU4Ek*;I2=>|5BZe#Q54)!WN#TL@j zYze)({h4iM!E6f)V{fq-wvENIovbMk`W%7(II><{cDgBM(E8au;Qu(ND6`xHi=XS>*E(0hrU zW?!&d>`QisUFC>fUWw&@dyUW|Nd%P2SzC{34I%mw5|*mAB$Icx(P6Z^!TQP8KSWA2$9c&QRv&G-oJdnIn|3%n{01`UsWf z=XDwHZXx(o63hEo@w~5<$opHJ_yDU5d^+jPpRm&SAFK>M%o@f=Sy?;>&QLAkMH{m0 aBCF2Ggw`!vJ^YobNYu)yw>&4z4*qX>%R^=W diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml index 894fca510..d4bea2bbc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml @@ -1,7 +1,7 @@ - +