acls, fixtures, models

db/dump/fixtures.before.sql

@@ -3882,3 +3882,22 @@ INSERT INTO `vn`.`calendarHolidays` (calendarHolidaysTypeFk, dated, calendarHoli
 		(1, '2001-05-17', 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);
+
+

db/versions/11103-limeBirch/00-firstScript.sql

@@ -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');
+

modules/worker/back/model-config.json

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

modules/worker/back/models/worker-income.json

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