Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker

2024-09-24 10:15:25 +02:00 · 2024-09-24 10:15:25 +02:00 · 78b500e452
parent 8ff0dc06fe f4de066d16
commit 78b500e452
4 changed files with 2 additions and 5 deletions
--- a/db/versions/11255-maroonRaphis/00-firstScript.sql
+++ b/db/versions/11255-maroonRaphis/00-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.worker
+	CHANGE isF11Allowed isF11Allowed__ TINYINT(1) NOT NULL DEFAULT 0 COMMENT '@deprecated 2024-09-22';
--- a/modules/worker/back/locale/worker/en.yml
+++ b/modules/worker/back/locale/worker/en.yml
@ -14,7 +14,6 @@ columns:
    hasMachineryAuthorized: machinery authorized
    seniority: seniority
    isTodayRelative: today relative
-    isF11Allowed: F11 allowed
    sectorFk: sector
    maritalStatus: marital status
    labelerFk: labeler
--- a/modules/worker/back/locale/worker/es.yml
+++ b/modules/worker/back/locale/worker/es.yml
@ -14,7 +14,6 @@ columns:
    hasMachineryAuthorized: maquinaria autorizada
    seniority: antigüedad
    isTodayRelative: relativo hoy
-    isF11Allowed: F11 autorizado
    sectorFk: sector
    maritalStatus: estado civil
    labelerFk: etiquetadora
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@ -55,9 +55,6 @@
        "birth": {
            "type": "date"
        },
-        "isF11Allowed": {
-            "type": "boolean"
-        },
        "sex": {
            "type": "string"
        },