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

#6878 hotfix fix add manual entries #2074

Merged
jorgep merged 2 commits from 6878-hotfix-addManualTimeEntries into master 2024-02-23 07:37:12 +00:00
Conversation 1 Commits 2 Files Changed 6 +75 -29
jorgep commented 2024-02-22 11:21:04 +00:00
Member
Copy Link
No description provided.
jorgep added 1 commit 2024-02-22 11:52:49 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
76b1433099 fix: refs #6878 use clockIn procedure on update time
jorgep changed title from 6878 hotfix fix add manual entries to #6878 hotfix fix add manual entries 2024-02-22 11:59:03 +00:00
jorgep added the
CR / Tests passed
 label 2024-02-22 12:11:24 +00:00
jorgep requested review from carlosap 2024-02-22 12:11:35 +00:00
jorgep requested review from alexm 2024-02-22 12:11:35 +00:00
carlosap approved these changes 2024-02-22 12:26:11 +00:00
alexm approved these changes 2024-02-23 07:32:11 +00:00
alexm added 1 commit 2024-02-23 07:32:21 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
f51df43d17 Merge branch 'master' into 6878-hotfix-addManualTimeEntries
jorgep merged commit 775764c2a9 into master 2024-02-23 07:37:12 +00:00
jorgep deleted branch 6878-hotfix-addManualTimeEntries 2024-02-23 07:37:12 +00:00
carlosap reviewed 2024-02-23 10:56:43 +00:00
carlosap requested changes 2024-02-23 10:57:40 +00:00
db/routines/vn/procedures/workerTimeControl_clockIn.sql
@ -76,3 +76,3 @@
SET vDated = DATE(vTimed);
SELECT IF(pc.name = 'Conductor +3500kg',
SELECT IF(pc.code = 'driveCE',
carlosap commented 2024-02-23 10:57:31 +00:00
Member
Copy Link

driverCE

driverCE
db/versions/10903-pinkIvy/00-professionalCategoryAddCode.sql
@ -0,0 +1,6 @@
ALTER TABLE vn.professionalCategory DROP COLUMN IF EXISTS code;
ALTER TABLE IF EXISTS vn.professionalCategory ADD COLUMN code VARCHAR(25) DEFAULT NULL;
carlosap commented 2024-02-23 10:57:07 +00:00
Member
Copy Link

los campos code son UNIQUE

los campos code son UNIQUE
jorgep commented 2024-02-23 11:24:37 +00:00
Author
Member
Copy Link

Se corrige en esta rama: #2083

Se corrige en esta rama: https://gitea.verdnatura.es/verdnatura/salix/pulls/2083
Sign in to join this conversation.
Reviewers
No reviewers
alexm
carlosap
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
3 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#2074
No description provided.
Delete Branch "6878-hotfix-addManualTimeEntries"

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?