Merge pull request 'fixes bug #AL-3494' (!407) from AL-3494 into master
Reviewed-on: adm/VentaBoletosAdm#407 Reviewed-by: aristides <aristides@rjconsultores.com.br>master 1.53.6
commit
103eaf2be4
4
pom.xml
4
pom.xml
|
@ -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.53.5</version>
|
<version>1.53.6</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<modelWeb.version>1.40.3</modelWeb.version>
|
<modelWeb.version>1.40.4</modelWeb.version>
|
||||||
<flyway.version>1.30.0</flyway.version>
|
<flyway.version>1.30.0</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>
|
||||||
|
|
|
@ -1083,7 +1083,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
|
||||||
// Gerar corrida novamente.
|
// Gerar corrida novamente.
|
||||||
List<EsquemaCorrida> esquemaCorridaList = new ArrayList<EsquemaCorrida>();
|
List<EsquemaCorrida> esquemaCorridaList = new ArrayList<EsquemaCorrida>();
|
||||||
esquemaCorridaList.add(esquemaCorrida);
|
esquemaCorridaList.add(esquemaCorrida);
|
||||||
corridaService.generarCorrida(dataIter, esquemaCorridaList, false, corridaTramoList);
|
corridaService.generarCorrida(dataIter, esquemaCorridaList, false, corridaTramoList, true);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1211,7 +1211,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
|
||||||
asientoExclusivoService.borrarByCorrida(corrida);
|
asientoExclusivoService.borrarByCorrida(corrida);
|
||||||
disponibilidadService.borrarByCorrida(corrida);
|
disponibilidadService.borrarByCorrida(corrida);
|
||||||
integracaoTotvsService.borrarByCorrida(corrida);
|
integracaoTotvsService.borrarByCorrida(corrida);
|
||||||
corridaService.borrar(corrida);
|
//corridaService.borrar(corrida);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void salvaNovoEsquemaCorrida(Date dataDeFecInicioVigencia, List<EsquemaCorrida> lsEC)
|
private void salvaNovoEsquemaCorrida(Date dataDeFecInicioVigencia, List<EsquemaCorrida> lsEC)
|
||||||
|
|
Loading…
Reference in New Issue