Merge remote-tracking branch 'origin/master' into AL-2696

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.7</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>

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;
+	}
+	
+	
+
 }

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

@@ -80,6 +80,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)
 	@JoinColumn(name = "PTOVTAEMPRESA_ID", referencedColumnName = "PTOVTAEMPRESA_ID")
@@ -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();

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;
 	}