From cc60a96ae823064643bf3cc395fca29859048bb3 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 16 Jun 2016 19:53:25 +0000
Subject: [PATCH] fixes bug #7573

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57024 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../BusquedaConferenciaComissaoController.java |  6 ------
 .../comissao/ConferenciaController.java        | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
index e2f0f4163..048aaa240 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
@@ -78,12 +78,6 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
 							Messagebox.OK, Messagebox.ERROR);
 			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;
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
index f2d55cc4c..094e469ca 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
@@ -927,16 +927,18 @@ public class ConferenciaController extends MyGenericForwardComposer {
 	private void carregarDadosConferencia() {
 		try {
 			DiaConferenciaComissaoVO diaConferenciaComissao = conferenciaComissaoService.carregarConferenciaRegistrada(conferencia.getDatamovimento(), conferencia.getEmpresa(), puntoventaFiltro);
-			for (DiaConferenciaComissaoVO diaConferenciaComissaoAux : conferenciaComissao.getDiasOrdenado()) {
-				if(diaConferenciaComissao.equals(diaConferenciaComissaoAux)) {
-					diaConferenciaComissaoAux.setIndboletogerado(diaConferenciaComissao.getIndboletogerado());
-					diaConferenciaComissaoAux.setIndconferido(diaConferenciaComissao.getIndconferido());
-					diaConferenciaComissaoAux.setIndmaloterecebido(diaConferenciaComissao.getIndmaloterecebido());
-					diaConferenciaComissaoAux.setIndpendencia(diaConferenciaComissao.getIndpendencia());
-					diaConferenciaComissaoAux.setIndsemmovimento(diaConferenciaComissao.getIndsemmovimento());
+			if(diaConferenciaComissao != null) {
+				for (DiaConferenciaComissaoVO diaConferenciaComissaoAux : conferenciaComissao.getDiasOrdenado()) {
+					if(diaConferenciaComissao.equals(diaConferenciaComissaoAux)) {
+						diaConferenciaComissaoAux.setIndboletogerado(diaConferenciaComissao.getIndboletogerado());
+						diaConferenciaComissaoAux.setIndconferido(diaConferenciaComissao.getIndconferido());
+						diaConferenciaComissaoAux.setIndmaloterecebido(diaConferenciaComissao.getIndmaloterecebido());
+						diaConferenciaComissaoAux.setIndpendencia(diaConferenciaComissao.getIndpendencia());
+						diaConferenciaComissaoAux.setIndsemmovimento(diaConferenciaComissao.getIndsemmovimento());
+					}
 				}
+				conferenciaList.updateItem(conferenciaComissao);
 			}
-			conferenciaList.updateItem(conferenciaComissao);
 		} catch (BusinessException e) {
 			log.error(e.getMessage(), e);
 		}