Commit Graph

9062 Commits (4c632a84aa2d9af302b46f0b4a5a8b3ac9b1a5bd)

Author SHA1 Message Date
Fernando Abimael Alvarez Uc 4c632a84aa Merge branch 'master' into AL-4549 2024-08-02 08:56:59 -06:00
Valdir Cordeiro 210899b9b6 Merge pull request 'fixes bug#AL-4487' (!628) from AL-4487 into master
Reviewed-on: adm/VentaBoletosAdm#628
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-08-02 12:17:34 +00:00
Gleison da Cruz 479700c1e2 fixes bug#AL-4487 2024-08-02 08:50:28 -03:00
Lucas Taiã 5d19c16601 Merge pull request 'correcao nazar' (!627) from AL-4280_2 into master
Reviewed-on: adm/VentaBoletosAdm#627
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2024-08-01 22:39:39 +00:00
Lucas 14aa6e81d8 correcao nazar 2024-08-01 18:42:04 -03:00
Fernando Abimael Alvarez Uc 330407fb5f Conflicts solved#AL-4549 2024-08-01 15:31:12 -06:00
Fernando Abimael Alvarez Uc bdac7d60e8 Conflicts solved. fixes bug#Al-4549 2024-08-01 14:54:56 -06:00
Fernando Abimael Alvarez Uc d0066b29ed Conflicts solved. fixes bug#Al-4549 2024-08-01 14:48:20 -06:00
fabio 44e566fa6f Merge pull request 'Consulta e Legalização de Voucher feat bug#AL-4249' (!624) from AL-4279 into master
Reviewed-on: adm/VentaBoletosAdm#624
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-08-01 20:47:56 +00:00
Fabio c529b99e86 Consulta e Legalização de Voucher feat bug#AL-4279 2024-08-01 17:46:43 -03:00
Fernando Abimael Alvarez Uc 448c09da9b Se actualiza versión en POM#AL-4549 2024-08-01 14:43:37 -06:00
Fernando Abimael Alvarez Uc 492f94dfd0 Merge branch 'AL-4549' of https://gitrj.rjconsultores.com.br/adm/VentaBoletosAdm into AL-4549 2024-08-01 14:34:43 -06:00
Fernando Abimael Alvarez Uc 4218de49c7 Se agrega funcionalidad de Pago a Crédito#AL-4549 2024-08-01 14:34:00 -06:00
Gleison da Cruz 4735078461 Merge pull request 'fixes bug#AL-4487' (!625) from AL-4487 into master
Reviewed-on: adm/VentaBoletosAdm#625
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-08-01 20:19:31 +00:00
Gleison da Cruz 65f9234b4f Merge branch 'master' into AL-4487 2024-08-01 20:18:48 +00:00
Gleison da Cruz c71c8a4aef fixes bug#AL-4487 2024-08-01 17:18:04 -03:00
Fabio f04c16a91e Consulta e Legalização de Voucher feat bug#AL-4249 2024-08-01 16:04:32 -03:00
Gleison da Cruz 323c0bdc49 Merge pull request 'fixes bug#AL-4487' (!623) from AL-4487 into master
Reviewed-on: adm/VentaBoletosAdm#623
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-08-01 17:04:52 +00:00
Gleison da Cruz a763d6a7f4 fixes bug#AL-4487 2024-08-01 12:24:35 -03:00
wallace 37e96f3adb Merge pull request 'fixes bug#AL-4442' (!622) from AL-4442 into master
Reviewed-on: adm/VentaBoletosAdm#622
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-08-01 13:24:02 +00:00
wallace.henrique 216b094635 fixes bug#AL-4442 2024-08-01 10:22:31 -03:00
wallace.henrique e62a9b8480 fixes bug#AL-4442 2024-08-01 09:44:45 -03:00
wallace e07f84019b Merge branch 'master' into AL-4549 2024-07-31 21:32:52 +00:00
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 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
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