From 878ca95d217dd36b5c4ea502ba7f80b6c33349a4 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 23 Apr 2014 13:24:15 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@34916
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../controladores/pricing/EditarPricingController.java | 10 +++++-----
 .../tarifas/ModificacionMasivaTarifasController.java   |  4 ++--
 src/java/versionADM.info                               |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
index eb0ce3064..4e019aec2 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
@@ -275,6 +275,11 @@ public class EditarPricingController extends MyGenericForwardComposer {
 		gravarNovo = (Boolean) Executions.getCurrent().getArg().get("gravarNovo");
 
 		super.doAfterCompose(comp);
+		
+		pricingCategoriaList.setDisabled(Boolean.TRUE);
+		btnNovoCategoria.setDisabled(Boolean.TRUE);
+		btnApagarCategoria.setDisabled(Boolean.TRUE);
+		btnModificarCategoria.setDisabled(Boolean.TRUE);
 
 		popularCombobox(cmbIndGeneraFeriadoFechaVenta);
 		popularCombobox(cmbIndGeneraFeriadoFechaViaje);
@@ -647,7 +652,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
 			Categoria categoria = null;
 			
 			if (ApplicationProperties.getInstance().habilitarPricingCategoria()) {
-				categoriaService.obtenerTodos();
 				pricingCategoriaList.setDisabled(Boolean.FALSE);
 				btnNovoCategoria.setDisabled(Boolean.FALSE);
 				btnApagarCategoria.setDisabled(Boolean.FALSE);
@@ -655,10 +659,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
 				
 			}else{
 				categoria = categoriaService.obtenerID(1);
-			pricingCategoriaList.setDisabled(Boolean.TRUE);
-				btnNovoCategoria.setDisabled(Boolean.TRUE);
-				btnApagarCategoria.setDisabled(Boolean.TRUE);
-				btnModificarCategoria.setDisabled(Boolean.TRUE);
 			}
 			
 			
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
index 8dc16780e..8ef484b96 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
@@ -304,7 +304,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
 					}
 				}
 			} catch (Exception e) {
-				log.error(e);
+				log.error("",e);
 				log.debug("Porcentagem Zero");
 			}
 
@@ -485,7 +485,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
 			}
 			
 		} catch (Exception ex) {
-			log.error(ex);
+			log.error("",ex);
 		}
 	}
 
diff --git a/src/java/versionADM.info b/src/java/versionADM.info
index 089b2a4d5..fbd021acc 100644
--- a/src/java/versionADM.info
+++ b/src/java/versionADM.info
@@ -1 +1 @@
-ADM_20140423_1RC346
\ No newline at end of file
+ADM_20140423_1RC347
\ No newline at end of file