Commit Graph

3233 Commits (187db2af6fa5230b8cc157bc3f0d2c51763d28d9)

Author SHA1 Message Date
Fernando Abimael Alvarez Uc 9d14260772 Conflicts solved. Fixes bug#AL-4549 2024-07-30 13:14:12 -06:00
Gleison da Cruz 702f3f5aa0 Merge pull request 'fixes bug#AL-4580' (!238) from AL-4580 into master
Reviewed-on: adm/ModelWeb#238
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-29 22:05:22 +00:00
Gleison da Cruz bc298845f2 fixes bug#AL-4580 2024-07-29 18:51:15 -03:00
fabio 6d92ae8b9b Merge pull request 'Permitir sillas com letras fixes bug#AL-4281' (!236) from AL-4281 into master
Reviewed-on: adm/ModelWeb#236
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-29 14:52:55 +00:00
Leonardo Oliveira 6a44af4575 Permitir sillas com letras fixes bug#AL-4281 2024-07-26 07:29:22 -03:00
Leonardo Oliveira 06b602da4f Merge branch 'master' of http://18.235.188.113:3000/adm/ModelWeb 2024-07-25 19:21:47 -03:00
leonardo.bolivariano edcd9a0d2f Merge pull request 'alterada a primary key composta para simples fixes bug#AL-4453' (!235) from AL-4453 into master
Reviewed-on: adm/ModelWeb#235
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-25 20:16:47 +00:00
Valdir Cordeiro f7beccb5dd Merge branch 'master' into AL-4453 2024-07-25 20:16:19 +00:00
Leonardo Oliveira 5cd7792971 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:42:38 -03:00
Leonardo Oliveira 0fbef4bb92 alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:35:32 -03:00
Leonardo Oliveira 700044c5fb alterada a primary key composta para simples fixes bug#AL-4453 2024-07-25 16:32:25 -03:00
leonardo.bolivariano e4437b4b58 Merge pull request 'Bolivariano - Autorização de viagem fixes bug#AL-4453' (!234) from AL-4453 into master
Reviewed-on: adm/ModelWeb#234
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-24 23:01:33 +00:00
Leonardo Oliveira 4e863123d1 merge master 2024-07-24 17:57:58 -03:00
Leonardo Oliveira 8040c1e5b8 Bolivariano - Autorização de viagem fixes bug#AL-4453 2024-07-24 17:55:44 -03:00
Valdir Cordeiro f0b9f9b675 Merge pull request 'Espec Bolivariano - Integração Infobit. fixes bug#AL-4273' (!233) from AL-4273-2 into master
Reviewed-on: adm/ModelWeb#233
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-22 13:39:21 +00:00
valdir.cordeiro e5ac6f38f8 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-22 10:31:23 -03:00
fabio 1eb352fe37 Merge pull request 'Funcionalidade de adicao ao contrato feat bug#AL-4343' (!232) from AL-4343 into master
Reviewed-on: adm/ModelWeb#232
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-19 16:17:22 +00:00
Fabio 50d0afe2a7 Funcionalidade de adicao ao contrato feat bug#AL-4343 2024-07-19 12:44:40 -03:00
pinheiro ceb3592b02 Merge pull request 'AL-4280 preview layout' (!231) from AL-4280_1 into master
Reviewed-on: adm/ModelWeb#231
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-19 14:03:46 +00:00
Lucas 0ce92cd755 AL-4280 preview layout 2024-07-18 22:37:29 -03:00
fabio 622fd86887 Cadastro de convenio transportadora feat bug#AL-4346' (!230) from AL-4346 into master
Reviewed-on: adm/ModelWeb#230
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-18 14:33:37 +00:00
Fabio 8ecbb03c03 Cadastro de convenio transportadora feat bug#AL-4346 2024-07-18 11:18:04 -03:00
pinheiro abdf8ce442 Merge pull request 'fixes bug #AL-4647' (!229) from AL-4647 into master
Reviewed-on: adm/ModelWeb#229
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-17 22:30:51 +00:00
valdevir 02590227d2 fixes bug #AL-4647 2024-07-17 19:26:36 -03:00
Valdir Cordeiro 3e850d746b Merge pull request 'Espec Bolivariano - Integração Infobit. fixes bug#AL-4273' (!228) from AL-4273_1 into master
Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/228
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
2024-07-17 14:01:10 +00:00
valdir.cordeiro d009439696 Espec Bolivariano - Integração Infobit. fixes bug#AL-4273 2024-07-17 10:55:09 -03:00
fabio 998629d197 Cadastro de desconto por contrato feat bug#AL-4342' (!227) from AL-4342 into master
Reviewed-on: adm/ModelWeb#227
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-16 23:04:35 +00:00
Fabio cc65c7cb15 Cadastro de desconto por contrato feat bug#AL-4342 2024-07-16 19:59:50 -03:00
pinheiro 59ec2fd9cd Merge pull request 'fixes bug #AL-4635' (!226) from AL-4635 into master
Reviewed-on: adm/ModelWeb#226
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-16 19:09:57 +00:00
valdevir 000ee30e98 fixes bug #AL-4635 2024-07-16 15:58:21 -03:00
pinheiro a0ce537011 Merge pull request 'fixes bug #AL-4634' (!225) from AL-4634 into master
Reviewed-on: adm/ModelWeb#225
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
2024-07-16 14:38:59 +00:00
valdevir 079f837108 fixes bug #AL-4634 2024-07-16 11:20:03 -03:00
fabio 3959f92672 Merge pull request 'Cadastro de convenio transportadora feat bug#AL-4346' (!224) from AL-4346 into master
Reviewed-on: adm/ModelWeb#224
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
2024-07-15 13:15:12 +00:00
Fabio 7c586b8b4e Cadastro de convenio transportadora feat bug#AL-4346 2024-07-12 18:11:02 -03:00
leonardo.bolivariano 4ab4de696b Merge pull request 'Aumentar tamanho do campo corrida_id para 9. fixes bug#AL-4264' (!223) from AL-4264 into master
Reviewed-on: adm/ModelWeb#223
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-11 20:40:08 +00:00
Leonardo Oliveira 431aeb4fa1 Aumentar tamanho do campo corrida_id para 9 fixes bug#AL-4264 2024-07-11 17:09:36 -03:00
fabio de3cedc446 Merge pull request 'Cadastro de contratos corporativos fixes bug#AL-4276' (!222) from AL-4276 into master
Reviewed-on: adm/ModelWeb#222
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
2024-07-11 19:30:27 +00:00
Fabio fd57cfbb29 Cadastro de convenio transportadora bug#AL-4246 2024-07-11 14:47:52 -03:00
Fabio a452f55c7c Cadastro de contratos corporativos fixes bug#AL-4276 2024-07-11 14:43:57 -03:00
fabio 15982a8440 Merge pull request 'AL-4273 nova tela comprovante de passagem' (!221) from AL-4273 into master
Reviewed-on: adm/ModelWeb#221
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-09 11:37:10 +00:00
Lucas 5d0972de39 AL-4273 nova tela comprovante de passagem 2024-07-08 22:26:30 -03:00
wallace 5a3d739ecd Merge pull request 'fixes bug#AL-4204' (!220) from AL-4204 into master
Reviewed-on: adm/ModelWeb#220
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-05 22:29:30 +00:00
wallace.henrique 4fc5262433 fixes bug#AL-4204 2024-07-05 19:12:57 -03:00
wallace f2c47d49cc Merge pull request 'cadastro de transportadora feat bug#AL-4277' (!219) from AL-4277 into master
Reviewed-on: adm/ModelWeb#219
Reviewed-by: wallace <wallace@rjconsultores.com.br>
2024-07-05 22:06:01 +00:00
Fabio 6f628db33a cadastro de transportadora feat bug#AL-4277 2024-07-05 18:00:41 -03:00
wallace 70f6a259eb Merge pull request 'fixes bug#AL-4607' (!218) from AL-4607 into master
Reviewed-on: adm/ModelWeb#218
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
2024-07-05 18:46:54 +00:00
wallace.henrique 54aad728d8 fixes bug#AL-4607 2024-07-05 15:45:47 -03:00
wallace f1a5814dfa Merge pull request 'fixes bug#AL-4607' (!217) from AL-4607 into master
Reviewed-on: adm/ModelWeb#217
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
2024-07-05 18:32:47 +00:00
wallace.henrique 6f0974d183 fixes bug#AL-4607 2024-07-05 15:27:51 -03:00
aristides 976243b602 Merge pull request 'fixes bug#AL-4091' (!216) from AL-4091 into master
Reviewed-on: adm/ModelWeb#216
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
2024-07-05 14:07:56 +00:00