7691-testToMaster #2703

Merged
alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00
4 changed files with 34 additions and 1 deletions
Showing only changes of commit fa8c1b3879 - Show all commits

View File

@ -3882,3 +3882,22 @@ INSERT INTO `vn`.`calendarHolidays` (calendarHolidaysTypeFk, dated, calendarHoli
(1, '2001-05-17', 1, 5), (1, '2001-05-17', 1, 5),
(1, '2001-05-18', 1, 5); (1, '2001-05-18', 1, 5);
INSERT INTO vn.payrollComponent
(id, name, isSalaryAgreed, isVariable, isException)
VALUES(1, 'Salario1', 1, 0, 0);
INSERT INTO vn.payrollComponent
(id, name, isSalaryAgreed, isVariable, isException)
VALUES(2, 'Salario2', 1, 1, 0);
INSERT INTO vn.payrollComponent
(id, name, isSalaryAgreed, isVariable, isException)
VALUES(3, 'Salario3', 1, 0, 1);
INSERT INTO vn.workerIncome
(debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
VALUES(1000.00, 900.00, 2, '2000-01-01', 1106, NULL);
INSERT INTO vn.workerIncome
(debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
VALUES(1001.00, 800.00, 2, '2000-01-01', 1106, NULL);

View File

@ -0,0 +1,8 @@
-- Place your SQL code here
INSERT INTO salix.ACL
(id, model, property, accessType, permission, principalType, principalId)
VALUES(872, 'WorkerIncome', '*', '*', 'ALLOW', 'ROLE', 'hr');
INSERT INTO salix.ACL
(id, model, property, accessType, permission, principalType, principalId)
VALUES(873, 'PayrollComponent', '*', '*', 'ALLOW', 'ROLE', 'hr');

View File

@ -124,6 +124,12 @@
}, },
"Locker": { "Locker": {
"dataSource": "vn" "dataSource": "vn"
},
"PayrollComponent": {
"dataSource": "vn"
},
"WorkerIncome": {
"dataSource": "vn"
} }
} }

View File

@ -37,7 +37,7 @@
"foreignKey": "id" "foreignKey": "id"
}, },
"worker": { "worker": {
"type": "belongsTo", "type": "hasMany",
"model": "Worker", "model": "Worker",
"foreignKey": "id" "foreignKey": "id"
} }