diff --git a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java
index 85e2beed6..55b8e7737 100644
--- a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java
+++ b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java
@@ -25,6 +25,7 @@ public class Constantes {
 	public static final Long MVO_CANCEL_BOLETO_ENTREGADO = new Long(16);
 	public static final Long MVO_CANCEL_BOLETO_AGRUPAMENTO = new Long(17);
 	public static final Long MVO_CANCEL_GERACAO_OCD = new Long(99);
+	public static final Long MVO_CANCEL_QUITACAO_OCD = new Long(35);
 
 	public static Long TPV_DIRECTO_NORMAL = new Long(1);
 	public static Long TPV_MANUAL = new Long(3);
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index e65317174..de64aedfd 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -202,12 +202,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			Map<String, Object> parametros = carregarParametros(competencia, empresa, puntoVenta, dataMovimento);
 			StringBuilder sQuery = new StringBuilder()
 					.append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ")
-					.append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(B.FECHORVENTA, 'DD/MM/YY') as \"datamovimento\" ")
-					.append("FROM BOLETO B ")
-					.append("INNER JOIN PUNTO_VENTA PV ON B.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
-					.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ")
+					.append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECHORVENTA, 'DD/MM/YY') as \"datamovimento\" ")
+					.append("FROM CAJA C ")
+					.append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
+					.append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
 					.append("WHERE PV.ACTIVO = 1 ")
-					.append("AND B.FECHORVENTA BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
+					.append("AND C.FECHORVENTA BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
 
 			if (parametros.containsKey("empresaId")) {
 				sQuery.append("AND M.EMPRESA_ID = ? ");
@@ -216,7 +216,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
 			}
 
-			sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(B.FECHORVENTA, 'DD/MM/YY') ");
+			sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECHORVENTA, 'DD/MM/YY') ");
 
 			int idxParametro = 1;
 			stmt = con.prepareStatement(sQuery.toString());
@@ -593,12 +593,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			if (conferencia != null && conferencia.getConferenciaId() != null) {
 				StringBuilder sQuery = new StringBuilder()
 						.append("SELECT LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", LOG.OBSERVACAO AS \"observacao\", LOG.PRECO AS \"preco\", ")
-						.append("LOG.STATUS AS \"status\", B.NUMFOLIOSISTEMA AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ")
+						.append("LOG.STATUS AS \"status\", NVL(B.NUMFOLIOSISTEMA,C.NUMFOLIOSISTEMA) AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ")
 						.append("O.NUMOPERACION AS \"numoperacion\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", U.NOMBUSUARIO AS \"nombusuario\", ")
 						.append("LOG.FECMODIF AS \"fecmodif\", LOG.INDCREDITO AS \"indcredito\", B.BOLETO_ID AS \"boletoId\", O.OCD_ID AS \"ocdId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", TI.DESCTIPO AS \"desctipoinformativo\", ")
-						.append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\" ")
+						.append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\", C.CAJA_ID AS \"cajaId\" ")
 						.append("FROM LOG_CONFERENCIA LOG ")
 						.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
+						.append("LEFT JOIN CAJA C ON C.CAJA_ID = LOG.CAJA_ID ")
 						.append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ")
 						.append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ")
 						.append("LEFT JOIN OCD O ON O.OCD_ID = LOG.OCD_ID ")
@@ -622,10 +623,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 						.addScalar("nombusuario", Hibernate.STRING)
 						.addScalar("fecmodif", Hibernate.TIMESTAMP)
 						.addScalar("indcredito", Hibernate.SHORT)
-						.addScalar("boletoId", Hibernate.LONG).addScalar("ocdId", Hibernate.LONG)
+						.addScalar("boletoId", Hibernate.LONG)
+						.addScalar("ocdId", Hibernate.LONG)
 						.addScalar("eventoextraId", Hibernate.LONG)
 						.addScalar("desctipoinformativo", Hibernate.STRING)
 						.addScalar("descpendencia", Hibernate.STRING)
+						.addScalar("cajaId", Hibernate.LONG)
 						.setResultTransformer(Transformers.aliasToBean(LogConferenciaVO.class));
 				qr.setParameter("conferenciaId", conferencia.getConferenciaId());
 
@@ -688,6 +691,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia)
 			throws BusinessException {
@@ -696,69 +700,58 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					conferencia.getPuntoVenta(), conferencia.getDatamovimento());
 
 			StringBuilder sQuery = new StringBuilder()
-					.append("SELECT B.BOLETO_ID AS \"boletoId\", B.NUMASIENTO AS \"numAsiento\", B.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", ")
-					.append("B.NUMOPERACION AS \"numoperacion\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", B.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", ")
-					.append("B.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ")
-					.append("NVL(B.PRECIOPAGADO,0) AS \"valorpagado\", NVL(B.IMPORTEOUTROS,0) AS \"seguroOutros\", ")
-					.append("NVL(B.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(B.IMPORTESEGURO,0) AS \"seguro\", NVL(B.IMPORTETAXAEMBARQUE,0) AS \"embarque\", ")
-					.append("B.TIPOVENTA_ID AS \"tipoVenta\", B.INDSTATUSBOLETO AS \"indstatusboleto\", LOG.STATUS AS \"status\", ")
-					.append("FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", ")
-					.append("MC.DESCMOTIVO AS \"descmotivocancelacion\", U.NOMBUSUARIO AS \"nombusuario\", B.MOTIVOCANCELACION_ID AS \"motivocancelacionId\", ")
-					.append("BF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMCAT.COMEMPCATEGORIA_ID AS \"comempcategoriaId\", ")
-					.append("BO1.TIPOVENTA_ID \"tipoVentaOriginal1\", BO2.TIPOVENTA_ID \"tipoVentaOriginal2\", OCD.OCD_ID \"ocdId\", ")
-					.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("NVL(tarifa.PRECIO,0) + NVL(tarifa.IMPORTEPEDAGIO,0) + NVL(tarifa.IMPORTETAXAEMBARQUE,0) + NVL(tarifa.IMPORTESEGURO,0) + NVL(tarifa.IMPORTEOUTROS,0) AS \"valorTabela\", ")
-					.append("NVL(OCD.VALOR_PAGAR,0) AS \"valorPagarOcd\", NVL(OCD.VALOR_TARJETA,0) AS \"valorTarjetaOcd\", ")
-					.append("B.INDCANCELACION AS \"indCancelacion\", BA.TIPOVENTA_ID AS \"tipoventaAnteriorId\", B.INDREIMPRESION AS \"indreimpresion\" ")
-					.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 ")
-					.append("LEFT JOIN BOLETO BA ON BA.BOLETO_ID = B.BOLETOANTERIOR_ID ")
-					.append("LEFT JOIN OCD OCD ON B.BOLETOORIGINAL_ID = OCD.BOLETO_ID ")
-					.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ")
+					.append("SELECT C.CAJA_ID AS \"cajaId\", C.NUMASIENTO AS \"numAsiento\", C.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", C.NUMOPERACION AS \"numoperacion\", C.NUMFOLIOSISTEMA AS \"numFolioSistema\", ")
+					.append("C.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", C.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ")
+					.append("NVL(C.PRECIOPAGADO,0) AS \"valorpagado\", NVL(C.IMPORTEOUTROS,0) AS \"seguroOutros\", NVL(C.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(C.IMPORTESEGURO,0) AS \"seguro\", ")
+					.append("NVL(C.IMPORTETAXAEMBARQUE,0) AS \"embarque\", C.TIPOVENTA_ID AS \"tipoVenta\", C.INDSTATUSBOLETO AS \"indstatusboleto\", LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", ")
+					.append("FP.DESCPAGO AS \"descpago\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", MC.DESCMOTIVO AS \"descmotivocancelacion\", U.NOMBUSUARIO AS \"nombusuario\", C.MOTIVOCANCELACION_ID AS \"motivocancelacionId\", ")
+					.append("CF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMCAT.COMEMPCATEGORIA_ID AS \"comempcategoriaId\", C.NOMBPASAJERO AS \"nombpasajero\", ")
+					.append("E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", C.FECCORRIDA AS \"feccorrida\", C.CORRIDA_ID \"corridaId\", ")
+					.append("NVL(T.PRECIO,0) + NVL(T.IMPORTEPEDAGIO,0) + NVL(T.IMPORTETAXAEMBARQUE,0) + NVL(T.IMPORTESEGURO,0) + NVL(T.IMPORTEOUTROS,0) AS \"valorTabela\", ")
+					.append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\" ")
+					.append("FROM CAJA C ")
+					.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ")
 					.append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.PARADA_ID ")
 					.append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ")
-					.append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ")
-					.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID AND LOG.ACTIVO = 1 ")
-					.append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = B.MOTIVOCANCELACION_ID ")
-					.append("INNER JOIN BOLETO_FORMAPAGO BF ON BF.BOLETO_ID = B.BOLETO_ID ")
-					.append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = BF.FORMAPAGO_ID ")
-					.append("INNER JOIN USUARIO U ON B.USUARIO_ID = U.USUARIO_ID ")
-					.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ")
+					.append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ")
+					.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ")
+					.append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = C.MOTIVOCANCELACION_ID ")
+					.append("INNER JOIN CAJA_FORMAPAGO CF ON CF.CAJA_ID = C.CAJA_ID ")
+					.append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CF.FORMAPAGO_ID ")
+					.append("INNER JOIN USUARIO U ON C.USUARIO_ID = U.USUARIO_ID ")
+					.append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
 					.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
 					.append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
-					.append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
-					.append("INNER JOIN TARIFA tarifa ON (tarifa.RUTA_ID = B.RUTA_ID AND tarifa.ORIGEN_ID = B.ORIGEN_ID AND tarifa.DESTINO_ID = B.DESTINO_ID AND tarifa.MARCA_ID = M.MARCA_ID) ")
-					.append("INNER JOIN VIGENCIA_TARIFA vigenciaTarifa ON (vigenciaTarifa.VIGENCIATARIFA_ID = tarifa.VIGENCIATARIFA_ID) ")
-					.append("WHERE B.ACTIVO = 1 ")
-					.append("AND B.FECCREACION BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ")
-					.append("AND B.FECCREACION BETWEEN vigenciaTarifa.FECINICIOVIGENCIA AND vigenciaTarifa.FECFINVIGENCIA ");
-			
+					.append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = C.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
+					.append("INNER JOIN TARIFA T ON (T.RUTA_ID = C.RUTA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.DESTINO_ID = C.DESTINO_ID AND T.MARCA_ID = M.MARCA_ID) ")
+					.append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
+					.append("WHERE C.ACTIVO = 1 ")
+					//.append("AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID <> :motivocancelacionIdQuitacaoOcd) ")
+					.append("AND C.FECHORVENTA BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ")
+					.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
 			
 			if (parametros.containsKey("empresaId")) {
 				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
 			}
 			if (parametros.containsKey("puntoventaId")) {
-				sQuery.append("AND B.PUNTOVENTA_ID = :puntoventaId ");
+				sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId ");
 			}
 			if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) {
-				sQuery.append("AND B.NUMFOLIOSISTEMA = :numfoliosistema ");
+				sQuery.append("AND C.NUMFOLIOSISTEMA = :numfoliosistema ");
 				parametros.put("numfoliosistema", conferencia.getNumfoliosistema());
 			}
-			sQuery.append("ORDER BY B.BOLETO_ID ");
+			sQuery.append("ORDER BY C.CAJA_ID ");
 
 			@SuppressWarnings("deprecation")
 			Query qr = getSession().createSQLQuery(sQuery.toString())
-					.addScalar("boletoId", Hibernate.LONG)
-					.addScalar("boletoOriginalId", Hibernate.LONG)
+					.addScalar("cajaId", Hibernate.LONG)
 					.addScalar("numAsiento", Hibernate.STRING)
 					.addScalar("numAsientoVinculado", Hibernate.STRING)
 					.addScalar("numFolioSistema", Hibernate.STRING)
 					.addScalar("numSeriePreimpresa", Hibernate.STRING)
 					.addScalar("numFolioPreImpreso", Hibernate.STRING)
-					.addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING)
+					.addScalar("uf", Hibernate.STRING)
+					.addScalar("desccategoria", Hibernate.STRING)
 					.addScalar("valorpagado", Hibernate.BIG_DECIMAL)
 					.addScalar("valorTabela", Hibernate.BIG_DECIMAL)
 					.addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
@@ -774,26 +767,19 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.addScalar("descmotivocancelacion", Hibernate.STRING)
 					.addScalar("nombusuario", Hibernate.STRING)
 					.addScalar("motivoCancelacionId", Hibernate.INTEGER)
-					.addScalar("motivoCancelacionOriginal1", Hibernate.INTEGER)
-					.addScalar("motivoCancelacionOriginal2", Hibernate.INTEGER)
 					.addScalar("importeFp", Hibernate.BIG_DECIMAL)
 					.addScalar("comempformapagoId", Hibernate.INTEGER)
 					.addScalar("comempcategoriaId", Hibernate.INTEGER)
 					.addScalar("numoperacion", Hibernate.STRING)
-					.addScalar("tipoVentaOriginal1", Hibernate.INTEGER)
-					.addScalar("tipoVentaOriginal2", Hibernate.INTEGER)
-					.addScalar("ocdId", Hibernate.INTEGER)
 					.addScalar("nombpasajero", Hibernate.STRING)
 					.addScalar("indcarboletosdevolvidosconf", Hibernate.BOOLEAN)
 					.addScalar("feccorrida", Hibernate.DATE)
 					.addScalar("corridaId", Hibernate.INTEGER)
-					.addScalar("valorPagarOcd", Hibernate.BIG_DECIMAL)
-					.addScalar("valorTarjetaOcd", Hibernate.BIG_DECIMAL)
 					.addScalar("indCancelacion", Hibernate.BOOLEAN)
-					.addScalar("tipoventaAnteriorId", Hibernate.INTEGER)
 					.addScalar("indreimpresion", Hibernate.BOOLEAN)
 					.setResultTransformer(Transformers.aliasToBean(BoletoComissao.class));
 			setParametros(qr, parametros);
+			//qr.setParameter("motivocancelacionIdQuitacaoOcd", Constantes.MVO_CANCEL_QUITACAO_OCD.intValue());
 
 			List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
 			List<BoletoComissao> auxLsBoletoComissao = qr.list();
@@ -870,9 +856,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 
 			@SuppressWarnings("deprecation")
 			Query qr = getSession().createSQLQuery(sQuery.toString())
-					.addScalar("ocdId", Hibernate.LONG).addScalar("numoperacion", Hibernate.STRING)
-					.addScalar("fecinc", Hibernate.DATE).addScalar("fecpagar", Hibernate.DATE)
-					.addScalar("fecpago", Hibernate.DATE).addScalar("indpago", Hibernate.BOOLEAN)
+					.addScalar("ocdId", Hibernate.LONG)
+					.addScalar("numoperacion", Hibernate.STRING)
+					.addScalar("fecinc", Hibernate.DATE)
+					.addScalar("fecpagar", Hibernate.DATE)
+					.addScalar("fecpago", Hibernate.DATE)
+					.addScalar("indpago", Hibernate.BOOLEAN)
 					.addScalar("valorPagar", Hibernate.BIG_DECIMAL)
 					.addScalar("penalizacion", Hibernate.BIG_DECIMAL)
 					.addScalar("status", Hibernate.INTEGER)
@@ -970,7 +959,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 	public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException {
 		try {
 			StringBuilder sQuery = new StringBuilder()
-					.append("SELECT log ").append("FROM LogConferencia log ")
+					.append("SELECT log ")
+					.append("FROM LogConferencia log ")
 					.append("WHERE log.activo = 1 ")
 					.append("AND log.conferencia.conferenciaId = :conferenciaId ");
 			Query qr = getSession().createQuery(sQuery.toString());
diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java b/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
index c1f47290f..8763f3b6f 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
@@ -92,6 +92,9 @@ public class LogConferencia implements Serializable {
     @Column(name = "INDMESMODIA")
     private Boolean indmesmodia;
 
+	@Column(name = "CAJA_ID")
+	private Long cajaId;
+
 	public Long getLogconferenciaId() {
 		return logconferenciaId;
 	}
@@ -259,5 +262,13 @@ public class LogConferencia implements Serializable {
 	public void setIndmesmodia(Boolean indmesmodia) {
 		this.indmesmodia = indmesmodia;
 	}
+
+	public Long getCajaId() {
+		return cajaId;
+	}
+
+	public void setCajaId(Long cajaId) {
+		this.cajaId = cajaId;
+	}
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index d57ec0cdf..a859bd9df 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -381,7 +381,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		BigDecimal total = BigDecimal.ZERO;
 		if (lsBoletoComissao != null) {
 			for (BoletoComissao boletoComissao : lsBoletoComissao) {
-				if(boletoComissao.isNaoSomarBilhete()) {
+				if(boletoComissao.isNotSomarBilhete()) {
 					continue;
 				}
 				
@@ -402,7 +402,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		BigDecimal totalOcd = BigDecimal.ZERO;
 		if (lsBoletoComissao != null) {
 			for (BoletoComissao boletoComissao : lsBoletoComissao) {
-				if(boletoComissao.isNaoSomarBilhete()) {
+				if(boletoComissao.isNotSomarBilhete()) {
 					continue;
 				}
 				if (boletoComissao.isOcd()) {
@@ -426,7 +426,12 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		BigDecimal total = BigDecimal.ZERO;
 		if (lsEventosFinanceiros != null) {
 			for (EventosFinanceirosVO eventosFinanceiros : lsEventosFinanceiros) {
-				total = total.add(eventosFinanceiros.getImpingreso());
+				/*total = total.add(eventosFinanceiros.getImpingreso());*/
+				if (eventosFinanceiros.isCredito()) {
+					total = MoneyHelper.somar(total, eventosFinanceiros.getImpingreso());
+				} else if (eventosFinanceiros.isDebito()) {
+					total = MoneyHelper.subtrair(total, eventosFinanceiros.getImpingreso().abs());
+				}
 			}
 		}
 		return total;
@@ -461,7 +466,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		resumoComissao.setTotalOcd(totalOcd);
 
 		carregarTotalFormapago(resumoComissao, boletoComissaos, lsEventosFinanceiros);
-		subtrairOcdFormapagoDinheiro(totalOcd, resumoComissao);
+		//subtrairOcdFormapagoDinheiro(totalOcd, resumoComissao);
 		carregarTotalDeposito(resumoComissao, boletoComissaos, lsEventosFinanceiros);
 
 		resumoComissao.setQuantidadeEcf(puntoVentaDAO.quantidadeECFPorPuntoVenta(conferencia.getEmpresa().getEmpresaId(), conferencia.getPuntoVenta().getPuntoventaId()));
@@ -483,7 +488,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 		BigDecimal totalDeposito = BigDecimal.ZERO;
 		
 		for (BoletoComissao boletoComissao : boletoComissaos) {
-			if (!boletoComissao.isNaoSomarBilhete()) {
+			if (!boletoComissao.isNotSomarBilhete()) {
 				for (FormapagoVO formapago : boletoComissao.getFormapagos()) {
 					if(formaspagosDeposito.contains(formapago.getFormapagoId())) {
 						//somando as vendas
@@ -492,11 +497,14 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 						//subtraindo os cancelamentos
 						} else if(boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
 							totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
-						//subtraindo as trocas						
+						//subtraindo as trocas e devolucoes
 						} else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
 							if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) {
 								totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
 							}
+						//subtraindo as quitacoes de ocd
+						} else if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
+							totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
 						}
 					}
 				}
@@ -509,15 +517,15 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 				if (eventosFinanceiros.isCredito()) {
 					totalDeposito = MoneyHelper.somar(totalDeposito, eventosFinanceiros.getImpingreso());
 				} else if (eventosFinanceiros.isDebito()) {
-					totalDeposito = MoneyHelper.subtrair(totalDeposito, eventosFinanceiros.getImpingreso().compareTo(BigDecimal.ZERO) >= 0 ? eventosFinanceiros.getImpingreso() : eventosFinanceiros.getImpingreso().abs());
+					totalDeposito = MoneyHelper.subtrair(totalDeposito, eventosFinanceiros.getImpingreso().abs());
 				}
 			}
 		}
 		
 		//subtraindo as ocds pagas
-		if(resumoComissao.getTotalOcd() != null && resumoComissao.getTotalOcd().getValorPagar() != null) {
+		/*if(resumoComissao.getTotalOcd() != null && resumoComissao.getTotalOcd().getValorPagar() != null) {
 			totalDeposito = MoneyHelper.subtrair(totalDeposito, resumoComissao.getTotalOcd().getValorPagar());
-		}
+		}*/
 
 		resumoComissao.setValorDeposito(totalDeposito);
 		
@@ -563,7 +571,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 	private void carregarTotalFormapago(ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) {
 		List<FormapagoVO> totalFormapagos = new ArrayList<FormapagoVO>();
 		for (BoletoComissao boletoComissao : boletoComissaos) {
-			if (!boletoComissao.isNaoSomarBilhete()) {
+			if (!boletoComissao.isNotSomarBilhete()) {
 				for (FormapagoVO formapagoBoleto : boletoComissao.getFormapagos()) {
 					FormapagoVO formapago;
 					if (totalFormapagos.contains(formapagoBoleto)) {
@@ -573,19 +581,25 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 						totalFormapagos.add(formapago);
 					}
 
+					//somando as vendas
 					if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
 						formapago.add(formapagoBoleto.getImporte());
+					//subtraindo os cancelamentos
 					} else if (boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
 						formapago.subtract(formapagoBoleto.getImporte());
+					//subtraindo as trocas e devolucoes
 					} else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
-						if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) {
+						if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido() || boletoComissao.isMotivocancelacionQuitacaoOcd()) {
 							formapago.subtract(formapagoBoleto.getImporte());
 						}
+					//subtraindo as quitacoes de ocd
+					} else if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
+						formapago.subtract(formapagoBoleto.getImporte());
 					}
 				}
 			}
 		}
-
+		
 		for (EventosFinanceirosVO eventosFinanceiros : lsEventosFinanceiros) {
 			FormapagoVO formapagoEventoFinanceiro = new FormapagoVO(eventosFinanceiros.getFormapagoId(), eventosFinanceiros.getDescpago(), null, BigDecimal.ZERO);
 			if (totalFormapagos.contains(formapagoEventoFinanceiro)) {
@@ -597,7 +611,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 			if (eventosFinanceiros.isCredito()) {
 				formapagoEventoFinanceiro.add(eventosFinanceiros.getImpingreso());
 			} else if (eventosFinanceiros.isDebito()) {
-				formapagoEventoFinanceiro.subtract(eventosFinanceiros.getImpingreso().compareTo(BigDecimal.ZERO) >= 0 ? eventosFinanceiros.getImpingreso() : eventosFinanceiros.getImpingreso().abs());
+				formapagoEventoFinanceiro.subtract(eventosFinanceiros.getImpingreso().abs());
 			}
 		}
 		
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index 2eff50fc6..ebeb8b9a2 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -79,6 +79,8 @@ public class BoletoComissao {
 	private Boolean indreimpresion;
 	
 	private Integer tipoventaAnteriorId;
+	
+	private Long cajaId;
 
 	public Integer getEmpresaId() {
 		return empresaId;
@@ -303,10 +305,10 @@ public class BoletoComissao {
 		if (obj == null)
 			return false;
 		BoletoComissao other = (BoletoComissao) obj;
-		if (getBoletoId() == null) {
-			if (other.getBoletoId() != null)
+		if (getCajaId() == null) {
+			if (other.getCajaId() != null)
 				return false;
-		} else if (!getBoletoId().equals(other.getBoletoId()))
+		} else if (!getCajaId().equals(other.getCajaId()))
 			return false;
 		return true;
 	}
@@ -388,10 +390,6 @@ public class BoletoComissao {
 	}
 
 	public String getSituacaoBilhete() {
-		if("768596".equals(getNumFolioSistema())) {
-			System.out.println("");
-		}
-		
 		if (isOcd()) {
 			return "OCD";
 		}
@@ -442,7 +440,7 @@ public class BoletoComissao {
 	}
 
 	public boolean isOcd() {
-		return getOcdId() != null && isStatusCancelado() && !isFormapagoTrocaPassagem();
+		return isMotivocancelacionGeracaoOcd() && isStatusCancelado() && !isFormapagoTrocaPassagem();
 	}
 
 	public String getNombusuario() {
@@ -510,11 +508,11 @@ public class BoletoComissao {
 	}
 
 	public Integer getTipoVentaOriginal() {
-		if(isVendaBilheteTroca(tipoVenta) || isVendaBilheteTransferencia(tipoVenta)) {
+		/*if(isVendaBilheteTroca(tipoVenta) || isVendaBilheteTransferencia(tipoVenta)) {
 			return tipoVentaOriginal2 != null ? tipoVentaOriginal2
 					: tipoVentaOriginal1 != null ? tipoVentaOriginal1
 					: tipoventaAnteriorId != null ? tipoventaAnteriorId : tipoVenta;
-		}
+		}*/
 		return tipoVenta;
 	}
 
@@ -542,11 +540,11 @@ public class BoletoComissao {
 		this.ocdId = ocdId;
 	}
 
-	private boolean isBoletoOriginal() {
+/*	private boolean isBoletoOriginal() {
 		return boletoOriginalId == null
 				&& getMotivoCancelacionOriginal() != null
 				&& getMotivoCancelacionOriginal() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue();
-	}
+	}*/
 
 	public Integer getMotivoCancelacionOriginal() {
 		return motivoCancelacionOriginal2 != null ? motivoCancelacionOriginal2 : motivoCancelacionOriginal1;
@@ -653,16 +651,21 @@ public class BoletoComissao {
 				&& getMotivoCancelacionId() == Constantes.MVO_CANCEL_GERACAO_OCD.intValue();
 	}
 
+	public boolean isMotivocancelacionQuitacaoOcd() {
+		return !isSemMotivocancelacion()
+				&& getMotivoCancelacionId() == Constantes.MVO_CANCEL_QUITACAO_OCD.intValue();
+	}
+	
 	/** ABA BILHETE MANUAL */
 	public boolean isBilhetesManualVendido() {
-		return (isVendaBilheteManual(getTipoVentaOriginal()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao
-			   (isVendaBilheteManual(getTipoVentaOriginal()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida;
+		return (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao
+			   (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida;
 	}
 	
 	/** ABA BILHETE MANUAL */
 	public boolean isBilhetesAbertoManualVendido() {
-		return (isVendaBilheteAbertoManual(getTipoVentaOriginal()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao
-			   (isVendaBilheteAbertoManual(getTipoVentaOriginal()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida;
+		return (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao
+			   (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida;
 	}
 
 	public boolean isStatusVendido() {
@@ -826,7 +829,7 @@ public class BoletoComissao {
 			return false;
 		}
 		
-		if((isVendaBilheteTransferencia(getTipoVenta())) && isVendaGap(getTipoVentaOriginal())) {
+		if(isVendaBilheteTransferencia(getTipoVenta())) {
 			return false;
 		}
 		
@@ -877,11 +880,7 @@ public class BoletoComissao {
 			return false;
 		}
 		
-		if((isVendaBilheteTransferencia(getTipoVenta())) && !isVendaGap(getTipoVentaOriginal())) {
-			return false;
-		}
-		
-		return isStatusVendido() || isStatusTroca();
+		return (isStatusVendido() || isStatusTroca()) && isNotNumFolioPreImpressoGerado();
 	}
 	
 	/** Define bilhete na aba de gap cancelada */
@@ -945,7 +944,7 @@ public class BoletoComissao {
 	private boolean isNotNumFolioPreImpressoGerado() {
 		return StringUtils.isBlank(getNumFolioPreImpreso());
 	}
-
+	
 	public Boolean getIndreimpresion() {
 		return indreimpresion;
 	}
@@ -959,12 +958,12 @@ public class BoletoComissao {
 		return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", total=" + getTotal() + "]";
 	}
 
-	public boolean isNaoSomarBilhete() {
-		/*if(getIndreimpresion() != null && getIndreimpresion()) {
+	public boolean isNotSomarBilhete() {
+		if(getIndreimpresion() != null && getIndreimpresion()) {
 			return true;
-		}*/
+		}
 		
-		if(isStatusTroca() && isVendaBilheteTransferencia(getTipoVenta())) {
+/*		if(isStatusTroca() && isVendaBilheteTransferencia(getTipoVenta())) {
 			return true;
 		}
 
@@ -982,9 +981,17 @@ public class BoletoComissao {
 		
 		if(isMotivocancelacionAgrupamento()) {
 			return true;
-		}
+		}*/
 		
 		return false;
 	}
 
+	public Long getCajaId() {
+		return cajaId;
+	}
+
+	public void setCajaId(Long cajaId) {
+		this.cajaId = cajaId;
+	}
+
 }
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
index 88333dab6..14a89aacd 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
@@ -32,6 +32,7 @@ public class LogConferenciaVO {
 	private String desctipoinformativo;
 	private String descpendencia;
 	private String descComportamentoData;
+	private Long cajaId;
 
 	public LogConferenciaVO() {
 		super();
@@ -285,5 +286,13 @@ public class LogConferenciaVO {
 	public void setDescComportamentoData(String descComportamentoData) {
 		this.descComportamentoData = descComportamentoData;
 	}
+
+	public Long getCajaId() {
+		return cajaId;
+	}
+
+	public void setCajaId(Long cajaId) {
+		this.cajaId = cajaId;
+	}
 	
 }