diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java index 733c4c0b9..47bb8f4e8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java @@ -65,7 +65,7 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { 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, 35, 36,37, 99) 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 = 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, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper index e2756555c..f6e032778 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml index cfb5c777b..db9b54892 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml @@ -1,7 +1,7 @@ - - + +