From db959c22a9be6cf56bf3f793f59787d5e14b6456 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 30 Nov 2017 20:33:35 +0000 Subject: [PATCH] fixes bug #9389 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76906 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFinanceiroSintetico.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java index 75e0fcda0..95765b2be 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -180,8 +180,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio { sql.append(" sum(case when (cd.indreimpresion = 0 and cd.indstatusboleto = 'V' and cd.tipoventa_id in (5,12,18,49)) then cd.valorpago else 0 end) as receita_gap, "); sql.append(" sum(case when (cd.indstatusboleto in ('C', 'T') and cd.motivocancelacion_id in (32,10,37) and cd.numfoliosistema is null and cd.tipoventa_id in (5,12,18,49)) then cd.valorpago else 0 end) as receita_devol_gap, "); sql.append(" sum(case when (cd.indstatusboleto = 'E') then cd.valorpago else 0 end) as entrega_gap, "); - sql.append(" sum(case when (cd.motivocancelacion_id is null and cd.indreimpresion = 0 and cd.indstatusoperacion = 'F' and cd.formapago_id in (2,25)) then cd.valorpago else 0 end) as cartao_credito, "); - sql.append(" sum(case when (cd.motivocancelacion_id is null and cd.indreimpresion = 0 and cd.indstatusoperacion = 'F' and cd.formapago_id in (3,26)) then cd.valorpago else 0 end) as cartao_debito, "); + sql.append(" sum(case when (cd.indreimpresion = 0 and cd.indstatusoperacion = 'F' and cd.motivocancelacion_id is null and cd.formapago_id in (2,25)) then cd.valorpago else 0 end) as cartao_credito, "); + sql.append(" sum(case when (cd.indreimpresion = 0 and cd.indstatusoperacion = 'F' and cd.motivocancelacion_id is null and cd.formapago_id in (3,26)) then cd.valorpago else 0 end) as cartao_debito, "); sql.append(" sum(case when (cd.indstatusboleto = 'C' and cd.motivocancelacion_id in (35)) then cd.valorpago else 0 end) as receita_ocd_deb, "); sql.append(" sum(case when (cd.indstatusboleto = 'C' and cd.motivocancelacion_id in (99) ) then cd.valorpago else 0 end) as receita_ocd_cred "); sql.append("from ( ");