verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

7409-workerIncome #2597

Merged
carlossa merged 14 commits from 7409-workerIncome into dev 2024-06-26 09:38:02 +00:00
Conversation 0 Commits 14 Files Changed 6 +109 -6
carlossa commented 2024-06-17 11:56:04 +00:00
Member
Copy Link
No description provided.
carlossa added 2 commits 2024-06-17 11:56:05 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
fa8c1b3879 acls, fixtures, models
alexm added 1 commit 2024-06-17 12:17:50 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
e8c7b55329 fix(WorkerIncome): refs #7409 fix models
carlossa added 1 commit 2024-06-17 13:51:15 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
3e25fff90f refs #7409 acl
carlossa added 1 commit 2024-06-18 07:18:20 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
52a34c8f2d refs #7409 fix acls
carlossa changed title from WIP: 7409-workerIncome to 7409-workerIncome 2024-06-21 08:28:56 +00:00
carlossa requested review from alexm 2024-06-21 08:28:59 +00:00
carlossa added 1 commit 2024-06-21 08:32:26 +00:00
alexm requested changes 2024-06-25 10:21:47 +00:00
Dismissed
db/dump/fixtures.before.sql Outdated
@ -3882,3 +3882,22 @@ INSERT INTO `vn`.`calendarHolidays` (calendarHolidaysTypeFk, dated, calendarHoli
(1, '2001-05-17', 1, 5),
(1, '2001-05-18', 1, 5);
INSERT INTO vn.payrollComponent
alexm commented 2024-06-25 10:21:40 +00:00
Member
Copy Link

Poner forma simplificada

Poner forma simplificada
carlossa marked this conversation as resolved
carlossa added 1 commit 2024-06-25 10:35:35 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
248358fbd7 refs #7409 fix pr
carlossa added 2 commits 2024-06-25 10:36:38 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f5bc0482d2 refs #7409 resolve conflicts
carlossa requested review from alexm 2024-06-25 10:36:50 +00:00
alexm added 1 commit 2024-06-25 11:16:17 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
dc628995b3 Merge branch 'dev' into 7409-workerIncome
alexm approved these changes 2024-06-25 11:16:27 +00:00
carlossa added 2 commits 2024-06-25 12:49:43 +00:00
carlossa added 1 commit 2024-06-25 14:04:11 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
d1ed4b4459 refs #7409 fix back
carlossa added 1 commit 2024-06-26 08:01:00 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
f9a09f3fec Merge branch 'dev' into 7409-workerIncome
carlossa merged commit 90d23fc1a4 into dev 2024-06-26 09:38:02 +00:00
carlossa deleted branch 7409-workerIncome 2024-06-26 09:38:02 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
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: verdnatura/salix#2597
No description provided.
Delete Branch "7409-workerIncome"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?