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

Merge pull request 'fixes bug#AL-1975' (#29) from AL-1975 into master 

Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/29
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
aristides 2023-02-07 13:06:42 +00:00
parent 6421dd28b7 123f207fe2
commit 3cc61b389f
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.0.31</version>
<version>1.0.32</version>
<distributionManagement>
<repository>
<id>rj-releases</id>

35
src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java
View File

@ -88,6 +88,15 @@ public class OrgaoConcedente implements Serializable, Auditavel<OrgaoConcedente>
private Boolean indValDocObligatorioMonitrip;
@Column(name = "INDVALDOCOBLIGATORIOEMBARCADA")
private Boolean indValDocObligatorioEmbarcada;
@Column(name = "TAXACONVENIENCIAPORC")
private BigDecimal taxaConvenienciaPorc;
@Column(name = "MAXTAXACONVENIENCIAPORTARIFA")
private BigDecimal maximoTaxaConvenienciaPorTarifa;
@Column(name = "MENSAGEMRECIBOTXCONVENIENCIA")
private String mensagemReciboTaxaDeConveniencia;
@OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL)
@NaoAuditar
@ -310,6 +319,22 @@ public class OrgaoConcedente implements Serializable, Auditavel<OrgaoConcedente>
public void setIndValDocObligatorioEmbarcada(Boolean indValDocObligatorioEmbarcada) {
this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada;
}
public BigDecimal getTaxaConvenienciaPorc() {
return taxaConvenienciaPorc;
}
public void setTaxaConvenienciaPorc(BigDecimal taxaConvenienciaPorc) {
this.taxaConvenienciaPorc = taxaConvenienciaPorc;
}
public BigDecimal getMaximoTaxaConvenienciaPorTarifa() {
return maximoTaxaConvenienciaPorTarifa;
}
public void setMaximoTaxaConvenienciaPorTarifa(BigDecimal maximoTaxaConvenienciaPorTarifa) {
this.maximoTaxaConvenienciaPorTarifa = maximoTaxaConvenienciaPorTarifa;
}
@Override
public int hashCode() {
@ -351,8 +376,14 @@ public class OrgaoConcedente implements Serializable, Auditavel<OrgaoConcedente>
public void setTaxaConvenienciaSVI(BigDecimal taxaConvenienciaSVI) {
this.taxaConvenienciaSVI = taxaConvenienciaSVI;
}
public String getMensagemReciboTaxaDeConveniencia() {
return mensagemReciboTaxaDeConveniencia;
}
public void setMensagemReciboTaxaDeConveniencia(String mensagemReciboTaxaDeConveniencia) {
this.mensagemReciboTaxaDeConveniencia = mensagemReciboTaxaDeConveniencia;
}
@Override
public void clonar() throws CloneNotSupportedException {