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 +11 -6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8c7b55329 - Show all commits

6
modules/worker/back/models/worker-income.json
View File

@ -33,13 +33,13 @@
"relations": { "relations": {
"payrollComponent": { "payrollComponent": {
"type": "belongsTo", "type": "belongsTo",
"model": "payrollComponent", "model": "PayrollComponent",
"foreignKey": "id" "foreignKey": "id"
}, },
"worker": { "worker": {
"type": "hasMany", "type": "belongsTo",
"model": "Worker", "model": "Worker",
"foreignKey": "id" "foreignKey": "workerFk"
} }
} }
} }

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

@ -115,6 +115,11 @@
"type": "hasMany", "type": "hasMany",
"model": "Locker", "model": "Locker",
"foreignKey": "workerFk" "foreignKey": "workerFk"
},
"incomes": {
"type": "hasMany",
"model": "WorkerIncome",
"foreignKey": "workerFk"
} }
}, },
"acls": [ "acls": [