From 9af8a338a62188ed78ce99c71c8b0b6a5916410c Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 16 Jun 2016 13:31:34 +0000 Subject: [PATCH] fixes bug #7565 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56995 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioConferenciaFormularioFisico.java | 10 +++++----- ...elatorioConferenciaFormularioFisico.jasper | Bin 39977 -> 40112 bytes ...RelatorioConferenciaFormularioFisico.jrxml | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java index d1d29d1a2..2362257f2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioConferenciaFormularioFisico.java @@ -96,17 +96,17 @@ public class RelatorioConferenciaFormularioFisico extends Relatorio { formulario.setAbertura(rs.getDate(6)); formulario.setBilheteFisicoAbertura(rs.getInt(8)); formulario.setBilheteFisicoFechamento(rs.getInt(9)); - formulario.setBilheteLogicoAbertura(rs.getInt(10)); - formulario.setBilheteLogicoFechamento(rs.getInt(11)); + formulario.setDif1(rs.getInt(10)); + formulario.setBilheteLogicoAbertura(rs.getInt(11)); + formulario.setBilheteLogicoFechamento(rs.getInt(12)); + formulario.setDif2(rs.getInt(13)); formulario.setCaixa(rs.getString(2)); formulario.setFechamento(rs.getDate(7)); formulario.setSerie(rs.getString(3)); formulario.setTerminal(rs.getInt(1)); formulario.setTurno(rs.getInt(5)); formulario.setUsuario(rs.getString(4)); - formulario.setDif1(rs.getInt(9) - rs.getInt(8)); - formulario.setDif2(rs.getInt(11) - rs.getInt(10)); - formulario.setTotal(rs.getInt(11) - rs.getInt(10)); + formulario.setTotal(rs.getInt(13)); formularios.add(formulario); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioConferenciaFormularioFisico.jasper index 71ca43668fad71101a9c982abfa6f223489d125e..5a994266e0c411ac6d09b76187caa96f571c8676 100644 GIT binary patch delta 5384 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 mo%Q% delta 5018 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 jockI&z5N - + @@ -250,7 +250,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -278,42 +278,42 @@ - + - + - + - + - + - +