fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,441 Commits
1 Branch
650 Tags
49 MiB
Commit Graph

9441 Commits (ace509bcd3d8ce00cb6261e607d61d99db2a5044)

Author SHA1 Message Date
Gleison da Cruz eb00aac227 Merge pull request 'fixes bug#AL-4682' (!621) from AL-4682 into master 
Reviewed-on: adm/VentaBoletosAdm#621
Reviewed-by: aristides <aristides@rjconsultores.com.br>
 2024-07-31 19:12:31 +00:00
Gleison da Cruz bd880fcd64 fixes bug#AL-4682 2024-07-31 16:09:43 -03:00
Gleison da Cruz 8f14e3c12a fixes bug#AL-4682 2024-07-31 16:08:26 -03:00
Fernando Abimael Alvarez Uc 1f5ca7e1fc Conflicts solved#AL4551 2024-07-31 10:43:49 -06:00
Fernando Abimael Alvarez Uc fd6c19626f Se cambia versión de POM#AL-4549 2024-07-31 09:19:27 -06:00
Fernando Abimael Alvarez Uc e92b7abaf5 Conflicts solved. Fixes bug#AL-4549 2024-07-31 09:17:42 -06:00
Fernando Abimael Alvarez Uc 2ce9ee2994 Se agrega funcionalidad de asignar número de placa de bus programado.#AL-4551 2024-07-31 09:12:15 -06:00
aristides f0c8aef100 Merge pull request 'fixes bug#AL-4586' (!620) from AL-4586 into master 
Reviewed-on: adm/VentaBoletosAdm#620
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
 2024-07-31 14:39:18 +00:00
Aristides dos Reis Júnior ce0591f823 fixes bug#AL-4586 2024-07-31 11:30:50 -03:00
Lucas Taiã d7d03c610a Merge pull request 'fixes bug#AL-4697 novo campo sicfe' (!619) from AL-4697 into master 
Reviewed-on: adm/VentaBoletosAdm#619
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-07-31 12:42:16 +00:00
Lucas e9993824f5 fixes bug#AL-4697 novo campo sicfe 2024-07-30 20:16:50 -03:00
Fernando Abimael Alvarez Uc ffe715b681 Conflicts solved. Fixes bug#AL-4549 2024-07-30 12:51:35 -06:00
Gleison da Cruz 6940934946 Merge pull request 'fixes bug#AL-4580' (!617) from AL-4580 into master 
Reviewed-on: adm/VentaBoletosAdm#617
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-07-29 22:05:41 +00:00
Gleison da Cruz cc94c9f6fd fixes bug#AL-4580 2024-07-29 18:57:44 -03:00
Fernando Abimael Alvarez Uc 7cf3f1ca8e Se crea pantalla Expreso Por Cotizar#AL-4549. \n Se crea pantalla Expreso Carga de Contrato#AL-4550. \n Se crea pantalla Expreso Programación de Vehículo#AL-4551. \n Se crea pantalla Expreso Documentos#AL-4552. 2024-07-29 14:39:28 -06:00
leonardo.bolivariano c1d0488150 Merge pull request 'Permitir sillas com letras fixes bug#AL-4281' (!615) from AL-4281 into master 
Reviewed-on: adm/VentaBoletosAdm#615
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-07-26 14:26:21 +00:00
Leonardo Oliveira 4b781df28f Permitir sillas com letras fixes bug#AL-4281 2024-07-26 07:31:14 -03:00
leonardo.bolivariano 9a21f92799 Merge pull request 'alterada a primary key composta para simples fixes bug#AL-4453' (!614) from AL-4453 into master 
Reviewed-on: adm/VentaBoletosAdm#614
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-07-26 01:03:33 +00:00
fabio 078ee8a2cb Merge branch 'master' into AL-4453 2024-07-25 23:33:05 +00:00
Leonardo Oliveira 507893adf8 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:37:47 -03:00
leonardo.bolivariano 4f406353d1 Merge pull request 'removido TipoLancamentoCaixa do spring-config.xml fixes bug#AL-4453' (!613) from AL-4453 into master 
Reviewed-on: adm/VentaBoletosAdm#613
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-07-25 11:56:45 +00:00
Leonardo Oliveira 838b924eb5 removido TipoLancamentoCaixa do spring-config.xml fixes bug#AL-4453 2024-07-25 08:53:32 -03:00
leonardo.bolivariano 16a4b85a8c Merge pull request 'Bolivariano - Autorização de viagem fixes bug#AL-4453' (!612) from AL-4453 into master 
Reviewed-on: adm/VentaBoletosAdm#612
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-07-24 23:01:56 +00:00
Leonardo Oliveira a5b6edebe1 merge master 2024-07-24 18:16:35 -03:00
Leonardo Oliveira 772e5e9dd0 Bolivariano - Autorização de viagem fixes bug#AL-4453 2024-07-24 18:01:02 -03:00
aristides ca8a56a848 Merge pull request 'AL-4587' (!610) from AL-4587 into master 
Reviewed-on: adm/VentaBoletosAdm#610
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-07-22 14:31:28 +00:00
Aristides dos Reis Júnior 52cdabcc31 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4587 
# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_fr_FR.label
#	web/WEB-INF/i3-label_pt_BR.label
 2024-07-22 11:30:14 -03:00
Valdir Cordeiro 9c38786221 Merge pull request 'Espec Bolivariano - Integração Infobit. fixes bug#AL-4273' (!611) from AL-4273-2 into master 
Reviewed-on: adm/VentaBoletosAdm#611
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-07-22 13:39:32 +00:00
valdir.cordeiro 331d8c4df9 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-22 10:31:06 -03:00
Aristides dos Reis Júnior 8358a869da fixes bug#AL-4587 2024-07-19 20:53:29 -03:00
Aristides dos Reis Júnior a89bc2ef05 fixes bug#AL-4587 2024-07-19 20:50:22 -03:00
aurora.cuaquentzi 7bb9e23d2d Merge pull request 'AL-4505A' (!609) from AL-4505A into master 
Reviewed-on: adm/VentaBoletosAdm#609
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
 2024-07-19 19:37:50 +00:00
aurora.cuaquentzi 5e9570afa2 Merge branch 'AL-4505A' of https://gitrj.rjconsultores.com.br/adm/VentaBoletosAdm.git into AL-4505A 2024-07-19 13:30:51 -06:00
aurora.cuaquentzi 957ffe1a1c bug#AL-4505 
Bolivariano - Sangria.
dev:Lukas
qua:
 2024-07-19 13:27:54 -06:00
aurora.cuaquentzi 1bfcaea9dd bug#AL-4505 
Bolivariano - Sangria.
dev:Lukas
qua:
 2024-07-19 13:23:18 -06:00
fabio 02d5f6abba Merge pull request 'Funcionalidade de adicao ao contrato feat bug#AL-4343' (!608) from AL-4343 into master 
Reviewed-on: adm/VentaBoletosAdm#608
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-07-19 16:17:37 +00:00
Fabio 2ba38347b1 Funcionalidade de adicao ao contrato feat bug#AL-4343 2024-07-19 12:45:47 -03:00
pinheiro b3cd60e7a6 Merge pull request 'fixes bug#AL-4657' (!607) from AL-4657 into master 
Reviewed-on: adm/VentaBoletosAdm#607
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-07-19 14:22:05 +00:00
valdevir 00f7f65eea fixes bug#AL-4657 2024-07-19 11:14:26 -03:00
pinheiro abf2d5c5f6 Merge pull request 'AL-4280 preview layout' (!606) from AL-4280_1 into master 
Reviewed-on: adm/VentaBoletosAdm#606
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-07-19 13:59:29 +00:00
Lucas d3482af9fc AL-4280 preview layout 2024-07-18 22:36:57 -03:00
pinheiro 3bdada3519 Merge pull request 'fixes bug #AL-4657' (!605) from AL-4657 into master 
Reviewed-on: adm/VentaBoletosAdm#605
Reviewed-by: aristides <aristides@rjconsultores.com.br>
 2024-07-18 19:34:11 +00:00
valdevir 4bfcd845ff fixes bug #AL-4657 2024-07-18 16:30:05 -03:00
fabio 92f76bc64b Merge pull request 'Correçao sequencia de versao de build' (!604) from AL-4346 into master 
Reviewed-on: adm/VentaBoletosAdm#604
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-07-18 14:48:22 +00:00
Fabio 8c817a50ab Correçao sequencia de versao de build 2024-07-18 11:43:06 -03:00
fabio 0150765b43 Cadastro de convenio transportadora feat bug#AL-4346' (!603) from AL-4346 into master 
Reviewed-on: adm/VentaBoletosAdm#603
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-07-18 14:33:53 +00:00
Fabio 95d145cfc4 Cadastro de convenio transportadora feat bug#AL-4346 2024-07-18 11:18:43 -03:00
aristides ce9cdce4a6 Merge pull request 'fixes bug#AL-4586' (!602) from AL-4587 into master 
Reviewed-on: adm/VentaBoletosAdm#602
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
 2024-07-18 13:14:25 +00:00
Aristides dos Reis Júnior 40365a74be fixes bug#4586 2024-07-18 10:13:25 -03:00
Aristides dos Reis Júnior 56b9c50d03 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4587 
# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_en.label
#	web/WEB-INF/i3-label_es_MX.label
#	web/WEB-INF/i3-label_fr_FR.label
#	web/WEB-INF/i3-label_pt_BR.label
 2024-07-18 01:06:58 -03:00