Commit Graph

7445 Commits (1.155.0)

Author SHA1 Message Date
Luis Angel Espina Hernandez a175dd73b9 Fixes bug #AL-4506 2024-08-27 12:59:26 -04:00
Fernando Abimael Alvarez Uc 674d6b5264 Fixes bug#AL4556 2024-08-26 15:34:21 -06:00
Fernando Abimael Alvarez Uc e9b8d92db4 Fixes bug#AL-4556 2024-08-26 15:33:25 -06:00
Aristides dos Reis Júnior 7ef6882605 bug #AL-4274 2024-08-26 16:55:31 -03:00
celio 2cffcc6ebf fixes bug#AL-4681 2024-08-23 22:29:23 -03:00
Fernando Abimael Alvarez Uc 13fff4de4d Fixes bug#AL-4556 2024-08-23 11:33:58 -06:00
Fernando Abimael Alvarez Uc a95ac498d7 Se agrega funcionalidad de Seguimiento de Expresos#AL-4556 2024-08-23 11:30:51 -06:00
valdir.cordeiro cf29b9b8da Bolivariano - Adequações Conexão entre linhas feat bug#AL-4465 2024-08-23 10:04:06 -03:00
Luis Angel Espina Hernandez f0aad5143d Fixes bug#AL-4506 2024-08-22 15:53:52 -04:00
Luis Angel Espina Hernandez 7be685dda5 Se agrega funcionalidad de configuracion productos #AL-4506 2024-08-22 15:47:43 -04:00
Gleison da Cruz 539fdce4ff fixes bug#AL-4577
Diminuindo a fonte para caber todos os campos sem cortar
2024-08-22 15:51:48 -03:00
Lucas 406f5e3489 Merge remote-tracking branch 'origin/master' into AL-4824 2024-08-21 20:57:07 -03:00
Lucas Taiã d1b8b197b2 Merge branch 'master' into AL-4555 2024-08-21 23:37:19 +00:00
Lucas d4b954742b AL-4824 2024-08-21 20:35:17 -03:00
Gleison da Cruz 112b234872 fixes bug#AL-4577
Adicionado campos F.Pagamento, Seguro, Linha e Num Linha
2024-08-21 19:33:51 -03:00
Fernando Abimael Alvarez Uc d0546810f9 Fixes bug#AL-4555 2024-08-21 15:40:58 -06:00
Fernando Abimael Alvarez Uc 0d06d1119a Fixes bug#AL-4555 2024-08-21 15:08:48 -06:00
Fernando Abimael Alvarez Uc 6d92cb99f1 Se agrega pantalla de funcionalidad de Informde Viajes Ocasionales 2024-08-21 15:05:02 -06:00
Fabio 734a08bf55 Rotina de faturamento de voucher feat bug#AL-4356 2024-08-21 14:57:45 -03:00
Gleison da Cruz 898f8d1152 fixes bug#AL-4747
Relatorio considerando excluidos/inativos
2024-08-21 09:20:46 -03:00
Fabio 18c535186f Ajustes envio email Izypay fixes bug#AL-4812 2024-08-21 08:11:15 -03:00
wallace.henrique 4ab75a38de fixes bug#AL-4732 2024-08-20 21:51:44 -03:00
Lucas 5320ca8b67 Merge branch 'master' into AL-4466 2024-08-19 17:15:05 -03:00
Lucas 5d3fa630c3 AL-4466 2024-08-19 13:00:30 -03:00
Fernando Abimael Alvarez Uc 1d3bf13f0a Fixes bug#AL-4554 2024-08-16 12:44:08 -06:00
Fernando Abimael Alvarez Uc ab5d5e7bcf Fixes bug#AL-4554 2024-08-16 12:43:51 -06:00
Fernando Abimael Alvarez Uc b1aa4f9294 Se agrega funcionalidad de log de Expresos 2024-08-16 12:41:59 -06:00
Fabio 404726c212 Integração IzyPay feat bug#AL-4397 2024-08-16 09:56:54 -03:00
Fabio 1eda906eba Integração IzyPay feat bug#AL-4397 2024-08-16 09:43:42 -03:00
Leonardo Oliveira 073320e177 Mudança de menu do relatório feat bug#AL-4318 2024-08-15 15:08:15 -03:00
wallace.henrique b43c1802a8 fixes bug#AL-4691 2024-08-14 20:13:35 -03:00
Fabio 12baeeca02 Legalizacao Massiva Voucher feat bug#AL-4710 2024-08-14 19:19:32 -03:00
Leonardo Oliveira db1f3dc766 Bolivariano - Institucionales ADM: Relatório Saldo Contrato feat bug#AL-4341 2024-08-14 18:55:25 -03:00
Leonardo Oliveira e536eb9f30 alterações pedidas no PR 2024-08-14 18:18:02 -03:00
valdevir d984c198bd Inserido menu e tela Tipo de Documento. fixes bug #AL-4655 2024-08-14 16:40:21 -03:00
Leonardo Oliveira 18ffafe93e merge master 2024-08-14 16:36:37 -03:00
Aristides dos Reis Júnior c304765f74 fixes bug#AL-4781 2024-08-14 16:21:34 -03:00
Leonardo Oliveira fe1c4110a7 Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4341 2024-08-14 16:16:43 -03:00
Aristides dos Reis Júnior 0e2aa33b84 fixes bug#AL-4781 2024-08-14 16:15:38 -03:00
Leonardo Oliveira 8b0555cedc merge master 2024-08-14 14:43:40 -03:00
Leonardo Oliveira ab0759edab Bolivariano - Institucionales ADM: Relatório Saldo Contrato fixes bug#AL-4341 2024-08-14 14:33:44 -03:00
Leonardo Oliveira efc21329ef commit parcial 2024-08-12 20:50:46 -03:00
Fernando Abimael Alvarez Uc 1b4e930b1f Fixes bug#AL-4553 2024-08-12 17:18:44 -06:00
Fernando Abimael Alvarez Uc 7fef346de1 Se agrega funcionalidad de Cumplimiento de Servicio 2024-08-12 17:09:41 -06:00
Fernando Abimael Alvarez Uc 2e8a5c0cde Se agrega menú Cumplimiento de Servicios para Expresos 2024-08-12 11:32:13 -06:00
Fabio 3cf0780fb6 Integração Izypay feat bug#AL-4379 2024-08-12 12:47:48 -03:00
Fernando Abimael Alvarez Uc 26d0dbc579 Se agrega funcionalidad de descarga de FLUEC y Lista de Pasajeros:Fixes bug#AL-4552 2024-08-09 17:33:13 -06:00
Fernando Abimael Alvarez Uc 72dd07def1 Fixes bug#AL-4551 2024-08-09 13:39:14 -06:00
Fernando Abimael Alvarez Uc 10ecc9cd77 Merge branch 'master' into AL-4551 2024-08-09 12:47:57 -06:00
Fernando Abimael Alvarez Uc c1cd7e20c9 Fixes bug#AL-4551 2024-08-09 12:46:17 -06:00
wallace.henrique 0e812df08f fixes bug#AL-4691 2024-08-09 15:04:15 -03:00
Fernando Abimael Alvarez Uc cd7d4e7498 Conflict solved. Fixes bug#AL-4551 2024-08-09 11:45:51 -06:00
celio f232dc6580 fixes bug#AL-4214 2024-08-08 21:54:09 -03:00
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 b6f9b29be4 Fixes bug#AL-4549 2024-08-07 15:29:32 -06:00
Fernando Abimael Alvarez Uc 73c7e4ef8f Fixes bug#AL4549 2024-08-07 14:33:45 -06:00
Fernando Abimael Alvarez Uc b358dbb5e6 Fixes bug#AL-4549 2024-08-07 13:10:46 -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 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
Aristides dos Reis Júnior e0f278879d fixes bug#AL-4688 2024-08-05 17:43:53 -03:00
Fernando Abimael Alvarez Uc 40a18949e5 Merge branch 'master' into AL-4549 2024-08-05 09:34:49 -06:00
Gleison da Cruz 932cf6130d fixes bug#AL-4487 2024-08-02 17:07:56 -03:00
Fernando Abimael Alvarez Uc 4c632a84aa Merge branch 'master' into AL-4549 2024-08-02 08:56:59 -06:00
Gleison da Cruz 479700c1e2 fixes bug#AL-4487 2024-08-02 08:50:28 -03: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
Fabio c529b99e86 Consulta e Legalização de Voucher feat bug#AL-4279 2024-08-01 17:46:43 -03:00
Fernando Abimael Alvarez Uc 4218de49c7 Se agrega funcionalidad de Pago a Crédito#AL-4549 2024-08-01 14:34:00 -06:00
Gleison da Cruz c71c8a4aef fixes bug#AL-4487 2024-08-01 17:18:04 -03:00
Fabio f04c16a91e Consulta e Legalização de Voucher feat bug#AL-4249 2024-08-01 16:04:32 -03:00
Gleison da Cruz a763d6a7f4 fixes bug#AL-4487 2024-08-01 12:24:35 -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 40365a74be fixes bug#4586 2024-07-18 10:13:25 -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 3219d70cb2 Cadastro de desconto por contrato feat bug#AL-4342 2024-07-16 20:00:33 -03:00
Fabio 4a5781826f Cadastro de convenio transportadora feat bug#AL-4346 2024-07-12 18:11:32 -03:00
Leonardo Oliveira 47d6036dfa Aumentar tamanho do campo corrida_id para 9 fixes bug#AL-4264 2024-07-11 17:10:31 -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 40199fbcbd fixes bug#AL-4414
Filtro Status Conf. Corrida
2024-07-10 17:31:48 -03:00
celio da0ee2f4bc fixes bug#AL-4578 2024-07-09 19:56:00 -03:00
Fabio bc0e2c780b cadastro de transportadora fixes bug#AL-4277 2024-07-09 09:25:45 -03:00
Lucas 82a22da021 AL-4273 nova tela comprovante de passagem 2024-07-08 22:28:31 -03:00
wallace.henrique 36a3a05880 fixes bug#AL-4204 2024-07-05 19:12:13 -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
Fabio c8a9d826c9 Usuario representante do contrato feat bug#AL-4278 2024-07-03 18:34:24 -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 bbcef89e8f fixes bug #AL-4595 2024-07-01 17:42:26 -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
valdir.cordeiro d4f73b5797 Espec - Bolivariano - Restauração de senha. fixes bug#AL-4269 2024-06-28 10:54:34 -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
valdir.cordeiro 1f81ebebba Espec - Bolivariano - Restauração de senha. fixes bug#AL-4269 2024-06-27 17:31:33 -03:00
Leonardo Oliveira 247895a959 Permitir assento com letra 2024-06-27 12:14:11 -03:00
wallace.henrique 2bd2d5821e fixes bug#AL-4488 2024-06-27 10:05:30 -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
valdevir 114d30ac25 fixes bug#AL-4492 2024-06-26 18:17:20 -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
celio.souza 4ce3f1f45d fixes bug#AL-4410 2024-06-20 14:50:10 -03:00
celio.souza ae6f076992 fixes bug#AL-4410 2024-06-19 21:32:44 -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
celio.souza 5109097914 fixes bug#AL-4167 2024-06-17 19:42:49 -03:00
wallace.henrique 42757862e5 fixes bug#AL-4478 2024-06-17 17:18:38 -03:00
valdir.cordeiro 6fc082328e bug#al-4269
Espec - Bolivariano - Restauração de senha.
dev:
qua:
2024-06-17 10:36:49 -03:00
valdir.cordeiro a805fc7df5 bug#al-4269
Espec - Bolivariano - Restauração de senha.
dev:
qua:
2024-06-17 10:03:03 -03:00
celio.souza fba9972188 fixes bug#AL-4167 2024-06-16 23:06:58 -03:00
wallace.henrique 7b336fdcfe fixes bug#AL-4309 2024-06-16 13:35:03 -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
Lucas 6cc8924bd2 AL-4271 2024-06-10 17:15:10 -03:00
valdevir 87ac67cf45 fixes bug #AL-4474 2024-06-04 19:03:42 -03:00
valdevir 9968991111 fixes bug #AL-4474 2024-06-04 18:09:20 -03:00
celio.souza 2f15c0a734 fixes bug#AL-4189 2024-05-31 20:21:46 -03:00