From 02aed2e8f2a4266bf869b2841a4f57d79950141f Mon Sep 17 00:00:00 2001 From: walace Date: Thu, 12 Aug 2021 21:21:04 +0000 Subject: [PATCH] fixes bug#22774 qua:juliane dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108309 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java index 47bb8f4e8..f04fac402 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java @@ -64,8 +64,8 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append(" OC.ORGAOCONCEDENTE_ID AS ORGAOCONCEDENTEID,"); sb.append(" (SELECT sum(cf.importe) FROM CAJA_FORMAPAGO cf WHERE cf.CAJA_ID=c.CAJA_ID AND cf.FORMAPAGO_ID IN (2,3) ) AS IMPORTECCREDITO, "); sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN C.PRECIOPAGADO ELSE 0 END AS PRECIOBOLETO, "); - sb.append(" CASE WHEN C.INDCANCELACION = 1 AND c.MOTIVOCANCELACION_ID NOT IN ( 34, 35, 36,37, 99) AND OC.ORGAOCONCEDENTE_ID = 3 THEN (C.PRECIOPAGADO) ELSE 0 END AS CANCELANTT, "); - sb.append(" CASE WHEN C.INDCANCELACION = 1 AND c.MOTIVOCANCELACION_ID NOT IN ( 34, 36,37, 99) or C.INDCANCELACION in(0) AND c.MOTIVOCANCELACION_ID IN (35) AND OC.ORGAOCONCEDENTE_ID = 27 THEN (C.PRECIOPAGADO) ELSE 0 END AS CANCELAGERBA, "); + sb.append(" CASE WHEN ((C.INDCANCELACION = 1 AND c.MOTIVOCANCELACION_ID NOT IN ( 34, 36,37, 99)) or (C.INDCANCELACION in(0) AND c.MOTIVOCANCELACION_ID IN (35))) AND OC.ORGAOCONCEDENTE_ID = 3 THEN (C.PRECIOPAGADO) ELSE 0 END AS CANCELANTT, "); + sb.append(" CASE WHEN ((C.INDCANCELACION = 1 AND c.MOTIVOCANCELACION_ID NOT IN ( 34, 36,37, 99)) or (C.INDCANCELACION in(0) AND c.MOTIVOCANCELACION_ID IN (35))) AND OC.ORGAOCONCEDENTE_ID = 27 THEN (C.PRECIOPAGADO) ELSE 0 END AS CANCELAGERBA, "); sb.append(" EI.PORCREDBASEICMS,"); sb.append(" EST_PUNTOVENTA.NOMBESTADO AS NOMEESTADO, "); sb.append(" CS.DESCCLASE AS NOMECLASSE, ");