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

Merge pull request 'fixes bug#2908' (!221) from AL-2908 into master 

Reviewed-on: adm/VentaBoletosAdm#221
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.9.1
wallace 2023-07-11 21:12:02 +00:00
parent fab387d9be 573c5361c8
commit 3b2e91a770
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.6.11</modelWeb.version> <modelWeb.version>1.6.12</modelWeb.version>
<flyway.version>1.5.2</flyway.version> <flyway.version>1.5.2</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfRestricaoCanalVenta.java
View File

@ -76,7 +76,7 @@ public class RenderConfRestricaoCanalVenta implements ListitemRenderer {
private String buscarDescricaoVigencia(ConfRestricaoCanalVenta confRestricaoCanalVenta) { private String buscarDescricaoVigencia(ConfRestricaoCanalVenta confRestricaoCanalVenta) {
if(confRestricaoCanalVenta.getFeciniciovigencia()!= null || confRestricaoCanalVenta.getFecfinvigencia()!= null) { if(confRestricaoCanalVenta.getFeciniciovigencia()!= null || confRestricaoCanalVenta.getFecfinvigencia()!= null) {
return "De "+ sdf.format(confRestricaoCanalVenta.getFeciniciovigencia()) + " até " + sdf.format(confRestricaoCanalVenta.getFecfinvigencia()); return "De "+ sdf.format(confRestricaoCanalVenta.getFeciniciovigencia()) + " até " + sdf.format(confRestricaoCanalVenta.getFecfinvigencia());
} }
return " - "; return " - ";
} }