Commit Graph

8199 Commits (12aa083bae570554bcf30dd1b2fb74f368d59613)

Author SHA1 Message Date
Gleison da Cruz 12aa083bae Merge pull request 'fixes bug#AL-2771' (!239) from AL-2771 into master
Reviewed-on: adm/VentaBoletosAdm#239
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2023-08-02 19:22:29 +00:00
Gleison da Cruz e21fb4ddc7 fixes bug#AL-2771
Acerto retorno
2023-08-02 16:19:23 -03:00
pinheiro 6b26645216 Merge pull request 'AL-2734' (!238) from AL-2734 into master
Reviewed-on: adm/VentaBoletosAdm#238
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-08-01 19:11:19 +00:00
valdevir fb725b909f fixes bug #AL-2734 2023-08-01 16:07:49 -03:00
valdevir 285b39026d fixes bug #AL-2734 2023-08-01 16:07:02 -03:00
wallace f8c26cc4d2 Merge pull request 'fixes bug#2919' (!237) from AL-2919 into master
Reviewed-on: adm/VentaBoletosAdm#237
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
2023-08-01 18:46:00 +00:00
wallace.henrique 57466b2add fixes bug#2919 2023-08-01 12:04:19 -03:00
fabio b85da1acc5 Add transferencia na conferencia movimento feat #AL-2752
Reviewed-on: adm/VentaBoletosAdm#236
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-07-31 16:48:19 +00:00
Fabio Faria 756465dcbe Add transferencia na conferencia movimento feat #AL-2752 2023-07-31 13:04:14 -03:00
pinheiro b67990b8f7 Merge pull request 'fixes bug #AL-2756' (!235) from AL-2756 into master
Reviewed-on: adm/VentaBoletosAdm#235
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-07-27 13:29:44 +00:00
valdevir ea11260e9c fixes bug #AL-2756 2023-07-27 10:20:59 -03:00
Gleison da Cruz a0f63f191b Merge pull request 'fixes bug#AL-2771' (!234) from AL-2771 into master
Reviewed-on: adm/VentaBoletosAdm#234
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2023-07-26 18:27:46 +00:00
Gleison da Cruz c7a85f29ca fixes bug#AL-2771
Opcao de filtro ida e volta relatorio de bilhetes vendidos
2023-07-26 15:23:16 -03:00
Gleison da Cruz ad59e93774 Merge pull request 'fixes bug#AL-2963' (!233) from AL-2963 into master
Reviewed-on: adm/VentaBoletosAdm#233
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-07-25 13:26:26 +00:00
Gleison da Cruz f8b96d233b fixes bug#AL-2963
Buscar tambem as reservas
2023-07-25 10:24:04 -03:00
fabio f7bc62e563 Merge pull request 'teste de build' (!232) from build_teste into master
Reviewed-on: adm/VentaBoletosAdm#232
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-07-24 18:12:31 +00:00
Fabio Faria 45e5a04457 teste de build 2023-07-24 15:10:19 -03:00
Gleison da Cruz f7161c7eb8 Merge pull request 'fixes bug#AL-2963' (!231) from AL-2963 into master
Reviewed-on: adm/VentaBoletosAdm#231
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-07-24 13:39:02 +00:00
Gleison da Cruz aad6f2641c fixes bug#AL-2963
Melhorias Relatorio Vijar Detalhado
2023-07-24 10:34:59 -03:00
gleimar c020d4398d Merge pull request 'AL-2988' (!230) from AL-2988 into master
Reviewed-on: adm/VentaBoletosAdm#230
2023-07-21 21:08:11 +00:00
gleimar 83499e21c3 Merge branch 'master' into AL-2988 2023-07-21 21:07:46 +00:00
Gleimar Botelho Baleeiro 54fb3a4455 Nova versãso do mo 2023-07-21 18:06:58 -03:00
Gleimar Botelho Baleeiro a2d3f23f4a Nova versãso do mo 2023-07-21 18:03:45 -03:00
Gleimar Botelho Baleeiro 932e7c122f Não foi adicionado o HINT de SQL. Sem isso, não otimiza 2023-07-21 17:59:04 -03:00
Valdir Cordeiro 9b355cf422 Merge pull request 'bug#al-2980' (!229) from AL-2980 into master
Reviewed-on: adm/VentaBoletosAdm#229
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-07-21 20:26:21 +00:00
valdir.cordeiro c0896aae13 bug#al-2980
Águia Branca - GLPI 65710 [PROJETO] - PRICING CONEXAO - ERRO AO GRAVAR
PRICING COM CONEXAO ASSOCIADA EM HMG
dev:
qua:

Acertando validação de origem e destino de conexao do pricing
2023-07-21 17:16:17 -03:00
Valdir Cordeiro e1c2c33fcf Merge pull request 'bug#al-2980' (!228) from AL2980 into master
Reviewed-on: adm/VentaBoletosAdm#228
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2023-07-21 17:49:16 +00:00
valdir.cordeiro f9035f2607 bug#al-2980
Águia Branca - GLPI 65710 [PROJETO] - PRICING CONEXAO - ERRO AO GRAVAR
PRICING COM CONEXAO ASSOCIADA EM HMG
dev:
qua:

Aumentando o tamanho do campo pricing_id da tabela PRICING_CONEXAO
2023-07-21 14:48:37 -03:00
valdir.cordeiro 3b46a916b5 bug#al-2980
Águia Branca - GLPI 65710 [PROJETO] - PRICING CONEXAO - ERRO AO GRAVAR
PRICING COM CONEXAO ASSOCIADA EM HMG
dev:
qua:

Aumentando o tamanho do campo pricing_id da tabela PRICING_CONEXAO
2023-07-21 14:45:06 -03:00
pinheiro cb57533e5f Merge pull request 'fixes bug #AL-2936' (!227) from AL-2936 into master
Reviewed-on: adm/VentaBoletosAdm#227
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-07-19 22:52:08 +00:00
valdevir 712275204c fixes bug #AL-2936 2023-07-19 19:49:55 -03:00
Gleison da Cruz 8a5379082b Merge pull request 'fixes bug#AL-2946' (!225) from AL-2946 into master
Reviewed-on: adm/VentaBoletosAdm#225
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-07-19 12:28:45 +00:00
Gleison da Cruz 86edf00b7d Merge branch 'master' of https://gitrj.rjconsultores.com.br/adm/VentaBoletosAdm into AL-2946
# Conflicts:
#	pom.xml
2023-07-19 09:25:07 -03:00
Gleison da Cruz 2c67403f28 fixes bug#AL-2946 2023-07-19 09:04:33 -03:00
Gleison da Cruz e0a1b1eb92 fixes bug#AL-2946
Nova opção de relatório
2023-07-18 17:30:31 -03:00
Valdir Cordeiro e98ec938d0 Merge pull request 'bug#al-2935' (!224) from AL2935 into master
Reviewed-on: adm/VentaBoletosAdm#224
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-07-17 23:11:13 +00:00
valdir.cordeiro 2d7c973bfd bug#al-2935
ADM - Ajuste Pricing Conexão
dev:
qua:
2023-07-17 20:08:40 -03:00
Gleison da Cruz 9d69920ba7 Merge pull request 'fixes bug#al-2723' (!223) from al-2723 into master
Reviewed-on: adm/VentaBoletosAdm#223
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-07-15 01:46:07 +00:00
Aristides 6c309f80c6 fixes bug#al-2723 2023-07-14 22:18:12 -03:00
Gleison da Cruz 52d3aef706 Merge pull request 'fixes bug#AL-2760' (!222) from AL-2760 into master
Reviewed-on: adm/VentaBoletosAdm#222
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2023-07-14 15:06:43 +00:00
Gleison da Cruz 294d9ff5b0 fixes bug#AL-2760 2023-07-14 12:00:29 -03:00
wallace 3b2e91a770 Merge pull request 'fixes bug#2908' (!221) from AL-2908 into master
Reviewed-on: adm/VentaBoletosAdm#221
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-07-11 21:12:02 +00:00
wallace.henrique 573c5361c8 fixes bug#2908 2023-07-11 18:09:53 -03:00
fabio fab387d9be Adição de campo passageiros no relario IRK feat #AL-2726
Reviewed-on: adm/VentaBoletosAdm#219
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-07-11 18:35:21 +00:00
Fabio Faria f411a6d450 Adição de campo passageiros no relario IRK feat #AL-2726 2023-07-11 14:47:27 -03:00
fabio 209d71b842 fix de cadastro de descontos fixes bug#AL-2684
Reviewed-on: adm/VentaBoletosAdm#218
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
2023-07-07 20:38:13 +00:00
Fabio Faria 29511527bf fix de cadastro de descontos fixes bug#AL-2684 2023-07-07 17:33:58 -03:00
gleimar cf9afda6c4 Merge pull request 'Ajsutes de referencia no objeto' (!217) from AL-2901 into master
Reviewed-on: adm/VentaBoletosAdm#217
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2023-07-07 14:50:52 +00:00
Gleimar Botelho Baleeiro 2a5f718d22 Ajsutes de referencia no objeto 2023-07-07 10:37:45 -03:00
Julio Heredia 7fc8067f2f Merge pull request 'AL-2732' (!215) from AL-2732 into master
Reviewed-on: adm/VentaBoletosAdm#215
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2023-07-07 13:05:55 +00:00