Commit Graph

2810 Commits (2edbe218a04dc2c47f0224d6509f2e7e414c658e)

Author SHA1 Message Date
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
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.taia ca50d1f66b bug#AL-1627 2022-12-30 19:11:12 -03:00
lucas.taia 318d8236a4 Merge branch 'master' into Al-1627 2022-12-30 18:53:53 -03:00
lucas.taia c2476f4d57 Merge branch 'master' of local repository into Al-1627 2022-12-30 18:34:07 -03:00
Lucas Taiã 41d86f6b7e bug#AL-1627 2022-12-30 18:33:08 -03:00
aristides 9c264968f5 Merge pull request 'bug#1747' (#15) from AL-1757 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/15
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2022-12-30 19:42:59 +00:00
lucas.taia d1661fcfe9 melhoria para corrigir erros ao editar telas quando não encontrado os
Enums de entidades salvo em banco
2022-12-29 20:46:21 -03:00
lucas.taia 2f9ed37416 melhoria para corrigir erros ao editar telas quando não encontrado os
Enums de entidades salvo em banco
2022-12-29 20:44:26 -03:00
aristides@rjconsultores.com.br fb25debf7a bug#1747 2022-12-29 19:59:15 -03:00
Lucas Taiã c3b4faf521 Merge pull request 'bug#AL-1972' (#14) from AL-1972 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/14
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2022-12-29 14:40:59 +00:00
lucas.taia c6d9adf52b Merge branch 'master' into AL-1972 2022-12-29 11:11:23 -03:00
lucas.taia 645134406d bug#AL-1972 2022-12-29 10:48:44 -03:00
fabio 2c9963ad9c Merge pull request 'bug#AL-1944' (#13) from AL-1944 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/13
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2022-12-28 18:05:39 +00:00
lucas.taia 901cb586d6 bug#AL-1972 2022-12-27 18:59:10 -03:00
Fabio Faria 64d45e3387 bug#AL-1944
Adição do campo tipo_pagamento nos boletos do fechamento
2022-12-27 08:47:58 -03:00
fabio d5858f7510 Merge pull request 'bug#AL-1786' (#12) from AL-1786 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/12
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2022-12-23 14:01:25 +00:00
Fabio Faria 0e122d6d16 bug#AL-1786 2022-12-23 10:50:15 -03:00
Fabio Faria 9dc6a4e257 bug#AL-1786
# Conflicts:
#	pom.xml
2022-12-23 10:22:05 -03:00
fabio 1448d3b401 Merge pull request 'fixes bug#AL-1936' (#11) from AL-1936 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/11
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2022-12-23 11:20:15 +00:00
Fabio Faria bb741390ee bug#AL-1786 2022-12-22 18:27:52 -03:00
Fabio Faria 3e0227fcc2 bug#AL-1786 2022-12-22 18:22:12 -03:00
Julio Heredia e107ef7737 fixes bug#AL-1936 2022-12-22 17:25:35 -03:00
aristides aefa7a5488 Merge pull request 'AL-1808' (#10) from AL-1808 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/10
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2022-12-22 12:28:30 +00:00
aristides@rjconsultores.com.br bd0446cc81 AL-1808 2022-12-21 16:33:23 -03:00
Julio Heredia 942dad3a6a Merge pull request 'card: AL-1771' (#9) from AL-1407 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/9
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2022-12-20 20:19:45 +00:00
Julio Heredia c90311c12e bug#AL-1407
dev: Lucas
qua:
2022-12-20 17:06:23 -03:00