.husky/addReferenceTag.js

@@ -0,0 +1,33 @@
+const fs = require('fs');
+const path = require('path');
+
+function getCurrentBranchName(p = process.cwd()) {
+    if (!fs.existsSync(p)) return false;
+
+    const gitHeadPath = path.join(p, '.git', 'HEAD');
+
+    if (!fs.existsSync(gitHeadPath))
+        return getCurrentBranchName(path.resolve(p, '..'));
+
+    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
+    return headContent.trim().split('/')[2];
+}
+
+const branchName = getCurrentBranchName();
+
+if (branchName) {
+    const msgPath = `.git/COMMIT_EDITMSG`;
+    const msg = fs.readFileSync(msgPath, 'utf-8');
+    const reference = branchName.match(/^\d+/);
+
+    const referenceTag = `refs #${reference}`;
+    if (!msg.includes(referenceTag) && reference) {
+        const splitedMsg = msg.split(':');
+
+        if (splitedMsg.length > 1) {
+            const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
+            fs.writeFileSync(msgPath, finalMsg);
+        }
+    }
+}
+

.husky/commit-msg

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+echo "Running husky commit-msg hook"
+npx --no-install commitlint --edit
+echo "Adding reference tag to commit message"
+node .husky/addReferenceTag.js
+

Jenkinsfile

@@ -24,7 +24,7 @@ node {
         FROM_GIT = env.JOB_NAME.startsWith('gitea/')
         RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
         RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
-
+        env.DEBUG = 'strong-remoting:shared-method'
         // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"

back/methods/dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        // accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

back/methods/docuware/download.js

@@ -43,7 +43,7 @@ module.exports = Self => {
             path: `/:id/download`,
             verb: 'GET'
         },
-        // accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/image/download.js

@@ -48,7 +48,7 @@ module.exports = Self => {
             path: `/:collection/:size/:id/download`,
             verb: 'GET'
         },
-        // accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, collection, size, id) {

back/methods/notification/getList.js

@@ -45,7 +45,6 @@ module.exports = Self => {
             });
             availableNotificationsMap.delete(active.notificationFk);
         }
-
         return {
             active: [...activeNotificationsMap.entries()],
             available: [...availableNotificationsMap.entries()]

back/methods/notification/specs/getList.spec.js

@@ -4,8 +4,8 @@ describe('NotificationSubscription getList()', () => {
     it('should return a list of available and active notifications of a user', async() => {
         const userId = 9;
         const {active, available} = await models.NotificationSubscription.getList(userId);
-        const notifications = await models.Notification.find({});
+        const notifications = await models.NotificationSubscription.getAvailable(userId);
-        const totalAvailable = notifications.length - active.length;
+        const totalAvailable = notifications.size - active.length;
 
         expect(active.length).toEqual(3);
         expect(available.length).toEqual(totalAvailable);

back/methods/vn-user/renew-token.js

@@ -33,16 +33,23 @@ module.exports = Self => {
         // Schedule to remove current token
         setTimeout(async() => {
             try {
-                await Self.logout(token.id);
+                const exists = await models.AccessToken.findById(token.id);
+                exists && await Self.logout(token.id);
             } catch (err) {
                 // eslint-disable-next-line no-console
                 console.error(err);
             }
         }, courtesyTime * 1000);
 
+        // Get scopes
+
+        let createTokenOptions = {};
+        const {scopes} = token;
+        if (scopes)
+            createTokenOptions = {scopes: [scopes[0]]};
         // Create new accessToken
         const user = await Self.findById(token.userId);
-        const accessToken = await user.createAccessToken();
+        const accessToken = await user.accessTokens.create(createTokenOptions);
 
         return {id: accessToken.id, ttl: accessToken.ttl};
     };

back/methods/vn-user/specs/renew-token.spec.js

@@ -33,6 +33,17 @@ describe('Renew Token', () => {
         const {id} = await models.VnUser.renewToken(ctx);
 
         expect(id).not.toEqual(ctx.req.accessToken.id);
+
+        await models.VnUser.logout(ctx.req.accessToken.id);
+        jasmine.clock().tick(70 * 1000);
+        let tokenNotExists;
+        try {
+            tokenNotExists = await models.AccessToken.findById(ctx.req.accessToken.id);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(tokenNotExists).toBeNull();
     });
 
     it('NOT should renew', async() => {

back/methods/vn-user/specs/share-token.spec.js

@@ -1,6 +1,9 @@
 const {models} = require('vn-loopback/server/server');
+const TOKEN_MULTIMEDIA = 'read:multimedia';
 describe('Share Token', () => {
     let ctx = null;
+    const startingTime = Date.now();
+    let multimediaToken = null;
     beforeAll(async() => {
         const unAuthCtx = {
             req: {
@@ -17,11 +20,45 @@ describe('Share Token', () => {
         ctx = {req: {accessToken: accessToken}};
     });
 
-    it('should renew token', async() => {
+    beforeEach(async() => {
-        const multimediaToken = await models.VnUser.shareToken(ctx);
+        multimediaToken = await models.VnUser.shareToken(ctx);
+        jasmine.clock().install();
+        jasmine.clock().mockDate(new Date(startingTime));
+    });
 
+    afterEach(() => {
+        jasmine.clock().uninstall();
+    });
+
+    it('should generate token', async() => {
         expect(Object.keys(multimediaToken).length).toEqual(1);
         expect(multimediaToken.multimediaToken.userId).toEqual(ctx.req.accessToken.userId);
-        expect(multimediaToken.multimediaToken.scopes[0]).toEqual('read:multimedia');
+        expect(multimediaToken.multimediaToken.scopes[0]).toEqual(TOKEN_MULTIMEDIA);
+    });
+
+    it('NOT should renew', async() => {
+        let error;
+        let response;
+        try {
+            response = await models.VnUser.renewToken(ctx);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+        expect(response.id).toEqual(ctx.req.accessToken.id);
+    });
+
+    it('should renew token', async() => {
+        const mockDate = new Date(startingTime + 26600000);
+        jasmine.clock().mockDate(mockDate);
+
+        const newShareToken = await models.VnUser.renewToken({req: {accessToken: multimediaToken.multimediaToken}});
+        const {id} = newShareToken;
+
+        expect(id).not.toEqual(ctx.req.accessToken.id);
+        const newMultimediaToken = await models.AccessToken.findById(id);
+
+        expect(newMultimediaToken.scopes[0]).toEqual(TOKEN_MULTIMEDIA);
     });
 });

back/model-config.json

@@ -174,5 +174,8 @@
     },
     "WorkerActivityType": {
         "dataSource": "vn"
+    },
+    "ProductionConfig": {
+        "dataSource": "vn"
     }
 }

back/models/production-config.json

@@ -0,0 +1,19 @@
+{
+	"name": "ProductionConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+		  "table": "productionConfig"
+		}
+	  },
+	"properties": {
+		"id": {
+			"type": "number",
+			"required": true,
+			"id": true
+		},
+		"backupPrinterNotificationDelay": {
+			"type": "string"
+		}
+	}
+}

back/models/specs/notificationSubscription.spec.js

@@ -41,8 +41,7 @@ describe('loopback model NotificationSubscription', () => {
 
         try {
             const options = {transaction: tx, accessToken: {userId: 9}};
-            const notificationSubscriptionId = 2;
+            await models.NotificationSubscription.destroyAll({id: 2}, options);
-            await models.NotificationSubscription.destroyAll({id: notificationSubscriptionId}, options);
 
             await tx.rollback();
         } catch (e) {
@@ -76,8 +75,7 @@ describe('loopback model NotificationSubscription', () => {
 
         try {
             const options = {transaction: tx, accessToken: {userId: 9}};
-            const notificationSubscriptionId = 6;
+            await models.NotificationSubscription.destroyAll({id: 6}, options);
-            await models.NotificationSubscription.destroyAll({id: notificationSubscriptionId}, options);
 
             await tx.rollback();
         } catch (e) {
@@ -111,8 +109,7 @@ describe('loopback model NotificationSubscription', () => {
 
         try {
             const options = {transaction: tx, accessToken: {userId: 19}};
-            const notificationSubscriptionId = 4;
+            await models.NotificationSubscription.destroyAll({id: 4}, options);
-            await models.NotificationSubscription.destroyAll({id: notificationSubscriptionId}, options);
 
             await tx.rollback();
         } catch (e) {

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']};

db/dump/.dump/data.sql

@@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','10970','273507d3b711f272078e83880802d0ef7278d062','2024-04-05 10:33:29','10983');
+INSERT INTO `version` VALUES ('vn-database','10977','7a021c9ac6f804cc120542b65d7461283d516569','2024-04-18 09:13:43','11000');
 
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@@ -703,6 +703,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10896','25-warehouse_pickup.sql'
 INSERT INTO `versionLog` VALUES ('vn-database','10896','29-kk.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:03',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','30-permissions.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:03',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10898','00-table.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:03',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10900','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10903','00-professionalCategoryAddCode.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-23 08:38:28',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10905','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10906','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:04',NULL,NULL);
@@ -712,6 +713,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10912','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10913','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10914','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-28 11:52:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10915','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10917','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10918','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:27',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10919','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10922','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-29 13:44:58',NULL,NULL);
@@ -722,12 +724,24 @@ INSERT INTO `versionLog` VALUES ('vn-database','10925','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10926','00-refactorClaimState.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10928','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10929','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:16:19',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','01-Tramos.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','02-dock.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','03-Proveedores_cargueras.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','04-payroll_employee.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','05-payroll_centros.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','06-payroll_conceptos.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10930','07-Permisos.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10932','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10940','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-06 16:48:18',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10941','00-restoreVn2008Jerarquia.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 09:36:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10942','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 10:24:45',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10943','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 10:29:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10946','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-08 07:56:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10948','00-addReconciliationConfig.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10948','02-grantPrivileges.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10948','03-modifyColumn.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10949','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10953','00-account.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10953','01-bs.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10953','02-edi.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
@@ -743,11 +757,18 @@ INSERT INTO `versionLog` VALUES ('vn-database','10956','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10957','00-aclTicketClone.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10959','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-18 13:32:25',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10962','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-25 08:27:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10964','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10967','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10968','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10969','00-aclSupplierDms.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10970','00-specialPrice.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10971','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10973','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10975','00-action.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-03 12:03:46',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10975','01-expeditionFk.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-03 12:04:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10976','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10977','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-18 07:40:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10988','00-pbx_prefix.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-04-11 17:00:16',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1108,6 +1129,7 @@ INSERT INTO `roleInherit` VALUES (359,129,35,NULL);
 INSERT INTO `roleInherit` VALUES (360,101,129,NULL);
 INSERT INTO `roleInherit` VALUES (361,50,112,NULL);
 INSERT INTO `roleInherit` VALUES (362,122,15,NULL);
+INSERT INTO `roleInherit` VALUES (364,35,18,NULL);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -1799,7 +1821,6 @@ INSERT INTO `ACL` VALUES (799,'Ticket','saveCmr','*','ALLOW','ROLE','developer')
 INSERT INTO `ACL` VALUES (800,'EntryDms','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (801,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (802,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (803,'ExpeditionPallet','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (804,'DeviceProduction','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (805,'Collection','assign','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (806,'ExpeditionPallet','getPallet','READ','ALLOW','ROLE','production');
@@ -1808,18 +1829,19 @@ INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALL
 INSERT INTO `ACL` VALUES (809,'SaleTracking','delete','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (810,'SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (811,'SaleTracking','setPicked','WRITE','ALLOW','ROLE','production');
-INSERT INTO `ACL` VALUES (812,'ExpeditionPallet','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (813,'Sale','getFromSectorCollection','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (814,'ItemBarcode','delete','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (815,'WorkerActivityType','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (816,'WorkerActivity','*','*','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (817,'ParkingLog','*','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (818,'ExpeditionPallet','*','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (818,'ExpeditionPallet','*','*','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (819,'Ticket','addSaleByCode','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (820,'TicketCollection','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (821,'Ticket','clone','WRITE','ALLOW','ROLE','administrative');
 INSERT INTO `ACL` VALUES (822,'SupplierDms','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (823,'MailAlias','*','*','ALLOW','ROLE','developerBoss');
+INSERT INTO `ACL` VALUES (824,'ItemShelving','hasItemOlder','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (825,'Application','getEnumValues','*','ALLOW','ROLE','employee');
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2181,11 +2203,11 @@ INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',55,56,7102,0
 INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (125,'miriamMarTeam','EQUIPO MIRIAM MAR',57,58,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',27,28,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',29,30,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',85,86,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',59,60,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',61,62,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'francia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
+INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',61,62,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
 INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',63,64,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
 INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',106,107,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);

db/dump/.dump/privileges.sql

@@ -78,7 +78,7 @@ INSERT  IGNORE INTO `db` VALUES ('','bi','developer','Y','Y','Y','Y','N','N','N'
 INSERT  IGNORE INTO `db` VALUES ('','util','grafana','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','mysql','developerBoss','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','rfid','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
-INSERT  IGNORE INTO `db` VALUES ('','floranet','floranet','N','N','N','N','N','N','N','N','N','N','Y','Y','N','N','N','N','Y','N','N','N');
+INSERT  IGNORE INTO `db` VALUES ('','floranet','floranet','Y','N','N','N','N','N','N','N','N','N','Y','Y','N','N','N','N','Y','N','N','N');
 /*!40000 ALTER TABLE `db` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `tables_priv` DISABLE KEYS */;
@@ -337,8 +337,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','state','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','travel','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Bancos_poliza','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','edi_bucket_type','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','edi_bucket','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','duaDismissed','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','edi_article','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','edi_bucket','alexm@%','0000-00-00 00:00:00','Select','');
@@ -349,7 +347,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','payment','al
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','edi_supplier','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','edi_supplier','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','travel','alexm@%','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Tramos','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Tramos','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Trabajadores','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','empresa','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','sectorType','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -431,12 +429,12 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Paises','alexm
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','salesAssistant','clientDied','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','warehouse_pickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_categorias','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_centros','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_centros','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_conceptos','alexm@%','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_conceptos','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','Tintas','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','alertLevel','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','bankEntity','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_employee','alexm@%','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_employee','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','sale','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','bankEntity','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','agencyMode','alexm@%','0000-00-00 00:00:00','Select','');
@@ -455,7 +453,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','iva_tipo
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','iva_codigo','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','pago','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Proveedores','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Proveedores_cargueras','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Proveedores_cargueras','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','expedition','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -779,7 +777,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','PreciosEspecia
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','movingState','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferState','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicle','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','buffer','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferGroup','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','lastRFID','alexm@%','0000-00-00 00:00:00','Select','');
@@ -858,7 +855,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleParking__','al
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','property','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','employee','config','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicleEvent','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','vehicle','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','buyer','lastIndicators','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','saleComponent','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemBotanical','alexm@%','0000-00-00 00:00:00','Select','');
@@ -951,8 +947,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','vehicleInvoice
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicleEvent','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicleDms','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','vehicle','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicle','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicle','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','vehicle','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Agencias','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','vehicleDms','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ticketState','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1215,7 +1210,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','grafana','m3','juan@db-proxy2
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cajas','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','tagAbbreviation','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemImageQueue','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','marketingBoss','parking','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','marketing','parking','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','sectorCollection','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','supplier','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','defaulter','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1379,6 +1374,20 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleState',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','expeditionState','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','specialPrice','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRatio','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ticketConfig','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','zoneIncluded','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','zoneGeo','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','quality','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','category','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','edi_bucket_type','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ektEntryAssign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','edi_bucket','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','calendarType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','timeSlots','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','supplierFreight','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','payrollWorker','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','payrollWorkCenter','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','payrollComponent','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1648,7 +1657,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','entryEditor','getinventoryDate
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','zone_upcomingdeliveries','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','android','vn_now','FUNCTION','jenkins@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','entryEditor','entry_unlock','PROCEDURE','guillermo@10.5.1.4','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','agency','agencia_volume','PROCEDURE','root@10.1.4.166','Execute','2022-08-03 23:44:43');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','account','zone_getAgency','PROCEDURE','juan@77.228.249.89','Execute','2022-08-03 23:44:43');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','account','invoiceout_getpath','FUNCTION','root@pc-juan.dyn.verdnatura.es','Execute','2022-08-03 23:44:43');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','hedera','employee','order_confirm','PROCEDURE','z-developer@www1.static.verdnatura.es','Execute','2022-08-03 23:44:43');
@@ -1662,7 +1670,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myUser_hasRoleId'
 INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myUser_checkLogin','FUNCTION','jenkins@172.16.255.34','Execute','2022-08-03 23:44:43');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','lang','FUNCTION','juan@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofmonth','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','account_conciliacion_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','addAccountReconciliation','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1717,6 +1725,8 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaInvoiceInB
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelvinglog_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','production','expedition_scan','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionBoss','saleSplit','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','client_getDebt','FUNCTION','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','client_getDebt','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_commit','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1795,6 +1805,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','zone_getstate','PRO
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','worker_gethierarchy','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','workertimecontrol_weekcheckbreak','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','ticket_split','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','agency','agencyVolume','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','saletracking_new','PROCEDURE','alexm@pc325.algemesi.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','ticketnotinvoicedbyclient','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','workerjourney_replace','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -2027,7 +2038,7 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','account','{\"access\": 0, \"is_rol
 INSERT  IGNORE INTO `global_priv` VALUES ('','adminBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','adminOfficer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','administrative','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','agency','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 20000, \"max_user_connections\": 50, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','agency','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 20000, \"max_user_connections\": 50, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','android','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','artificialBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','assetManager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
@@ -2068,8 +2079,8 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','maintenance','{\"access\":0,\"vers
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBos','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','manager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','marketing','{\"access\": 0, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','marketing','{\"access\": 0, \"is_role\": true,\"version_id\":101106}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','marketingBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','marketingBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','officeBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','packager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','palletizer','{\"access\":0,\"version_id\":101106,\"is_role\":true}');

db/dump/.dump/triggers.sql

@@ -10997,4 +10997,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-04-08  7:14:22
+-- Dump completed on 2024-04-18  7:16:17

db/dump/fixtures.after.sql

@@ -9,6 +9,10 @@ SET foreign_key_checks = 0;
 
 INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled)
     VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
+
+INSERT INTO util.binlogQueue (code,logName, `position`)
+    VALUES ('mylogger', 'bin.000001', 4);
+
 /* #5483
 INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk)
     VALUES(1, NULL, 1, 300, 1);
@@ -113,9 +117,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
     (100, 4, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 4, NULL, 1, 567, 1, '2022-07-12', 0, 0, 6, NULL, NULL, NULL, NULL, NULL),
     (100, 5, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 5, NULL, 1, 567, 1, '2022-07-12', 0, 0, 1, NULL, NULL, NULL, NULL, NULL);
 */
-INSERT INTO vn.sector (description,warehouseFk) VALUES
-    ('Sector One',1);
-
 INSERT INTO vn.saleGroup (userFk,parkingFk,sectorFk) VALUES
     (100,1,1);
 
@@ -156,16 +157,6 @@ INSERT INTO `vn`.`occupationCode` (`code`, `name`)
         ('b', 'Representantes de comercio'),
         ('c', 'Personal de oficios en trabajos de construcción en general, y en instalac.,edificios y obras');
 
-INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`codempresa`)
-    VALUES
-        (36,20),
-        (43,20),
-        (76,20),
-        (1106,20),
-        (1107,20),
-        (1108,20),
-        (1109,20),
-        (1110,20);
 
 INSERT INTO `vn`.`trainingCourseType` (`id`, `name`)
     VALUES

db/dump/fixtures.before.sql

@@ -198,7 +198,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
-UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+UPDATE `vn`.`sector` SET `backupPrinterFk` = 1 WHERE id = 1;
 
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
@@ -1492,21 +1492,21 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeF
 
 INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
     VALUES
-        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
+        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
-        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  0, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
+        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  NULL, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
-        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  0, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  NULL, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
+        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES
@@ -1827,9 +1827,9 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`,
 
 INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
     VALUES
-        (1, util.VN_CURDATE(), 1,   1101, 18, 3, 0, util.VN_CURDATE(), 0,  11),
+        (1, util.VN_CURDATE(), 1,   1101, 19, 3, 0, util.VN_CURDATE(), 0,  11),
         (2, util.VN_CURDATE(), 4,   1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
-        (3, util.VN_CURDATE(), 3,   1101, 18, 1, 1, util.VN_CURDATE(), 5, 7),
+        (3, util.VN_CURDATE(), 3,   1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
         (4, util.VN_CURDATE(), 3,   1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
 
 INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
@@ -1973,6 +1973,15 @@ INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxC
         (4, 'Documentos',    1, 2.00,  1, 9,  1),
         (5, 'Documentos',    1, 2.00,  1, 8,  1);
 
+INSERT INTO `pbx`.`config` (id,defaultPrefix)
+    VALUES (1,'0034');
+
+INSERT INTO `pbx`.`prefix` (country, prefix)
+    VALUES
+        ('es', '0034'),
+        ('fr', '0033'),
+        ('pt', '00351');
+
 INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
     VALUES
         (1, 1010),
@@ -2542,15 +2551,15 @@ INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroV
 REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
     VALUES
         (1,  1001,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1),
-        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 1, 442, 1),
+        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1),
         (3,  1003,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1),
         (4,  1004,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1),
-        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 1, 442, 1),
+        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1),
         (6,  1006,  'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1),
-        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 1, 442, 1),
+        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1),
-        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 1, 442, 1),
+        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1),
-        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 1, 442, 1),
+        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1),
-        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
+        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1);
 
 INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`, `daysAgo`)
     VALUES
@@ -2605,6 +2614,10 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo
         (2, 13.20, 5080000, 15.00, 580, 5),
         (2, 16.10, 6021010, 25.00, 80,  5);
 
+UPDATE `vn`.`invoiceIn`
+	SET isBooked = TRUE
+	WHERE id IN (2, 5, 7, 8, 9, 10);
+
 INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
     SELECT t.id
         FROM vn.ticket t
@@ -2813,7 +2826,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
         (5, 'modified-entry', 'An entry has been modified'),
         (6, 'book-entry-deleted', 'accounting entries deleted'),
-        (7, 'zone-included','An email to notify zoneCollisions');
+        (7, 'zone-included','An email to notify zoneCollisions'),
+        (8, 'backup-printer-selected','A backup printer has been selected');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2825,7 +2839,8 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (4, 1),
         (5, 9),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
@@ -2845,15 +2860,16 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
 	    (1, 9),
         (1, 3),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
         (1, 9);
 
-INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`)
     VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);
 
 INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
     VALUES
@@ -3223,7 +3239,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3261,7 +3277,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 40,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3299,7 +3315,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 10,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3345,7 +3361,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 4,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3383,7 +3399,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3422,7 +3438,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 200,
 		`grouping` = 30,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3461,7 +3477,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 500,
 		`grouping` = 10,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3500,7 +3516,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 300,
 		`grouping` = 50,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3539,7 +3555,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 50,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3579,7 +3595,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 5,
 		`grouping` = 2,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3618,7 +3634,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 100,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3734,10 +3750,9 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 	VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
 
 INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
-    VALUES
+    VALUES (1, 10, 9);
-        (1, 10, 9);
 
-INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created) 
+INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
 	VALUES
 		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
 		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
@@ -3748,6 +3763,10 @@ INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,value
 		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
 		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
 
-INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk) 
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
-	VALUES
+	VALUES (1, 1);
-		(1, 1);
+
+
+INSERT INTO vn.workerTeam(id, team, workerFk)
+    VALUES
+        (8, 1, 19);

db/routines/edi/procedures/ekt_load.sql

@@ -14,7 +14,6 @@ proc:BEGIN
 	DECLARE vPackage INT;
 	DECLARE vPutOrderFk INT;
 	DECLARE vIsLot BOOLEAN;
-	DECLARE vForceToPacking INT DEFAULT 2;
 	DECLARE vEntryFk INT;
 	DECLARE vHasToChangePackagingFk BOOLEAN;
 	DECLARE vIsFloramondoDirect BOOLEAN;
@@ -147,10 +146,10 @@ proc:BEGIN
 				(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
 				IFNULL(vItem, vDefaultEntry) itemFk,
 				e.qty stickers,
-				@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
+				@pac := GREATEST(1, IFNULL(i.stemMultiplier, 1) * e.pac / @t) packing,
 				IFNULL(b.`grouping`, e.pac),
 				@pac * e.qty,
-				vForceToPacking,
+				'packing',
 				IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk),
 				(IFNULL(i.weightByPiece, 0) * @pac) / 1000
 			FROM ekt e 

db/routines/edi/procedures/floramondo_offerRefresh.sql

@@ -1,5 +1,5 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`floramondo_offerRefresh`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`floramondo_offerRefresh`()
 proc: BEGIN
 	DECLARE vLanded DATETIME;
 	DECLARE vDone INT DEFAULT FALSE;
@@ -417,7 +417,7 @@ proc: BEGIN
 					o.NumberOfUnits etiquetas,
 					o.NumberOfItemsPerCask packing,
 					GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
-					2, -- Obliga al Packing
+					'packing',
 					o.embalageCode,
 					o.diId
 				FROM edi.offer o
@@ -518,5 +518,5 @@ proc: BEGIN
 			fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime);
 
 	DO RELEASE_LOCK('edi.floramondo_offerRefresh');
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;

db/routines/floranet/procedures/catalogue_findById.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_findById(vSelf INT)
+READS SQL DATA
+BEGIN
+/**
+ * Returns one recordset from catalogue
+ * 
+ * @param vCatalogueFk Identifier de floranet.catalogue
+ */
+	SELECT * FROM catalogue WHERE id = vSelf;
+END$$
+DELIMITER ;

db/routines/floranet/procedures/order_put.sql

@@ -1,41 +1,21 @@
-DROP PROCEDURE IF EXISTS floranet.order_put;
-
 DELIMITER $$
-$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vJsonData JSON)
-CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vOrder JSON)
 READS SQL DATA
 BEGIN
 /**
  *  Get and process an order.
  * 
- * @param vOrder Data of the order
+ * @param vJsonData The order data in json format
- *
- *	Customer data: <customerName>, <email>, <customerPhone>
- *
- *	Item data: <catalogueFk>, <message>	
- *
- *	Delivery data: <deliveryName>, <address>, <deliveryPhone>
- *
  */
-	INSERT IGNORE INTO `order`(
+	INSERT INTO `order`
-							catalogueFk,
+		SET catalogueFk = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.products[0].id')),
-							customerName,
+			customerName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerName')),
-							email,
+    		email = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.email')),
-							customerPhone,
+    		customerPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerPhone')),
-							message,
+    		message= JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.message')),
-							deliveryName,
+    		deliveryName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryName')),
-							address,
+    		address = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.address')),
-							deliveryPhone
+    		deliveryPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryPhone'));						
-	)
-		VALUES (JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.catalogueFk')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerName')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.email')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerPhone')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.message')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryName')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.address')),
-				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryPhone'))
-		);
 
 	SELECT LAST_INSERT_ID() orderFk;
 END$$

db/routines/hedera/events/order_doRecalc.sql

@@ -3,6 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `hedera`.`order_doRecalc`
 	ON SCHEDULE EVERY 10 SECOND
 		STARTS '2019-08-29 14:18:04.000'
 	ON COMPLETION PRESERVE
-	ENABLE
+	DISABLE
 DO CALL order_doRecalc$$
 DELIMITER ;

db/routines/hedera/procedures/order_requestRecalc.sql

@@ -10,6 +10,7 @@ proc: BEGIN
 		LEAVE proc;
 	END IF;
 
-	INSERT INTO orderRecalc SET orderFk = vSelf;
+	-- #4409 Disable order recalc
+	-- INSERT INTO orderRecalc SET orderFk = vSelf;
 END$$
 DELIMITER ;

db/routines/util/functions/binlogQueue_getDelay.sql

@@ -0,0 +1,45 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`binlogQueue_getDelay`(vCode VARCHAR(255))
+	RETURNS BIGINT
+	NOT DETERMINISTIC
+BEGIN
+/**
+ * Returns the difference between the current position of the binary log and
+ * the passed queue.
+ *
+ * @param vCode The queue code
+ * @return The difference in MB
+ */
+	DECLARE vCurLogName VARCHAR(255);
+	DECLARE vCurPosition BIGINT;
+	DECLARE vQueueLogName VARCHAR(255);
+	DECLARE vQueuePosition BIGINT;
+	DECLARE vDelay BIGINT;
+
+	SELECT VARIABLE_VALUE INTO vCurLogName
+		FROM information_schema.GLOBAL_STATUS
+		WHERE VARIABLE_NAME = 'BINLOG_SNAPSHOT_FILE';
+
+	SELECT VARIABLE_VALUE INTO vCurPosition
+		FROM information_schema.GLOBAL_STATUS
+		WHERE VARIABLE_NAME = 'BINLOG_SNAPSHOT_POSITION';
+
+	SELECT logName, `position`
+		INTO vQueueLogName, vQueuePosition
+		FROM binlogQueue
+		WHERE code = vCode;
+
+	IF vQueuePosition IS NULL THEN
+		RETURN NULL;
+	END IF;
+
+	SET vDelay =
+		vCurPosition - CAST(vQueuePosition AS SIGNED) +
+		@@max_binlog_size * (
+			CAST(REGEXP_SUBSTR(vCurLogName, '[0-9]+') AS SIGNED) -
+			CAST(REGEXP_SUBSTR(vQueueLogName, '[0-9]+') AS SIGNED)
+		);
+
+	RETURN ROUND(vDelay / POW(1024, 2));
+END$$
+DELIMITER ;

db/routines/util/procedures/slowLog_prune.sql

@@ -6,16 +6,24 @@ BEGIN
  */
 	DECLARE vSlowQueryLog INT DEFAULT @@slow_query_log;
 	DECLARE vSqlLogBin INT DEFAULT @@SESSION.sql_log_bin;
+	DECLARE vLogExists BOOL;
 
 	SET sql_log_bin = OFF;
 	SET GLOBAL slow_query_log = OFF;
 
-	RENAME TABLE `mysql`.`slow_log` TO `mysql`.`slow_log_temp`;
+	SELECT COUNT(*) > 0 INTO vLogExists
+		FROM information_schema.TABLES
+		WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME = 'slow_log';
 
-	DELETE FROM `mysql`.`slow_log_temp`
+	IF vLogExists THEN
+		DROP TEMPORARY TABLE IF EXISTS mysql.slow_log_temp;
+		RENAME TABLE mysql.slow_log TO mysql.slow_log_temp;
+	END IF;
+
+	DELETE FROM mysql.slow_log_temp
 		WHERE start_time < TIMESTAMPADD(WEEK, -1, util.VN_NOW());
 
-	RENAME TABLE `mysql`.`slow_log_temp` TO `mysql`.`slow_log`;
+	RENAME TABLE mysql.slow_log_temp TO mysql.slow_log;
 
 	SET GLOBAL slow_query_log = vSlowQueryLog;
 	SET sql_log_bin = vSqlLogBin;

db/routines/vn/events/raidUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn2008`.`raidUpdate`
+CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`raidUpdate`
 	ON SCHEDULE EVERY 1 DAY
 		STARTS '2017-12-29 00:05:00.000'
 	ON COMPLETION PRESERVE

db/routines/vn/procedures/catalog_componentCalculate.sql

@@ -48,7 +48,7 @@ BEGIN
 			IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate3, b.price3)),IFNULL(pf.rate3, b.price3)) rate3,
 			IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing,
 			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
-			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
+			b.groupingMode groupingMode,
 			tl.buyFk,
 			i.typeFk,
 			IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
@@ -252,14 +252,15 @@ BEGIN
 		SELECT tcc.warehouseFk,
 				tcc.itemFk,
 				1 rate,
-				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`,
+				IF(tcc.groupingMode = 'grouping', tcc.`grouping`, 1) `grouping`,
 				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
 				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
 			FROM tmp.ticketComponentCalculate tcc
 				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
 					AND tcs.warehouseFk = tcc.warehouseFk
 			WHERE IFNULL(tcs.classRate, 1) = 1
-				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
+				AND NOT tcc.groupingMode = 'packing'
+				AND (tcc.packing > tcc.`grouping` OR tcc.groupingMode IS NULL)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
 
 	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)

db/routines/vn/procedures/client_getDebt.sql

@@ -17,15 +17,15 @@ BEGIN
 
 	SET vEnded = util.dayEnd(IFNULL(vDate, util.VN_CURDATE()));
 
-    CREATE OR REPLACE TEMPORARY TABLE tClientRisk
+	CREATE OR REPLACE TEMPORARY TABLE tClientRisk
 		ENGINE = MEMORY
-        SELECT cr.clientFk, SUM(cr.amount) amount
+		SELECT cr.clientFk, SUM(cr.amount) amount
 			FROM clientRisk cr
 				JOIN tmp.clientGetDebt c ON c.clientFk = cr.clientFk
 			GROUP BY cr.clientFk;
 
 	INSERT INTO tClientRisk
-        SELECT c.clientFk, SUM(r.amountPaid)
+		SELECT c.clientFk, SUM(r.amountPaid)
 			FROM receipt r
 				JOIN tmp.clientGetDebt c ON c.clientFk = r.clientFk
 			WHERE r.payed > vEnded

db/routines/vn/procedures/client_getRisk.sql

@@ -0,0 +1,35 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_getRisk`(
+	vDate DATE
+)
+BEGIN
+/**
+ * Retorna el riesgo de los clientes activos.
+ *
+ * @param vDate Fecha a calcular
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.clientGetDebt
+		(PRIMARY KEY (clientFk))
+		ENGINE = MEMORY
+		SELECT id clientFk
+			FROM client
+			WHERE isActive;
+
+	CALL client_getDebt(vDate);
+
+	SELECT c.socialName,
+			r.clientFk,
+			c.credit,
+			CAST(r.risk AS DECIMAL (10,2)) risk,
+			CAST(c.credit - r.risk AS DECIMAL (10,2)) difference,
+			co.country
+		FROM client c
+			JOIN tmp.risk r ON r.clientFk = c.id
+			JOIN country co ON co.id = c.countryFk
+		GROUP BY c.id;
+
+	DROP TEMPORARY TABLE
+		tmp.risk,
+		tmp.clientGetDebt;
+END$$
+DELIMITER ;

db/routines/vn/procedures/collectionPlacement_get.sql

@@ -40,8 +40,8 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT b.itemFk,
 				CASE b.groupingMode
-					WHEN 0 THEN 1
+					WHEN NULL THEN 1
-					WHEN 2 THEN b.packing
+					WHEN 'packing' THEN b.packing
 					ELSE b.`grouping`
 				END `grouping`
 			FROM buy b

db/routines/vn/procedures/collection_assign.sql

@@ -13,11 +13,16 @@ proc:BEGIN
  * @param vCollectionFk Id de colección
  */
 	DECLARE vHasTooMuchCollections BOOL;
+	DECLARE vItemPackingTypeFk VARCHAR(1);
+	DECLARE vWarehouseFk INT;
+	DECLARE vLockName VARCHAR(215);
 	DECLARE vLockTime INT DEFAULT 15;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		DO RELEASE_LOCK('collection_assign');
+		IF vLockName IS NOT NULL THEN
+			DO RELEASE_LOCK(vLockName);
+		END IF;
 		
 		RESIGNAL;
 	END;
@@ -28,7 +33,7 @@ proc:BEGIN
 	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
 		INTO vHasTooMuchCollections
 		FROM tCollection
-			JOIN productionConfig pc ;
+			JOIN productionConfig pc;
 
 	DROP TEMPORARY TABLE tCollection;
 
@@ -37,7 +42,18 @@ proc:BEGIN
 		LEAVE proc;
 	END IF;
 
-	IF NOT GET_LOCK('collection_assign',vLockTime) THEN
+	SELECT warehouseFk, itemPackingTypeFk
+		INTO vWarehouseFk, vItemPackingTypeFk
+		FROM operator
+		WHERE workerFk = vUserFk;
+
+	SET vLockName = CONCAT_WS('/',
+		'collection_assign',
+		vWarehouseFk,
+		vItemPackingTypeFk
+	);
+
+	IF NOT GET_LOCK(vLockName, vLockTime) THEN
 		LEAVE proc;
 	END IF;
 
@@ -90,6 +106,6 @@ proc:BEGIN
 		SET workerFk = vUserFk
 		WHERE id = vCollectionFk;
 
-	DO RELEASE_LOCK('collection_assign');
+	DO RELEASE_LOCK(vLockName);
 END$$
 DELIMITER ;

db/routines/vn/procedures/company_getSuppliersDebt.sql

@@ -7,195 +7,195 @@ BEGIN
  * @param vSelf company id
  * @param vMonthAgo time interval to be consulted
  */
-    DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE());
+	DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE());
-    DECLARE vCurrencyEuroFk INT;
+	DECLARE vCurrencyEuroFk INT;
-    DECLARE vStartDate DATE;
+	DECLARE vStartDate DATE;
-    DECLARE vInvalidBalances DOUBLE;
+	DECLARE vInvalidBalances DOUBLE;
 
-    SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances  FROM supplierDebtConfig;
+	SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances  FROM supplierDebtConfig;
-    SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR';
+	SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR';
 
-    DROP TEMPORARY TABLE IF EXISTS tOpeningBalances;
+	DROP TEMPORARY TABLE IF EXISTS tOpeningBalances;
-    CREATE TEMPORARY TABLE tOpeningBalances (
+	CREATE TEMPORARY TABLE tOpeningBalances (
-        supplierFk INT NOT NULL,
+		supplierFk INT NOT NULL,
-        companyFk INT NOT NULL,
+		companyFk INT NOT NULL,
-        openingBalances DOUBLE NOT NULL,
+		openingBalances DOUBLE NOT NULL,
-        closingBalances DOUBLE NOT NULL,
+		closingBalances DOUBLE NOT NULL,
-        currencyFk INT NOT NULL,
+		currencyFk INT NOT NULL,
-        PRIMARY KEY (supplierFk, companyFk, currencyFk)
+		PRIMARY KEY (supplierFk, companyFk, currencyFk)
-    ) ENGINE = MEMORY;
+	) ENGINE = MEMORY;
 
-    -- Calculates the opening and closing balance for each supplier
+	-- Calculates the opening and closing balance for each supplier
-    INSERT INTO tOpeningBalances
+	INSERT INTO tOpeningBalances
-        SELECT supplierFk,
+		SELECT supplierFk,
-            companyFk,
+			companyFk,
-            SUM(amount * isBeforeStarting) AS openingBalances,
+			SUM(amount * isBeforeStarting) AS openingBalances,
-            SUM(amount) closingBalances,
+			SUM(amount) closingBalances,
-            currencyFk
+			currencyFk
-            FROM (
+			FROM (
-                SELECT p.supplierFk,
+				SELECT p.supplierFk,
-                        p.companyFk,
+						p.companyFk,
-                        IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
+						IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
-                        p.dueDated < vStartingDate isBeforeStarting,
+						p.dueDated < vStartingDate isBeforeStarting,
-                        p.currencyFk
+						p.currencyFk
-                    FROM payment p
+					FROM payment p
-                    WHERE p.received > vStartDate
+					WHERE p.received > vStartDate
-                        AND p.companyFk = vSelf
+						AND p.companyFk = vSelf
-                    UNION ALL
+					UNION ALL
-                SELECT r.supplierFk,
+				SELECT r.supplierFk,
-                        r.companyFk,
+						r.companyFk,
-                        - IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
+						- IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
-                        rv.dueDated < vStartingDate isBeforeStarting,
+						rv.dueDated < vStartingDate isBeforeStarting,
-                        r.currencyFk
+						r.currencyFk
-                    FROM invoiceIn r
+					FROM invoiceIn r
-                        INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
+						INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
-                    WHERE r.issued > vStartDate
+					WHERE r.issued > vStartDate
-                        AND r.isBooked
+						AND r.isBooked
-                        AND r.companyFk = vSelf
+						AND r.companyFk = vSelf
-            ) sub GROUP BY companyFk, supplierFk, currencyFk;
+			) sub GROUP BY companyFk, supplierFk, currencyFk;
 
-    DROP TEMPORARY TABLE IF EXISTS tPendingDuedates;
+	DROP TEMPORARY TABLE IF EXISTS tPendingDuedates;
-    CREATE TEMPORARY TABLE tPendingDuedates (
+	CREATE TEMPORARY TABLE tPendingDuedates (
-        id INT auto_increment,
+		id INT auto_increment,
-        expirationId INT,
+		expirationId INT,
-        dated DATE,
+		dated DATE,
-        supplierFk INT NOT NULL,
+		supplierFk INT NOT NULL,
-        companyFk INT NOT NULL,
+		companyFk INT NOT NULL,
-        amount DECIMAL(10, 2) NOT NULL,
+		amount DECIMAL(10, 2) NOT NULL,
-        currencyFk INT NOT NULL,
+		currencyFk INT NOT NULL,
-        pending DECIMAL(10, 2) DEFAULT 0,
+		pending DECIMAL(10, 2) DEFAULT 0,
-        balance DECIMAL(10, 2) DEFAULT 0,
+		balance DECIMAL(10, 2) DEFAULT 0,
-        endingBalance DECIMAL(10, 2) DEFAULT 0,
+		endingBalance DECIMAL(10, 2) DEFAULT 0,
-        isPayment BOOLEAN,
+		isPayment BOOLEAN,
-        isReconciled BOOLEAN,
+		isReconciled BOOLEAN,
-        PRIMARY KEY (id),
+		PRIMARY KEY (id),
-        INDEX (supplierFk, companyFk, currencyFk)
+		INDEX (supplierFk, companyFk, currencyFk)
-    ) ENGINE = MEMORY;
+	) ENGINE = MEMORY;
 
-    INSERT INTO tPendingDuedates (
+	INSERT INTO tPendingDuedates (
-        expirationId,
+		expirationId,
-        dated,
+		dated,
-        supplierFk,
+		supplierFk,
-        companyFk,
+		companyFk,
-        amount,
+		amount,
-        currencyFk,
+		currencyFk,
-        isPayment,
+		isPayment,
-        isReconciled
+		isReconciled
-    )SELECT p.id,
+	)SELECT p.id,
-            p.dueDated,
+			p.dueDated,
-            p.supplierFk,
+			p.supplierFk,
-            p.companyFk,
+			p.companyFk,
-            IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa),
+			IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa),
-            p.currencyFk,
+			p.currencyFk,
-            TRUE isPayment,
+			TRUE isPayment,
-            p.isConciliated
+			p.isConciliated
-        FROM payment p
+		FROM payment p
-        WHERE p.dueDated >= vStartingDate
+		WHERE p.dueDated >= vStartingDate
-            AND p.companyFk = vSelf
+			AND p.companyFk = vSelf
-    UNION ALL
+	UNION ALL
-    SELECT r.id,
+	SELECT r.id,
-            rv.dueDated,
+			rv.dueDated,
-            r.supplierFk,
+			r.supplierFk,
-            r.companyFk,
+			r.companyFk,
-            -IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
+			-IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
-            r.currencyFk,
+			r.currencyFk,
-            FALSE isPayment,
+			FALSE isPayment,
-            TRUE
+			TRUE
-        FROM invoiceIn r
+		FROM invoiceIn r
-            LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
+			LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
-                AND r.supplierFk = si.supplierFk
+				AND r.supplierFk = si.supplierFk
-                AND r.currencyFk = si.currencyFk
+				AND r.currencyFk = si.currencyFk
-            JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
+			JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
-        WHERE rv.dueDated >= vStartingDate
+		WHERE rv.dueDated >= vStartingDate
-            AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
+			AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
-            AND r.isBooked
+			AND r.isBooked
-            AND r.companyFk = vSelf
+			AND r.companyFk = vSelf
-        ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id;
+		ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id;
-    -- Now, we calculate the outstanding amount for each receipt in descending order
+	-- Now, we calculate the outstanding amount for each receipt in descending order
-    SET @risk := 0.0;
+	SET @risk := 0.0;
-    SET @supplier := 0.0;
+	SET @supplier := 0.0;
-    SET @company := 0.0;
+	SET @company := 0.0;
-    SET @moneda := 0.0;
+	SET @moneda := 0.0;
-    SET @pending := 0.0;
+	SET @pending := 0.0;
-    SET @day := util.VN_CURDATE();
+	SET @day := util.VN_CURDATE();
 
-    UPDATE tPendingDuedates vp
+	UPDATE tPendingDuedates vp
-        LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk
+		LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk
-            AND vp.supplierFk = si.supplierFk
+			AND vp.supplierFk = si.supplierFk
-            AND vp.currencyFk = si.currencyFk
+			AND vp.currencyFk = si.currencyFk
-        SET vp.balance = @risk := (
+		SET vp.balance = @risk := (
-            IF (
+			IF (
-                @company <> vp.companyFk
+				@company <> vp.companyFk
-                OR @supplier <> vp.supplierFk
+				OR @supplier <> vp.supplierFk
-                OR @moneda <> vp.currencyFk,
+				OR @moneda <> vp.currencyFk,
-                IFNULL(si.openingBalances, 0),
+				IFNULL(si.openingBalances, 0),
-                @risk
+				@risk
-                ) +
+				) +
-            vp.amount
+			vp.amount
-        ),
+		),
-        -- if there is a change of company or supplier or currency, the balance is reset
+		-- if there is a change of company or supplier or currency, the balance is reset
-        vp.pending = @pending := IF (
+		vp.pending = @pending := IF (
-            @company <> vp.companyFk
+			@company <> vp.companyFk
-            OR @supplier <> vp.supplierFk
+			OR @supplier <> vp.supplierFk
-            OR @moneda <> vp.currencyFk
+			OR @moneda <> vp.currencyFk
-            OR @day <> vp.dated,
+			OR @day <> vp.dated,
-            vp.amount * (NOT vp.isPayment),
+			vp.amount * (NOT vp.isPayment),
-            @pending + vp.amount
+			@pending + vp.amount
-        ),
+		),
-        vp.companyFk = @company := vp.companyFk,
+		vp.companyFk = @company := vp.companyFk,
-        vp.supplierFk = @supplier := vp.supplierFk,
+		vp.supplierFk = @supplier := vp.supplierFk,
-        vp.currencyFk = @moneda := vp.currencyFk,
+		vp.currencyFk = @moneda := vp.currencyFk,
-        vp.dated = @day := vp.dated,
+		vp.dated = @day := vp.dated,
-        vp.balance = @risk,
+		vp.balance = @risk,
-        vp.pending = @pending;
+		vp.pending = @pending;
 
-    CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY
+	CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY
-        SELECT expirationId,
+		SELECT expirationId,
-            dated,
+			dated,
-            supplierFk,
+			supplierFk,
-            companyFk,
+			companyFk,
-            currencyFk,
+			currencyFk,
-            balance
+			balance
-        FROM tPendingDuedates
+		FROM tPendingDuedates
-        WHERE balance < vInvalidBalances
+		WHERE balance < vInvalidBalances
-            AND balance > - vInvalidBalances;
+			AND balance > - vInvalidBalances;
 
-    DELETE vp.*
+	DELETE vp.*
-        FROM tPendingDuedates vp
+		FROM tPendingDuedates vp
-            JOIN tRowsToDelete rd ON (
+			JOIN tRowsToDelete rd ON (
-                vp.dated < rd.dated
+				vp.dated < rd.dated
-                OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId)
+				OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId)
-            )
+			)
-            AND vp.supplierFk = rd.supplierFk
+			AND vp.supplierFk = rd.supplierFk
-            AND vp.companyFk = rd.companyFk
+			AND vp.companyFk = rd.companyFk
-            AND vp.currencyFk = rd.currencyFk
+			AND vp.currencyFk = rd.currencyFk
-        WHERE NOT vp.isPayment;
+		WHERE NOT vp.isPayment;
 
-    SELECT vp.expirationId,
+	SELECT vp.expirationId,
-            vp.dated,
+			vp.dated,
-            vp.supplierFk,
+			vp.supplierFk,
-            vp.companyFk,
+			vp.companyFk,
-            vp.currencyFk,
+			vp.currencyFk,
-            vp.amount,
+			vp.amount,
-            vp.pending,
+			vp.pending,
-            vp.balance,
+			vp.balance,
-            s.payMethodFk,
+			s.payMethodFk,
-            vp.isPayment,
+			vp.isPayment,
-            vp.isReconciled,
+			vp.isReconciled,
-            vp.endingBalance,
+			vp.endingBalance,
-            cr.amount clientRiskAmount,
+			cr.amount clientRiskAmount,
-            co.CEE
+			co.CEE
-        FROM tPendingDuedates vp
+		FROM tPendingDuedates vp
-            LEFT JOIN supplier s ON s.id = vp.supplierFk
+			LEFT JOIN supplier s ON s.id = vp.supplierFk
-            LEFT JOIN client c ON c.fi = s.nif
+			LEFT JOIN client c ON c.fi = s.nif
-            LEFT JOIN clientRisk cr ON cr.clientFk = c.id
+			JOIN clientRisk cr ON cr.clientFk = c.id 
-            LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
+				AND cr.companyFk = vp.companyFk
-            LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
+			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
-            LEFT JOIN country co ON co.id = be.countryFk
+			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
-                AND cr.companyFk = vp.companyFk;
+			LEFT JOIN country co ON co.id = be.countryFk;
 
-    DROP TEMPORARY TABLE tOpeningBalances;
+	DROP TEMPORARY TABLE tOpeningBalances;
-    DROP TEMPORARY TABLE tPendingDuedates;
+	DROP TEMPORARY TABLE tPendingDuedates;
-    DROP TEMPORARY TABLE tRowsToDelete;
+	DROP TEMPORARY TABLE tRowsToDelete;
 END$$
 DELIMITER ;

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -1,42 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`creditInsurance_getRisk`()
-BEGIN
-/**
- * Devuelve el riesgo de los clientes que estan asegurados
- */
-	CREATE OR REPLACE TEMPORARY TABLE tmp.client_list
-	    (PRIMARY KEY (Id_Cliente))
-	    ENGINE = MEMORY
-	        SELECT * FROM (
-	                SELECT cc.client Id_Cliente, ci.grade
-	                    FROM creditClassification cc
-	                        JOIN creditInsurance ci ON cc.id = ci.creditClassification
-	                    WHERE dateEnd IS NULL
-	                ORDER BY ci.creationDate DESC
-	                LIMIT 10000000000000000000) t1
-	            GROUP BY Id_Cliente;
-
-	CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
-
-	SELECT
-	        c.id,
-	        c.name,
-	        c.credit clientCredit,
-	        c.creditInsurance solunion,
-	        CAST(r.risk AS DECIMAL(10,0)) risk,
-	        CAST(c.creditInsurance - r.risk AS DECIMAL(10,0)) riskAlive,
-	        cac.invoiced billedAnnually,
-	        c.dueDay,
-	        ci.grade,
-	        c2.country
-	    FROM tmp.client_list ci
-	        LEFT JOIN tmp.risk r ON r.Id_Cliente = ci.Id_Cliente
-	        JOIN client c ON c.id = ci.Id_Cliente
-	        JOIN bs.clientAnnualConsumption cac ON c.id = cac.clientFk
-	        JOIN country c2 ON c2.id = c.countryFk
-	    GROUP BY c.id;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-END$$
-DELIMITER ;

db/routines/vn/procedures/creditRecovery.sql

@@ -0,0 +1,54 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`creditRecovery`()
+BEGIN
+/**
+ * Actualiza el crédito de los clientes 
+ */
+
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	START TRANSACTION;
+
+	UPDATE `client` c
+			JOIN payMethod pm ON pm.id = c.payMethodFk
+		SET c.credit = 0
+		WHERE pm.`code` = 'card';
+
+	DROP TEMPORARY TABLE IF EXISTS tCreditClients;
+	CREATE TEMPORARY TABLE tCreditClients
+		SELECT clientFk, IF(credit > recovery, credit - recovery, 0) newCredit
+			FROM (
+				SELECT r.clientFk,
+					r.amount recovery,
+					(sub2.created + INTERVAL r.period DAY) deadLine,
+					sub2.amount credit
+					FROM recovery r
+						JOIN (
+							SELECT clientFk, amount, created
+								FROM (
+									SELECT clientFk, amount, created
+										FROM clientCredit
+										ORDER BY created DESC
+										LIMIT 10000000000000000000
+								) sub
+							GROUP BY clientFk
+						) sub2 ON sub2.clientFk = r.clientFk
+					WHERE r.finished IS NULL OR r.finished >= util.VN_CURDATE()
+					GROUP BY r.clientFk
+					HAVING deadLine <= util.VN_CURDATE()
+			) sub3
+			WHERE credit > 0;
+
+	UPDATE client c
+			JOIN tCreditClients cc ON cc.clientFk = c.id
+		SET c.credit = newCredit;
+	
+	DROP TEMPORARY TABLE tCreditClients;
+	COMMIT;
+
+END$$
+DELIMITER ;

db/routines/vn/procedures/inventoryMake.sql

@@ -116,7 +116,7 @@ BEGIN
 			freightValue decimal(10,3) DEFAULT '0.000',
 			packing int(11) DEFAULT '1',
 			`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
-			groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
+			groupingMode enum('grouping', 'packing') DEFAULT NULL,
 			comissionValue decimal(10,3) DEFAULT '0.000',
 			packageValue decimal(10,3) DEFAULT '0.000',
 			packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
@@ -232,8 +232,6 @@ BEGIN
 	CLOSE cWarehouses;
 
 	UPDATE config SET inventoried = vInventoryDate;
-
-	SET @isModeInventory := FALSE;
 	
 	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		(INDEX(entryId)) ENGINE = MEMORY
@@ -262,6 +260,8 @@ BEGIN
 		FROM travel t
 			JOIN tEntryToDelete tmp ON tmp.travelId = t.id;
 
+	SET @isModeInventory := FALSE;
+
 	DROP TEMPORARY TABLE IF EXISTS tEntryToDelete;
 
 	COMMIT;

db/routines/vn/procedures/invoiceInTax_afterUpsert.sql

@@ -10,6 +10,8 @@ BEGIN
 	DECLARE vLines INT;
 	DECLARE vHasDistinctTransactions INT;
 
+	CALL invoiceIn_checkBooked(vInvoiceInFk);
+
 	SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
 	
 	SELECT COUNT(*) INTO vLines

db/routines/vn/procedures/invoiceInTax_getFromEntries.sql

@@ -4,16 +4,9 @@ BEGIN
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
 	DECLARE vExpenseFk VARCHAR(10);
-	DECLARE vIsBooked BOOLEAN DEFAULT FALSE;
 
-	SELECT isBooked INTO vIsBooked  
+	CALL invoiceIn_checkBooked(vInvoiceInFk);
-		FROM invoiceIn ii 
-		WHERE id = vInvoiceInFk;
 
-	IF vIsBooked THEN 
-		CALL util.throw('A booked invoice cannot be modified');
-	END IF;
-	
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr
 			JOIN invoiceIn ii ON ii.id = vInvoiceInFk

db/routines/vn/procedures/invoiceIn_checkBooked.sql

@@ -0,0 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceIn_checkBooked`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Comprueba si una factura recibida está contabilizada,
+ * y si lo está retorna un throw.
+ *
+ * @param vSelf Id invoiceIn
+ */
+	DECLARE vIsBooked BOOL;
+
+	SELECT isBooked INTO vIsBooked
+		FROM invoiceIn
+		WHERE id = vSelf;
+
+	IF vIsBooked THEN
+		CALL util.throw('InvoiceIn is already booked');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/item_getSimilar.sql

@@ -61,8 +61,8 @@ BEGIN
 			a.available,
 			IFNULL(ip.counter, 0) `counter`,
 			CASE
-				WHEN b.groupingMode = 1 THEN b.grouping
+				WHEN b.groupingMode = 'grouping' THEN b.grouping
-				WHEN b.groupingMode = 2 THEN b.packing
+				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
 			END AS minQuantity,
 			iss.visible located

db/routines/vn/procedures/item_setVisibleDiscard.sql

@@ -13,6 +13,7 @@ BEGIN
  * @param vQuantity a dar de alta/baja
  * @param vAddressFk id address
  */
+
 	DECLARE vTicketFk INT;
 	DECLARE vClientFk INT;
 	DECLARE vDefaultCompanyFk INT;
@@ -23,17 +24,17 @@ BEGIN
 
 	SELECT DEFAULT(companyFk)  INTO vDefaultCompanyFk
 		FROM vn.ticket LIMIT 1;
-	
+
-	IF vAddressFk IS NULL THEN 
+	IF vAddressFk IS NULL THEN
 		SELECT pc.shortageAddressFk INTO vAddressShortage
 			FROM productionConfig pc ;
-	ELSE 
+	ELSE
 		SET vAddressShortage = vAddressFk;
 	END IF;
 
 	SELECT a.clientFk INTO vClientFk
 		FROM address a
-		WHERE a.id = vAddressFk;
+		WHERE a.id = vAddressShortage;
 
 	SELECT t.id INTO vTicketFk
 		FROM ticket t
@@ -65,7 +66,7 @@ BEGIN
 	INSERT INTO sale(ticketFk, itemFk, concept, quantity)
 		SELECT vTicketFk,
 				vItemFk,
-				CONCAT(longName,' ', worker_getCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+				name,
 				vQuantity
 			FROM item
 			WHERE id = vItemFk;

db/routines/vn/procedures/raidUpdate.sql

@@ -0,0 +1,31 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`raidUpdate`()
+BEGIN
+/**
+ * Actualiza el travel de las entradas de redadas
+ */
+	UPDATE entry e
+		JOIN entryVirtual ev ON ev.entryFk = e.id
+		JOIN travel t ON t.id = e.travelFk
+		JOIN (
+			SELECT *
+				FROM (
+					SELECT t.id, t.landed, tt.warehouseInFk, tt.warehouseOutFk
+						FROM travel t
+							JOIN (
+								SELECT t.warehouseInFk, t.warehouseOutFk
+									FROM entryVirtual ev
+										JOIN entry e ON e.id = ev.entryFk
+										JOIN travel t ON t.id = e.travelFk
+									GROUP BY t.warehouseInFk, t.warehouseOutFk
+							) tt ON t.warehouseInFk = tt.warehouseInFk AND t.warehouseOutFk = tt.warehouseOutFk
+						WHERE shipped > util.VN_CURDATE() AND NOT isDelivered
+						ORDER BY t.landed
+						LIMIT 10000000000000000000
+				) t
+				GROUP BY t.warehouseInFk, t.warehouseOutFk
+		) tt ON t.warehouseInFk = tt.warehouseInFk AND t.warehouseOutFk = tt.warehouseOutFk
+		SET e.travelFk = t.id;
+
+END$$
+DELIMITER ;

db/routines/vn/procedures/rateView.sql

@@ -0,0 +1,38 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`rateView`()
+BEGIN
+/**
+ * Muestra información sobre tasas de cambio de Dolares
+ */
+	SELECT
+			t.year año,
+			t.month mes,
+			pay.dollars dolares,
+			pay.changePractical cambioPractico,
+			CAST(SUM(iit.foreignValue ) / SUM(iit.taxableBase) AS DECIMAL(5,4))cambioTeorico,
+			pay.changeOfficial cambioOficial
+		FROM invoiceIn ii
+			JOIN time t ON t.dated = ii.issued
+			JOIN invoiceInTax iit ON ii.id = iit.invoiceInFk
+			JOIN
+			(	SELECT
+						t.year,
+						t.month,
+						CAST(SUM(p.divisa) AS DECIMAL(10,2)) dollars,
+						CAST(SUM(p.divisa) / SUM(p.amount) AS DECIMAL(5,4)) changePractical,
+						CAST(rr.value * 0.998 AS DECIMAL(5,4)) changeOfficial
+					FROM payment p
+						JOIN time t ON t.dated = p.received
+						JOIN referenceRate rr ON rr.dated = p.received
+						JOIN currency c ON c.id = rr.currencyFk
+					WHERE p.divisa
+						AND c.code = 'USD'
+					GROUP BY t.year, t.month
+			) pay ON t.year = pay.year AND t.month = pay.month
+			JOIN currency c ON c.id = ii.currencyFk
+		WHERE c.code = 'USD'
+			AND iit.foreignValue
+			AND iit.taxableBase
+		GROUP BY t.year, t.month;
+END$$
+DELIMITER ;

db/routines/vn/procedures/riskAllClients.sql

@@ -1,29 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`riskAllClients`(maxRiskDate DATE)
-BEGIN
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-    CREATE TEMPORARY TABLE tmp.client_list
-    (PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT id Id_Cliente, null grade FROM vn.client;
-    
-    CALL vn2008.risk_vs_client_list(maxRiskDate);
-    
-	SELECT 
-		c.RazonSocial,
-        c.Id_Cliente,
-        c.Credito,
-        CAST(r.risk as DECIMAL (10,2)) risk,
-        CAST(c.Credito - r.risk as DECIMAL (10,2)) Diferencia,
-        c.Id_Pais
-	FROM
-		vn2008.Clientes c
-			JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente
-			JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
-		GROUP BY c.Id_cliente;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-    DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_replaceItem.sql

@@ -13,7 +13,7 @@ BEGIN
 	DECLARE vWarehouseFk SMALLINT;
 	DECLARE vDate DATE;
 	DECLARE vGrouping INT;
-	DECLARE vGroupingModeFk INT;
+	DECLARE vGroupingMode VARCHAR(255);
 	DECLARE vPacking INT;
 	DECLARE vRoundQuantity INT DEFAULT 1;
 	DECLARE vLanded DATE;
@@ -23,8 +23,6 @@ BEGIN
 	DECLARE vOldPrice DECIMAL(10,2);
 	DECLARE vOption VARCHAR(255);
 	DECLARE vNewSaleFk INT;
-	DECLARE vForceToGrouping INT DEFAULT 1;
-	DECLARE vForceToPacking INT DEFAULT 2;
 	DECLARE vFinalPrice DECIMAL(10,2);
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
@@ -58,15 +56,15 @@ BEGIN
 	CALL buyUltimate(vWarehouseFk, vDate);
 
 	SELECT `grouping`, groupingMode, packing
-		INTO vGrouping,vGroupingModeFk,vPacking
+		INTO vGrouping,vGroupingMode,vPacking
 		FROM buy b
 			JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
 		WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
 
-	IF vGroupingModeFk = vForceToPacking AND vPacking > 0 THEN
+	IF vGroupingMode = 'packing' AND vPacking > 0 THEN
 		SET vRoundQuantity = vPacking;
 	END IF;
-	IF  vGroupingModeFk = vForceToGrouping AND vGrouping > 0 THEN
+	IF  vGroupingMode = 'grouping' AND vGrouping > 0 THEN
 		SET vRoundQuantity = vGrouping;
 	END IF;
 
@@ -81,10 +79,6 @@ BEGIN
 		ORDER BY (vQuantity % `grouping`) ASC
 		LIMIT 1;
 
-	IF vNewPrice IS NULL THEN
-		CALL util.throw('price retrieval failed');
-	END IF;
-
 	IF vNewPrice > vOldPrice THEN
 		SET vFinalPrice = vOldPrice;
 		SET vOption = 'substitution';

db/routines/vn/procedures/ticket_doCmr.sql

@@ -1,5 +1,5 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
 BEGIN
 /**
 * Crea u actualiza la información del CMR asociado con
@@ -29,7 +29,6 @@ BEGIN
 				JOIN province p ON p.id = a.provinceFk
 				JOIN country co ON co.id = p.countryFk
 				JOIN agencyMode am ON am.id = t.agencyModeFk
-				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 				JOIN company com ON com.id = t.companyFk
 				JOIN client c2 ON c2.id = com.clientFk
@@ -38,12 +37,10 @@ BEGIN
 				LEFT JOIN route r ON r.id = t.routeFk
 				LEFT JOIN worker wo ON wo.id = r.workerFk
 				LEFT JOIN vehicle v ON v.id = r.vehicleFk
-			WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
+			WHERE al.code IN ('PACKED', 'DELIVERED')
-				AND al.code IN ('PACKED', 'DELIVERED')
 				AND co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
-				AND dm.code = 'DELIVERY'
 				AND t.id = vSelf
 			GROUP BY t.id;
 	
@@ -85,5 +82,5 @@ BEGIN
 
 	COMMIT;
 	DROP TEMPORARY TABLE tTicket;
-END$$
+END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/accountReconciliation_beforeInsert.sql

@@ -3,13 +3,13 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`accountReconciliation
 	BEFORE INSERT ON `accountReconciliation`
 	FOR EACH ROW
 
-	SET NEW.calculatedCode = REPLACE(
+	SET NEW.calculatedCode = REGEXP_REPLACE(
-							REPLACE(
+		CONCAT(NEW.supplierAccountFk, 
-								REPLACE(
+			NEW.operationDated, 
-									REPLACE(
+			NEW.amount, 
-											CONCAT(NEW.supplierAccountFk,NEW.operationDated,NEW.amount,NEW.concept,NEW.debitCredit)
+			NEW.concept, 
-											,' ','')
+			CAST(NEW.debitCredit AS UNSIGNED)
-										,":",'')
+		),
-									,'-','')
+		'[ :\\-.]', ''
-								,'.','')$$
+	)$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/buy_beforeInsert.sql

@@ -6,7 +6,7 @@ trig: BEGIN
 	DECLARE vWarehouse INT;
 	DECLARE vLanding DATE;
 	DECLARE vGrouping INT;
-	DECLARE vGroupingMode TINYINT;
+	DECLARE vGroupingMode VARCHAR(255);
 	DECLARE vGenericFk INT;
 	DECLARE vGenericInDate BOOL;
 	DECLARE vBuyerFk INT;

db/routines/vn/triggers/invoiceInCorrection_beforeDelete.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInCorrection_beforeDelete`
+	BEFORE DELETE ON `invoiceInCorrection`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.correctingFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInCorrection_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInCorrection_beforeInsert`
+	BEFORE INSERT ON `invoiceInCorrection`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(NEW.correctingFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInCorrection_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInCorrection_beforeUpdate`
+	BEFORE UPDATE ON `invoiceInCorrection`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.correctingFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInDueDay_beforeDelete.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_beforeDelete`
+	BEFORE DELETE ON `invoiceInDueDay`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInDueDay_beforeInsert.sql

@@ -5,6 +5,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_befor
 BEGIN
 	DECLARE vIsNotified BOOLEAN;
 
+	CALL invoiceIn_checkBooked(NEW.invoiceInFk);
+
 	SET NEW.editorFk = account.myUser_getId();
     
     SELECT isNotified INTO vIsNotified 

db/routines/vn/triggers/invoiceInDueDay_beforeUpdate.sql

@@ -5,6 +5,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_befor
 BEGIN
 	DECLARE vIsNotified BOOLEAN;
 
+	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
 	SET NEW.editorFk = account.myUser_getId();
     
     SELECT isNotified INTO vIsNotified 

db/routines/vn/triggers/invoiceInIntrastat_beforeDelete.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInIntrastat_beforeDelete`
+	BEFORE DELETE ON `invoiceInIntrastat`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInIntrastat_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInIntrastat_beforeInsert`
+	BEFORE INSERT ON `invoiceInIntrastat`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(NEW.invoiceInFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInIntrastat_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInIntrastat_beforeUpdate`
+	BEFORE UPDATE ON `invoiceInIntrastat`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInTax_beforeDelete.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_beforeDelete`
+	BEFORE DELETE ON `invoiceInTax`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceInTax_beforeUpdate.sql

@@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_beforeUp
 	BEFORE UPDATE ON `invoiceInTax`
 	FOR EACH ROW
 BEGIN
+	CALL invoiceIn_checkBooked(OLD.invoiceInFk);
+	
 	IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) THEN 
 		CALL invoiceInTax_afterUpsert(NEW.invoiceInFk);
 	END IF;

db/routines/vn/triggers/invoiceIn_afterUpdate.sql

@@ -3,7 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_afterUpdate
 	AFTER UPDATE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
-
 	IF NEW.issued != OLD.issued    
 		OR NEW.currencyFk != OLD.currencyFk THEN
 

db/routines/vn/triggers/invoiceIn_beforeDelete.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_beforeDelete`
+	BEFORE DELETE ON `invoiceIn`
+	FOR EACH ROW
+BEGIN
+	CALL invoiceIn_checkBooked(OLD.id);
+END$$
+DELIMITER ;

db/routines/vn/triggers/invoiceIn_beforeUpdate.sql

@@ -5,6 +5,10 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_beforeUpdat
 BEGIN
 	DECLARE vWithholdingSageFk INT;
 
+	IF NEW.isBooked = OLD.isBooked THEN
+		CALL invoiceIn_checkBooked(OLD.id);
+	END IF;
+
 	IF NOT (NEW.supplierRef <=> OLD.supplierRef) AND NOT util.checkPrintableChars(NEW.supplierRef) THEN
 		CALL util.throw('The invoiceIn reference contains invalid characters');
 	END IF;

db/routines/vn/views/payrollCenter.sql

@@ -1,12 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`payrollCenter`
-AS SELECT `b`.`cod_centro` AS `codCenter`,
+AS SELECT `b`.`workCenterFkA3` AS `codCenter`,
-	`b`.`Centro` AS `name`,
+	`b`.`companyFkA3` AS `companyCode`
-	`b`.`nss_cotizacion` AS `nss`,
+FROM `vn`.`payrollWorkCenter` `b`
-	`b`.`domicilio` AS `street`,
+
-	`b`.`poblacion` AS `city`,
-	`b`.`cp` AS `postcode`,
-	`b`.`empresa_id` AS `companyFk`,
-	`b`.`codempresa` AS `companyCode`
-FROM `vn2008`.`payroll_centros` `b`

db/routines/vn2008/procedures/raidUpdate.sql

@@ -1,28 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`raidUpdate`()
-BEGIN
-    
-    UPDATE Entradas e
-		JOIN Entradas_Auto ea USING (Id_Entrada)
-        JOIN travel t ON t.id = e.travel_id
-        JOIN (
-			SELECT *
-				FROM (
-					SELECT id, landing, warehouse_id, warehouse_id_out  
-						FROM travel
-							JOIN (
-								SELECT warehouse_id, warehouse_id_out
-									FROM Entradas_Auto ea
-										JOIN Entradas e USING(Id_Entrada)
-										JOIN travel t ON t.id = e.travel_id
-									GROUP BY warehouse_id, warehouse_id_out
-							) t USING (warehouse_id, warehouse_id_out)
-						WHERE shipment > util.VN_CURDATE() AND delivered = FALSE
-						ORDER BY landing
-						LIMIT 10000000000000000000
-				) t  
-				GROUP BY warehouse_id, warehouse_id_out
-		) t USING (warehouse_id, warehouse_id_out)
-        SET e.travel_id = t.id;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/rateView.sql

@@ -1,37 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`rateView`()
-BEGIN
-
-	SELECT 
-			t.year as año,
-			t.month as  mes, 
-			pagos.dolares,
-			pagos.cambioPractico,
-			CAST(sum(divisa) / sum(bi) as DECIMAL(5,4)) as cambioTeorico,
-			pagos.cambioOficial
-		FROM recibida r
-			JOIN time t ON t.date = r.fecha
-			JOIN recibida_iva ri ON r.id = ri.recibida_id
-			JOIN
-			(	
-				SELECT 
-					t.year as Año,
-					t.month as  Mes, 
-					cast(sum(divisa) as DECIMAL(10,2)) as dolares,
-					cast(sum(divisa) / sum(importe) as DECIMAL(5,4)) as cambioPractico,
-					cast(rr.rate * 0.998 as DECIMAL(5,4)) as cambioOficial
-				FROM pago p
-				JOIN time t ON t.date = p.fecha
-				JOIN reference_rate rr ON rr.date = p.fecha AND moneda_id = 2
-				WHERE divisa 
-				AND fecha >= '2015-01-11' 
-				GROUP BY t.year, t.month
-			) pagos ON t.year = pagos.Año AND t.month = pagos.Mes
-		WHERE moneda_id = 2
-			AND fecha >= '2015-01-01'
-			AND divisa 
-			AND bi
-		GROUP BY t.year, t.month;
-
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/recobro_credito.sql

@@ -1,45 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`recobro_credito`()
-BEGIN
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	START TRANSACTION;
-	UPDATE vn.`client` c
-			JOIN vn.payMethod pm ON pm.id = c.payMethodFk
-		SET credit = 0
-			WHERE pm.`code` = 'card';
-
-	DROP TEMPORARY TABLE IF EXISTS clientes_credit;
-	CREATE TEMPORARY TABLE clientes_credit
-		SELECT Id_Cliente, if (Credito > Recobro ,Credito - Recobro,0) AS newCredit
-		FROM (
-			SELECT r.Id_Cliente, r.amount AS Recobro,
-				timestampadd(DAY, period, UltimaFecha) AS Deadline, sub2.amount AS Credito
-				FROM vn2008.recovery r
-					JOIN (
-						SELECT Id_Cliente, amount , odbc_date AS UltimaFecha
-						FROM (
-							SELECT * FROM credit
-								ORDER BY odbc_date DESC
-								LIMIT 10000000000000000000
-						) sub
-						GROUP BY Id_Cliente
-					) sub2 USING(Id_Cliente)
-				WHERE dend IS NULL or dend >= util.VN_CURDATE()
-				GROUP BY Id_Cliente
-					HAVING Deadline <= util.VN_CURDATE()
-		) sub3
-		WHERE Credito > 0;
-
-	UPDATE Clientes
-		JOIN clientes_credit USING(Id_Cliente)
-			SET Clientes.Credito = newCredit;
-	
-	DROP TEMPORARY TABLE clientes_credit;
-	COMMIT;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/risk_vs_client_list.sql

@@ -1,84 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`risk_vs_client_list`(maxRiskDate DATE)
-BEGIN
-/**
- * Calcula el riesgo para los clientes activos de la tabla temporal tmp.client_list
- *
- * @deprecated usar vn.client_getDebt
- * @param maxRiskDate Fecha maxima de los registros
- * @return table tmp.risk
- */
-	DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(util.VN_CURDATE()) - 60, util.VN_CURDATE());
-	DECLARE endingDate DATETIME;
-	DECLARE MAX_RISK_ALLOWED INT DEFAULT 200;
-
-	SET maxRiskDate = IFNULL(maxRiskDate, util.VN_CURDATE());
-	SET endingDate = TIMESTAMP(maxRiskDate, '23:59:59');
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list_2;
-	CREATE TEMPORARY TABLE tmp.client_list_2
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT *
-			FROM tmp.client_list;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list_3;
-	CREATE TEMPORARY TABLE tmp.client_list_3
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT *
-			FROM tmp.client_list;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.tickets_sin_facturar;
-	CREATE TEMPORARY TABLE tmp.tickets_sin_facturar
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-			SELECT t.Id_Cliente, floor(IF(cl.isVies, 1, 1.1) * sum(Cantidad * Preu * (100 - Descuento) / 100)) as total
-			FROM Movimientos m
-				JOIN Tickets t on m.Id_Ticket = t.Id_Ticket
-				JOIN tmp.client_list c on c.Id_Cliente = t.Id_Cliente
-				JOIN vn.client cl ON cl.id = t.Id_Cliente
-			WHERE Factura IS NULL
-				AND Fecha BETWEEN startingDate AND endingDate
-			GROUP BY t.Id_Cliente;      
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-	CREATE TEMPORARY TABLE tmp.risk
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT Id_Cliente, SUM(amount) risk, sum(saldo) saldo
-			FROM Clientes c
-			JOIN (
-				SELECT clientFk, SUM(amount) amount,SUM(amount) saldo 
-					FROM vn.clientRisk
-						JOIN tmp.client_list on Id_Cliente = clientFk
-					GROUP BY clientFk
-				UNION ALL
-				SELECT Id_Cliente, SUM(Entregado),SUM(Entregado)
-					FROM Recibos
-						JOIN tmp.client_list_2 using(Id_Cliente)
-					WHERE  Fechacobro > endingDate
-					GROUP BY Id_Cliente
-				UNION ALL
-				SELECT Id_Cliente, total,0
-					FROM tmp.tickets_sin_facturar
-				UNION ALL
-				SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)), CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2))
-					FROM hedera.tpvTransaction t
-						JOIN tmp.client_list_3 on Id_Cliente = t.clientFk
-					WHERE  t.receiptFk IS NULL
-						AND t.status = 'ok'
-					GROUP BY t.clientFk
-			) t ON c.Id_Cliente = t.clientFk
-			WHERE c.activo != FALSE 
-			GROUP BY c.Id_Cliente;
-			
-	DELETE r.*
-		FROM tmp.risk r
-			JOIN vn2008.Clientes c on c.Id_Cliente = r.Id_Cliente
-			JOIN vn2008.pay_met pm on pm.id = c.pay_met_id
-		WHERE IFNULL(r.saldo,0) < 10
-			AND r.risk <= MAX_RISK_ALLOWED
-			AND pm.`name` = 'TARJETA';
-END$$
-DELIMITER ;

db/routines/vn2008/views/gastos_resumen.sql

@@ -2,6 +2,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn2008`.`gastos_resumen` 
 AS SELECT
+	`es`.`id` AS `id`,
 	`es`.`expenseFk` AS `Id_Gasto`,
 	`es`.`year` AS `year`,
 	`es`.`month` AS `month`,

db/versions/10895-pinkArborvitae/00-firstScript.sql

@@ -0,0 +1,11 @@
+ALTER TABLE `vn`.`packingSite` DROP FOREIGN KEY IF EXISTS `packingSite_FK_4`;
+ALTER TABLE `vn`.`arcRead` DROP FOREIGN KEY IF EXISTS `worker_printer_FK`;
+ALTER TABLE `vn`.`host` DROP FOREIGN KEY IF EXISTS  `configHost_FK`;
+ALTER TABLE `vn`.`operator` DROP FOREIGN KEY IF EXISTS `operator_FK_5`;
+ALTER TABLE `vn`.`packingSite` DROP FOREIGN KEY IF EXISTS `packingSite_FK_1`;
+ALTER TABLE `vn`.`printQueue` DROP FOREIGN KEY IF EXISTS `printQueue_printerFk`;
+ALTER TABLE `vn`.`sector` DROP FOREIGN KEY IF EXISTS `sector_FK_1`;
+ALTER TABLE `vn`.`worker` DROP FOREIGN KEY IF EXISTS `worker_FK`;
+ALTER TABLE dipole.printer DROP FOREIGN KEY IF EXISTS printer_FK;
+ALTER TABLE dipole.expedition_PrintOut DROP FOREIGN KEY IF EXISTS expedition_PrintOut_FK;
+

db/versions/10895-pinkArborvitae/01-secondScript.sql

@@ -0,0 +1,28 @@
+ALTER TABLE `vn`.`printer` MODIFY COLUMN IF EXISTS `id` int unsigned auto_increment NOT NULL;
+
+ALTER TABLE `vn`.`arcRead` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`arcRead` ADD CONSTRAINT `arcRead_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`host` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`host` ADD CONSTRAINT `host_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`operator` MODIFY COLUMN IF EXISTS `labelerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`operator` ADD CONSTRAINT `operator_FK_4` FOREIGN KEY IF NOT EXISTS (labelerFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`packingSite` MODIFY COLUMN  IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`packingSite` ADD CONSTRAINT `packingSite_FK_1` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+
+ALTER TABLE `vn`.`packingSite` MODIFY COLUMN IF EXISTS `printerRfidFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`packingSite` ADD CONSTRAINT `packingSite_FK_4` FOREIGN KEY IF NOT EXISTS(printerRfidFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`printQueue` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`printQueue` ADD CONSTRAINT `printQueue_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`sector` MODIFY COLUMN IF EXISTS `mainPrinterFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`sector` ADD CONSTRAINT `sector_FK` FOREIGN KEY IF NOT EXISTS (mainPrinterFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `dipole`.`printer` MODIFY COLUMN IF EXISTS `id` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `dipole`.`printer` ADD CONSTRAINT `vnPrinter_FK` FOREIGN KEY IF NOT EXISTS (id) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `dipole`.`expedition_PrintOut` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT 0 NOT NULL;
+ALTER TABLE `dipole`.`expedition_PrintOut` ADD CONSTRAINT `expedition_PrintOut_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES printer(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10895-pinkArborvitae/02-thirdScript.sql

@@ -0,0 +1,17 @@
+
+ALTER TABLE `vn`.`productionConfig` ADD IF NOT EXISTS backupPrinterNotificationDelay int unsigned NULL 
+    COMMENT 'Minimum seconds Interval to Prevent Spam from Same-Type Notifications';
+
+ALTER TABLE vn.sector DROP FOREIGN KEY IF EXISTS sector_FK;
+
+ALTER TABLE `vn`.`sector` CHANGE IF EXISTS `mainPrinterFk` `backupPrinterFk` int unsigned DEFAULT NULL NULL;
+
+ALTER TABLE `util`.`notificationSubscription` DROP FOREIGN KEY IF EXISTS `notificationSubscription_ibfk_1`;
+ALTER TABLE `util`.`notificationQueue` DROP FOREIGN KEY IF EXISTS `nnotificationQueue_ibfk_1`;
+ALTER TABLE `util`.`notificationAcl` DROP FOREIGN KEY IF EXISTS `notificationAcl_ibfk_1`;
+
+ALTER TABLE `util`.`notification` MODIFY COLUMN IF EXISTS `id` int(11) auto_increment NOT NULL;
+
+ALTER TABLE `util`.`notificationSubscription` ADD CONSTRAINT `notificationSubscription_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `util`.`notificationQueue` ADD CONSTRAINT `notificationQueue_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `util`.`notificationAcl` ADD CONSTRAINT `notificationAcl_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10895-pinkArborvitae/03-insertBackUpNotification.vn.sql

@@ -0,0 +1,12 @@
+INSERT IGNORE INTO util.notification (name, description)
+	VALUES ('backup-printer-selected','A backup printer has been selected');
+
+INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk) 
+    SELECT id, 10435
+        FROM util.notification
+        WHERE name = 'backup-printer-selected'; 
+
+INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk) 
+    SELECT id, 66
+        FROM util.notification
+        WHERE name = 'backup-printer-selected'; 

db/versions/10944-tealLaurel/00-firstScript.sql

@@ -0,0 +1,8 @@
+REVOKE UPDATE ON vn.entry FROM entryEditor;
+GRANT UPDATE ON vn.entry TO administrative;
+GRANT UPDATE (id, supplierFk, dated, invoiceNumber, isExcludedFromAvailable, 
+	isConfirmed, isOrdered, isRaid,commission, created, evaNotes, travelFk, 
+	currencyFk,companyFk, gestDocFk, invoiceInFk, loadPriority,
+	kop, sub, pro, auction, invoiceAmount, buyerFk, typeFk, reference,
+	observationEditorFk, clonedFrom, editorFk, lockerUserFk, locked
+) ON vn.entry TO entryEditor;

db/versions/10984-navyDendro/00-firstScript.sql

@@ -0,0 +1,4 @@
+-- Place your SQL code here
+UPDATE bs.nightTask SET `schema`='vn' WHERE `procedure`='raidUpdate';
+
+UPDATE bs.nightTask SET `schema`='vn',`procedure`='creditRecovery' WHERE `procedure` ='recobro_credito';

db/versions/10988-blackIvy/00-pbx_prefix.sql

@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS pbx.prefix (
+    country CHAR(2) NOT NULL COMMENT 'Country code',
+    prefix varchar(100) NOT NULL COMMENT 'Country prefix',
+    CONSTRAINT prefix_pk PRIMARY KEY (country)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE pbx.config
+    CHANGE countryPrefix defaultPrefix varchar(20)
+        CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+ALTER TABLE pbx.config DROP COLUMN IF EXISTS sundayFestive;
+
+CREATE TABLE IF NOT EXISTS pbx.holiday (
+	id INT UNSIGNED auto_increment NOT NULL,
+	country CHAR(2) NOT NULL,
+	`day` DATE NOT NULL,
+	CONSTRAINT holiday_pk PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+CREATE UNIQUE INDEX holiday_country_IDX USING BTREE ON pbx.holiday (country,`day`);
+
+ALTER TABLE pbx.schedule
+    CHANGE timeStart startTime time NOT NULL,
+    CHANGE timeEnd endTime time NOT NULL,
+    DROP FOREIGN KEY schedule_ibfk_1,
+    DROP COLUMN queue,
+    ADD country CHAR(2) NOT NULL,
+    CHANGE weekDay weekDays set('mon','tue','wed','thu','fri','sat','sun') NOT NULL
+        COMMENT '0 = Monday, 6 = Sunday';
+

db/versions/10988-blackIvy/01-pbx_prefix.vn.sql

@@ -0,0 +1,13 @@
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('es','0034');
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('fr','0033');
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('pt','00351');
+
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','es');
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','fr');
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','pt');

db/versions/10990-yellowPalmetto/00-firstScript.sql

@@ -0,0 +1,5 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_getRisk`()
+BEGIN
+END;
+
+GRANT EXECUTE ON PROCEDURE vn.client_getRisk TO financialBoss;

db/versions/10994-wheatLaurel/00-modifyAcls.sql

@@ -0,0 +1,4 @@
+UPDATE salix.ACL SET principalId = "hr" WHERE property IN ('find','findById','findOne') AND model = "Worker";
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+	VALUES ('Worker', '__get__summary', 'READ', 'ALLOW', 'ROLE', 'employee');

db/versions/10997-crimsonCyca/00-groupingMode.sql

@@ -0,0 +1,16 @@
+START TRANSACTION;
+
+SET @isTriggerDisabled = TRUE;
+
+ALTER TABLE vn.buy ADD groupingMode2 enum('grouping', 'packing') DEFAULT NULL NULL;
+ALTER TABLE vn.buy CHANGE groupingMode2 groupingMode2 enum('grouping', 'packing') DEFAULT NULL NULL AFTER groupingMode;
+
+UPDATE vn.buy SET groupingMode2 = 'packing' WHERE groupingMode = 2;
+UPDATE vn.buy SET groupingMode2 = 'grouping' WHERE groupingMode = 1;
+
+ALTER TABLE vn.buy DROP COLUMN groupingMode;
+ALTER TABLE vn.buy CHANGE groupingMode2 groupingMode enum('grouping','packing') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+
+SET @isTriggerDisabled = FALSE;
+
+COMMIT;

e2e/paths/03-worker/01_summary.spec.js

@@ -2,7 +2,6 @@ import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
 describe('Worker summary path', () => {
-    const workerId = 3;
     let browser;
     let page;
     beforeAll(async() => {
@@ -10,7 +9,7 @@ describe('Worker summary path', () => {
         page = browser.page;
         await page.loginAndModule('employee', 'worker');
         const httpDataResponse = page.waitForResponse(response => {
-            return response.status() === 200 && response.url().includes(`Workers/${workerId}`);
+            return response.status() === 200 && response.url().includes(`Workers/summary`);
         });
         await page.accessToSearchResult('agencyNick');
         await httpDataResponse;

front/core/services/auth.js

@@ -86,8 +86,7 @@ export default class Auth {
         return this.$http.get('VnUsers/ShareToken', {
             headers: {Authorization: json.data.token}
         }).then(({data}) => {
-            // Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado
+            this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
-            this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
             this.loadAcls().then(() => {
                 let continueHash = this.$state.params.continue;
                 if (continueHash)

front/core/services/token.js

@@ -59,8 +59,7 @@ export default class Token {
 
     getStorage(storage) {
         this.token = storage.getItem('vnToken');
-        // Cambio realizado temporalmente
+        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
-        this.tokenMultimedia = this.token; // storage.getItem('vnTokenMultimedia');
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);

loopback/locale/es.json

@@ -352,5 +352,6 @@
 	"The line could not be marked": "La linea no puede ser marcada",
 	"This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
 	"They're not your subordinate": "No es tu subordinado/a.",
-	"No results found": "No se han encontrado resultados"
+	"No results found": "No se han encontrado resultados",
+	"InvoiceIn is already booked": "La factura recibida está contabilizada"
 }

modules/claim/back/methods/claim/claimPickupPdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:id/claim-pickup-pdf',
             verb: 'GET'
         },
-        //accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');

modules/claim/back/methods/claim/downloadFile.js

@@ -33,7 +33,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        //accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/claim/back/methods/claim/filter.js

@@ -79,7 +79,12 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The claimResponsible id',
                 http: {source: 'query'}
-            }
+            },
+            {
+                arg: 'myTeam',
+                type: 'boolean',
+                description: `Team partners`
+            },
         ],
         returns: {
             type: ['object'],
@@ -92,6 +97,7 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter, options) => {
+        const userId = ctx.req.accessToken.userId;
         const models = Self.app.models;
         const conn = Self.dataSource.connector;
         const args = ctx.args;
@@ -121,7 +127,23 @@ module.exports = Self => {
             claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
         }
 
-        const where = buildFilter(args, (param, value) => {
+        // Apply filter by team
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
+            }, myOptions);
+            const collegues = worker.collegues() || [];
+            for (let collegue of collegues)
+                teamMembersId.push(collegue.collegueFk);
+
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
+
+        const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
@@ -152,6 +174,11 @@ module.exports = Self => {
                 to.setHours(23, 59, 59, 999);
 
                 return {'cl.created': {between: [value, to]}};
+            case 'myTeam':
+                if (value)
+                    return {'cl.workerFk': {inq: teamMembersId}};
+                else
+                    return {'cl.workerFk': {nin: teamMembersId}};
             }
         });
 

modules/claim/back/methods/claim/specs/filter.spec.js

@@ -1,13 +1,25 @@
 const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
 describe('claim filter()', () => {
+    let ctx;
+    beforeEach(() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            }
+        };
+    });
+
     it('should return 1 result filtering by id', async() => {
         const tx = await app.models.Claim.beginTransaction({});
 
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, search: 1}}, null, options);
+            ctx.args = {search: 1};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(1);
             expect(result[0].id).toEqual(1);
@@ -25,7 +37,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, search: 'Tony Stark'}}, null, options);
+            ctx.args = {search: 'Tony Stark'};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(1);
             expect(result[0].id).toEqual(4);
@@ -43,7 +56,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, workerFk: 18}}, null, options);
+            ctx.args = {workerFk: 18};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(4);
             expect(result[0].id).toEqual(1);
@@ -64,7 +78,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, itemFk: 2}}, null, options);
+            ctx.args = {itemFk: 2};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(3);
             expect(result[0].id).toEqual(1);
@@ -84,7 +99,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, claimResponsibleFk: 7}}, null, options);
+            ctx.args = {claimResponsibleFk: 7};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(3);
             expect(result[0].id).toEqual(2);
@@ -97,4 +113,22 @@ describe('claim filter()', () => {
             throw e;
         }
     });
+
+    it('should now return claims from the worker team', async() => {
+        const tx = await models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            ctx.args = {itemFk: null, myTeam: true};
+            const result = await app.models.Claim.filter(ctx, null, options);
+
+            expect(result.length).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/claim/back/models/claim-beginning.js

@@ -19,7 +19,7 @@ module.exports = Self => {
             if (ticket.ticketFk != claim.ticketFk)
                 throw new UserError(`Cannot create a new claimBeginning from a different ticket`);
         }
-        // await claimIsEditable(ctx);
+        await claimIsEditable(ctx);
     });
 
     Self.observe('before delete', async ctx => {
@@ -36,7 +36,7 @@ module.exports = Self => {
         if (ctx.options && ctx.options.transaction)
             myOptions.transaction = ctx.options.transaction;
 
-        const claimBeginning = await Self.findById(ctx.where.id);
+        const claimBeginning = ctx.instance ?? await Self.findById(ctx.where.id);
 
         const filter = {
             where: {id: claimBeginning.claimFk},

modules/claim/front/search-panel/index.html

@@ -70,6 +70,13 @@
                 label="Responsible">
             </vn-autocomplete>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-check
+                vn-one
+                label="My team"
+                ng-model="filter.myTeam"
+                triple-state="true">
+        </vn-horizontal>
         <vn-horizontal class="vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>

modules/client/back/methods/client/campaignMetricsPdf.js

@@ -46,7 +46,7 @@ module.exports = Self => {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
         },
-        //accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');

modules/entry/back/methods/entry/entryOrderPdf.js

@@ -34,7 +34,7 @@ module.exports = Self => {
             path: '/:id/entry-order-pdf',
             verb: 'GET'
         },
-        //accessScopes: ['read:multimedia']
+        accessScopes: ['read:multimedia']
     });
 
     Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');

modules/entry/back/models/buy.json

@@ -34,7 +34,7 @@
             "type": "number"
         },
         "groupingMode": {
-            "type": "number"
+            "type": "string"
         },
         "comissionValue": {
             "type": "number"

modules/entry/front/basic-data/index.html

@@ -123,7 +123,9 @@
             </vn-check>
             <vn-check
                 label="Booked"
-                ng-model="$ctrl.entry.isBooked">
+                ng-model="$ctrl.entry.isBooked"
+                vn-acl="administrative"
+                >
             </vn-check>
         </vn-horizontal>
     </vn-card>

modules/entry/front/buy/index/index.html

@@ -119,13 +119,13 @@
                                 <append>
                                     <vn-icon
                                         pointer
-                                        ng-show="buy.groupingMode == '2'"
+                                        ng-show="buy.groupingMode == 'packing'"
                                         ng-click="$ctrl.toggleGroupingMode(buy, 'packing')"
                                         icon="lock">
                                     </vn-icon>
                                     <vn-icon
                                         pointer
-                                        ng-show="buy.groupingMode != '2'"
+                                        ng-show="buy.groupingMode != 'packing'"
                                         ng-click="$ctrl.toggleGroupingMode(buy, 'packing')"
                                         icon="lock_open">
                                     </vn-icon>
@@ -140,13 +140,13 @@
                                 <append>
                                     <vn-icon
                                         pointer
-                                        ng-show="buy.groupingMode == '1'"
+                                        ng-show="buy.groupingMode == 'grouping'"
                                         ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')"
                                         icon="lock">
                                     </vn-icon>
                                     <vn-icon
                                         pointer
-                                        ng-show="buy.groupingMode != '1'"
+                                        ng-show="buy.groupingMode != 'grouping'"
                                         ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')"
                                         icon="lock_open">
                                     </vn-icon>

modules/entry/front/buy/index/index.js

@@ -53,12 +53,8 @@ export default class Controller extends Section {
     }
 
     toggleGroupingMode(buy, mode) {
-        const grouping = 1;
+        const groupingMode = mode === 'grouping' ? mode : 'packing';
-        const packing = 2;
+        const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
-        const groupingMode = mode === 'grouping' ? grouping : packing;
-
-        const newGroupingMode = buy.groupingMode === groupingMode ? 0 : groupingMode;
-
         const params = {
             groupingMode: newGroupingMode
         };

modules/entry/front/buy/index/index.spec.js

@@ -57,45 +57,34 @@ describe('Entry buy', () => {
 
     describe('toggleGroupingMode()', () => {
         it(`should toggle grouping mode from grouping to packing`, () => {
-            const grouping = 1;
+            const buy = {id: 999, groupingMode: 'grouping'};
-            const packing = 2;
-            const buy = {id: 999, groupingMode: grouping};
 
             const query = `Buys/${buy.id}`;
-            $httpBackend.expectPATCH(query, {groupingMode: packing}).respond(200);
+            $httpBackend.expectPATCH(query, {groupingMode: 'packing'}).respond(200);
             controller.toggleGroupingMode(buy, 'packing');
             $httpBackend.flush();
         });
 
         it(`should toggle grouping mode from packing to grouping`, () => {
-            const grouping = 1;
+            const buy = {id: 999, groupingMode: 'packing'};
-            const packing = 2;
-            const buy = {id: 999, groupingMode: packing};
-
             const query = `Buys/${buy.id}`;
-            $httpBackend.expectPATCH(query, {groupingMode: grouping}).respond(200);
+            $httpBackend.expectPATCH(query, {groupingMode: 'grouping'}).respond(200);
             controller.toggleGroupingMode(buy, 'grouping');
             $httpBackend.flush();
         });
 
         it(`should toggle off the grouping mode if it was packing to packing`, () => {
-            const noGrouping = 0;
+            const buy = {id: 999, groupingMode: 'packing'};
-            const packing = 2;
-            const buy = {id: 999, groupingMode: packing};
-
             const query = `Buys/${buy.id}`;
-            $httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200);
+            $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
             controller.toggleGroupingMode(buy, 'packing');
             $httpBackend.flush();
         });
 
         it(`should toggle off the grouping mode if it was grouping to grouping`, () => {
-            const noGrouping = 0;
+            const buy = {id: 999, groupingMode: 'grouping'};
-            const grouping = 1;
-            const buy = {id: 999, groupingMode: grouping};
-
             const query = `Buys/${buy.id}`;
-            $httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200);
+            $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
             controller.toggleGroupingMode(buy, 'grouping');
             $httpBackend.flush();
         });

modules/entry/front/latest-buys/index.html

@@ -143,12 +143,12 @@
                             </span>
                         </td>
                         <td number>
-                            <vn-chip class="transparent" translate-attr="buy.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}">
+                            <vn-chip class="transparent" translate-attr="buy.groupingMode == 'packing' ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 'packing'}">
                                 <span>{{::buy.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </td>
                         <td number>
-                            <vn-chip class="transparent" translate-attr="buy.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}">
+                            <vn-chip class="transparent" translate-attr="buy.groupingMode == 'grouping' ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 'grouping'}">
                                 <span>{{::buy.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </td>