Commit Graph

2489 Commits (b8770839fb193d32402c25aa6424337a6deedc61)

Author SHA1 Message Date
Leonardo Oliveira ed8fc1a03a merge master 2024-08-08 18:04:10 -03:00
Fernando Abimael Alvarez Uc 024eddb26d Se agrega funcionalidad de carga de placa y carga de FUEC#AL-4551 2024-08-08 10:51:20 -06:00
Fernando Abimael Alvarez Uc 73fb9d5e63 Conflict solved. Fixes bug#AL-4549 2024-08-07 13:22:57 -06:00
Fernando Abimael Alvarez Uc b382513974 Se agrega funcionalidad de envío de correo.Fixes bug#AL-4549 2024-08-07 12:48:59 -06:00
Leonardo Oliveira 995c135ec9 Bolivariano - Autorização de viagem fixes bug#AL-4453 2024-08-07 13:36:05 -03:00
Leonardo Oliveira 2a60489708 commit parcial 2024-08-07 13:04:12 -03:00
wallace.henrique ce68097eed fixes bug#AL-4691 2024-08-06 13:15:19 -03:00
Fernando Abimael Alvarez Uc ccb960632a Se agregan textos en inglés, francés y portugués. Fixes bug#AL4549 2024-08-02 11:01:25 -06:00
Fernando Abimael Alvarez Uc 330407fb5f Conflicts solved#AL-4549 2024-08-01 15:31:12 -06:00
Fernando Abimael Alvarez Uc bdac7d60e8 Conflicts solved. fixes bug#Al-4549 2024-08-01 14:54:56 -06:00
Fernando Abimael Alvarez Uc d0066b29ed Conflicts solved. fixes bug#Al-4549 2024-08-01 14:48:20 -06:00
Fernando Abimael Alvarez Uc 4218de49c7 Se agrega funcionalidad de Pago a Crédito#AL-4549 2024-08-01 14:34:00 -06:00
Fabio f04c16a91e Consulta e Legalização de Voucher feat bug#AL-4249 2024-08-01 16:04:32 -03:00
wallace.henrique 216b094635 fixes bug#AL-4442 2024-08-01 10:22:31 -03:00
Leonardo Oliveira 62807f808a commit parcial 2024-07-31 21:49:03 -03:00
Leonardo Oliveira d487beed48 commit parcial 2024-07-31 19:45:58 -03:00
Fernando Abimael Alvarez Uc 25ff79db98 Se agrega funcionalidad de carga de fluec#AL4551 2024-07-31 14:33:10 -06:00
Fernando Abimael Alvarez Uc 1f5ca7e1fc Conflicts solved#AL4551 2024-07-31 10:43:49 -06:00
Fernando Abimael Alvarez Uc e92b7abaf5 Conflicts solved. Fixes bug#AL-4549 2024-07-31 09:17:42 -06:00
Fernando Abimael Alvarez Uc 2ce9ee2994 Se agrega funcionalidad de asignar número de placa de bus programado.#AL-4551 2024-07-31 09:12:15 -06:00
Aristides dos Reis Júnior ce0591f823 fixes bug#AL-4586 2024-07-31 11:30:50 -03:00
Lucas e9993824f5 fixes bug#AL-4697 novo campo sicfe 2024-07-30 20:16:50 -03:00
Fernando Abimael Alvarez Uc ffe715b681 Conflicts solved. Fixes bug#AL-4549 2024-07-30 12:51:35 -06:00
Fernando Abimael Alvarez Uc 7cf3f1ca8e Se crea pantalla Expreso Por Cotizar#AL-4549. \n Se crea pantalla Expreso Carga de Contrato#AL-4550. \n Se crea pantalla Expreso Programación de Vehículo#AL-4551. \n Se crea pantalla Expreso Documentos#AL-4552. 2024-07-29 14:39:28 -06:00
Leonardo Oliveira 838b924eb5 removido TipoLancamentoCaixa do spring-config.xml fixes bug#AL-4453 2024-07-25 08:53:32 -03:00
Leonardo Oliveira a5b6edebe1 merge master 2024-07-24 18:16:35 -03:00
Leonardo Oliveira 772e5e9dd0 Bolivariano - Autorização de viagem fixes bug#AL-4453 2024-07-24 18:01:02 -03:00
Aristides dos Reis Júnior 52cdabcc31 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4587
# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_fr_FR.label
#	web/WEB-INF/i3-label_pt_BR.label
2024-07-22 11:30:14 -03:00
valdir.cordeiro 331d8c4df9 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-22 10:31:06 -03:00
Aristides dos Reis Júnior a89bc2ef05 fixes bug#AL-4587 2024-07-19 20:50:22 -03:00
aurora.cuaquentzi 957ffe1a1c bug#AL-4505
Bolivariano - Sangria.
dev:Lukas
qua:
2024-07-19 13:27:54 -06:00
Fabio 2ba38347b1 Funcionalidade de adicao ao contrato feat bug#AL-4343 2024-07-19 12:45:47 -03:00
Lucas d3482af9fc AL-4280 preview layout 2024-07-18 22:36:57 -03:00
Fabio 95d145cfc4 Cadastro de convenio transportadora feat bug#AL-4346 2024-07-18 11:18:43 -03:00
Aristides dos Reis Júnior 56b9c50d03 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4587
# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_en.label
#	web/WEB-INF/i3-label_es_MX.label
#	web/WEB-INF/i3-label_fr_FR.label
#	web/WEB-INF/i3-label_pt_BR.label
2024-07-18 01:06:58 -03:00
Aristides dos Reis Júnior 7a04f7cf0e fixes bug#AL-4586 2024-07-18 00:57:03 -03:00
valdevir ceecd87b6b fixes bug #AL-4647 2024-07-17 19:27:02 -03:00
valdir.cordeiro c230fd099c Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-17 10:55:51 -03:00
Fabio 4e93a9bff3 Cadastro de desconto por contrato feat bug#AL-4342 2024-07-16 20:02:37 -03:00
Fabio 3219d70cb2 Cadastro de desconto por contrato feat bug#AL-4342 2024-07-16 20:00:33 -03:00
valdevir 37a9bc5559 fixes bug #AL-4635 2024-07-16 15:58:52 -03:00
valdevir cd90ee401f fixes bug #AL-4634 2024-07-16 11:15:44 -03:00
Fabio 4a5781826f Cadastro de convenio transportadora feat bug#AL-4346 2024-07-12 18:11:32 -03:00
Fabio 9fa67c0da8 Cadastro de contratos corporativos fixes bug#AL-4276 2024-07-11 14:45:18 -03:00
Fabio d6193b8266 Cadastro de contratos corporativos fixes bug#AL-4276 2024-07-10 20:01:40 -03:00
Gleison da Cruz 15c3d86e11 fixes bug#AL-4414 2024-07-10 18:12:01 -03:00
Gleison da Cruz 871f4e44c9 fixes bug#AL-4414 2024-07-10 17:52:35 -03:00
Gleison da Cruz 40199fbcbd fixes bug#AL-4414
Filtro Status Conf. Corrida
2024-07-10 17:31:48 -03:00
Lucas 82a22da021 AL-4273 nova tela comprovante de passagem 2024-07-08 22:28:31 -03:00
valdevir e087405e27 fixes bug #AL-4348 Adicionado tooltip help no tipo de pricing na tela de
pricing
2024-07-08 11:29:29 -03:00
Fabio 9a5dff6372 cadastro de transportadora feat bug#AL-4277 2024-07-05 18:02:32 -03:00
Aristides dos Reis Júnior cee73c68ef fixes bug#AL-4091 2024-07-04 12:55:54 -03:00
Leonardo Oliveira 8256d3967d Permitir assento com letra. feat bug #AL-4281 2024-07-03 18:03:40 -03:00
Leonardo Oliveira 37d702975d Merge branch 'master' of https://gitrj.rjconsultores.com.br/adm/VentaBoletosAdm into AL-4281 2024-07-03 17:42:31 -03:00
Fabio fe0221d90c Cadastro de contratos corporativos fixes bug#AL-4276 2024-07-02 17:43:05 -03:00
Fabio 07d9c727d3 Cadastro de contratos corporativos feat bug#AL-4276 2024-07-02 14:00:47 -03:00
celio 18f8295e74 fixes bug #AL-4121 2024-07-01 13:27:41 -03:00
valdevir 7945c429aa fixes bug #AL-4348 2024-06-29 15:37:28 -03:00
wallace.henrique e34c98a1a5 fixes bug#AL-4204 2024-06-28 15:40:47 -03:00
Fabio 51cd8950b0 Aba de tarifas não cobertas no grupo de contrato feat bug#AL-4543 2024-06-27 19:51:50 -03:00
Lucas 26456f5308 AL-4280 2024-06-27 19:25:33 -03:00
Leonardo Oliveira 247895a959 Permitir assento com letra 2024-06-27 12:14:11 -03:00
celio.souza d8f1f25ea6 fixes bug#AL-4120 2024-06-27 09:05:31 -03:00
Wilian Domingues b176c1561e AL-4468 - Correção conflito pom 2024-06-27 08:41:34 -03:00
aurora.cuaquentzi 6ebc3574f1 bug#AL-4505
Bolivariano - Sangria.
dev:valdir
qua:
2024-06-26 13:00:46 -06:00
Aristides dos Reis Júnior ce3ed06483 bug#AL-4133 2024-06-26 10:56:49 -03:00
Fabio 445291ab1c cadastro de grupo de contrato feat bug#AL-4276 2024-06-25 16:20:57 -03:00
Fabio 3ebfbfa202 Cadastro de cliente Corporativo feat bug#AL-4275 2024-06-18 17:23:23 -03:00
Fabio 551c92788d Cadastro de clientes corporativos feat bug#AL-4275 2024-06-18 12:55:59 -03:00
wallace.henrique 42757862e5 fixes bug#AL-4478 2024-06-17 17:18:38 -03:00
Lucas b48c3f521b AL-4271 2024-06-13 17:24:09 -03:00
valdir.cordeiro aaf0d4567a bug#al-4269
Espec - Bolivariano - Restauração de senha.
dev:
qua:
2024-06-12 16:36:51 -03:00
Aristides dos Reis Júnior 38d3780805 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL_4075
# Conflicts:
#	pom.xml
2024-06-12 11:17:22 -03:00
Aristides dos Reis Júnior ce74cc2746 fixes bug#AL_4075 2024-06-12 11:06:47 -03:00
wallace.henrique f25e44fe38 fixes bug#AL-4311 2024-06-11 18:30:16 -03:00
valdevir 87ac67cf45 fixes bug #AL-4474 2024-06-04 19:03:42 -03:00
Fabio a5f1371b92 implementação de alias de classe fixes bug #AL-3857 2024-06-04 08:30:52 -03:00
Gleison da Cruz 29c229c84f fixes bug#AL-4146 2024-05-27 20:40:40 -03:00
Fabio a66e62e9fb Conflito 2024-05-22 09:06:06 -03:00
Fabio ed8189165b commit 2024-05-21 18:29:32 -03:00
Aristides dos Reis Júnior bad23629cd fixes bug#AL-4368 2024-05-21 17:42:47 -03:00
Fabio 9f68dfad40 alteracao de conta boleto alfanumerico feat bug#AL-4117 2024-05-16 17:20:54 -03:00
Fabio c14e4655df Adicao campo outros vendas bilheteiro feat bug#AL4078 2024-05-16 10:11:22 -03:00
Aristides dos Reis Júnior e4b5aa7832 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4247
# Conflicts:
#	pom.xml
2024-05-15 11:49:26 -03:00
Aristides dos Reis Júnior 2f714cc36f fixes bug#AL-4727 2024-05-15 11:44:15 -03:00
valdir.cordeiro 71af5aeadf bug#al-4170
M. Regulatório - Termo Recusa API
dev:
qua:
2024-05-14 15:36:32 -03:00
Aristides dos Reis Júnior e24152afdb fixes bug#AL-4049 2024-05-13 11:46:49 -03:00
valdevir a0862a449d fix bug #AL-3854 2024-05-09 17:05:11 -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
valdevir 2093980e0a fixes bug #AL-4298 2024-05-09 15:58:51 -03:00
Aristides dos Reis Júnior 96c31f8c06 fix bug#AL_3854 2024-05-08 14:44:17 -03:00
Aristides dos Reis Júnior f5b118e25d fix bug#AL-3854 2024-05-07 12:58:33 -03:00
Lucas 4ce97670c2 bug #AL-3949 2024-05-06 21:30:10 -03:00
Fabio e7c8ebdb68 campo multa relatorio devolução fixes bug#AL-4023 2024-04-30 11:15:00 -03:00
Aristides dos Reis Júnior 0c3e477a9a bug#AL-4107 2024-04-25 17:49:16 -03:00
valdir.cordeiro 7d80f8f3dd bug#al-3856
ESP05-2024_MR_Operação conjunta
dev:
qua:
2024-04-25 11:02:51 -03:00
Fabio 5ec4d7c3ff adicao de layout novo rel Devolucao feat bug #AL-4023 2024-04-23 09:23:04 -03:00
Aristides dos Reis Júnior 9165f2f3df bug#AL-4104 2024-04-18 21:40:35 -03:00
valdir.cordeiro 0936607f93 bug#al-3855
ESP04-2024_MR_2ª via de bilhete v2
dev:
qua:
2024-04-15 10:22:12 -03:00
Lucas 05a7e1689f AL-4135 2024-04-12 19:34:37 -03:00
Lucas Taiã 1d50cccf62 Merge branch 'master' into AL-4135 2024-04-11 22:46:57 +00:00
Gleison da Cruz aad3098bd5 fixes bug#AL-3947 2024-04-11 17:07:30 -03:00
Lucas 9339703b31 AL-4135 2024-04-10 20:10:59 -03:00
Aristides dos Reis Júnior d3b7016cbd fixes bug#AL-3779 2024-04-04 23:50:49 -03:00
fabio 24da9935a7 adição de filtros no relatorio venda embarcada feat bug#AL-3975 2024-04-04 18:45:14 -03:00
celio.souza 8e4cd65aaa fixes bug#AL-4095 2024-04-03 14:47:42 -03:00
celio.souza 4fa439a4d8 fixes bug#AL-4095 2024-04-03 13:35:06 -03:00
celio.souza c0bbff97b7 fixes bug#AL-4095 2024-04-02 17:20:09 -03:00
Gleison da Cruz f0919c2dfe fixes bug#AL-3765 2024-03-27 15:40:26 -03:00
Gleison da Cruz 4e5a3d6e18 fixes bug#AL-3818 2024-03-27 11:48:10 -03:00
wallace.henrique 86d3d2c504 bug#AL-3866 2024-03-27 10:51:51 -03:00
Gleison da Cruz f869a0f46d fixes bug#AL-3818 2024-03-27 09:13:27 -03:00
Gleison da Cruz db7effa143 fixes bug#AL-3765 2024-03-26 10:10:05 -03:00
wallace.henrique 94bb806746 bug#AL-4032 2024-03-20 20:49:33 -03:00
wallace.henrique a331ce84aa bug#AL-4032 2024-03-20 20:03:56 -03:00
fabio.fbarreto 937cf72724 Bloqueio de cadastro duplicado AIDF fixes bug#AL-4011 2024-03-15 20:15:00 -03:00
valdir.cordeiro fcce85bf40 bug#al-3852
ESP01-2024_MR_Devolução Não Presencial v3
dev:
qua:
2024-03-15 17:17:32 -03:00
fabio.fbarreto 7fdb7a1c62 Erro na transferencia de estoque fixes bug#Al-3998 2024-03-15 00:57:35 -03:00
pinheiro 2d385f5958 Merge branch 'master' into AL-3938 2024-03-14 03:09:17 +00:00
fabio.fbarreto 79d79bbbd2 Transferencia de estoque simplificado feat bug#AL-3983 2024-03-13 16:28:54 -03:00
valdevir fa2336636b fixes bug AL-39398
Commit melhoria na descricao do label
2024-03-13 16:09:27 -03:00
wallace.henrique 288117d61d fixes bug#AL-3984 2024-03-13 09:30:11 -03:00
wallace.henrique bb10111a25 fixes bug#AL-3977 2024-03-12 22:28:55 -03:00
Gleimar Botelho Baleeiro 31e860a66d Complemento arquivo 2024-03-12 15:37:13 -03:00
wallace.henrique e06f20ceb2 fixes bug#AL-3972 2024-03-12 11:57:23 -03:00
wallace.henrique 3708e4770e fixes bug#AL-3971 2024-03-12 10:48:40 -03:00
Gleison da Cruz ab5d345f67 fixes bug#AL-3817 2024-03-08 14:20:23 -03:00
Gleison da Cruz c8bcef2324 fixes bug#AL-3900 2024-03-05 13:12:52 -03:00
wallace.henrique c709cb7aca fixes bug#AL-3915 2024-03-03 21:13:41 -03:00
wallace.henrique 71cd20e917 fixes bug#AL-3928 2024-03-01 15:37:30 -03:00
valdevir 7f86ef4b5a fixes bug #AL-3494 2024-02-28 18:14:17 -03:00
Lucas dce3034e1a fixes bug#AL-3881 2024-02-28 10:30:01 -03:00
wallace.henrique e6c5a8b437 fixes bug#AL-3859 2024-02-23 19:37:29 -03:00
wallace.henrique 75953baa03 fixes bug#AL-3862 2024-02-21 15:08:25 -03:00
wallace.henrique dd55597085 fixes bug#AL-3862 2024-02-21 15:04:52 -03:00
valdevir e609a3e2a1 fixes bug #AL-3470 2024-02-20 15:39:57 -03:00
Fabio ad2ade12d4 add filtro de data viagem no rel bilhetes vendidos feat bug #AL-3637 2024-02-09 18:49:01 -03:00
Fabio ee00563bc9 Novo layout relatorio forma pagamento feat bug #AL-3565 2024-02-08 19:54:42 -03:00
valdevir a012017c00 fixes bug #AL-3763 2024-02-02 18:20:51 -03:00
Gleison da Cruz fa70eff1c2 fixes bug#AL-3713 2024-02-02 18:06:57 -03:00
Fabio bd4888bda9 forçando commit de internacionalizacao fix bug#AL-3512 2024-02-02 15:15:16 -03:00
Fabio 633c19d65b force recommit de internacionalização fix bug #AL-3512 2024-02-02 12:05:10 -03:00
wallace.henrique 09adba2412 fixes bug#AL-3566 2024-01-31 13:56:16 -03:00
Fabio 0f4b8bfc49 Adição de relatorio de recarga Feat bug#AL=3512 2024-01-30 14:12:55 -03:00
Fabio 881af70bd8 Refatoraçao recarga celular feat bug#AL-3513 2024-01-26 18:39:11 -03:00
valdevir 3986cb603c fixes bug #AL-3763 2024-01-26 18:08:12 -03:00
valdir.cordeiro 8c728bfc9e bug#al-3564
69586 - Espec - ADM - Log de alterações venda embarcada
dev:
qua:
2024-01-25 14:23:39 -03:00
Fabio 56bcb27b7c Correção na geraçao de boleto fix bug #AL-3536 2024-01-17 18:51:36 -03:00
Gleison da Cruz 37b62a75d4 fixes bug#AL-3734 2024-01-16 09:24:54 -03:00
valdir.cordeiro 3924e30038 bug#al-3609
Documentacao_integracao_PM_ARTESP
dev:
qua:
2024-01-11 15:29:18 -03:00