diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java index 557351dbf..e60db2269 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -95,12 +95,12 @@ public class RelatorioFolioRmd extends Relatorio { 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(" 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(" f.valorcontabil as valorContabil, "); + sql.append(" f.basecalculo as baseCalculo, "); + sql.append(" f.aliquota as aliquota, "); + sql.append(" f.isentos as isentos, "); + sql.append(" f.outros as outros, "); + sql.append(" f.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 b9d8eee4e..bb160df43 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 756c8d96e..0ebb45822 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 @@ - + - + @@ -17,6 +17,21 @@ + + + + + + + + + + + + + + + @@ -30,7 +45,7 @@ - + @@ -40,13 +55,6 @@ - - - - - - - @@ -54,47 +62,54 @@ + + + + + + + - + - + - + - + - + - + @@ -104,42 +119,42 @@ - + - + - + - + - + - + @@ -185,50 +200,50 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + @@ -236,7 +251,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 5e34f20a2..6c9072ae5 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 03cf3f475..e2996b431 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -170,37 +170,37 @@ - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index 21f5ff786..0cc98fa2d 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 89153a31d..449ce2723 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -175,37 +175,37 @@ - + - + - + - + - + - +