fixes bug#AL-2431

src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java

@@ -34,4 +34,11 @@ public class ConstantesFuncionSistema {
 	public static final String CLAVE_RELATORIO_PRICING_ESPECIFICO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MENU.RELATORIOPRICINGESPECIFICO";
 	public static final String CLAVE_MODIFICACAO_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.TARIFAS.MENU.MODIFICACIONMASIVAEMBARCADA";
 	public static final String CLAVE_AUTORIZACAO_RUTA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.AUTORIZACAORUTA";
+	
+	public static final String CLAVE_MENU_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING";
+	public static final String CLAVE_GESTAO_PRICING_ESPECIFICO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.PRICINGESPECIFICO";
+	public static final String CLAVE_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.PRICING";
+	public static final String CLAVE_TELA_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.GESTAOPRICING";
+	public static final String CLAVE_MENU_RELATORIOS_MUDANCAS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSDEMUDANCAS";
+	public static final String CLAVE_MENU_RELATORIOS_MUDANCAS_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSDEMUDANCAS.RELATORIOSDEMUDANCASPRICING";
 }

src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java

@@ -11,6 +11,7 @@ import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
 import com.rjconsultores.ventaboletos.entidad.Corrida;
 import com.rjconsultores.ventaboletos.entidad.Corrida.Id;
 import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.Marca;
 import com.rjconsultores.ventaboletos.entidad.Parada;
@@ -105,5 +106,8 @@ public interface CorridaDAO extends GenericDAO<Corrida, Corrida.Id> {
 
 	public CorridaVO buscarVOPorId(Id corridaId);
 
-	public Integer buscarOcupacaoCorrida(Corrida corrida);
+	public Integer buscarOcupacaoCorrida(Corrida corrida);
+	
+	public List<Corrida> buscarCorridas(Parada ori, Parada des, Date dataInicio, Date dataFinal, ClaseServicio cs,
+			Ruta linha, Empresa empresa);
 }

src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.rjconsultores.ventaboletos.entidad.Corrida;
 import com.rjconsultores.ventaboletos.entidad.CorridaTramo;
+import com.rjconsultores.ventaboletos.entidad.Tramo;
 
 public interface CorridaTramoDAO extends GenericDAO<CorridaTramo, Integer> {
 
@@ -15,5 +16,7 @@ public interface CorridaTramoDAO extends GenericDAO<CorridaTramo, Integer> {
     List<CorridaTramo> buscarCorridaTramoPorCorrida(Corrida corrida);
 
     public BigDecimal buscarSumTarjetaMesmaCorrida(CorridaTramo ct);
+    
+    List<Tramo> buscarTramoPorCorridaId(Integer corridaId);
 
 }

src/com/rjconsultores/ventaboletos/dao/GP_PricingAsientoDAO.java

@@ -0,0 +1,13 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingAsiento;
+
+public interface GP_PricingAsientoDAO extends GenericDAO<GP_PricingAsiento, Integer> {
+
+    public List<GP_PricingAsiento> obtenerPricingCategoria(GP_Pricing pricing, Integer asiento);
+
+	public List<GP_PricingAsiento> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingCategoriaDAO.java

@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.Categoria;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingCategoria;
+
+/**
+ *
+ * @author Rafius
+ */
+public interface GP_PricingCategoriaDAO extends GenericDAO<GP_PricingCategoria, Integer> {
+
+    public Boolean obtenerPricingCategoria(GP_Pricing pricing, Categoria categoria);
+
+	List<GP_PricingCategoria> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingClaseDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingClase;
+
+public interface GP_PricingClaseDAO extends GenericDAO<GP_PricingClase, Integer> {
+
+    public Boolean obtenerPricingClase(GP_Pricing pricing, ClaseServicio claseServicio);
+
+	public List<GP_PricingClase> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingClasseTarifariaDAO.java

@@ -0,0 +1,9 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingClasseTarifaria;
+
+public interface GP_PricingClasseTarifariaDAO extends GenericDAO<GP_PricingClasseTarifaria, Integer> {
+
+	public Boolean validacionSigla(String sigla);
+
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingCorridaDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.CorridaCtrl;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingCorrida;
+
+public interface GP_PricingCorridaDAO extends GenericDAO<GP_PricingCorrida, Integer> {
+
+    public Boolean obtenerPricingCorrida(GP_Pricing pricing, CorridaCtrl corrida);
+
+	public List<GP_PricingCorrida> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingDAO.java

@@ -0,0 +1,20 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingVigencia;
+import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingRevisaoValoresVO;
+
+public interface GP_PricingDAO extends GenericDAO<GP_Pricing, Integer> {
+
+    public List<GP_Pricing> buscar(String nombPricing, Empresa empresa,
+            Short cantboleto, Integer cantdiasanticipacion,
+            BigDecimal descuentoporcentaje, BigDecimal descuentoporcredondo);
+
+    public List<GP_Pricing> buscarPorNombre(String nombPricing);
+    
+    public List<GP_PricingRevisaoValoresVO> buscarPricingRevisaoValoresVO(List<Integer> classeServicioIds,List<Integer> marcaIds, List<Integer> rutaIds, List<Integer> tramoIds, List<GP_PricingVigencia> lsPricingVigencia);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingDiaDAO.java

@@ -0,0 +1,13 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingDia;
+
+public interface GP_PricingDiaDAO extends GenericDAO<GP_PricingDia, Integer> {
+
+    public List<GP_PricingDia> buscarTraslapa(GP_PricingDia pricingDia);
+
+	public List<GP_PricingDia> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoAgenciaDAO.java

@@ -0,0 +1,9 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoAgencia;
+
+public interface GP_PricingEspecificoAgenciaDAO extends GenericDAO<GP_PricingEspecificoAgencia, Long> {
+
+	Boolean isDuplicado(GP_PricingEspecificoAgencia entidad);
+
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCanalVendasDAO.java

@@ -0,0 +1,9 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCanalVendas;
+
+public interface GP_PricingEspecificoCanalVendasDAO extends GenericDAO<GP_PricingEspecificoCanalVendas, Long> {
+
+	Boolean isDuplicado(GP_PricingEspecificoCanalVendas entidad);
+
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCategoriaDAO.java

@@ -0,0 +1,9 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCategoria;
+
+public interface GP_PricingEspecificoCategoriaDAO extends GenericDAO<GP_PricingEspecificoCategoria, Long> {
+
+	Boolean isDuplicado(GP_PricingEspecificoCategoria entidad);
+
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoDAO.java

@@ -0,0 +1,19 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecifico;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+
+
+public interface GP_PricingEspecificoDAO extends GenericDAO<GP_PricingEspecifico, Long> {
+
+    public List<GP_PricingEspecifico> buscarPorNome(GP_PricingEspecifico pricingEspecifico);
+    
+    public List<GP_PricingEspecifico> buscarPorNome(String nome);
+
+	public List<GP_PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoOcupacionDAO.java

@@ -0,0 +1,7 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoOcupacion;
+
+public interface GP_PricingEspecificoOcupacionDAO extends GenericDAO<GP_PricingEspecificoOcupacion, Long> {
+
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingFormapagoDAO.java

@@ -0,0 +1,11 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingFormapago;
+
+public interface GP_PricingFormapagoDAO extends GenericDAO<GP_PricingFormapago, Integer> {
+
+	List<GP_PricingFormapago> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingGestaoDAO.java

@@ -0,0 +1,7 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingGestao;
+
+public interface GP_PricingGestaoDAO extends GenericDAO<GP_PricingGestao, Integer> {
+
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingHistoricoDAO.java

@@ -0,0 +1,8 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingHistorico;
+
+
+public interface GP_PricingHistoricoDAO extends GenericDAO<GP_PricingHistorico, Long> {
+	
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingImporteDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingImporte;
+import com.rjconsultores.ventaboletos.entidad.Moneda;
+
+public interface GP_PricingImporteDAO extends GenericDAO<GP_PricingImporte, Integer> {
+
+    public List<GP_PricingImporte> buscarMoneda(GP_PricingImporte pricingImporte, Moneda moneda);
+
+	public List<GP_PricingImporte> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingMarcaDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingMarca;
+import com.rjconsultores.ventaboletos.entidad.Marca;
+
+public interface GP_PricingMarcaDAO extends GenericDAO<GP_PricingMarca, Integer> {
+
+    public Boolean obtenerPricingMarca(GP_Pricing pricing, Marca marca);
+
+	public List<GP_PricingMarca> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingMercadoDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingMercado;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+
+public interface GP_PricingMercadoDAO extends GenericDAO<GP_PricingMercado, Integer> {
+
+    public Boolean obtenerPricingMercado(GP_Pricing pricing, Parada origen, Parada destino);
+
+	public List<GP_PricingMercado> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingOcupaAntecipaDAO.java

@@ -0,0 +1,16 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa;
+
+public interface GP_PricingOcupaAntecipaDAO extends GenericDAO<GP_PricingOcupaAntecipa, Integer> {
+
+
+	public List<GP_PricingOcupaAntecipa> buscarOcupaAntecipaPricing(Integer pricingId);
+
+	public List<GP_PricingOcupaAntecipa> buscarOcupaAntecipaPricingAtivos(Integer pricingId);
+
+	public List<GP_PricingOcupaAntecipa> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingPuntoVentaDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingPuntoVenta;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+
+public interface GP_PricingPuntoVentaDAO extends GenericDAO<GP_PricingPuntoVenta, Integer> {
+
+    public Boolean obtenerPricingPuntoVenta(GP_Pricing pricing, PuntoVenta puntoVenta);
+
+	public List<GP_PricingPuntoVenta> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingRutaDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingRuta;
+import com.rjconsultores.ventaboletos.entidad.Ruta;
+
+public interface GP_PricingRutaDAO extends GenericDAO<GP_PricingRuta, Integer> {
+
+    public Boolean obtenerPricingRuta(GP_Pricing pricing, Ruta ruta);
+
+	public List<GP_PricingRuta> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoPtoVtaDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingTipoPtoVta;
+import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
+
+public interface GP_PricingTipoPtoVtaDAO extends GenericDAO<GP_PricingTipoPtoVta, Integer> {
+
+    public Boolean obtenerPricingTipoPuntoVenta(GP_Pricing pricing, TipoPuntoVenta tipoPuntoVenta);
+
+	public List<GP_PricingTipoPtoVta> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoServicioDAO.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingTipoServicio;
+import com.rjconsultores.ventaboletos.entidad.TipoServicio;
+
+public interface GP_PricingTipoServicioDAO extends GenericDAO<GP_PricingTipoServicio, Integer> {
+
+    public Boolean obtenerPricingTipoServicio(GP_Pricing pricing, TipoServicio tipoServicio);
+
+	public List<GP_PricingTipoServicio> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/GP_PricingVigenciaDAO.java

@@ -0,0 +1,17 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingVigencia;
+
+public interface GP_PricingVigenciaDAO extends GenericDAO<GP_PricingVigencia, Integer> {
+
+    public List<GP_PricingVigencia> buscarPorVigencias(GP_PricingVigencia pv);
+
+    public Boolean podeSalvar(GP_Pricing pricing, GP_PricingVigencia pricingVigencia,
+            Date inicio, Date fim);
+
+	public List<GP_PricingVigencia> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/dao/TramoDAO.java

@@ -53,4 +53,5 @@ public interface TramoDAO extends GenericDAO<Tramo, Integer> {
 
 	public List<TramoVO> buscarListaPorIds(List<Integer> tramoIds, String chaveCorrida, boolean tarifaEmbarcada) throws Exception;
     
+	List<Tramo> obtenerTramosPorOrigemDestino(Parada origem, Parada destino);
 }

src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java

@@ -38,6 +38,7 @@ import com.rjconsultores.ventaboletos.entidad.Corrida;
 import com.rjconsultores.ventaboletos.entidad.Corrida.Id;
 import com.rjconsultores.ventaboletos.entidad.CorridaTramo;
 import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.Marca;
 import com.rjconsultores.ventaboletos.entidad.Parada;
@@ -1113,5 +1114,80 @@ public class CorridaHibernateDAO extends GenericHibernateDAO<Corrida, Corrida.Id
 		
 		return 0;
 	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Corrida> buscarCorridas(Parada ori, Parada des, Date dataInicial, Date dataFinal, ClaseServicio cs,
+			Ruta linha, Empresa empresa) {
+		
+		StringBuilder hql = new StringBuilder("");
+		hql.append("select distinct ");
+		hql.append("    new com.rjconsultores.ventaboletos.entidad.Corrida(");
+		hql.append("	c.marca, ");
+		hql.append("	c.id.corridaId, ");
+		hql.append("	c.id.feccorrida, ");
+		hql.append("	c.origem, ");
+		hql.append("	c.destino, ");
+		hql.append("	c.claseServicio, ");
+		hql.append("	c.corridaCtrl.horario) ");
+		hql.append("from ");
+		hql.append("	Corrida c ");
+		hql.append(" where c.activo = 1 ");
+		
+		if (empresa != null) {
+			hql.append("	and c.empresa = :empresa ");
+		}
+		if (linha != null) {
+			hql.append("	and c.ruta = :linha ");
+		}
+		if (ori != null) {
+			hql.append("	and c.origem = :origen ");
+		}
+		if (des != null) {
+			hql.append("	and c.destino = :destino");
+		}
+		if (cs != null) {
+			hql.append("	and c.claseServicio = :claseServicio ");
+		}
+		if (dataInicial != null) {
+
+			hql.append("	and c.corridaCtrl.horario >= :horaSalidaInicio");
+		}
+		if (dataFinal != null) {
+
+			hql.append("	and c.corridaCtrl.horario <= :horaSalidaFin");
+		}
+
+		hql.append("  order by c.id.corridaId,c.corridaCtrl.horario");
+
+		Query query = getSession().createQuery(hql.toString());
+		
+		if (empresa != null) {
+			query.setParameter("empresa", empresa);
+		}
+		if (linha != null) {
+			query.setParameter("linha", linha);
+		}
+		if (ori != null) {
+			query.setParameter("origen", ori);
+		}
+		if (des != null) {
+			query.setParameter("destino", des);
+		}
+		if (cs != null) {
+			query.setParameter("claseServicio", cs);
+		}
+
+		if (dataInicial != null) {
+
+			query.setParameter("horaSalidaInicio", dataInicial);
+		}
+		if (dataFinal != null) {
+			query.setParameter("horaSalidaFin", dataFinal);
+
+		}
+
+		return query.list();
+	}
 
 }

src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java

@@ -8,6 +8,7 @@ import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.transform.AliasToBeanResultTransformer;
 import org.hibernate.type.ShortType;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Repository;
 import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO;
 import com.rjconsultores.ventaboletos.entidad.Corrida;
 import com.rjconsultores.ventaboletos.entidad.CorridaTramo;
+import com.rjconsultores.ventaboletos.entidad.Tramo;
 import com.rjconsultores.ventaboletos.utilerias.ActivoUtil;
 
 @Repository("corridaTramoDAO")
@@ -93,4 +95,15 @@ public class CorridaTramoHibernateDAO extends GenericHibernateDAO<CorridaTramo,
 
         return km;
     }
+    
+    public List<Tramo> buscarTramoPorCorridaId(Integer corridaId) {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", ActivoUtil.ATIVO));
+        c.createAlias("corrida", "corrida");
+        c.add(Restrictions.eq("corrida.id.corridaId", corridaId));
+        c.setProjection(Projections.distinct(Projections.property("tramo")));
+
+        return c.list();
+    }
+    
 }

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java

@@ -0,0 +1,50 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingAsientoDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingAsiento;
+import com.rjconsultores.ventaboletos.entidad.Pricing;
+
+@Repository("gp_pricingAsientoDAO")
+public class GP_PricingAsientoHibernateDAO extends GenericHibernateDAO<GP_PricingAsiento, Integer>
+		implements GP_PricingAsientoDAO {
+
+	@Autowired
+	public GP_PricingAsientoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingAsiento> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public List<GP_PricingAsiento> obtenerPricingCategoria(GP_Pricing pricing, Integer asiento) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("numeasiento", asiento.toString()));
+
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingAsiento> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingCategoriaDAO;
+import com.rjconsultores.ventaboletos.entidad.Categoria;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingCategoria;
+
+@Repository("gp_pricingCategoriaDAO")
+public class GP_PricingCategoriaHibernateDAO extends GenericHibernateDAO<GP_PricingCategoria, Integer>
+		implements GP_PricingCategoriaDAO {
+
+	@Autowired
+	public GP_PricingCategoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingCategoria> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingCategoria(GP_Pricing pricing, Categoria categoria) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("categoria", categoria));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	@Override
+	public List<GP_PricingCategoria> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java

@@ -0,0 +1,55 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingClaseDAO;
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingClase;
+
+@Repository("gp_pricingClaseDAO")
+public class GP_PricingClaseHibernateDAO extends GenericHibernateDAO<GP_PricingClase, Integer>
+		implements GP_PricingClaseDAO {
+
+	@Autowired
+	public GP_PricingClaseHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingClase> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingClase(GP_Pricing pricing, ClaseServicio claseServicio) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("claseServicio", claseServicio));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public List<GP_PricingClase> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+	
+	
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java

@@ -0,0 +1,51 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingClasseTarifariaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingClasseTarifaria;
+
+@Repository("gp_pricingClasseTarifariaDAO")
+public class GP_PricingClasseTarifariaHibernateDAO extends GenericHibernateDAO<GP_PricingClasseTarifaria, Integer>
+		implements GP_PricingClasseTarifariaDAO {
+
+	@Autowired
+	public GP_PricingClasseTarifariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<GP_PricingClasseTarifaria> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+		return c.list();
+	}
+
+	public Boolean validacionSigla(String sigla) {
+
+		StringBuffer hql = new StringBuffer();
+		hql.append("   FROM GP_PricingClasseTarifaria pct ");
+		hql.append("   WHERE pct.sigla = :sigla ");
+		hql.append("         AND pct.activo = :activo ");
+
+		Query query = getSession().createQuery(hql.toString());
+		query.setParameter("activo", Boolean.TRUE);
+		query.setParameter("sigla", sigla);
+
+		if (query.list().isEmpty())
+			return true;
+		else
+			return false;
+	}
+
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingCorridaDAO;
+import com.rjconsultores.ventaboletos.entidad.CorridaCtrl;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingCorrida;
+
+@Repository("gp_pricingCorridaDAO")
+public class GP_PricingCorridaHibernateDAO extends GenericHibernateDAO<GP_PricingCorrida, Integer>
+		implements GP_PricingCorridaDAO {
+
+	@Autowired
+	public GP_PricingCorridaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingCorrida> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingCorrida(GP_Pricing pricing, CorridaCtrl corrida) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("corridaCtrl", corrida));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public List<GP_PricingCorrida> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java

@@ -0,0 +1,71 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingDiaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingDia;
+import com.rjconsultores.ventaboletos.entidad.Pricing;
+
+@Repository("gp_pricingDiaDAO")
+public class GP_PricingDiaHibernateDAO extends GenericHibernateDAO<GP_PricingDia, Integer>
+		implements GP_PricingDiaDAO {
+
+	private static Logger log = Logger.getLogger(GP_PricingDiaHibernateDAO.class);
+
+	@Autowired
+	public GP_PricingDiaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingDia> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public List<GP_PricingDia> buscarTraslapa(GP_PricingDia pricingDia) {
+		Date horarioinicio = pricingDia.getHorarioinicio();
+		Date horariofin = pricingDia.getHorariofin();
+
+		SimpleDateFormat sf = new SimpleDateFormat("HHmm");
+
+		StringBuilder hql = new StringBuilder();
+		hql.append("select pv from GP_PricingDia pv ");
+		hql.append(" where pv.activo = 1 ");
+		hql.append(" and pricing.pricingId = ").append(pricingDia.getPricing().getPricingId());
+		hql.append(" and pv.horariofin >= :horariofin ");
+		hql.append(" and pv.horarioinicio >= :horarioinicio ");
+
+		log.info("Hora Ini: " + sf.format(horarioinicio));
+		log.info("Hora Fin: " + sf.format(horariofin));
+		log.info("SQL: " + hql.toString());
+
+		Query sq = getSession().createQuery(hql.toString());
+		sq.setParameter("horariofin", horariofin);
+		sq.setParameter("horarioinicio", horarioinicio);
+
+		return sq.list();
+	}
+
+	@Override
+	public List<GP_PricingDia> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java

@@ -0,0 +1,42 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingEspecificoAgenciaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoAgencia;
+
+
+@Repository("gp_pricingEspecificoAgenciaDAO")
+public class GP_PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO<GP_PricingEspecificoAgencia, Long> implements GP_PricingEspecificoAgenciaDAO {
+
+    @Autowired
+    public GP_PricingEspecificoAgenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<GP_PricingEspecificoAgencia> obtenerTodos() {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+        return c.list();
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Boolean isDuplicado(GP_PricingEspecificoAgencia entidad) {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", Boolean.TRUE));
+        c.add(Restrictions.eq("puntoVenta.puntoventaId", entidad.getPuntoVenta().getPuntoventaId()));
+       
+        return c.list().isEmpty();
+	}
+}
+

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java

@@ -0,0 +1,42 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingEspecificoCanalVendasDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCanalVendas;
+
+
+@Repository("gp_pricingEspecificoCanalVendasDAO")
+public class GP_PricingEspecificoCanalVendasHibernateDAO extends GenericHibernateDAO<GP_PricingEspecificoCanalVendas, Long> implements GP_PricingEspecificoCanalVendasDAO {
+
+    @Autowired
+    public GP_PricingEspecificoCanalVendasHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<GP_PricingEspecificoCanalVendas> obtenerTodos() {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+        return c.list();
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Boolean isDuplicado(GP_PricingEspecificoCanalVendas entidad) {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", Boolean.TRUE));
+        c.add(Restrictions.eq("tipoPtovta.tipoptovtaId", entidad.getTipoPtovta().getTipoptovtaId()));
+       
+        return c.list().isEmpty();
+	}
+}
+

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java

@@ -0,0 +1,40 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingEspecificoCategoriaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCategoria;
+
+@Repository("gp_pricingEspecificoCategoriaDAO")
+public class GP_PricingEspecificoCategoriaHibernateDAO extends GenericHibernateDAO<GP_PricingEspecificoCategoria, Long> implements GP_PricingEspecificoCategoriaDAO {
+
+	@Autowired
+	public GP_PricingEspecificoCategoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<GP_PricingEspecificoCategoria> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+		return c.list();
+	}
+
+	@Override
+	public Boolean isDuplicado(GP_PricingEspecificoCategoria entidad) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+		c.add(Restrictions.eq("categoria.categoriaId", entidad.getCategoria().getCategoriaId()));
+
+		return c.list().isEmpty();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java

@@ -0,0 +1,129 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingEspecificoDAO;
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecifico;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+
+/**
+ *
+ * @author Rafius
+ */
+@Repository("gp_pricingEspecificoDAO")
+public class GP_PricingEspecificoHibernateDAO extends GenericHibernateDAO<GP_PricingEspecifico, Long>
+		implements GP_PricingEspecificoDAO {
+
+	@Autowired
+	public GP_PricingEspecificoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingEspecifico> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+		return c.list();
+	}
+
+	public List<GP_PricingEspecifico> buscarPorNome(GP_PricingEspecifico pricingEspecifico) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+		c.add(Restrictions.eq("nombPricing", pricingEspecifico.getNombPricing()));
+
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingEspecifico> buscarPorNome(String nome) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+		c.add(Restrictions.eq("nombPricing", nome));
+
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal) {
+
+		StringBuilder hql = new StringBuilder();
+		hql.append("SELECT DISTINCT pe ");
+		hql.append("FROM GP_PricingEspecifico pe ");
+		hql.append(" WHERE pe.activo = 1 ");
+
+		if (!empresas.isEmpty()) {
+			hql.append(" AND pe.marca.empresa.empresaId IN (");
+			for (Empresa e : empresas) {
+				hql.append(e.getEmpresaId() + ",");
+			}
+			hql.deleteCharAt(hql.length() - 1);
+			hql.append(")");
+		}
+
+		if (!tipoClasses.isEmpty()) {
+			hql.append(" AND pe.claseServicio.claseservicioId IN (");
+			for (ClaseServicio c : tipoClasses) {
+				hql.append(c.getClaseservicioId() + ",");
+			}
+			hql.deleteCharAt(hql.length() - 1);
+			hql.append(")");
+		}
+
+		if (!origens.isEmpty()) {
+			hql.append(" AND pe.parada.paradaId IN (");
+			for (Parada o : origens) {
+				hql.append(o.getParadaId() + ",");
+			}
+			hql.deleteCharAt(hql.length() - 1);
+			hql.append(")");
+		}
+
+		if (!destinos.isEmpty()) {
+			hql.append(" AND pe.parada1.paradaId IN (");
+			for (Parada o : origens) {
+				hql.append(o.getParadaId() + ",");
+			}
+			hql.deleteCharAt(hql.length() - 1);
+			hql.append(")");
+		}
+
+		if (vigenciaInicial != null) {
+			hql.append(" AND YEAR(pe.fechorinicio) >= YEAR(:vigenciaInicial) ");
+			hql.append(" AND MONTH(pe.fechorinicio)>= MONTH(:vigenciaInicial) ");
+			hql.append(" AND DAY(pe.fechorinicio)  >= DAY(:vigenciaInicial) ");
+		}
+
+		if (vigenciaFinal != null) {
+			hql.append(" AND YEAR(pe.fechorfin)    <= YEAR(:vigenciaFinal) ");
+			hql.append(" AND MONTH(pe.fechorfin)   <= MONTH(:vigenciaFinal) ");
+			hql.append(" AND DAY(pe.fechorfin)     <= DAY(:vigenciaFinal) ");
+		}
+
+		Query query = getSession().createQuery(hql.toString());
+
+		if (vigenciaInicial != null) {
+			query.setDate("vigenciaInicial", vigenciaInicial);
+		}
+		if (vigenciaFinal != null) {
+			query.setDate("vigenciaFinal", vigenciaFinal);
+		}
+
+		return query.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java

@@ -0,0 +1,32 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingEspecificoOcupacionDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoOcupacion;
+
+
+@Repository("gp_pricingEspecificoOcupacionDAO")
+public class GP_PricingEspecificoOcupacionHibernateDAO extends GenericHibernateDAO<GP_PricingEspecificoOcupacion, Long> implements GP_PricingEspecificoOcupacionDAO {
+
+    @Autowired
+    public GP_PricingEspecificoOcupacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<GP_PricingEspecificoOcupacion> obtenerTodos() {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+        return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingFormapagoHibernateDAO.java

@@ -0,0 +1,32 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingFormapagoDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingFormapago;
+
+@Repository("gp_pricingFormapagoDAO")
+public class GP_PricingFormapagoHibernateDAO extends GenericHibernateDAO<GP_PricingFormapago, Integer> implements GP_PricingFormapagoDAO {
+
+	@Autowired
+	public GP_PricingFormapagoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingFormapago> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java

@@ -0,0 +1,33 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingGestaoDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingGestao;
+
+@Repository("gp_pricingGestaoDAO")
+public class GP_PricingGestaoHibernateDAO extends GenericHibernateDAO<GP_PricingGestao, Integer>
+		implements GP_PricingGestaoDAO {
+
+	@Autowired
+	public GP_PricingGestaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingGestao> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java

@@ -0,0 +1,156 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.transform.AliasToBeanResultTransformer;
+import org.hibernate.type.BigDecimalType;
+import org.hibernate.type.StringType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingDAO;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingVigencia;
+import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingRevisaoValoresVO;
+
+@Repository("gp_pricingDAO")
+public class GP_PricingHibernateDAO extends GenericHibernateDAO<GP_Pricing, Integer>
+		implements GP_PricingDAO {
+
+	@Autowired
+	public GP_PricingHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_Pricing> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public List<GP_Pricing> buscar(String nombPricing, Empresa empresa,
+			Short cantboleto, Integer cantdiasanticipacion,
+			BigDecimal descuentoporcentaje, BigDecimal descuentoporcredondo) {
+
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		c.add(Restrictions.eq("nombPricing", nombPricing));
+		c.add(Restrictions.eq("empresa", empresa));
+		c.add(Restrictions.eq("cantboleto", cantboleto));
+		c.add(Restrictions.eq("cantdiasanticipacion", cantdiasanticipacion));
+		if (descuentoporcentaje != null) {
+			c.add(Restrictions.eq("descuentoporcentaje", descuentoporcentaje));
+		}
+		if (descuentoporcredondo != null) {
+			c.add(Restrictions.eq("descuentoporcredondo", descuentoporcredondo));
+		}
+
+		return c.list();
+	}
+
+	public List<GP_Pricing> buscarPorNombre(String nombPricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		c.add(Restrictions.eq("nombPricing", nombPricing));
+
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingRevisaoValoresVO> buscarPricingRevisaoValoresVO(List<Integer> classeServicioIds,List<Integer> marcaIds, List<Integer> rutaIds, List<Integer> tramoIds, List<GP_PricingVigencia> lsPricingVigencia) {
+		StringBuilder sql = new StringBuilder();
+		sql.append("	SELECT distinct  ");
+		sql.append(" 	  porigen.descparada \"origem\",                                                               ");
+		sql.append("     pdestino.descparada \"destino\",                                                             ");
+		sql.append("     cs.descclase \"classeServico\",                                                              ");
+		sql.append("     coalesce(t.precio,0) + coalesce(t.importetaxaembarque,0) + coalesce(t.importepedagio,0)  ");
+		sql.append("     + coalesce(t.importeseguro,0) + coalesce(t.importeoutros,0) \"precioAtual\",                 ");
+		sql.append("     coalesce(t.precio,0) \"tarifaAtual\",                                                        ");
+		sql.append("     coalesce(t.importetaxaembarque,0) \"taxaEmbarque\",                                          ");
+		sql.append("     coalesce(t.importepedagio,0) \"pedagio\",                                                     ");
+		sql.append("     coalesce(t.importeseguro,0) \"seguro\",                                                     ");
+		sql.append("     coalesce(t.importeoutros,0) \"outros\"                                                     ");
+		sql.append(" FROM tarifa t                                                                                ");
+		sql.append(" join tramo tr on tr.tramo_id = t.tramo_id                                                    ");
+		sql.append(" join parada pOrigen on porigen.parada_id = tr.origen_id                                      ");
+		sql.append(" join parada pDestino on pDestino.parada_id = tr.destino_id                                   ");
+		sql.append(" join clase_servicio cs on cs.claseservicio_id = t.claseservicio_id                           ");
+		sql.append(" join vigencia_tarifa vt on vt.vigenciatarifa_id = t.vigenciatarifa_id                        ");
+		sql.append(" join marca m on m.marca_id = t.marca_id                                                      ");
+		sql.append(" join ruta r on t.ruta_id = r.ruta_id                                                         ");
+		sql.append(" where                                                                                        ");
+		sql.append(" t.activo = 1                                                                                 ");
+		sql.append(" and vt.activo = 1                                                                            ");
+		sql.append(" and tr.activo = 1                                                                            ");
+		if(lsPricingVigencia!= null && !lsPricingVigencia.isEmpty()) {
+			sql.append(" and (" );
+			for (int i = 1; i <= lsPricingVigencia.size(); i++) {
+				sql.append(" (:dataInicioPricing between vt.feciniciovigencia and vt.fecfinvigencia                   ");
+				sql.append(" or :dataFimPricing between vt.feciniciovigencia and vt.fecfinvigencia)                       ");
+				if(i < lsPricingVigencia.size()) {
+					sql.append(" or ");
+				}
+			}
+			sql.append(" )" );
+		}
+		
+		if (classeServicioIds != null && !classeServicioIds.isEmpty()) {
+			sql.append(" and cs.claseservicio_id in(:listClasseServicioId)                                            ");
+		}
+		if(tramoIds != null && !tramoIds.isEmpty()) {
+			sql.append(" and tr.tramo_id  in (:listTramoId)                                                           ");
+		}
+		if (marcaIds != null && !marcaIds.isEmpty()) {
+			sql.append(" and m.marca_id in(:listMarcaId)                                                          ");
+		}
+		if (rutaIds != null && !rutaIds.isEmpty()) {
+			sql.append(" and r.ruta_id in(:listRutaId)                                                                ");
+		}
+
+		Query query = getSession().createSQLQuery(sql.toString())
+				.addScalar("origem",StringType.INSTANCE)
+				.addScalar("destino",StringType.INSTANCE)
+				.addScalar("classeServico", StringType.INSTANCE)
+				.addScalar("precioAtual", BigDecimalType.INSTANCE)
+				.addScalar("tarifaAtual", BigDecimalType.INSTANCE)
+				.addScalar("taxaEmbarque", BigDecimalType.INSTANCE)
+				.addScalar("pedagio", BigDecimalType.INSTANCE)
+				.addScalar("seguro", BigDecimalType.INSTANCE)
+				.addScalar("outros", BigDecimalType.INSTANCE)
+				.setResultTransformer(new AliasToBeanResultTransformer(GP_PricingRevisaoValoresVO.class));
+		
+		if(lsPricingVigencia!= null && !lsPricingVigencia.isEmpty()) {
+			for (GP_PricingVigencia pricingVigencia:lsPricingVigencia) {	
+				query.setDate("dataInicioPricing", pricingVigencia.getFecinicioventa());
+				query.setDate("dataFimPricing", pricingVigencia.getFecfinventa());
+			} 
+		}
+		
+		if (classeServicioIds != null && !classeServicioIds.isEmpty()) {
+			query.setParameterList("listClasseServicioId", classeServicioIds);
+		}
+		if(tramoIds != null && !tramoIds.isEmpty()) {
+			query.setParameterList("listTramoId", tramoIds);
+		}
+		if (marcaIds != null && !marcaIds.isEmpty()) {
+			query.setParameterList("listMarcaId", marcaIds);
+		}
+		if (rutaIds != null && !rutaIds.isEmpty()) {
+			query.setParameterList("listRutaId", rutaIds);
+		}
+		
+		query.setFetchSize(1000);
+		return query.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHistoricoHibernateDAO.java

@@ -0,0 +1,21 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingHistoricoDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingHistorico;
+
+
+@Repository("gp_pricingHistoricoDAO")
+public class GP_PricingHistoricoHibernateDAO extends GenericHibernateDAO<GP_PricingHistorico, Long> implements GP_PricingHistoricoDAO {
+
+    @Autowired
+    public GP_PricingHistoricoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+			
+}
+

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java

@@ -0,0 +1,50 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingImporteDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingImporte;
+import com.rjconsultores.ventaboletos.entidad.Moneda;
+
+@Repository("gp_pricingImporteDAO")
+public class GP_PricingImporteHibernateDAO extends GenericHibernateDAO<GP_PricingImporte, Integer>
+		implements GP_PricingImporteDAO {
+
+	@Autowired
+	public GP_PricingImporteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingImporte> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public List<GP_PricingImporte> buscarMoneda(GP_PricingImporte pricingImporte, Moneda moneda) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricingImporte.getPricing()));
+		c.add(Restrictions.eq("moneda", moneda));
+
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingImporte> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingMarcaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingMarca;
+import com.rjconsultores.ventaboletos.entidad.Marca;
+
+@Repository("gp_pricingMarcaDAO")
+public class GP_PricingMarcaHibernateDAO extends GenericHibernateDAO<GP_PricingMarca, Integer>
+        implements GP_PricingMarcaDAO {
+
+    @Autowired
+    public GP_PricingMarcaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+
+    @Override
+    public List<GP_PricingMarca> obtenerTodos() {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+        return c.list();
+    }
+
+    public Boolean obtenerPricingMarca(GP_Pricing pricing, Marca marca) {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+        c.add(Restrictions.eq("pricing", pricing));
+        c.add(Restrictions.eq("marca", marca));
+
+        if (c.list().size() > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+	@Override
+	public List<GP_PricingMarca> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java

@@ -0,0 +1,55 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingMercadoDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingMercado;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+
+@Repository("gp_pricingMercadoDAO")
+public class GP_PricingMercadoHibernateDAO extends GenericHibernateDAO<GP_PricingMercado, Integer>
+		implements GP_PricingMercadoDAO {
+
+	@Autowired
+	public GP_PricingMercadoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingMercado> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingMercado(GP_Pricing pricing, Parada origen, Parada destino) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("origen", origen));
+		c.add(Restrictions.eq("destino", destino));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public List<GP_PricingMercado> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java

@@ -0,0 +1,67 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingOcupaAntecipaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa;
+
+@Repository("gp_pricingOcupacionDAO")
+public class GP_PricingOcupaAntecipaHibernateDAO extends GenericHibernateDAO<GP_PricingOcupaAntecipa, Integer>
+		implements GP_PricingOcupaAntecipaDAO {
+
+	@Autowired
+	public GP_PricingOcupaAntecipaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingOcupaAntecipa> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingOcupaAntecipa> buscarOcupaAntecipaPricing(Integer pricingId) {
+		return buscarOcupaAntecipaPricing(pricingId, GP_Pricing.ATIVO, GP_Pricing.INATIVO);
+	}
+
+	@Override
+	public List<GP_PricingOcupaAntecipa> buscarOcupaAntecipaPricingAtivos(Integer pricingId) {
+		return buscarOcupaAntecipaPricing(pricingId, GP_Pricing.ATIVO, null);
+	}
+	
+	private List<GP_PricingOcupaAntecipa> buscarOcupaAntecipaPricing(Integer pricingId, Integer ativo, Integer inativo) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		
+		List<Integer> pricingStatus = new ArrayList<Integer>();
+		if(ativo != null) {
+			pricingStatus.add(ativo);
+		}
+		if(inativo != null) {
+			pricingStatus.add(inativo);
+		}
+		
+		c.add(Restrictions.in("activo", pricingStatus));
+		c.add(Restrictions.eq("pricing.pricingId", pricingId));
+		
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingOcupaAntecipa> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	} 
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingPuntoVentaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingPuntoVenta;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+
+@Repository("gp_pricingPuntoVentaDAO")
+public class GP_PricingPuntoVentaHibernateDAO extends GenericHibernateDAO<GP_PricingPuntoVenta, Integer>
+		implements GP_PricingPuntoVentaDAO {
+
+	@Autowired
+	public GP_PricingPuntoVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingPuntoVenta> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingPuntoVenta(GP_Pricing pricing, PuntoVenta puntoVenta) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("puntoVenta", puntoVenta));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public List<GP_PricingPuntoVenta> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingRutaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingRuta;
+import com.rjconsultores.ventaboletos.entidad.Ruta;
+
+@Repository("gp_pricingRutaDAO")
+public class GP_PricingRutaHibernateDAO extends GenericHibernateDAO<GP_PricingRuta, Integer>
+		implements GP_PricingRutaDAO {
+
+	@Autowired
+	public GP_PricingRutaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingRuta> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingRuta(GP_Pricing pricing, Ruta ruta) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("ruta", ruta));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public List<GP_PricingRuta> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingTipoPtoVtaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingTipoPtoVta;
+import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
+
+@Repository("gp_pricingTipoPtoVtaDAO")
+public class GP_PricingTipoPtoVtaHibernateDAO extends GenericHibernateDAO<GP_PricingTipoPtoVta, Integer>
+        implements GP_PricingTipoPtoVtaDAO {
+
+    @Autowired
+    public GP_PricingTipoPtoVtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+
+    @Override
+    public List<GP_PricingTipoPtoVta> obtenerTodos() {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+        return c.list();
+    }
+
+    public Boolean obtenerPricingTipoPuntoVenta(GP_Pricing pricing, TipoPuntoVenta tipoPuntoVenta) {
+        Criteria c = getSession().createCriteria(getPersistentClass());
+        c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+        c.add(Restrictions.eq("pricing", pricing));
+        c.add(Restrictions.eq("tipoPtovta", tipoPuntoVenta));
+
+        if (c.list().size() > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+	@Override
+	public List<GP_PricingTipoPtoVta> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java

@@ -0,0 +1,54 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingTipoServicioDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingTipoServicio;
+import com.rjconsultores.ventaboletos.entidad.TipoServicio;
+
+@Repository("gp_pricingTipoServicioDAO")
+public class GP_PricingTipoServicioHibernateDAO extends GenericHibernateDAO<GP_PricingTipoServicio, Integer>
+		implements GP_PricingTipoServicioDAO {
+
+	@Autowired
+	public GP_PricingTipoServicioHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingTipoServicio> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	public Boolean obtenerPricingTipoServicio(GP_Pricing pricing, TipoServicio tipoServicio) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.eq("pricing", pricing));
+		c.add(Restrictions.eq("tipoServicio", tipoServicio));
+
+		if (c.list().size() > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public List<GP_PricingTipoServicio> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java

@@ -0,0 +1,83 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.GP_PricingVigenciaDAO;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingVigencia;
+
+@Repository("gp_pricingVigenciaDAO")
+public class GP_PricingVigenciaHibernateDAO extends GenericHibernateDAO<GP_PricingVigencia, Integer>
+		implements GP_PricingVigenciaDAO {
+
+	@Autowired
+	public GP_PricingVigenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
+
+	@Override
+	public List<GP_PricingVigencia> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		return c.list();
+	}
+
+	@Override
+	public List<GP_PricingVigencia> buscarPorVigencias(GP_PricingVigencia pv) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+
+		c.add(Restrictions.eq("pricing", pv.getPricing()));
+
+		Date fecinicioventa = pv.getFecinicioventa();
+		Date fecfinventa = pv.getFecfinventa();
+
+		c.add(Restrictions.or(Restrictions.between("fecinicioventa", fecinicioventa, fecfinventa),
+				(Restrictions.between("fecfinventa", fecinicioventa, fecfinventa))));
+
+		return c.list();
+	}
+
+	@Override
+	public Boolean podeSalvar(GP_Pricing pricing, GP_PricingVigencia pricingVigencia, Date inicio, Date fim) {
+		Calendar fecInicio = Calendar.getInstance();
+		fecInicio.setTime(inicio);
+		fecInicio.set(Calendar.MILLISECOND, 0);
+		fecInicio.set(Calendar.SECOND, 0);
+
+		Calendar fecFin = Calendar.getInstance();
+		fecFin.setTime(fim);
+		fecFin.set(Calendar.MILLISECOND, 0);
+		fecFin.set(Calendar.SECOND, 0);
+
+		Criteria c = this.getSession().createCriteria(GP_PricingVigencia.class);
+		c.add(Restrictions.eq("activo", GP_Pricing.ATIVO));
+		c.add(Restrictions.ge("fecfinviaje", fecInicio.getTime()));
+		c.add(Restrictions.le("fecinicioviaje", fecFin.getTime()));
+		c.add(Restrictions.eq("pricing", pricing));
+		if (pricingVigencia.getPricingvigenciaId() != null) {
+			c.add(Restrictions.ne("pricingvigenciaId", pricingVigencia.getPricingvigenciaId()));
+		}
+
+		return c.list().isEmpty();
+	}
+
+	@Override
+	public List<GP_PricingVigencia> obtenerTodoPorPricing(GP_Pricing pricing) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("pricing.pricingId", pricing.getPricingId()));
+
+		return c.list();
+	}
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java

@@ -285,4 +285,15 @@ public class TramoHibernateDAO extends GenericHibernateDAO<Tramo, Integer>
 		
 		return query.list();
 	}
+	
+	@Override
+	public List<Tramo> obtenerTramosPorOrigemDestino(Parada origem, Parada destino) {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("origem", origem));
+		c.add(Restrictions.eq("destino", destino));
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+
+
+		return c.list();
+	}
 }

src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java

@@ -292,5 +292,10 @@ public class ClaseServicio implements Serializable, Auditavel<ClaseServicio> {
 	public void setTipoDescontoMonitrip(TipoClasseServicoBPe tipoClasseServicoBPe) {
 		this.tipoDescontoMonitrip = tipoClasseServicoBPe;
 	}
+	
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
 
 }

src/com/rjconsultores/ventaboletos/entidad/GP_Pricing.java

@@ -0,0 +1,845 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_SEQ", sequenceName = "GP_PRICING_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING")
+public class GP_Pricing implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	public static final Integer ATIVO = 1;
+	public static final Integer INATIVO = 2;
+	public static final Integer EXCLUIDO = 0;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_SEQ")
+	@Column(name = "PRICING_ID")
+	private Integer pricingId;
+	
+	@Column(name = "NOMBPRICING")
+	private String nombPricing;
+	
+	@Column(name = "CANTBOLETO")
+	private Short cantboleto;
+	
+	@Column(name = "DESCUENTOPORCENTAJE")
+	private BigDecimal descuentoporcentaje;
+	
+	@Column(name = "DESCUENTOPORCREDONDO")
+	private BigDecimal descuentoporcredondo;
+	
+	@Column(name = "INDTRANSFERIBLE")
+	private Boolean indtransferible;
+	
+	@Column(name = "INDRESERVABLE")
+	private Boolean indreservable;
+	
+	@Column(name = "EXIBEVENDA")
+	private Boolean exibeVenda;
+	
+	@Column(name = "INDCANCELABLE")
+	private Boolean indcancelable;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@Column(name = "CANTDIASANTICIPACION")
+	private Integer cantdiasanticipacion;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingAsiento> pricingAsientoList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingMercado> pricingMercadoList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingMarca> pricingMarcaList;
+	
+	@JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID")
+	@ManyToOne	
+	private Empresa empresa;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingRuta> pricingRutaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingDia> pricingDiaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingImporte> pricingImporteList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingTipoPtoVta> pricingTipoptovtaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingCategoria> pricingCategoriaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingVigencia> pricingVigenciaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingClase> pricingClaseList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingCorrida> pricingCorridaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingPuntoVenta> pricingPuntoventaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingTipoServicio> pricingTipoServicioList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingOcupaAntecipa> pricingOcupaAntecipaList;
+	
+	@OneToMany(mappedBy = "pricing", cascade = CascadeType.ALL)
+	private List<GP_PricingFormapago> pricingFormapagoList;
+	
+	@Column(name = "INDGENERAFERIADOVIAJE")
+	private String indGeneraFeriadoViaje;
+	
+	@Column(name = "INDGENERAFERIADOVENTA")
+	private String indGeneraFeriadoVenta;
+	
+	@Column(name = "COLOR")
+	private String color;
+	
+	@Column(name = "INDSOBREPOSICAO")
+	private Boolean indSobreposicao;
+	
+	@Column(name = "INDGESTAO")
+	private Boolean indGestao;
+	
+	@Column(name = "INDAGRUPADODIA")
+	private Boolean indAgrupadoDia;
+	
+	@Column(name = "INDAGRUPADOSERVICO")
+	private Boolean indAgrupadoServico;
+	
+	@Column(name = "INDESTADIAMINIMA")
+	private Boolean indestadiaminima;
+	
+	@Column(name = "CANTDIAS_ESTADIAMINIMA")
+	private Integer cantdiasEstadiaminima;
+	
+	@Column(name = "INDLUN_ESTADIAMINIMA")
+	private Boolean indLunEstadiaminima;
+	
+	@Column(name = "INDMAR_ESTADIAMINIMA")
+	private Boolean indMarEstadiaminima;
+	
+	@Column(name = "INDMIE_ESTADIAMINIMA")
+	private Boolean indMieEstadiaminima;
+	
+	@Column(name = "INDJUE_ESTADIAMINIMA")
+	private Boolean indJueEstadiaminima;
+	
+	@Column(name = "INDVIE_ESTADIAMINIMA")
+	private Boolean indVieEstadiaminima;
+	
+	@Column(name = "INDSAB_ESTADIAMINIMA")
+	private Boolean indSabEstadiaminima;
+	
+	@Column(name = "INDDOM_ESTADIAMINIMA")
+	private Boolean indDomEstadiaminima;
+
+	public enum GerarFeriado {
+		// Declaração dos enum
+		GERARSEMPRE("GERAR SEMPRE", "S"),
+
+		GERARQUANDOFERIADO("GERAR SÓ QUANDO FOR FERIADO", "F"),
+
+		GERARQUANDONAOFERIADO("GERAR QUANDO NÃO FOR FERIADO", "N");
+
+		// Definição das constantes
+		public final String valor;
+		public final String descricao;
+
+		public String valor() {
+			return this.valor;
+		}
+
+		public String descricao() {
+			return this.descricao;
+		}
+
+		private GerarFeriado(String descricao, String valor) {
+			this.descricao = descricao;
+			this.valor = valor;
+		}
+	}
+
+	public GP_Pricing() {
+	}
+
+	public GP_Pricing(Integer pricingId) {
+		this.pricingId = pricingId;
+	}
+
+	public Integer getPricingId() {
+		return pricingId;
+	}
+
+	public void setPricingId(Integer pricingId) {
+		this.pricingId = pricingId;
+	}
+
+	public Short getCantboleto() {
+		return cantboleto;
+	}
+
+	public Integer getCantdiasanticipacion() {
+		return cantdiasanticipacion;
+	}
+
+	public void setCantdiasanticipacion(Integer cantdiasanticipacion) {
+		this.cantdiasanticipacion = cantdiasanticipacion;
+	}
+
+	public void setCantboleto(Short cantboleto) {
+		this.cantboleto = cantboleto;
+	}
+
+	public BigDecimal getDescuentoporcentaje() {
+		return descuentoporcentaje;
+	}
+
+	public void setDescuentoporcentaje(BigDecimal descuentoporcentaje) {
+		this.descuentoporcentaje = descuentoporcentaje;
+	}
+
+	public BigDecimal getDescuentoporcredondo() {
+		return descuentoporcredondo;
+	}
+
+	public void setDescuentoporcredondo(BigDecimal descuentoporcredondo) {
+		this.descuentoporcredondo = descuentoporcredondo;
+	}
+
+	public Boolean getIndtransferible() {
+		return indtransferible;
+	}
+
+	public void setIndtransferible(Boolean indtransferible) {
+		this.indtransferible = indtransferible;
+	}
+
+	public Boolean getIndreservable() {
+		return indreservable;
+	}
+
+	public void setIndreservable(Boolean indreservable) {
+		this.indreservable = indreservable;
+	}
+
+	public Boolean getIndcancelable() {
+		return indcancelable;
+	}
+
+	public void setIndcancelable(Boolean indcancelable) {
+		this.indcancelable = indcancelable;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public List<GP_PricingOcupaAntecipa> getPricingOcupaAntecipaList() {
+		List<GP_PricingOcupaAntecipa> poaList = new ArrayList<GP_PricingOcupaAntecipa>();
+		for (GP_PricingOcupaAntecipa poa : this.pricingOcupaAntecipaList) {
+			if (poa.getActivo() != EXCLUIDO.intValue()) {
+				poaList.add(poa);
+			}
+		}
+		return poaList;
+	}
+
+	public void setPricingOcupaAntecipaList(List<GP_PricingOcupaAntecipa> pricingOcupaAntecipaList) {
+		this.pricingOcupaAntecipaList = pricingOcupaAntecipaList;
+	}
+
+	public List<GP_PricingAsiento> getPricingAsientoList() {
+		List<GP_PricingAsiento> paList = new ArrayList<GP_PricingAsiento>();
+		for (GP_PricingAsiento pa : this.pricingAsientoList) {
+			if (pa.getActivo() != EXCLUIDO.intValue()) {
+				paList.add(pa);
+			}
+		}
+
+		return paList;
+	}
+
+	public void setPricingAsientoList(List<GP_PricingAsiento> pricingAsientoList) {
+		this.pricingAsientoList = pricingAsientoList;
+	}
+
+	public List<GP_PricingMercado> getPricingMercadoList() {
+		List<GP_PricingMercado> pmList = new ArrayList<GP_PricingMercado>();
+		for (GP_PricingMercado pm : this.pricingMercadoList) {
+			if (pm.getActivo() != EXCLUIDO.intValue()) {
+				pmList.add(pm);
+			}
+		}
+
+		return pmList;
+	}
+
+	public void setPricingMercadoList(List<GP_PricingMercado> pricingMercadoList) {
+		this.pricingMercadoList = pricingMercadoList;
+	}
+
+	public List<GP_PricingMarca> getPricingMarcaList() {
+		List<GP_PricingMarca> pmList = new ArrayList<GP_PricingMarca>();
+		for (GP_PricingMarca pm : this.pricingMarcaList) {
+			if (pm.getActivo() != EXCLUIDO.intValue()) {
+				pmList.add(pm);
+			}
+		}
+
+		return pmList;
+	}
+
+	public void setPricingMarcaList(List<GP_PricingMarca> pricingMarcaList) {
+		this.pricingMarcaList = pricingMarcaList;
+	}
+
+	public Empresa getEmpresa() {
+		return empresa;
+	}
+
+	public void setEmpresa(Empresa empresa) {
+		this.empresa = empresa;
+	}
+
+	public List<GP_PricingRuta> getPricingRutaList() {
+		List<GP_PricingRuta> prList = new ArrayList<GP_PricingRuta>();
+		for (GP_PricingRuta pr : this.pricingRutaList) {
+			if (pr.getActivo() != EXCLUIDO.intValue()) {
+				prList.add(pr);
+			}
+		}
+
+		return prList;
+	}
+
+	public void setPricingRutaList(List<GP_PricingRuta> pricingRutaList) {
+		this.pricingRutaList = pricingRutaList;
+	}
+
+	public List<GP_PricingDia> getPricingDiaList() {
+		List<GP_PricingDia> pdList = new ArrayList<GP_PricingDia>();
+		for (GP_PricingDia pd : this.pricingDiaList) {
+			if (pd.getActivo() != EXCLUIDO.intValue()) {
+				pdList.add(pd);
+			}
+		}
+
+		return pdList;
+	}
+
+	public void setPricingDiaList(List<GP_PricingDia> pricingDiaList) {
+		this.pricingDiaList = pricingDiaList;
+	}
+
+	public List<GP_PricingImporte> getPricingImporteList() {
+		List<GP_PricingImporte> piList = new ArrayList<GP_PricingImporte>();
+		for (GP_PricingImporte pi : this.pricingImporteList) {
+			if (pi.getActivo() != EXCLUIDO.intValue()) {
+				piList.add(pi);
+			}
+		}
+
+		return piList;
+	}
+
+	public void setPricingImporteList(List<GP_PricingImporte> pricingImporteList) {
+		this.pricingImporteList = pricingImporteList;
+	}
+
+	public List<GP_PricingTipoPtoVta> getPricingTipoptovtaList() {
+		List<GP_PricingTipoPtoVta> ptList = new ArrayList<GP_PricingTipoPtoVta>();
+		for (GP_PricingTipoPtoVta pt : this.pricingTipoptovtaList) {
+			if (pt.getActivo() != EXCLUIDO.intValue()) {
+				ptList.add(pt);
+			}
+		}
+
+		return ptList;
+	}
+
+	public void setPricingTipoptovtaList(List<GP_PricingTipoPtoVta> pricingTipoptovtaList) {
+		this.pricingTipoptovtaList = pricingTipoptovtaList;
+	}
+
+	public List<GP_PricingCategoria> getPricingCategoriaList() {
+		List<GP_PricingCategoria> pcList = new ArrayList<GP_PricingCategoria>();
+		for (GP_PricingCategoria pc : this.pricingCategoriaList) {
+			if (pc.getActivo() != EXCLUIDO.intValue()) {
+				pcList.add(pc);
+			}
+		}
+
+		return pcList;
+	}
+
+	public void setPricingCategoriaList(List<GP_PricingCategoria> pricingCategoriaList) {
+		this.pricingCategoriaList = pricingCategoriaList;
+	}
+
+	public List<GP_PricingVigencia> getPricingVigenciaList() {
+		List<GP_PricingVigencia> pvList = new ArrayList<GP_PricingVigencia>();
+		if (this.pricingVigenciaList != null) {
+			for (GP_PricingVigencia pv : this.pricingVigenciaList) {
+				if (pv.getActivo() != EXCLUIDO.intValue()) {
+					pvList.add(pv);
+				}
+			}
+		}
+
+		return pvList;
+	}
+
+	public void setPricingVigenciaList(List<GP_PricingVigencia> pricingVigenciaList) {
+		this.pricingVigenciaList = pricingVigenciaList;
+	}
+
+	public List<GP_PricingClase> getPricingClaseList() {
+		List<GP_PricingClase> pcList = new ArrayList<GP_PricingClase>();
+		for (GP_PricingClase pc : this.pricingClaseList) {
+			if (pc.getActivo() != EXCLUIDO.intValue()) {
+				pcList.add(pc);
+			}
+		}
+
+		return pcList;
+	}
+
+	public void setPricingClaseList(List<GP_PricingClase> pricingClaseList) {
+		this.pricingClaseList = pricingClaseList;
+	}
+
+	public List<GP_PricingCorrida> getPricingCorridaList() {
+		List<GP_PricingCorrida> pcList = new ArrayList<GP_PricingCorrida>();
+		if (pricingCorridaList == null) {
+			return null;
+		}
+
+		for (GP_PricingCorrida pc : this.pricingCorridaList) {
+			if (pc.getActivo() != EXCLUIDO.intValue()) {
+				pcList.add(pc);
+			}
+		}
+
+		return pcList;
+	}
+
+	public void setPricingCorridaList(List<GP_PricingCorrida> pricingCorridaList) {
+		this.pricingCorridaList = pricingCorridaList;
+	}
+
+	public List<GP_PricingPuntoVenta> getPricingPuntoventaList() {
+		List<GP_PricingPuntoVenta> ppList = new ArrayList<GP_PricingPuntoVenta>();
+		for (GP_PricingPuntoVenta pp : this.pricingPuntoventaList) {
+			if (pp.getActivo() != EXCLUIDO.intValue()) {
+				ppList.add(pp);
+			}
+		}
+
+		return ppList;
+	}
+
+	public void setPricingPuntoventaList(List<GP_PricingPuntoVenta> pricingPuntoventaList) {
+		this.pricingPuntoventaList = pricingPuntoventaList;
+	}
+
+	public List<GP_PricingTipoServicio> getPricingTipoServicioList() {
+		List<GP_PricingTipoServicio> ppList = new ArrayList<GP_PricingTipoServicio>();
+		for (GP_PricingTipoServicio pp : this.pricingTipoServicioList) {
+			if (pp.getActivo() != EXCLUIDO.intValue()) {
+				ppList.add(pp);
+			}
+		}
+
+		return ppList;
+	}
+
+	public void setPricingTipoServicioList(List<GP_PricingTipoServicio> pricingTipoServicioList) {
+		this.pricingTipoServicioList = pricingTipoServicioList;
+	}
+
+	public List<GP_PricingFormapago> getPricingFormapagoList() {
+		List<GP_PricingFormapago> pfpList = new ArrayList<GP_PricingFormapago>();
+		for (GP_PricingFormapago pfp : this.pricingFormapagoList) {
+			if (pfp.getActivo() != EXCLUIDO.intValue()) {
+				pfpList.add(pfp);
+			}
+		}
+
+		return pfpList;
+	}
+
+	public void setPricingFormapagoList(List<GP_PricingFormapago> pricingFormapagoList) {
+		this.pricingFormapagoList = pricingFormapagoList;
+	}
+
+	public String getIndGeneraFeriadoViaje() {
+		return indGeneraFeriadoViaje;
+	}
+
+	public void setIndGeneraFeriadoViaje(String indGeneraFeriadoViaje) {
+		this.indGeneraFeriadoViaje = indGeneraFeriadoViaje;
+	}
+
+	public String getIndGeneraFeriadoVenta() {
+		return indGeneraFeriadoVenta;
+	}
+
+	public void setIndGeneraFeriadoVenta(String indGeneraFeriadoVenta) {
+		this.indGeneraFeriadoVenta = indGeneraFeriadoVenta;
+	}
+
+	public String getNombPricing() {
+		return nombPricing;
+	}
+
+	public void setNombPricing(String nombPricing) {
+		this.nombPricing = nombPricing;
+	}
+	
+	public Boolean getExibeVenda() {
+		return exibeVenda;
+	}
+
+	public void setExibeVenda(Boolean exibeVenda) {
+		this.exibeVenda = exibeVenda;
+	}
+
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	public Boolean getIndSobreposicao() {
+		return indSobreposicao;
+	}
+
+	public void setIndSobreposicao(Boolean indSobreposicao) {
+		this.indSobreposicao = indSobreposicao;
+	}
+
+	public Boolean getIndGestao() {
+		return indGestao;
+	}
+
+	public void setIndGestao(Boolean indGestao) {
+		this.indGestao = indGestao;
+	}
+	
+	public Boolean getIndAgrupadoDia() {
+		return indAgrupadoDia;
+	}
+
+	public void setIndAgrupadoDia(Boolean indAgrupadoDia) {
+		this.indAgrupadoDia = indAgrupadoDia;
+	}
+
+	public Boolean getIndAgrupadoServico() {
+		return indAgrupadoServico;
+	}
+
+	public void setIndAgrupadoServico(Boolean indAgrupadoServico) {
+		this.indAgrupadoServico = indAgrupadoServico;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingId != null ? pricingId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_Pricing)) {
+			return false;
+		}
+		GP_Pricing other = (GP_Pricing) object;
+		if ((this.pricingId == null && other.pricingId != null) || (this.pricingId != null && !this.pricingId.equals(other.pricingId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "[ Id=" + pricingId + ", nome=" + nombPricing + "]";
+	}
+
+	public Boolean getIndestadiaminima() {
+		return indestadiaminima;
+	}
+
+	public void setIndestadiaminima(Boolean indestadiaminima) {
+		this.indestadiaminima = indestadiaminima;
+	}
+
+	public Integer getCantdiasEstadiaminima() {
+		return cantdiasEstadiaminima;
+	}
+
+	public void setCantdiasEstadiaminima(Integer cantdiasEstadiaminima) {
+		this.cantdiasEstadiaminima = cantdiasEstadiaminima;
+	}
+
+	public Boolean getIndLunEstadiaminima() {
+		return indLunEstadiaminima;
+	}
+
+	public void setIndLunEstadiaminima(Boolean indLunEstadiaminima) {
+		this.indLunEstadiaminima = indLunEstadiaminima;
+	}
+
+	public Boolean getIndMarEstadiaminima() {
+		return indMarEstadiaminima;
+	}
+
+	public void setIndMarEstadiaminima(Boolean indMarEstadiaminima) {
+		this.indMarEstadiaminima = indMarEstadiaminima;
+	}
+
+	public Boolean getIndMieEstadiaminima() {
+		return indMieEstadiaminima;
+	}
+
+	public void setIndMieEstadiaminima(Boolean indMieEstadiaminima) {
+		this.indMieEstadiaminima = indMieEstadiaminima;
+	}
+
+	public Boolean getIndJueEstadiaminima() {
+		return indJueEstadiaminima;
+	}
+
+	public void setIndJueEstadiaminima(Boolean indJueEstadiaminima) {
+		this.indJueEstadiaminima = indJueEstadiaminima;
+	}
+
+	public Boolean getIndVieEstadiaminima() {
+		return indVieEstadiaminima;
+	}
+
+	public void setIndVieEstadiaminima(Boolean indVieEstadiaminima) {
+		this.indVieEstadiaminima = indVieEstadiaminima;
+	}
+
+	public Boolean getIndSabEstadiaminima() {
+		return indSabEstadiaminima;
+	}
+
+	public void setIndSabEstadiaminima(Boolean indSabEstadiaminima) {
+		this.indSabEstadiaminima = indSabEstadiaminima;
+	}
+
+	public Boolean getIndDomEstadiaminima() {
+		return indDomEstadiaminima;
+	}
+
+	public void setIndDomEstadiaminima(Boolean indDomEstadiaminima) {
+		this.indDomEstadiaminima = indDomEstadiaminima;
+	}
+	
+	public GP_Pricing clonar() throws CloneNotSupportedException {
+		GP_Pricing novo = new GP_Pricing();
+
+		novo = (GP_Pricing) super.clone();
+
+		novo.setEmpresa((Empresa) empresa.getCloneObject());
+
+		List<GP_PricingAsiento> auxGP_PricingAsientoList = new ArrayList<GP_PricingAsiento>();
+		for (GP_PricingAsiento aux : pricingAsientoList) {
+
+			GP_PricingAsiento obj = (GP_PricingAsiento) aux.clone();
+
+			auxGP_PricingAsientoList.add(obj);
+		}
+		novo.setPricingAsientoList(auxGP_PricingAsientoList);
+		
+		List<GP_PricingCategoria> auxGP_PricingCategoriaList = new ArrayList<GP_PricingCategoria>();
+		for (GP_PricingCategoria aux : pricingCategoriaList) {
+
+			GP_PricingCategoria obj = (GP_PricingCategoria) aux.clone();
+
+			auxGP_PricingCategoriaList.add(obj);
+		}
+		novo.setPricingCategoriaList(auxGP_PricingCategoriaList);
+
+		List<GP_PricingClase> auxGP_PricingClaseList = new ArrayList<GP_PricingClase>();
+		for (GP_PricingClase aux : pricingClaseList) {
+
+			GP_PricingClase obj = (GP_PricingClase) aux.clone();
+
+			auxGP_PricingClaseList.add(obj);
+		}
+		novo.setPricingClaseList(auxGP_PricingClaseList);
+
+		List<GP_PricingCorrida> auxGP_PricingCorridaList = new ArrayList<GP_PricingCorrida>();
+		for (GP_PricingCorrida aux : pricingCorridaList) {
+
+			GP_PricingCorrida obj = (GP_PricingCorrida) aux.clone();
+
+			auxGP_PricingCorridaList.add(obj);
+		}
+		novo.setPricingCorridaList(auxGP_PricingCorridaList);
+
+		List<GP_PricingDia> auxGP_PricingDiaList = new ArrayList<GP_PricingDia>();
+		for (GP_PricingDia aux : pricingDiaList) {
+
+			GP_PricingDia obj = (GP_PricingDia) aux.clone();
+
+			auxGP_PricingDiaList.add(obj);
+		}
+		novo.setPricingDiaList(auxGP_PricingDiaList);
+
+		List<GP_PricingFormapago> auxGP_PricingFormapagoList = new ArrayList<GP_PricingFormapago>();
+		for (GP_PricingFormapago aux : pricingFormapagoList) {
+
+			GP_PricingFormapago obj = (GP_PricingFormapago) aux.clone();
+
+			auxGP_PricingFormapagoList.add(obj);
+		}
+		novo.setPricingFormapagoList(auxGP_PricingFormapagoList);
+
+		List<GP_PricingImporte> auxGP_PricingImporteList = new ArrayList<GP_PricingImporte>();
+		for (GP_PricingImporte aux : pricingImporteList) {
+
+			GP_PricingImporte obj = (GP_PricingImporte) aux.clone();
+
+			auxGP_PricingImporteList.add(obj);
+		}
+		novo.setPricingImporteList(auxGP_PricingImporteList);
+
+		List<GP_PricingMarca> auxGP_PricingMarcaList = new ArrayList<GP_PricingMarca>();
+		for (GP_PricingMarca aux : pricingMarcaList) {
+
+			GP_PricingMarca obj = (GP_PricingMarca) aux.clone();
+
+			auxGP_PricingMarcaList.add(obj);
+		}
+		novo.setPricingMarcaList(auxGP_PricingMarcaList);
+
+		List<GP_PricingMercado> auxGP_PricingMercadoList = new ArrayList<GP_PricingMercado>();
+		for (GP_PricingMercado aux : pricingMercadoList) {
+
+			GP_PricingMercado obj = (GP_PricingMercado) aux.clone();
+
+			auxGP_PricingMercadoList.add(obj);
+		}
+		novo.setPricingMercadoList(auxGP_PricingMercadoList);
+
+		List<GP_PricingOcupaAntecipa> auxGP_PricingOcupaAntecipaList = new ArrayList<GP_PricingOcupaAntecipa>();
+		for (GP_PricingOcupaAntecipa aux : pricingOcupaAntecipaList) {
+
+			GP_PricingOcupaAntecipa obj = (GP_PricingOcupaAntecipa) aux.clone();
+
+			auxGP_PricingOcupaAntecipaList.add(obj);
+		}
+		novo.setPricingOcupaAntecipaList(auxGP_PricingOcupaAntecipaList);
+
+		List<GP_PricingVigencia> auxGP_PricingVigenciaList = new ArrayList<GP_PricingVigencia>();
+		for (GP_PricingVigencia aux : pricingVigenciaList) {
+
+			GP_PricingVigencia obj = (GP_PricingVigencia) aux.clone();
+
+			auxGP_PricingVigenciaList.add(obj);
+		}
+		novo.setPricingVigenciaList(auxGP_PricingVigenciaList);
+
+		List<GP_PricingPuntoVenta> auxGP_PricingPuntoVentaList = new ArrayList<GP_PricingPuntoVenta>();
+		for (GP_PricingPuntoVenta aux : pricingPuntoventaList) {
+
+			GP_PricingPuntoVenta obj = (GP_PricingPuntoVenta) aux.clone();
+
+			auxGP_PricingPuntoVentaList.add(obj);
+		}
+		novo.setPricingPuntoventaList(auxGP_PricingPuntoVentaList);
+
+		List<GP_PricingRuta> auxGP_PricingRutaList = new ArrayList<GP_PricingRuta>();
+		for (GP_PricingRuta aux : pricingRutaList) {
+
+			GP_PricingRuta obj = (GP_PricingRuta) aux.clone();
+
+			auxGP_PricingRutaList.add(obj);
+		}
+		novo.setPricingRutaList(auxGP_PricingRutaList);
+
+		List<GP_PricingTipoPtoVta> auxGP_PricingTipoPtoVtaList = new ArrayList<GP_PricingTipoPtoVta>();
+		for (GP_PricingTipoPtoVta aux : pricingTipoptovtaList) {
+
+			GP_PricingTipoPtoVta obj = (GP_PricingTipoPtoVta) aux.clone();
+
+			auxGP_PricingTipoPtoVtaList.add(obj);
+		}
+		novo.setPricingTipoptovtaList(auxGP_PricingTipoPtoVtaList);
+
+		List<GP_PricingTipoServicio> auxGP_PricingTipoServicioList = new ArrayList<GP_PricingTipoServicio>();
+		for (GP_PricingTipoServicio aux : pricingTipoServicioList) {
+
+			GP_PricingTipoServicio obj = (GP_PricingTipoServicio) aux.clone();
+
+			auxGP_PricingTipoServicioList.add(obj);
+		}
+		novo.setPricingTipoServicioList(auxGP_PricingTipoServicioList);
+
+		return novo;
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingAsiento.java

@@ -0,0 +1,159 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_ASIENTO_SEQ", sequenceName = "GP_PRICING_ASIENTO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_ASIENTO")
+public class GP_PricingAsiento implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_ASIENTO_SEQ")
+	@Column(name = "PRICINGASIENTO_ID")
+	private Integer pricingasientoId;
+	
+	@Column(name = "NUMEASIENTO")
+	private String numeasiento;
+	
+	@Column(name = "NOMBIMAGEN")
+	private String nombImagen;
+	
+	@Column(name = "PORCENTAJE")
+	private BigDecimal porcentaje;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+
+	public GP_PricingAsiento() {
+	}
+
+	public GP_PricingAsiento(Integer pricingasientoId) {
+		this.pricingasientoId = pricingasientoId;
+	}
+
+	public Integer getPricingasientoId() {
+		return pricingasientoId;
+	}
+
+	public void setPricingasientoId(Integer pricingasientoId) {
+		this.pricingasientoId = pricingasientoId;
+	}
+
+	public String getNumeasiento() {
+		return numeasiento;
+	}
+
+	public void setNumeasiento(String numeasiento) {
+		this.numeasiento = numeasiento;
+	}
+
+	public BigDecimal getPorcentaje() {
+		return porcentaje;
+	}
+
+	public void setPorcentaje(BigDecimal porcentaje) {
+		this.porcentaje = porcentaje;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public String getNombImagen() {
+		return nombImagen;
+	}
+
+	public void setNombImagen(String nombImagen) {
+		this.nombImagen = nombImagen;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingasientoId != null ? pricingasientoId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingAsiento)) {
+			return false;
+		}
+		GP_PricingAsiento other = (GP_PricingAsiento) object;
+		if ((this.pricingasientoId == null && other.pricingasientoId != null) || (this.pricingasientoId != null && !this.pricingasientoId.equals(other.pricingasientoId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [Poltrona=" + numeasiento + ", Porcentagem=" + porcentaje + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+	
+	
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingCategoria.java

@@ -0,0 +1,134 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_CATEGORIA_SEQ", sequenceName = "GP_PRICING_CATEGORIA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_CATEGORIA")
+public class GP_PricingCategoria implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_CATEGORIA_SEQ")
+	@Column(name = "PRICINGCATEGORIA_ID")
+	private Integer pricingcategoriaId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID")
+	@ManyToOne
+	private Categoria categoria;
+
+	public GP_PricingCategoria() {
+	}
+
+	public GP_PricingCategoria(Integer pricingcategoriaId) {
+		this.pricingcategoriaId = pricingcategoriaId;
+	}
+
+	public Integer getPricingcategoriaId() {
+		return pricingcategoriaId;
+	}
+
+	public void setPricingcategoriaId(Integer pricingcategoriaId) {
+		this.pricingcategoriaId = pricingcategoriaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public Categoria getCategoria() {
+		return categoria;
+	}
+
+	public void setCategoria(Categoria categoria) {
+		this.categoria = categoria;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingcategoriaId != null ? pricingcategoriaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingCategoria)) {
+			return false;
+		}
+		GP_PricingCategoria other = (GP_PricingCategoria) object;
+		if ((this.pricingcategoriaId == null && other.pricingcategoriaId != null) || (this.pricingcategoriaId != null && !this.pricingcategoriaId.equals(other.pricingcategoriaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [ categoria=" + categoria.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+	
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingClase.java

@@ -0,0 +1,135 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_CLASE_SEQ", sequenceName = "GP_PRICING_CLASE_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_CLASE")
+public class GP_PricingClase implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_CLASE_SEQ")
+	@Column(name = "PRICINGCLASE_ID")
+	private Integer pricingclaseId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID")
+	@ManyToOne
+	private ClaseServicio claseServicio;
+
+	public GP_PricingClase() {
+	}
+
+	public GP_PricingClase(Integer pricingclaseId) {
+		this.pricingclaseId = pricingclaseId;
+	}
+
+	public Integer getPricingclaseId() {
+		return pricingclaseId;
+	}
+
+	public void setPricingclaseId(Integer pricingclaseId) {
+		this.pricingclaseId = pricingclaseId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public ClaseServicio getClaseServicio() {
+		return claseServicio;
+	}
+
+	public void setClaseServicio(ClaseServicio claseServicio) {
+		this.claseServicio = claseServicio;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingclaseId != null ? pricingclaseId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingClase)) {
+			return false;
+		}
+		GP_PricingClase other = (GP_PricingClase) object;
+		if ((this.pricingclaseId == null && other.pricingclaseId != null) || (this.pricingclaseId != null && !this.pricingclaseId.equals(other.pricingclaseId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return "[ CLASSE =" + claseServicio.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+	
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingClasseTarifaria.java

@@ -0,0 +1,127 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_CLAS_TAR_SEQ", sequenceName = "GP_PRICING_CLAS_TAR_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_CLASSE_TARIFARIA")
+public class GP_PricingClasseTarifaria implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_CLAS_TAR_SEQ")
+	@Column(name = "PRICINGCLASSETARIFARIA_ID")
+	private Integer pricingClasseTarifariaId;
+	@Column(name = "DESCCLASSE_TARIFARIA")
+	private String descClasseTarifaria;
+	@Column(name = "SIGLA")
+	private String sigla;
+	@Basic(optional = false)
+	@Column(name = "ACTIVO")
+	private Boolean activo;
+	@Basic(optional = false)
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+
+	public Integer getPricingClasseTarifariaId() {
+		return pricingClasseTarifariaId;
+	}
+
+	public void setPricingClasseTarifariaId(Integer pricingClasseTarifariaId) {
+		this.pricingClasseTarifariaId = pricingClasseTarifariaId;
+	}
+
+	public String getDescClasseTarifaria() {
+		return descClasseTarifaria;
+	}
+
+	public void setDescClasseTarifaria(String descClasseTarifaria) {
+		this.descClasseTarifaria = descClasseTarifaria;
+	}
+
+	public String getSigla() {
+		return sigla;
+	}
+
+	public void setSigla(String sigla) {
+		this.sigla = sigla;
+	}
+
+	public Boolean getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((pricingClasseTarifariaId == null) ? 0 : pricingClasseTarifariaId.hashCode());
+		result = prime * result + ((sigla == null) ? 0 : sigla.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		GP_PricingClasseTarifaria other = (GP_PricingClasseTarifaria) obj;
+		if (pricingClasseTarifariaId == null) {
+			if (other.pricingClasseTarifariaId != null)
+				return false;
+		} else if (!pricingClasseTarifariaId.equals(other.pricingClasseTarifariaId))
+			return false;
+		if (sigla == null) {
+			if (other.sigla != null)
+				return false;
+		} else if (!sigla.equals(other.sigla))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return descClasseTarifaria + " - " + sigla;
+	}
+
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingCorrida.java

@@ -0,0 +1,132 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_CORRIDA_SEQ", sequenceName = "GP_PRICING_CORRIDA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_CORRIDA")
+public class GP_PricingCorrida implements Serializable, Cloneable {
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_CORRIDA_SEQ")
+	@Column(name = "PRICINGCORRIDA_ID")
+	private Integer pricingcorridaId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "CORRIDA_ID", referencedColumnName = "CORRIDA_ID")
+	@ManyToOne
+	private CorridaCtrl corridaCtrl;
+
+	public GP_PricingCorrida() {
+	}
+
+	public GP_PricingCorrida(Integer pricingcorridaId) {
+		this.pricingcorridaId = pricingcorridaId;
+	}
+
+	public Integer getPricingcorridaId() {
+		return pricingcorridaId;
+	}
+
+	public void setPricingcorridaId(Integer pricingcorridaId) {
+		this.pricingcorridaId = pricingcorridaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public CorridaCtrl getCorridaCtrl() {
+		return corridaCtrl;
+	}
+
+	public void setCorridaCtrl(CorridaCtrl corridaCtrl) {
+		this.corridaCtrl = corridaCtrl;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingcorridaId != null ? pricingcorridaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingCorrida)) {
+			return false;
+		}
+		GP_PricingCorrida other = (GP_PricingCorrida) object;
+		if ((this.pricingcorridaId == null && other.pricingcorridaId != null) || (this.pricingcorridaId != null && !this.pricingcorridaId.equals(other.pricingcorridaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return "[ CORRIDA =" + corridaCtrl.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingDia.java

@@ -0,0 +1,245 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_DIA_SEQ", sequenceName = "GP_PRICING_DIA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_DIA")
+public class GP_PricingDia implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_DIA_SEQ")
+	@Column(name = "PRICINGDIA_ID")
+	private Integer pricingdiaId;
+	
+	@Column(name = "INDLUNES")
+	private Boolean indlunes;
+	
+	@Column(name = "INDMARTES")
+	private Boolean indmartes;
+	
+	@Column(name = "INDMIERCOLES")	
+	private Boolean indmiercoles;
+	
+	@Column(name = "INDJUEVES")
+	private Boolean indjueves;
+	
+	@Column(name = "INDVIERNES")
+	private Boolean indviernes;
+	
+	@Column(name = "INDSABADO")
+	private Boolean indsabado;
+	
+	@Column(name = "INDDOMINGO")
+	private Boolean inddomingo;
+	
+	@Column(name = "HORARIOINICIO")
+	@Temporal(TemporalType.TIMESTAMP)
+	// Fue cambido de TIME para TIMESTAMP porque cuando está time el año que se salva el 1900 y no 1970.
+	private Date horarioinicio;
+	
+	@Column(name = "HORARIOFIN")
+	@Temporal(TemporalType.TIMESTAMP)
+	// Fue cambido de TIME para TIMESTAMP porque cuando está time el año que se salva el 1900 y no 1970.
+	private Date horariofin;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@Column(name = "INDFECVIAJE")
+	private Boolean indfecviaje;
+	
+	@Column(name = "INDFECVENTA")
+	private Boolean indfecventa;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+
+	public GP_PricingDia() {
+	}
+
+	public GP_PricingDia(Integer pricingdiaId) {
+		this.pricingdiaId = pricingdiaId;
+	}
+
+	public Integer getPricingdiaId() {
+		return pricingdiaId;
+	}
+
+	public void setPricingdiaId(Integer pricingdiaId) {
+		this.pricingdiaId = pricingdiaId;
+	}
+
+	public Boolean getInddomingo() {
+		return inddomingo;
+	}
+
+	public void setInddomingo(Boolean inddomingo) {
+		this.inddomingo = inddomingo;
+	}
+
+	public Boolean getIndjueves() {
+		return indjueves;
+	}
+
+	public void setIndjueves(Boolean indjueves) {
+		this.indjueves = indjueves;
+	}
+
+	public Boolean getIndlunes() {
+		return indlunes;
+	}
+
+	public void setIndlunes(Boolean indlunes) {
+		this.indlunes = indlunes;
+	}
+
+	public Boolean getIndmartes() {
+		return indmartes;
+	}
+
+	public void setIndmartes(Boolean indmartes) {
+		this.indmartes = indmartes;
+	}
+
+	public Boolean getIndmiercoles() {
+		return indmiercoles;
+	}
+
+	public void setIndmiercoles(Boolean indmiercoles) {
+		this.indmiercoles = indmiercoles;
+	}
+
+	public Boolean getIndsabado() {
+		return indsabado;
+	}
+
+	public void setIndsabado(Boolean indsabado) {
+		this.indsabado = indsabado;
+	}
+
+	public Boolean getIndviernes() {
+		return indviernes;
+	}
+
+	public void setIndviernes(Boolean indviernes) {
+		this.indviernes = indviernes;
+	}
+
+	public Date getHorarioinicio() {
+		return horarioinicio;
+	}
+
+	public void setHorarioinicio(Date horarioinicio) {
+		this.horarioinicio = horarioinicio;
+	}
+
+	public Date getHorariofin() {
+		return horariofin;
+	}
+
+	public void setHorariofin(Date horariofin) {
+		this.horariofin = horariofin;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public Boolean getIndfecviaje() {
+		return indfecviaje;
+	}
+
+	public void setIndfecviaje(Boolean indfecviaje) {
+		this.indfecviaje = indfecviaje;
+	}
+
+	public Boolean getIndfecventa() {
+		return indfecventa;
+	}
+
+	public void setIndfecventa(Boolean indfecventa) {
+		this.indfecventa = indfecventa;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingdiaId != null ? pricingdiaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingDia)) {
+			return false;
+		}
+		GP_PricingDia other = (GP_PricingDia) object;
+		if ((this.pricingdiaId == null && other.pricingdiaId != null) || (this.pricingdiaId != null && !this.pricingdiaId.equals(other.pricingdiaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "[id=" + pricingdiaId + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecifico.java

@@ -0,0 +1,430 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.annotations.Where;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_ESPECIFICO_SEQ", sequenceName = "GP_PRICING_ESPECIFICO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_ESPECIFICO")
+public class GP_PricingEspecifico implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_ESPECIFICO_SEQ")
+	@Column(name = "PRICINGESPECIFICO_ID")
+	private Long pricingespecificoId;
+	
+	@Column(name = "NOMBPRICING")
+	private String nombPricing;
+	
+	@Column(name = "FECHORINICIO")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fechorinicio;
+	
+	@Column(name = "FECHORFIN")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fechorfin;
+	
+	@Column(name = "TARIFA")
+	private BigDecimal tarifa;
+	
+	@Column(name = "TARIFAREDABIERTO")
+	private BigDecimal tarifaredabierto;
+	
+	@Column(name = "ACTIVO")
+	private Boolean activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID")
+	@ManyToOne
+	private Parada parada;
+	
+	@JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID")
+	@ManyToOne
+	private Parada parada1;
+	
+	@JoinColumn(name = "MONEDA_ID", referencedColumnName = "MONEDA_ID")
+	@ManyToOne
+	private Moneda moneda;
+	
+	@JoinColumn(name = "MARCA_ID", referencedColumnName = "MARCA_ID")
+	@ManyToOne
+	private Marca marca;
+	
+	@JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID")
+	@ManyToOne
+	private ClaseServicio claseServicio;
+	
+	@Column(name = "CORRIDA_ID")
+	private Integer corridaId;
+	
+	@Column(name = "EXIBEVENDA")
+	private Boolean exibeVenda;
+	
+	@OneToMany(mappedBy = "pricingEspecifico", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	private List<GP_PricingEspecificoOcupacion> pricingEspecificoOcupacionsList;
+	
+	@OneToMany(mappedBy = "pricingEspecifico", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+	@Where(clause="ACTIVO=1")
+	private List<GP_PricingEspecificoAgencia> pricingEspecificoAgenciasList;
+	
+	@OneToMany(mappedBy = "pricingEspecifico", cascade = CascadeType.ALL)
+	@LazyCollection(LazyCollectionOption.FALSE)
+	@Where(clause="ACTIVO=1")
+	private List<GP_PricingEspecificoCanalVendas> pricingEspecificoCanalVendasList;
+
+	@OneToMany(mappedBy = "pricingEspecifico", cascade = CascadeType.ALL)
+	@LazyCollection(LazyCollectionOption.FALSE)
+	@Where(clause="ACTIVO=1")
+	private List<GP_PricingEspecificoCategoria> pricingEspecificoCategoriaList;
+	
+	@Column(name = "COLOR")
+	private String color;
+	
+	@Column(name = "INDSOBREPOSICAO")
+	private Boolean indSobreposicao;
+
+	public GP_PricingEspecifico() {
+	}
+
+	public GP_PricingEspecifico(Long pricingespecificoId) {
+		this.pricingespecificoId = pricingespecificoId;
+	}
+
+	public Long getPricingespecificoId() {
+		return pricingespecificoId;
+	}
+
+	public void setPricingespecificoId(Long pricingespecificoId) {
+		this.pricingespecificoId = pricingespecificoId;
+	}
+
+	public Date getFechorinicio() {
+		return fechorinicio;
+	}
+
+	public void setFechorinicio(Date fechorinicio) {
+		this.fechorinicio = fechorinicio;
+	}
+
+	public Date getFechorfin() {
+		return fechorfin;
+	}
+
+	public void setFechorfin(Date fechorfin) {
+		this.fechorfin = fechorfin;
+	}
+
+	public BigDecimal getTarifa() {
+		return tarifa;
+	}
+
+	public void setTarifa(BigDecimal tarifa) {
+		this.tarifa = tarifa;
+	}
+
+	public BigDecimal getTarifaredabierto() {
+		return tarifaredabierto;
+	}
+
+	public void setTarifaredabierto(BigDecimal tarifaredabierto) {
+		this.tarifaredabierto = tarifaredabierto;
+	}
+
+	public Boolean getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public Parada getParada() {
+		return parada;
+	}
+
+	public void setParada(Parada parada) {
+		this.parada = parada;
+	}
+
+	public Parada getParada1() {
+		return parada1;
+	}
+
+	public void setParada1(Parada parada1) {
+		this.parada1 = parada1;
+	}
+
+	public Moneda getMoneda() {
+		return moneda;
+	}
+
+	public void setMoneda(Moneda moneda) {
+		this.moneda = moneda;
+	}
+
+	public Marca getMarca() {
+		return marca;
+	}
+
+	public void setMarca(Marca marca) {
+		this.marca = marca;
+	}
+
+	public ClaseServicio getClaseServicio() {
+		return claseServicio;
+	}
+
+	public void setClaseServicio(ClaseServicio claseServicio) {
+		this.claseServicio = claseServicio;
+	}
+
+	public String getNombPricing() {
+		return nombPricing;
+	}
+
+	public void setNombPricing(String nombPricing) {
+		this.nombPricing = nombPricing;
+	}
+
+	public Integer getCorridaId() {
+		return corridaId;
+	}
+
+	public void setCorridaId(Integer corridaId) {
+		this.corridaId = corridaId;
+	}
+
+	public List<GP_PricingEspecificoOcupacion> getPricingEspecificoOcupacionsList() {
+		if(this.pricingEspecificoOcupacionsList == null){
+			this.pricingEspecificoOcupacionsList = new ArrayList<GP_PricingEspecificoOcupacion>();
+		}
+		return this.pricingEspecificoOcupacionsList;
+	}
+
+	public void setPricingEspecificoOcupacionsList(List<GP_PricingEspecificoOcupacion> pricingEspecificoOcupacionsList) {
+		this.pricingEspecificoOcupacionsList = pricingEspecificoOcupacionsList;
+	}
+	
+	public Boolean getExibeVenda() {
+		return exibeVenda;
+	}
+
+	public void setExibeVenda(Boolean exibeVenda) {
+		this.exibeVenda = exibeVenda;
+	}
+	
+	public List<GP_PricingEspecificoAgencia> getPricingEspecificoAgenciasList() {
+		if(this.pricingEspecificoAgenciasList == null){
+			this.pricingEspecificoAgenciasList = new ArrayList<GP_PricingEspecificoAgencia>();
+		}
+		return pricingEspecificoAgenciasList;
+	}
+
+	public void setPricingEspecificoAgenciasList(List<GP_PricingEspecificoAgencia> pricingEspecificoAgenciasList) {
+		this.pricingEspecificoAgenciasList = pricingEspecificoAgenciasList;
+	}
+	
+
+	public List<GP_PricingEspecificoCanalVendas> getPricingEspecificoCanalVendasList() {
+		if(this.pricingEspecificoCanalVendasList == null){
+			this.pricingEspecificoCanalVendasList = new ArrayList<GP_PricingEspecificoCanalVendas>();
+		}
+		return pricingEspecificoCanalVendasList;
+	}
+
+	public void setPricingEspecificoCanalVendasList(List<GP_PricingEspecificoCanalVendas> pricingEspecificoCanalVendasList) {
+		this.pricingEspecificoCanalVendasList = pricingEspecificoCanalVendasList;
+	}
+
+	public List<GP_PricingEspecificoCategoria> getPricingEspecificoCategoriaList() {
+		if (this.pricingEspecificoCategoriaList == null) {
+			this.pricingEspecificoCategoriaList = new ArrayList<GP_PricingEspecificoCategoria>();
+		}
+		return pricingEspecificoCategoriaList;
+	}
+
+	public void setPricingEspecificoCategoriaList(List<GP_PricingEspecificoCategoria> pricingEspecificoCategoriaList) {
+		this.pricingEspecificoCategoriaList = pricingEspecificoCategoriaList;
+	}
+
+	public Boolean getIndSobreposicao() {
+		return indSobreposicao;
+	}
+
+	public void setIndSobreposicao(Boolean indSobreposicao) {
+		this.indSobreposicao = indSobreposicao;
+	}
+
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingespecificoId != null ? pricingespecificoId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		// TODO: Warning - this method won't work in the case the id fields are not set
+		if (!(object instanceof GP_PricingEspecifico)) {
+			return false;
+		}
+		GP_PricingEspecifico other = (GP_PricingEspecifico) object;
+		if ((this.pricingespecificoId == null && other.pricingespecificoId != null) || (this.pricingespecificoId != null && !this.pricingespecificoId.equals(other.pricingespecificoId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "[ nomePricing="+ nombPricing+ "] ";
+	}
+	
+	@Transient
+	public List<GP_PricingEspecificoOcupacion> getPricingEspecificoOcupacionsListActivos() {
+		List<GP_PricingEspecificoOcupacion> peoList = new ArrayList<GP_PricingEspecificoOcupacion>();
+		if(getPricingEspecificoOcupacionsList() != null) {
+			for (GP_PricingEspecificoOcupacion peo : getPricingEspecificoOcupacionsList()) {
+				if (peo.getActivo()) {
+					peoList.add(peo);
+				}
+			}
+		}
+		return peoList;
+	}
+	@Transient
+	public List<GP_PricingEspecificoAgencia> getPricingEspecificoAgenciaListActivos() {
+		List<GP_PricingEspecificoAgencia> peoList = new ArrayList<GP_PricingEspecificoAgencia>();
+		if(getPricingEspecificoAgenciasList() != null) {
+			for (GP_PricingEspecificoAgencia peo : getPricingEspecificoAgenciasList()) {
+				if (peo.getActivo()) {
+					peoList.add(peo);
+				}
+			}
+		}
+		return peoList;
+	}
+	@Transient
+	public List<GP_PricingEspecificoCanalVendas> getPricingEspecificoCanalListActivos() {
+		List<GP_PricingEspecificoCanalVendas> pecList = new ArrayList<GP_PricingEspecificoCanalVendas>();
+		if(getPricingEspecificoCanalVendasList() != null) {
+			for (GP_PricingEspecificoCanalVendas pec : getPricingEspecificoCanalVendasList()) {
+				if (pec.getActivo()) {
+					pecList.add(pec);
+				}
+			}
+		}
+		return pecList;
+	}
+	
+	public GP_PricingEspecifico clonar() throws CloneNotSupportedException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
+		GP_PricingEspecifico novo = new GP_PricingEspecifico();
+		
+		novo = (GP_PricingEspecifico) super.clone();
+		
+		novo.setClaseServicio((ClaseServicio) this.claseServicio.clone());
+		novo.setMarca((Marca) this.marca.clone());
+		novo.setMoneda((Moneda) this.moneda.clone());
+		novo.setParada((Parada) this.parada.clone());
+		novo.setParada1((Parada) this.parada1.clone());
+		
+		novo.setPricingEspecificoAgenciasList(new ArrayList<GP_PricingEspecificoAgencia>());
+		for(GP_PricingEspecificoAgencia  aux: pricingEspecificoAgenciasList) {
+			
+			GP_PricingEspecificoAgencia obj = (GP_PricingEspecificoAgencia) aux.clone();
+			
+			if(obj.getActivo()) {
+				novo.getPricingEspecificoAgenciasList().add(obj);
+			}
+		}
+		
+		novo.setPricingEspecificoCanalVendasList(new ArrayList<GP_PricingEspecificoCanalVendas>());
+		for(GP_PricingEspecificoCanalVendas  aux: pricingEspecificoCanalVendasList) {
+			
+			GP_PricingEspecificoCanalVendas obj = (GP_PricingEspecificoCanalVendas) aux.clone();
+			
+			if(obj.getActivo()) {
+				novo.getPricingEspecificoCanalVendasList().add(obj);
+			}
+		}
+		
+		novo.setPricingEspecificoCategoriaList(new ArrayList<GP_PricingEspecificoCategoria>());
+		for(GP_PricingEspecificoCategoria  aux: pricingEspecificoCategoriaList) {
+			
+			GP_PricingEspecificoCategoria obj = (GP_PricingEspecificoCategoria) aux.clone();
+			
+			if(obj.getActivo()) {
+				novo.getPricingEspecificoCategoriaList().add(obj);
+			}
+		}
+		
+		novo.setPricingEspecificoOcupacionsList(new ArrayList<GP_PricingEspecificoOcupacion>());
+		for(GP_PricingEspecificoOcupacion  aux: pricingEspecificoOcupacionsList) {
+			
+			GP_PricingEspecificoOcupacion obj = (GP_PricingEspecificoOcupacion) aux.clone();
+			
+			if(obj.getActivo()) {
+				novo.getPricingEspecificoOcupacionsList().add(obj);
+			}
+		}
+		
+		return novo;
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoAgencia.java

@@ -0,0 +1,144 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_ESP_PUNTOV_SEQ", sequenceName = "GP_PRICING_ESP_PUNTOV_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_ESP_PUNTO_VENTA")
+public class GP_PricingEspecificoAgencia implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_ESP_PUNTOV_SEQ")
+	@Column(name = "PRICINGESPPUNTOVENTA_ID")
+	private Integer pricingEspecificoAgenciaId;
+	
+	@ManyToOne
+	@JoinColumn(name = "PUNTOVENTA_ID",referencedColumnName = "PUNTOVENTA_ID")
+	private PuntoVenta puntoVenta;
+	
+	@Basic(optional = false)
+	@Column(name = "ACTIVO")
+	private Boolean activo;
+
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+    @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID")
+	@ManyToOne
+	private GP_PricingEspecifico pricingEspecifico;
+    
+	public GP_PricingEspecificoAgencia() {
+		super();
+	}
+	public GP_PricingEspecificoAgencia(PuntoVenta puntoVenta, GP_PricingEspecifico pricingEspecifico, Integer usuarioId) {
+		super();
+		
+		this.puntoVenta = puntoVenta;
+		this.pricingEspecifico = pricingEspecifico;
+		this.usuarioId  = usuarioId;
+		this.fecmodif = new Date();
+		this.activo = Boolean.TRUE;
+	}
+	public Integer getPricingEspecificoAgenciaId() {
+		return pricingEspecificoAgenciaId;
+	}
+	public void setPricingEspecificoAgenciaId(Integer pricingEspecificoAgenciaId) {
+		this.pricingEspecificoAgenciaId = pricingEspecificoAgenciaId;
+	}
+	public PuntoVenta getPuntoVenta() {
+		return puntoVenta;
+	}
+	public void setPuntoVenta(PuntoVenta puntoVenta) {
+		this.puntoVenta = puntoVenta;
+	}
+	public Boolean getActivo() {
+		return activo;
+	}
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+	public GP_PricingEspecifico getPricingEspecifico() {
+		return pricingEspecifico;
+	}
+	public void setPricingEspecifico(GP_PricingEspecifico pricingEspecifico) {
+		this.pricingEspecifico = pricingEspecifico;
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((activo == null) ? 0 : activo.hashCode());
+		result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode());
+		result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		GP_PricingEspecificoAgencia other = (GP_PricingEspecificoAgencia) obj;
+		if (activo == null) {
+			if (other.activo != null)
+				return false;
+		} else if (!activo.equals(other.activo))
+			return false;
+		if (pricingEspecifico == null) {
+			if (other.pricingEspecifico != null)
+				return false;
+		} else if (!pricingEspecifico.equals(other.pricingEspecifico))
+			return false;
+		if (puntoVenta == null) {
+			if (other.puntoVenta != null)
+				return false;
+		} else if (!puntoVenta.equals(other.puntoVenta))
+			return false;
+		return true;
+	}
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+	@Override
+	public String toString() {
+		return "[puntoVenta=" + puntoVenta.toString() + " ]";
+	}
+
+	
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCanalVendas.java

@@ -0,0 +1,148 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * @author Bruno Rodrigo
+ *
+ */
+@Entity
+@SequenceGenerator(name = "GP_PRICING_ESP_CANAL_SEQ", sequenceName = "GP_PRICING_ESP_CANAL_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_ESP_CANAL_VENTA")
+public class GP_PricingEspecificoCanalVendas implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_ESP_CANAL_SEQ")
+	@Column(name = "PRICINGESPCANAL_ID")
+	private Integer pricingEspecificoCanalId;
+	
+	@ManyToOne
+	@JoinColumn(name = "TIPOPTOVTA_ID", referencedColumnName = "TIPOPTOVTA_ID")
+	private TipoPuntoVenta tipoPtovta;
+	
+	@Basic(optional = false)
+	@Column(name = "ACTIVO")
+	private Boolean activo;
+
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+    @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID")
+	@ManyToOne
+	private GP_PricingEspecifico pricingEspecifico;
+    
+	public GP_PricingEspecificoCanalVendas() {
+		super();
+	}
+	public GP_PricingEspecificoCanalVendas(TipoPuntoVenta tipoPtovta, GP_PricingEspecifico pricingEspecifico, Integer usuarioId) {
+		super();
+		
+		this.tipoPtovta = tipoPtovta;
+		this.pricingEspecifico = pricingEspecifico;
+		this.usuarioId  = usuarioId;
+		this.fecmodif = new Date();
+		this.activo = Boolean.TRUE;
+	}
+	
+	public Integer getPricingEspecificoCanalId() {
+		return pricingEspecificoCanalId;
+	}
+	public void setPricingEspecificoCanalId(Integer pricingEspecificoCanalId) {
+		this.pricingEspecificoCanalId = pricingEspecificoCanalId;
+	}
+	public TipoPuntoVenta getTipoPtovta() {
+		return tipoPtovta;
+	}
+	public void setTipoPtovta(TipoPuntoVenta tipoPtovta) {
+		this.tipoPtovta = tipoPtovta;
+	}
+	public Boolean getActivo() {
+		return activo;
+	}
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+	public GP_PricingEspecifico getPricingEspecifico() {
+		return pricingEspecifico;
+	}
+	public void setPricingEspecifico(GP_PricingEspecifico pricingEspecifico) {
+		this.pricingEspecifico = pricingEspecifico;
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((activo == null) ? 0 : activo.hashCode());
+		result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode());
+		result = prime * result + ((tipoPtovta == null) ? 0 : tipoPtovta.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		GP_PricingEspecificoCanalVendas other = (GP_PricingEspecificoCanalVendas) obj;
+		if (activo == null) {
+			if (other.activo != null)
+				return false;
+		} else if (!activo.equals(other.activo))
+			return false;
+		if (pricingEspecifico == null) {
+			if (other.pricingEspecifico != null)
+				return false;
+		} else if (!pricingEspecifico.equals(other.pricingEspecifico))
+			return false;
+		if (tipoPtovta == null) {
+			if (other.tipoPtovta != null)
+				return false;
+		} else if (!tipoPtovta.equals(other.tipoPtovta))
+			return false;
+		return true;
+	}
+
+	
+	
+	@Override
+	public String toString() {
+		return " [TIPO_PONTO_VENDA=" + tipoPtovta.toString() + "]";
+	}
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCategoria.java

@@ -0,0 +1,154 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_ESP_CATEGORIA_SEQ", sequenceName = "GP_PRICING_ESP_CATEGORIA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_ESP_CATEGORIA")
+public class GP_PricingEspecificoCategoria implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer pricingEspecificoCategoriaId;
+	private GP_PricingEspecifico pricingEspecifico;
+	private Categoria categoria;
+	private Boolean activo;
+	private Date fecmodif;
+	private Integer usuarioId;
+
+	public GP_PricingEspecificoCategoria() {
+		super();
+	}
+
+	public GP_PricingEspecificoCategoria(Categoria categoria, GP_PricingEspecifico pricingEspecifico, Integer usuarioId) {
+		this.pricingEspecifico = pricingEspecifico;
+		this.categoria = categoria;
+		this.usuarioId = usuarioId;
+		this.activo = true;
+		this.fecmodif = new Date();
+	}
+
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_ESP_CATEGORIA_SEQ")
+	@Column(name = "PRICINGESPECIFICO_CATEGORIAID")
+	public Integer getPricingEspecificoCategoriaId() {
+		return pricingEspecificoCategoriaId;
+	}
+
+	public void setPricingEspecificoCategoriaId(Integer pricingEspecificoCategoriaId) {
+		this.pricingEspecificoCategoriaId = pricingEspecificoCategoriaId;
+	}
+
+	@JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID")
+	@ManyToOne
+	public GP_PricingEspecifico getPricingEspecifico() {
+		return pricingEspecifico;
+	}
+
+	public void setPricingEspecifico(GP_PricingEspecifico pricingEspecifico) {
+		this.pricingEspecifico = pricingEspecifico;
+	}
+
+	@ManyToOne
+	@JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID")
+	public Categoria getCategoria() {
+		return categoria;
+	}
+
+	public void setCategoria(Categoria categoria) {
+		this.categoria = categoria;
+	}
+
+	@Column(name = "ACTIVO")
+	public Boolean getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((activo == null) ? 0 : activo.hashCode());
+		result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode());
+		result = prime * result + ((categoria == null) ? 0 : categoria.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		GP_PricingEspecificoCategoria other = (GP_PricingEspecificoCategoria) obj;
+		if (activo == null) {
+			if (other.activo != null)
+				return false;
+		} else if (!activo.equals(other.activo))
+			return false;
+		if (pricingEspecifico == null) {
+			if (other.pricingEspecifico != null)
+				return false;
+		} else if (!pricingEspecifico.equals(other.pricingEspecifico))
+			return false;
+		if (categoria == null) {
+			if (other.categoria != null)
+				return false;
+		} else if (!categoria.equals(other.categoria))
+			return false;
+		return true;
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+
+	@Override
+	public String toString() {
+		return " [ CATEGORIA=" + categoria.toString() + "]";
+	}
+
+	
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoOcupacion.java

@@ -0,0 +1,182 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_ESPEC_OCUP_SEQ", sequenceName = "GP_PRICING_ESPEC_OCUP_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_ESPEC_OCUPACION")
+public class GP_PricingEspecificoOcupacion implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_ESPEC_OCUP_SEQ")
+	@Column(name = "PRICINGESPECIFICOOCUPACION_ID")
+	private Integer pricingEspecificoOcupacionId;
+	
+	@Column(name = "OCUPACIONINICIAL")
+	private BigDecimal ocupacioninicial;
+	
+	@Column(name = "OCUPACIONFINAL")
+	private BigDecimal ocupacionfinal;
+	
+	@Column(name = "TARIFA")
+	private BigDecimal tarifa;
+	
+	@Basic(optional = false)
+	@Column(name = "ACTIVO")
+	private Boolean activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@Column(name = "DESCUENTO")
+	private BigDecimal descuento;
+
+	@JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID")
+	@ManyToOne
+	private GP_PricingEspecifico pricingEspecifico;
+
+	public GP_PricingEspecificoOcupacion() {
+		super();
+	}
+
+	public GP_PricingEspecificoOcupacion(BigDecimal ocupacioninicial, BigDecimal ocupacionfinal, BigDecimal tarifa, Boolean activo, Date fecmodif, Integer usuarioId, BigDecimal descuento, GP_PricingEspecifico pricingEspecifico) {
+		super();
+		this.ocupacioninicial = ocupacioninicial;
+		this.ocupacionfinal = ocupacionfinal;
+		this.tarifa = tarifa;
+		this.activo = activo;
+		this.fecmodif = fecmodif;
+		this.usuarioId = usuarioId;
+		this.descuento = descuento;
+		this.pricingEspecifico = pricingEspecifico;
+	}
+
+	public Integer getPricingEspecificoOcupacionId() {
+		return pricingEspecificoOcupacionId;
+	}
+
+	public void setPricingEspecificoOcupacionId(Integer pricingEspecificoOcupacionId) {
+		this.pricingEspecificoOcupacionId = pricingEspecificoOcupacionId;
+	}
+
+	public BigDecimal getOcupacioninicial() {
+		return ocupacioninicial;
+	}
+
+	public void setOcupacioninicial(BigDecimal ocupacioninicial) {
+		this.ocupacioninicial = ocupacioninicial;
+	}
+
+	public BigDecimal getOcupacionfinal() {
+		return ocupacionfinal;
+	}
+
+	public void setOcupacionfinal(BigDecimal ocupacionfinal) {
+		this.ocupacionfinal = ocupacionfinal;
+	}
+
+	public BigDecimal getTarifa() {
+		return tarifa;
+	}
+
+	public void setTarifa(BigDecimal tarifa) {
+		this.tarifa = tarifa;
+	}
+
+	public Boolean getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Boolean activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_PricingEspecifico getPricingEspecifico() {
+		return pricingEspecifico;
+	}
+
+	public void setPricingEspecifico(GP_PricingEspecifico pricingEspecifico) {
+		this.pricingEspecifico = pricingEspecifico;
+	}
+	
+	public BigDecimal getDescuento() {
+		return descuento;
+	}
+
+	public void setDescuento(BigDecimal descuento) {
+		this.descuento = descuento;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((pricingEspecificoOcupacionId == null) ? 0 : pricingEspecificoOcupacionId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		GP_PricingEspecificoOcupacion other = (GP_PricingEspecificoOcupacion) obj;
+		if (pricingEspecificoOcupacionId == null) {
+			if (other.pricingEspecificoOcupacionId != null)
+				return false;
+		} else if (!pricingEspecificoOcupacionId.equals(other.pricingEspecificoOcupacionId))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return " [OCUPACAO_INICIAL=" + ocupacioninicial + ", OCUPACAO_FINAL=" + ocupacionfinal + ", TARIFA=" + tarifa + ", DESCONTO=" + descuento + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingFormapago.java

@@ -0,0 +1,155 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_FORMAPAGO_SEQ", sequenceName = "GP_PRICING_FORMAPAGO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_FORMAPAGO")
+public class GP_PricingFormapago implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_FORMAPAGO_SEQ")
+	@Column(name = "PRICINGFORMAPAGO_ID")
+	private Integer pricingformapagoId;
+	
+	@Column(name = "INDEXCEPCION")
+	private Boolean indexcepcion;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "FORMAPAGO_ID", referencedColumnName = "FORMAPAGO_ID")
+	@ManyToOne
+	private FormaPago formaPago;
+
+	public GP_PricingFormapago() {
+	}
+
+	public GP_PricingFormapago(Integer pricingformapagoId) {
+		this.pricingformapagoId = pricingformapagoId;
+	}
+
+	public GP_PricingFormapago(Integer pricingformapagoId, Boolean indexcepcion, Integer activo, Date fecmodif, Integer usuarioId, GP_Pricing pricing, FormaPago formaPago) {
+		this.pricingformapagoId = pricingformapagoId;
+		this.indexcepcion = indexcepcion;
+		this.activo = activo;
+		this.fecmodif = fecmodif;
+		this.usuarioId = usuarioId;
+		this.pricing = pricing;
+		this.formaPago = formaPago;
+	}
+
+	public Integer getPricingformapagoId() {
+		return pricingformapagoId;
+	}
+
+	public void setPricingformapagoId(Integer pricingformapagoId) {
+		this.pricingformapagoId = pricingformapagoId;
+	}
+
+	public Boolean getIndexcepcion() {
+		return indexcepcion;
+	}
+
+	public void setIndexcepcion(Boolean indexcepcion) {
+		this.indexcepcion = indexcepcion;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public FormaPago getFormaPago() {
+		return formaPago;
+	}
+
+	public void setFormaPago(FormaPago formaPago) {
+		this.formaPago = formaPago;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingformapagoId != null ? pricingformapagoId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingFormapago)) {
+			return false;
+		}
+		GP_PricingFormapago other = (GP_PricingFormapago) object;
+		if ((this.pricingformapagoId == null && other.pricingformapagoId != null) || (this.pricingformapagoId != null && !this.pricingformapagoId.equals(other.pricingformapagoId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [formaPago=" + formaPago.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingGestao.java

@@ -0,0 +1,127 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_GESTAO_SEQ", sequenceName = "GP_PRICING_GESTAO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_GESTAO")
+public class GP_PricingGestao implements Serializable {
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_GESTAO_SEQ")
+	@Column(name = "PRICINGGESTAO_ID")
+	private Integer pricinggestaoId;
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	@Column(name = "CORRIDA_ID")
+	private Integer corridaId;
+	@Column(name = "FECCORRIDA")
+	@Temporal(TemporalType.DATE)
+	private Date feccorrida;
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+
+	public GP_PricingGestao() {
+	}
+
+	public Integer getPricinggestaoId() {
+		return pricinggestaoId;
+	}
+
+	public void setPricinggestaoId(Integer pricinggestaoId) {
+		this.pricinggestaoId = pricinggestaoId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public Integer getCorridaId() {
+		return corridaId;
+	}
+
+	public void setCorridaId(Integer corridaId) {
+		this.corridaId = corridaId;
+	}
+
+	public Date getFeccorrida() {
+		return feccorrida;
+	}
+
+	public void setFeccorrida(Date feccorrida) {
+		this.feccorrida = feccorrida;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricinggestaoId != null ? pricinggestaoId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingGestao)) {
+			return false;
+		}
+		GP_PricingGestao other = (GP_PricingGestao) object;
+		if ((this.pricinggestaoId == null && other.pricinggestaoId != null) || (this.pricinggestaoId != null && !this.pricinggestaoId.equals(other.pricinggestaoId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "entidad.test.PricingGestao[pricinggestaoId=" + pricinggestaoId + "]";
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingHistorico.java

@@ -0,0 +1,148 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_HISTORICO_SEQ", sequenceName = "GP_PRICING_HISTORICO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_HISTORICO")
+public class GP_PricingHistorico implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_HISTORICO_SEQ")
+	@Column(name = "PRICINGHISTORICO_ID")
+	private Long pricingHistoricoId;
+	
+	@Column(name = "PRICING_ID")
+	private Long pricingId;
+	
+	@Column(name = "ISESPECIFICO")
+	private Boolean isEspecifico;
+	
+	@Column(name = "DESCRICAO")
+	private String descricao;
+	
+	@Column(name = "VALORANTERIOR")
+	private String valorAnterior;
+	
+	@Column(name = "VALORNOVO")
+	private String valorNovo;
+	
+	@Column(name = "CAMPOALTERADO")
+	private String campoAlterado;
+	
+	@Column(name = "CLASSEALTERADA")
+	private String classeAlterada;
+	
+	@Column(name = "CLASSEPRINCIPAL")
+	private String classePrincipal;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+
+	public Long getPricingHistoricoId() {
+		return pricingHistoricoId;
+	}
+
+	public void setPricingHistoricoId(Long pricingHistoricoId) {
+		this.pricingHistoricoId = pricingHistoricoId;
+	}
+
+	public Long getPricingId() {
+		return pricingId;
+	}
+
+	public void setPricingId(Long pricingId) {
+		this.pricingId = pricingId;
+	}
+
+	public Boolean getIsEspecifico() {
+		return isEspecifico == null ? false : isEspecifico;
+	}
+
+	public void setIsEspecifico(Boolean isEspecifico) {
+		this.isEspecifico = isEspecifico;
+	}
+
+	public String getDescricao() {
+		return descricao;
+	}
+
+	public void setDescricao(String descricao) {
+		this.descricao = descricao;
+	}
+
+	public String getValorAnterior() {
+		return valorAnterior;
+	}
+
+	public void setValorAnterior(String valorAnterior) {
+		this.valorAnterior = valorAnterior;
+	}
+
+	public String getValorNovo() {
+		return valorNovo;
+	}
+
+	public void setValorNovo(String valorNovo) {
+		this.valorNovo = valorNovo;
+	}
+
+	public String getCampoAlterado() {
+		return campoAlterado;
+	}
+
+	public void setCampoAlterado(String campoAlterado) {
+		this.campoAlterado = campoAlterado;
+	}
+
+	public String getClasseAlterada() {
+		return classeAlterada;
+	}
+
+	public void setClasseAlterada(String classeAlterada) {
+		this.classeAlterada = classeAlterada;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public String getClassePrincipal() {
+		return classePrincipal;
+	}
+
+	public void setClassePrincipal(String classePrincipal) {
+		this.classePrincipal = classePrincipal;
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingImporte.java

@@ -0,0 +1,146 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_IMPORTE_SEQ", sequenceName = "GP_PRICING_IMPORTE_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_IMPORTE")
+public class GP_PricingImporte implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_IMPORTE_SEQ")
+	@Column(name = "PRICINGIMPORTE_ID")
+	private Integer pricingimporteId;
+	
+	@Column(name = "IMPORTE")
+	private BigDecimal importe;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "MONEDA_ID", referencedColumnName = "MONEDA_ID")
+	@ManyToOne
+	private Moneda moneda;
+
+	public GP_PricingImporte() {
+	}
+
+	public GP_PricingImporte(Integer pricingimporteId) {
+		this.pricingimporteId = pricingimporteId;
+	}
+
+	public Integer getPricingimporteId() {
+		return pricingimporteId;
+	}
+
+	public void setPricingimporteId(Integer pricingimporteId) {
+		this.pricingimporteId = pricingimporteId;
+	}
+
+	public BigDecimal getImporte() {
+		return importe;
+	}
+
+	public void setImporte(BigDecimal importe) {
+		this.importe = importe;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public Moneda getMoneda() {
+		return moneda;
+	}
+
+	public void setMoneda(Moneda moneda) {
+		this.moneda = moneda;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingimporteId != null ? pricingimporteId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingImporte)) {
+			return false;
+		}
+		GP_PricingImporte other = (GP_PricingImporte) object;
+		if ((this.pricingimporteId == null && other.pricingimporteId != null) || (this.pricingimporteId != null && !this.pricingimporteId.equals(other.pricingimporteId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [ importe=" + importe + ", moneda=" + moneda.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingMarca.java

@@ -0,0 +1,134 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_MARCA_SEQ", sequenceName = "GP_PRICING_MARCA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_MARCA")
+public class GP_PricingMarca implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_MARCA_SEQ")
+	@Column(name = "PRICINGMARCA_ID")
+	private Integer pricingmarcaId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "MARCA_ID", referencedColumnName = "MARCA_ID")
+	@ManyToOne
+	private Marca marca;
+
+	public GP_PricingMarca() {
+	}
+
+	public GP_PricingMarca(Integer pricingmarcaId) {
+		this.pricingmarcaId = pricingmarcaId;
+	}
+
+	public Integer getPricingmarcaId() {
+		return pricingmarcaId;
+	}
+
+	public void setPricingmarcaId(Integer pricingmarcaId) {
+		this.pricingmarcaId = pricingmarcaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public Marca getMarca() {
+		return marca;
+	}
+
+	public void setMarca(Marca marca) {
+		this.marca = marca;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingmarcaId != null ? pricingmarcaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingMarca)) {
+			return false;
+		}
+		GP_PricingMarca other = (GP_PricingMarca) object;
+		if ((this.pricingmarcaId == null && other.pricingmarcaId != null) || (this.pricingmarcaId != null && !this.pricingmarcaId.equals(other.pricingmarcaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [marca=" + marca.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingMercado.java

@@ -0,0 +1,146 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_MERCADO_SEQ", sequenceName = "GP_PRICING_MERCADO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_MERCADO")
+public class GP_PricingMercado implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_MERCADO_SEQ")
+	@Column(name = "PRICINGPARADA_ID")
+	private Integer pricingparadaId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID")
+	@ManyToOne
+	private Parada origen;
+	
+	@JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID")
+	@ManyToOne
+	private Parada destino;
+
+	public GP_PricingMercado() {
+	}
+
+	public GP_PricingMercado(Integer pricingparadaId) {
+		this.pricingparadaId = pricingparadaId;
+	}
+
+	public Integer getPricingparadaId() {
+		return pricingparadaId;
+	}
+
+	public void setPricingparadaId(Integer pricingparadaId) {
+		this.pricingparadaId = pricingparadaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public Parada getDestino() {
+		return destino;
+	}
+
+	public void setDestino(Parada destino) {
+		this.destino = destino;
+	}
+
+	public Parada getOrigen() {
+		return origen;
+	}
+
+	public void setOrigen(Parada origen) {
+		this.origen = origen;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingparadaId != null ? pricingparadaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingMercado)) {
+			return false;
+		}
+		GP_PricingMercado other = (GP_PricingMercado) object;
+		if ((this.pricingparadaId == null && other.pricingparadaId != null) || (this.pricingparadaId != null && !this.pricingparadaId.equals(other.pricingparadaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return "[origen=" + origen.toString() + ", destino=" + destino.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingOcupaAntecipa.java

@@ -0,0 +1,238 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_OCUPA_ANTECIPA_SEQ", sequenceName = "GP_PRICING_OCUPA_ANTECIPA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_OCUPA_ANTECIPA")
+public class GP_PricingOcupaAntecipa implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_OCUPA_ANTECIPA_SEQ")
+	@Column(name = "PRICINGOCUPAANTECIPA_ID")
+	private Integer pricingocupaantecipaId;
+	
+	@Column(name = "CANTDIASMIN")
+	private Integer cantdiasmin;
+	
+	@Column(name = "CANTDIASMAX")
+	private Integer cantdiasmax;
+	
+	@Column(name = "CANTASIENTOSMIN")
+	private Integer cantasientosmin;
+	
+	@Column(name = "CANTASIENTOSMAX")
+	private Integer cantasientosmax;
+	
+	@Column(name = "PORCENTAJE")
+	private BigDecimal porcentaje;
+	
+	@Column(name = "OCUPACIONINICIAL")
+	private BigDecimal ocupacioninicial;
+	
+	@Column(name = "OCUPACIONFINAL")
+	private BigDecimal ocupacionfinal;
+	
+	@Column(name = "IMPORTE")
+	private BigDecimal importe;
+	
+	@Basic(optional = false)
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Basic(optional = false)
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	
+	private Integer usuarioId;
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "PRICINGCLASSETARIFARIA_ID", referencedColumnName = "PRICINGCLASSETARIFARIA_ID")
+	@ManyToOne	
+	private GP_PricingClasseTarifaria pricingClasseTarifaria;
+	
+	@Column(name = "COR")
+	private String cor;
+	
+	public GP_PricingOcupaAntecipa() {
+		super();
+	}
+
+	public GP_PricingOcupaAntecipa(Integer pricingocupaantecipaId) {
+		this();
+		this.pricingocupaantecipaId = pricingocupaantecipaId;
+	}
+
+	public Integer getPricingocupaantecipaId() {
+		return pricingocupaantecipaId;
+	}
+
+	public void setPricingocupaantecipaId(Integer pricingocupaantecipaId) {
+		this.pricingocupaantecipaId = pricingocupaantecipaId;
+	}
+
+	public Integer getCantdiasmin() {
+		return cantdiasmin;
+	}
+
+	public void setCantdiasmin(Integer cantdiasmin) {
+		this.cantdiasmin = cantdiasmin;
+	}
+
+	public Integer getCantdiasmax() {
+		return cantdiasmax;
+	}
+
+	public void setCantdiasmax(Integer cantdiasmax) {
+		this.cantdiasmax = cantdiasmax;
+	}
+
+	public Integer getCantasientosmin() {
+		return cantasientosmin;
+	}
+
+	public void setCantasientosmin(Integer cantasientosmin) {
+		this.cantasientosmin = cantasientosmin;
+	}
+
+	public Integer getCantasientosmax() {
+		return cantasientosmax;
+	}
+
+	public void setCantasientosmax(Integer cantasientosmax) {
+		this.cantasientosmax = cantasientosmax;
+	}
+
+	public BigDecimal getPorcentaje() {
+		return porcentaje;
+	}
+
+	public void setPorcentaje(BigDecimal porcentaje) {
+		this.porcentaje = porcentaje;
+	}
+
+	public BigDecimal getOcupacioninicial() {
+		return ocupacioninicial;
+	}
+
+	public void setOcupacioninicial(BigDecimal ocupacioninicial) {
+		this.ocupacioninicial = ocupacioninicial;
+	}
+
+	public BigDecimal getOcupacionfinal() {
+		return ocupacionfinal;
+	}
+
+	public void setOcupacionfinal(BigDecimal ocupacionfinal) {
+		this.ocupacionfinal = ocupacionfinal;
+	}
+
+	public BigDecimal getImporte() {
+		return importe;
+	}
+
+	public void setImporte(BigDecimal importe) {
+		this.importe = importe;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public GP_PricingClasseTarifaria getPricingClasseTarifaria() {
+		return pricingClasseTarifaria;
+	}
+
+	public void setPricingClasseTarifaria(GP_PricingClasseTarifaria pricingClasseTarifaria) {
+		this.pricingClasseTarifaria = pricingClasseTarifaria;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (getPricingocupaantecipaId() != null ? getPricingocupaantecipaId().hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingOcupaAntecipa)) {
+			return false;
+		}
+		GP_PricingOcupaAntecipa other = (GP_PricingOcupaAntecipa) object;
+		if ((this.getPricingocupaantecipaId() == null && other.getPricingocupaantecipaId() != null) || (this.getPricingocupaantecipaId() != null && !this.getPricingocupaantecipaId().equals(other.getPricingocupaantecipaId()))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return " [DIAS_MIN=" + cantdiasmin + ", DIAS_MAX=" + cantdiasmax + ", MIN_POLTRONA=" + cantasientosmin + 
+				", MAX_POLRONA=" + cantasientosmax + ", OCUPACAO_INICIAL=" + ocupacioninicial + ", OCUPACAO_FINAL=" + ocupacionfinal + "]";
+	}
+
+	public String getCor() {
+		return cor;
+	}
+
+	public void setCor(String cor) {
+		this.cor = cor;
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingPuntoVenta.java

@@ -0,0 +1,132 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_PUNTOVENTA_SEQ", sequenceName = "GP_PRICING_PUNTOVENTA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_PUNTOVENTA")
+public class GP_PricingPuntoVenta implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_PUNTOVENTA_SEQ")
+	@Column(name = "PRICINGPTOVTA_ID")
+	private Integer pricingptovtaId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID")
+	@ManyToOne
+	private PuntoVenta puntoVenta;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+
+	public GP_PricingPuntoVenta() {
+	}
+
+	public GP_PricingPuntoVenta(Integer pricingptovtaId) {
+		this.pricingptovtaId = pricingptovtaId;
+	}
+
+	public Integer getPricingptovtaId() {
+		return pricingptovtaId;
+	}
+
+	public void setPricingptovtaId(Integer pricingptovtaId) {
+		this.pricingptovtaId = pricingptovtaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public PuntoVenta getPuntoVenta() {
+		return puntoVenta;
+	}
+
+	public void setPuntoVenta(PuntoVenta puntoVenta) {
+		this.puntoVenta = puntoVenta;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingptovtaId != null ? pricingptovtaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingPuntoVenta)) {
+			return false;
+		}
+		GP_PricingPuntoVenta other = (GP_PricingPuntoVenta) object;
+		if ((this.pricingptovtaId == null && other.pricingptovtaId != null) || (this.pricingptovtaId != null && !this.pricingptovtaId.equals(other.pricingptovtaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return " [ PONTO_VENDA=" + puntoVenta.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingRuta.java

@@ -0,0 +1,133 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_RUTA_SEQ", sequenceName = "GP_PRICING_RUTA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_RUTA")
+
+public class GP_PricingRuta implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_RUTA_SEQ")
+	@Column(name = "PRICINGRUTA_ID")
+	private Integer pricingrutaId;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	
+	private Date fecmodif;
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID")
+	@ManyToOne
+	private Ruta ruta;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+
+	public GP_PricingRuta() {
+	}
+
+	public GP_PricingRuta(Integer pricingrutaId) {
+		this.pricingrutaId = pricingrutaId;
+	}
+
+	public Integer getPricingrutaId() {
+		return pricingrutaId;
+	}
+
+	public void setPricingrutaId(Integer pricingrutaId) {
+		this.pricingrutaId = pricingrutaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public Ruta getRuta() {
+		return ruta;
+	}
+
+	public void setRuta(Ruta ruta) {
+		this.ruta = ruta;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingrutaId != null ? pricingrutaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingRuta)) {
+			return false;
+		}
+		GP_PricingRuta other = (GP_PricingRuta) object;
+		if ((this.pricingrutaId == null && other.pricingrutaId != null) || (this.pricingrutaId != null && !this.pricingrutaId.equals(other.pricingrutaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return " [ linha=" + ruta.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoPtoVta.java

@@ -0,0 +1,142 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 
+ * @author Rafius
+ */
+@Entity
+@SequenceGenerator(name = "GP_PRICING_TIPOPTOVTA_SEQ", sequenceName = "GP_PRICING_TIPOPTOVTA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_TIPOPTOVTA")
+public class GP_PricingTipoPtoVta implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_TIPOPTOVTA_SEQ")
+	@Column(name = "PRICINGTIPOPTOVTA_ID")
+	private Integer pricingtipoptovtaId;
+
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	
+	private Date fecmodif;
+	@Column(name = "USUARIO_ID")
+	
+	private Integer usuarioId;
+	@JoinColumn(name = "TIPOPTOVTA_ID", referencedColumnName = "TIPOPTOVTA_ID")
+	@ManyToOne
+	private TipoPuntoVenta tipoPtovta;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+
+	public GP_PricingTipoPtoVta() {
+	}
+
+	public GP_PricingTipoPtoVta(Integer pricingtipoptovtaId) {
+		this.pricingtipoptovtaId = pricingtipoptovtaId;
+	}
+
+	public Integer getPricingtipoptovtaId() {
+		return pricingtipoptovtaId;
+	}
+
+	public void setPricingtipoptovtaId(Integer pricingtipoptovtaId) {
+		this.pricingtipoptovtaId = pricingtipoptovtaId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public TipoPuntoVenta getTipoPtovta() {
+		return tipoPtovta;
+	}
+
+	public void setTipoPtovta(TipoPuntoVenta tipoPtovta) {
+		this.tipoPtovta = tipoPtovta;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingtipoptovtaId != null ? pricingtipoptovtaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingTipoPtoVta)) {
+			return false;
+		}
+		GP_PricingTipoPtoVta other = (GP_PricingTipoPtoVta) object;
+		if ((this.pricingtipoptovtaId == null && other.pricingtipoptovtaId != null) || (this.pricingtipoptovtaId != null && !this.pricingtipoptovtaId.equals(other.pricingtipoptovtaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [ TIPO_PONTO_VENDA=" + tipoPtovta.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoServicio.java

@@ -0,0 +1,135 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_TIPOSERVICIO_SEQ", sequenceName = "GP_PRICING_TIPOSERVICIO_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_TIPOSERVICIO")
+public class GP_PricingTipoServicio implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_TIPOSERVICIO_SEQ")
+	@Column(name = "PRICINGTIPOSERVICIO_ID")
+	private Integer pricingtiposervicioId;
+	
+	@Basic(optional = false)
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Basic(optional = false)
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Basic(optional = false)
+	@Column(name = "USUARIO_ID")
+	private int usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+	
+	@JoinColumn(name = "TIPOSERVICIO_ID", referencedColumnName = "TIPOSERVICIO_ID")
+	@ManyToOne
+	private TipoServicio tipoServicio;
+
+	public GP_PricingTipoServicio() {
+	}
+
+	public GP_PricingTipoServicio(Integer pricingtiposervicioId) {
+		this.pricingtiposervicioId = pricingtiposervicioId;
+	}
+
+	public Integer getPricingtiposervicioId() {
+		return pricingtiposervicioId;
+	}
+
+	public void setPricingtiposervicioId(Integer pricingtiposervicioId) {
+		this.pricingtiposervicioId = pricingtiposervicioId;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public int getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(int usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	public TipoServicio getTipoServicio() {
+		return tipoServicio;
+	}
+
+	public void setTipoServicio(TipoServicio tipoServicio) {
+		this.tipoServicio = tipoServicio;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingtiposervicioId != null ? pricingtiposervicioId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingTipoServicio)) {
+			return false;
+		}
+		GP_PricingTipoServicio other = (GP_PricingTipoServicio) object;
+		if ((this.pricingtiposervicioId == null && other.pricingtiposervicioId != null) || (this.pricingtiposervicioId != null && !this.pricingtiposervicioId.equals(other.pricingtiposervicioId))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return " [ TIPO_SERVICO =" + tipoServicio.toString() + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/GP_PricingVigencia.java

@@ -0,0 +1,175 @@
+package com.rjconsultores.ventaboletos.entidad;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+
+@Entity
+@SequenceGenerator(name = "GP_PRICING_VIGENCIA_SEQ", sequenceName = "GP_PRICING_VIGENCIA_SEQ", allocationSize = 1)
+@Table(name = "GP_PRICING_VIGENCIA")
+public class GP_PricingVigencia implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+	@Id
+	@Basic(optional = false)
+	@GeneratedValue(strategy = GenerationType.AUTO, generator = "GP_PRICING_VIGENCIA_SEQ")
+	@Column(name = "PRICINGVIGENCIA_ID")
+	private Integer pricingvigenciaId;
+	
+	@Column(name = "FECINICIOVIAJE")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecinicioviaje;
+	
+	@Column(name = "FECFINVIAJE")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecfinviaje;
+	
+	@Column(name = "FECINICIOVENTA")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecinicioventa;
+	
+	@Column(name = "FECFINVENTA")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecfinventa;
+	
+	@Column(name = "ACTIVO")
+	private Integer activo;
+	
+	@Column(name = "FECMODIF")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date fecmodif;
+	
+	@Column(name = "USUARIO_ID")
+	private Integer usuarioId;
+	
+	@JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID")
+	@ManyToOne
+	private GP_Pricing pricing;
+
+	public GP_PricingVigencia() {
+	}
+
+	public GP_PricingVigencia(Integer pricingvigenciaId) {
+		this.pricingvigenciaId = pricingvigenciaId;
+	}
+
+	public Integer getPricingvigenciaId() {
+		return pricingvigenciaId;
+	}
+
+	public void setPricingvigenciaId(Integer pricingvigenciaId) {
+		this.pricingvigenciaId = pricingvigenciaId;
+	}
+
+	public Date getFecinicioviaje() {
+		return fecinicioviaje;
+	}
+
+	public void setFecinicioviaje(Date fecinicioviaje) {
+		this.fecinicioviaje = fecinicioviaje;
+	}
+
+	public Date getFecfinviaje() {
+		return fecfinviaje;
+	}
+
+	public void setFecfinviaje(Date fecfinviaje) {
+		this.fecfinviaje = fecfinviaje;
+	}
+
+	public Date getFecinicioventa() {
+		return fecinicioventa;
+	}
+
+	public void setFecinicioventa(Date fecinicioventa) {
+		this.fecinicioventa = fecinicioventa;
+	}
+
+	public Date getFecfinventa() {
+		return fecfinventa;
+	}
+
+	public void setFecfinventa(Date fecfinventa) {
+		this.fecfinventa = fecfinventa;
+	}
+
+	public Integer getActivo() {
+		return activo;
+	}
+
+	public void setActivo(Integer activo) {
+		this.activo = activo;
+	}
+
+	public Date getFecmodif() {
+		return fecmodif;
+	}
+
+	public void setFecmodif(Date fecmodif) {
+		this.fecmodif = fecmodif;
+	}
+
+	public Integer getUsuarioId() {
+		return usuarioId;
+	}
+
+	public void setUsuarioId(Integer usuarioId) {
+		this.usuarioId = usuarioId;
+	}
+
+	public GP_Pricing getPricing() {
+		return pricing;
+	}
+
+	public void setPricing(GP_Pricing pricing) {
+		this.pricing = pricing;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		hash += (pricingvigenciaId != null ? pricingvigenciaId.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof GP_PricingVigencia)) {
+			return false;
+		}
+		GP_PricingVigencia other = (GP_PricingVigencia) object;
+		if ((this.pricingvigenciaId == null && other.pricingvigenciaId != null) || (this.pricingvigenciaId != null && !this.pricingvigenciaId.equals(other.pricingvigenciaId))) {
+			return false;
+		}
+		return true;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		return " [INICIO_VIAGEM=" + DateUtil.getStringDate(fecinicioviaje) + 
+				", FIM_VIAGEM=" + DateUtil.getStringDate(fecfinviaje) + 
+				", INICIO_VENDA=" + DateUtil.getStringDate(fecinicioventa) + 
+				", FIM_VENDA=" + DateUtil.getStringDate(fecfinventa) + "]";
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}

src/com/rjconsultores/ventaboletos/entidad/Marca.java

@@ -265,6 +265,11 @@ public class Marca implements Serializable, Auditavel<Marca> {
 	public Marca getCloneObject() throws CloneNotSupportedException {
 		return marcaClone;
 	}
+	
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
 
 	@Override
 	public String getTextoInclusaoExclusao() {

src/com/rjconsultores/ventaboletos/entidad/Moneda.java

@@ -166,5 +166,9 @@ public class Moneda implements Serializable {
 	public void setSigla(String sigla) {
 		this.sigla = sigla;
 	}
-	
+
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		return this.clone();
+	}
 }

src/com/rjconsultores/ventaboletos/service/GP_PricingAsientoService.java

@@ -0,0 +1,13 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingAsiento;
+
+public interface GP_PricingAsientoService extends GenericService<GP_PricingAsiento, Integer> {
+
+    public List<GP_PricingAsiento> obtenerPricingCategoria(GP_Pricing pricing, Integer value);
+    
+    public List<GP_PricingAsiento> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingCategoriaService.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.Categoria;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingCategoria;
+
+public interface GP_PricingCategoriaService extends GenericService<GP_PricingCategoria, Integer> {
+
+    public Boolean obtenerPricingCategoria(GP_Pricing pricing, Categoria categoria);
+    
+    public List<GP_PricingCategoria> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingClaseService.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingClase;
+
+public interface GP_PricingClaseService extends GenericService<GP_PricingClase, Integer> {
+
+    public Boolean obtenerPricingClase(GP_Pricing pricing, ClaseServicio claseServicio);
+    
+    public List<GP_PricingClase> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingClasseTarifariaService.java

@@ -0,0 +1,9 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingClasseTarifaria;
+
+public interface GP_PricingClasseTarifariaService extends GenericService<GP_PricingClasseTarifaria, Integer> {
+
+	public Boolean validacionSigla(String sigla);
+
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingCorridaService.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.CorridaCtrl;
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingCorrida;
+
+public interface GP_PricingCorridaService extends GenericService<GP_PricingCorrida, Integer> {
+
+    public Boolean obtenerPricingCorrida(GP_Pricing pricing, CorridaCtrl corrida);
+
+	public List<GP_PricingCorrida> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingDiaService.java

@@ -0,0 +1,13 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingDia;
+
+public interface GP_PricingDiaService extends GenericService<GP_PricingDia, Integer> {
+
+    public List<GP_PricingDia> buscarTraslapa(GP_PricingDia pricingDia);
+
+	public List<GP_PricingDia> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoAgenciaService.java

@@ -0,0 +1,8 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoAgencia;
+
+public interface GP_PricingEspecificoAgenciaService extends GenericService<GP_PricingEspecificoAgencia, Long> {
+
+	Boolean existeAgenciaPricing(GP_PricingEspecificoAgencia entidad);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCanalVendasService.java

@@ -0,0 +1,8 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCanalVendas;
+
+public interface GP_PricingEspecificoCanalVendasService extends GenericService<GP_PricingEspecificoCanalVendas, Long> {
+
+	Boolean existeCanalVendasPricing(GP_PricingEspecificoCanalVendas entidad);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCategoriaService.java

@@ -0,0 +1,6 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCategoria;
+
+public interface GP_PricingEspecificoCategoriaService extends GenericService<GP_PricingEspecificoCategoria, Long> {
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoOcupacionService.java

@@ -0,0 +1,6 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoOcupacion;
+
+public interface GP_PricingEspecificoOcupacionService extends GenericService<GP_PricingEspecificoOcupacion, Long> {
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoService.java

@@ -0,0 +1,21 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecifico;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingEspecificoCategoria;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+
+public interface GP_PricingEspecificoService extends GenericService<GP_PricingEspecifico, Long> {
+
+	public List<GP_PricingEspecifico> buscarPorNome(GP_PricingEspecifico pricingEspecifico);
+
+	public List<GP_PricingEspecifico> buscarPorNome(String nome);
+
+	public GP_PricingEspecifico clonarPricing(Long id, String nome, List<GP_PricingEspecificoCategoria> pricingCategoriaList);
+
+	public List<GP_PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingFormapagoService.java

@@ -0,0 +1,11 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingFormapago;
+
+public interface GP_PricingFormapagoService extends GenericService<GP_PricingFormapago, Integer> {
+
+	List<GP_PricingFormapago> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingGestaoService.java

@@ -0,0 +1,11 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingGestao;
+
+public interface GP_PricingGestaoService extends GenericService<GP_PricingGestao, Integer> {
+
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingHistoricoService.java

@@ -0,0 +1,11 @@
+package com.rjconsultores.ventaboletos.service;
+
+import com.rjconsultores.ventaboletos.entidad.GP_PricingHistorico;
+
+public interface GP_PricingHistoricoService extends GenericService<GP_PricingHistorico, Long> {
+	
+	public void compararESalvar(Object original, Object novo);
+	
+	public void registarExclusao(Object pricing, Boolean ativar);
+
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingImporteService.java

@@ -0,0 +1,14 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingImporte;
+import com.rjconsultores.ventaboletos.entidad.Moneda;
+
+public interface GP_PricingImporteService extends GenericService<GP_PricingImporte, Integer> {
+
+      public List<GP_PricingImporte> buscarMoneda(GP_PricingImporte pricingImporte, Moneda moneda);
+
+	public List<GP_PricingImporte> obtenerTodoPorPricing(GP_Pricing pricing);
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingMarcaService.java

@@ -0,0 +1,15 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingMarca;
+import com.rjconsultores.ventaboletos.entidad.Marca;
+
+public interface GP_PricingMarcaService extends GenericService<GP_PricingMarca, Integer> {
+
+    public Boolean obtenerPricingMarca(GP_Pricing pricing, Marca marca);
+
+	public List<GP_PricingMarca> obtenerTodoPorPricing(GP_Pricing pricing);
+    
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingMercadoService.java

@@ -0,0 +1,15 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingMercado;
+import com.rjconsultores.ventaboletos.entidad.Parada;
+
+public interface GP_PricingMercadoService extends GenericService<GP_PricingMercado, Integer> {
+
+    public Boolean obtenerPricingMercado(GP_Pricing pricing, Parada origen, Parada destino);
+
+	public List<GP_PricingMercado> obtenerTodoPorPricing(GP_Pricing pricing);
+
+}

src/com/rjconsultores/ventaboletos/service/GP_PricingOcupaAntecipaService.java

@@ -0,0 +1,34 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.GP_Pricing;
+import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa;
+import com.rjconsultores.ventaboletos.exception.BusinessException;
+import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaLegendaVO;
+import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaVO;
+
+public interface GP_PricingOcupaAntecipaService {
+
+	public GP_PricingOcupaAntecipa obtenerID(Integer pricingocupaantecipaId) throws BusinessException;
+	
+	public GP_PricingOcupaAntecipa suscribir(GP_PricingOcupaAntecipa entidad) throws BusinessException;
+
+	public GP_PricingOcupaAntecipa actualizacion(GP_PricingOcupaAntecipa entidad) throws BusinessException;
+
+	public void borrar(GP_PricingOcupaAntecipa entidad);
+	
+	public List<GP_PricingOcupaAntecipa> updateList(GP_PricingOcupaAntecipa entidad);
+	
+	public List<GP_PricingOcupaAntecipaVO> carregarPricingOcupaAntecipaVO(Integer pricingId);
+	
+	public List<GP_PricingOcupaAntecipa> carregarPricingOcupaAntecipa(Integer pricingId);
+	
+	public List<GP_PricingOcupaAntecipaLegendaVO> carregarPricingOcupaAntecipaLegenda(Integer pricingId);
+
+	List<GP_PricingOcupaAntecipaVO> carregarPricingOcupaAntecipaVO(List<GP_PricingOcupaAntecipa> pricingOcupaAntecipas);
+
+	List<GP_PricingOcupaAntecipaLegendaVO> carregarPricingOcupaAntecipaLegenda(List<GP_PricingOcupaAntecipa> lsPricingOcupaAntecipa);
+
+	public List<GP_PricingOcupaAntecipa> obtenerTodoPorPricing(GP_Pricing pricing);
+}