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

8781 Commits (a0862a449dbfc6d8a8988feba5dbb5eb2a9786af)

Author SHA1 Message Date
valdevir a0862a449d fix bug #AL-3854 2024-05-09 17:05:11 -03:00
valdevir aafd65fdd5 fixes bug #A-3854 2024-05-09 17:02:10 -03:00
valdevir 45fd6c7d3d Merge remote-tracking branch 'remotes/origin/master' into fixBug_AL-3854 
# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_pt_BR.label
 2024-05-09 16:53:16 -03:00
pinheiro 138668e7fe Merge pull request 'fixes bug #AL-4298' (!507) from AL-4298 into master 
Reviewed-on: adm/VentaBoletosAdm#507
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-05-09 19:10:04 +00:00
valdevir 80799850ba fixes bug #AL-4298 2024-05-09 16:09:13 -03:00
gleimar 2a9ab26af7 Merge pull request 'Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado.' (!506) from AL-4287 into master 
Reviewed-on: adm/VentaBoletosAdm#506
 2024-05-09 19:00:50 +00:00
Gleimar Botelho Baleeiro 62274e1e0f Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado. 2024-05-09 15:59:32 -03:00
valdevir 2093980e0a fixes bug #AL-4298 2024-05-09 15:58:51 -03:00
gleimar 90f950861d Merge pull request 'Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado.' (!505) from AL-4286__ into master 
Reviewed-on: adm/VentaBoletosAdm#505
 2024-05-09 15:52:12 +00:00
Gleimar Botelho Baleeiro 735f938962 Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado. 2024-05-09 12:51:09 -03:00
gleimar d36a09c984 Merge pull request 'Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado.' (!504) from AL-4286_ into master 
Reviewed-on: adm/VentaBoletosAdm#504
 2024-05-09 15:18:40 +00:00
Gleimar Botelho Baleeiro e97a2958c1 Mudança no filtro para passar a considerar apenas a situação de agrupamento de corridas. Antes olhava só a diferença de datas, o que se mostrou errado. 2024-05-09 12:18:18 -03:00
Aristides dos Reis Júnior 96c31f8c06 fix bug#AL_3854 2024-05-08 14:44:17 -03:00
aristides 78da24aea2 Merge pull request 'fix bug#AL-3854' (!499) from AL-3854 into master 
Reviewed-on: adm/VentaBoletosAdm#499
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-05-07 18:48:05 +00:00
Aristides dos Reis Júnior f5b118e25d fix bug#AL-3854 2024-05-07 12:58:33 -03:00
wallace c8bf56a709 Merge pull request 'AL-4231' (!498) from AL-4231 into master 
Reviewed-on: adm/VentaBoletosAdm#498
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-05-07 14:09:24 +00:00
wallace.henrique 85fef97bfb fixes bug#AL-4231 2024-05-07 11:08:13 -03:00
wallace.henrique db4ed1ca68 fixes bug#AL-4231 2024-05-07 11:06:20 -03:00
Lucas Taiã 1337947688 Merge pull request 'bug #AL-3949' (!497) from AL-3949 into master 
Reviewed-on: adm/VentaBoletosAdm#497
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-05-07 12:48:18 +00:00
Lucas 4ce97670c2 bug #AL-3949 2024-05-06 21:30:10 -03:00
Gleison da Cruz b9ce7f7681 Merge pull request 'fixes bug#AL-4236' (!496) from AL-4236 into master 
Reviewed-on: adm/VentaBoletosAdm#496
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
 2024-05-06 19:30:23 +00:00
Gleison da Cruz 6f88e20b84 fixes bug#AL-4236 2024-05-06 16:29:10 -03:00
gleimar 960ba7d97f Merge pull request 'fixes bug#AL-4259' (!495) from AL-4259 into master 
Reviewed-on: adm/VentaBoletosAdm#495
 2024-05-02 21:00:49 +00:00
Gleimar Botelho Baleeiro 54bb48c7ad fixes bug#AL-4259 2024-05-02 18:00:11 -03:00
gleimar 111c48f9d5 Merge pull request 'Ordenação da query do relatório por linha e ordenação do java para o relatório por trecho' (!494) from AL-4259 into master 
Reviewed-on: adm/VentaBoletosAdm#494
 2024-05-02 20:30:32 +00:00
Gleimar Botelho Baleeiro c7e29947a0 Ordenação da query do relatório por linha e ordenação do java para o relatório por trecho 2024-05-02 17:29:26 -03:00
fabio e767ee49e7 campo multa relatorio devolução fixes bug#AL-4023' (!493) from AL-4023 into master 
Reviewed-on: adm/VentaBoletosAdm#493
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
 2024-04-30 14:22:42 +00:00
Fabio e7c8ebdb68 campo multa relatorio devolução fixes bug#AL-4023 2024-04-30 11:15:00 -03:00
fabio 23e6d203a5 Merge pull request 'AL-4107' (!492) from AL-4107 into master 
Reviewed-on: adm/VentaBoletosAdm#492
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-04-26 17:34:17 +00:00
Aristides dos Reis Júnior 922eaafc3e bug#AL-4107 2024-04-25 18:08:43 -03:00
Aristides dos Reis Júnior 0c3e477a9a bug#AL-4107 2024-04-25 17:49:16 -03:00
Valdir Cordeiro 5c34251fdf Merge pull request 'bug#al-3856' (!491) from AL-3856 into master 
Reviewed-on: adm/VentaBoletosAdm#491
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-04-25 14:05:52 +00:00
valdir.cordeiro 7d80f8f3dd bug#al-3856 
ESP05-2024_MR_Operação conjunta
dev:
qua:
 2024-04-25 11:02:51 -03:00
Gleison da Cruz 7b27a9132d Merge pull request 'fixes bug#AL-3934' (!490) from AL-3934 into master 
Reviewed-on: adm/VentaBoletosAdm#490
Reviewed-by: aristides <aristides@rjconsultores.com.br>
 2024-04-24 19:17:23 +00:00
Gleison da Cruz 5997001375 fixes bug#AL-3934 2024-04-24 16:12:54 -03:00
aristides 8d7638604c Merge pull request 'AL-4211' (!489) from AL-4211 into master 
Reviewed-on: adm/VentaBoletosAdm#489
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
 2024-04-23 15:07:34 +00:00
Aristides dos Reis Júnior a954a7c573 Merge branch 'AL-4211' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4211 
# Conflicts:
#	pom.xml
 2024-04-23 12:00:25 -03:00
Aristides dos Reis Júnior c61f79d9c0 fixes bug#AL-4211 2024-04-23 11:50:46 -03:00
Aristides dos Reis Júnior 5b2497ae73 fixes bug#AL-4211 2024-04-23 11:43:36 -03:00
fabio 38f0fe46b1 adicao de layout novo rel Devolucao feat bug #AL-4023' (!488) from AL-4023 into master 
Reviewed-on: adm/VentaBoletosAdm#488
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
 2024-04-23 12:32:18 +00:00
Fabio 64a0f666ca alteracao de pom 2024-04-23 09:28:48 -03:00
Fabio 5ec4d7c3ff adicao de layout novo rel Devolucao feat bug #AL-4023 2024-04-23 09:23:04 -03:00
Gleison da Cruz d7924ec19b Merge pull request 'fixes bug#AL-4193' (!487) from AL-4193 into master 
Reviewed-on: adm/VentaBoletosAdm#487
Reviewed-by: wallace <wallace@rjconsultores.com.br>
 2024-04-22 17:15:22 +00:00
Gleison da Cruz e76d909b2e fixes bug#AL-4193 2024-04-22 12:10:26 -03:00
Gleison da Cruz 35fb506d74 Merge pull request 'bug#AL-4104' (!486) from AL-4104 into master 
Reviewed-on: adm/VentaBoletosAdm#486
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
 2024-04-19 12:22:48 +00:00
Aristides dos Reis Júnior 9165f2f3df bug#AL-4104 2024-04-18 21:40:35 -03:00
Gleison da Cruz 537e49f334 Merge pull request 'fixes bug#AL-3947' (!485) from AL-3947 into master 
Reviewed-on: adm/VentaBoletosAdm#485
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
 2024-04-18 13:25:31 +00:00
Gleison da Cruz 56f2c57844 fixes bug#AL-3947 2024-04-18 10:20:27 -03:00
wallace d3b8010f60 Merge pull request 'fixes bug#AL-3691' (!483) from AL-3691 into master 
Reviewed-on: adm/VentaBoletosAdm#483
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
 2024-04-17 12:42:28 +00:00
wallace.henrique 6e8383d27e fixes bug#AL-3691 2024-04-17 09:30:19 -03:00