From 48fcf3061dcbbeade87344a980316fb4e8d866ad Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 25 Aug 2017 18:33:51 +0000 Subject: [PATCH] bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73079 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFolioRmd.java | 14 ++- .../templates/RelatorioFolioRmd.jasper | Bin 25340 -> 30547 bytes .../templates/RelatorioFolioRmd.jrxml | 112 ++++++++++++++++-- .../templates/RelatorioImpressaoRmd.jasper | Bin 32943 -> 32953 bytes .../templates/RelatorioImpressaoRmd.jrxml | 20 ++-- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 33502 -> 33512 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 20 ++-- 7 files changed, 134 insertions(+), 32 deletions(-) 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 589cfc3ddcaad696e6676215bef0a2dc197c8b9b..b9d8eee4e299c18a5e4bfac89457ee90ff9a1291 100644 GIT binary patch literal 30547 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 J=7W}x{x_(6%Nqay 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 8d3ec0fb7c4ff0ccca2105462ac96c17f904c1b8..5e34f20a25107212effd6afa3c19799f129ca4de 100644 GIT binary patch delta 644 zcmZ4A$h5POX@hz&qw!=(1?kB=5i*nGgTM0E6*AN@-YsEZbMg-f@%NqFA1*VwG{g_6 z>ZhXgA(DaNa7Y0Vz$LCgB!Y2C#9&HHb_^GmgcuDn3T$u! z%+QOIA{CgJPJtaG80G_XOk7xR*b|U_VB#Sbhd^YpI0RV&#UT(0utT6~FdXs_?vO;F zBR+=rhJ67!0!)0w;s}T=7DpgUpf~~|0d@pb4Td8=!W|(q*)Gxp=#civURxHRLzuw? zBc?+j5-gYwfl5pcj1o42m;g}|hZI9F&FBtcW<)q-^OdN-jQkd61{Q|K#%A%RW`-8# ZCYv9`bSn#?36?MzO*UkgnLM*W3;@!)*v|j} delta 683 zcmdnl$h5wZX@hz&qwZu$1?kCaB4sAW2Y+QPWT<1jH~D|4%;fqIKcL*XklwIMKtU!j zalW7!$YzLSU^pC700eM}OAv`*ToN&u5|cNE3QIza1{no5I00tp`N<2S6qvv+$pE@S zN)_V5`C(yUk3g1!iThYw1Chnz8e|C+*FYq|u7Rq-aLs*$Yh)&G4R-~)XpbhuMMe=} zVV^)Q0u%4CxCkPP#YM;xC@z9XfL#PtgW;n0$S(4T^Z>eOVq|YU6VN5hAcE;Xrc1yQ z%uJXrL6Jaq35rAogv=_-?o9{*aWfV0sFfcK+G%$`gGdD9gG-YRCWMt5p jT*wMcVX5q!g=3SHh0v6gFc?iXWS5!zA)0gYng(6~BsJ>a 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 424361c1256b4a1698f4780e59ee8000db8281c4..21f5ff786ab8124e44b430896ba43928a488f720 100644 GIT binary patch delta 743 zcmccD%Jia@X+vuWqv_;+Md``5VKS5VhJ59(D`co+{8Ylg=Hwp|;_o|op_a_#%b|Wi zRfftSRYmo$fhw55#EXJrAe$kQf#GmS0T93?UPB~;aY@ABl8D110W=tFO#;LU<~pVq zlMTZan3x`d9hV>O19aS;@ZS30Ap60@4=fIY$YOCAvIL65kR?zY29>~c*biifaYniV z9p)d|Th9%27&DmQz;qZyf*aFeC=$pHLyEN+9yVsRU?1d7{`B~aW3mB4hH1d`h}8^x$HiCUN$SQs0c7{wb|8krecurn|+ wGU!Y$WR;nGAc=i*e;l`p5So$_2BXP_>@t&cVmW!e63Y^ko%3@GGILUk0A*k8;Q#;t delta 684 zcmaFS%5<-lX+vuWqweH>Md`_0(K3_whJ0l$WT<2OJo#W~7Es(!86ut>7FPcfD8U3K zo)r`W*$j~k42MGsfB-J>5+V_dOCkoBL>v|gpuu2k5+GJE*D*btoTx4fb>BiQnaP#m zK0r4f3-7J}3339M_=d%85Lqm4LzX~s8?pq7+n^GdZu^GjHsMHDpxYuNd$~D*Zes=$ zY?D7m3a3E$n681S;e<#ay9Px9*)=c;G}qKIv!OX=S(FFRG4G>#xg|l40TW_i$3Xa4 z9D^)@;uvHJ6vsd%FdQR>>X^+oF{(`bMg|5Z#%2aa@n)8$riKQa3*t;vgwO;_7>p(x Lvdc`q)FcJ~U6|dT 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 @@ - - + + - - + + - - + + - - + + - - + +