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

7627 Commits (4849871badcc27ea1a6421c1424ffeb18e516175)

Author SHA1 Message Date
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
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
aristides@rjconsultores.com.br 23e58628cd bug#AL-1757 2022-12-29 20:43:32 -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
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 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
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
lucas.taia aa1d7582d1 bug#AL-1972 2022-12-27 19:00:03 -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
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 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 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
Julio Heredia 8ae4b2bb05 fixes bug#AL-1936 2022-12-22 17:26:40 -03:00
aristides 9f83b797c2 Merge pull request 'bug#AL-1808' (#25) from bugfix#AL-1808 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/25
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
 2022-12-22 19:04:04 +00:00
aristides@rjconsultores.com.br 2a87e8a990 bug#AL-1808 2022-12-22 11:30:29 -03:00
aristides ec17c208c2 Merge pull request 'bug#AL-1808' (#24) from AL-1808 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/24
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2022-12-22 13:08:42 +00:00
aristides@rjconsultores.com.br 3915507299 bug#AL-1808 2022-12-22 09:25:03 -03:00
Gleison da Cruz e8a74f7b33 Merge pull request 'fixes bug#AL-1904' (#22) from AL-1904 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/22
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2022-12-21 11:55:05 +00:00
Gleison da Cruz 91d0e2b564 fixes bug#AL-1904 
Quebra por empresa para visualizar novos campos adquirente e estab.
 2022-12-20 20:14:00 -03:00
Julio Heredia 3d1cab271e Merge pull request 'fix bug#AL-1771' (#21) from AL-1407 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/21
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2022-12-20 20:19:51 +00:00
Julio Heredia ea45bd1376 fix bug#AL-1771 
dev: Lucas
qua:
 2022-12-20 17:11:26 -03:00
Gleison da Cruz 8069ec2d1e Merge pull request 'fixes bug#AL-1558' (#20) from AL-1558 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/20
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: aristides <aristides@rjconsultores.com.br>
 2022-12-20 18:16:29 +00:00
Gleison da Cruz 415fd7b771 fixes bug#AL-1558 
acerto no Encoding
 2022-12-20 14:53:58 -03:00
Gleison da Cruz e400bff1a3 fixes bug#AL-1558 
Novo campo totalizador somente com status vendido
 2022-12-20 14:17:24 -03:00
fabio baeb1484e2 Merge pull request 'fixes bug#AL-1626' (#17) from AL-1626 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/17
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2022-12-19 15:53:41 +00:00
Fabio Faria 8ea5226700 Merge branch 'master' into HEAD 2022-12-19 12:51:41 -03:00
Gleison da Cruz 87e0eafb64 Teste 2022-12-19 11:58:13 -03:00
Gleison da Cruz 1c28184b38 fixes bug#AL-1626 
Novo relatório Sie (Deter)
 2022-12-19 10:43:12 -03:00
Lucas Taiã 5db35ea40b Merge pull request 'AL-1231' (#16) from AL-1231 into master 
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/16
Reviewed-by: wallace <wallace@rjconsultores.com.br>
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
Reviewed-by: gleimar <gleimar@rjconsultores.com.br>
 2022-12-16 23:51:46 +00:00
lucas.taia 38caa3532a AL-1231 2022-12-16 20:10:19 -03:00
lucas.taia 5b1d43a9e3 AL-1231 2022-12-16 19:41:19 -03:00
lucas.taia f484c7b47f AL-1231 2022-12-16 19:33:10 -03:00