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

fixes bug #7409 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55457 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-05-02 19:40:42 +00:00
parent c8b5afa664
commit 314c91e81d
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -97,7 +97,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
private MyTextboxDecimal txtTotalBilhetesGapDevolvidosTroca;
private MyTextboxDecimal txtTotalBilhetesManual;
private MyTextboxDecimal txtTotalOcdValorPagar;
private MyTextboxDecimal txtTotalOcdPenalizacion;
private MyTextbox txtQtdeTotalBilhetes;
private MyTextbox txtQtdeTotalBilhetesCancelados;
@ -534,7 +533,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
private void carregarBilhetesDevolvidos(List<BoletoComissao> boletosComissaos) throws BusinessException {
totalBilhetesDevolvidos = BigDecimal.ZERO;
if(empresa.getIndcarboletosdevolvidosconf() != null && empresa.getIndcarboletosdevolvidosconf()) {
lsBilhetesDevolvidos = conferenciaComissaoService.carregarBilhetesComissao(boletosComissaos, conferencia, BoletoStatusComissao.BOLETO_DEVOLVIDO);
Map<BoletoStatusComissao, BigDecimal> totais = conferenciaComissaoService.totalizarBoletoComissaoDevolvidosTrocaOcd(lsBilhetesDevolvidos);
@ -549,7 +547,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesDevolvidosList.setData(lsBilhetesDevolvidos);
}
}
private void carregarBilhetesGap(List<BoletoComissao> boletosComissaos) throws BusinessException {
lsBilhetesGap = conferenciaComissaoService.carregarBilhetesComissao(boletosComissaos, conferencia, BoletoStatusComissao.GAP_VENDIDOS);

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java
View File

@ -23,7 +23,7 @@ public class RenderBoletoComissao implements ListitemRenderer {
boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null);
Listcell lc = new Listcell();
if(boletoComissao.isExigeConferencia()) {
if(boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {
Checkbox chk = new Checkbox();
chk.setId(boletoComissao.getBoletoId()+"");
chk.setChecked(boletoComissao.isConferido());