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

fixes bug #7406 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55576 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-05-04 19:52:39 +00:00
parent 435e43407e
commit 87dc4886b9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -861,13 +861,13 @@ public class ConferenciaController extends MyGenericForwardComposer {
public void onClick$btnPesquisaBoletoDevolvido(Event event) throws InterruptedException {
try {
if((empresa.getIndcarboletosdevolvidosconf() == null || !empresa.getIndcarboletosdevolvidosconf()) &&
/* if((empresa.getIndcarboletosdevolvidosconf() == null || !empresa.getIndcarboletosdevolvidosconf()) &&
StringUtils.isBlank(conferencia.getNumfoliosistema())) {
Messagebox.show(Labels.getLabel("conferenciaController.msg.numfoliosistemaNaoInformado"),
Labels.getLabel("conferenciaController.window.title"),
Messagebox.OK,Messagebox.INFORMATION);
return;
}
}*/
lsBilhetesDevolvidos = conferenciaComissaoService.carregarBilhetesComissao(null, conferencia, BoletoStatusComissao.BOLETO_DEVOLVIDO);
Map<BoletoStatusComissao, BigDecimal> totais = conferenciaComissaoService.totalizarBoletoComissaoDevolvidosTrocaOcd(lsBilhetesDevolvidos);
@ -1002,7 +1002,9 @@ public class ConferenciaController extends MyGenericForwardComposer {
}*/
private void removerLogConferencia(Long logconferenciaId) {
logsConferenciaList.removeItem(new LogConferenciaVO(logconferenciaId));
LogConferenciaVO log = new LogConferenciaVO(logconferenciaId);
logsConferenciaList.removeItem(log);
lsLogsConferencia.remove(log);
}
private LogConferencia gravarLogConferencia(TipoLogConferencia tipo, Long id, String numfoliosistema) throws BusinessException {
@ -1043,6 +1045,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
logConferenciaVO.setStatus(logConferencia.getStatus().getValue());
logConferenciaVO.setTipo(logConferencia.getTipo().getValue());
logsConferenciaList.updateItem(logConferenciaVO);
lsLogsConferencia.add(logConferenciaVO);
}
/*@SuppressWarnings("unchecked")

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -6381,7 +6381,7 @@ conferenciaController.msg.adicionarLogConferencia = Observação adicionada com
conferenciaController.msg.removerLogConferencia = Observação removido com sucesso
conferenciaController.lhNumAsiento.value = Assento
conferenciaController.lhNumFolioSistema.value = Nº Bilhete
conferenciaController.lhNombpasajero.value = Pasajero
conferenciaController.lhNombpasajero.value = Passageiro
conferenciaController.lhNumSeriePreimpresa.value = Série Pré-impressa
conferenciaController.lhNumFolioPreImpreso.value = Folio Pré-impresso
conferenciaController.lhUf.value = UF