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

fixes bug #7804 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60010 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-09-05 18:11:00 +00:00
parent 15060cbca5
commit cb923a8081
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -751,9 +751,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
if (boletoComissao.getFormapagos() == null) {
boletoComissao.setFormapagos(new HashSet<FormapagoVO>());
}
if (lsBoletoComissao.contains(boletoComissao)) {
BoletoComissao aux = lsBoletoComissao.get(lsBoletoComissao.indexOf(boletoComissao));
int indice = lsBoletoComissao.indexOf(boletoComissao);
BoletoComissao aux = lsBoletoComissao.get(indice);
aux.setComempcategoriaId(boletoComissao.getComempcategoriaId() != null
? boletoComissao.getComempcategoriaId() : aux.getComempcategoriaId());
aux.setComempformapagoId(boletoComissao.getComempformapagoId() != null
@ -762,7 +763,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
boletoComissao.getDescpago(),
boletoComissao.getIndconferenciafisicacomissao(),
boletoComissao.getImporteFp()));
lsBoletoComissao.set(lsBoletoComissao.indexOf(boletoComissao), aux);
lsBoletoComissao.set(indice, aux);
}
else {
boletoComissao.getFormapagos().add(new FormapagoVO(boletoComissao.getFormapagoId(),

1
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -252,6 +252,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
boletoComissao.isBilheteNormalTrocadoDevolvido() ||
boletoComissao.isBilheteTrocadoDevolvido() ||
boletoComissao.isBilheteNormalTransferidoDevolvido() ||
boletoComissao.isBilheteNormalTransferidoTrocado() ||
boletoComissao.isBilheteAbertoDevolvido() ||
boletoComissao.isBilheteAbertoDevolvidoTrocado() ||
boletoComissao.isBilheteEntregaGapDevolvido() ||

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

@ -704,6 +704,11 @@ public class BoletoComissao {
public boolean isBilheteNormalTransferidoDevolvido() {
return isVendaBilheteTransferencia(getTipoVenta()) && isStatusCancelado() && isMotivocancelacionDevolvido();
}
/** ABA BILHETE DEVOLVIDO */
public boolean isBilheteNormalTransferidoTrocado() {
return isVendaBilheteTransferencia(getTipoVenta()) && isStatusCancelado() && isMotivocancelacionTrocado();
}
/** ABA BILHETE CANCELADO */
public boolean isBilheteNormalTrocadoCancelado() {
@ -910,4 +915,5 @@ public class BoletoComissao {
|| isBilheteGapTrocadoCancelado()
|| isBilheteGapTrocadoDevolvido();
}
}