From bc779e2c22dae6e79e98b0d57a42da1ddd67b164 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Wed, 18 Jan 2023 11:23:29 -0300
Subject: [PATCH] fixes bug#AL-1558 Totalizador somente para vendas

---
 pom.xml                                       |   2 +-
 .../RelatorioGratuidade_es.properties         |   5 ++
 .../RelatorioGratuidade_pt_BR.properties      |   3 +
 .../templates/RelatorioGratuidade.jasper      | Bin 63450 -> 64855 bytes
 .../templates/RelatorioGratuidade.jrxml       |  55 ++++++++++++++----
 5 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 548f3e045..c0809d188 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.0.40</version>
+	<version>1.0.41</version>
 	<packaging>war</packaging>
  
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
index a8eae1944..2b0bf897e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties
@@ -54,6 +54,11 @@ detail.totalSemDesconto=Total s/ desconto
 detail.totalVendido=Total vendido 
 detail.ccf=CCf
 detail.chaveBPe=Ch. BP-e
+detail.totalV=Total V.
+detail.totalC=Total C.
+detail.totalP=Total P.
+
+
 
 linhas=Linhas
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
index 790c6df2f..d1feb68f9 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties
@@ -54,6 +54,9 @@ detail.totalSemDesconto=Total s/ desconto
 detail.totalVendido=Total vendido
 detail.ccf=CCf
 detail.chaveBPe=Ch. BP-e
+detail.totalV=Total Vendido
+detail.totalC=Total Cobrado
+detail.totalP=Total Preço
 
 linhas=Linhas
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper
index 71c8807f5f7a567b41fc56bf658a45dd4d329846..80bd3c42850e2316f18d2a1eb7860533cb51ba7c 100644
GIT binary patch
delta 14671
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
W%{IvTqiu%K&WsGIXCAsy>puZ36#>!!

delta 13074
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
CI|b?h

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
index aeb7d1408..ac696bf94 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="RelatorioEmpresaCorrida" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="2.923075650000008"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="220"/>
+	<property name="ireport.zoom" value="1.996500000000005"/>
+	<property name="ireport.x" value="1044"/>
+	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<parameter name="fecInicioViagem" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -597,32 +597,63 @@
 		</band>
 	</detail>
 	<summary>
-		<band height="18">
+		<band height="109">
 			<textField>
 				<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="0" width="139" height="18"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="182" y="0" width="75" height="18"/>
-				<textElement/>
+				<textElement>
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="91cfa7bb-414a-41a5-8971-4b91012dbc4d" x="779" y="0" width="90" height="18"/>
-				<textElement textAlignment="Right"/>
+				<reportElement uuid="91cfa7bb-414a-41a5-8971-4b91012dbc4d" x="814" y="18" width="129" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="779b8652-d8e3-4b84-85f2-d37ef88488b9" x="869" y="0" width="90" height="18"/>
-				<textElement textAlignment="Right"/>
+				<reportElement uuid="779b8652-d8e3-4b84-85f2-d37ef88488b9" x="814" y="0" width="129" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement uuid="97a0b50b-6760-4619-86ea-ea6ac23547d9" x="959" y="0" width="90" height="18"/>
-				<textElement textAlignment="Right"/>
+				<reportElement uuid="97a0b50b-6760-4619-86ea-ea6ac23547d9" x="814" y="36" width="129" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$V{total_vendido}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="7702e077-cc45-41e8-83d7-a6b45fcd5a80" x="650" y="18" width="164" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.totalP}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="7d8e9e1e-3fb6-4b08-8b72-4ff02b598be5" x="650" y="0" width="164" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.totalC}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="1fe1943b-acc0-4514-8c0e-3c63aae5c329" x="650" y="36" width="164" height="18"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.totalV}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 	<noData>