fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #7893 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60026 d1611594-4594-4d17-8e1d-87c2c4800839
master
eduardo.dicarde 2016-09-05 20:05:59 +00:00
parent d0598774c1
commit 7cc6ff1dcf
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -799,7 +799,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID AND LOG.ACTIVO = 1 ") .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID AND LOG.ACTIVO = 1 ")
.append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ") .append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ")
.append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = M.EMPRESA_ID AND CEC.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = M.EMPRESA_ID AND CEC.ACTIVO = 1 ")
.append("INNER JOIN MARCA m ON m.MARCA_ID = b.MARCA_ID ") .append("INNER JOIN MARCA ON m.MARCA_ID = b.MARCA_ID ")
.append("WHERE O.ACTIVO = 1 ") .append("WHERE O.ACTIVO = 1 ")
.append("AND O.FECPAGO BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ") .append("AND O.FECPAGO BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ")
.append("AND O.INDPAGO = 1 "); .append("AND O.INDPAGO = 1 ");

2
src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
View File

@ -617,8 +617,6 @@ public class BoletoComissao {
/** ABA BILHETE VENDIDO */ /** ABA BILHETE VENDIDO */
public boolean isBilheteNormalVendido() { public boolean isBilheteNormalVendido() {
if (nombpasajero.startsWith("ABILIO"))
System.out.println("break point");
return (isVendaBilheteNormal(getTipoVenta()) && isSemMotivocancelacion() return (isVendaBilheteNormal(getTipoVenta()) && isSemMotivocancelacion()
&& isStatusVendido()) // Venda sem alteração && isStatusVendido()) // Venda sem alteração