refs #6553 changes models #2522

Open
carlossa wants to merge 22 commits from 6553-workerBusiness into dev
4 changed files with 12 additions and 4 deletions
Showing only changes of commit 5d73af5392 - Show all commits

View File

@ -154,5 +154,8 @@
}, },
"WorkerBusinessType": { "WorkerBusinessType": {
"dataSource": "vn" "dataSource": "vn"
},
"PayrollCategory": {
"dataSource": "vn"
} }
} }

View File

@ -103,12 +103,16 @@
"model": "OccupationCode", "model": "OccupationCode",
"foreignKey":"occupationCodeFk" "foreignKey":"occupationCodeFk"
}, },
"payrollCategory": {
"type": "belongsTo",
"model": "PayrollCategory",
"foreignKey":"workerBusinessCategoryFk"
},
"workerBusinessProfessionalCategory": { "workerBusinessProfessionalCategory": {
"type": "belongsTo", "type": "belongsTo",
"model": "WorkerBusinessProfessionalCategory", "model": "WorkerBusinessProfessionalCategory",
"foreignKey": "workerBusinessProfessionalCategoryFk" "foreignKey": "workerBusinessProfessionalCategoryFk"
} },
,
"calendarType": { "calendarType": {
"type": "belongsTo", "type": "belongsTo",
"model": "CalendarType", "model": "CalendarType",

View File

@ -8,7 +8,8 @@
}, },
"properties": { "properties": {
"code": { "code": {
"type": "string" "type": "string",
"id": true
}, },
"name": { "name": {
"type": "string" "type": "string"

View File

@ -1,5 +1,5 @@
{ {
"name": "BusinessReasonEnd", "name": "PayrollCategory",
"base": "VnModel", "base": "VnModel",
"options": { "options": {
"mysql": { "mysql": {