Commit Graph

15130 Commits (0026eb0cfbf8c9bf86a333b0ee649003aa1db8b9)

Author SHA1 Message Date
fabio 11b8d247eb Merge pull request 'fixes bug#AL-1979' (#18) from AL-1979 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/18
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-01-09 11:29:29 +00:00
Fabio Faria 31011161c9 fixes bug#AL-1979 2023-01-06 12:42:08 -03:00
Fabio Faria 1e622e226d fixes bug#AL-1979 2023-01-06 12:38:52 -03:00
Fabio Faria a11baab5a4 fixes bug#AL-1979 2023-01-06 12:30:51 -03:00
Célio de Souza Ribeiro JR 9f9dae787d Merge pull request 'Correção para o card AL-1878;' (#43) from AL-1878 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/43
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-01-05 19:51:32 +00:00
Célio de Souza Ribeiro JR 5ab7cf7741 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-1878 2023-01-05 16:43:32 -03:00
Lucas Taiã 87e8cf52f1 Merge branch 'master' into melhoria_enums 2023-01-05 19:39:18 +00:00
Célio de Souza Ribeiro JR 87b83f0e6b Correção para o card AL-1878; 2023-01-05 15:30:07 -03:00
fabio 3274cc7a39 Merge pull request 'fixes bug#AL-2004' (#42) from AL-2004 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/42
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2023-01-05 13:01:10 +00:00
fabio 2cbcfa78fd Merge pull request 'fixes bug#AL-2004' (#11) from AL-2004 into master
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/11
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2023-01-05 12:59:14 +00:00
Fabio Faria 7202a52527 fixes bug#AL-2004 2023-01-05 09:55:11 -03:00
Fabio Faria 666eb7b04e fixes bug#AL-2004 2023-01-04 18:33:04 -03:00
Fabio Faria f631eb4c2a fixes bug#AL-2004 2023-01-04 18:28:08 -03:00
Gleison da Cruz cf6ccc7e57 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm
# Conflicts:
#	pom.xml
2023-01-04 11:17:39 -03:00
Gleison da Cruz de78c64fea Merge pull request 'fixes bug#AL-1558' (#41) from AL-1558 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/41
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-01-04 14:03:33 +00:00
Gleison da Cruz 7df5a939b8 fixes bug#AL-1558
Adicionando nomeclatura aos totalizadores
2023-01-04 10:09:32 -03:00
Lucas Taiã 139fa3a370 Merge pull request 'correcção AL-1627' (#40) from AL-1627-2 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/40
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-01-03 20:06:27 +00:00
Lucas Taiã fb7b22919a Merge pull request 'correção AL-1627' (#10) from AL-1627 into master
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/10
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-01-03 20:05:37 +00:00
lucas.taia dd3e725f8b Merge branch 'master' into AL-1627 2023-01-03 16:52:23 -03:00
lucas.taia 396522b262 correcção AL-1627 2023-01-03 16:48:37 -03:00
Gleison da Cruz 04fd4ce744 Merge pull request 'AL-1904' (#39) from AL-1904 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/39
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-01-03 18:39:56 +00:00
Gleison da Cruz 8c5fb83828 Conflito POM 2023-01-03 15:39:21 -03:00
Gleison da Cruz 94edb07644 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-1904 2023-01-03 15:28:47 -03:00
Gleison da Cruz 37dac836af AL-1904 - Atualizando o arquivo pom para resolver o conflito 2023-01-03 14:00:27 -03:00
lucas.taia 30cd478721 correção AL-1627 2023-01-03 12:49:20 -03:00
Gleison da Cruz d0ac2b4ae9 Merge branch 'AL-1904'
Conflicts:
pom.xml
2023-01-03 11:43:46 -03:00
fabio f46cb5a58e fixes bug#AL-2002 2023-01-03 14:05:34 +00:00
fabio 699f0e30ab Merge pull request 'fixes bug#AL-2002' (#37) from AL-2002 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/37
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-01-03 13:38:25 +00:00
fabio ff541141d4 Merge pull request 'bug#AL-2002' (#9) from AL-2002 into master
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/9
Reviewed-by: wallace <wallace@rjconsultores.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2023-01-03 13:36:33 +00:00
Fabio Faria bdc18daae2 fixes bug#AL-2002 2023-01-03 10:27:21 -03:00
Fabio Faria 75414406c0 bug#AL-2002 2023-01-03 10:24:22 -03:00
Gleison da Cruz 303c52d096 fixes bug#
AL-1904
qua:Debora
Incluindo o campo NSU/HOST no relatoio.
2023-01-02 11:35:06 -03:00
Gleison da Cruz a3c7cde891 fixes bug#
AL-1904
qua:Juliane
2023-01-02 10:55:06 -03:00
Lucas Taiã 6e33d954ad Merge pull request 'AL-1627' (#34) from AL-1627 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/34
Reviewed-by: wallace <wallace@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2022-12-31 00:25:29 +00:00
Lucas Taiã 1e9972242d Merge pull request 'Al-1627' (#17) from Al-1627 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/17
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2022-12-31 00:25:16 +00:00
Lucas Taiã 99f47050a5 Merge pull request 'AL-1627' (#8) from AL-1627 into master
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/8
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2022-12-31 00:24:58 +00:00
lucas.taia f0b3638000 Merge branch 'master' into AL-1627 2022-12-30 21:24:17 -03:00
lucas.taia 395c8ec094 bug#Al-1627 2022-12-30 19:11:36 -03:00
lucas.taia ca50d1f66b bug#AL-1627 2022-12-30 19:11:12 -03:00
lucas.taia 74cf32b99c Merge branch 'master' into AL-1627 2022-12-30 19:10:32 -03:00
lucas.taia 318d8236a4 Merge branch 'master' into Al-1627 2022-12-30 18:53:53 -03:00
lucas.taia 80b7e4ab0c Merge branch 'master' of local repository into AL-1627 2022-12-30 18:39:36 -03:00
fabio c88c78b8bc bug#AL-1627 2022-12-30 18:37:15 -03:00
lucas.taia c2476f4d57 Merge branch 'master' of local repository into Al-1627 2022-12-30 18:34:07 -03:00
lucas.taia a5eaacb005 Merge branch 'master' of local repository into AL-1627 2022-12-30 18:33:51 -03:00
wallace ac436ec4e8 bug#AL-1627 2022-12-30 18:33:41 -03:00
Lucas Taiã 41d86f6b7e bug#AL-1627 2022-12-30 18:33:08 -03:00
Fabio Faria 4849871bad Correção para erro no versionamento do jenkins 2022-12-30 17:20:26 -03:00
aristides d9e0813ef4 Merge pull request 'bug#AL-1757' (#33) from AL-1757 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/33
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2022-12-30 20:12:03 +00:00
aristides@rjconsultores.com.br fe3e378efc Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-1757
# Conflicts:
#	pom.xml
2022-12-30 17:09:30 -03:00