Listado-General-Vacaciones #52

Merged

jesus.pelaez merged 23 commits from Listado-General-Vacaciones into En-desarrollo 2024-10-11 19:30:22 +00:00

Conversation 0 Commits 23 Files Changed 13 +887 -186

jesus.pelaez commented 2024-10-11 19:26:08 +00:00

Member

Copy Link

No description provided.

jesus.pelaez added 23 commits 2024-10-11 19:26:09 +00:00

#4 Perfil de Empleado - Añadir nuevos Campos para el formulario de registro del empleado 8bf4a97c88

#4 Perfil de Empleado - Revisar campos del Formulario b7a63b8c78

Crear views para el modulo de documentos a7d1c08f90

merged conflicts b4c27f8a9b

merge conflicts 831f9ec9a5

fix readonly fields 25448fff44

Merge remote-tracking branch 'origin/#10-Registro-Informacion-Profesional' into #10-Registro-Informacion-Profesional ... 40aa10bc7d

# Conflicts:
#	src/main/java/com/primefactorsolutions/views/EmployeeView.java

Merge remote-tracking branch 'refs/remotes/origin/main' into #10-Registro-Informacion-Profesional ... 592a8d18ea

# Conflicts:
#	src/main/java/com/primefactorsolutions/views/EmployeeView.java

#4 Perfil de Empleado - Revisar campos del Formulario 4ae2badb7b

#4 Perfil de Empleado - Detalles para formulario de Empleado 6316230a2a

Merge pull request 'En-desarrollo' (#27) from En-desarrollo into main ... 2782fcfb86

Reviewed-on: #27
Reviewed-by: alex <alex@primefactorsolutions.com>

Merge branch 'main' into #10-Registro-Informacion-Profesional 2c18455581

#46 Perfil de Empleado - Registro Semanal de Horas trabajadas 067941e540

#46 Perfil de Empleado - Registro Semanal de Horas trabajadas 379e822572

Merge pull request '#10-Registro-Informacion-Profesional' (#38) from #10-Registro-Informacion-Profesional into main ... ef78cc91a8

Reviewed-on: #38

Correcciones b14e7902cc

Actualizar src/main/java/com/primefactorsolutions/model/TimeOffRequest.java 02c0b848af

Vacaciones del Empleado - Filtrar por categoria y estado e8e0f60c4e

Merge pull request '#37, #41, #42, #43, #44 Perfil de Personal Administrativo - Listado General de Vacaciones y Filtrado' (#48) from Listado-General-Vacaciones into main ... 2a59bc4e7e

Reviewed-on: #48

Merge branch 'Listado-General-Vacaciones' of https://git.primefactorsolutions.com/PFS/pfs-intra into Listado-General-Vacaciones f7d0e9df23

Vacaciones del Empleado - Refactorizar 334802e004

Merge branch 'main' into Listado-General-Vacaciones f8f71b187c

Modelo empleado - Unir bd Team a la bd Employee 0fd278ac62

jesus.pelaez merged commit 2a47bb8d9a into En-desarrollo 2024-10-11 19:30:22 +00:00

jesus.pelaez referenced this issue from a commit 2024-10-11 19:30:23 +00:00

Merge pull request 'Listado-General-Vacaciones' (#52) from Listado-General-Vacaciones into En-desarrollo

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: PFS/pfs-intra#52

No description provided.