fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #9386 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74503 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-10-05 04:04:13 +00:00
parent a46ba1ba5a
commit e4d088d117
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper
View File

Binary file not shown.

48
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
View File

@ -138,10 +138,10 @@
<variable name="icmsRec_viagem" class="java.math.BigDecimal" resetType="Group" resetGroup="tiporecGroup"> <variable name="icmsRec_viagem" class="java.math.BigDecimal" resetType="Group" resetGroup="tiporecGroup">
<variableExpression><![CDATA[$V{icmsRec_rec}.subtract($V{icmsRec_dev})]]></variableExpression> <variableExpression><![CDATA[$V{icmsRec_rec}.subtract($V{icmsRec_dev})]]></variableExpression>
</variable> </variable>
<variable name="quant_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="quant_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{quant_rec}]]></variableExpression> <variableExpression><![CDATA[$V{quant_rec}]]></variableExpression>
</variable> </variable>
<variable name="quant_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="quant_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{quant_dev}]]></variableExpression> <variableExpression><![CDATA[$V{quant_dev}]]></variableExpression>
</variable> </variable>
<variable name="quant_mes" class="java.math.BigDecimal" resetType="None"> <variable name="quant_mes" class="java.math.BigDecimal" resetType="None">
@ -150,100 +150,100 @@
<variable name="uf" class="java.lang.String" resetType="Group" resetGroup="estadoGroup"> <variable name="uf" class="java.lang.String" resetType="Group" resetGroup="estadoGroup">
<variableExpression><![CDATA[$F{estado}]]></variableExpression> <variableExpression><![CDATA[$F{estado}]]></variableExpression>
</variable> </variable>
<variable name="tarifa_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="tarifa_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{tarifa_rec}]]></variableExpression> <variableExpression><![CDATA[$V{tarifa_rec}]]></variableExpression>
</variable> </variable>
<variable name="tarifa_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="tarifa_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{tarifa_dev}]]></variableExpression> <variableExpression><![CDATA[$V{tarifa_dev}]]></variableExpression>
</variable> </variable>
<variable name="tarifa_mes" class="java.math.BigDecimal" resetType="None"> <variable name="tarifa_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{tarifa_mes_rec}.subtract($V{tarifa_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{tarifa_mes_rec}.subtract($V{tarifa_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="seguro_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="seguro_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{seguro_rec}]]></variableExpression> <variableExpression><![CDATA[$V{seguro_rec}]]></variableExpression>
</variable> </variable>
<variable name="seguro_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="seguro_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{seguro_dev}]]></variableExpression> <variableExpression><![CDATA[$V{seguro_dev}]]></variableExpression>
</variable> </variable>
<variable name="seguro_mes" class="java.math.BigDecimal" resetType="None"> <variable name="seguro_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{seguro_mes_rec}.subtract($V{seguro_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{seguro_mes_rec}.subtract($V{seguro_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="txEmbarque_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="txEmbarque_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{txEmbarque_rec}]]></variableExpression> <variableExpression><![CDATA[$V{txEmbarque_rec}]]></variableExpression>
</variable> </variable>
<variable name="txEmbarque_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="txEmbarque_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{txEmbarque_dev}]]></variableExpression> <variableExpression><![CDATA[$V{txEmbarque_dev}]]></variableExpression>
</variable> </variable>
<variable name="txEmbarque_mes" class="java.math.BigDecimal" resetType="None"> <variable name="txEmbarque_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{txEmbarque_mes_rec}.subtract($V{txEmbarque_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{txEmbarque_mes_rec}.subtract($V{txEmbarque_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="pedagio_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="pedagio_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{pedagio_rec}]]></variableExpression> <variableExpression><![CDATA[$V{pedagio_rec}]]></variableExpression>
</variable> </variable>
<variable name="pedagio_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="pedagio_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{pedagio_dev}]]></variableExpression> <variableExpression><![CDATA[$V{pedagio_dev}]]></variableExpression>
</variable> </variable>
<variable name="pedagio_mes" class="java.math.BigDecimal" resetType="None"> <variable name="pedagio_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{pedagio_mes_rec}.subtract($V{pedagio_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{pedagio_mes_rec}.subtract($V{pedagio_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="passagem_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="passagem_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{passagem_rec}]]></variableExpression> <variableExpression><![CDATA[$V{passagem_rec}]]></variableExpression>
</variable> </variable>
<variable name="passagem_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="passagem_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{passagem_dev}]]></variableExpression> <variableExpression><![CDATA[$V{passagem_dev}]]></variableExpression>
</variable> </variable>
<variable name="passagem_mes" class="java.math.BigDecimal" resetType="None"> <variable name="passagem_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{passagem_mes_rec}.subtract($V{passagem_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{passagem_mes_rec}.subtract($V{passagem_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="isentos_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="isentos_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{isentos_rec}]]></variableExpression> <variableExpression><![CDATA[$V{isentos_rec}]]></variableExpression>
</variable> </variable>
<variable name="isentos_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="isentos_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{isentos_dev}]]></variableExpression> <variableExpression><![CDATA[$V{isentos_dev}]]></variableExpression>
</variable> </variable>
<variable name="isentos_mes" class="java.math.BigDecimal" resetType="None"> <variable name="isentos_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{isentos_mes_rec}.subtract($V{isentos_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{isentos_mes_rec}.subtract($V{isentos_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="outros_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="outros_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{outros_rec}]]></variableExpression> <variableExpression><![CDATA[$V{outros_rec}]]></variableExpression>
</variable> </variable>
<variable name="outros_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="outros_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{outros_dev}]]></variableExpression> <variableExpression><![CDATA[$V{outros_dev}]]></variableExpression>
</variable> </variable>
<variable name="outros_mes" class="java.math.BigDecimal" resetType="None"> <variable name="outros_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{outros_mes_rec}.subtract($V{outros_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{outros_mes_rec}.subtract($V{outros_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="baseCalculo_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="baseCalculo_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{baseCalculo_rec}]]></variableExpression> <variableExpression><![CDATA[$V{baseCalculo_rec}]]></variableExpression>
</variable> </variable>
<variable name="baseCalculo_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="baseCalculo_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{baseCalculo_dev}]]></variableExpression> <variableExpression><![CDATA[$V{baseCalculo_dev}]]></variableExpression>
</variable> </variable>
<variable name="baseCalculo_mes" class="java.math.BigDecimal" resetType="None"> <variable name="baseCalculo_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{baseCalculo_mes_rec}.subtract($V{baseCalculo_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{baseCalculo_mes_rec}.subtract($V{baseCalculo_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="icms_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="icms_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{icms_rec}]]></variableExpression> <variableExpression><![CDATA[$V{icms_rec}]]></variableExpression>
</variable> </variable>
<variable name="icms_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="icms_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{icms_dev}]]></variableExpression> <variableExpression><![CDATA[$V{icms_dev}]]></variableExpression>
</variable> </variable>
<variable name="icms_mes" class="java.math.BigDecimal" resetType="None"> <variable name="icms_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{icms_mes_rec}.subtract($V{icms_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{icms_mes_rec}.subtract($V{icms_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="credPres_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="credPres_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{credPres_rec}]]></variableExpression> <variableExpression><![CDATA[$V{credPres_rec}]]></variableExpression>
</variable> </variable>
<variable name="credPres_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="credPres_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{credPres_dev}]]></variableExpression> <variableExpression><![CDATA[$V{credPres_dev}]]></variableExpression>
</variable> </variable>
<variable name="credPres_mes" class="java.math.BigDecimal" resetType="None"> <variable name="credPres_mes" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{credPres_mes_rec}.subtract($V{credPres_mes_dev})]]></variableExpression> <variableExpression><![CDATA[$V{credPres_mes_rec}.subtract($V{credPres_mes_dev})]]></variableExpression>
</variable> </variable>
<variable name="icmsRec_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="icmsRec_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{icmsRec_rec}]]></variableExpression> <variableExpression><![CDATA[$V{icmsRec_rec}]]></variableExpression>
</variable> </variable>
<variable name="icmsRec_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum"> <variable name="icmsRec_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
<variableExpression><![CDATA[$V{icmsRec_dev}]]></variableExpression> <variableExpression><![CDATA[$V{icmsRec_dev}]]></variableExpression>
</variable> </variable>
<variable name="icmsRec_mes" class="java.math.BigDecimal" resetType="None"> <variable name="icmsRec_mes" class="java.math.BigDecimal" resetType="None">