refs #6224 deploy: correct sql folder and fix sql

db/changes/233801/01-deviceLog_acl.sql

@@ -1,6 +1,6 @@
 
-ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+-- ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
 
-INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
-VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+-- INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
+-- VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
 

db/changes/234001/01-deliveryAssistantACL.sql

@@ -4,13 +4,18 @@ INSERT INTO `account`.`role` (name, description)
 
 INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
     SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
-FROM account.roleInherit ri
-    JOIN account.role r2 ON r2.id = ri.`role`
-WHERE r2.name = 'deliveryBoss';
+        FROM account.roleInherit ri
+            JOIN account.role r2 ON r2.id = ri.`role`
+        WHERE r2.name = 'deliveryBoss';
+
+DELETE `account`.`roleInherit` FROM `account`.`roleInherit`
+    JOIN `account`.`role` r ON `account`.`roleInherit`.role = r.id
+    WHERE r.name = 'deliveryBoss';
 
 INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
 		SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
 		(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
 
-
-CALL `account`.`role_syncPrivileges`();
+UPDATE `salix`.`ACL`
+    SET principalId='deliveryAssistant'
+        WHERE principalId='deliveryBoss';

db/changes/234001/02-roleSync.sql

@@ -0,0 +1,2 @@
+-- Locally it fails because it is executed before the fixtures and the roleConfig table is empty
+CALL `account`.`role_syncPrivileges`();

modules/item/back/methods/item/setVisibleDiscard.js

@@ -32,6 +32,6 @@ module.exports = Self => {
 
     Self.setVisibleDiscard = async(ctx, itemFk, warehouseFk, quantity, addressFk) => {
         const query = `CALL vn.item_setVisibleDiscard(?, ?, ?, ?)`;
-        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk]);
+        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk], {userId: ctx.req.accessToken.userId});
     };
 };