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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2145_e2e_linux_fix

This commit is contained in:
Bernat 2020-03-13 13:17:55 +01:00
parent 91b58eb56b 47988f9cb5
commit 24425c7022
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/worker/back/models/calendar-holiday.json
View File

@ -23,12 +23,12 @@
"detail": {
"type": "belongsTo",
"model": "CalendarHolidaysName",
"foreignKey": "holidayDetailFk"
"foreignKey": "calendarHolidaysNameFk"
},
"type": {
"type": "belongsTo",
"model": "CalendarHolidaysType",
"foreignKey": "holidayTypeFk"
"foreignKey": "calendarHolidaysTypeFk"
},
"workCenter": {
"type": "belongsTo",