#45-Registro Semanal de Horas Trabajadas #69

Merged

alex merged 8 commits from hoursworked into main 2024-11-11 19:21:23 +00:00

Conversation 0 Commits 8 Files Changed 12 +1005 -454

melina.gutierrez commented 2024-11-09 17:00:33 +00:00

Member

Copy Link

No description provided.

melina.gutierrez added 6 commits 2024-11-09 17:00:34 +00:00

primer commit 4561a43866

hoursworked sin reporte vista 40d0cef2a1

primer commit 5a0aa27382

hoursworked sin reporte vista 36287611b8

#45-Registro Semanal de Horas Trabajadas mas Reporte Excel ca2cd583a0

Merge remote-tracking branch 'origin/hoursworked' into hoursworked ... b58a833444

# Conflicts:
#	src/main/java/com/primefactorsolutions/model/Actividad.java
#	src/main/java/com/primefactorsolutions/service/HoursWorkedService.java
#	src/main/java/com/primefactorsolutions/views/EmployeeView.java
#	src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
#	src/main/java/com/primefactorsolutions/views/ReporteView.java

melina.gutierrez added 1 commit 2024-11-09 17:03:20 +00:00

#45-Registro Semanal de Horas Trabajadas corregir employee 249a8cb1ee

melina.gutierrez added 1 commit 2024-11-11 19:01:05 +00:00

#45-Registro Semanal de Horas Trabajadas corregir employee solucionar error 21d1313b69

alex merged commit 3b0e5833f8 into main 2024-11-11 19:21:23 +00:00

alex referenced this issue from a commit 2024-11-11 19:21:24 +00:00

Merge pull request '#45-Registro Semanal de Horas Trabajadas' (#69) from hoursworked into main

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#69

No description provided.