Commit Graph

2686 Commits (0adde4acced456fb8d2dfb1aba6ebb98880176f3)

Author SHA1 Message Date
valdir.cordeiro 0adde4acce bug#al-2213
Ouro e Prata - Espec_-_Bloquear-Desbloquear_desconto_via_API
dev:
qua:
2023-03-13 16:53:35 -03:00
Gleison da Cruz 537a952dde Merge pull request 'fixes bug#AL-2074' (#35) from AL-2074 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/35
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-03-09 20:30:22 +00:00
Gleison da Cruz 765765802f fixes bug#AL-2074 2023-03-09 16:39:10 -03:00
fabio c4971cff26 Merge pull request 'fixes bug #AL-2093' (#34) from #AL-2093 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/34
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2023-02-28 19:04:29 +00:00
Fabio Faria 149a361812 fixes bug #AL-2093
correção de erro no preenchimento do código de desconto e melhorias
2023-02-28 15:34:36 -03:00
aristides cd6234bf00 Merge pull request 'fixes bug#AL-2224' (#33) from AL-2224 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/33
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-02-27 16:34:26 +00:00
aristides@rjconsultores.com.br 517485ef71 fixes bug#AL-2224 2023-02-27 13:01:09 -03:00
Lucas Taiã f016c17b83 Merge pull request 'AL-1801' (#32) from AL-1801 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/32
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-02-23 14:02:36 +00:00
lucas.taia 2acdad339d AL-1801 2023-02-22 20:17:41 -03:00
lucas.taia 49fe3e5b72 Merge remote-tracking branch 'origin/master' into AL-1801 2023-02-22 20:14:25 -03:00
lucas.taia 6abe7918ec fixes #AL-1801 2023-02-22 20:06:09 -03:00
lucas.taia cc1e7bdccf AL-1801 2023-02-22 14:23:16 -03:00
Lucas Taiã cadfb5846a Merge pull request 'AL-1801' (#31) from AL-1801 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/31
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-02-17 22:12:28 +00:00
lucas.taia d55b35300c AL-1801 2023-02-17 19:04:31 -03:00
wallace 052c45252b Merge pull request 'fixes bug#AL-2179' (#30) from AL-2179 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/30
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-02-14 13:08:32 +00:00
wallace.henrique 572cb0f924 fixes bug#AL-2179 2023-02-13 18:27:32 -03:00
aristides 3cc61b389f Merge pull request 'fixes bug#AL-1975' (#29) from AL-1975 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/29
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-02-07 13:06:42 +00:00
aristides@rjconsultores.com.br 123f207fe2 fixes bug#AL-1975 2023-02-07 08:35:00 -03:00
Lucas Taiã 6421dd28b7 Merge pull request 'fixes bug #AL-2144' (#28) from AL-2144 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/28
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-02-03 21:07:22 +00:00
lucas.taia 3078f03ac3 fixes bug #AL-2144 2023-02-03 17:56:20 -03:00
pinheiro 671280488c Merge pull request 'fixes bug AL-2125' (#27) from AL-2125 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/27
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-02-03 12:50:47 +00:00
valdevir.silva 5fe075d9be fixes bug AL-2125 2023-02-03 09:47:19 -03:00
Valdir Cordeiro 3b7c9f4866 Merge pull request 'correcao_enums' (#26) from correcao_enums into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/26
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-01-31 13:22:57 +00:00
lucas.taia 5167885f2a correcao_enums 2023-01-31 10:18:00 -03:00
lucas.taia 7438fb4737 correção toString enums 2023-01-31 10:11:54 -03:00
wallace 03bf64d5be Merge pull request 'AL-1296_2' (#25) from AL-1296_2 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/25
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-01-30 13:01:07 +00:00
wallace.henrique 6d5616422c fixes bug#AL-1296 2023-01-30 09:54:12 -03:00
wallace.henrique 3d6a3241e6 fixes bug#1296 2023-01-27 18:11:42 -03:00
wallace.henrique dd0938d151 fixes bug#AL-1296 2023-01-27 18:07:36 -03:00
Célio de Souza Ribeiro JR 0d9a4d5c47 Merge pull request 'fix bug#AL-1905' (#24) from AL-1905 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/24
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-01-27 19:41:56 +00:00
Célio de Souza Ribeiro JR 810f74af5e Merge branch 'master' of http://18.235.188.113:3000/adm/ModelWeb into bug#AL-1905
# Conflicts:
#	pom.xml
2023-01-27 16:20:41 -03:00
Célio de Souza Ribeiro JR dc491715e7 fix bug#AL-1905 2023-01-27 16:11:41 -03:00
fabio ec86e26d30 validacao de mudanca no build bug#AL-9999 2023-01-19 20:49:40 +00:00
fabio ca03830634 Merge pull request 'fixes bug#AL-2027' (#23) from AL-2027 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/23
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-01-17 20:43:08 +00:00
Fabio Faria 1f3ec84545 fixes bug#AL-2027 2023-01-17 17:13:08 -03:00
Valdir Cordeiro 1502b80741 Merge pull request 'bug#al-2042' (#22) from AL-2042 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/22
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-01-16 12:40:21 +00:00
valdir.cordeiro bb6bdcb0b6 bug#al-2042
glpi 59559 [PROJETO] - ADM - ERRO APARECE AO AVANÇAR NAS PAGINAS DO
CADASTRO DO EVENTO EXTRA NO ADM
dev:
qua:

Criando a versão para as alterações do Enum do Lucas acertando a tela de
eventos extras.
2023-01-16 09:19:32 -03:00
Valdir Cordeiro a45655a32c Merge pull request 'melhoria enum' (#21) from melhoria_enums into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/21
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-01-16 12:03:21 +00:00
lucas.taia fa976e7de4 melhoria enum 2023-01-14 15:43:20 -03:00
Lucas Taiã a96c794fa9 Merge pull request 'AL-1912' (#20) from AL-1912 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/20
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
2023-01-12 21:26:19 +00:00
lucas.taia 4bae58e6e2 AL-1912 2023-01-12 17:57:10 -03:00
lucas.taia 890161180c AL-1912 2023-01-12 17:55:52 -03:00
Lucas Taiã 3e529151b9 Merge pull request 'melhoria_enums' (#16) from melhoria_enums into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/16
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-01-11 20:42:02 +00:00
Lucas Taiã 51e5acf7d6 Merge branch 'master' into melhoria_enums 2023-01-11 20:20:38 +00:00
wallace 38aedb55a2 Merge pull request 'AL-1296' (#19) from AL-1296 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/19
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-01-11 17:57:36 +00:00
wallace.henrique 5e839fe86c fixes bug#AL-1296 2023-01-11 14:43:14 -03:00
wallace.henrique 5ea3c94145 fixes bug#AL-1296 2023-01-11 14:36:32 -03:00
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 a11baab5a4 fixes bug#AL-1979 2023-01-06 12:30:51 -03:00
Lucas Taiã 87e8cf52f1 Merge branch 'master' into melhoria_enums 2023-01-05 19:39:18 +00:00