Merge branch 'master' into 5153---business-type-worker-descriptor
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
6d23ef5d1e
|
@ -0,0 +1,11 @@
|
||||||
|
name: shelving
|
||||||
|
columns:
|
||||||
|
id: id
|
||||||
|
code: code
|
||||||
|
parkingFk: parking
|
||||||
|
isPrinted: printed
|
||||||
|
priority: priority
|
||||||
|
parked: parked
|
||||||
|
userFk: user
|
||||||
|
isSpam: SPAM
|
||||||
|
isRecyclable: recyclable
|
|
@ -0,0 +1,11 @@
|
||||||
|
name: estantería
|
||||||
|
columns:
|
||||||
|
id: id
|
||||||
|
code: código
|
||||||
|
parkingFk: parking
|
||||||
|
isPrinted: impreso
|
||||||
|
priority: prioridad
|
||||||
|
parked: aparcado
|
||||||
|
userFk: usuario
|
||||||
|
isSpam: SPAM
|
||||||
|
isRecyclable: reciclable
|
|
@ -4,9 +4,20 @@ columns:
|
||||||
companyCodeFk: company
|
companyCodeFk: company
|
||||||
started: started
|
started: started
|
||||||
ended: ended
|
ended: ended
|
||||||
|
workerBusiness: business
|
||||||
|
reasonEndFk: ending reason
|
||||||
payedHolidays: payed holidays
|
payedHolidays: payed holidays
|
||||||
|
occupationCodeFk: occupation
|
||||||
workerFk: worker
|
workerFk: worker
|
||||||
|
notes: notes
|
||||||
|
departmentFk: department
|
||||||
|
workerBusinessProfessionalCategoryFk: professional category
|
||||||
calendarTypeFk: calendar type
|
calendarTypeFk: calendar type
|
||||||
isHourlyLabor: hourly labor
|
isHourlyLabor: hourly labor
|
||||||
workcenterFk: workcenter
|
workcenterFk: workcenter
|
||||||
|
rate: rate
|
||||||
|
workerBusinessCategoryFk: category
|
||||||
|
workerBusinessTypeFk: type
|
||||||
amount: amount
|
amount: amount
|
||||||
|
workerBusinessAgreementFk: agreement
|
||||||
|
basicSalary: salary
|
||||||
|
|
|
@ -4,9 +4,20 @@ columns:
|
||||||
companyCodeFk: empresa
|
companyCodeFk: empresa
|
||||||
started: iniciado
|
started: iniciado
|
||||||
ended: finalizado
|
ended: finalizado
|
||||||
|
workerBusiness: negocio
|
||||||
|
reasonEndFk: motivo finalización
|
||||||
payedHolidays: vacaciones pagadas
|
payedHolidays: vacaciones pagadas
|
||||||
|
occupationCodeFk: ocupación
|
||||||
workerFk: trabajador
|
workerFk: trabajador
|
||||||
|
notes: notas
|
||||||
|
departmentFk: departamento
|
||||||
|
workerBusinessProfessionalCategoryFk: categoría profesional
|
||||||
calendarTypeFk: tipo calendario
|
calendarTypeFk: tipo calendario
|
||||||
isHourlyLabor: horario laboral
|
isHourlyLabor: horario laboral
|
||||||
workcenterFk: centro de trabajo
|
workcenterFk: centro de trabajo
|
||||||
|
rate: tarifa
|
||||||
|
workerBusinessCategoryFk: categoría
|
||||||
|
workerBusinessTypeFk: tipo
|
||||||
amount: salario
|
amount: salario
|
||||||
|
workerBusinessAgreementFk: acuerdo
|
||||||
|
basicSalary: salario base
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
name: document
|
||||||
|
columns:
|
||||||
|
id: id
|
||||||
|
worker: worker
|
||||||
|
document: document
|
||||||
|
isReadableByWorker: readable by worker
|
|
@ -0,0 +1,6 @@
|
||||||
|
name: documento
|
||||||
|
columns:
|
||||||
|
id: id
|
||||||
|
worker: trabajador
|
||||||
|
document: documento
|
||||||
|
isReadableByWorker: accesible por trabajador
|
Loading…
Reference in New Issue