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

7199-devToTest_2316 #2287

Merged
alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00
Conversation 0 Commits 169 Files Changed 105 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fad30eb56d - Show all commits

4
db/versions/10930-wheatDendro/04-payroll_employee.sql
View File

@ -2,10 +2,10 @@
ALTER TABLE IF EXISTS `vn2008`.`payroll_employee` RENAME `vn`.`payrollWorker`;
ALTER TABLE IF EXISTS `vn`.`payrollWorker`
CHANGE COLUMN IF EXISTS `CodTrabajador` `workerCodeFk` int(11) NOT NULL,
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` `companyCodeFk` int(10) NOT NULL,
CHANGE COLUMN IF EXISTS `codempresa` `companyFkA3` int(10) NOT NULL COMMENT 'Columna que hace referencia a A3.',
CHANGE COLUMN IF EXISTS `codcontrato` `codcontrato__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
CHANGE COLUMN IF EXISTS `FAntiguedad` `FAntiguedad__` date NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
CHANGE COLUMN IF EXISTS `grupotarifa` `grupotarifa__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',

2
db/versions/10930-wheatDendro/06-payroll_conceptos.sql
View File

@ -3,4 +3,4 @@ ALTER TABLE IF EXISTS `vn2008`.`payroll_conceptos` RENAME `vn`.`payrollComponent
ALTER TABLE IF EXISTS `vn`.`payrollComponent`
CHANGE COLUMN IF EXISTS `conceptoid` `id` int(11) NOT NULL,
CHANGE COLUMN IF EXISTS `concepto` `concept` varchar(255) DEFAULT NULL;
CHANGE COLUMN IF EXISTS `concepto` `name` varchar(255) DEFAULT NULL;