En-desarrollo #53

Merged
alex merged 15 commits from En-desarrollo into main 2024-10-16 01:31:00 +00:00

15 Commits

Author SHA1 Message Date
5a270d6795 Merge pull request '#37, #41#, 42, #43, #44 Listado General Vacaciones - Vista y Filtros' (#56) from Vacaciones into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
Reviewed-on: #56
2024-10-15 19:06:19 +00:00
22963adad9 #37, #41#, 42, #43, #44 Listado General Vacaciones - Vista y Filtros
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-15 15:04:26 -04:00
7d3b63f6a8 Merge pull request 'Vacaciones' (#54) from Vacaciones into En-desarrollo
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 20s
Reviewed-on: #54
2024-10-14 21:43:44 +00:00
696481a695 Resolver conflictos entre las Ramas Vacaciones y En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-14 17:42:31 -04:00
0d9e0755b0 #49, #50 Perfil de Personal Administrativo - Ver/Editar Vacaciones del Empleado
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-14 01:17:23 -04:00
81b3003d1b Modelo empleado - Unir bd Team a la bd Employee 2024-10-13 20:25:39 -04:00
602ab686f5 Vacaciones del Empleado - Refactorizar 2024-10-13 20:25:38 -04:00
62d678c407 Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-13 20:25:37 -04:00
2a47bb8d9a Merge pull request 'Listado-General-Vacaciones' (#52) from Listado-General-Vacaciones into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m30s
Reviewed-on: #52
2024-10-11 19:30:22 +00:00
0fd278ac62 Modelo empleado - Unir bd Team a la bd Employee
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-11 01:25:56 -04:00
f8f71b187c Merge branch 'main' into Listado-General-Vacaciones 2024-10-11 00:55:37 -04:00
334802e004 Vacaciones del Empleado - Refactorizar 2024-10-11 00:53:46 -04:00
f7d0e9df23 Merge branch 'Listado-General-Vacaciones' of https://git.primefactorsolutions.com/PFS/pfs-intra into Listado-General-Vacaciones 2024-10-10 18:47:23 -04:00
e8e0f60c4e Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-10 13:29:14 -04:00
f90efef23c Merge pull request '#37, #41, #42, #43, #44 Perfil de Personal Administrativo - Listado General de Vacaciones y Filtrado' (#47) from Listado-General-Vacaciones into En-desarrollo
Reviewed-on: #47
2024-10-08 18:48:54 +00:00