From 3cb5935ff3c1bd67e21deda0374efc2c0c92be74 Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 3 Oct 2016 14:25:50 +0000
Subject: [PATCH] fixed bug #7908

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@61054 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../hibernate/ConferenciaComissaoHibernateDAO.java   |  4 ++--
 .../ventaboletos/vo/comissao/BoletoComissao.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index d3e81db4d..ad272fb7c 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -674,7 +674,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ")
 					.append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ")
 					.append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\", ")
-					.append("tarifa.PRECIO AS \"valorBilhete\"")
+					.append("NVL(tarifa.PRECIO,0) + NVL(tarifa.IMPORTEPEDAGIO,0) + NVL(tarifa.IMPORTETAXAEMBARQUE,0) + NVL(tarifa.IMPORTESEGURO,0) + NVL(tarifa.IMPORTEOUTROS,0) AS \"valorTabela\"")
 					.append("FROM BOLETO B ")
 					.append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ")
 					.append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ")
@@ -721,7 +721,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.addScalar("numFolioPreImpreso", Hibernate.STRING)
 					.addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING)
 					.addScalar("valorpagado", Hibernate.BIG_DECIMAL)
-					.addScalar("valorBilhete", Hibernate.BIG_DECIMAL)
+					.addScalar("valorTabela", Hibernate.BIG_DECIMAL)
 					.addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
 					.addScalar("pedagio", Hibernate.BIG_DECIMAL)
 					.addScalar("seguro", Hibernate.BIG_DECIMAL)
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index 58724189d..0842629b6 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -24,7 +24,7 @@ public class BoletoComissao {
 	private Integer motivoCancelacionOriginal2;
 	private String descmotivocancelacion;
 	private BigDecimal valorpagado;
-	private BigDecimal valorBilhete;
+	private BigDecimal valorTabela;
 	private BigDecimal seguro;
 	private BigDecimal pedagio;
 	private BigDecimal embarque;
@@ -372,7 +372,7 @@ public class BoletoComissao {
 				.add(getEmbarque())
 				.add(getSeguro())
 				.add(getPedagio())
-				.add(getSeguro());
+				.add(getSeguroOutros());
 	}
 
 	public String getDescTipoVenta() {
@@ -868,12 +868,12 @@ public class BoletoComissao {
 		this.corridaId = corridaId;
 	}
 	
-	public BigDecimal getValorBilhete() {
-		return valorBilhete;
+	public BigDecimal getValorTabela() {
+		return valorTabela;
 	}
 
-	public void setValorBilhete(BigDecimal valorBilhete) {
-		this.valorBilhete = valorBilhete;
+	public void setValorTabela(BigDecimal valorTabela) {
+		this.valorTabela = valorTabela;
 	}
 
 	public String getFeccorridaServico() {