From b8fec5b798579b13db57c5568b89ea9b1c9677ae Mon Sep 17 00:00:00 2001
From: Aristides <aristides@rjconsultores.com.br>
Date: Wed, 5 Jul 2023 15:30:22 -0300
Subject: [PATCH 1/3] fixes bug#AL_2690

---
 pom.xml                                             |  2 +-
 .../rjconsultores/ventaboletos/entidad/Cliente.java | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 87c32a507..f474240da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.6.4</version>
+	<version>1.6.5</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Cliente.java b/src/com/rjconsultores/ventaboletos/entidad/Cliente.java
index 1332c62e6..b5b9fc29f 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Cliente.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Cliente.java
@@ -36,7 +36,10 @@ import org.hibernate.annotations.Where;
 @Entity
 @SequenceGenerator(name = "CLIENTE_SEQ", sequenceName = "CLIENTE_SEQ", allocationSize = 1)
 @Table(name = "CLIENTE")
+
 public class Cliente implements Serializable {
+	@Column(name="ROWID", updatable=false, insertable=false)
+	private String rowId;
 
 	private static final long serialVersionUID = 1L;
 	@Id
@@ -553,4 +556,14 @@ public class Cliente implements Serializable {
 		this.fecbloqueiopcd = fecbloqueiopcd;
 	}
 
+	public String getRowId() {
+		return rowId;
+	}
+
+	public void setRowId(String rowId) {
+		this.rowId = rowId;
+	}
+	
+	
+
 }

From bad45a7fbcaf995577b993034bd54142ce883fc7 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Wed, 5 Jul 2023 21:48:53 -0300
Subject: [PATCH 2/3] fixes bug AL-2895

---
 pom.xml                                               |  2 +-
 .../ventaboletos/entidad/PtovtaEmpresa.java           | 11 +++++++++++
 .../ventaboletos/entidad/PuntoVenta.java              | 11 -----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 87c32a507..f474240da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.6.4</version>
+	<version>1.6.5</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>
diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java
index 460910ef8..02f9f9bb7 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java
@@ -79,6 +79,9 @@ public class PtovtaEmpresa implements Serializable, Auditavel<PtovtaEmpresa>{
     
     @Column(name = "NUMSITEF")
     private String numeroSitef;
+    
+	@Column(name = "MERCHANTSTOREADYEN")
+	private String merchantStoreAdyen;	
         
     @NaoAuditar
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@@ -233,6 +236,14 @@ public class PtovtaEmpresa implements Serializable, Auditavel<PtovtaEmpresa>{
 		this.contasBancaria = contasBancaria;
 	}
 
+	public String getMerchantStoreAdyen() {
+		return merchantStoreAdyen;
+	}
+
+	public void setMerchantStoreAdyen(String merchantStoreAdyen) {
+		this.merchantStoreAdyen = merchantStoreAdyen;
+	}
+
 	public String getContasBancariaInfo() {
 		if (!getContasBancaria().isEmpty()) {
 			StringBuilder sb = new StringBuilder();
diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java
index d79dce8c7..061e1ae88 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java
@@ -346,9 +346,6 @@ public class PuntoVenta implements Serializable,  Auditavel<PuntoVenta>  {
 	@Column(name = "INDBLOQUEARDESCONTOWEB")
 	private Boolean indBloquearDescontoWEB;
 	
-	@Column(name = "MERCHANTSTOREADYEN")
-	private String merchantStoreAdyen;	
-	
 	public List<CobrancaAdcPuntoVenta> getCobrancaAdicionalList() {
 		return cobrancaAdicionalList;
 	}
@@ -1373,14 +1370,6 @@ public class PuntoVenta implements Serializable,  Auditavel<PuntoVenta>  {
 		this.indBloquearDescontoWEB = indBloquearDescontoWEB;
 	}
 
-	public String getMerchantStoreAdyen() {
-		return merchantStoreAdyen;
-	}
-
-	public void setMerchantStoreAdyen(String merchantStoreAdyen) {
-		this.merchantStoreAdyen = merchantStoreAdyen;
-	}
-
 	public Integer getTempoMaxServicoEmVenda() {
 		return tempoMaxServicoEmVenda;
 	}

From e3e2e5b1666042fc5511699042e3f09ab6548f88 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Wed, 5 Jul 2023 21:55:53 -0300
Subject: [PATCH 3/3] fixes bug AL-2895

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f474240da..e3d5655d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.6.5</version>
+	<version>1.6.6</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>