fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #8153 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@62065 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-10-27 16:32:39 +00:00
parent af87af7685
commit 189deed103
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java
View File

@ -131,7 +131,7 @@ public class EmpresaContaBancaria implements Serializable {
if(this.getInstituicaoFinandeira().equals(oldObject.getInstituicaoFinandeira()) && if(this.getInstituicaoFinandeira().equals(oldObject.getInstituicaoFinandeira()) &&
this.getNumAgencia().equals(oldObject.getNumAgencia()) && this.getNumConta().equals(oldObject.getNumConta()) && this.getNumAgencia().equals(oldObject.getNumAgencia()) && this.getNumConta().equals(oldObject.getNumConta()) &&
this.getNumIntegracion().equals(oldObject.getNumIntegracion()) && (this.getNumIntegracion() != null && this.getNumIntegracion().equals(oldObject.getNumIntegracion())) &&
this.getActivo().equals(oldObject.getActivo())) { this.getActivo().equals(oldObject.getActivo())) {
return true; return true;
} }

49
src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java
View File

@ -70,6 +70,9 @@ public class PtovtaEmpresa implements Serializable {
@ManyToOne @ManyToOne
private EmpresaContaBancaria empresaContaBancaria; private EmpresaContaBancaria empresaContaBancaria;
@Column(name = "INDIMPCOMPCARTAO")
private Boolean indImpCompCartao;
public PtovtaEmpresa() { public PtovtaEmpresa() {
} }
@ -135,30 +138,27 @@ public class PtovtaEmpresa implements Serializable {
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; final int prime = 31;
hash += (ptovtaempresaId != null ? ptovtaempresaId.hashCode() : 0); int result = 1;
return hash; result = prime * result + ((ptovtaempresaId == null) ? 0 : ptovtaempresaId.hashCode());
return result;
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) { if (this == obj)
return false; return true;
} if (obj == null)
if (getClass() != obj.getClass()) { return false;
return false; if (getClass() != obj.getClass())
} return false;
final PtovtaEmpresa other = (PtovtaEmpresa) obj; PtovtaEmpresa other = (PtovtaEmpresa) obj;
if (this.activo != other.activo && (this.activo == null || !this.activo.equals(other.activo))) { if (ptovtaempresaId == null) {
return false; if (other.ptovtaempresaId != null)
} return false;
if (this.empresa != other.empresa && (this.empresa == null || !this.empresa.equals(other.empresa))) { } else if (!ptovtaempresaId.equals(other.ptovtaempresaId))
return false; return false;
} return true;
if (this.puntoVenta != other.puntoVenta && (this.puntoVenta == null || !this.puntoVenta.equals(other.puntoVenta))) {
return false;
}
return true;
} }
@Override @Override
@ -203,4 +203,13 @@ public class PtovtaEmpresa implements Serializable {
public void setNumeroSitef(String numeroSitef) { public void setNumeroSitef(String numeroSitef) {
this.numeroSitef = numeroSitef; this.numeroSitef = numeroSitef;
} }
public Boolean getIndImpCompCartao() {
return indImpCompCartao;
}
public void setIndImpCompCartao(Boolean indImpCompCartao) {
this.indImpCompCartao = indImpCompCartao;
}
} }