diff --git a/Jenkinsfile b/Jenkinsfile index c5424ee27..a52a9e91d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,6 +113,7 @@ pipeline { } steps { script { + sh 'rm junit/e2e-*.xml || true' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') sh "docker-compose ${env.COMPOSE_PARAMS} up -d" diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9e46c54e3..5b667555e 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -694,8 +694,10 @@ worker: machine: Machine business: tableVisibleColumns: + id: ID started: Start Date ended: End Date + hourlyLabor: Time sheet company: Company reasonEnd: Reason for Termination department: Department @@ -703,6 +705,7 @@ worker: calendarType: Work Calendar workCenter: Work Center payrollCategories: Contract Category + workerBusinessAgreementName: Agreement occupationCode: Contribution Code rate: Rate businessType: Contract Type diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index fd42d37c7..3f004485d 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -770,8 +770,10 @@ worker: concept: Concepto business: tableVisibleColumns: + id: Id started: Fecha inicio ended: Fecha fin + hourlyLabor: Ficha company: Empresa reasonEnd: Motivo finalización department: Departamento @@ -782,6 +784,7 @@ worker: occupationCode: Cotización rate: Tarifa businessType: Contrato + workerBusinessAgreementName: Convenio amount: Salario basicSalary: Salario transportistas notes: Notas diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index d358601d3..18602f043 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -185,6 +185,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`; data-key="InvoiceInSummary" :url="`InvoiceIns/${entityId}/summary`" @on-fetch="(data) => init(data)" + module-name="InvoiceIn" > diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index 9dad8ba22..5723e2f0d 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -1,5 +1,5 @@