From fa5f2bc7194630598c664804d5688f90a53be6f9 Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 17 Feb 2020 20:41:43 +0000
Subject: [PATCH] bug#18049 qua:Wallysson dev:Thiago

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@100250 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../catalogos/EditarOrgaoConcedenteController.java  |  3 +++
 .../utilerias/render/RenderOrgaoCancelacion.java    |  4 ++++
 web/gui/catalogos/editarOrgaoConcedente.zul         | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
index 7f1047ccc..459693a67 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
@@ -125,6 +125,8 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 	private Row rowIndValDocObligatorioMonitrip;
 	
 	private MyTextboxDecimal txtCoeficiente;
+	
+	private MyTextboxDecimal txtComissaoVenda;
 
 	public OrgaoConcedente getOrgaoConcedente() {
 		return orgaoConcedente;
@@ -254,6 +256,7 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 		oc.setOrgao(orgaoConcedente);
 		oc.setPorccambio(txtPorcCambio.getValueDecimal());
 		oc.setPorcmulta(txtPorcMulta.getValueDecimal());
+		oc.setPorcComissaoVenda(txtComissaoVenda.getValueDecimal());
 		oc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
 		oc.setFecmodif(Calendar.getInstance().getTime());
 		oc.setTiempolimite(new Integer(txtTiempoLimite.getValue()));
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
index b4f39ac50..c57c1931a 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
@@ -71,6 +71,10 @@ public class RenderOrgaoCancelacion implements ListitemRenderer {
 		lc = new Listcell(orgaoCancelacion.getIndMultaDevolucaoAberto() != null && orgaoCancelacion.getIndMultaDevolucaoAberto() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO"));
 		lc.setParent(lstm);
 		lc.setStyle("text-align:center");
+		
+	    lc = new Listcell(orgaoCancelacion.getPorcComissaoVenda() != null ? df.format(orgaoCancelacion.getPorcComissaoVenda()) : null);
+        lc.setParent(lstm);
+        lc.setStyle("text-align:right");
 
         lstm.setAttribute("data", orgaoCancelacion);
     }
diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul
index 08730ce3e..e229302ec 100644
--- a/web/gui/catalogos/editarOrgaoConcedente.zul
+++ b/web/gui/catalogos/editarOrgaoConcedente.zul
@@ -326,6 +326,15 @@
 								<checkbox
 									id="chkIndOrgaoconcedentetransf" />
 							</row>
+							
+							<row>
+								<label
+									value="${c:l('editarOrgaoConcedenteController.porComissaoVenta.label')}" />
+								<textbox id="txtComissaoVenda"
+									constraint="no empty" width="60%" maxlength="60"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" />
+							</row>
+
 						</rows>
 					</grid>
 
@@ -376,8 +385,10 @@
 								label="${c:l('editarOrgaoConcedenteController.indsolicitadatostarjeta.label')}" width="170px"  />
 							<listheader image="/gui/img/create_doc.gif"
 								label="${c:l('editarOrgaoConcedenteController.indOrgaoconcedentetransf.label')}" width="170px"  />
-								<listheader image="/gui/img/create_doc.gif"
+							<listheader image="/gui/img/create_doc.gif"
 								label="${c:l('editarOrgaoConcedenteController.indMultaDevolucaoAberto.label')}" width="170px"  />
+							<listheader image="/gui/img/create_doc.gif"
+								label="${c:l('editarOrgaoConcedenteController.porComissaoVenta.label')}" width="170px"  />
 						</listhead>
 					</listbox>
 				</tabpanel>