Commit Graph

9015 Commits (52cdabcc319a2b1e519f188acfa4b0ae2f72b718)

Author SHA1 Message Date
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
Aristides dos Reis Júnior 7a04f7cf0e fixes bug#AL-4586 2024-07-18 00:57:03 -03:00
pinheiro 8d96e49c4b Merge pull request 'fixes bug #AL-4647' (!601) from AL-4647 into master
Reviewed-on: adm/VentaBoletosAdm#601
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-17 22:40:51 +00:00
valdevir ceecd87b6b fixes bug #AL-4647 2024-07-17 19:27:02 -03:00
pinheiro ea83bcf674 Merge pull request 'fixes bug #AL-4634' (!600) from AL-4634 into master
Reviewed-on: adm/VentaBoletosAdm#600
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-17 21:01:58 +00:00
valdevir 16ba6bcd2f fixes bug #AL-4634 2024-07-17 17:59:51 -03:00
Valdir Cordeiro f7d40327c8 Merge pull request 'Espec Bolivariano - Integração Infobit. fixes bug#AL-4273' (!599) from AL-4273_1 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/599
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-17 14:01:36 +00:00
valdir.cordeiro c230fd099c Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-17 10:55:51 -03:00
fabio 899a5d4475 Cadastro de desconto por contrato feat bug#AL-4342' (!598) from AL-4342 into master
Reviewed-on: adm/VentaBoletosAdm#598
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-16 23:05:22 +00:00
Fabio 4e93a9bff3 Cadastro de desconto por contrato feat bug#AL-4342 2024-07-16 20:02:37 -03:00
Fabio 3219d70cb2 Cadastro de desconto por contrato feat bug#AL-4342 2024-07-16 20:00:33 -03:00
pinheiro 0ba2deb26b Merge pull request 'fixes bug #AL-4635' (!597) from AL-4635 into master
Reviewed-on: adm/VentaBoletosAdm#597
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-16 19:10:02 +00:00
valdevir 37a9bc5559 fixes bug #AL-4635 2024-07-16 15:58:52 -03:00
pinheiro d76b4296a8 Merge pull request 'fixes bug #AL-4634' (!596) from AL-4634 into master
Reviewed-on: adm/VentaBoletosAdm#596
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-16 14:38:49 +00:00
valdevir cd90ee401f fixes bug #AL-4634 2024-07-16 11:15:44 -03:00
fabio 4468618ed7 Merge pull request 'Cadastro de convenio transportadora feat bug#AL-4346' (!595) from AL-4346 into master
Reviewed-on: adm/VentaBoletosAdm#595
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
2024-07-15 13:30:07 +00:00
Fabio 4a5781826f Cadastro de convenio transportadora feat bug#AL-4346 2024-07-12 18:11:32 -03:00
leonardo.bolivariano 1a29c5595a Merge pull request 'Aumentar tamanho do campo corrida_id para 9. fixes bug#AL-4264' (!594) from AL-4264 into master
Reviewed-on: adm/VentaBoletosAdm#594
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-11 20:38:05 +00:00
Leonardo Oliveira 47d6036dfa Aumentar tamanho do campo corrida_id para 9 fixes bug#AL-4264 2024-07-11 17:10:31 -03:00
fabio 33a3c5d4a2 Merge pull request 'Cadastro de contratos corporativos fixes bug#AL-4276' (!593) from AL-4276 into master
Reviewed-on: adm/VentaBoletosAdm#593
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2024-07-11 19:35:27 +00:00
Fabio fe4412b4e6 Cadastro de convenio transportadora bug#AL-4246 2024-07-11 14:49:28 -03:00
Fabio 9fa67c0da8 Cadastro de contratos corporativos fixes bug#AL-4276 2024-07-11 14:45:18 -03:00
Gleison da Cruz c1f4daef89 Merge pull request 'Cadastro de contratos corporativos fixes bug#AL-4276' (!592) from AL-4276 into master
Reviewed-on: adm/VentaBoletosAdm#592
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2024-07-11 12:24:33 +00:00
Fabio d6193b8266 Cadastro de contratos corporativos fixes bug#AL-4276 2024-07-10 20:01:40 -03:00
Gleison da Cruz 657e17ce73 Merge pull request 'fixes bug#AL-4414' (!591) from AL-4414 into master
Reviewed-on: adm/VentaBoletosAdm#591
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-10 21:15:04 +00:00
Gleison da Cruz 15c3d86e11 fixes bug#AL-4414 2024-07-10 18:12:01 -03:00
Gleison da Cruz 871f4e44c9 fixes bug#AL-4414 2024-07-10 17:52:35 -03:00