fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,130 Commits
1 Branch
650 Tags
49 MiB
Commit Graph

15130 Commits (0026eb0cfbf8c9bf86a333b0ee649003aa1db8b9)

Author SHA1 Message Date
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
aristides bf67201b8f Merge pull request 'bug#AL-1757' (#7) from AL-1757 into master 
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/7
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2022-12-30 19:40:03 +00:00
fabio 855b14f36b Correção de erro no versionamento do build 2022-12-30 15:10:18 +00:00
fabio 3c6ab14b40 correçao do encode de build bug#AL-1230(teste de commit) 2022-12-30 15:02:37 +00:00
fabio e58b33bf15 bug#AL-1230 2022-12-30 14:46:00 +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 23e58628cd bug#AL-1757 2022-12-29 20:43:32 -03:00
aristides@rjconsultores.com.br fb25debf7a bug#1747 2022-12-29 19:59:15 -03:00
aristides@rjconsultores.com.br bd886809b4 bug#AL-1757 2022-12-29 19:54:24 -03:00
wallace cb40e6ea32 Merge pull request 'fixes bug#AL-1858' (#32) from AL-1858 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/32
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
 2022-12-29 20:18:06 +00:00
wallace.henrique 6e00cd030c fixes bug#AL-1858 
Ajustado o valor de IRK
 2022-12-29 17:04:38 -03:00
wallace.henrique f24457fef0 fixes bug#AL-1858 
Ajustado o valor de IRK
 2022-12-29 16:58:21 -03:00
wallace 069496301d Merge pull request 'Quando gerava o relatorio com alias, ele gerava duas colunas ambiguas :' (#31) from AL-1983 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/31
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2022-12-29 18:18:47 +00:00
wallace.henrique 1429923bac AL-1983 
Corrigindo a acentuação
 2022-12-29 12:14:32 -03:00
wallace.henrique 7e42f1289d Merge branch 'master' into AL-1983 2022-12-29 12:08:54 -03:00
Lucas Taiã cd1a21fb9f Merge pull request 'bug#AL-1972' (#30) from AL-1972 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/30
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
 2022-12-29 14:42:02 +00: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
wallace.henrique 80bc714e87 Quando gerava o relatorio com alias, ele gerava duas colunas ambiguas : 
origem e destino.
Então foi criado uma condição, para um ou outro
 2022-12-29 11:20:40 -03:00
lucas.taia c6d9adf52b Merge branch 'master' into AL-1972 2022-12-29 11:11:23 -03:00
lucas.taia 17ec1c5a83 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm 
into AL-1972
 2022-12-29 11:07:46 -03:00
lucas.taia 4ae57d2fe3 bug#AL-1972 2022-12-29 10:48:53 -03:00
lucas.taia 645134406d bug#AL-1972 2022-12-29 10:48:44 -03:00
fabio eda134453b Merge pull request 'bug#AL-1944' (#29) from AL-1944 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/29
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
 2022-12-28 18:05:50 +00: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
fabio 46a9bc08c9 Merge pull request 'bug#AL-1944' (#6) from AL-1944 into master 
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/6
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
 2022-12-28 18:05:22 +00:00
lucas.taia aa1d7582d1 bug#AL-1972 2022-12-27 19:00:03 -03:00
lucas.taia 901cb586d6 bug#AL-1972 2022-12-27 18:59:10 -03:00
Fabio Faria 8b16b4ce36 bug#AL-1944 
Adição do campo tipo_pagamento nos boletos do fechamento
 2022-12-27 08:53:56 -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 Faria 25a7033708 bug#AL-1944 
Adição do campo tipo_pagamento nos boletos do fechamento
 2022-12-27 08:46:58 -03:00
wallace 3b5d6aeb9e Merge pull request 'AL-1954' (#28) from AL-1954 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/28
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
 2022-12-26 16:35:19 +00:00
wallace.henrique c39fe410fe fixes bug#AL-1954 2022-12-26 13:24:45 -03:00
wallace.henrique 7e7d38d409 AL-1954 2022-12-26 13:08:55 -03:00
fabio d2ece09b3c Merge pull request 'AL-1786' (#27) from AL-1786 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/27
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
 2022-12-23 14:01:51 +00: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 327bcc0dd8 Merge pull request 'AL-1786' (#5) from AL-1786 into master 
Reviewed-on: http://18.235.188.113:3000/utilidades/Flyway/pulls/5
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2022-12-23 14:01:03 +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 Faria 18beee4088 fixes bug#1786 2022-12-23 08:38:32 -03:00
Fabio Faria 4cac0a7989 bug#AL-1786 
Resolução de conflitos
 2022-12-23 08:36:27 -03:00
fabio 11814ff744 Merge pull request 'fixes bug#AL-1936' (#26) from AL-1936 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/26
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2022-12-23 11:20:56 +00: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 23add3750b resolução de conflitos 2022-12-22 18:57:01 -03:00
Fabio Faria 0d28dd32de Resolução de conflitos 2022-12-22 18:55:57 -03:00
Fabio Faria fa713ecb7c fixes bug#AL-1786 2022-12-22 18:37:07 -03: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
Fabio Faria 02df3527e6 bug#AL-1786 2022-12-22 18:20:16 -03:00
Fabio Faria ce62089f41 bug#AL-1786 2022-12-22 18:18:18 -03:00