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

Merge pull request 'AL-4466' (!262) from AL-4466_1 into master 

Reviewed-on: adm/ModelWeb#262
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Valdir Cordeiro 2024-08-28 20:03:03 +00:00
parent 6ad50a3b52 d7f069a659
commit e73e3ff118
2 changed files with 12 additions and 1 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.101.0</version> <version>1.102.0</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

11
src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java
View File

@ -130,6 +130,10 @@ public class TipoEventoExtra implements Serializable {
@JoinColumn(name = "IMPRESIONLAYOUTCONFIG_ID") @JoinColumn(name = "IMPRESIONLAYOUTCONFIG_ID")
private ImpresionLayoutConfig impresionLayoutConfig; private ImpresionLayoutConfig impresionLayoutConfig;
@OneToOne
@JoinColumn(name = "IMPRESIONLAYOUTEMAILCONFIG_ID")
private ImpresionLayoutConfig impresionLayoutEmailConfig;
public TipoEventoExtraEmpresa addEmpresa(Empresa e) { public TipoEventoExtraEmpresa addEmpresa(Empresa e) {
TipoEventoExtraEmpresa t = new TipoEventoExtraEmpresa(); TipoEventoExtraEmpresa t = new TipoEventoExtraEmpresa();
t.setEmpresa(e); t.setEmpresa(e);
@ -458,6 +462,13 @@ public class TipoEventoExtra implements Serializable {
this.indQuantViasImp = indQuantViasImp; this.indQuantViasImp = indQuantViasImp;
} }
public ImpresionLayoutConfig getImpresionLayoutEmailConfig() {
return impresionLayoutEmailConfig;
}
public void setImpresionLayoutEmailConfig(ImpresionLayoutConfig impresionLayoutEmailConfig) {
this.impresionLayoutEmailConfig = impresionLayoutEmailConfig;
}
@Override @Override
public int hashCode() { public int hashCode() {