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

Merge pull request 'fixes bug#AL-4889' (!798) from AL-4889 into master 

Reviewed-on: adm/VentaBoletosAdm#798
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.160.3
Gleison da Cruz 2024-10-18 20:14:55 +00:00
parent 0a906340a6 37cfa51bd6
commit 87bbfd610d
4 changed files with 5 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.160.2</version>
<version>1.160.3</version>
<packaging>war</packaging>
<properties>

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -207,10 +207,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 ");
sql.append(" THEN 'CANCELADO' ");
sql.append(" WHEN c.INDREIMPRESION = 1 and c.MOTIVOREIMPRESION_ID = 99 ");
sql.append(" THEN 'REIMPRESSO' ");
sql.append(" ELSE 'OUTROS' ");
sql.append(" END) ");
sql.append(" ) AS tipo ");
sql.append("FROM caja c ");

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

Binary file not shown.

89
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
View File

@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb">
<property name="ireport.zoom" value="1.239669421487605"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="11"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@ -39,10 +39,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
($F{tarifa}
.add( $F{taxaembarque} )
.add( $F{pedagio} )
@ -59,10 +55,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
0
:
$F{tipo}.equals("REIMPRESSO")
?
0
:
$F{qtde}]]></variableExpression>
</variable>
<variable name="totalTrechoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@ -74,10 +66,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{tarifa}]]></variableExpression>
</variable>
<variable name="totalTrechoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@ -89,10 +77,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{taxaembarque}]]></variableExpression>
</variable>
<variable name="totalTrechoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@ -104,10 +88,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{pedagio}]]></variableExpression>
</variable>
<variable name="totalTrechoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@ -119,10 +99,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{outros}]]></variableExpression>
</variable>
<variable name="totalTrechoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@ -134,10 +110,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{seguro}]]></variableExpression>
</variable>
<variable name="totalTrechoGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho">
@ -156,11 +128,6 @@ $F{seguro}]]></variableExpression>
$F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
($F{tarifa}
.add( $F{taxaembarque} )
@ -178,10 +145,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
0
:
$F{tipo}.equals("REIMPRESSO")
?
0
:
$F{qtde}]]></variableExpression>
</variable>
<variable name="totalLinhaTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@ -193,10 +156,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{tarifa}]]></variableExpression>
</variable>
<variable name="totalLinhaTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@ -208,10 +167,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{taxaembarque}]]></variableExpression>
</variable>
<variable name="totalLinhaPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@ -223,10 +178,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{pedagio}]]></variableExpression>
</variable>
<variable name="totalLinhaOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@ -238,10 +189,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{outros}]]></variableExpression>
</variable>
<variable name="totalLinhaSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@ -253,14 +200,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{seguro}]]></variableExpression>
</variable>
<variable name="totalLinhaGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha">
<variableExpression><![CDATA[$V{totalTrecho}]]></variableExpression>
<variableExpression><![CDATA[$V{totalLinha}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable>
<variable name="soma" class="java.math.BigDecimal" resetType="None">
@ -283,10 +226,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
($F{tarifa}
.add( $F{taxaembarque} )
.add( $F{pedagio} )
@ -303,10 +242,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
0
:
$F{tipo}.equals("REIMPRESSO")
?
0
:
$F{qtde}]]></variableExpression>
</variable>
<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
@ -318,10 +253,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{tarifa}]]></variableExpression>
</variable>
<variable name="totalTaxaEmbarque" class="java.math.BigDecimal" calculation="Sum">
@ -333,10 +264,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{taxaembarque}]]></variableExpression>
</variable>
<variable name="totalPedagio" class="java.math.BigDecimal" calculation="Sum">
@ -348,10 +275,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{pedagio}]]></variableExpression>
</variable>
<variable name="totalOutros" class="java.math.BigDecimal" calculation="Sum">
@ -363,10 +286,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{outros}]]></variableExpression>
</variable>
<variable name="totalSeguro" class="java.math.BigDecimal" calculation="Sum">
@ -378,10 +297,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
?
new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{seguro}]]></variableExpression>
</variable>
<variable name="totalGeral" class="java.math.BigDecimal">