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

fixes bug #7573 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57024 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-06-16 19:53:25 +00:00
parent 11e0314f9a
commit cc60a96ae8
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
View File

@ -78,12 +78,6 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
Messagebox.OK, Messagebox.ERROR); Messagebox.OK, Messagebox.ERROR);
return false; return false;
} }
if(cmbPuntoVenta.getSelectedItem().getValue() == null || ((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue()).getPuntoventaId() == -1) {
Messagebox.show(Labels.getLabel("MSG.Error.necessita.puntoVenta"),
Labels.getLabel("conferenciaComissaoController.window.title"),
Messagebox.OK, Messagebox.ERROR);
return false;
}
return true; return true;
} }

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

@ -927,16 +927,18 @@ public class ConferenciaController extends MyGenericForwardComposer {
private void carregarDadosConferencia() { private void carregarDadosConferencia() {
try { try {
DiaConferenciaComissaoVO diaConferenciaComissao = conferenciaComissaoService.carregarConferenciaRegistrada(conferencia.getDatamovimento(), conferencia.getEmpresa(), puntoventaFiltro); DiaConferenciaComissaoVO diaConferenciaComissao = conferenciaComissaoService.carregarConferenciaRegistrada(conferencia.getDatamovimento(), conferencia.getEmpresa(), puntoventaFiltro);
for (DiaConferenciaComissaoVO diaConferenciaComissaoAux : conferenciaComissao.getDiasOrdenado()) { if(diaConferenciaComissao != null) {
if(diaConferenciaComissao.equals(diaConferenciaComissaoAux)) { for (DiaConferenciaComissaoVO diaConferenciaComissaoAux : conferenciaComissao.getDiasOrdenado()) {
diaConferenciaComissaoAux.setIndboletogerado(diaConferenciaComissao.getIndboletogerado()); if(diaConferenciaComissao.equals(diaConferenciaComissaoAux)) {
diaConferenciaComissaoAux.setIndconferido(diaConferenciaComissao.getIndconferido()); diaConferenciaComissaoAux.setIndboletogerado(diaConferenciaComissao.getIndboletogerado());
diaConferenciaComissaoAux.setIndmaloterecebido(diaConferenciaComissao.getIndmaloterecebido()); diaConferenciaComissaoAux.setIndconferido(diaConferenciaComissao.getIndconferido());
diaConferenciaComissaoAux.setIndpendencia(diaConferenciaComissao.getIndpendencia()); diaConferenciaComissaoAux.setIndmaloterecebido(diaConferenciaComissao.getIndmaloterecebido());
diaConferenciaComissaoAux.setIndsemmovimento(diaConferenciaComissao.getIndsemmovimento()); diaConferenciaComissaoAux.setIndpendencia(diaConferenciaComissao.getIndpendencia());
diaConferenciaComissaoAux.setIndsemmovimento(diaConferenciaComissao.getIndsemmovimento());
}
} }
conferenciaList.updateItem(conferenciaComissao);
} }
conferenciaList.updateItem(conferenciaComissao);
} catch (BusinessException e) { } catch (BusinessException e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }