From 10cffc619f700d2562b804b726ec2024780a8211 Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 24 May 2021 18:58:11 +0000
Subject: [PATCH] =?UTF-8?q?0022382:=20Aguia=20Branca=20-=20GLPI=20-=203801?=
 =?UTF-8?q?3=20-=20[PROJETO=20SPRINT=2001]=20-=20VENDAS=20-=20DATA=20DA=20?=
 =?UTF-8?q?VIAGEM=20NO=20DABPE=200022377:=20GLPI=2037944=20-=20[PROJETO=20?=
 =?UTF-8?q?SPRINT=2001]=20-=20ADM=20-=20CUPOM=20DE=20EMBARQUE=20NA=20VENDA?=
 =?UTF-8?q?/CONFIRMA=C3=87=C3=83O=20EM=20ABERTO=200022367:=20glpi=2037935?=
 =?UTF-8?q?=20-[PROJETO=20SPRINT=2001]=20-=20ADM=20DEV=20-=20FLAGS=20DA=20?=
 =?UTF-8?q?TELA=20DE=20TIPO=20DE=20PASSAGEM=20bug#22382=20bug#22377=20bug#?=
 =?UTF-8?q?22367=20dev:valdevir=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@106829 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../entidad/CategoriaDescuento.java           | 36 ++++++++++++-------
 .../ventaboletos/entidad/Empresa.java         | 23 +++++++++++-
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
index 78c69b8a1..22b897f9c 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
@@ -185,14 +185,16 @@ public class CategoriaDescuento implements Serializable {
 	@Column(name = "INDCLIENTEPCD")
 	private Boolean indClientePcd;
 	
-	@Column(name = "INDPERMITETROCATRANSFERENCIA")
-	private Boolean indPermiteTrocaTransferencia;	
-	
 	@Column(name = "INDCHECKINAUTOMATICO")
 	private Boolean indCheckinAutomatico;
 
-
 	//Comportamento geral
+	@Column(name = "INDPERMITETROCA")
+	private Boolean indPermiteTroca;
+	
+	@Column(name = "INDPERMITETRANSFERENCIA")
+	private Boolean indPermiteTransferencia;
+	
 	@Column(name = "INDPERMITECANCELAR")
 	private Boolean indPermiteCancelar;
 	
@@ -851,14 +853,6 @@ public class CategoriaDescuento implements Serializable {
 		this.indClientePcd = indClientePcd;
 	}
 
-	public Boolean getIndPermiteTrocaTransferencia() {
-		return BooleanUtils.toBoolean(indPermiteTrocaTransferencia);
-	}
-
-	public void setIndPermiteTrocaTransferencia(Boolean indPermiteTrocaTransferencia) {
-		this.indPermiteTrocaTransferencia = indPermiteTrocaTransferencia;
-	}
-
 	public Boolean getIndCancelaEmAberto() {
 		return indCancelaEmAberto == null ? true : indCancelaEmAberto;
 	}
@@ -946,4 +940,22 @@ public class CategoriaDescuento implements Serializable {
 	public void setIndCheckinAutomatico(Boolean indCheckinAutomatico) {
 		this.indCheckinAutomatico = indCheckinAutomatico;
 	}
+
+	public Boolean getIndPermiteTroca() {
+		return indPermiteTroca == null ? true : indPermiteTroca;
+	}
+
+	public void setIndPermiteTroca(Boolean indPermiteTroca) {
+		this.indPermiteTroca = indPermiteTroca;
+	}
+
+	public Boolean getIndPermiteTransferencia() {
+		return indPermiteTransferencia == null ? true : indPermiteTransferencia;
+	}
+
+	public void setIndPermiteTransferencia(Boolean indPermiteTransferencia) {
+		this.indPermiteTransferencia = indPermiteTransferencia;
+	}
+	
+	
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
index da60e4bdc..52888a813 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java
@@ -386,6 +386,12 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
 	
 	@Column(name = "INDICEIRK")
 	private BigDecimal indiceIRK;
+	
+	@Column(name = "INDNAOIMPRIMECUPOMVENDABERTO")
+	private Boolean indNaoImprimeCupomEmbarqueVendaAberto;
+
+	@Column(name = "INDNAOIMPRIMECUPOMCONFABERTO")
+	private Boolean indNaoImprimeCupomEmbarqueConfirmacaoAberto;
 
 	@Transient
 	@NaoAuditar
@@ -1436,5 +1442,20 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
 	public void setIndNaoPermiteTrocaEntreEmpresa(Boolean indNaoPermiteTrocaEntreEmpresa) {
 		this.indNaoPermiteTrocaEntreEmpresa = indNaoPermiteTrocaEntreEmpresa;
 	}
-	
+
+	public Boolean getIndNaoImprimeCupomEmbarqueVendaAberto() {
+		return indNaoImprimeCupomEmbarqueVendaAberto == null ? false : indNaoImprimeCupomEmbarqueVendaAberto;
+	}
+
+	public void setIndNaoImprimeCupomEmbarqueVendaAberto(Boolean indNaoImprimeCupomEmbarqueVendaAberto) {
+		this.indNaoImprimeCupomEmbarqueVendaAberto = indNaoImprimeCupomEmbarqueVendaAberto;
+	}
+
+	public Boolean getIndNaoImprimeCupomEmbarqueConfirmacaoAberto() {
+		return indNaoImprimeCupomEmbarqueConfirmacaoAberto == null ? false : indNaoImprimeCupomEmbarqueConfirmacaoAberto;
+	}
+
+	public void setIndNaoImprimeCupomEmbarqueConfirmacaoAberto(Boolean indNaoImprimeCupomEmbarqueConfirmacaoAberto) {
+		this.indNaoImprimeCupomEmbarqueConfirmacaoAberto = indNaoImprimeCupomEmbarqueConfirmacaoAberto;
+	}
 }