Commit Graph

8822 Commits (07ce10ca848f4976f0a2e2fa051993b2c882d5fe)

Author SHA1 Message Date
Gleison da Cruz 07ce10ca84 Merge pull request 'fixes bug#AL-4360' (!525) from AL-4360 into master
Reviewed-on: adm/VentaBoletosAdm#525
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2024-05-20 20:33:55 +00:00
Gleison da Cruz ca614860ca fixes bug#AL-4360 2024-05-20 17:30:34 -03:00
gleimar dc9d782218 Merge pull request 'Correção.' (!524) from AL-4382 into master
Reviewed-on: adm/VentaBoletosAdm#524
2024-05-20 18:11:33 +00:00
Gleimar Botelho Baleeiro 00f50ecdd6 Correção. 2024-05-20 15:09:47 -03:00
Célio de Souza Ribeiro JR a7b794416a Merge pull request 'fixes bug#AL-4128' (!523) from AL-4128 into master
Reviewed-on: adm/VentaBoletosAdm#523
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-05-18 01:16:07 +00:00
celio.souza 2d893a8942 fixes bug#AL-4128 2024-05-17 22:14:52 -03:00
celio.souza 3d4491fd27 ixes bug#AL-4128 2024-05-17 22:11:50 -03:00
Gleison da Cruz 2fc38433a1 Merge pull request 'fixes bug#AL-4360' (!522) from AL-4360 into master
Reviewed-on: adm/VentaBoletosAdm#522
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2024-05-17 12:39:06 +00:00
Gleison da Cruz c51bdc234f Resolvendo conflito 2024-05-17 09:27:54 -03:00
fabio 0c5077a3d4 alteracao de conta boleto alfanumerico feat bug#AL-4117' (!520) from AL-4117 into master
Reviewed-on: adm/VentaBoletosAdm#520
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2024-05-17 12:18:35 +00:00
Gleison da Cruz 66ea9caccc fixes bug#AL-4360 2024-05-17 09:17:31 -03:00
Fabio 5f1ee62f2a Resolusão de conflitos 2024-05-17 08:24:35 -03:00
Célio de Souza Ribeiro JR 2b5e239805 Merge pull request 'fixes bug#AL-4195' (!521) from AL-4195 into master
Reviewed-on: adm/VentaBoletosAdm#521
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2024-05-16 21:32:44 +00:00
celio.souza c82b4c85e5 fixes bug#AL-4195 2024-05-16 18:24:48 -03:00
Fabio 9f68dfad40 alteracao de conta boleto alfanumerico feat bug#AL-4117 2024-05-16 17:20:54 -03:00
fabio f5f2265560 Merge pull request 'fixes bug#AL-4360' (!519) from AL-4360 into master
Reviewed-on: adm/VentaBoletosAdm#519
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-05-16 20:17:02 +00:00
Gleison da Cruz 69e90ab4ae fixes bug#AL-4360 2024-05-16 17:15:39 -03:00
fabio e179282676 Adicao campo outros vendas bilheteiro feat bug#AL4078' (!518) from AL-4078 into master
Reviewed-on: adm/VentaBoletosAdm#518
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-05-16 13:25:30 +00:00
Fabio c14e4655df Adicao campo outros vendas bilheteiro feat bug#AL4078 2024-05-16 10:11:22 -03:00
Célio de Souza Ribeiro JR 9b00b9dd9b Merge pull request 'fixes bug #AL-4195' (!517) from AL-4195 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/517
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-05-15 22:04:16 +00:00
celio.souza 1b2c0f1213 fixes bug #AL-4195 2024-05-15 18:51:21 -03:00
pinheiro 5bed9e1072 Merge pull request 'fixes bug #AL-4360' (!516) from AL-4360 into master
Reviewed-on: adm/VentaBoletosAdm#516
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-05-15 20:35:01 +00:00
valdevir 21ffd3fc0b fixes bug #AL-4360 2024-05-15 17:31:37 -03:00
Gleison da Cruz cc189f8812 Merge pull request 'fixes bug#AL-4360' (!515) from AL-4360 into master
Reviewed-on: adm/VentaBoletosAdm#515
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-05-15 17:24:12 +00:00
Gleison da Cruz 012e934e0f fixes bug#AL-4360 2024-05-15 14:21:14 -03:00
aristides 9640750068 Merge pull request 'fixes bug#AL-4727' (!514) from AL-4247 into master
Reviewed-on: adm/VentaBoletosAdm#514
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-05-15 14:55:46 +00:00
Aristides dos Reis Júnior e4b5aa7832 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4247
# Conflicts:
#	pom.xml
2024-05-15 11:49:26 -03:00
Aristides dos Reis Júnior 2f714cc36f fixes bug#AL-4727 2024-05-15 11:44:15 -03:00
Valdir Cordeiro e38a6dd489 Merge pull request 'bug#al-4170' (!513) from AL-4170 into master
Reviewed-on: adm/VentaBoletosAdm#513
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-05-15 12:58:50 +00:00
valdir.cordeiro 28f77e8aa2 bug#al-4170
M. Regulatório - Termo Recusa API
dev:
qua:
2024-05-15 08:07:23 -03:00
gleimar 8feb3d8fd8 Merge pull request 'Adição do filtro de empresa.' (!512) from AL-4292 into master
Reviewed-on: adm/VentaBoletosAdm#512
2024-05-15 01:04:34 +00:00
Gleimar Botelho Baleeiro 052bb985b8 Adição do filtro de empresa. 2024-05-14 22:03:35 -03:00
Valdir Cordeiro 5093bba846 Merge pull request 'bug#al-4170' (!511) from AL4170 into master
Reviewed-on: adm/VentaBoletosAdm#511
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-05-14 18:43:04 +00:00
valdir.cordeiro 71af5aeadf bug#al-4170
M. Regulatório - Termo Recusa API
dev:
qua:
2024-05-14 15:36:32 -03:00
aristides 1bee32e0d2 Merge pull request 'fixes bug#AL-4049' (!510) from AL-4049 into master
Reviewed-on: adm/VentaBoletosAdm#510
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-05-13 14:58:29 +00:00
Aristides dos Reis Júnior e24152afdb fixes bug#AL-4049 2024-05-13 11:46:49 -03:00
gleimar 92ea38485d Merge pull request 'Ordenação sentido.' (!509) from AL-4329 into master
Reviewed-on: adm/VentaBoletosAdm#509
2024-05-10 15:04:11 +00:00
Gleimar Botelho Baleeiro 0225c37b83 Ordenação sentido. 2024-05-10 12:02:04 -03:00
pinheiro 51f0694652 Merge pull request 'fix bug #AL-3854' (!508) from fixBug_AL-3854 into master
Reviewed-on: adm/VentaBoletosAdm#508
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-05-09 20:08:25 +00:00
pinheiro 67f61e26bb Merge branch 'master' into fixBug_AL-3854 2024-05-09 20:07:05 +00:00
valdevir a0862a449d fix bug #AL-3854 2024-05-09 17:05:11 -03:00
aristides abf7e375d7 Merge pull request 'fix bug#AL_3854' (!500) from fixBug_AL-3854 into master
Reviewed-on: adm/VentaBoletosAdm#500
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-05-09 20:04:41 +00:00
valdevir aafd65fdd5 fixes bug #A-3854 2024-05-09 17:02:10 -03:00
valdevir 45fd6c7d3d Merge remote-tracking branch 'remotes/origin/master' into fixBug_AL-3854
# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_pt_BR.label
2024-05-09 16:53:16 -03:00
pinheiro 138668e7fe Merge pull request 'fixes bug #AL-4298' (!507) from AL-4298 into master
Reviewed-on: adm/VentaBoletosAdm#507
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-05-09 19:10:04 +00:00
valdevir 80799850ba fixes bug #AL-4298 2024-05-09 16:09:13 -03:00
gleimar 2a9ab26af7 Merge pull request 'Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado.' (!506) from AL-4287 into master
Reviewed-on: adm/VentaBoletosAdm#506
2024-05-09 19:00:50 +00:00
Gleimar Botelho Baleeiro 62274e1e0f Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado. 2024-05-09 15:59:32 -03:00
valdevir 2093980e0a fixes bug #AL-4298 2024-05-09 15:58:51 -03:00
gleimar 90f950861d Merge pull request 'Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado.' (!505) from AL-4286__ into master
Reviewed-on: adm/VentaBoletosAdm#505
2024-05-09 15:52:12 +00:00