Commit Graph

15130 Commits (0026eb0cfbf8c9bf86a333b0ee649003aa1db8b9)

Author SHA1 Message Date
Leonardo Oliveira 06b602da4f Merge branch 'master' of http://18.235.188.113:3000/adm/ModelWeb 2024-07-25 19:21:47 -03:00
leonardo.bolivariano edcd9a0d2f Merge pull request 'alterada a primary key composta para simples fixes bug#AL-4453' (!235) from AL-4453 into master
Reviewed-on: adm/ModelWeb#235
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-25 20:16:47 +00:00
Valdir Cordeiro f7beccb5dd Merge branch 'master' into AL-4453 2024-07-25 20:16:19 +00:00
leonardo.bolivariano 262433c666 Merge pull request 'alterada a primary key composta para simples fixes bug#AL-4453' (!159) from AL-4453 into master
Reviewed-on: utilidades/Flyway#159
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-25 19:58:46 +00:00
Leonardo Oliveira 5cd7792971 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:42:38 -03:00
Leonardo Oliveira 507893adf8 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:37:47 -03:00
Leonardo Oliveira 0fbef4bb92 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:35:32 -03:00
Leonardo Oliveira f2f861ca80 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:34:58 -03:00
Leonardo Oliveira 700044c5fb alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:32:25 -03:00
Leonardo Oliveira 90e7d7ddba alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:31:27 -03:00
Leonardo Oliveira 463c4be2ee alteradas as constraints pois o nome nao deve exceder 30 caracteres fixes bug#AL-4453 2024-07-25 11:31:56 -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.bolivariano e4437b4b58 Merge pull request 'Bolivariano - Autorização de viagem fixes bug#AL-4453' (!234) from AL-4453 into master
Reviewed-on: adm/ModelWeb#234
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-24 23:01:33 +00:00
leonardo.bolivariano 67478dd0bf Merge pull request 'Bolivariano - Autorização de viagem fixes bug#AL-4453' (!157) from AL-4453 into master
Reviewed-on: utilidades/Flyway#157
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-24 21:20:27 +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
Leonardo Oliveira 4e863123d1 merge master 2024-07-24 17:57:58 -03:00
Leonardo Oliveira 8040c1e5b8 Bolivariano - Autorização de viagem fixes bug#AL-4453 2024-07-24 17:55:44 -03:00
Leonardo Oliveira 0211c1748b merge master 2024-07-24 17:51:48 -03:00
Leonardo Oliveira 23f0f4ee4b Bolivariano - Autorização de viagem fixes bug#AL-4453 2024-07-24 17:46:49 -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 f0b9f9b675 Merge pull request 'Espec Bolivariano - Integração Infobit. fixes bug#AL-4273' (!233) from AL-4273-2 into master
Reviewed-on: adm/ModelWeb#233
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-22 13:39:21 +00:00
Valdir Cordeiro 6cd3b32bc4 Merge pull request 'Espec Bolivariano - Integração Infobit. fixes bug#AL-4273' (!156) from AL-4273-2 into master
Reviewed-on: utilidades/Flyway#156
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-22 13:39:14 +00:00
valdir.cordeiro d746ac68f3 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-22 10:32:24 -03:00
valdir.cordeiro e5ac6f38f8 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-22 10:31:23 -03:00
valdir.cordeiro 331d8c4df9 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-22 10:31:06 -03:00
Valdir Cordeiro d3c86d0488 Merge pull request 'fixes bug#AL-4587' (!155) from fixes_bugAL-4587 into master
Reviewed-on: utilidades/Flyway#155
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-07-22 13:27:01 +00: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
Aristides dos Reis Júnior cf9f7812f4 fixes bug#AL-4587 2024-07-19 20:39:13 -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 1eb352fe37 Merge pull request 'Funcionalidade de adicao ao contrato feat bug#AL-4343' (!232) from AL-4343 into master
Reviewed-on: adm/ModelWeb#232
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-19 16:17:22 +00:00
fabio 334c8ca8f6 Merge pull request 'Funcionalidade de adicao ao contrato feat bug#AL-4343' (!154) from AL-4343 into master
Reviewed-on: utilidades/Flyway#154
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-19 16:17:12 +00:00
Fabio 2ba38347b1 Funcionalidade de adicao ao contrato feat bug#AL-4343 2024-07-19 12:45:47 -03:00
Fabio 50d0afe2a7 Funcionalidade de adicao ao contrato feat bug#AL-4343 2024-07-19 12:44:40 -03:00
Fabio a7142ba6eb Funcionalidade de adicao ao contrato feat bug#AL-4343 2024-07-19 12:44:02 -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
pinheiro d370afd453 Merge pull request 'fixes bug #AL-4657' (!153) from AL-4657 into master
Reviewed-on: utilidades/Flyway#153
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-19 14:20:59 +00:00
valdevir 00f7f65eea fixes bug#AL-4657 2024-07-19 11:14:26 -03:00
pinheiro ceb3592b02 Merge pull request 'AL-4280 preview layout' (!231) from AL-4280_1 into master
Reviewed-on: adm/ModelWeb#231
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-19 14:03:46 +00: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
valdevir 6ecdaa4225 fixes bug #AL-4657 2024-07-19 10:53:58 -03:00