From 1bd4b5978e2763da5eddfee90fc5551ab7af2ff9 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 25 Oct 2013 13:39:06 +0000
Subject: [PATCH] Pricing dia - Erro ao aplicar pricing na venda

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@31704 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../pricing/EditarPricingDiaController.java   | 19 ++++++++++++-------
 web/gui/pricing/editarPricingDia.zul          |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
index 50eaa49de..226028ac2 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
@@ -192,7 +192,9 @@ public class EditarPricingDiaController extends MyGenericForwardComposer {
 		}
 
 		if (!rdFecViaje.isChecked() && !rdFecVenta.isChecked()) {
-			Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioData"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
+			Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioData"),
+					Labels.getLabel("editarPricingController.windowDia.title"),
+					Messagebox.EXCLAMATION);
 			return;
 		}
 
@@ -209,15 +211,16 @@ public class EditarPricingDiaController extends MyGenericForwardComposer {
 			pricingDia.setIndsabado(rdSab.isChecked() ? Boolean.TRUE : Boolean.FALSE);
 			pricingDia.setInddomingo(rdDom.isChecked() ? Boolean.TRUE : Boolean.FALSE);
 
-			pricingDia.setIndfecventa(rdFecVenta.isChecked() ? Boolean.TRUE : Boolean.FALSE);
-			pricingDia.setIndfecviaje(rdFecViaje.isChecked() ? Boolean.TRUE : Boolean.FALSE);
+			pricingDia.setIndfecventa(rdFecVenta == null ? Boolean.FALSE :
+					rdFecVenta.isChecked() ? Boolean.TRUE : Boolean.FALSE);
+			pricingDia.setIndfecviaje(rdFecViaje == null ? Boolean.FALSE :
+					rdFecViaje.isChecked() ? Boolean.TRUE : Boolean.FALSE);
 
 			pricingDia.setHorarioinicio(DateUtil.getFecInicio(horarioinicio.getValue()).getTime());
 			pricingDia.setHorariofin(DateUtil.getFecInicio(horariofin.getValue()).getTime());
 
 			if (noTraslapa()) {
 				if (pricingDia.getPricingdiaId() != null) {
-
 					pricingDiaService.actualizacion(pricingDia);
 					pricingDiaList.updateItem(pricingDia);
 				} else {
@@ -226,12 +229,14 @@ public class EditarPricingDiaController extends MyGenericForwardComposer {
 				}
 				closeWindow();
 			} else {
-				Messagebox.show(Labels.getLabel("editarPricingController.MSG.traslapa"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.OK,
-						Messagebox.EXCLAMATION);
+				Messagebox.show(Labels.getLabel("editarPricingController.MSG.traslapa"),
+						Labels.getLabel("editarPricingController.windowDia.title"),
+						Messagebox.OK, Messagebox.EXCLAMATION);
 			}
 		} catch (Exception ex) {
 			log.error(ex);
-			Clients.alert(Labels.getLabel("MSG.Error"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.ERROR);
+			Clients.alert(Labels.getLabel("MSG.Error"),
+					Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.ERROR);
 		}
 
 	}
diff --git a/web/gui/pricing/editarPricingDia.zul b/web/gui/pricing/editarPricingDia.zul
index ca9dbde6b..ba2d23d62 100644
--- a/web/gui/pricing/editarPricingDia.zul
+++ b/web/gui/pricing/editarPricingDia.zul
@@ -34,7 +34,7 @@
 						<hbox>
 							<radio id="rdFecViaje"
 								label="${c:l('editarPricingController.ckFecViagem.value')}"
-								checked="false" />
+								checked="true" />
 							<radio id="rdFecVenta"
 								label="${c:l('editarPricingController.ckFecCompra.value')}"
 								checked="false" />