From 6163cad8a5184e731c11a8e17dfa831aaaea2ec0 Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 13 Mar 2024 14:17:10 +0100 Subject: [PATCH] refs #6738 --- db/routines/vn2008/views/payrollWorker.sql | 4 ++-- db/routines/vn2008/views/payroll_conceptos.sql | 2 +- db/versions/10930-wheatDendro/04-payroll_employee.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/routines/vn2008/views/payrollWorker.sql b/db/routines/vn2008/views/payrollWorker.sql index 83ba02ecf..d4ada9aa0 100644 --- a/db/routines/vn2008/views/payrollWorker.sql +++ b/db/routines/vn2008/views/payrollWorker.sql @@ -1,6 +1,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `vn2008`.`payroll_employee` -AS SELECT `pw`.`workerCodeFk` AS `CodTrabajador`, - `pw`.`companyCodeFk` AS `codempresa` +AS SELECT `pw`.`workerFkA3` AS `CodTrabajador`, + `pw`.`companyFkA3` AS `codempresa` FROM `vn`.`payrollWorker` `pw` diff --git a/db/routines/vn2008/views/payroll_conceptos.sql b/db/routines/vn2008/views/payroll_conceptos.sql index 54be27d0b..a7c6ece5b 100644 --- a/db/routines/vn2008/views/payroll_conceptos.sql +++ b/db/routines/vn2008/views/payroll_conceptos.sql @@ -2,7 +2,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `vn2008`.`payroll_conceptos` AS SELECT `pc`.`id` AS `conceptoid`, - `pc`.`concept` AS `concepto`, + `pc`.`name` AS `concepto`, `pc`.`isSalaryAgreed` AS `isSalaryAgreed`, `pc`.`isVariable` AS `isVariable`, `pc`.`isException` AS `isException` diff --git a/db/versions/10930-wheatDendro/04-payroll_employee.sql b/db/versions/10930-wheatDendro/04-payroll_employee.sql index 538c636f4..c346fbf8d 100644 --- a/db/versions/10930-wheatDendro/04-payroll_employee.sql +++ b/db/versions/10930-wheatDendro/04-payroll_employee.sql @@ -2,7 +2,7 @@ ALTER TABLE IF EXISTS `vn2008`.`payroll_employee` RENAME `vn`.`payrollWorker`; ALTER TABLE IF EXISTS `vn`.`payrollWorker` -CHANGE COLUMN IF EXISTS `CodTrabajador` `workerFkA3` int(11) NOT NULL COMMENT 'Columna que hace referencia a A3.',, +CHANGE COLUMN IF EXISTS `CodTrabajador` `workerFkA3` int(11) NOT NULL COMMENT 'Columna que hace referencia a A3.', CHANGE COLUMN IF EXISTS `nss` `nss__` varchar(23) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024', CHANGE COLUMN IF EXISTS `codpuesto` `codpuesto__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024', CHANGE COLUMN IF EXISTS `codempresa` `companyFkA3` int(10) NOT NULL COMMENT 'Columna que hace referencia a A3.',