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

fixes bug#AL-3149 

Subtrair os cancelamentos e ordenar somente por nome / descrição do
ponto de vendas
master
Gleison da Cruz 2023-09-08 14:57:16 -03:00
parent 614def73d6
commit c1ae9652ba
2 changed files with 4 additions and 2 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.18.0</version> <version>1.18.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java
View File

@ -123,6 +123,7 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio {
total = total.add(difMaior); total = total.add(difMaior);
total = total.subtract(rset1.getBigDecimal("valorCancelado"));
total = total.subtract(rset1.getBigDecimal("valorEstornado")); total = total.subtract(rset1.getBigDecimal("valorEstornado"));
total = total.subtract(rset1.getBigDecimal("valorOCD")); total = total.subtract(rset1.getBigDecimal("valorOCD"));
@ -300,6 +301,7 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio {
sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa, o.boleto_id "); sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa, o.boleto_id ");
sql.append(" ORDER BY pv.nombpuntoventa "); 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(); return sql.toString();