Commit Graph

7728 Commits (72dbc085663025d1c04d05d22647ed678b21cb48)

Author SHA1 Message Date
Gleison da Cruz 10539c2414 Merge pull request 'fixes bug#AL-1518' (#52) from AL-1518 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/52
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
2023-01-17 17:37:58 +00:00
Gleison da Cruz 6eb7a2879d fixes bug#AL-1518
Ordenação dos campos de acordo com a spec, melhorias, campo NSUHost
2023-01-17 12:06:51 -03:00
Gleison da Cruz 976195256e Merge pull request 'AL-2048' (#50) from AL-2048 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/50
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
2023-01-17 12:16:34 +00:00
Gleison da Cruz f790a5a145 Merge branch 'master' into AL-2048 2023-01-17 12:16:18 +00:00
Fabio Faria 47b3e4875c Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into bug#AL-2027
# Conflicts:
#	pom.xml
2023-01-17 08:15:01 -03:00
Fabio Faria f762c438fd fixes bug#AL-2027 2023-01-16 19:10:20 -03:00
Gleison da Cruz 8075a14d6c fixes bug#AL-2048 2023-01-16 18:40:34 -03:00
Valdir Cordeiro 63df39af45 Merge pull request 'bug#al-2042' (#49) from AL-2042 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/49
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2023-01-16 12:31:13 +00:00
valdir.cordeiro 43de749f74 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:40 -03:00
Gleison da Cruz 9a9df7cb99 fixes bug#AL-2048
Ao salvar o telefone no ponto de venda estava considerando somente com
mascara. Alterado para que ao salvar considerar qualquer numero de
telefone. O tratamento da mascara ira continuar valendo, caso o usuário
use.
2023-01-13 15:06:00 -03:00
Gleison da Cruz feb3fbab9d Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm 2023-01-13 14:54:37 -03:00
Lucas Taiã e9cb392c9f Merge pull request 'AL-1912' (#47) from AL-1912 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/47
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
2023-01-12 21:26:31 +00:00
lucas.taia c3794b0f6f AL-1912 2023-01-12 18:03:57 -03:00
lucas.taia 87da68899e Merge branch 'master' into AL-1912 2023-01-12 18:02:47 -03:00
lucas.taia 233d3dd0d9 Merge branch 'master' into AL-1912 2023-01-12 18:00:07 -03:00
wallace 988beba1d3 Merge pull request 'fixes bug#AL-1296' (#46) from AL-1296 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/46
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-01-11 18:00:03 +00:00
wallace.henrique 4afe1f1caf fixes bug#AL-1296 2023-01-11 14:45:02 -03:00
Gleison da Cruz 5dc65759f5 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm 2023-01-10 10:15:20 -03:00
lucas.taia cc8814e7c5 AL-1912 2023-01-09 18:55:14 -03:00
fabio 44da4d520c fixes bug#AL-2027 2023-01-09 21:48:29 +00:00
fabio 64fe4857ac fixes bug#AL-2027 2023-01-09 21:00:50 +00:00
fabio 28df33a034 Merge pull request 'fixes bug#AL-2027' (#45) from AL-2027 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/45
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
2023-01-09 20:51:06 +00:00
Fabio Faria c8442975a9 fixes bug#AL-2027 2023-01-09 15:51:10 -03:00
fabio 48efc1094c Merge pull request 'fixes bug#AL-1979' (#44) from AL-1979 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/44
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-01-09 11:36:41 +00:00
Fabio Faria d6a5bc2be0 fixes bug#AL-1979 2023-01-09 08:34:01 -03: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
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
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 Faria 666eb7b04e fixes bug#AL-2004 2023-01-04 18:33:04 -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.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
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 Faria bdc18daae2 fixes bug#AL-2002 2023-01-03 10:27:21 -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.taia 74cf32b99c Merge branch 'master' into AL-1627 2022-12-30 19:10:32 -03:00
lucas.taia a5eaacb005 Merge branch 'master' of local repository into AL-1627 2022-12-30 18:33:51 -03:00