From d6ec2c09668c2121283c597e11be97fb5df8f7c2 Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Thu, 29 Oct 2015 19:24:34 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=206555=20corre=C3=A7=C3=B5es=20dive?= =?UTF-8?q?rsas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49616 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCancelamentoVendaCartao.java | 11 +++++------ .../RelatorioCancelamentoVendaCartao.jasper | Bin 38338 -> 38338 bytes .../RelatorioCancelamentoVendaCartao.jrxml | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index f6e816013..cd589e9ef 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -91,16 +91,15 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(" 'OCD' as descmotivo, ctj.numautorizacion, ctj.nsu, c.numfoliosistema, o.fecmodif as datadevolucao"); sql.append(" from OCD o"); sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID"); - sql.append(" inner join caja_det_pago cdt on cdt.NUMOPERACION = b.NUMOPERACION"); - sql.append(" inner join caja_tarjeta ctj on cdt.cajadetpago_id = ctj.cajadetpago_id"); - sql.append(" inner join punto_venta p on p.puntoventa_id = b.puntoventa_id"); - sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id"); + sql.append(" inner join caja c on c.numoperacion = b.numoperacion and b.numfoliosistema = c.numfoliosistema"); + sql.append(" inner join caja_det_pago cdt ON cdt.caja_id = c.caja_id and cdt.formapago_id in (:formaPago1)"); + sql.append(" inner join caja_tarjeta ctj on cdt.cajadetpago_id = ctj.cajadetpago_id"); + sql.append(" inner join punto_venta p on p.puntoventa_id = o.puntoventa_id"); + sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id"); if(parametros.get("EMPRESA_ID") != null){ sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") ); } - sql.append(" inner join caja c on c.NUMOPERACION = b.NUMOPERACION"); sql.append(" inner join marca m on m.marca_id = b.marca_id "); - sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id"); sql.append(" and m.EMPRESA_ID = ptovta.EMPRESA_ID"); sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final "); if (parametros.get("NUMPUNTOVENTA") != null) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper index 6483678eb21428a0a2df98fc96273c5fffe517c7..ce7de9def2f3b01a41ab4bd031d654d183ac559a 100644 GIT binary patch delta 81 zcmX@Kn(5GLrVUDVthNjcOiw27x6#}jV7J^z*wDnx$kNEb!Z_Z{#KPFzn4N)f^1Ujx X%?5?ODj1R_3`Ua;*<~iLnJNYV^rsg^ delta 81 zcmX@Kn(5GLrVUDVtcnZ_Oiw27x6#}jV7J^z*udD*)Y#O_!ZhB<$kNilgq?wL^1Ujx X%?5?ODj1R_3`Ua;*<~iLnJNYV?kg8D diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml index 84726c951..703ba65eb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml @@ -278,7 +278,7 @@ - +