From d913b4118813799090d6caf396074889e03d23e5 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Thu, 22 Oct 2015 21:53:22 +0000 Subject: [PATCH] FIXES BUG #6702 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49346 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 17 +++---- .../templates/RelatorioDepositos.jasper | Bin 31660 -> 34882 bytes .../templates/RelatorioDepositos.jrxml | 43 ++++++++++++++++++ 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index f1c056a57..4c385ca93 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -93,16 +93,16 @@ public class RelatorioDepositos extends Relatorio { sql.append(" SELECT e.nombempresa, "); sql.append(" p.nombpuntoventa, "); - sql.append(" f.fecfechamento AS dtmotivo, "); - sql.append(" SUM(( NVL(fd.valor_pago,0) - f.total )) AS saldo, "); - sql.append(" SUM(f.total) AS vrfechamento , "); - sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrdeposito "); + sql.append(" f.fecfechamento AS dtmotivo, "); + sql.append(" ( sum(NVL(fd.valor_pago,0)) - f.total ) AS saldo, "); + sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); + sql.append(" f.total AS vrdeposito "); sql.append(" FROM fechamento_cntcorrente f "); sql.append(" INNER JOIN punto_venta p "); sql.append(" ON p.puntoventa_id = f.puntoventa_id "); sql.append(" INNER JOIN empresa e "); sql.append(" ON e.empresa_id = f.empresa_id "); - sql.append(" INNER JOIN fechamento_cct_deposito fd "); + sql.append(" LEFT JOIN fechamento_cct_deposito fd "); sql.append(" ON fd.fechamentocntcorrente_id = f.fechamentocntcorrente_id "); sql.append(" AND fd.activo = 1 "); sql.append(" WHERE f.fecfechamento BETWEEN ? AND ? "); @@ -117,11 +117,12 @@ public class RelatorioDepositos extends Relatorio { } sql.append(" GROUP BY e.nombempresa, "); sql.append(" p.nombpuntoventa, "); - sql.append(" f.fecfechamento "); + sql.append(" f.fecfechamento, "); + sql.append(" f.total "); sql.append(" ORDER BY e.nombempresa, "); sql.append(" p.nombpuntoventa, "); - sql.append(" f.fecfechamento "); - + sql.append(" f.fecfechamento, "); + sql.append(" f.total "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index a86cc16468a9f5cf11f50cf811491ff2db07bdd9..71c099cd8bea7c8eb143ec5ef4db382e776584b3 100644 GIT binary patch delta 11365 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index 75c0be481..f284396ea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -17,6 +17,15 @@ + + + + + + + + + @@ -191,6 +200,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +