From b54bc57096e7aba598f265af6ed35f84ff97847e Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 26 Oct 2015 13:06:03 +0000 Subject: [PATCH] bug #6669 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49434 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioCalculoComissao.jasper | Bin 63149 -> 64130 bytes .../templates/RelatorioCalculoComissao.jrxml | 167 ++++++++++++------ .../EditarPuntoVentaComissaoController.java | 2 +- .../catalogos/EditarPuntoVentaController.java | 2 +- 4 files changed, 113 insertions(+), 58 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissao.jasper index 002a4ea8f3e87327bfaedc03b0cedd80d8158295..ad5b0d4329aae1a68de70a837b4bc2037054594c 100644 GIT binary patch delta 11687 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 delta 10664 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 - + @@ -122,226 +122,271 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + + + + + + + + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + + + + - + + + + - - + + + + - + + + + - + + + + - + + + + - + @@ -486,6 +531,13 @@ + + + + + + + @@ -518,7 +570,7 @@ - + @@ -548,7 +600,10 @@ - + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java index c7432b05a..55580f464 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java @@ -98,7 +98,7 @@ public class EditarPuntoVentaComissaoController extends MyGenericForwardComposer super.doAfterCompose(comp); - for (PtovtaComissao.enumReceita p : PtovtaComissao.enumReceita.values()) { + for (PtovtaComissao.Receita p : PtovtaComissao.Receita.values()) { Comboitem comboItem = new Comboitem(p.descricao()); comboItem.setValue(p.valor()); comboItem.setParent(cmbReceita); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index 8e4c2ba20..0bd6d830e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -814,7 +814,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { comboItem.setParent(cmbPosicao); } - for (PtovtaComissao.enumReceita p : PtovtaComissao.enumReceita.values()) { + for (PtovtaComissao.Receita p : PtovtaComissao.Receita.values()) { Comboitem comboItem = new Comboitem(p.descricao()); comboItem.setValue(p.valor()); comboItem.setParent(cmbReceita);