From c1ae9652baa93967b0dd5c9b19145d40177bdb18 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Fri, 8 Sep 2023 14:57:16 -0300
Subject: [PATCH] =?UTF-8?q?fixes=20bug#AL-3149=20Subtrair=20os=20cancelame?=
 =?UTF-8?q?ntos=20e=20ordenar=20somente=20por=20nome=20/=20descri=C3=A7?=
 =?UTF-8?q?=C3=A3o=20do=20ponto=20de=20vendas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../relatorios/impl/RelatorioAgenciaFechamentoNovo.java       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 612717625..3229c4ba3 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.18.0</version>
+	<version>1.18.1</version>
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java
index c2fa4bbd1..57ff53a81 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java
@@ -123,6 +123,7 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio {
 					
 					
 					total = total.add(difMaior);
+					total = total.subtract(rset1.getBigDecimal("valorCancelado")); 
 					total = total.subtract(rset1.getBigDecimal("valorEstornado")); 
 					total = total.subtract(rset1.getBigDecimal("valorOCD"));
 					
@@ -299,7 +300,8 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio {
 		sql.append(" AND NVL(C.MONEDA_ID, 1) = :MOEDA_ID ");
 		sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa, o.boleto_id  ");
 		sql.append(" ORDER BY pv.nombpuntoventa ");
-		sql.append(") GROUP BY codigo, descricao "); 
+		sql.append(") GROUP BY codigo, descricao ");
+		sql.append("  ORDER BY descricao "); 
 		
 		return sql.toString();