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 @@
+
+
+
+
+
+
@@ -376,8 +385,10 @@
label="${c:l('editarOrgaoConcedenteController.indsolicitadatostarjeta.label')}" width="170px" />
-
+