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

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +2 -5
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4de066d16 - Show all commits

2
db/versions/11255-maroonRaphis/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.worker
CHANGE isF11Allowed isF11Allowed__ TINYINT(1) NOT NULL DEFAULT 0 COMMENT '@deprecated 2024-09-22';

1
modules/worker/back/locale/worker/en.yml
View File

@ -14,7 +14,6 @@ columns:
hasMachineryAuthorized: machinery authorized hasMachineryAuthorized: machinery authorized
seniority: seniority seniority: seniority
isTodayRelative: today relative isTodayRelative: today relative
isF11Allowed: F11 allowed
sectorFk: sector sectorFk: sector
maritalStatus: marital status maritalStatus: marital status
labelerFk: labeler labelerFk: labeler

1
modules/worker/back/locale/worker/es.yml
View File

@ -14,7 +14,6 @@ columns:
hasMachineryAuthorized: maquinaria autorizada hasMachineryAuthorized: maquinaria autorizada
seniority: antigüedad seniority: antigüedad
isTodayRelative: relativo hoy isTodayRelative: relativo hoy
isF11Allowed: F11 autorizado
sectorFk: sector sectorFk: sector
maritalStatus: estado civil maritalStatus: estado civil
labelerFk: etiquetadora labelerFk: etiquetadora

3
modules/worker/back/models/worker.json
View File

@ -55,9 +55,6 @@
"birth": { "birth": {
"type": "date" "type": "date"
}, },
"isF11Allowed": {
"type": "boolean"
},
"sex": { "sex": {
"type": "string" "type": "string"
}, },