Merge branch 'dev' into 7116-agencyIncoming

.gitignore

@@ -10,3 +10,4 @@ print.*.json
 db.json
 junit.xml
 .DS_Store
+storage

.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
+

CHANGELOG.md

@@ -1,3 +1,83 @@
+# Version 24.24 - 2024-06-11
+
+### Added 🆕
+
+- 6281 feat:buyFk in itemShekving  by:sergiodt
+- 6281 feat:buyFk in itemShelving  by:sergiodt
+- feat: #6408 tests  by:jgallego
+- feat: packaging refs #4021  (origin/4021_packaging) by:sergiodt
+- feat: refs #6021 add new field  by:pablone
+- feat: refs #6281 change fixtures  by:robert
+- feat: refs # 6408 test ok  (origin/6408-rocketChat) by:jgallego
+- feat: refs #6477 productionConfig add column  by:robert
+- feat: refs #6600 add column  (origin/6600-createItemPhotoComment) by:jorgep
+- feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table  by:jorgep
+- feat: refs #6889 add back tests  by:jorgep
+- feat: refs #6889 fixtures & models  by:jorgep
+- feat : refs #6889 wip: check if is productionReviewer or owner  by:jorgep
+- feat: refs #6942 set false isBooed & ledger  by:jorgep
+- feat: refs #6942 toUnbook  by:jorgep
+- feat: refs #6942 xdiario fixtures  by:jorgep
+- feat: refs #7398 Change  by:guillermo
+- feat: refs #7438 Added volume to item_valuateInventory  by:guillermo
+- feat: refs #7438 Requested changes and little changes  by:guillermo
+- refs #6281 feat:buyFk in itemShelving  by:sergiodt
+
+### Changed 📦
+
+- refactor: refs #6600 add space  by:jorgep
+- refactor: refs #6889 improve file loading logic  by:jorgep
+- refactor: refs #6889 sale tests e2e  by:jorgep
+- refactor: refs #6889 script sql  (origin/6889-dropAddSaleByCode) by:jorgep
+- refactor: refs #6889 use addSale  by:jorgep
+- refactor: refs #6942 toUnbook & drop buyer acls  by:jorgep
+- refactor: refs #7398 Refactor and change ekt_scan  (origin/7398-ektScan) by:guillermo
+- refactor: refs #7486 Optimized procs  by:guillermo
+
+### Fixed 🛠️
+
+- feat: refs #6281 change fixtures  by:robert
+- feat: refs #6889 fixtures & models  by:jorgep
+- feat: refs #6942 xdiario fixtures  by:jorgep
+- fix: checking process.env.NODE_ENV  by:alexm
+- fix: en translations  by:alexm
+- fix: move to boot  (origin/7421-fix_checking_NODE_ENV, 7421-fix_checking_NODE_ENV) by:alexm
+- fix: refs #6095 filter by refFk null  by:pablone
+- fix: refs #6600 rollback  by:jorgep
+- fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer  by:jorgep
+- fix: refs #6889 check if has collection or sectorCollection  by:jorgep
+- fix: refs #6889 e2e tests  by:jorgep
+- fix: refs #6889 fix back tests  by:jorgep
+- fix: refs #6889 modify fixtures  by:jorgep
+- fix: refs #6889 rollback  by:jorgep
+- fix: refs #6942 acls & back  by:jorgep
+- fix: refs #6942 add deleteById acl  by:jorgep
+- fix: refs #6942 add test & change column name  by:jorgep
+- fix: refs #6942 create invoiceIn acl  by:jorgep
+- fix: refs #6942 delete  by:jorgep
+- fix: refs #6942 drop quotes  by:jorgep
+- fix : refs #6942 remove grafana update priv  by:jorgep
+- fix: refs #6942 revoke update isBooked  by:jorgep
+- fix: refs #6942 toBook/toUnbook  by:jorgep
+- fix: refs #7442 Fix kubernetes deploy  by:Juan Ferrer Toribio
+- fix(salix): refs #7272 #7272 Add aclService in routes.js  by:Javier Segarra
+- fix(salix): refs #7272 #7272 Back validateToken endpoint  by:Javier Segarra
+- fix(salix): refs #7272 #7272 Bug when acl not loaded  by:Javier Segarra
+- fix(salix): refs #7272 #7272 Call validateToken  by:Javier Segarra
+- fix(salix): refs #7272 #7272 Errors when Token not exists  by:Javier Segarra
+- fix(salix): refs #7272 #7272 Front retry calls  by:Javier Segarra
+- fix(salix): refs #7272 #7272 i18n Error  by:Javier Segarra
+- fix(salix): refs #7272 #7272 Remove aclService from auth.js  by:Javier Segarra
+- fix: simplify  by:alexm
+- fix traduction & e2e  by:carlossa
+- refs #6820 fix back  by:carlossa
+- refs #6820 fix pr  by:carlossa
+- refs #6832 fix: ToItem  (origin/6832_refactorBackToItem) by:Sergio De la torre
+- refs #7292 fix tback  by:carlossa
+- refs #7296 fix pr errors, trad  by:carlossa
+- test(salix): refs #7272 #7272 fix renew-token.spec  by:Javier Segarra
+
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
@@ -5,22 +85,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [24.20.01] - 2024-05-14
+
+### Fixed
+- (Worker -> time-control) Corrección de errores
+- (InvoiceOut -> Crear factura) Cuando falla al crear una factura, se devuelve un error
+- (Worker -> Ver albarán) Ya no aparece la página en blanco
+
+### Changed
+- (InvoiceOut) Las facturas ahora muestran el ticket del cual proviene el abono
+
+## [24.18.01] - 2024-05-07
+
+## [24.16.01] - 2024-04-18
+
 ## [2414.01] - 2024-04-04
 
-### Added
-
-### Changed
-
-### Fixed
-
 ## [2408.01] - 2024-02-22
 
-### Added
-
-### Changed
-
-### Fixed
-
 ## [2406.01] - 2024-02-08
 
 ### Added

Jenkinsfile

@@ -60,7 +60,6 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'salix'
-        STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {
@@ -71,6 +70,7 @@ pipeline {
                 stage('Back') {
                     steps {
                         sh 'pnpm install --prefer-offline'
+                        sh 'node node_modules/puppeteer/install.mjs'
                     }
                 }
                 stage('Print') {
@@ -103,7 +103,7 @@ pipeline {
                                 NODE_ENV = ''
                             }
                             steps {
-                                sh 'node back/tests.js --ci --junit --network jenkins'
+                                sh 'node back/tests.js --junit'
                             }
                             post {
                                 always {
@@ -121,7 +121,7 @@ pipeline {
                             steps {
                                 script {
                                     def packageJson = readJSON file: 'package.json'
-                                    env.VERSION = packageJson.version
+                                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                                 }
                                 sh 'docker-compose build back'
                             }
@@ -159,7 +159,7 @@ pipeline {
                             steps {
                                 script {
                                     def packageJson = readJSON file: 'package.json'
-                                    env.VERSION = packageJson.version
+                                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                                 }
                                 sh 'gulp build'
                                 sh 'docker-compose build front'
@@ -179,7 +179,7 @@ pipeline {
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
                 sh 'docker-compose push'
@@ -203,19 +203,23 @@ pipeline {
                         sh 'npx myt push $NODE_ENV --force --commit'
                     }
                 }
-                stage('Docker') {
+                stage('Kubernetes') {
                     when {
                         expression { FROM_GIT }
                     }
-                    environment {
-                        DOCKER_HOST = "${env.SWARM_HOST}"
-                    }
                     steps {
                         script {
                             def packageJson = readJSON file: 'package.json'
-                            env.VERSION = packageJson.version
+                            env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                        }
+                        withKubeConfig([
+                            serverUrl: "$KUBERNETES_API",
+                            credentialsId: 'kubernetes',
+                            namespace: 'salix'
+                        ]) {
+                            sh 'kubectl set image deployment/salix-back-$BRANCH_NAME salix-back-$BRANCH_NAME=$REGISTRY/salix-back:$VERSION'
+                            sh 'kubectl set image deployment/salix-front-$BRANCH_NAME salix-front-$BRANCH_NAME=$REGISTRY/salix-front:$VERSION'
                         }
-                        sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
                     }
                 }
             }

README.md

@@ -11,11 +11,16 @@ Required applications.
 * Node.js
 * Docker
 * Git
+* MYT
 
 You will need to install globally the following items.
 ```
 $ sudo npm install -g jest gulp-cli
 ```
+After installing MYT you will need the following item.
+```
+$ apt install libkrb5-dev libssl-dev
+```
 
 ## Installing dependencies and launching
 
@@ -23,7 +28,7 @@ Pull from repository.
 
 Run this commands on project root directory to install Node dependencies.
 ```
-$ npm install
+$ pnpm install
 $ gulp install
 ```
 
@@ -54,6 +59,12 @@ For end-to-end tests run from project's root.
 $ npm run test:e2e
 ```
 
+## Generate changeLog test → master
+```
+$ bash changelog.sh
+```
+
+
 ## Visual Studio Code extensions
 
 Open Visual Studio Code, press Ctrl+P and paste the following commands.

back/methods/chat/sendCheckingPresence.js

@@ -1,3 +1,5 @@
+const isProduction = require('vn-loopback/server/boot/isProduction');
+
 module.exports = Self => {
     Self.remoteMethodCtx('sendCheckingPresence', {
         description: 'Creates a message in the chat model checking the user status',
@@ -37,7 +39,7 @@ module.exports = Self => {
         if (!recipient)
             throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
 
-        if (process.env.NODE_ENV == 'test')
+        if (!isProduction())
             message = `[Test:Environment to user ${userId}] ` + message;
 
         const chat = await models.Chat.create({

back/methods/chat/sendQueued.js

@@ -1,4 +1,6 @@
 const axios = require('axios');
+const isProduction = require('vn-loopback/server/boot/isProduction');
+
 module.exports = Self => {
     Self.remoteMethodCtx('sendQueued', {
         description: 'Send a RocketChat message',
@@ -94,7 +96,7 @@ module.exports = Self => {
      * @return {Promise} - The request promise
      */
     Self.sendMessage = async function sendMessage(senderFk, recipient, message) {
-        if (process.env.NODE_ENV !== 'production') {
+        if (!isProduction(false)) {
             return new Promise(resolve => {
                 return resolve({
                     statusCode: 200,
@@ -149,7 +151,7 @@ module.exports = Self => {
      * @return {Promise} - The request promise
      */
     Self.getUserStatus = async function getUserStatus(username) {
-        if (process.env.NODE_ENV !== 'production') {
+        if (!isProduction(false)) {
             return new Promise(resolve => {
                 return resolve({
                     data: {

back/methods/chat/spec/send.spec.js

@@ -3,14 +3,14 @@ const {models} = require('vn-loopback/server/server');
 describe('Chat send()', () => {
     it('should return true as response', async() => {
         let ctx = {req: {accessToken: {userId: 1}}};
-        let response = await models.Chat.send(ctx, '@salesPerson', 'I changed something');
+        let response = await models.Chat.send(ctx, '@salesperson', 'I changed something');
 
         expect(response).toEqual(true);
     });
 
     it('should return false as response', async() => {
         let ctx = {req: {accessToken: {userId: 18}}};
-        let response = await models.Chat.send(ctx, '@salesPerson', 'I changed something');
+        let response = await models.Chat.send(ctx, '@salesperson', 'I changed something');
 
         expect(response).toEqual(false);
     });

back/methods/collection/assign.js

@@ -20,8 +20,9 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const [,, {collectionFk}] = await Self.rawSql('CALL vn.collection_assign(?, @vCollectionFk); SELECT @vCollectionFk collectionFk',
-            [userId], myOptions);
+        const [, , [{collectionFk}]] =
+            await Self.rawSql('CALL vn.collection_assign(?, @vCollectionFk); SELECT @vCollectionFk collectionFk',
+                [userId], myOptions);
 
         if (!collectionFk) throw new UserError('There are not picking tickets');
         await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);

back/methods/collection/assignCollection.js

@@ -0,0 +1,29 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    Self.remoteMethodCtx('assignCollection', {
+        description: 'Assign a collection',
+        accessType: 'WRITE',
+        http: {
+            path: `/assignCollection`,
+            verb: 'POST'
+        },
+        returns: {
+            type: ['object'],
+            root: true
+        },
+    });
+
+    Self.assignCollection = async(ctx, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+        const [info, info2, [{'@vCollectionFk': collectionFk}]] = await Self.rawSql(
+            'CALL vn.collection_getAssigned(?, @vCollectionFk);SELECT @vCollectionFk', [userId], myOptions);
+        if (!collectionFk) throw new UserError('There are not picking tickets');
+        await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);
+
+        return collectionFk;
+    };
+};

back/methods/collection/getSales.js

@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethodCtx('getSales', {
-        description: 'Get sales from ticket or collection',
+        description: 'Get sales from ticket, collection or sectorCollection',
         accessType: 'READ',
         accepts: [
             {
@@ -29,6 +29,7 @@ module.exports = Self => {
     });
 
     Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
         const $t = ctx.req.__;

back/methods/collection/getTickets.js

@@ -37,6 +37,7 @@ module.exports = Self => {
 
         const promises = [];
         const [tickets] = await Self.rawSql(`CALL vn.collection_getTickets(?)`, [id], myOptions);
+
         const sales = await Self.rawSql(`
             SELECT s.ticketFk,
                     sgd.saleGroupFk,
@@ -68,7 +69,7 @@ module.exports = Self => {
                     LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
                     LEFT JOIN parking p2 ON p2.id = sg.parkingFk
                     JOIN item i ON i.id = s.itemFk
-                    LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
+                    JOIN itemShelvingSale iss ON iss.saleFk = s.id
                     LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
                     LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
                     LEFT JOIN parking p ON p.id = sh.parkingFk
@@ -76,17 +77,56 @@ module.exports = Self => {
                     LEFT JOIN origin o ON o.id = i.originFk
                 WHERE tc.collectionFk = ?
                 GROUP BY s.id, ish.id, p.code, p2.code
-                ORDER BY pickingOrder;`, [id], myOptions);
-
+            UNION ALL
+            SELECT s.ticketFk,
+                sgd.saleGroupFk,
+                s.id saleFk,
+                s.itemFk,
+                i.longName,
+                i.size,
+                ic.color,
+                o.code origin,
+                ish.packing,
+                ish.grouping,
+                s.isAdded,
+                s.originalQuantity,
+                s.quantity,
+                iss.quantity,
+                SUM(iss.quantity) OVER (PARTITION BY s.id ORDER BY ish.id),
+                ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY p.pickingOrder),
+                COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) ,
+                sh.code,
+                IFNULL(p2.code, p.code),
+                IFNULL(p2.pickingOrder, p.pickingOrder),
+                iss.id itemShelvingSaleFk,
+                iss.isPicked
+            FROM sectorCollection sc
+                JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
+                JOIN saleGroup sg ON sg.id = ss.saleGroupFk
+                JOIN ticket t ON t.id = sg.ticketFk 
+                JOIN sale s ON s.ticketFk = t.id
+                LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+                LEFT JOIN parking p2 ON p2.id = sg.parkingFk
+                JOIN item i ON i.id = s.itemFk
+                JOIN itemShelvingSale iss ON iss.saleFk = s.id
+                LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+                LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+                LEFT JOIN parking p ON p.id = sh.parkingFk
+                LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
+                LEFT JOIN origin o ON o.id = i.originFk
+            WHERE sc.id = ? 
+                AND sgd.saleGroupFk
+            GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);
         if (print)
             await Self.rawSql(`CALL vn.collection_printSticker(?, ?)`, [id, null], myOptions);
 
         const collection = {collectionFk: id, tickets: []};
+
         if (tickets && tickets.length) {
             for (const ticket of tickets) {
                 const ticketId = ticket.ticketFk;
-                if (ticket.observaciones != '') {
-                    for (observation of ticket.observaciones.split(' ')) {
+                if (ticket.observation) {
+                    for (observation of ticket.observation?.split(' ')) {
                         if (['#', '@'].includes(observation.charAt(0))) {
                             promises.push(Self.app.models.Chat.send(ctx, observation,
                                 $t('The ticket is in preparation', {
@@ -100,11 +140,11 @@ module.exports = Self => {
                 if (sales && sales.length) {
                     const barcodes = await Self.rawSql(`
                         SELECT s.id saleFk, b.code, c.id
-                            FROM vn.sale s
-                                LEFT JOIN vn.itemBarcode b ON b.itemFk = s.itemFk
-                                LEFT JOIN vn.buy c ON c.itemFk = s.itemFk
-                                LEFT JOIN vn.entry e ON e.id = c.entryFk
-                                LEFT JOIN vn.travel tr ON tr.id = e.travelFk
+                            FROM sale s
+                                LEFT JOIN itemBarcode b ON b.itemFk = s.itemFk
+                                LEFT JOIN buy c ON c.itemFk = s.itemFk
+                                LEFT JOIN entry e ON e.id = c.entryFk
+                                LEFT JOIN travel tr ON tr.id = e.travelFk
                             WHERE s.ticketFk = ?
                                 AND tr.landed >= util.VN_CURDATE() - INTERVAL 1 YEAR`,
                     [ticketId], myOptions);

back/methods/collection/spec/assignCollection.spec.js

@@ -0,0 +1,38 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('ticket assignCollection()', () => {
+    let ctx;
+    let options;
+    let tx;
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 1106},
+                headers: {origin: 'http://localhost'},
+                __: value => value
+            },
+            args: {}
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx.req
+        });
+
+        options = {transaction: tx};
+        tx = await models.Sale.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should throw an error when  there is not picking tickets', async() => {
+        try {
+            await models.Collection.assignCollection(ctx, options);
+        } catch (e) {
+            expect(e.message).toEqual('There are not picking tickets');
+        }
+    });
+});

back/methods/collection/spec/getTickets.spec.js

@@ -26,8 +26,8 @@ describe('collection getTickets()', () => {
             expect(collectionTickets.tickets[1].ticketFk).toEqual(2);
             expect(collectionTickets.tickets[2].ticketFk).toEqual(23);
             expect(collectionTickets.tickets[0].sales[0].ticketFk).toEqual(1);
-            expect(collectionTickets.tickets[0].sales[1].ticketFk).toEqual(1);
-            expect(collectionTickets.tickets[0].sales[2].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[1].sales.length).toEqual(0);
+            expect(collectionTickets.tickets[2].sales.length).toEqual(0);
             expect(collectionTickets.tickets[0].sales[0].Barcodes.length).toBeTruthy();
 
             await tx.rollback();

back/methods/dms/deleteTrashFiles.js

@@ -1,6 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 const fs = require('fs-extra');
 const path = require('path');
+const isProduction = require('vn-loopback/server/boot/isProduction');
 
 module.exports = Self => {
     Self.remoteMethod('deleteTrashFiles', {
@@ -22,7 +23,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (process.env.NODE_ENV == 'test')
+        if (!isProduction())
             throw new UserError(`Action not allowed on the test environment`);
 
         const models = Self.app.models;

back/methods/dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', '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: ['DEFAULT', 'read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/docuware/upload.js

@@ -1,5 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
 const axios = require('axios');
+const isProduction = require('vn-loopback/server/boot/isProduction');
 
 module.exports = Self => {
     Self.remoteMethodCtx('upload', {
@@ -119,7 +120,7 @@ module.exports = Self => {
                 ]
             };
 
-            if (process.env.NODE_ENV != 'production')
+            if (!isProduction(false))
                 throw new UserError('Action not allowed on the test environment');
 
             // delete old

back/methods/image/download.js

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

back/methods/image/scrub.js

@@ -1,6 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const UserError = require('vn-loopback/util/user-error');
+const isProduction = require('vn-loopback/server/boot/isProduction');
 
 module.exports = Self => {
     Self.remoteMethod('scrub', {
@@ -43,8 +44,7 @@ module.exports = Self => {
     Self.scrub = async function(collection, remove, limit, dryRun, skipLock) {
         const $ = Self.app.models;
 
-        const env = process.env.NODE_ENV;
-        dryRun = dryRun || (env && env !== 'production');
+        dryRun = dryRun || !isProduction(false);
 
         const instance = await $.ImageCollection.findOne({
             fields: ['id'],

back/methods/image/specs/download.spec.js

@@ -4,20 +4,21 @@ describe('image download()', () => {
     const collection = 'user';
     const size = '160x160';
     const employeeId = 1;
+    const developerId = 9;
+    const jessicaJonesId = 1110;
     const ctx = {req: {accessToken: {userId: employeeId}}};
 
     it('should return the image content-type of the user', async() => {
-        const userId = 9;
-        const image = await models.Image.download(ctx, collection, size, userId);
+        const image = await models.Image.download(ctx, collection, size, developerId);
         const contentType = image[1];
 
         expect(contentType).toEqual('image/png');
     });
 
-    it(`should return false if the user doesn't have image`, async() => {
-        const userId = 1110;
-        const image = await models.Image.download(ctx, collection, size, userId);
+    it('should return the user profile picture', async() => {
+        const image = await models.Image.download(ctx, collection, size, jessicaJonesId);
+        const fileName = image[2];
 
-        expect(image).toBeFalse();
+        expect(fileName).toMatch('1110.png');
     });
 });

back/methods/image/upload.js

@@ -1,6 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 const fs = require('fs/promises');
 const path = require('path');
+const isProduction = require('vn-loopback/server/boot/isProduction');
 
 module.exports = Self => {
     Self.remoteMethodCtx('upload', {
@@ -41,7 +42,7 @@ module.exports = Self => {
             if (!hasWriteRole)
                 throw new UserError(`You don't have enough privileges`);
 
-            if (process.env.NODE_ENV == 'test')
+            if (!isProduction())
                 throw new UserError(`Action not allowed on the test environment`);
 
             // Upload file to temporary path

back/methods/machine-worker/updateInTime.js

@@ -38,7 +38,7 @@ module.exports = Self => {
             }, myOptions);
 
             if (!machine)
-                throw new Error($t('the plate does not exist', {plate}));
+                throw new UserError($t('the plate does not exist', {plate}));
 
             const machineWorker = await Self.findOne({
                 where: {
@@ -48,7 +48,7 @@ module.exports = Self => {
             }, myOptions);
 
             const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions);
-            const hoursDifference = (Date.vnNow() - machineWorker.inTime.getTime()) / (60 * 60 * 1000);
+            const hoursDifference = (Date.vnNow() - machineWorker?.inTime?.getTime() ?? 0) / (60 * 60 * 1000);
 
             if (machineWorker) {
                 const isHimself = userId == machineWorker.workerFk;

back/methods/mobile-app-version-control/getVersion.js

@@ -40,6 +40,11 @@ module.exports = Self => {
             fields,
         };
 
-        return Self.findOne(filter);
+        const result = await Self.findOne(filter);
+        return {
+            isVersionCritical: result?.isVersionBetaCritical ?? result?.isVersionCritical,
+            version: result?.versionBeta ?? result?.version,
+            url: result?.urlBeta ?? result?.urlProduction
+        };
     };
 };

back/methods/mobile-app-version-control/specs/getVersion.spec.js

@@ -2,6 +2,8 @@ const {models} = require('vn-loopback/server/server');
 
 describe('mobileAppVersionControl getVersion()', () => {
     const appName = 'delivery';
+    const appNameVersion = '9.2';
+    const appNameVersionBeta = '9.7';
     beforeAll(async() => {
         ctx = {
             req: {
@@ -13,17 +15,15 @@ describe('mobileAppVersionControl getVersion()', () => {
 
     it('should get the version app', async() => {
         ctx.req.accessToken.userId = 9;
-        const {version, versionBeta} = await models.MobileAppVersionControl.getVersion(ctx, appName);
+        const {version} = await models.MobileAppVersionControl.getVersion(ctx, appName);
 
-        expect(version).toEqual('9.2');
-        expect(versionBeta).toBeUndefined();
+        expect(version).toEqual(appNameVersion);
     });
 
     it('should get the beta version app', async() => {
         ctx.req.accessToken.userId = 66;
-        const {version, versionBeta} = await models.MobileAppVersionControl.getVersion(ctx, appName);
+        const {version} = await models.MobileAppVersionControl.getVersion(ctx, appName);
 
-        expect(versionBeta).toBeDefined();
-        expect(version).toBeUndefined();
+        expect(version).toEqual(appNameVersionBeta);
     });
 });

back/methods/mrw-config/cancelShipment.js

@@ -39,8 +39,6 @@ module.exports = Self => {
         const xmlString = response.data;
         const parser = new DOMParser();
         const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
-        const [resultElement] = xmlDoc.getElementsByTagName('Mensaje');
-
-        return resultElement.textContent;
+        return xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
     };
 };

back/methods/mrw-config/createShipment.ejs

@@ -26,16 +26,24 @@
                     <mrw:Nif><%= expeditionData.fi %></mrw:Nif>
                     <mrw:Nombre><%= expeditionData.clientName %></mrw:Nombre>
                     <mrw:Telefono><%= expeditionData.phone %></mrw:Telefono>
+                    <mrw:Observaciones><%= expeditionData.deliveryObservation %></mrw:Observaciones>
                 </mrw:DatosEntrega>
                 <mrw:DatosServicio>
                     <mrw:Fecha><%= expeditionData.created %></mrw:Fecha>
-                    <mrw:Referencia><%= expeditionData.expeditionDataId %></mrw:Referencia>
+                    <mrw:Referencia><%= expeditionData.reference %></mrw:Referencia>
                     <mrw:CodigoServicio><%= expeditionData.serviceType %></mrw:CodigoServicio>
                     <mrw:NumeroBultos>1</mrw:NumeroBultos>
                     <mrw:EntregaSabado><%= expeditionData.weekDays %></mrw:EntregaSabado>
-                    <mrw:Peso><%= expeditionData.kg %></mrw:Peso>
                     <mrw:Reembolso/>
                     <mrw:ImporteReembolso/>
+                    <mrw:Bultos>
+                        <mrw:BultoRequest>
+                            <mrw:Alto><%= mrw.defaultHeight %></mrw:Alto>
+                            <mrw:Largo><%= mrw.defaultLength %></mrw:Largo>
+                            <mrw:Ancho><%= mrw.defaultWidth %></mrw:Ancho>
+                            <mrw:Peso><%= mrw.defaultWeight %></mrw:Peso>
+                        </mrw:BultoRequest>
+                    </mrw:Bultos>
                 </mrw:DatosServicio>
             </mrw:request>
         </mrw:TransmEnvio>

back/methods/mrw-config/createShipment.js

@@ -42,9 +42,10 @@ module.exports = Self => {
             throw new UserError(`Some mrwConfig parameters are not set`);
 
         const query =
-            `SELECT CASE co.code 
+            `SELECT 
+                CASE co.code 
                     WHEN 'ES' THEN a.postalCode
-                    WHEN 'PT' THEN LEFT(a.postalCode, 4)
+                    WHEN 'PT' THEN LEFT(a.postalCode, mc.portugalPostCodeTrim)
                     WHEN 'AD' THEN REPLACE(a.postalCode, 'AD', '00')
                 END postalCode,
                 a.city,
@@ -55,18 +56,23 @@ module.exports = Self => {
                 c.phone,
                 DATE_FORMAT(t.shipped, '%d/%m/%Y') created,
                 t.shipped,
-                e.id expeditionId,
-                LPAD(IF(mw.params IS NULL, ms.serviceType, mw.serviceType), 4 ,'0') serviceType,
-                IF(mw.weekdays, 'S', 'N') weekDays
+                CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference,
+                LPAD(IF(mw.serviceType IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth,'0') serviceType,
+                IF(mw.weekdays, 'S', 'N') weekDays,
+                oa.description deliveryObservation
             FROM expedition e
                 JOIN ticket t ON e.ticketFk = t.id
                 JOIN agencyMode am ON am.id = t.agencyModeFk
                 JOIN mrwService ms ON ms.agencyModeCodeFk = am.code
-                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays = DATE_FORMAT(t.shipped, '%a') 
+                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays | 1 << WEEKDAY(t.landed)
                 JOIN client c ON t.clientFk = c.id
                 JOIN address a ON t.addressFk = a.id
+                LEFT JOIN addressObservation oa ON oa.addressFk = a.id
+                LEFT JOIN observationType ot ON ot.id = oa.observationTypeFk 
+                    AND ot.code = 'delivery'
                 JOIN province p ON a.provinceFk = p.id
                 JOIN country co ON co.id = p.countryFk
+                JOIN mrwConfig mc
             WHERE e.id = ?
             LIMIT 1`;
 
@@ -89,14 +95,9 @@ module.exports = Self => {
         const getLabelResponse = await sendXmlDoc('getLabel', {mrw, shipmentId}, 'text/xml');
         const file = getTextByTag(getLabelResponse, 'EtiquetaFile');
 
-        try {
-            await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
-            if (tx) await tx.commit();
-        } catch (error) {
-            if (tx) await tx.rollback();
-            throw error;
-        }
-        return file;
+        if (tx) await tx.commit();
+
+        return {shipmentId, file};
     };
 
     function getTextByTag(xmlDoc, tag) {

back/methods/mrw-config/specs/createShipment.spec.js

@@ -81,9 +81,9 @@ describe('MRWConfig createShipment()', () => {
 
         spyOn(axios, 'post').and.callFake(() => Promise.resolve(mockPostResponses.pop()));
 
-        const base64Binary = await models.MrwConfig.createShipment(expedition1.id, options);
+        const {file} = await models.MrwConfig.createShipment(expedition1.id, options);
 
-        expect(base64Binary).toEqual(mockBase64Binary);
+        expect(file).toEqual(mockBase64Binary);
     });
 
     it('should fail if mrwConfig has no data', async() => {

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/send.js

@@ -1,4 +1,5 @@
 const {Email} = require('vn-print');
+const isProduction = require('vn-loopback/server/boot/isProduction');
 
 module.exports = Self => {
     Self.remoteMethod('send', {
@@ -70,7 +71,7 @@ module.exports = Self => {
                     const newParams = Object.assign({}, queueParams, sendParams);
                     const email = new Email(queueName, newParams);
 
-                    if (process.env.NODE_ENV != 'test')
+                    if (isProduction())
                         await email.send();
 
                     await queue.updateAttribute('status', statusSent);

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 totalAvailable = notifications.length - active.length;
+        const notifications = await models.NotificationSubscription.getAvailable(userId);
+        const totalAvailable = notifications.size - active.length;
 
         expect(active.length).toEqual(3);
         expect(available.length).toEqual(totalAvailable);

back/methods/osticket/sendToSupport.js

@@ -46,7 +46,7 @@ module.exports = Self => {
             html += `<strong>${data}</strong>:<br/>${tryParse(additionalData[data])}<br/>`;
 
         const subjectReason = httpRequest?.data?.error;
-        smtp.send({
+        await smtp.send({
             to: `${config.app.reportEmail}, ${emailUser.email}`,
             subject:
                 '[Support-Salix] ' +

back/methods/postcode/filter.js

@@ -45,7 +45,7 @@ module.exports = Self => {
                         {'pc.code': {like: `%${value}%`}},
                         {'t.name': {like: `%${value}%`}},
                         {'p.name': {like: `%${value}%`}},
-                        {'c.country': {like: `%${value}%`}}
+                        {'c.name': {like: `%${value}%`}}
                     ]
                 };
             }
@@ -62,7 +62,7 @@ module.exports = Self => {
             pc.code,
             t.name as town,
             p.name as province,
-            c.country
+            c.name country
         FROM
             postCode pc
             JOIN town t on t.id = pc.townFk

back/methods/url/getUrl.js

@@ -19,12 +19,12 @@ module.exports = Self => {
         }
     });
     Self.getUrl = async(appName = 'salix') => {
-        const {url} = await Self.app.models.Url.findOne({
+        const url = await Self.app.models.Url.findOne({
             where: {
                 appName,
-                environment: process.env.NODE_ENV || 'development'
+                environment: process.env.NODE_ENV || 'dev'
             }
         });
-        return url;
+        return url?.url;
     };
 };

back/methods/vn-user/acls.js

@@ -0,0 +1,72 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('acls', {
+        description: 'Get all of the current user acls',
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: '/acls',
+            verb: 'GET'
+        }
+    });
+
+    const staticAcls = new Map();
+    const app = require('vn-loopback/server/server');
+    app.on('started', function() {
+        for (const model of app.models()) {
+            for (const acl of model.settings.acls) {
+                if (acl.principalType == 'ROLE' && acl.permission == 'ALLOW') {
+                    const staticAcl = {
+                        model: model.name,
+                        property: '*',
+                        accessType: acl.accessType,
+                        permission: acl.permission,
+                        principalType: acl.principalType,
+                        principalId: acl.principalId,
+                    };
+                    if (staticAcls.has(acl.principalId))
+                        staticAcls.get(acl.principalId).push(staticAcl);
+                    else
+                        staticAcls.set(acl.principalId, [staticAcl]);
+                }
+            }
+        }
+    });
+
+    Self.acls = async function(ctx) {
+        const models = Self.app.models;
+        const acls = [];
+        const userId = ctx.req.accessToken.userId;
+        if (userId) {
+            const roleMapping = await models.RoleMapping.find({
+                where: {
+                    principalId: userId
+                },
+                include: [
+                    {
+                        relation: 'role',
+                        scope: {
+                            fields: [
+                                'name'
+                            ]
+                        }
+                    }
+                ]
+            });
+            const dynamicAcls = await models.ACL.find({
+                where: {
+                    principalId: {
+                        inq: roleMapping.map(rm => rm.role().name)
+                    }
+                }
+            });
+            dynamicAcls.forEach(acl => acls.push(acl));
+            staticAcls.get('$authenticated').forEach(acl => acls.push(acl));
+        } else
+            staticAcls.get('$unauthenticated').forEach(acl => acls.push(acl));
+
+        staticAcls.get('$everyone').forEach(acl => acls.push(acl));
+        return acls;
+    };
+};

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

@@ -12,38 +12,55 @@ module.exports = Self => {
         http: {
             path: `/renewToken`,
             verb: 'POST'
-        }
-    });
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']});
 
     Self.renewToken = async function(ctx) {
-        const {accessToken: token} = ctx.req;
+        let createTokenOptions = {};
+        let token; let isNotExceeded;
+        try {
+            token = ctx.req.accessToken;
 
-        // Check if current token is valid
+            const {courtesyTime} = await models.AccessTokenConfig.findOne({
+                fields: ['courtesyTime']
+            });
+            isNotExceeded = await Self.validateToken(ctx);
+            if (isNotExceeded)
+                return token;
 
-        const {renewPeriod, courtesyTime} = await models.AccessTokenConfig.findOne({
-            fields: ['renewPeriod', 'courtesyTime']
-        });
-        const now = Date.now();
-        const differenceMilliseconds = now - token.created;
-        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
-        const isNotExceeded = differenceSeconds < renewPeriod - courtesyTime;
-        if (isNotExceeded)
-            return token;
-
-        // Schedule to remove current token
-        setTimeout(async() => {
-            try {
-                await Self.logout(token.id);
-            } catch (err) {
+            // Schedule to remove current token
+            setTimeout(async() => {
+                let exists;
+                try {
+                    exists = await models.AccessToken.findById(token.id);
+                    exists && await Self.logout(token.id);
+                } catch (error) {
                 // eslint-disable-next-line no-console
-                console.error(err);
-            }
-        }, courtesyTime * 1000);
+                    console.error(error);
+                    const body = {error: error.message, now: Date.now(), userId: token?.userId ?? null, exists};
+                    await handleError(body);
+                    throw new Error(error);
+                }
+            }, courtesyTime * 1000);
 
-        // Create new accessToken
-        const user = await Self.findById(token.userId);
-        const accessToken = await user.createAccessToken();
+            // Get scopes
+            const {scopes} = token;
+            if (scopes)
+                createTokenOptions = {scopes: [scopes[0]]};
+            // Create new accessToken
+            const user = await Self.findById(token.userId);
+            const accessToken = await user.accessTokens.create(createTokenOptions);
 
-        return {id: accessToken.id, ttl: accessToken.ttl};
+            return {id: accessToken.id, ttl: accessToken.ttl};
+        } catch (error) {
+            const body = {error: error.message, now: Date.now(), userId: token?.userId ?? null, createTokenOptions, isNotExceeded};
+            await handleError(body);
+            throw new Error(error);
+        }
     };
 };
+
+async function handleError(body, tag = 'renewToken') {
+    body = JSON.stringify(body);
+    await models.Application.rawSql('CALL util.debugAdd(?,?);', [tag, body]);
+}

back/methods/vn-user/specs/acls.spec.js

@@ -0,0 +1,27 @@
+const {models} = require('vn-loopback/server/server');
+const id = {administrative: 5, employee: 1, productionBoss: 50};
+
+describe('VnUser acls()', () => {
+    it('should get its owns acls', async() => {
+        expect(await hasAcl('administrative', id.administrative)).toBeTruthy();
+        expect(await hasAcl('productionBoss', id.productionBoss)).toBeTruthy();
+    });
+
+    it('should not get administrative acls', async() => {
+        expect(await hasAcl('administrative', id.employee)).toBeFalsy();
+    });
+
+    it('should get the $authenticated acls', async() => {
+        expect(await hasAcl('$authenticated', id.employee)).toBeTruthy();
+    });
+
+    it('should get the $everyone acls', async() => {
+        expect(await hasAcl('$everyone', id.employee)).toBeTruthy();
+    });
+});
+
+const hasAcl = async(role, userId) => {
+    const ctx = {req: {accessToken: {userId}, headers: {origin: 'http://localhost'}}};
+    const acls = await models.VnUser.acls(ctx);
+    return Object.values(acls).some(acl => acl.principalId === role);
+};

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

@@ -28,11 +28,25 @@ describe('Renew Token', () => {
     });
 
     it('should renew token', async() => {
+        const {courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['courtesyTime']
+        });
         const mockDate = new Date(startingTime + 26600000);
         jasmine.clock().mockDate(mockDate);
         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((courtesyTime + 10) * 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() => {
@@ -47,4 +61,21 @@ describe('Renew Token', () => {
         expect(error).toBeUndefined();
         expect(response.id).toEqual(ctx.req.accessToken.id);
     });
+
+    it('throw error', async() => {
+        let error;
+
+        try {
+            await models.VnUser.renewToken({req: {token: null}});
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error).toBeDefined();
+        const query = 'SELECT * FROM util.debug';
+
+        const debugLog = await models.Application.rawSql(query, null);
+
+        expect(debugLog.length).toEqual(1);
+    });
 });

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() => {
-        const multimediaToken = await models.VnUser.shareToken(ctx);
+    beforeEach(async() => {
+        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/methods/vn-user/validate-token.js

@@ -0,0 +1,30 @@
+const {models} = require('vn-loopback/server/server');
+module.exports = Self => {
+    Self.remoteMethodCtx('validateToken', {
+        description: 'Validates the current logged user token',
+        accepts: [],
+        accessType: 'READ',
+        returns: {
+            type: 'Boolean',
+            root: true
+        },
+        http: {
+            path: `/validateToken`,
+            verb: 'GET'
+        }
+    });
+
+    Self.validateToken = async function(ctx) {
+        const {accessToken: token} = ctx.req;
+
+        // Check if current token is valid
+        const {renewPeriod, courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['renewPeriod', 'courtesyTime']
+        });
+        const now = Date.now();
+        const differenceMilliseconds = now - token.created;
+        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+        const isNotExceeded = differenceSeconds < renewPeriod - courtesyTime;
+        return isNotExceeded;
+    };
+};

back/model-config.json

@@ -64,6 +64,9 @@
     "EmailUser": {
         "dataSource": "vn"
     },
+    "Expedition_PrintOut": {
+        "dataSource": "vn"
+    },
     "Image": {
         "dataSource": "vn"
     },
@@ -124,6 +127,9 @@
     "Postcode": {
         "dataSource": "vn"
     },
+    "ReferenceRate": {
+        "dataSource": "vn"
+    },
     "SageWithholding": {
         "dataSource": "vn"
     },
@@ -174,5 +180,17 @@
     },
     "WorkerActivityType": {
         "dataSource": "vn"
+    },
+    "ProductionConfig": {
+        "dataSource": "vn"
+    },
+    "AgencyLog": {
+        "dataSource": "vn"
+    },
+    "AgencyWorkCenter": {
+        "dataSource": "vn"
+    },
+    "RouteConfig": {
+        "dataSource": "vn"
     }
 }

back/models/agency-log.json

@@ -0,0 +1,9 @@
+{
+	"name": "AgencyLog",
+	"base": "Log",
+	"options": {
+		"mysql": {
+			"table": "agencyLog"
+		}
+	}
+}

back/models/agency-workCenter.js

@@ -0,0 +1,8 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`This workCenter is already assigned to this agency`);
+        return err;
+    });
+};

back/models/agency-workCenter.json

@@ -0,0 +1,41 @@
+{
+  "name": "AgencyWorkCenter",
+  "base": "VnModel",
+  "options": {
+    "mysql": {
+      "table": "agencyWorkCenter"
+    }
+  },
+  "properties": {
+    "id": {
+      "id": true,
+      "type": "number",
+      "forceId": false
+    },
+    "agencyFk": {
+      "type": "number",
+      "required": false
+    },
+    "workCenterFk": {
+      "type": "number",
+      "required": false
+    }
+  },
+  "relations": {
+    "agency": {
+			"type": "belongsTo",
+			"model": "WorkCenter",
+			"foreignKey": "agencyFk"
+		},
+    "workCenter": {
+			"type": "belongsTo",
+			"model": "WorkCenter",
+			"foreignKey": "workCenterFk"
+		}
+  },
+  "scope": {
+    "include":{
+       "relation": "workCenter"
+      }
+  }
+}

back/models/collection.js

@@ -3,6 +3,7 @@ module.exports = Self => {
     require('../methods/collection/setSaleQuantity')(Self);
     require('../methods/collection/previousLabel')(Self);
     require('../methods/collection/getTickets')(Self);
+    require('../methods/collection/assignCollection')(Self);
     require('../methods/collection/assign')(Self);
     require('../methods/collection/getSales')(Self);
 };

back/models/collection.json

@@ -1,6 +1,21 @@
 {
     "name": "Collection",
     "base": "VnModel",
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "required": true
+        },
+        "workerFk": {
+            "type": "number"
+        }
+    },
+    "options": {
+		"mysql": {
+			"table": "collection"
+		}
+	},
     "acls": [{
         "property": "validations",
         "accessType": "EXECUTE",
@@ -9,4 +24,3 @@
         "permission": "ALLOW"
 	}]
 }
-  

back/models/country.json

@@ -13,7 +13,7 @@
             "id": true,
             "description": "Identifier"
         },
-        "country": {
+        "name": {
             "type": "string",
             "required": true
         },

back/models/expedition_PrintOut.json

@@ -0,0 +1,19 @@
+{
+    "name": "Expedition_PrintOut",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "dipole.expedition_PrintOut"
+        }
+    },
+    "properties": {
+        "expeditionFk": {
+            "type": "number",
+            "id": true,
+            "description": "id expeditionFk"
+        },
+        "itemFk": {
+            "type": "number"
+        }
+    }
+}

back/models/mrw-config.json

@@ -27,6 +27,18 @@
 		},
 		"subscriberCode": {
 			"type": "string"
+		},
+		"defaultHeight": {
+			"type": "number"
+		},
+		"defaultLength": {
+			"type": "number"
+		},
+		"defaultWidth": {
+			"type": "number"
+		},
+		"defaultWeight": {
+			"type": "number"
 		}
 	}
 }

back/models/production-config.json

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

back/models/reference-rate.json

@@ -0,0 +1,36 @@
+{
+    "name": "ReferenceRate",
+    "base": "PersistedModel",
+    "options": {
+        "mysql": {
+            "table": "referenceRate"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "currencyFk": {
+            "type": "number",
+            "required": true
+        },
+        "dated": {
+            "type": "date",
+            "required": true
+        },
+        "value": {
+            "type": "number",
+            "required": true
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/routeConfig.json

@@ -0,0 +1,18 @@
+{
+    "name": "RouteConfig",
+	"base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "routeConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "description": "Identifier"
+        },
+        "kmMax": {
+            "type": "number"
+        }
+    }
+}

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: notificationSubscriptionId}, options);
+            await models.NotificationSubscription.destroyAll({id: 2}, 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: notificationSubscriptionId}, options);
+            await models.NotificationSubscription.destroyAll({id: 6}, 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: notificationSubscriptionId}, options);
+            await models.NotificationSubscription.destroyAll({id: 4}, options);
 
             await tx.rollback();
         } catch (e) {

back/models/vn-user.js

@@ -15,6 +15,8 @@ module.exports = function(Self) {
     require('../methods/vn-user/renew-token')(Self);
     require('../methods/vn-user/share-token')(Self);
     require('../methods/vn-user/update-user')(Self);
+    require('../methods/vn-user/validate-token')(Self);
+    require('../methods/vn-user/acls')(Self);
 
     Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
 

back/models/vn-user.json

@@ -113,6 +113,13 @@
             "principalId": "$everyone",
             "permission": "ALLOW"
         },
+        {
+            "property": "validateToken",
+			"accessType": "EXECUTE",
+			"principalType": "ROLE",
+			"principalId": "$authenticated",
+			"permission": "ALLOW"
+		},
         {
             "property": "privileges",
             "accessType": "*",
@@ -133,6 +140,13 @@
             "principalType": "ROLE",
             "principalId": "$authenticated",
             "permission": "ALLOW"
+        },
+        {
+			"property": "acls",
+			"accessType": "*",
+			"principalType": "ROLE",
+			"principalId": "$everyone",
+			"permission": "ALLOW"
         }
     ],
     "scopes": {

back/tests-helper.js

@@ -17,6 +17,7 @@ async function init() {
             err => err ? reject(err) : resolve());
     });
     // FIXME: Workaround to wait for loopback to be ready
+    app.emit('started');
     await app.models.Application.status();
 }
 

changelog.sh

@@ -0,0 +1,34 @@
+features_types=(chore feat style)
+changes_types=(refactor perf)
+fix_types=(fix revert)
+file="CHANGELOG.md"
+file_tmp="temp_log.txt"
+file_current_tmp="temp_current_log.txt"
+
+setType(){
+    echo "### $1" >> $file_tmp
+    arr=("$@")
+    echo "" > $file_current_tmp
+    for i in "${arr[@]}"
+    do
+        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
+    done
+    # remove duplicates
+    sort -o $file_current_tmp -u $file_current_tmp
+    cat $file_current_tmp >> $file_tmp
+    echo "" >> $file_tmp
+    # remove tmp current file
+    [ -e $file_current_tmp ] && rm $file_current_tmp
+}
+
+echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
+echo "" >> $file_tmp
+
+setType "Added 🆕" "${features_types[@]}"
+setType "Changed 📦" "${changes_types[@]}"
+setType "Fixed 🛠️" "${fix_types[@]}"
+
+cat $file >> $file_tmp
+mv $file_tmp $file
+
+

commitlint.config.js

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

db/.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

db/.pullinfo.json

@@ -9,7 +9,7 @@
     },
     "vn": {
       "view": {
-        "expeditionPallet_Print": "288cbd6e8289df083ed5eb1a2c808f7a82ba4c90c8ad9781104808a7a54471fb"
+        "expeditionPallet_Print": "ced2b84a114fcb99fce05f0c34f4fc03f3fa387bef92621be1bc306608a84345"
       }
     }
   }

db/changes/240404/00-revokeMailAliasAccount.sql

@@ -1,5 +0,0 @@
-DELETE FROM salix.ACL
-	WHERE model = 'MailAliasAccount'
-		AND property = 'canEditAlias'
-		AND principalType = 'ROLE'
-		AND principalId = 'marketingBoss';

db/dbWatcher.js

@@ -0,0 +1,24 @@
+const fs = require('fs');
+const {spawn} = require('child_process');
+
+function watchDatabaseChanges() {
+    console.log('Watching for changes in db/routines and db/versions');
+    fs.watch('db', {recursive: true}, (eventType, filename) => {
+        if (filename.endsWith('.sql')) {
+            let command;
+            if (filename.startsWith('routines')) command = 'push';
+            else if (filename.startsWith('versions')) command = 'run';
+
+            if (command) {
+                const process = spawn('myt', [command]);
+                process.stdout.on('data', data => console.log(data.toString()));
+                process.stderr.on('data', data => console.error(`stderr: ${data}`));
+                process.on('error', error => console.error(`error: ${error.message}`));
+                process.on('close', () => console.log('Watching for changes in db/routines and db/versions'));
+            }
+        }
+    });
+}
+
+if (require.main === module) watchDatabaseChanges();
+module.exports = watchDatabaseChanges;

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','10943','fbdebad12c9b306004dee3fba252c1fc4613584e','2024-03-07 10:29:57','10943');
+INSERT INTO `version` VALUES ('vn-database','11114','cf0f80142fed798c3307565a69158d7dba9276c4','2024-06-25 09:25:54','11115');
 
 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);
@@ -581,6 +581,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10825','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10827','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-23 12:32:13',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10828','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10828','01-RevokeClientes_regalos_lista.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10832','00-newWareHouse.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_commit.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_rollback.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_start.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
@@ -650,6 +651,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10855','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10856','00-cloneAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10857','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10858','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10859','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:25',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10861','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterAgencyTermConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterGastosResumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
@@ -672,14 +674,24 @@ INSERT INTO `versionLog` VALUES ('vn-database','10874','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10876','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10878','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10879','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10880','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10881','00-alterTableNotification.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10881','01-notification.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10882','00-vehicle.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10883','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10884','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10885','00-revokeUpdateClient.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10887','00-schemaAndUser.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10887','01-tables.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10888','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-16 07:39:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10889','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-23 09:55:56',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10890','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10891','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10892','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10893','00-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10895','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10895','01-secondScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10895','02-thirdScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','01-financialProductType.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','02-flight.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','03-gastos_resumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:00',NULL,NULL);
@@ -695,17 +707,161 @@ 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);
 INSERT INTO `versionLog` VALUES ('vn-database','10908','00-createSupplierDms.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10909','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-26 11:07:35',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10912','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:25',NULL,NULL);
+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);
+INSERT INTO `versionLog` VALUES ('vn-database','10923','00-createParkingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10923','01-aclParkingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10924','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10925','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
+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','10944','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',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','10950','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',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);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','03-hedera.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','04-pbx.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','05-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','06-salix.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','06-srt.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','07-util.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','08-vn.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','08-vn2.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10955','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:16',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10956','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+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','10978','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:33',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10984','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',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);
+INSERT INTO `versionLog` VALUES ('vn-database','10990','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10991','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10992','00-acl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10992','00-referenceRate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10994','00-modifyAcls.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10995','01-agencyLogCreate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10995','02-agencyWorkCenterCreate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10995','03-tableAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10996','00-dropOrderRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10996','01-dropTicketRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10996','02-dropTravelRecalc.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:31:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10997','00-groupingMode.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11000','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:16',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11001','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11002','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11003','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11006','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:16',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11007','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11008','00-alter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11010','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11012','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11013','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11014','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11015','00-photoMotivation.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11016','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-27 13:16:09',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11018','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-07 07:34:21',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11019','00-locker.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11019','01-aclLocker.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11021','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-30 09:07:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11022','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11026','00-entryAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11026','01-entryUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11026','02-entryInternal.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11030','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11031','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-14 07:45:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11033','00-rollbackAcls.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-07 12:45:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11034','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11037','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11038','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11040','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:31',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11044','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:31',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11045','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-10 14:53:29',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11046','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11050','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11050','01-elementFilter.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11051','00-sipConfig_callLimit.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-14 14:31:10',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11054','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11055','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11057','00-part.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11057','01-part.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11057','02-part.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11057','03-part.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11058','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11059','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11060','00-createRoleReviewer.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11061','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11063','00-roadmapAddress.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11063','01-roadmapStop.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11063','02-roadmapStopGrants.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11064','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11065','00-modifyInvoiceInPrivileges.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11065','01-modifyInvoiceInAcls.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11068','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11069','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11070','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11071','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-28 07:32:48',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11074','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11075','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-05-28 12:54:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11078','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11079','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-31 08:22:10',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11080','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-05-31 12:01:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11082','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11083','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-03 10:46:36',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11084','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11087','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:38:13',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11089','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:16',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11090','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 08:32:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11092','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-07 08:21:23',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11093','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:16',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11096','00-addBuyerAcl.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-11 12:48:51',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11105','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-06-20 15:36:07',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11106','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:49',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11109','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-18 19:09:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11114','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-06-25 08:39:49',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -720,8 +876,8 @@ INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 09:04:5
 INSERT INTO `role` VALUES (2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 09:04:58','2023-06-02 22:33:28',NULL);
 INSERT INTO `role` VALUES (3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
 INSERT INTO `role` VALUES (5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
-INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
-INSERT INTO `role` VALUES (9,'developer','Desarrolladores del sistema',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
+INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios no autenticados',1,'2017-05-19 09:04:58','2024-04-06 12:05:08',1437);
+INSERT INTO `role` VALUES (9,'developer','Desarrollador raso',1,'2017-05-19 09:04:58','2024-03-27 14:14:58',1437);
 INSERT INTO `role` VALUES (11,'account','Privilegios relacionados con el login',0,'2017-05-19 09:04:58','2017-09-20 19:06:35',NULL);
 INSERT INTO `role` VALUES (13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 09:04:58','2021-06-30 15:29:30',NULL);
 INSERT INTO `role` VALUES (15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 09:04:58','2018-02-12 11:50:10',NULL);
@@ -789,18 +945,19 @@ INSERT INTO `role` VALUES (109,'salesTeamBoss','Jefe de equipo de comerciales',1
 INSERT INTO `role` VALUES (110,'palletizer','Paletizadores',1,'2022-12-02 13:56:22','2022-12-02 13:56:30',NULL);
 INSERT INTO `role` VALUES (111,'entryEditor','Entry editor',1,'2023-01-13 12:21:55','2023-01-13 12:21:55',NULL);
 INSERT INTO `role` VALUES (112,'maintenance','Personal de mantenimiento',1,'2023-01-19 07:23:35','2023-01-19 07:23:35',NULL);
-INSERT INTO `role` VALUES (114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 07:31:16','2023-05-17 13:07:21',NULL);
+INSERT INTO `role` VALUES (114,'maintenanceBoss','Jefe de mantenimiento',1,'2023-01-19 07:31:16','2024-06-14 08:56:41',19295);
 INSERT INTO `role` VALUES (115,'itManagement','TI management',1,'2023-03-29 09:27:55','2023-03-29 09:28:04',NULL);
 INSERT INTO `role` VALUES (119,'palletizerBoss','Jefe de paletizadores',1,'2023-06-07 13:51:54','2023-06-07 13:51:54',NULL);
 INSERT INTO `role` VALUES (120,'developerBoss','Jefe de proyecto de desarrollo',1,'2023-06-19 09:07:21','2023-06-19 09:07:21',21709);
 INSERT INTO `role` VALUES (121,'buyerSalesAssistant','Rol para compradores que también son responsables de ventas',1,'2023-06-23 16:48:19','2023-06-23 16:48:19',NULL);
-INSERT INTO `role` VALUES (122,'logisticAssistant','Jefe auxiliar de logística',1,'2023-06-26 09:21:15','2023-06-26 09:21:15',NULL);
+INSERT INTO `role` VALUES (122,'logisticAssist','Jefe auxiliar de logística',1,'2023-06-26 09:21:15','2024-03-15 13:38:26',19295);
 INSERT INTO `role` VALUES (123,'deliveryAssistant','Jefe auxiliar repartos',1,'2023-10-05 08:47:48','2023-10-05 08:47:48',10578);
 INSERT INTO `role` VALUES (124,'hrBuyer','Recursos Humanos con Buyer',1,'2023-10-23 13:50:43','2023-10-23 13:50:43',NULL);
 INSERT INTO `role` VALUES (125,'claimViewer','Trabajadores que consulta las reclamaciones ',1,'2023-11-16 09:14:46','2023-11-16 09:14:46',10578);
 INSERT INTO `role` VALUES (126,'greenhouseBoss','Jefe de invernadero',1,'2023-11-16 14:32:13','2023-11-16 14:32:13',NULL);
 INSERT INTO `role` VALUES (127,'timeControl','Tablet para fichar',1,'2024-01-09 16:36:56','2024-01-09 16:36:56',NULL);
 INSERT INTO `role` VALUES (129,'buyerAssistant','Comprador que tienes mas permisos para ayudar al buyerBoss en algunas tareas',1,'2024-02-06 06:59:12','2024-02-06 06:59:12',783);
+INSERT INTO `role` VALUES (130,'reviewer','Revisor de producción',1,'2024-06-11 00:00:00','2024-06-11 00:00:00',10578);
 
 INSERT INTO `roleInherit` VALUES (1,1,2,NULL);
 INSERT INTO `roleInherit` VALUES (2,1,3,NULL);
@@ -827,7 +984,6 @@ INSERT INTO `roleInherit` VALUES (27,21,53,NULL);
 INSERT INTO `roleInherit` VALUES (28,22,13,NULL);
 INSERT INTO `roleInherit` VALUES (29,22,21,NULL);
 INSERT INTO `roleInherit` VALUES (30,30,5,NULL);
-INSERT INTO `roleInherit` VALUES (31,30,20,NULL);
 INSERT INTO `roleInherit` VALUES (32,30,22,NULL);
 INSERT INTO `roleInherit` VALUES (33,30,53,NULL);
 INSERT INTO `roleInherit` VALUES (34,30,64,NULL);
@@ -992,7 +1148,6 @@ INSERT INTO `roleInherit` VALUES (249,109,18,NULL);
 INSERT INTO `roleInherit` VALUES (250,109,13,NULL);
 INSERT INTO `roleInherit` VALUES (251,51,21,NULL);
 INSERT INTO `roleInherit` VALUES (253,48,49,NULL);
-INSERT INTO `roleInherit` VALUES (254,110,1,NULL);
 INSERT INTO `roleInherit` VALUES (255,110,76,NULL);
 INSERT INTO `roleInherit` VALUES (256,48,69,NULL);
 INSERT INTO `roleInherit` VALUES (257,47,111,NULL);
@@ -1036,7 +1191,6 @@ INSERT INTO `roleInherit` VALUES (312,115,120,NULL);
 INSERT INTO `roleInherit` VALUES (314,43,18,NULL);
 INSERT INTO `roleInherit` VALUES (315,121,35,NULL);
 INSERT INTO `roleInherit` VALUES (316,121,21,NULL);
-INSERT INTO `roleInherit` VALUES (317,122,15,NULL);
 INSERT INTO `roleInherit` VALUES (318,16,122,NULL);
 INSERT INTO `roleInherit` VALUES (319,37,49,NULL);
 INSERT INTO `roleInherit` VALUES (320,37,18,NULL);
@@ -1061,11 +1215,19 @@ INSERT INTO `roleInherit` VALUES (353,110,49,NULL);
 INSERT INTO `roleInherit` VALUES (354,103,119,NULL);
 INSERT INTO `roleInherit` VALUES (355,127,11,NULL);
 INSERT INTO `roleInherit` VALUES (356,123,125,NULL);
-INSERT INTO `roleInherit` VALUES (357,36,35,NULL);
 INSERT INTO `roleInherit` VALUES (358,36,49,NULL);
 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 `roleInherit` VALUES (365,123,119,NULL);
+INSERT INTO `roleInherit` VALUES (366,30,37,NULL);
+INSERT INTO `roleInherit` VALUES (367,30,73,NULL);
+INSERT INTO `roleInherit` VALUES (368,130,49,10578);
+INSERT INTO `roleInherit` VALUES (369,50,130,10578);
+INSERT INTO `roleInherit` VALUES (370,72,130,10578);
+INSERT INTO `roleInherit` VALUES (371,36,35,NULL);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -1159,7 +1321,7 @@ INSERT INTO `ACL` VALUES (105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketin
 INSERT INTO `ACL` VALUES (106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss');
 INSERT INTO `ACL` VALUES (108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss');
 INSERT INTO `ACL` VALUES (109,'UserConfig','*','*','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (110,'Bank','*','READ','ALLOW','ROLE','trainee');
+INSERT INTO `ACL` VALUES (110,'Accounting','*','READ','ALLOW','ROLE','trainee');
 INSERT INTO `ACL` VALUES (111,'ClientLog','*','READ','ALLOW','ROLE','trainee');
 INSERT INTO `ACL` VALUES (112,'Defaulter','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (113,'ClientRisk','*','READ','ALLOW','ROLE','trainee');
@@ -1247,10 +1409,9 @@ INSERT INTO `ACL` VALUES (211,'TravelLog','*','READ','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (212,'Thermograph','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (214,'Entry','*','*','ALLOW','ROLE','buyer');
-INSERT INTO `ACL` VALUES (215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (216,'TravelThermograph','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (218,'Intrastat','*','*','ALLOW','ROLE','buyer');
-INSERT INTO `ACL` VALUES (221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account');
+INSERT INTO `ACL` VALUES (221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','guest');
 INSERT INTO `ACL` VALUES (226,'ClientObservation','*','READ','ALLOW','ROLE','trainee');
 INSERT INTO `ACL` VALUES (227,'Address','*','READ','ALLOW','ROLE','trainee');
 INSERT INTO `ACL` VALUES (228,'AddressObservation','*','READ','ALLOW','ROLE','trainee');
@@ -1279,7 +1440,7 @@ INSERT INTO `ACL` VALUES (259,'Client','createReceipt','*','ALLOW','ROLE','sales
 INSERT INTO `ACL` VALUES (260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (261,'SupplierAccount','*','*','ALLOW','ROLE','administrative');
 INSERT INTO `ACL` VALUES (262,'Entry','*','*','ALLOW','ROLE','administrative');
-INSERT INTO `ACL` VALUES (263,'InvoiceIn','*','*','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (263,'InvoiceIn','*','READ','ALLOW','ROLE','administrative');
 INSERT INTO `ACL` VALUES (264,'StarredModule','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss');
 INSERT INTO `ACL` VALUES (266,'ZoneLog','*','READ','ALLOW','ROLE','employee');
@@ -1294,7 +1455,7 @@ INSERT INTO `ACL` VALUES (274,'InvoiceInLog','*','READ','ALLOW','ROLE','administ
 INSERT INTO `ACL` VALUES (275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant');
-INSERT INTO `ACL` VALUES (279,'MailAlias','*','*','ALLOW','ROLE','marketing');
+INSERT INTO `ACL` VALUES (279,'MailAlias','*','READ','ALLOW','ROLE','marketing');
 INSERT INTO `ACL` VALUES (283,'EntryObservation','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin');
 INSERT INTO `ACL` VALUES (285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin');
@@ -1346,7 +1507,6 @@ INSERT INTO `ACL` VALUES (338,'Shelving','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (339,'OsTicket','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (340,'OsTicketConfig','*','*','ALLOW','ROLE','it');
 INSERT INTO `ACL` VALUES (341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (345,'Ticket','deliveryNoteCsvEmail','READ','ALLOW','ROLE','employee');
@@ -1391,8 +1551,10 @@ INSERT INTO `ACL` VALUES (383,'Sector','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (384,'Sector','*','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer');
+INSERT INTO `ACL` VALUES (387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','$owner');
 INSERT INTO `ACL` VALUES (388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager');
+INSERT INTO `ACL` VALUES (390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager');
 INSERT INTO `ACL` VALUES (391,'Notification','*','WRITE','ALLOW','ROLE','system');
 INSERT INTO `ACL` VALUES (392,'Boxing','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (393,'Url','*','READ','ALLOW','ROLE','employee');
@@ -1519,7 +1681,7 @@ INSERT INTO `ACL` VALUES (522,'Client','replaceOrCreate','*','ALLOW','ROLE','emp
 INSERT INTO `ACL` VALUES (523,'Client','updateAll','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (524,'Client','upsertWithWhere','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (525,'Defaulter','observationEmail','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (527,'VnUser','acl','READ','ALLOW','ROLE','account');
+INSERT INTO `ACL` VALUES (527,'VnUser','acl','READ','ALLOW','ROLE','guest');
 INSERT INTO `ACL` VALUES (528,'VnUser','getCurrentUserData','READ','ALLOW','ROLE','account');
 INSERT INTO `ACL` VALUES (530,'Account','exists','READ','ALLOW','ROLE','account');
 INSERT INTO `ACL` VALUES (531,'Account','exists','READ','ALLOW','ROLE','account');
@@ -1565,7 +1727,7 @@ INSERT INTO `ACL` VALUES (570,'InvoiceOut','canCreatePdf','WRITE','ALLOW','ROLE'
 INSERT INTO `ACL` VALUES (571,'Supplier','editPayMethodCheck','WRITE','ALLOW','ROLE','financial');
 INSERT INTO `ACL` VALUES (572,'Worker','isTeamBoss','WRITE','ALLOW','ROLE','teamBoss');
 INSERT INTO `ACL` VALUES (573,'Worker','forceIsSubordinate','READ','ALLOW','ROLE','hr');
-INSERT INTO `ACL` VALUES (574,'Claim','editState','WRITE','ALLOW','ROLE','claimManager');
+INSERT INTO `ACL` VALUES (574,'Claim','editPickup','WRITE','ALLOW','ROLE','claimManager');
 INSERT INTO `ACL` VALUES (577,'Claim','findOne','READ','ALLOW','ROLE','salesPerson');
 INSERT INTO `ACL` VALUES (579,'Claim','updateClaim','WRITE','ALLOW','ROLE','salesPerson');
 INSERT INTO `ACL` VALUES (580,'Claim','regularizeClaim','WRITE','ALLOW','ROLE','claimManager');
@@ -1645,10 +1807,6 @@ INSERT INTO `ACL` VALUES (686,'MailForward','*','*','ALLOW','ROLE','hr');
 INSERT INTO `ACL` VALUES (687,'ClientSms','find','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (688,'ClientSms','create','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss');
-INSERT INTO `ACL` VALUES (691,'Roadmap','*','*','ALLOW','ROLE','productionBoss');
-INSERT INTO `ACL` VALUES (692,'ExpeditionTruck','*','*','ALLOW','ROLE','production');
-INSERT INTO `ACL` VALUES (693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss');
 INSERT INTO `ACL` VALUES (695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative');
@@ -1684,7 +1842,7 @@ INSERT INTO `ACL` VALUES (727,'Account','find','READ','ALLOW','ROLE','employee')
 INSERT INTO `ACL` VALUES (728,'Account','exists','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (729,'Sale','clone','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (730,'Ticket','setDeleted','WRITE','ALLOW','ROLE','deliveryAssistant');
-INSERT INTO `ACL` VALUES (732,'Sale','isInPreparing','*','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (732,'Sale','isInPreparing','*','ALLOW','ROLE','reviewer');
 INSERT INTO `ACL` VALUES (733,'Train','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (734,'WorkerDepartment','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (735,'VnUser','higherPrivileges','*','ALLOW','ROLE','itManagement');
@@ -1717,7 +1875,7 @@ INSERT INTO `ACL` VALUES (761,'Route','downloadZip','READ','ALLOW','ROLE','emplo
 INSERT INTO `ACL` VALUES (762,'Route','filter','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (763,'Route','getByWorker','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (764,'Route','getDeliveryPoint','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (765,'Route','getExternalCmrs','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (765,'Route','cmrs','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (766,'Route','getSuggestedTickets','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (767,'Route','getTickets','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (768,'Route','guessPriority','WRITE','ALLOW','ROLE','employee');
@@ -1741,7 +1899,7 @@ INSERT INTO `ACL` VALUES (785,'VnRole','*','WRITE','ALLOW','ROLE','it');
 INSERT INTO `ACL` VALUES (786,'State','isAllEditable','READ','ALLOW','ROLE','delivery');
 INSERT INTO `ACL` VALUES (787,'Ticket','makePdfList','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (788,'Ticket','invoiceTicketsAndPdf','*','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (789,'InvoiceIn','*','*','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (789,'InvoiceIn','*','READ','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (790,'InvoiceIn','getSerial','READ','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (791,'InvoiceIn','corrective','WRITE','ALLOW','ROLE','administrative');
 INSERT INTO `ACL` VALUES (792,'InvoiceInCorrection','*','*','ALLOW','ROLE','administrative');
@@ -1753,6 +1911,78 @@ INSERT INTO `ACL` VALUES (797,'MrwConfig','createShipment','WRITE','ALLOW','ROLE
 INSERT INTO `ACL` VALUES (798,'MailAliasAccount','*','*','ALLOW','ROLE','itManagement');
 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 (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');
+INSERT INTO `ACL` VALUES (807,'MachineWorker','updateInTime','WRITE','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','employee');
+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 (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','*','*','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 `ACL` VALUES (826,'Ticket','editZone','WRITE','ALLOW','ROLE','salesAssistant');
+INSERT INTO `ACL` VALUES (827,'TicketWeekly','deleteById','WRITE','ALLOW','ROLE','buyerBoss');
+INSERT INTO `ACL` VALUES (828,'TicketWeekly','upsert','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (830,'InvoiceIn','*','READ','ALLOW','ROLE','deliveryBoss');
+INSERT INTO `ACL` VALUES (831,'InvoiceIn','exchangeRateUpdate','*','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (832,'AgencyLog','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (833,'AgencyWorkCenter','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (834,'AgencyMode','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (835,'Agency','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (836,'Agency','*','WRITE','ALLOW','ROLE','deliveryAssistant');
+INSERT INTO `ACL` VALUES (837,'AgencyWorkCenter','*','WRITE','ALLOW','ROLE','deliveryAssistant');
+INSERT INTO `ACL` VALUES (838,'Worker','getAvailablePda','READ','ALLOW','ROLE','hr');
+INSERT INTO `ACL` VALUES (839,'Locker','__get__codes','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (840,'Locker','*','*','ALLOW','ROLE','hr');
+INSERT INTO `ACL` VALUES (841,'Locker','*','*','ALLOW','ROLE','productionBoss');
+INSERT INTO `ACL` VALUES (842,'Worker','__get__locker','READ','ALLOW','ROLE','hr');
+INSERT INTO `ACL` VALUES (843,'Worker','__get__locker','READ','ALLOW','ROLE','productionBoss');
+INSERT INTO `ACL` VALUES (846,'Ticket','refund','WRITE','ALLOW','ROLE','logistic');
+INSERT INTO `ACL` VALUES (847,'RouteConfig','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (848,'InvoiceIn','updateInvoiceIn','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (849,'InvoiceIn','clone','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (850,'InvoiceIn','corrective','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (851,'InvoiceIn','exchangeRateUpdate','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (852,'InvoiceIn','invoiceInEmail','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (853,'InvoiceIn','toBook','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (854,'InvoiceIn','toUnbook','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (855,'InvoiceIn','deleteById','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (856,'InvoiceIn','updateInvoiceIn','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (857,'InvoiceIn','clone','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (858,'InvoiceIn','corrective','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (859,'InvoiceIn','exchangeRateUpdate','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (860,'InvoiceIn','invoiceInEmail','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (861,'InvoiceIn','toBook','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (862,'InvoiceIn','deleteById','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (863,'InvoiceIn','create','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (864,'InvoiceIn','create','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (865,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (866,'InvoiceOut','download','READ','ALLOW','ROLE','$owner');
+INSERT INTO `ACL` VALUES (867,'InvoiceIn','*','READ','ALLOW','ROLE','maintenanceBoss');
+INSERT INTO `ACL` VALUES (868,'InvoiceIn','*','READ','ALLOW','ROLE','maintenanceBos');
+INSERT INTO `ACL` VALUES (869,'Ticket','editZone','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (870,'Entry','find','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (871,'RoadmapAddress','*','WRITE','ALLOW','ROLE','palletizerBoss');
+INSERT INTO `ACL` VALUES (872,'RoadmapAddress','*','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (873,'Roadmap','*','WRITE','ALLOW','ROLE','palletizerBoss');
+INSERT INTO `ACL` VALUES (874,'Roadmap','*','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (875,'RoadmapStop','*','WRITE','ALLOW','ROLE','palletizerBoss');
+INSERT INTO `ACL` VALUES (876,'RoadmapStop','*','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (877,'TravelKgPercentage','*','READ','ALLOW','ROLE','employee');
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -1841,6 +2071,7 @@ INSERT INTO `defaultViewConfig` VALUES ('itemsIndex','{\"intrastat\":false,\"ste
 INSERT INTO `defaultViewConfig` VALUES ('latestBuys','{\"intrastat\":false,\"description\":false,\"density\":false,\"isActive\":false,\n	\"freightValue\":false,\"packageValue\":false,\"isIgnored\":false,\"price2\":false,\"ektFk\":false,\"weight\":false,\n	\"size\":false,\"comissionValue\":false,\"landing\":false}');
 INSERT INTO `defaultViewConfig` VALUES ('ticketsMonitor','{\"id\":false}');
 INSERT INTO `defaultViewConfig` VALUES ('clientsDetail','{\"id\":true,\"phone\":true,\"city\":true,\"socialName\":true,\"salesPersonFk\":true,\"email\":true,\"name\":false,\"fi\":false,\"credit\":false,\"creditInsurance\":false,\"mobile\":false,\"street\":false,\"countryFk\":false,\"provinceFk\":false,\"postcode\":false,\"created\":false,\"businessTypeFk\":false,\"payMethodFk\":false,\"sageTaxTypeFk\":false,\"sageTransactionTypeFk\":false,\"isActive\":false,\"isVies\":false,\"isTaxDataChecked\":false,\"isEqualizated\":false,\"isFreezed\":false,\"hasToInvoice\":false,\"hasToInvoiceByAddress\":false,\"isToBeMailed\":false,\"hasLcr\":false,\"hasCoreVnl\":false,\"hasSepaVnl\":false}');
+INSERT INTO `defaultViewConfig` VALUES ('routesList','{\"ID\":true,\"worker\":true,\"agency\":true,\"vehicle\":true,\"date\":true,\"volume\":true,\"description\":true,\"started\":true,\"finished\":true,\"actions\":true}');
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1898,6 +2129,7 @@ INSERT INTO `businessType` VALUES ('others','Otros');
 INSERT INTO `businessType` VALUES ('otherSector','Profesional de otro sector');
 INSERT INTO `businessType` VALUES ('restoration','Restauración');
 INSERT INTO `businessType` VALUES ('trainingCentre','Centro de formación');
+INSERT INTO `businessType` VALUES ('VIP','Very important person');
 INSERT INTO `businessType` VALUES ('wholesaler','Mayorista');
 INSERT INTO `businessType` VALUES ('worker','Trabajador');
 
@@ -2071,61 +2303,61 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');
 
-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,110,763,0,0,0,0,27,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (35,'finance','FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (36,'labor','LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,35,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',36,37,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',38,67,NULL,0,0,0,1,14,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',68,69,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',74,75,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',19,20,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL);
-INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',21,22,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',84,87,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',39,40,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,1,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (61,NULL,'VNH',90,93,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (80,NULL,'EQUIPO J VALLES',41,42,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,'5300');
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (89,NULL,'COORDINACION',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (90,NULL,'TRAILER',91,92,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',43,44,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (94,NULL,'EQUIPO J BROCAL',45,46,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',0,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL,'5100');
-INSERT INTO `department` VALUES (95,NULL,'EQUIPO C ZAMBRANO',47,48,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',0,'equipoczambrano@verdnatura.es',0,0,0,0,NULL,NULL,'5000');
-INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',49,50,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',51,52,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',53,54,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
-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);
-INSERT INTO `department` VALUES (125,NULL,'EQUIPO MIRIAM MAR',55,56,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200');
-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);
-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);
-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);
-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);
-INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',57,58,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',59,60,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'francia@verdnatura.es',0,0,0,0,NULL,NULL,'3300');
-INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',61,62,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500');
-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);
-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);
-INSERT INTO `department` VALUES (137,'sorter','SORTER',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (139,NULL,'EQUIPO J SORIA ',63,64,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,'5400');
-INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',65,66,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,110,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (35,'finance','FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (36,'labor','LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,35,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',36,37,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',38,69,NULL,0,0,0,1,15,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',76,77,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',39,40,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',19,20,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',21,22,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',84,87,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (61,NULL,'VNH',90,93,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',43,44,4250,0,0,0,2,0,43,'/1/43/','es5_equipo',1,'es5@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',91,92,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',45,46,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',47,48,3797,0,0,0,2,0,43,'/1/43/','es2_equipo',1,'es2@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',49,50,24065,0,0,0,2,0,43,'/1/43/','es1_equipo',1,'es1@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',51,52,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',53,54,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',55,56,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+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,'spainTeam3','EQUIPO ESPAÑA 3',57,58,1118,0,0,0,2,0,43,'/1/43/','es3_equipo',1,'es3@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,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,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,'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);
+INSERT INTO `department` VALUES (137,'sorter','SORTER',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',65,66,3803,0,0,0,2,0,43,'/1/43/','es4_equipo',1,'es4@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',67,68,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,NULL);
 
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
@@ -2428,7 +2660,7 @@ INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,1
 INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL);
 INSERT INTO `workCenter` VALUES (2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (3,'Marjales',26,20008,NULL,NULL,NULL,NULL);
-INSERT INTO `workCenter` VALUES (4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `workCenter` VALUES (4,'VNH',NULL,NULL,7,NULL,NULL,NULL);
 INSERT INTO `workCenter` VALUES (5,'Madrid',28,2869,5,'Av constitución 3',554145,2.00);
 INSERT INTO `workCenter` VALUES (6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL);
 INSERT INTO `workCenter` VALUES (7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL);
@@ -2456,7 +2688,7 @@ USE `cache`;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 INSERT INTO `cache` VALUES (1,'equalizator','00:19:00');
-INSERT INTO `cache` VALUES (2,'available','00:06:00');
+INSERT INTO `cache` VALUES (2,'available','00:01:00');
 INSERT INTO `cache` VALUES (3,'stock','00:30:00');
 INSERT INTO `cache` VALUES (4,'last_buy','23:59:00');
 INSERT INTO `cache` VALUES (5,'weekly_sales','12:00:00');

db/dump/.dump/privileges.sql

@@ -45,6 +45,7 @@ INSERT  IGNORE INTO `db` VALUES ('','account','salix','Y','Y','Y','Y','N','N','N
 INSERT  IGNORE INTO `db` VALUES ('','mysql','salix','Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','psico','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 ('','geo','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','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','tmp','guest','Y','Y','Y','Y','N','Y','N','N','N','N','Y','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','util','salix','Y','Y','Y','Y','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','dipole','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
@@ -77,6 +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','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 */;
@@ -90,7 +92,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','tagL10n','root@pc-jua
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','config','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','','Select');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','originL10n','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','origin','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','entryEditor','entry','guillermo@10.5.1.4','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','entryEditor','entry','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','social','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','image','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','guest','tblContadores','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','','Select');
@@ -132,7 +134,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','account','account','userPassword',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','account','mainAccountBank','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','itemCategory','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','psico','hr','answer','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','ticketDms','alexm@%','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','ticketDms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','employee','ekt','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','sage','administrative','taxType','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','psico','hr','fellow','alexm@%','0000-00-00 00:00:00','Select','');
@@ -301,7 +303,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','jerarquia'
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerBusinessAgreement','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','tarifa_componentes','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','tarifa_componentes_series','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','Entradas','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemType','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','cl_main','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','cl_main','alexm@%','0000-00-00 00:00:00','Select','');
@@ -325,35 +326,29 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','price_fixed','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','printQueue','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','preservedBoss','travel','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerAssistant','itemType','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','state','alexm@%','0000-00-00 00:00:00','Select','');
 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','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+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','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','edi_bucket_type','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','time','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','operator','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','payment','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 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','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Tintas','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','Movimientos','juan@%','0000-00-00 00:00:00','Insert,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Entradas','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Entradas','guillermo@10.5.1.3','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','ticket_observation','juan@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Entradas_dits','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','sale','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -369,9 +364,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','tickets_
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','tickets_gestdoc','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','tickets_gestdoc','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Tickets','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Entradas','root@localhost','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Entradas','alexm@%','0000-00-00 00:00:00','Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Tintas','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','filtros','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas_kop','alexm@%','0000-00-00 00:00:00','Select','');
@@ -420,9 +413,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Movimientos
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Movimientos_revisar','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','handmadeBoss','Reservas','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerBoss','bankEntity','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','bank','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Ordenes','alexm@%','0000-00-00 00:00:00','Select,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','bank','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','awb','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Origen','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','pago','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -431,12 +422,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_conceptos','alexm@%','0000-00-00 00:00:00','Select,Update','');
+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','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 +446,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','');
@@ -555,7 +546,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','client','alexm@%',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleVolume','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','awb_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos','alexm@%','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerAssistant','Cubos','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','routesMonitor','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','sale','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','sale','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Delete','Update');
@@ -606,7 +597,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','ektEntryAssign','a
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionBoss','itemShelving','root@localhost','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','propertyDms','juan@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerTimeControlConfig','juan@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','entry','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','Update');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','entry','guillermo@10.5.1.3','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','businessType','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','entryLog','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','projectState','alexm@%','0000-00-00 00:00:00','Select','');
@@ -633,7 +624,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','wks','alexm@%'
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','entryObservation','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','itemShelvingList','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','cmrConfig','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','expeditionTruck','alexm@%','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','expeditionTruck','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','alertLevel','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','expeditionSticker','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','artificialBoss','entryObservation','alexm@%','0000-00-00 00:00:00','Select','');
@@ -656,9 +647,9 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','pgcMaster','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','itemBarcode','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','host','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ticket','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceIn','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','invoiceIn','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','invoiceIn','alexm@%','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceIn','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','invoiceIn','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','Update');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','invoiceIn','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','inventoryFailure','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','intrastat','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','inventoryFailure','alexm@%','0000-00-00 00:00:00','Select','');
@@ -666,7 +657,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','inventoryFailureCause
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','invoiceCorrection','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceCorrectionDataSource','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','invoiceCorrectionType','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','invoiceIn','alexm@%','0000-00-00 00:00:00','Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','invoiceIn','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceInDueDay','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','invoiceInDueDay','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','invoiceInIntrastat__','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
@@ -757,8 +748,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','buy','alexm@%','0000-
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','buy','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','saleGoal','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','packager','packingSiteLog','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','component','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','Entradas','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','saleComponent','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','arcRead','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','clientProtected','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -780,8 +769,7 @@ 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','alexm@%','0000-00-00 00:00:00','Update','');
-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','buffer','guillermo@10.5.1.3','0000-00-00 00:00:00','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','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','person__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -796,7 +784,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','vehicleState
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','vehicleEvent','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','cooler','Tintas','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','itemBotanical','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','cooler','Entradas','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','account','developer','signInLog','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketTracking','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','deviceProductionState','alexm@%','0000-00-00 00:00:00','Select','');
@@ -859,7 +846,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','');
@@ -900,7 +886,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','calendar_employe
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','ticket','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticket','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketCollection','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','ticketDms','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','ticketDocumentation','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketDms','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','ektEntryAssign','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
@@ -953,8 +938,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','adminBoss','vehicle','alexm@%','0000-00-00 00:00:00','Delete','');
+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 ('','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','');
@@ -998,7 +982,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceCorre
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ink','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','zone','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','XDiario','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','XDiario','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','XDiario','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','workerTimeControlMail','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','workerTimeControl','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bi','financial','Greuge_Evolution','alexm@%','0000-00-00 00:00:00','Select','');
@@ -1064,7 +1048,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','userSession','j
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','receipt','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','buy','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','calendarHolidays','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','parking','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','parking','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','role','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','errorLogApp','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','continent','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1201,7 +1185,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','businessCalendar','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','employee','item','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicleNotes','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicleDms','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','palletizerBoss','expeditionTruck','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','invoiceInConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','palletizerBoss','zoneEvent','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','palletizerBoss','routesMonitor','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','propertyNotes','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
@@ -1217,7 +1201,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','');
@@ -1235,7 +1219,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','module','juan@
 INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','printConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','url','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','userConfigView','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRedelivery','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRedelivery','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientRisk','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','supplierDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','buyer','sale','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1255,7 +1239,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Recib
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Rutas','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Movimientos','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','state','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','route','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','route','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','routeComplement','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','deliveryMethod','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Tickets','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
@@ -1263,7 +1247,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','expeditio
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','expeditionScan','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','expeditionPallet','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','province','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','expeditionTruck','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','visitAccess','root@localhost','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_botanic_export','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','itemCost','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','deliveryAssistant','m3','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1311,15 +1295,16 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimState','juan@d
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','company','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','buffer','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','greuge','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','item','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Select,Update');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','item','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Select,Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','itemShelving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','negativeOrigin','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryBoss','Vehiculos_consumo','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','entryOrder','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDms','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ink','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','supplierDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','supplierDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','visitAgent','root@localhost','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','remittance','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','vehicleConsumption','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','vehicleConsumption','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
@@ -1362,6 +1347,81 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','warehousePickup','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','component','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','config','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Select');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','componentType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','priceFixed','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','itemShelvingSale','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','tagAbbreviation','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','ticketTracking','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','item','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Update');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','ticketDms','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','agencyExtraCharge','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','sale_freightComponent','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accounting','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','accounting','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','workerActivity','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ticketRequest','guillermo@10.5.1.3','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleState','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+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','buyer','edi_bucket','guillermo@db-proxy2.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','buyer','edi_bucket_type','guillermo@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','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','professionalCategory','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','ticketObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','deliveryNoteState','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','deliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','comparative','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','invoiceOutExpense','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','delivery','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','entry','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos_Retorno','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimDestination','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','entryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','sage','grafana','TiposIva','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','buyer','waste','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','visit','root@localhost','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerActivity','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','bankPolicy','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','bankPolicyDetail','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','bankPolicyReview','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','roadmapStop','guillermo@10.5.1.3','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','roadmapStop','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','agencyWorkCenter','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','roadmapStop','guillermo@10.5.1.3','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','entryEditor','Entradas','guillermo@10.5.1.3','0000-00-00 00:00:00','Insert','Update');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','clientInforma','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','solunionCAP','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','clientUnpaid','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','pay_dem','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','invoiceOut','guillermo@10.5.1.3','0000-00-00 00:00:00','Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','invoiceOut','guillermo@10.5.1.3','0000-00-00 00:00:00','Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','antenna','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','bufferPool','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','enteringLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','expeditionLoading','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','failureLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','movingLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','sorterLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1421,35 +1481,6 @@ INSERT  IGNORE INTO `columns_priv` VALUES ('','pbx','grafana','sip','user_id','0
 INSERT  IGNORE INTO `columns_priv` VALUES ('','pbx','grafana','sip','extension','0000-00-00 00:00:00','Select');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','account','grafana','user','name','0000-00-00 00:00:00','Select');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','account','grafana','user','active','0000-00-00 00:00:00','Select');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','id','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','supplierFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','dated','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','invoiceNumber','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','isExcludedFromAvailable','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','notes','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','isConfirmed','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','isOrdered','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','isRaid','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','commission','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','created','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','evaNotes','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','travelFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','currencyFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','companyFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','gestDocFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','invoiceInFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','isBlocked','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','loadPriority','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','kop','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','sub','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','pro','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','auction','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','invoiceAmount','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','buyerFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','typeFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','reference','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','observationEditorFk','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','entry','clonedFrom','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','routesMonitor','routeFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','routesMonitor','name','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','routesMonitor','beachFk','0000-00-00 00:00:00','Update');
@@ -1557,10 +1588,10 @@ INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','item','editorFk',
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','item','recycledPlastic','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','item','nonRecycledPlastic','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','item','minQuantity','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','size','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Id_Entrada','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','originFk','0000-00-00 00:00:00','Select,Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','longName','0000-00-00 00:00:00','Update');
-INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','name','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Id_Proveedor','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Fecha','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','id','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','warehouseFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','shipped','0000-00-00 00:00:00','Update');
@@ -1595,6 +1626,125 @@ INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','weight',
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','clonedFrom','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','cmrFk','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','editorFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','config','truckLength','0000-00-00 00:00:00','Select');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','production','item','isBoxPickingMode','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','supplierFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','dated','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','invoiceNumber','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isExcludedFromAvailable','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isConfirmed','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isOrdered','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','isRaid','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','commission','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','created','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','evaNotes','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','travelFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','currencyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','companyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','gestDocFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','invoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','loadPriority','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','kop','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','sub','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','pro','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','auction','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','invoiceAmount','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','buyerFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','typeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','reference','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','observationEditorFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','clonedFrom','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','editorFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','lockerUserFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','entryEditor','entry','locked','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Referencia','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Inventario','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Confirmada','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Pedida','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Redada','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','comision','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','odbc_date','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Notas_Eva','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','travel_id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','Id_Moneda','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','empresa_id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','gestdoc_id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','recibida_id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','loadPriority','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','kop','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','sub','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','pro','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','invoiceAmount','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','buyerFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','typeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn2008','entryEditor','Entradas','reference','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','serialNumber','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','serial','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','supplierFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','issued','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','supplierRef','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','currencyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','created','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','companyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','docFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','booked','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','operated','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','siiTypeInvoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','cplusRectificationTypeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','cplusSubjectOpFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','cplusTaxBreakFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','siiTrascendencyInvoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','bookEntried','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','isVatDeductible','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','withholdingSageFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','expenseFkDeductible','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','hrBoss','invoiceIn','editorFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','serialNumber','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','serial','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','supplierFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','issued','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','supplierRef','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','currencyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','created','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','companyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','docFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','booked','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','operated','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','siiTypeInvoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','cplusRectificationTypeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','cplusSubjectOpFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','cplusTaxBreakFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','siiTrascendencyInvoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','bookEntried','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','isVatDeductible','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','withholdingSageFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','expenseFkDeductible','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','invoiceIn','editorFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','serialNumber','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','serial','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','supplierFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','issued','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','supplierRef','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','currencyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','created','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','companyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','docFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','booked','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','operated','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','siiTypeInvoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','cplusRectificationTypeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','cplusSubjectOpFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','cplusTaxBreakFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','siiTrascendencyInvoiceInFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','bookEntried','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','isVatDeductible','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','withholdingSageFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','expenseFkDeductible','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','logistic','invoiceIn','editorFk','0000-00-00 00:00:00','Update');
 /*!40000 ALTER TABLE `columns_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `procs_priv` DISABLE KEYS */;
@@ -1629,7 +1779,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');
@@ -1643,10 +1792,8 @@ 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 ('','vn2008','logistic','add_awb_component','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 ('','vn2008','productionAssi','agencyModeImbalance','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');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1657,35 +1804,32 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROC
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','dayend','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','production','buffer_settypebyname','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financialBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buyUltimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','barcodeToItem','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticket_splititempackingtype','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_getCommission','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','deliveryAssistant','expeditionstate_addbypallet','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','entryEditor','buy_tarifas','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','claimManager','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','ledger_nextTx','PROCEDURE','guillermo@10.5.1.3','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','mail_insert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_fixMisfit','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','employee','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','entry_updateComission','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_CURDATE','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','calculoremesas','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','client_checkBalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','addressTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','absoluteInventoryHistory','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','client_getSalesPersonByTicket','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','handmadeBoss','confection_control_source','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','productionAssi','confection_control_source','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','artificialBoss','confection_control_source','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','deliveryAssistant','preordenarruta','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','pay','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','pbx','developer','clientFromPhone','FUNCTION','juan@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','util','production','log_addWithUser','PROCEDURE','juan@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_addChild','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_delete','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_move','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','company_getSuppliersDebt','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','multipleInventoryHistory','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','salesAssistant','defaultersFromDate','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_updatepacking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_updategrouping','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','item_comparative','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','logistic','calculoremesas','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','entryEditor','item_getVolume','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','clientgetmana','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_scan','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1696,15 +1840,14 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','manager','collection_make','PR
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','android','debugadd','PROCEDURE','jenkins@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','copyComponentsFromSaleList','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaEntryValueUpdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaInvoiceInBooking','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaInvoiceInBooking','PROCEDURE','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 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 ('','vn2008','buyer','historico_absoluto','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','historico_multiple','PROCEDURE','alexm@%','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');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buyultimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1716,10 +1859,8 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hasanynegativ
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hassomenegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','administrative','accountshorttostandard','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','logistic','raidupdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','grafana','lastdayofweek','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','artificialBoss','raidupdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','adminBoss','nest_delete','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','creditInsurance_GetRisk','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','invoicefromclient','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoicefromclient','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoicefromticket','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1729,7 +1870,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','entry_splitbyshelvi
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoiceintaxmakebydua','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','invoiceintax_getfromentries','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoiceintax_getfromentries','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','adminBoss','nest_child_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','invoiceoutbooking','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoiceoutbooking','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','clienttaxarea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1749,13 +1889,12 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','invoiceoutboo
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','ticket_gettax','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','productionAssi','midnight','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','dipole','employee','expedition_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticketstateupdate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','itempacking','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','cache','employee','available_refresh','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','itemproposal','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','payment_add','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','timebusiness_calculatebyuser','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','itemsale_byweek','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','itemsale_byweek','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1782,7 +1921,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 ('','vn2008','buyer','add_awb_component','PROCEDURE','alexm@%','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');
@@ -1800,7 +1939,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','workercalendar_calculateb
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticketparking_findskipped','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','ticketcollection_getnopacked','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','supplier_checkbalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','item_valuateinventory','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','ledger_docompensation','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','ledger_next','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','invoicein_booking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1815,12 +1953,10 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaParcialMak
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','palletizerBoss','packingsite_startcollection','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','sale_calculatecomponent','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','manaspellersrequery','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','packageinvoicing','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','packinglistswitch','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','previoussticker_get','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','productioncontrol','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','productionsectorlist','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','riskallclients','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','routemonitor_calculate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','account','developer','user_haspriv','FUNCTION','jgallego@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','salegroup_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1855,11 +1991,11 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myuser_hasroutine
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionAssi','timebusiness_calculateall','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','timecontrol_geterror','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','travel_weeklyclone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerAssist','itemproposal','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','company_getsuppliersdebt','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','handmadeBoss','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','productionAssi','rutasanalyze','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionPlus','workerCreateExternal','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionAssi','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_NOW','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_UNIX_TIMESTAMP','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_UTC_DATE','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1919,7 +2055,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','expeditionscan_ad
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','expeditionscan_list','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','expeditionscan_put','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','cmrpallet_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','itemtrash','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','item_getbalance','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_checkroute','FUNCTION','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','addnotefromdelivery','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1972,7 +2107,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expeditionscan_add'
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expeditionscan_list','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expeditionscan_put','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','cmrpallet_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemtrash','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','item_getbalance','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_checkroute','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','delivery','addnotefromdelivery','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1986,7 +2120,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_rollback','PROCED
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_start','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPrices','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByAwb','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','hr','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','financial','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','supplier_statement','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1997,6 +2131,20 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','travel_getDetailFromCo
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','entry_getTransfer','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','entry_getTransfer','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','intrastat_estimateNet','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','artificialBoss','confection_controlSource','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','remittance_calc','PROCEDURE','alexm@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','util','developer','connection_kill','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','client_getRisk','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','account','developer','user_hasRole','FUNCTION','root@localhost','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','balance_create','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hrBoss','balance_create','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_recalcPricesByEntry','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','entryEditor','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_recalcPricesByBuy','PROCEDURE','jenkins@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','ledger_nextTx','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','ledger_docompensation','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -2013,32 +2161,33 @@ 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\":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}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','buyer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','buyerAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','customer','{\"access\": 0, \"max_questions\": 0, \"max_updates\": 30000, \"max_connections\": 300000, \"max_user_connections\": 400, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','developer','{\"access\": 5909905728, \"is_role\": true, \"version_id\": 100707}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','developer','{\"access\": 5909905728, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','developerBoss','{\"access\":33554432,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','employee','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','ext','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','floranet','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','grafana','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','greenhouseBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','guest','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 150000, \"max_user_connections\": 200, \"max_statement_time\": 0.000000, \"is_role\": true, \"version_id\": 101106}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','handmadeBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','handmadeBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','hedera-web','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','hr','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','hrBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
@@ -2047,21 +2196,22 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','itBoss','{\"access\": 541165846527
 INSERT  IGNORE INTO `global_priv` VALUES ('','itManagement','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','itemPicker','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','logistic','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','logisticAssist','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','logisticBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenance','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 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 ('','maintenanceBoss','{\"access\":0,\"version_id\":101106,\"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 ('','marketingBoss','{\"access\":0,\"version_id\":100707,\"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\":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}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','palletizerBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','palletizerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','preservedBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','production','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','production','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','productionAssi','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','productionBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','productionBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','productionPlus','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','root','{\"access\": 549755781119, \"version_id\": 100705, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','salesAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');

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);
 
@@ -128,7 +129,7 @@ INSERT INTO vn.itemShelving (id,itemFk,visible,shelvingFk,`grouping`,packing,pac
 INSERT INTO vn.beach (code,warehouseFk) VALUES
     ('TEST',1);
 
-INSERT INTO vn.routesMonitor (routeFk,name,beachFk,m3,expeditionTruckFk) VALUES
+INSERT INTO vn.routesMonitor (routeFk,name,beachFk,m3,roadmapStopFk) VALUES
     (1,'TEST','TEST',1.0,1);
 /* #5483
 INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressFk, workerFk, observations, isSigned, isLabeled, isPrinted, packages, location, `hour`, created, isBlocked, solution, routeFk, priority, hasPriority, companyFk, agencyModeFk, landed, isBoxed, isDeleted, zoneFk, zonePrice, zoneBonus, totalWithVat, totalWithoutVat, weight)
@@ -145,7 +146,7 @@ INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)
         ('2', 'No supera PP empresa'),
         ('3', 'Despido');
 
-INSERT INTO `vn2008`.`payroll_categorias` (`codcategoria`, `descripcion`, `Tarifa`)
+INSERT INTO `vn`.`payrollCategories` (`id`, `description`, `rate`)
     VALUES
         ('11', 'INFORMATICA', '2'),
         ('12', 'AUX INFORMATICA', '7');
@@ -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`,`nss`,`codpuesto`,`codempresa`,`codcontrato`,`FAntiguedad`,`grupotarifa`,`codcategoria`,`ContratoTemporal`)
-    VALUES
-        (36,'46/10515497-58',6,20,189,'2009-01-02',5,10,0),
-        (43,'46/10235353-50',7,20,189,'2009-04-21',5,10,0),
-        (76,'46/10250562-30',1,20,189,'2009-09-07',9,5,0),
-        (1106,'46/10297768-94',4,20,100,'2021-03-09',7,18,0),
-        (1107,'46/1627085-11',15,20,402,'2021-03-15',9,6,1),
-        (1108,'46/10446901-41',25,20,502,'2021-03-22',10,29,1),
-        (1109,'46/10552113-8',3,20,402,'2021-03-23',9,9,1),
-        (1110,'46/10723579-75',3,20,402,'2021-03-23',9,9,1);
 
 INSERT INTO `vn`.`trainingCourseType` (`id`, `name`)
     VALUES

db/dump/fixtures.before.sql

@@ -11,7 +11,6 @@ CREATE ROLE 'salix';
 GRANT 'salix' TO 'root'@'%';
 SET DEFAULT ROLE 'salix' FOR 'root'@'%';
 
-CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
 UPDATE `util`.`config`
@@ -81,7 +80,7 @@ INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPre
 CALL `account`.`role_sync`;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
-    SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
+    SELECT id, LOWER(name), CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
         FROM `account`.`role`
             ORDER BY id;
 
@@ -118,18 +117,18 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
 
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
-        (1101, 'BruceWayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1102, 'PetterParker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1103, 'ClarkKent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1104, 'TonyStark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1105, 'MaxEisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1107, 'HankPym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1108, 'CharlesXavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1109, 'BruceBanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
-        (1110, 'JessicaJones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en', NULL),
-        (1111, 'Missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en', NULL),
-        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en', NULL);
+        (1101, 'brucewayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
+        (1102, 'petterparker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
+        (1103, 'clarkkent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
+        (1104, 'tonystark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
+        (1105, 'maxeisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
+        (1106, 'davidcharleshaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
+        (1107, 'hankpym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
+        (1108, 'charlesxavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
+        (1109, 'brucebanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
+        (1110, 'jessicajones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
+        (1111, 'missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
+        (1112, 'trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
 
 UPDATE account.`user`
     SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
@@ -160,9 +159,10 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
         (1, 'EUR', 'Euro',          1),
         (2, 'USD', 'Dollar USA',    1.4),
         (3, 'GBP', 'Libra',         1),
-        (4, 'JPY', 'Yen Japones',   1);
+        (4, 'JPY', 'Yen Japones',   1),
+        (5, 'CNY',  'Yuan Chino',   1.2);
 
-INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
+INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
     VALUES
         (1, 'España',   1, 'ES', 1, 24, 4, 0, 1),
         (2, 'Italia',   1, 'IT', 1, 27, 4, 0, 1),
@@ -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`)
@@ -371,20 +371,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
         (4, 'GCN Channel'),
         (5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
     VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist','normal'),
-        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'),
-        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses');
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 'florist','normal'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -527,7 +527,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (4, 'SalesPerson',      'salesPerson'),
         (5, 'Administrative',   'administrative'),
         (6, 'Weight',           'weight'),
-        (7, 'InvoiceOut',       'invoiceOut');
+        (7, 'InvoiceOut',       'invoiceOut'),
+        (8, 'DropOff',           'dropOff');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -760,7 +761,12 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
-        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL);
+        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
+        (33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
+        (34, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1103, 'BEJAR',                                         123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
+        (35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
+        (36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
+        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL);
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
@@ -807,7 +813,10 @@ INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `userFk`, `created`)
         (21, 1,  19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
         (22, 1,  19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
         (23, 16, 21, util.VN_NOW()),
-        (24, 16, 21, util.VN_NOW());
+        (24, 16, 21, util.VN_NOW()),
+        (34, 14, 49, util.VN_NOW()),
+        (35, 14, 18, util.VN_NOW()),
+        (36, 14, 18, util.VN_NOW());
 
 INSERT INTO `vn`.`deliveryPoint` (`id`, `name`, `ubication`)
     VALUES
@@ -830,9 +839,9 @@ INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`,
 INSERT INTO `vn`.`greugeType`(`id`, `name`, `code`)
     VALUES
         (1, 'Diff',             'diff'),
-        (2, 'Recover',          'recover'),
+        (2, 'Recovery',         'recovery'),
         (3, 'Mana',             'mana'),
-        (4, 'Reclaim',          'reclaim'),
+        (4, 'Claim',            'claim'),
         (5, 'Heritage',         'heritage'),
         (6, 'Miscellaneous',    'miscellaneous'),
         (7, 'Freight Pickup',   'freightPickUp');
@@ -1067,7 +1076,10 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (37, 4, 31, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
+        (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE()),
+        (40, 2, 34, 'Melee weapon combat fist 15cm', 10.00, 3.91, 0, 0, 0, util.VN_CURDATE()),
+        (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE()),
+        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
@@ -1204,11 +1216,11 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (32,    36, -92.324),
         (32,    39, 0.994);
 
-INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`, `userFk`)
+INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`,`buyFk`, `userFk`)
     VALUES
-        (2, 'GVC', 1, 1, 1, 1106),
-        (4, 'HEJ', 1, 1, 1, 1106),
-        (1, 'UXN', 2, 12, 12, 1106);
+        (2, 'GVC', 1, 1, 1, 2,1106),
+        (4, 'HEJ', 1, 1, 1, NULL,1106),
+        (1, 'UXN', 2, 12, 12, NULL,1106);
 
 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
     VALUES
@@ -1246,14 +1258,20 @@ INSERT INTO `vn`.`operator` (`workerFk`, `numberOfWagons`, `trainFk`, `itemPacki
 INSERT INTO `vn`.`collection`(`id`, `workerFk`, `stateFk`, `created`, `trainFk`)
     VALUES
         (1, 1106, 5, DATE_ADD(util.VN_CURDATE(),INTERVAL +1 DAY), 1),
-        (2, 1106, 14, util.VN_CURDATE(), 1);
+        (2, 1106, 14, util.VN_CURDATE(), 1),
+        (4, 49, 5, util.VN_CURDATE(), 1),
+        (5, 18, 5, util.VN_CURDATE(), 1),
+        (6, 18, 5, util.VN_CURDATE(), 1);
 
 INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`)
     VALUES
         (1, 1, 1),
         (2, 1, NULL),
         (3, 2, NULL),
-        (23, 1, NULL);
+        (23, 1, NULL),
+        (34, 4, 1),
+        (35, 5, 1),
+        (8, 6, 1);
 
 INSERT INTO `vn`.`genus`(`id`, `name`)
     VALUES
@@ -1492,21 +1510,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),
-        (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),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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()),
-        (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());
+        (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,  '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,  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, 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,  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,  '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, '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, '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, '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,  '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, '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, '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,  '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, '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, '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 +1845,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`)
@@ -1867,9 +1885,9 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina
         (1, 31, 4, 21, 2),
         (2, 32, 3, 21, 3);
 
-INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`)
+INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`, `monthsToRefund`, `minShipped`)
     VALUES
-        (1, 50);
+        (1, 5, 4, '2016-10-01');
 
 INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
     VALUES
@@ -1880,7 +1898,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
 
 INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
     VALUES
-        (1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
+        (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
         (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
         (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
         (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
@@ -1973,6 +1991,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),
@@ -1980,10 +2007,10 @@ INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
         (5, 1102),
         (9, 1201);
 
-INSERT INTO `vn`.`professionalCategory` (`id`, `name`, `level`, `dayBreak`)
+INSERT INTO `vn`.`professionalCategory` (`id`, `description`)
     VALUES
-        (1, 'employee', NULL, NULL),
-        (2, 'florist', NULL, NULL);
+        (1, 'employee'),
+        (2, 'florist');
 
 INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`)
     VALUES
@@ -2400,7 +2427,8 @@ INSERT INTO `vn`.`dmsType`(`id`, `name`, `readRoleFk`, `writeRoleFk`, `code`)
         (18, 'dua',                 NULL,   NULL,   'dua'),
         (19, 'inmovilizado',        NULL,   NULL,   'fixedAssets'),
         (20, 'Reclamación',         1,      1,      'claim'),
-        (21, 'Entrada',             1,      1,      'entry');
+        (21, 'Entrada',             1,      1,      'entry'),
+		(22, 'Proveedor',           1,      1,      'supplier');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2412,7 +2440,8 @@ INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `wa
         (6, 5,  '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists',       'DoesNotExists',                               util.VN_CURDATE()),
         (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
         (8, 20, '8.mp4', 'video/mp4',  9, 1, 442, NULL, FALSE, '1',              'TICKET ID  DEL CLIENTE BRUCE WAYNE ID 1101',  util.VN_CURDATE()),
-        (9, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'ENTRADA ID 1',                                util.VN_CURDATE());
+        (9, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',              'ENTRADA ID 1',                                util.VN_CURDATE()),
+		(10, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1',             'ENTRADA DE PRUEBA',                          util.VN_CURDATE());
 
 INSERT INTO `vn`.`claimDms`(`claimFk`, `dmsFk`)
     VALUES
@@ -2537,20 +2566,20 @@ INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroV
         (7, 7, 1.00, 1.00, 1.00),
         (8, 8, 1.00, 1.00, 1.00);
 
-REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
+REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`, `bookEntried`)
     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),
-        (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),
-        (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),
-        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 1, 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),
-        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
+        (1,  1001,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1,util.VN_CURDATE()),
+        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1,util.VN_CURDATE()),
+        (3,  1003,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1,util.VN_CURDATE()),
+        (4,  1004,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1,util.VN_CURDATE()),
+        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1,util.VN_CURDATE()),
+        (6,  1006,  'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1,util.VN_CURDATE()),
+        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1,util.VN_CURDATE()),
+        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1,util.VN_CURDATE()),
+        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1,util.VN_CURDATE()),
+        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1,util.VN_CURDATE());
 
-INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`, `daysAgo`)
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`)
     VALUES
         (1, -2, '2% retention', 2, 45);
 
@@ -2603,13 +2632,33 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo
         (2, 13.20, 5080000, 15.00, 580, 5),
         (2, 16.10, 6021010, 25.00, 80,  5);
 
-INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
-    SELECT t.id
-        FROM vn.ticket t
-            LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id
-        WHERE tr.ticketFk IS NULL;
+UPDATE `vn`.`invoiceIn`
+    SET isBooked = TRUE
+    WHERE id IN (5, 7, 8, 9, 10);
 
-CALL `vn`.`ticket_doRecalc`();
+DELIMITER $$
+CREATE PROCEDURE `tmp`.`ticket_recalc`()
+BEGIN
+	DECLARE vDone BOOL;
+	DECLARE vTicketFk INT;
+
+	DECLARE cTickets CURSOR FOR SELECT id FROM vn.ticket;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+
+	OPEN cTickets;
+	myLoop: LOOP
+		SET vDone = FALSE;
+		FETCH cTickets INTO vTicketFk;
+		IF vDone THEN LEAVE myLoop; END IF;
+		CALL vn.ticket_recalc(vTicketFk, NULL);
+	END LOOP;
+	CLOSE cTickets;
+END$$
+DELIMITER ;
+
+CALL tmp.ticket_recalc;
+DROP PROCEDURE tmp.ticket_recalc;
 
 UPDATE `vn`.`ticket`
     SET refFk = 'T1111111'
@@ -2638,13 +2687,20 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
         (3,  6,  5),
         (4,  7,  1);
 
+INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
+    VALUES
+        (1),
+        (2),
+        (3),
+        (4);
+
 INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `userFk`, `price`, `driverName`)
     VALUES
-        (1, 'val-algemesi', 'RE-001', 'PO-001', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
-        (2, 'alg-valencia', 'RE-002', 'PO-002', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', 'RE-003', 'PO-003', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
+        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
+        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
 
-INSERT INTO `vn`.`expeditionTruck` (`id`, `roadmapFk`, `warehouseFk`, `eta`, `description`, `userFk`)
+INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `addressFk`, `eta`, `description`, `userFk`)
     VALUES
         (1, 1, 1, DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY),          'Best truck in fleet',      1),
         (2, 1, 2, DATE_ADD(util.VN_NOW(), INTERVAL '1 2' DAY_HOUR), 'Second truck in fleet',    1),
@@ -2802,7 +2858,7 @@ INSERT INTO `vn`.`packingSiteConfig` (`id`, `shinobiUrl`, `shinobiToken`, `shino
 INSERT INTO `util`.`notificationConfig`
 	SET `id` = 1,
         `cleanDays` = 90;
-
+TRUNCATE `util`.`notification`;
 INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
         (1, 'print-email', 'notification fixture one'),
@@ -2811,8 +2867,10 @@ 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`)
     VALUES
         (1, 9),
@@ -2822,13 +2880,16 @@ 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`)
     VALUES
         (1, 'print-email', '{"id": "1"}', 9, 'pending', util.VN_CURDATE()),
         (2, 'print-email', '{"id": "2"}', null, 'pending', util.VN_CURDATE()),
         (3, 'print-email', null, null, 'pending', util.VN_CURDATE());
+TRUNCATE `util`.`notificationSubscription`;
 
 INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
     VALUES
@@ -2840,15 +2901,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
@@ -2908,7 +2970,8 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'development', 'http://localhost:9000/#/'),
         ('hedera', 'development', 'http://localhost:9090/'),
-        ('salix', 'development', 'http://localhost:5000/#!/');
+        ('salix', 'development', 'http://localhost:5000/#!/'),
+        ('docuware', 'development', 'http://docuware');
 
 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
     VALUES
@@ -3063,6 +3126,18 @@ INSERT INTO `vn`.`entryDms`(`entryFk`, `dmsFk`, `editorFk`)
     VALUES
         (1, 9, 9);
 
+INSERT INTO vn.entryType (code,description,isInformal)
+	VALUES ('devaluation','Devaluation',0),
+        ('internal','Internal',1),
+        ('inventory','Inventory',1),
+        ('life','Life',1),
+        ('packaging','Packaging',0),
+        ('payment','Refund',0),
+        ('product','Product',0),
+        ('regularization','Regularization',1),
+        ('return','Return',0),
+        ('transport','Delivery',0);
+
 INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentInstruccions,specialAgreements,companyFk,addressToFk,addressFromFk,supplierFk,packagesList,merchandiseDetail,state)
 	VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
 	    (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
@@ -3217,8 +3292,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3256,8 +3330,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 40,
 		`grouping` = 5,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3295,8 +3368,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 10,
 		`grouping` = 5,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3342,8 +3414,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 4,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3381,8 +3452,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3421,8 +3491,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 200,
 		`grouping` = 30,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3461,8 +3530,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 500,
 		`grouping` = 10,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3501,8 +3569,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 300,
 		`grouping` = 50,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3541,8 +3608,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 50,
 		`grouping` = 5,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3582,8 +3648,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 5,
 		`grouping` = 2,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3622,8 +3687,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 100,
 		`grouping` = 5,
-		groupingMode = 1,
-		packageFk = 94,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3677,7 +3741,8 @@ INSERT IGNORE INTO vn.saleGroup
 	SET id = 4,
 		userFk = 1,
 		parkingFk = 9,
-		sectorFk = 9992;
+		sectorFk = 9992,
+        ticketFk = 36;
 
 INSERT IGNORE INTO vn.sectorCollectionSaleGroup
 	SET id = 9999,
@@ -3737,3 +3802,112 @@ INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description,
 
 INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,newInstance,changedModelId,changedModelValue)
 	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 (1, 10, 9);
+
+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'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',118.81,'RCBO','debit','10','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',2149.71,'RCBO.AMAZON','debit','122','2023-12-14 08:39:53.000'),
+		(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)
+	VALUES (1, 1);
+
+
+INSERT INTO vn.workerTeam(id, team, workerFk)
+    VALUES
+        (8, 1, 19);
+
+INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment)
+    VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);
+
+INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
+	('1M', 'M', 1),
+	('2M', 'M', 9),
+	('3M', 'M', NULL),
+	('4M', 'M', NULL),
+	('1F', 'F', 1110),
+	('2F', 'F', NULL),
+	('3F', 'F', NULL),
+	('4F', 'F', NULL);
+
+INSERT INTO `vn`.`ledgerCompany` SET
+    fiscalYear = YEAR(util.VN_CURDATE()),
+    bookEntry = 2;
+
+INSERT INTO  `vn`.`ledgerConfig` SET
+    maxTolerance = 0.01;
+
+
+INSERT INTO vn.trainingCourse (workerFk,trainingCourseTypeFk,centerFk,started,ended,hasDiscount,hasDiploma)
+	VALUES
+		(9,2,1,'2018-06-20 00:00:00.000','2020-06-24 00:00:00.000',0,1),
+		(9,1,2,'2018-06-20 00:00:00.000','2020-06-24 00:00:00.000',1,0),
+		(9,2,2,'2018-06-20 00:00:00.000','2020-06-24 00:00:00.000',1,1);
+
+INSERT INTO vn.sectorCollection
+	SET id = 2,
+		userFk = 18,
+		sectorFk = 1;
+
+INSERT INTO vn.sectorCollectionSaleGroup
+	SET id = 8,
+		sectorCollectionFk = 2,
+		saleGroupFk = 4;
+
+INSERT INTO vn.saleGroup (userFk, parkingFk, sectorFk, ticketFk)
+    VALUES
+        (1, 1, 1, 37);
+
+INSERT INTO vn.sectorCollection
+	SET id = 3,
+		userFk = 18,
+		sectorFk = 1;
+
+INSERT INTO vn.sectorCollectionSaleGroup
+	SET id = 9,
+		sectorCollectionFk = 3,
+		saleGroupFk = 6;
+
+
+INSERT INTO `vn`.`calendarHolidays` (calendarHolidaysTypeFk, dated, calendarHolidaysNameFk, workCenterFk)
+	VALUES
+		(1, '2001-05-08', 1, 1),
+		(1, '2001-05-09', 1, 1),
+		(1, '2001-05-10', 1, 1),
+		(1, '2001-05-11', 1, 1),
+		(1, '2001-05-14', 1, 5),
+		(1, '2001-05-15', 1, 5),
+		(1, '2001-05-16', 1, 5),
+		(1, '2001-05-17', 1, 5),
+		(1, '2001-05-18', 1, 5);
+
+INSERT INTO vn.payrollComponent
+(id, name, isSalaryAgreed, isVariable, isException)
+	VALUES
+		(1, 'Salario1', 1, 0, 0),
+		(2, 'Salario2', 1, 1, 0),
+		(3, 'Salario3', 1, 0, 1);
+
+
+INSERT INTO vn.workerIncome
+(debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
+	VALUES
+		(1000.00, 900.00, 2, '2000-01-01', 1106, NULL),
+		(1001.00, 800.00, 2, '2000-01-01', 1106, NULL);
+
+
+INSERT INTO dipole.printer (id, description)
+VALUES(1, '');
+
+INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode,
+truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
+VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, NULL, 'NCC', NULL);
+

db/routines/account/procedures/user_checkName.sql

@@ -7,7 +7,7 @@ BEGIN
  * The user name must only contain lowercase letters or, starting with second
  * character, numbers or underscores.
  */
-	IF vUserName NOT REGEXP '^[a-z0-9_-]*$' THEN
+	IF vUserName NOT REGEXP BINARY '^[a-z0-9_-]+$' THEN
 		SIGNAL SQLSTATE '45000'
 			SET MESSAGE_TEXT = 'INVALID_USER_NAME';
 	END IF;

db/routines/bi/procedures/Greuge_Evolution_Add.sql

@@ -91,15 +91,15 @@ BEGIN
 		-- Recobro
 		UPDATE bi.Greuge_Evolution ge 
 			JOIN (
-				   SELECT cs.Id_Cliente, sum(Valor * Cantidad) as Importe
-					   FROM vn2008.Tickets t
-					   JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
-					   JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
-					   JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
-				   WHERE t.Fecha >= datFEC 
-					   AND t.Fecha < datFEC_TOMORROW
-					   AND mc.Id_Componente = 17 -- Recobro
-				   GROUP BY cs.Id_Cliente
+				   SELECT a.clientFk Id_Cliente, sum(sc.value * s.quantity) as Importe
+					   FROM vn.ticket t
+					   JOIN vn.address a on a.id = t.addressFk
+					   JOIN vn.sale s on s.ticketFk = t.id
+					   JOIN vn.saleComponent sc on sc.saleFk = s.id
+				   WHERE t.shipped >= datFEC 
+					   AND t.shipped < datFEC_TOMORROW
+					   AND sc.componentFk = 17 -- Recobro
+				   GROUP BY a.clientFk
 				 ) sub using(Id_Cliente)
 			SET Recobro = Importe
 			WHERE ge.Fecha = datFEC;

db/routines/bi/procedures/analisis_ventas_evolution_add.sql

@@ -24,7 +24,7 @@ BEGIN
 			WHERE Periodo < vMaxPeriod;
 
 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;
 
 		SET vYear = FLOOR(vCurrentPeriod / 100);
@@ -66,7 +66,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;
 
 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;
 
 		SET vYear = FLOOR(vCurrentPeriod / 100);
@@ -108,7 +108,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;
 
 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;
 
 		SET vYear = FLOOR(vCurrentPeriod / 100);
@@ -156,7 +156,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;
 
 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;
 
 		SET vYear = FLOOR(vCurrentPeriod / 100);
@@ -198,7 +198,7 @@ BEGIN
 			WHERE periodo < vMaxPeriod;
 
 		SELECT MIN(period) INTO vCurrentPeriod
-			FROM vn2008.time
+			FROM vn.time
 			WHERE period > vPreviousPeriod;
 
 		SET vYear = FLOOR(vCurrentPeriod / 100);

db/routines/bi/procedures/analisis_ventas_update.sql

@@ -10,44 +10,44 @@ BEGIN
 			OR (Año = YEAR(vLastMonth) AND Mes >= MONTH(vLastMonth));
 
 	INSERT INTO analisis_ventas (
-            Familia,
-            Reino,
-            Comercial,
-            Comprador,
-            Provincia,
-            almacen,
-            Año,
-            Mes,
-            Semana,
-            Vista,
-            Importe
-        )
+			Familia,
+			Reino,
+			Comercial,
+			Comprador,
+			Provincia,
+			almacen,
+			Año,
+			Mes,
+			Semana,
+			Vista,
+			Importe
+		)
 		SELECT 
-			tp.Tipo AS Familia,
-			r.reino AS Reino,
-			tr.CodigoTrabajador AS Comercial,
-			tr2.CodigoTrabajador AS Comprador,
-			p.name AS Provincia,
-			w.name AS almacen,
-			tm.year AS Año,
-			tm.month AS Mes,
-			tm.week AS Semana,
-			dm.description AS Vista,
-			bt.importe AS Importe
+			it.name,
+			ic.name,
+			w.code,
+			w2.code,
+			p.name,
+			wa.name,
+			tm.year,
+			tm.month,
+			tm.week,
+			dm.description,
+			bt.importe
 		FROM bs.ventas bt
-            LEFT JOIN vn2008.Tipos tp ON tp.tipo_id = bt.tipo_id
-            LEFT JOIN vn2008.reinos r ON r.id = tp.reino_id
-            LEFT JOIN vn2008.Clientes c on c.Id_Cliente = bt.Id_Cliente
-            LEFT JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = c.Id_Trabajador
-            LEFT JOIN vn2008.Trabajadores tr2 ON tr2.Id_Trabajador = tp.Id_Trabajador
-            JOIN vn2008.time tm ON tm.date = bt.fecha
-            JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
-            LEFT JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-            JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-            LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
-            LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
-            LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
-            LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
-        WHERE bt.fecha >= vLastMonth AND r.mercancia;
+			LEFT JOIN vn.itemType it ON it.id = bt.tipo_id
+			LEFT JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+			LEFT JOIN vn.client c on c.id = bt.Id_Cliente
+			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+			LEFT JOIN vn.worker w2 ON w2.id = it.workerFk
+			JOIN vn.time tm ON tm.dated = bt.fecha
+			JOIN vn.sale s ON s.id = bt.Id_Movimiento
+			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
+			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+			LEFT JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+			LEFT JOIN vn.address a ON a.id = t.addressFk
+			LEFT JOIN vn.province p ON p.id = a.provinceFk
+			LEFT JOIN vn.warehouse wa ON wa.id = t.warehouseFk
+		WHERE bt.fecha >= vLastMonth AND ic.merchandise;
 END$$
 DELIMITER ;

db/routines/bi/procedures/claim_ratio_routine.sql

@@ -1,168 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`claim_ratio_routine`()
-BEGIN
-	DECLARE vMonthToRefund INT DEFAULT 4;
-
-	/*
-	*	PAK 2015-11-20
-	*   Se trata de añadir a la tabla Greuges todos los
-	*   cargos que luego vamos a utilizar para calcular el recobro
-	*/
-
-	-- Reclamaciones demasiado sensibles
-
-	INSERT INTO vn.greuge(shipped, clientFk, description,
-					amount, greugeTypeFk, ticketFk)
-		SELECT cm.Fecha
-			, cm.Id_Cliente
-			, concat('Claim ',cm.id,' : ', m.Concepte)
-			,round( -1 * ((sensib -1)/4) * Cantidad *
-				Preu * (100 - Descuento) / 100, 2) AS Reclamaciones
-			, 4
-			, m.Id_Ticket
-			FROM vn2008.Movimientos m
-				JOIN vn2008.cl_act ca USING(Id_Movimiento)
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-			WHERE ca.cl_sol_id  NOT IN (1,5)
-				AND ca.greuge = 0
-				AND cm.cl_est_id = 3;
-
-	-- Reclamaciones que pasan a Maná
-
-	INSERT INTO vn.greuge(shipped, clientFk, description,
-					amount, greugeTypeFk, ticketFk)
-		SELECT cm.Fecha
-			, cm.Id_Cliente
-			, concat('Claim_mana ',cm.id,' : ', m.Concepte)
-			,round( ((sensib -1)/4) * Cantidad * Preu * (100 - Descuento) / 100, 2)
-				AS Reclamaciones
-			,3
-			,m.Id_Ticket
-			FROM vn2008.Movimientos m
-				JOIN vn2008.cl_act ca USING(Id_Movimiento)
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-			WHERE ca.cl_sol_id  NOT IN (1,5)
-				AND ca.greuge = 0
-				AND cm.cl_est_id = 3
-				AND cm.mana;
-
-	-- Marcamos para no repetir
-	UPDATE vn2008.cl_act ca
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-			SET greuge = 1
-			WHERE ca.cl_sol_id  NOT IN (1,5)
-				AND ca.greuge = 0
-				AND cm.cl_est_id = 3;
-
-	-- Recobros
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
-	CREATE TEMPORARY TABLE tmp.ticket_list
-	(PRIMARY KEY (Id_Ticket))
-	SELECT DISTINCT t.Id_Ticket
-			FROM vn2008.Movimientos_componentes mc
-				JOIN vn2008.Movimientos m ON mc.Id_Movimiento = m.Id_Movimiento
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-				JOIN vn2008.Tickets_state ts ON ts.Id_Ticket = t.Id_Ticket
-				JOIN vn.ticketTracking tt ON tt.id = ts.inter_id
-				JOIN vn2008.state s ON s.id = tt.stateFk
-			WHERE mc.Id_Componente = 17
-				AND mc.greuge = 0
-				AND t.Fecha >= '2016-10-01'
-				AND t.Fecha < util.VN_CURDATE()
-				AND s.alert_level >= 3;
-
-	DELETE g.*
-			FROM vn.greuge g
-				JOIN tmp.ticket_list t ON g.ticketFk = t.Id_Ticket
-			WHERE g.greugeTypeFk = 2;
-
-	INSERT INTO vn.greuge(clientFk, description, amount,shipped,
-					greugeTypeFk, ticketFk)
-		SELECT Id_Cliente
-				,concat('recobro ', m.Id_Ticket), - round(SUM(mc.Valor*Cantidad),2)
-					AS dif
-				,date(t.Fecha)
-				, 2
-				,tt.Id_Ticket
-			FROM vn2008.Movimientos m
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-				JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket
-				JOIN vn2008.Movimientos_componentes mc
-					ON mc.Id_Movimiento = m.Id_Movimiento AND mc.Id_Componente = 17
-			GROUP BY t.Id_Ticket
-				HAVING ABS(dif) > 1;
-
-	UPDATE vn2008.Movimientos_componentes mc
-				JOIN vn2008.Movimientos m ON m.Id_Movimiento = mc.Id_Movimiento
-				JOIN tmp.ticket_list tt ON tt.Id_Ticket = m.Id_Ticket
-			SET greuge = 1
-			WHERE Id_Componente = 17;
-
-	/*
-	* Recalculamos la ratio de las reclamaciones, que luego
-	* se va a utilizar en el recobro
-	*/
-
-	REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro)
-		SELECT Id_Cliente, 0,0,0,0
-		FROM vn2008.Clientes;
-
-	REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro)
-		SELECT fm.Id_Cliente, 12 * fm.Consumo, Reclamaciones,
-				round(Reclamaciones / (12*fm.Consumo),4) AS Ratio, 0
-			FROM bi.facturacion_media_anual fm
-				LEFT JOIN(
-					SELECT cm.Id_Cliente, round(sum(-1 * ((sensib -1)/4) *
-							Cantidad * Preu * (100 - Descuento) / 100))
-							AS Reclamaciones
-						FROM vn2008.Movimientos m
-							JOIN vn2008.cl_act ca
-								ON ca.Id_Movimiento = m.Id_Movimiento
-							JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
-						WHERE ca.cl_sol_id  NOT IN (1,5)
-							AND cm.cl_est_id = 3
-							AND cm.Fecha >= TIMESTAMPADD(YEAR, -1, util.VN_CURDATE())
-						GROUP BY cm.Id_Cliente
-						) claims ON claims.Id_Cliente = fm.Id_Cliente;
-
-
-	-- Calculamos el porcentaje del recobro para añadirlo al precio de venta
-	UPDATE bi.claims_ratio cr
-				JOIN (
-					SELECT clientFk Id_Cliente, IFNULL(SUM(amount), 0) AS Greuge
-						FROM vn.greuge
-						WHERE shipped <= util.VN_CURDATE()
-						GROUP BY clientFk
-					) g ON g.Id_Cliente = cr.Id_Cliente
-			SET recobro = GREATEST(0,round(IFNULL(Greuge, 0) /
-				(IFNULL(Consumo, 0) * vMonthToRefund / 12 ) ,3));
-
-	-- Protección neonatos
-	UPDATE bi.claims_ratio cr
-			JOIN vn.firstTicketShipped fts ON fts.clientFk = cr.Id_Cliente
-			SET recobro = 0, Ratio = 0
-		WHERE fts.shipped > TIMESTAMPADD(MONTH,-1,util.VN_CURDATE());
-
-	-- CLIENTE 7983, JULIAN SUAU
-	UPDATE bi.claims_ratio SET recobro = LEAST(0.05, recobro) WHERE Id_Cliente = 7983;
-
-	-- CLIENTE 4358
-	UPDATE bi.claims_ratio SET recobro = GREATEST(0.05, recobro) WHERE Id_Cliente = 4358;
-
-	-- CLIENTE 5523, VERDECORA
-	UPDATE bi.claims_ratio SET recobro = GREATEST(0.12, recobro) WHERE Id_Cliente = 5523;
-
-    -- CLIENTE 15979, SERVEIS VETERINARIS
-	UPDATE bi.claims_ratio SET recobro = GREATEST(0.05, recobro) WHERE Id_Cliente = 15979;
-
-	-- CLIENTE 5189 i 8942, son de CSR i son el mateix client
-	UPDATE bi.claims_ratio cr
-		JOIN (SELECT sum(Consumo * recobro)/sum(Consumo) as recobro
-				FROM bi.claims_ratio
-				WHERE Id_Cliente IN ( 5189,8942)
-			) sub
-		SET cr.recobro = sub.recobro
-		WHERE Id_Cliente IN ( 5189,8942);
-END$$
-DELIMITER ;

db/routines/bi/procedures/clean_launcher.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`clean_launcher`()
-BEGIN
-/**
- * Borra registros de las principales tablas (excepto de "ticket").
- */
-	CALL vn2008.clean(0);
-END$$
-DELIMITER ;

db/routines/bi/procedures/comparativa_add.sql

@@ -1,32 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`comparativa_add`()
-BEGIN
-    DECLARE lastCOMP INT;  # Se trata de una variable para almacenar el ultimo valor del Periodo
-    DECLARE vMaxPeriod INT;
-	DECLARE vMaxWeek INT;
-
-	SELECT t.period, t.`week` INTO vMaxPeriod, vMaxWeek
-		FROM vn.`time` t 
-		WHERE t.dated = util.VN_CURDATE();
-
-    SELECT MAX(Periodo) INTO lastCOMP FROM vn2008.Comparativa;
-    -- Fijaremos las ventas con más de un mes de antiguedad en la tabla Comparativa
-
-    IF lastCOMP < vMaxPeriod - 3 AND vMaxWeek > 3 THEN
-    
-		REPLACE vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-			SELECT tm.period as Periodo, m.Id_Article, t.warehouse_id, sum(m.Cantidad), sum(v.importe)
-            FROM bs.ventas v
-            JOIN vn2008.time tm ON tm.date = v.fecha
-            JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
-            JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
-            JOIN vn2008.reinos r ON r.id = tp.reino_id
-            JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-            WHERE tm.period BETWEEN lastCOMP AND vMaxPeriod - 3
-            AND t.Id_Cliente NOT IN(400,200)
-            AND t.warehouse_id NOT IN (0,13)		
-            GROUP BY m.Id_Article, Periodo, t.warehouse_id;
-
-    END IF;
-END$$
-DELIMITER ;

db/routines/bi/procedures/comparativa_add_manual.sql

@@ -1,40 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`comparativa_add_manual`(IN vStarted DATE, IN vEnded DATE)
-BEGIN
-/**
- * Recalcula la tabla Comparativa para dos valores dados
- *
- * @param vStarted fecha desde
- * @param vEnded fecha hasta
- */  
-
-	DECLARE periodStart INT;
-	DECLARE periodEnd INT;
-	
-	-- Seleccionamos la fecha minima/maxima del periodo que vamos a consultar
-
-	SELECT t.period INTO periodStart
-		FROM vn.`time` t 
-		WHERE t.dated = vStarted;
-	
-	SELECT t.period INTO periodEnd
-		FROM vn.`time` t 
-		WHERE t.dated = vEnded;
-                
-	DELETE FROM vn2008.Comparativa 
-		WHERE Periodo BETWEEN periodStart AND periodEnd;
-
-	INSERT INTO vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-		SELECT tm.period as Periodo, m.Id_Article, t.warehouse_id, sum(m.Cantidad), sum(v.importe)
-			FROM bs.ventas v
-				JOIN vn2008.time tm ON tm.date = v.fecha
-				JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
-				JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
-				JOIN vn2008.reinos r ON r.id = tp.reino_id
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-			WHERE tm.period BETWEEN periodStart AND periodEnd
-				AND t.Id_Cliente NOT IN(400,200)
-				AND t.warehouse_id NOT IN (0,13)		
-			GROUP BY m.Id_Article, Periodo, t.warehouse_id;
-END$$
-DELIMITER ;

db/routines/bi/procedures/defaultersFromDate.sql

@@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
 BEGIN
 
-	SELECT t1.*, c.Cliente, w.code AS workerCode, c.pay_met_id,c.Vencimiento
+	SELECT t1.*, c.name Cliente, w.code workerCode, c.payMethodFk pay_met_id, c.dueDay Vencimiento
 	FROM (
 	-- Filtramos aquellos clientes cuyo saldo se ha incrementado de ayer a hoy
 		select * from(
@@ -18,7 +18,7 @@ BEGIN
 
 					having today.amount > 0 and difference <> 0
 					) newDefaulters
-	)t1 left join vn2008.Clientes c ON t1.client = c.Id_Cliente
-		left join vn.worker w ON w.id = c.Id_Trabajador;
+	)t1 left join vn.client c ON c.id = t1.client
+		left join vn.worker w ON w.id = c.salesPersonFk;
 END$$
 DELIMITER ;

db/routines/bi/procedures/defaulting.sql

@@ -2,16 +2,17 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
 BEGIN
 	DECLARE vDone BOOLEAN;
-    DECLARE vClient INT;
-    DECLARE vAmount INT;
-    DECLARE vDued DATE;
-    DECLARE vAmountInvoice DECIMAL(10,2);
-    DECLARE vGraceDays INT;
+	DECLARE vClient INT;
+	DECLARE vAmount INT;
+	DECLARE vDued DATE;
+	DECLARE vAmountInvoice DECIMAL(10,2);
+	DECLARE vGraceDays INT;
 	DECLARE defaulters CURSOR FOR
-		SELECT client, amount, graceDays FROM bi.defaulters d 
-				JOIN vn2008.Clientes c ON c.Id_Cliente = d.client
-                JOIN vn2008.pay_met pm ON pm.id = c.pay_met_id
-                WHERE hasChanged AND date = vDate;
+		SELECT d.client, d.amount, pm.graceDays
+			FROM bi.defaulters d 
+				JOIN vn.client c ON c.id = d.client
+				JOIN vn.payMethod pm ON pm.id = c.payMethodFk
+			WHERE hasChanged AND date = vDate;
 		
 	DECLARE invoices CURSOR FOR
 		SELECT dued Vencimiento, amount importe FROM vn.invoiceOut
@@ -35,16 +36,16 @@ BEGIN
 					WHERE date <= TIMESTAMPADD(DAY,-1, vDate)
 					ORDER BY date DESC
 					LIMIT 10000000000000000000) t GROUP BY client
-		  ) yesterday using(client)
+		) yesterday using(client)
 	SET d.hasChanged = (IFNULL(d.amount,0) <> IFNULL(yesterday.amount,0)),
 		d.defaulterSince = yesterday.defaulterSince,
-        d.frozened = yesterday.frozened
+		d.frozened = yesterday.frozened
 	WHERE d.date = vDate ;
 	
-    OPEN defaulters;
+	OPEN defaulters;
 	defaulters: LOOP
 		SET vDone = FALSE;
-        SET vAmount = 0;
+		SET vAmount = 0;
 		FETCH defaulters INTO vClient,vAmount, vGraceDays;
 		IF vDone THEN
 			LEAVE defaulters;
@@ -73,20 +74,20 @@ BEGIN
 	END LOOP;
 		CLOSE defaulters;
 	
-    DELETE FROM defaulters
+	DELETE FROM defaulters
 		WHERE amount = 0 
 			AND hasChanged = FALSE
-            AND `date` = vDate;
+			AND `date` = vDate;
 		
-    UPDATE defaulters d
+	UPDATE defaulters d
 			JOIN vn.config ON TRUE
 		SET d.frozened = NULL
 		WHERE `date` = vDate 
 			AND d.amount <= config.defaultersMaxAmount;
 			
-    CALL vn.clientFreeze();
+	CALL vn.clientFreeze();
 	
-    -- actualizamos defaulting
+	-- actualizamos defaulting
 	DELETE FROM bi.defaulting WHERE date = vDate;
 
 	INSERT INTO bi.defaulting(date, amount)

db/routines/bi/procedures/greuge_dif_porte_add.sql

@@ -1,8 +1,19 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
 BEGIN
-	DECLARE datSTART DATETIME DEFAULT TIMESTAMPADD(DAY,-60,util.VN_CURDATE()); -- '2019-07-01'
-	DECLARE datEND DATETIME DEFAULT TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
+
+/**
+ * Calculates the greuge based on a specific date in the 'grievanceConfig' table
+ */
+
+	DECLARE vDateStarted DATETIME;
+	DECLARE vDateEnded DATETIME DEFAULT (util.VN_CURDATE() - INTERVAL 1 DAY);
+	DECLARE vDaysAgoOffset INT;
+
+	SELECT daysAgoOffset INTO vDaysAgoOffset
+		FROM vn.greugeConfig;
+
+	SET vDateStarted = util.VN_CURDATE() - INTERVAL vDaysAgoOffset DAY;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.dp;
 
@@ -10,53 +21,53 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.dp
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		 SELECT t.id ticketFk,
-			SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) AS teorico,
-			00000.00 as practico,
-			00000.00 as greuge,
-            t.clientFk,
-            t.shipped
-		FROM
-			vn.ticket t
-			JOIN vn2008.Clientes cli ON cli.Id_cliente = t.clientFk
-			LEFT JOIN vn.expedition e ON e.ticketFk = t.id
-			JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
-			JOIN vn.zone z ON t.zoneFk = z.id
-		WHERE
-			t.shipped between datSTART AND datEND
-				AND cli.`real`
-				AND t.companyFk IN (442 , 567)
-				AND z.isVolumetric = FALSE
-		GROUP BY t.id;
+		SELECT t.id ticketFk,
+				SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) teorico,
+				00000.00 practico,
+				00000.00 greuge,
+				t.clientFk,
+				t.shipped
+			FROM vn.ticket t
+				JOIN vn.client c ON c.id = t.clientFk
+				LEFT JOIN vn.expedition e ON e.ticketFk = t.id
+				JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
+				JOIN vn.zone z ON t.zoneFk = z.id
+				JOIN vn.company cp ON cp.id = t.companyFk
+			WHERE t.shipped BETWEEN vDateStarted AND vDateEnded
+				AND c.isRelevant
+				AND cp.code IN ('VNL', 'VNH')
+				AND NOT z.isVolumetric
+			GROUP BY t.id;
 
 	-- Agencias que cobran por volumen
 	INSERT INTO tmp.dp
 		SELECT sv.ticketFk,
-			SUM(IFNULL(sv.freight,0)) AS teorico,
-			00000.00 as practico,
-			00000.00 as greuge,
-            sv.clientFk,
-            sv.shipped
-		FROM vn.saleVolume sv
-		    JOIN vn.zone z ON z.id = sv.zoneFk
-				AND sv.shipped BETWEEN datSTART AND datEND
-				AND z.isVolumetric != FALSE
-		GROUP BY sv.ticketFk;
+				SUM(IFNULL(sv.freight,0)) teorico,
+				00000.00 practico,
+				00000.00 greuge,
+				sv.clientFk,
+				sv.shipped
+			FROM vn.saleVolume sv
+				JOIN vn.zone z ON z.id = sv.zoneFk
+					AND sv.shipped BETWEEN vDateStarted AND vDateEnded
+					AND z.isVolumetric != FALSE
+			GROUP BY sv.ticketFk;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.dp_aux;
 
 	CREATE TEMPORARY TABLE tmp.dp_aux
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT dp.ticketFk, sum(Cantidad * Valor) as valor
-		FROM tmp.dp
-		JOIN vn2008.Movimientos m ON m.Id_Ticket = dp.ticketFk
-		JOIN vn2008.Movimientos_componentes mc using(Id_Movimiento)
-		WHERE mc.Id_Componente = 15
-		GROUP BY dp.ticketFk;
+		SELECT dp.ticketFk, SUM(s.quantity * sc.value) valor
+			FROM tmp.dp
+				JOIN vn.sale s ON s.ticketFk = dp.ticketFk
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id
+				JOIN vn.component c ON c.id = sc.componentFk
+			WHERE c.code = 'delivery'
+			GROUP BY dp.ticketFk;
 
 	UPDATE tmp.dp
-		JOIN tmp.dp_aux USING(ticketFk)
+			JOIN tmp.dp_aux USING(ticketFk)
 		SET practico = IFNULL(valor,0);
 
 	DROP TEMPORARY TABLE tmp.dp_aux;
@@ -64,25 +75,26 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.dp_aux
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT dp.ticketFk, sum(g.amount) Importe
+		SELECT dp.ticketFk, SUM(g.amount) Importe
 			FROM tmp.dp
-			JOIN vn.greuge g ON g.ticketFk = dp.ticketFk
-				WHERE g.greugeTypeFk = 1 -- dif_porte
-				GROUP BY dp.ticketFk;
+				JOIN vn.greuge g ON g.ticketFk = dp.ticketFk
+				JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
+			WHERE gt.code = 'freightDifference' -- dif_porte
+			GROUP BY dp.ticketFk;
 
 	UPDATE tmp.dp
-		JOIN tmp.dp_aux USING(ticketFk)
+			JOIN tmp.dp_aux USING(ticketFk)
 		SET greuge = IFNULL(Importe,0);
 
 	INSERT INTO vn.greuge (clientFk,description,amount,shipped,greugeTypeFk,ticketFk)
-		SELECT dp.clientFk
-			  , concat('dif_porte ', dp.ticketFk)
-			  , round(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) as Importe
-			  , date(dp.shipped)
-			  , 1
-			  ,dp.ticketFk
+		SELECT dp.clientFk,
+				CONCAT('dif_porte ', dp.ticketFk), 
+				ROUND(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) Importe,
+				date(dp.shipped), 
+				1,
+				dp.ticketFk
 			FROM tmp.dp
-			JOIN vn.client c ON c.id = dp.clientFk
+				JOIN vn.client c ON c.id = dp.clientFk
 			WHERE ABS(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0)) > 1
 				AND c.isRelevant;
 

db/routines/bi/views/last_Id_Cubo.sql

@@ -1,19 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bi`.`last_Id_Cubo`
-AS SELECT `C`.`Id_Compra` AS `Id_Compra`,
-	`C`.`Id_Article` AS `Id_Article`,
-	`tr`.`warehouse_id` AS `warehouse_id`,
-	`C`.`Id_Cubo` AS `Id_Cubo`,
-	`C`.`Packing` AS `Packing`
-FROM (
-		(
-			`vn2008`.`Compres` `C`
-			JOIN `vn2008`.`Entradas` `E` ON(`C`.`Id_Entrada` = `E`.`Id_Entrada`)
-		)
-		JOIN `vn2008`.`travel` `tr` ON(`E`.`travel_id` = `tr`.`id`)
-	)
-WHERE `C`.`Id_Cubo` IS NOT NULL
-	AND `C`.`Id_Cubo` <> '--'
-	AND `tr`.`landing` > `util`.`VN_CURDATE`() - INTERVAL 18 MONTH
-ORDER BY `C`.`Id_Compra` DESC

db/routines/bi/views/v_ventas_contables.sql

@@ -1,23 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bi`.`v_ventas_contables`
-AS SELECT `time`.`year` AS `year`,
-	`time`.`month` AS `month`,
-	cast(
-		sum(
-			`m`.`Cantidad` * `m`.`Preu` * (100 - `m`.`Descuento`) / 100
-		) AS decimal(10, 0)
-	) AS `importe`
-FROM (
-		(
-			(
-				`vn2008`.`Tickets` `t`
-				JOIN `bi`.`f_tvc` ON(`t`.`Id_Ticket` = `bi`.`f_tvc`.`Id_Ticket`)
-			)
-			JOIN `vn2008`.`Movimientos` `m` ON(`t`.`Id_Ticket` = `m`.`Id_Ticket`)
-		)
-		JOIN `vn2008`.`time` ON(`time`.`date` = cast(`t`.`Fecha` AS date))
-	)
-WHERE `t`.`Fecha` >= '2014-01-01'
-GROUP BY `time`.`year`,
-	`time`.`month`

db/routines/bs/procedures/bancos_evolution_add.sql

@@ -1,112 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`bancos_evolution_add`(vStartingDate DATE)
-BEGIN
-/**
- * Inserta en la tabla bancos_evolution los saldos acumulados de cada banco
- *
- * @param vStartingDate Fecha desde la cual se recalculan la tabla bs.bancos_evolution
- */ 
-	DECLARE vCurrentDate DATE;
-	DECLARE vMaxDate DATE DEFAULT TIMESTAMPADD(MONTH, 7, util.VN_CURDATE());
-	IF IFNULL(vStartingDate,0) < TIMESTAMPADD(YEAR, -5, util.VN_CURDATE()) THEN
-		CALL util.throw('invalid date');
-    END IF;
-	DELETE FROM bs.bancos_evolution WHERE Fecha >= vStartingDate;
-
-	SET vCurrentDate = vStartingDate;
-
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT vCurrentDate, Id_Banco, deuda
-			FROM bs.bancos_evolution
-			WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate);
-            
-	WHILE vCurrentDate < vMaxDate DO
--- insertar solo el dia de ayer
-		INSERT INTO bs.bancos_evolution(Fecha ,Id_Banco, saldo)
-			SELECT vCurrentDate, Id_Banco, SUM(saldo)  
-				FROM (
-					SELECT Id_Banco ,saldo
-						FROM bs.bancos_evolution
-						WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate)  -- los saldos acumulados del dia anterior
-					UNION ALL
-				
-					SELECT c.Id_Banco, IFNULL(SUM(Entrada),0) - IFNULL(SUM(Salida),0) as saldo
-						FROM vn2008.Cajas c
-							JOIN vn2008.Bancos b using(Id_Banco)   -- saldos de las cajas
-							JOIN vn.accountingType at2 ON at2.id = b.cash 
-						WHERE at2.code IN ('wireTransfer','fundingLine')
-							AND Cajafecha = vCurrentDate
-							AND (Serie = 'MB' OR at2.code = 'fundingLine')
-						GROUP BY Id_Banco
-			)sub 
-			GROUP BY Id_Banco
-		ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-                              
-		SET vCurrentDate = TIMESTAMPADD(DAY,1,vCurrentDate);
-
-	END WHILE;
-
-    -- Ahora actualizamos la quilla 
-	UPDATE bs.bancos_evolution be
-		JOIN
-		(
-			SELECT bp.Id_Banco, - sum(bp.importe) as quilla, t.dated
-			FROM vn.time t 
-				JOIN vn2008.Bancos_poliza bp ON t.dated between apertura AND IFNULL(cierre, t.dated)
-			WHERE t.dated BETWEEN vStartingDate AND vMaxDate
-			GROUP BY Id_Banco, t.dated
-		) sub ON be.Id_Banco = sub.Id_Banco AND sub.dated = be.Fecha
-		SET be.quilla = sub.quilla;                  
-
-	-- pagos futuros no concilidados
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT t.dated, p.id_banco, - importe
-			FROM vn.time t 
-				join vn2008.pago p ON p.fecha <= t.dated
-		WHERE t.dated BETWEEN util.VN_CURDATE() AND vMaxDate
-			AND p.fecha BETWEEN util.VN_CURDATE() AND vMaxDate
-			AND NOT conciliado
-	ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
-		-- cobros futuros
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT t.dated, r.Id_Banco, SUM(Entregado)
-			FROM vn.time t 
-				JOIN vn2008.Recibos r ON r.Fechacobro <= t.dated
-			WHERE r.Fechacobro > util.VN_CURDATE() AND r.Fechacobro <= vMaxDate
-				AND t.dated BETWEEN util.VN_CURDATE() AND vMaxDate
-			GROUP BY t.dated, r.Id_Banco
-	ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
-	-- saldos de la tabla prevision
-	INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo)
-		SELECT t.dated, sp.Id_Banco, SUM(Importe)
-			FROM vn.time t 
-				JOIN vn2008.Saldos_Prevision sp ON sp.Fecha <= t.dated
-				JOIN vn2008.Bancos b ON sp.Id_Banco = b.Id_Banco
-				JOIN vn.accountingType at2 ON at2.id = b.cash 
-		WHERE at2.code IN ('wireTransfer','fundingLine')
-			AND t.dated BETWEEN vStartingDate AND vMaxDate
-		GROUP BY t.dated, sp.Id_Banco
-	ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo);
-
-	-- Utilizamos el saldo_auxiliar para calcular lo dispuesto en las polizas
-	UPDATE  bs.bancos_evolution be
-		SET saldo_aux = saldo
-		WHERE Fecha >= vStartingDate;
-
-	-- Deuda
-	UPDATE bs.bancos_evolution be
-		JOIN vn2008.Bancos b using(Id_Banco)
-		JOIN vn.accountingType at2 ON at2.id = b.cash 
-		SET be.deuda =  IF(at2.code = 'fundingLine', be.saldo_aux, 0)
-		   , be.saldo = IF(at2.code = 'fundingLine', 0, be.saldo_aux)
-	WHERE Fecha >= vStartingDate;
-
-	-- Liquidez            
-	update bs.bancos_evolution set liquidez = saldo - quilla + deuda WHERE Fecha >= vStartingDate;
-   -- Disponibilidad
-   update bs.bancos_evolution set `disponibilidad ajena` = - quilla + deuda WHERE Fecha >= vStartingDate;
-
-END$$
-DELIMITER ;

db/routines/bs/procedures/comercialesCompleto.sql

@@ -1,111 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`comercialesCompleto`(IN vWorker INT, vDate DATE)
-BEGIN
-	DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01');
-	DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate));
-    
-	CALL vn.worker_GetHierarchy(vWorker);
-	
-    INSERT IGNORE INTO tmp.workerHierarchyList (workerFk)
-		SELECT wd2.workerFk
-			FROM vn.workerDepartment wd2
-				WHERE wd2.workerFk = vWorker;
-		 
-	-- Falta que en algunos casos solo tenga en cuenta los tipos afectados.
-	SELECT 
-		c.Id_Cliente id_cliente,
-		c.Cliente cliente,
-		cr.recobro * 100 tarifa,
-		c.Telefono telefono,
-		c.movil,
-		c.POBLACION poblacion,
-		p.`name` provincia,
-		ROUND(f.futur, 2) futur,
-		c.Credito credito,
-		pm.`name` forma_pago,
-		ROUND(c365 / 12, 2) consumo_medio365,
-		ROUND(c365, 2) consumo365,
-		ROUND(CmLy.peso, 2) peso_mes_año_pasado,
-		ROUND(CmLy.peso * 1.19, 2) objetivo,
-		tr.CodigoTrabajador,
-		ROUND(mes_actual.consumo, 2) consumoMes,
-		ROUND(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0), 2) como_lo_llevo,
-		DATE(LastTicket) ultimo_ticket,
-		dead.muerto,
-		g.Greuge,
-		cr.recobro
-	FROM
-		vn2008.Clientes c
-			LEFT JOIN
-			(SELECT g.clientFk Id_Cliente, CAST( SUM(g.amount) as DECIMAL(12,2)) AS Greuge 
-				FROM vn.greuge g
-					JOIN vn.`client` c ON c.id = g.clientFk
-					LEFT JOIN vn.worker w ON c.salesPersonFk = w.id
-				WHERE (c.salesPersonFk = vWorker OR w.bossFk = vWorker)
-			 GROUP BY Id_Cliente
-			) g ON g.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		vn2008.province p ON p.province_id = c.province_id
-			JOIN
-		vn2008.pay_met pm ON pm.id = c.pay_met_id
-			LEFT JOIN
-		vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-			LEFT JOIN
-		 bi.claims_ratio cr on cr.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT v.Id_Cliente, SUM(importe) c365 -- optimizat de 6s /5.3s/ 4.7s a 0.3/0.4/0.3
-			FROM bs.ventas v
-				JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente
-			WHERE v.fecha BETWEEN TIMESTAMPADD(YEAR, - 1, vDate) AND vDate
-				GROUP BY v.Id_Cliente) c365 ON c365.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT 
-			Id_Cliente, SUM(importe) consumo
-		FROM
-			 bs.ventas v
-		INNER JOIN vn2008.Clientes c USING (Id_Cliente)
-		LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-		WHERE
-			(c.Id_Trabajador = vWorker OR tr.boss = vWorker) 
-				AND (v.fecha BETWEEN TIMESTAMPADD(DAY, - DAY(vDate) + 1, vDate)  AND TIMESTAMPADD(DAY, - 1, vDate))
-		GROUP BY Id_Cliente) mes_actual ON mes_actual.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT t.Id_Cliente, SUM(m.preu * m.Cantidad * (1 - m.Descuento / 100)) futur
-				FROM vn2008.Tickets t
-					JOIN vn2008.Clientes c ON c.Id_Cliente = t.Id_Cliente
-					JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
-					LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-				WHERE
-					(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					AND t.Fecha BETWEEN vDate AND util.dayEnd(LAST_DAY(vDate))
-				GROUP BY Id_Cliente) f ON c.Id_Cliente = f.Id_Cliente
-			LEFT JOIN
-		(SELECT MAX(t.Fecha) LastTicket, c.Id_Cliente
-				FROM vn2008.Tickets t
-						JOIN vn2008.Clientes c ON c.Id_cliente = t.Id_Cliente
-						LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-					WHERE
-						(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					GROUP BY t.Id_Cliente) LastTicket ON LastTicket.Id_Cliente = c.Id_Cliente
-					LEFT JOIN
-		(
-			SELECT SUM(importe) peso, c.Id_Cliente
-					FROM bs.ventas v
-						JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente
-						LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-				WHERE fecha BETWEEN vAYearAgoStarted and vAYearAgoEnded
-					AND (c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-				GROUP BY c.Id_Cliente) CmLy ON CmLy.Id_Cliente = c.Id_Cliente
-			LEFT JOIN
-		(SELECT c.Id_Cliente,
-				IF(MAX(io.issued) < DATE_FORMAT(TIMESTAMPADD(MONTH, - 1, vDate), '%Y- %m-01'), TRUE, FALSE) muerto
-			FROM vn.invoiceOut io
-				JOIN vn2008.Clientes c ON c.Id_cliente = io.clientFk
-				LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
-			WHERE (c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-		GROUP BY Id_Cliente) dead ON dead.Id_Cliente = c.Id_Cliente
-		JOIN tmp.workerHierarchyList s ON s.workerFk = c.Id_Trabajador;
-
-	DROP TEMPORARY TABLE tmp.workerHierarchyList;
-END$$
-DELIMITER ;

db/routines/bs/procedures/indicatorsUpdate.sql

@@ -15,10 +15,10 @@ BEGIN
 		SET lastYearSales = 
 			(SELECT SUM(importe + recargo)
 				FROM ventas v
-					JOIN vn2008.empresa e ON e.id = v.empresa_id
-					JOIN vn2008.empresa_grupo eg ON eg.empresa_grupo_id = e.empresa_grupo
+					JOIN vn.company c ON c.id = v.empresa_id
+					JOIN vn.companyGroup cg ON cg.id = c.companyGroupFk
 				WHERE fecha BETWEEN oneYearBefore AND vDated
-					AND eg.grupo = 'Verdnatura'
+					AND cg.code = 'Verdnatura'
 			) 
 		WHERE updated = vDated;
  

db/routines/bs/procedures/manaCustomerUpdate.sql

@@ -5,15 +5,15 @@ BEGIN
 	DECLARE vFromDated DATE;
 	DECLARE vForDeleteDated DATE;
 	DECLARE vManaId INT;
-    DECLARE vManaAutoId INT;
-    DECLARE vClaimManaId INT;
-    DECLARE vManaBankId INT;
-    DECLARE vManaGreugeTypeId INT;
-    DECLARE vManaFromDays INT;
-    DECLARE vManaToDays INT;
+	DECLARE vManaAutoId INT;
+	DECLARE vClaimManaId INT;
+	DECLARE vManaBankId INT;
+	DECLARE vManaGreugeTypeId INT;
+	DECLARE vManaFromDays INT;
+	DECLARE vManaToDays INT;
 
 	SELECT id INTO vManaId
-			FROM vn.component WHERE code = 'mana';
+		FROM vn.component WHERE code = 'mana';
 		
 	SELECT id INTO vManaAutoId
 		FROM vn.component WHERE code = 'autoMana';
@@ -27,75 +27,68 @@ BEGIN
 	SELECT id INTO vManaGreugeTypeId
 		FROM vn.greugeType WHERE code = 'mana';
 
-    SELECT manaFromDays, manaToDays
-        INTO vManaFromDays, vManaToDays
-        FROM vn.salespersonConfig;
+	SELECT manaFromDays, manaToDays
+		INTO vManaFromDays, vManaToDays
+		FROM vn.salespersonConfig;
 
-	SELECT MAX(dated)
-        INTO vFromDated 
-        FROM vn.clientManaCache;
+	SELECT MAX(dated) INTO vFromDated
+		FROM vn.clientManaCache;
 
-	 DELETE
-        FROM vn.clientManaCache
-        WHERE dated = vFromDated;
+	DELETE FROM vn.clientManaCache
+		WHERE dated = vFromDated;
 	
-    SELECT MAX(dated)
-        INTO vFromDated 
-        FROM vn.clientManaCache;
+	SELECT MAX(dated) INTO vFromDated 
+		FROM vn.clientManaCache;
 			
-    IF ISNULL(vFromDated) THEN
-        SELECT manaDateFrom
-            INTO vFromDated
-            FROM vn.salespersonConfig;
-    END IF;
+	IF vFromDated IS NULL THEN
+		SELECT manaDateFrom
+			INTO vFromDated
+			FROM vn.salespersonConfig;
+	END IF;
 
-    WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
-        SELECT
-                vFromDated + INTERVAL vManaToDays DAY,
-                vFromDated - INTERVAL vManaFromDays DAY 
-            INTO 
-                vToDated,
-                vForDeleteDated;
+	WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
+		SELECT vFromDated + INTERVAL vManaToDays DAY,
+				vFromDated - INTERVAL vManaFromDays DAY 
+			INTO  vToDated,
+				vForDeleteDated;
 			
-        DELETE FROM vn.clientManaCache
-            WHERE dated <= vForDeleteDated;
+		DELETE FROM vn.clientManaCache
+			WHERE dated <= vForDeleteDated;
 
-        INSERT INTO vn.clientManaCache(clientFk, mana, dated)
-            SELECT 
-                    Id_Cliente,
-                    SUM(mana),
-                    vToDated 
-                FROM 
-                (
-                    SELECT cs.Id_Cliente, Cantidad * Valor as mana
-                        FROM vn2008.Tickets t
-                            JOIN vn2008.Consignatarios cs using(Id_Consigna)
-                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
-                            JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
-                        WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
-                            AND t.Fecha > vFromDated 
-                            AND date(t.Fecha) <= vToDated
-                    UNION ALL
-                    SELECT r.Id_Cliente, - Entregado
-                        FROM vn2008.Recibos r
-                        WHERE Id_Banco = vManaBankId
-                            AND Fechacobro > vFromDated 
-                            AND Fechacobro <= vToDated
-                    UNION ALL
-                    SELECT clientFk, amount
-                        FROM vn.greuge
-                        WHERE greugeTypeFk = vManaGreugeTypeId
-                            AND shipped > vFromDated 
-                            AND shipped <= vToDated
-                    UNION ALL
-                    SELECT clientFk, mana
-                        FROM vn.clientManaCache
-                        WHERE dated = vFromDated
-                ) sub
-                GROUP BY Id_Cliente
-                HAVING Id_Cliente;
+		INSERT INTO vn.clientManaCache(clientFk, mana, dated)
+			SELECT Id_Cliente,
+					SUM(mana),
+					vToDated 
+				FROM (
+					SELECT a.clientFk Id_Cliente, s.quantity * sc.value mana
+						FROM vn.ticket t
+							JOIN vn.address a ON a.id = t.addressFk
+							JOIN vn.sale s ON s.ticketFk = t.id
+							JOIN vn.saleComponent sc ON sc.saleFk = s.id
+						WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
+							AND t.shipped > vFromDated 
+							AND DATE(t.shipped) <= vToDated
+					UNION ALL
+					SELECT clientFk, - amountPaid
+						FROM vn.receipt
+						WHERE bankFk = vManaBankId
+							AND payed > vFromDated 
+							AND payed <= vToDated
+					UNION ALL
+					SELECT clientFk, amount
+						FROM vn.greuge
+						WHERE greugeTypeFk = vManaGreugeTypeId
+							AND shipped > vFromDated 
+							AND shipped <= vToDated
+					UNION ALL
+					SELECT clientFk, mana
+						FROM vn.clientManaCache
+						WHERE dated = vFromDated
+				) sub
+				GROUP BY Id_Cliente
+				HAVING Id_Cliente;
 
-        SET vFromDated = vToDated;  
-    END WHILE;
+		SET vFromDated = vToDated;
+	END WHILE;
 END$$
 DELIMITER ;

db/routines/bs/procedures/sale_add.sql

@@ -0,0 +1,64 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sale_add`(
+	IN vStarted DATE,
+	IN vEnded DATE
+)
+BEGIN
+/**
+ * Añade las ventas que se realizaron entre 2 fechas a la tabla bs.sale
+ * 
+ * @param vStarted Fecha de inicio
+ * @param vEnded Fecha de fin
+ *
+ */
+	IF vStarted < (util.VN_CURDATE() - INTERVAL 5 YEAR) OR vStarted > vEnded THEN
+		CALL util.throw('Wrong date');
+	END IF;
+	
+	DELETE FROM sale 
+		WHERE dated BETWEEN vStarted AND vEnded;
+
+	REPLACE sale(
+		saleFk,
+		amount,
+		surcharge,
+		dated,
+		typeFk,
+		clientFk,
+		companyFk,
+		margin
+	)WITH calculatedSales AS(
+	SELECT s.id saleFk,
+			CAST(SUM(IF(ct.isBase, s.quantity * sc.value, 0)) AS DECIMAL(10, 3)) amount,
+			CAST(SUM(IF(ct.isBase, 0, s.quantity * sc.value)) AS DECIMAL(10, 3)) surcharge,
+			s.total,
+			DATE(t.shipped) dated,
+			i.typeFk,
+			t.clientFk,
+			t.companyFk,
+			CAST(SUM(IF(ct.isMargin, s.quantity * sc.value, 0 )) AS DECIMAL(10, 3)) marginComponents
+		FROM vn.ticket t
+			STRAIGHT_JOIN vn.sale s ON s.ticketFk = t.id
+			JOIN vn.item i ON i.id = s.itemFk
+			JOIN vn.itemType it ON it.id = i.typeFk
+			JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+			JOIN vn.saleComponent sc ON sc.saleFk = s.id 
+			JOIN vn.component c ON c.id = sc.componentFk
+			JOIN vn.componentType ct ON ct.id = c.typeFk
+		WHERE t.shipped BETWEEN vStarted AND vEnded
+			AND s.quantity <> 0
+			AND ic.merchandise 
+		GROUP BY s.id
+	)SELECT saleFk, 
+			amount, 
+			surcharge, 
+			dated, 
+			typeFk, 
+			clientFk, 
+			companyFk, 
+			IF (marginComponents IS NULL, 
+				0, 
+				CAST(marginComponents + amount + surcharge - total AS DECIMAL(10, 3)))
+		FROM calculatedSales;
+END$$
+DELIMITER ;

db/routines/bs/procedures/sales_addLauncher.sql

@@ -1,13 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add_launcher`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`sales_addLauncher`()
 BEGIN
 /**
  * Añade las ventas a la tabla bs.sale que se realizaron desde hace un mes hasta hoy
  * 
  */
-
 	DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
-	CALL ventas_add(vCurDate - INTERVAL 1 MONTH, vCurDate);
 	
+	CALL sale_add(vCurDate - INTERVAL 1 MONTH, vCurDate);
 END$$
 DELIMITER ;

db/routines/bs/procedures/ventas_add.sql

@@ -1,78 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add`(
-	IN vStarted DATETIME,
-	IN vEnded DATETIME)
-BEGIN
-/**
-* Añade las ventas que se realizaron entre
-* vStarted y vEnded
-* 
-* @param vStarted Fecha de inicio
-* @param vEnded Fecha de finalizacion
-*
-**/
-	DECLARE vStartingDate DATETIME;
-	DECLARE vEndingDate DATETIME;
-
-	IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) 
-		OR vEnded < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) THEN
-		CALL util.throw('fechaDemasiadoAntigua');
-	END IF;
-
-	SET vEnded = util.dayEnd(vEnded);
-	SET vStartingDate = vStarted ;
-	SET vEndingDate = util.dayEnd(vStartingDate);
-
-	DELETE 
-		FROM sale 
-		WHERE dated BETWEEN vStartingDate AND vEnded;
-
-	WHILE vEndingDate <= vEnded DO
-
-		REPLACE ventas(Id_Movimiento, importe, recargo, fecha, tipo_id, Id_Cliente, empresa_id)
-			SELECT saleFk,
-					SUM(IF(ct.isBase, s.quantity * sc.value, 0)) importe,
-					SUM(IF(ct.isBase, 0, s.quantity * sc.value)) recargo,
-					vStartingDate,
-					i.typeFk,
-					a.clientFk,
-					t.companyFk
-				FROM vn.saleComponent sc
-					JOIN vn.component c ON c.id = sc.componentFk
-					JOIN vn.componentType ct ON ct.id = c.typeFk
-					JOIN vn.sale s ON s.id = sc.saleFk
-					JOIN vn.item i ON i.id = s.itemFk
-					JOIN vn.itemType it ON it.id = i.typeFk
-					JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-					JOIN vn.ticket t ON t.id = s.ticketFk
-					JOIN vn.address a ON a.id = t.addressFk 
-					JOIN vn.client cl ON cl.id = a.clientFk
-				WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
-					AND s.quantity <> 0
-					AND s.discount <> 100
-					AND ic.merchandise 
-				GROUP BY sc.saleFk
-				HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0;
-
-		UPDATE sale s
-				JOIN (
-					SELECT s.id, 
-							SUM(s.quantity * sc.value ) margen,
-							s.quantity * s.price * (100 - s.discount ) / 100 pvp
-						FROM vn.sale s
-							JOIN vn.ticket t ON t.id = s.ticketFk 
-							JOIN vn.saleComponent sc ON sc.saleFk = s.id
-							JOIN vn.component c ON c.id = sc.componentFk 
-							JOIN vn.componentType ct ON ct.id = c.typeFk 
-						WHERE t.shipped BETWEEN vStartingDate AND vEndingDate
-							AND ct.isMargin = TRUE
-						GROUP BY s.id) sub ON sub.id = s.saleFk 
-			SET s.margin = sub.margen + s.amount + s.surcharge - sub.pvp;
-
-		SET vStartingDate = TIMESTAMPADD(DAY,1, vStartingDate);
-		SET vEndingDate = util.dayEnd(vStartingDate);
-
-	END WHILE;
-
-END$$
-DELIMITER ;

db/routines/bs/procedures/ventas_contables_add.sql

@@ -19,11 +19,11 @@ BEGIN
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list
-		(PRIMARY KEY (Id_Ticket))
+		(PRIMARY KEY (id))
 		ENGINE = MEMORY
-		SELECT Id_Ticket
-			FROM vn2008.Tickets t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
+		SELECT t.id
+			FROM vn.ticket t
+				JOIN vn.invoiceOut io ON io.`ref` = t.refFk
 			WHERE year(io.issued) = vYear
 				AND month(io.issued) = vMonth;
 
@@ -38,35 +38,35 @@ BEGIN
 
 		SELECT  vYear
 			  , vMonth
-			  , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
+			  , round(sum(s.quantity * s.price * (100 - s.discount)/100))
 			  , IF(
-				   e.empresa_grupo = e2.empresa_grupo
+				   co.companyGroupFk = co2.companyGroupFk
 				  ,1
-				  ,IF(e2.empresa_grupo,2,0)
+				  ,IF(co2.companyGroupFk,2,0)
 				  ) as grupo
-			  , tp.reino_id
-			  , a.tipo_id
-			  , t.empresa_id
-			  , a.expenseFk
-				+ IF(e.empresa_grupo = e2.empresa_grupo
+			  , it.categoryFk
+			  , i.typeFk
+			  , t.companyFk
+			  , i.expenseFk
+				+ IF(co.companyGroupFk = co2.companyGroupFk
 									  ,1
-									  ,IF(e2.empresa_grupo,2,0)
+									  ,IF(co2.companyGroupFk,2,0)
 									  ) * 100000
-				+ tp.reino_id * 1000 as Gasto
-			FROM vn2008.Movimientos m
-				JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
-				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
-				JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
-				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.Id_Ticket
-				JOIN vn2008.Articles a on m.Id_Article = a.Id_Article
-				JOIN vn2008.empresa e on e.id = t.empresa_id
-				LEFT JOIN vn2008.empresa e2 on e2.Id_Cliente = c.Id_Cliente
-				JOIN vn2008.Tipos tp on tp.tipo_id = a.tipo_id
-			WHERE Cantidad <> 0
-				AND Preu <> 0
-				AND m.Descuento <> 100
-				AND a.tipo_id != TIPO_PATRIMONIAL
-			GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
+				+ it.categoryFk * 1000 as Gasto
+			FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk
+				JOIN vn.address a on a.id = t.addressFk
+				JOIN vn.client c on c.id = a.clientFk
+				JOIN tmp.ticket_list tt on tt.id = t.id
+				JOIN vn.item i on s.itemFk = i.id
+				JOIN vn.company co on co.id = t.companyFk
+				LEFT JOIN vn.company co2 on co2.clientFk = c.id
+				JOIN vn.itemType it on it.id = i.typeFk
+			WHERE s.quantity <> 0
+				AND s.price <> 0
+				AND s.discount <> 100
+				AND i.typeFk <> TIPO_PATRIMONIAL
+			GROUP BY grupo, it.categoryFk, i.typeFk, t.companyFk, Gasto;
 
 	INSERT INTO bs.ventas_contables(year
 								  , month
@@ -92,7 +92,7 @@ BEGIN
 				JOIN vn.ticket t ON ts.ticketFk = t.id
 				JOIN vn.address a on a.id = t.addressFk
 				JOIN vn.client cl on cl.id = a.clientFk
-				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
+				JOIN tmp.ticket_list tt on tt.id = t.id
 				JOIN vn.company c on c.id = t.companyFk
 				LEFT JOIN vn.company c2 on c2.clientFk = cl.id
 			GROUP BY grupo, t.companyFk ;

db/routines/bs/procedures/ventas_contables_por_cliente.sql

@@ -1,47 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT)
-BEGIN
-	
-	/**
-	 * Muestra las ventas (€) de cada cliente
-	 * dependiendo del año
-	 */
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
-
-	CREATE TEMPORARY TABLE tmp.ticket_list
-		(PRIMARY KEY (Id_Ticket))
-		SELECT Id_Ticket
-			FROM vn2008.Tickets t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
-			WHERE year(io.issued) = vYear
-				AND month(io.issued) = vMonth;   		
-	            
-	SELECT vYear Año,
-			vMonth Mes,
-			t.Id_Cliente,
-			round(sum(Cantidad * Preu * (100 - m.Descuento)/100)) Venta,
-			IF(e.empresa_grupo = e2.empresa_grupo,
-				1,
-				IF(e2.empresa_grupo,2,0))
-			AS grupo,
-			t.empresa_id empresa
-		FROM vn2008.Movimientos m 
-			JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-			JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
-			JOIN vn2008.Clientes c ON c.Id_Cliente = cs.Id_Cliente
-			JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket
-			JOIN vn2008.Articles a ON m.Id_Article = a.Id_Article
-			JOIN vn2008.empresa e ON e.id = t.empresa_id
-			LEFT JOIN vn2008.empresa e2 ON e2.Id_Cliente = c.Id_Cliente
-			JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
-		WHERE Cantidad <> 0
-			AND Preu <> 0
-			AND m.Descuento <> 100
-			AND a.tipo_id != 188
-		GROUP BY t.Id_Cliente, grupo,t.empresa_id;
-	
-	DROP TEMPORARY TABLE tmp.ticket_list;
-			
-END$$
-DELIMITER ;

db/routines/bs/procedures/vivosMuertos.sql

@@ -1,63 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`vivosMuertos`()
-BEGIN
-	
-	/**
-	 * Devuelve el número de clientes nuevos y muertos,
-	 * dependiendo de la fecha actual.
-	 *
-	 * @param @datSTART Fecha de inicio a buscar
-	 * @param @datEND Fecha de finalización a buscar
-	 */
-
-		SET @datSTART = TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
-		SET @datEND = TIMESTAMPADD(DAY,-DAY(util.VN_CURDATE()),util.VN_CURDATE());
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.VivosMuertos;
-	
-	CREATE TEMPORARY TABLE tmp.VivosMuertos
-		SELECT c.Id_Cliente, tm.yearMonth, f.Compra, 0 as Nuevo, 0 as Muerto
-		FROM vn2008.Clientes c
-			JOIN
-				(SELECT DISTINCT yearMonth
-				FROM vn2008.time
-				WHERE date BETWEEN @datSTART
-					AND @datEND ) tm
-			LEFT JOIN
-				(SELECT DISTINCT tm.yearMonth, io.clientFk Id_Cliente , 1 as Compra
-					FROM vn.invoiceOut io
-			        	JOIN vn2008.time tm ON tm.date = io.issued
-					WHERE io.issued BETWEEN @datSTART
-						AND @datEND) f ON f.yearMonth = tm.yearMonth
-						AND f.Id_Cliente = c.Id_Cliente;
-	
-	UPDATE tmp.VivosMuertos vm
-		JOIN
-			(SELECT MIN(tm.yearMonth) firstMonth, io.clientFk Id_Cliente 
-			FROM vn.invoiceOut io
-		        JOIN vn2008.time tm ON tm.date = io.issued
-			WHERE io.issued BETWEEN @datSTART AND @datEND
-		    GROUP BY io.clientFk) fm ON fm.firstMonth = vm.yearMonth
-		    	AND fm.Id_Cliente = vm.Id_Cliente
-
-	SET Nuevo = 1;
-	  
-	SELECT max(yearMonth) INTO @lastYearMonth FROM tmp.VivosMuertos;
-	 
-	UPDATE tmp.VivosMuertos vm
-	JOIN (
-	  SELECT MAX(tm.yearMonth) firstMonth, io.clientFk Id_Cliente
-			FROM vn.invoiceOut io
-	        	JOIN vn2008.time tm ON tm.date = io.issued
-			WHERE io.issued BETWEEN @datSTART AND @datEND
-	        GROUP BY io.clientFk) fm ON fm.firstMonth = vm.yearMonth
-				AND fm.Id_Cliente = vm.Id_Cliente
-
-	SET Muerto = 1
-
-	WHERE yearMonth < @lastYearMonth;
-
-	SELECT * FROM tmp.VivosMuertos;
-
-END$$
-DELIMITER ;

db/routines/bs/views/VentasPorCliente.sql

@@ -1,14 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`VentasPorCliente`
-AS SELECT `v`.`Id_Cliente` AS `Id_Cliente`,
-	round(sum(`v`.`importe`), 0) AS `VentaBasica`,
-	`t`.`year` AS `year`,
-	`t`.`month` AS `month`
-FROM (
-		`vn2008`.`time` `t`
-		JOIN `bs`.`ventas` `v` ON(`v`.`fecha` = `t`.`date`)
-	)
-GROUP BY `v`.`Id_Cliente`,
-	`t`.`year`,
-	`t`.`month`

db/routines/bs/views/bajasLaborales.sql

@@ -1,31 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`bajasLaborales`
-AS SELECT `w`.`firstName` AS `firstname`,
-	`w`.`lastName` AS `name`,
-	`b`.`id` AS `businessFk`,
-	max(`c`.`dated`) AS `lastDate`,
-	max(IFNULL(`b`.`ended`, `util`.`VN_CURDATE`())) AS `endContract`,
-	`at`.`name` AS `type`,
-	cast(COUNT(0) AS decimal(10, 0)) AS `dias`,
-	`w`.`id` AS `userFk`
-FROM (
-		(
-			(
-				`vn`.`calendar` `c`
-				JOIN `vn`.`business` `b` ON(`b`.`id` = `c`.`businessFk`)
-			)
-			JOIN `vn`.`worker` `w` ON(`w`.`id` = `b`.`workerFk`)
-		)
-		JOIN `vn`.`absenceType` `at` ON(`at`.`id` = `c`.`dayOffTypeFk`)
-	)
-WHERE `c`.`dated` >= `util`.`VN_CURDATE`() + INTERVAL -1 year
-	AND `at`.`name` NOT IN (
-		'Vacaciones',
-		'Vacaciones 1/2 día',
-		'Compensar',
-		'Festivo'
-	)
-GROUP BY `w`.`id`,
-	`at`.`id`
-HAVING `endContract` >= `util`.`VN_CURDATE`()

db/routines/bs/views/horasSilla.sql

@@ -1,27 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`horasSilla`
-AS SELECT `wj`.`dated` AS `Fecha`,
-	`d`.`name` AS `Departamento`,
-	cast(sum(`wj`.`total`) AS decimal(10, 2)) AS `Horas`,
-	cast(
-		sum(
-			(`wj`.`total` + `wj`.`lunch`) * `wj`.`priceOrdinaryHour`
-		) AS decimal(10, 2)
-	) AS `Salarios`
-FROM (
-		(
-			`vn`.`workerJourney` `wj`
-			JOIN `vn`.`business` `b` ON(`b`.`id` = `wj`.`businessFk`)
-		)
-		JOIN `vn`.`department` `d` ON(`d`.`id` = `b`.`departmentFk`)
-	)
-WHERE `d`.`name` IN (
-		'CAMARA',
-		'ENCAJADO',
-		'PALETIZADORES',
-		'PRODUCCION',
-		'SACADORES'
-	)
-GROUP BY `wj`.`dated`,
-	`d`.`name`

db/routines/bs/views/s1_ticketDetail.sql

@@ -1,19 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`s1_ticketDetail`
-AS SELECT `s`.`ticketFk` AS `ticketFk`,
-	cast(
-		sum(`s`.`price` * `s`.`quantity`) AS decimal(10, 2)
-	) AS `ticketAmount`,
-	COUNT(`s`.`id`) AS `ticketLines`,
-	cast(sum(`sv`.`volume`) AS decimal(10, 2)) AS `ticketM3`,
-	cast(`t`.`shipped` AS date) AS `shipped`
-FROM (
-		(
-			`vn`.`ticket` `t`
-			JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`)
-		)
-		JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`)
-	)
-WHERE `t`.`shipped` BETWEEN '2021-09-01' AND '2021-10-31 23:59'
-GROUP BY `s`.`ticketFk`

db/routines/bs/views/s21_saleDetail.sql

@@ -1,42 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bs`.`s21_saleDetail`
-AS SELECT dayofmonth(`t`.`shipped`) AS `dia`,
-	year(`t`.`shipped`) AS `año`,
-	MONTH(`t`.`shipped`) AS `mes`,
-	`s`.`concept` AS `concepto`,
-	`s`.`quantity` AS `unidades`,
-	`s`.`price` AS `precio`,
-	`s`.`quantity` * `s`.`price` AS `venta`,
-	`it`.`name` AS `familia`,
-	`w`.`code` AS `comprador`,
-	`s`.`itemFk` AS `itemFk`,
-	`s`.`ticketFk` AS `ticketFk`,
-	`sv`.`volume` AS `volume`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							`vn`.`sale` `s`
-							JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`)
-						)
-						JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`)
-					)
-					JOIN `vn`.`worker` `w` ON(`w`.`id` = `it`.`workerFk`)
-				)
-				JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`)
-			)
-			JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`)
-		)
-		JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`)
-	)
-WHERE (
-		`t`.`shipped` BETWEEN '2020-10-21' AND '2020-10-28'
-		OR `t`.`shipped` BETWEEN '2019-10-21' AND '2019-10-28'
-		OR `t`.`shipped` BETWEEN '2021-09-1' AND '2021-10-28'
-	)
-	AND `t`.`warehouseFk` IN (1, 60)
-	AND `c`.`isRelevant` <> 0
-	AND `s`.`quantity` > 0

db/routines/cache/procedures/prod_graphic_refresh.sql

@@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`prod_graphic_refresh`(v_refresh BOOL, wh_id INT)
-proc: BEGIN
-	DECLARE datEQ DATETIME;
-	DECLARE timDIF TIME;
-    DECLARE v_calc INT;
-    
-    CALL cache_calc_start (v_calc, v_refresh, 'prod_graphic', wh_id);
-    
-    IF !v_refresh
-    THEN
-		LEAVE proc;
-	END IF;
-    
-    CALL vn2008.production_control_source(wh_id, 0);
-
-	DELETE FROM prod_graphic_source;
-
-	INSERT INTO prod_graphic_source (warehouse_id,  graphCategory, m3, hora, `order`, Agencia)
-	SELECT
-		wh_id,
-        st.graphCategory,
-        CAST(SUM(m3) AS DECIMAL(10,0)) as m3,
-        pb.Hora,
-        pb.state_order,
-        pb.Agencia
-	FROM tmp.production_buffer pb
-		JOIN vn.state st ON st.id = pb.state
-    WHERE Fecha = util.VN_CURDATE()
-    GROUP BY wh_id, graphCategory
-    ;
-    
-    
-    CALL cache_calc_end (v_calc);
-END$$
-DELIMITER ;

db/routines/dipole/procedures/expedition_add.sql

@@ -34,7 +34,7 @@ BEGIN
 					vPrinterFk,
 					IFNULL(right(`t`.`routeFk`, 3),0),
 					if (@vVolume := vn.ticketTotalVolume(t.id) > 1.5, @vVolume, IFNULL( rm.beachFk, 0)),
-					LEFT(IFNULL(et.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName,
+					LEFT(IFNULL(rs.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName,
 					t.clientFk ,
 					ifnull(c.mobile, ifnull(a.mobile, ifnull(c.phone, a.phone))),
 					LEFT(p.name, 20),
@@ -46,7 +46,7 @@ BEGIN
 					JOIN vn.address a ON a.id = t.addressFk
 					JOIN vn.province p ON p.id = a.provinceFk
 					LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-					LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+					LEFT JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk
 					LEFT JOIN vn.beach b ON b.code = rm.beachFk
 					LEFT JOIN vn.`zone`z ON z.id = t.zoneFk
 					JOIN vn.agencyMode am ON t.agencyModeFk = am.id