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

Reviewed-on: adm/VentaBoletosAdm#753
Reviewed-by: aristides <aristides@rjconsultores.com.br>

pom.xml

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

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java

@@ -197,7 +197,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
 		sql.append("              AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 18)  ");
 		sql.append("              THEN 'VENDA PRE-PAGA'  ");
 		sql.append("               ");
-		sql.append("              WHEN c.MOTIVOCANCELACION_ID IS NULL  AND c.indreimpresion = 1");
+		sql.append("              WHEN c.MOTIVOCANCELACION_ID IS NULL  AND c.indreimpresion = 1 AND c.MOTIVOREIMPRESION_ID IS NULL");
 		sql.append("              AND (c.INDSTATUSBOLETO = 'E' AND c.TIPOVENTA_ID in (5,12,18))  ");
 		sql.append("              THEN 'IMPRESSAO POSTERIOR'  ");
 		sql.append("               ");		
@@ -207,6 +207,10 @@ 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("		   END)  ");
 		sql.append("    ) AS tipo ");
 		sql.append("FROM caja c  ");

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml

@@ -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="11"/>
+	<property name="ireport.y" value="0"/>
 	<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,6 +39,10 @@ $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} )
@@ -55,6 +59,10 @@ $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">
@@ -66,6 +74,10 @@ $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">
@@ -77,6 +89,10 @@ $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">
@@ -88,6 +104,10 @@ $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">
@@ -99,6 +119,10 @@ $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">
@@ -110,6 +134,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="totalTrechoGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho">
@@ -128,6 +156,11 @@ $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} )
@@ -145,6 +178,10 @@ $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">
@@ -156,6 +193,10 @@ $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">
@@ -167,6 +208,10 @@ $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">
@@ -178,6 +223,10 @@ $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">
@@ -189,6 +238,10 @@ $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">
@@ -200,10 +253,14 @@ $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{totalLinha}]]></variableExpression>
+		<variableExpression><![CDATA[$V{totalTrecho}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
 	<variable name="soma" class="java.math.BigDecimal" resetType="None">
@@ -226,6 +283,10 @@ $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} )
@@ -242,6 +303,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+0
+:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
@@ -253,6 +318,10 @@ $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">
@@ -264,6 +333,10 @@ $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">
@@ -275,6 +348,10 @@ $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">
@@ -286,6 +363,10 @@ $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">
@@ -297,6 +378,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="totalGeral" class="java.math.BigDecimal">