diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java index 80bb28c22..557351dbf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -57,6 +57,12 @@ public class RelatorioFolioRmd extends Relatorio { item.setDoc(rset.getString("doc")); item.setTipo(rset.getString("tipo")); item.setFechorfolioDate(DateUtil.getDateFromString(item.getFechorfolio(), DATE_FORMAT_FISCAL)); + item.setValorContabil(rset.getBigDecimal("valorContabil")); + item.setBaseCalculo(rset.getBigDecimal("baseCalculo")); + item.setAliquota(rset.getBigDecimal("aliquota")); + item.setIsentos(rset.getBigDecimal("isentos")); + item.setOutros(rset.getBigDecimal("outros")); + item.setIcms(rset.getBigDecimal("icms")); listdata.add(item); } @@ -88,7 +94,13 @@ public class RelatorioFolioRmd extends Relatorio { sql.append(" eo.cveestado as uf, "); sql.append(" eo.nombestado as estado, "); sql.append(" ai.docfiscal as doc, "); - sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo "); + sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo, "); + sql.append(" valorcontabil as valorContabil, "); + sql.append(" basecalculo as baseCalculo, "); + sql.append(" aliquota as aliquota, "); + sql.append(" isentos as isentos, "); + sql.append(" outros as outros, "); + sql.append(" icms as icms "); sql.append("from folio_consumo_rmd f "); sql.append("inner join aidf ai on f.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); sql.append("inner join empresa e on e.empresa_id = f.empresa_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper index 589cfc3dd..b9d8eee4e 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml index 09e529b56..756c8d96e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml @@ -1,7 +1,7 @@ - + - + @@ -11,6 +11,12 @@ + + + + + + @@ -42,11 +48,11 @@ - + - + @@ -60,7 +66,7 @@ - + @@ -74,7 +80,7 @@ - + @@ -88,15 +94,57 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109,7 +157,7 @@ - + @@ -123,7 +171,7 @@ - + @@ -137,12 +185,54 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 8d3ec0fb7..5e34f20a2 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index be4b0f750..03cf3f475 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -172,36 +172,36 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index 424361c12..21f5ff786 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index 37c9afd59..89153a31d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -177,36 +177,36 @@ - - + + - - + + - - + + - - + + - - + +