Merge pull request 'feat: refs #7823 refs#7823 selectPrinterFreely' (!3544) from 7823_selectPrinterFreely into dev

Reviewed-on: #3544
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

Jenkinsfile

@@ -8,6 +8,7 @@ def RUN_BUILD
 def BRANCH_ENV = [
     test: 'test',
     master: 'production',
+    main: 'production',
     beta: 'production'
 ]
 
@@ -20,12 +21,14 @@ node {
             'dev',
             'test',
             'master',
+            'main',
             'beta'
         ].contains(env.BRANCH_NAME)
 
         FROM_GIT = env.JOB_NAME.startsWith('gitea/')
         RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
         RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
+        IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
 
         // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
@@ -73,6 +76,7 @@ pipeline {
                     def packageJson = readJSON file: 'package.json'
                     def version = "${packageJson.version}-build${env.BUILD_ID}"
                     writeFile(file: 'VERSION.txt', text: version)
+                    echo "VERSION: ${version}"
                 }
             }
         }
@@ -105,93 +109,71 @@ pipeline {
                 }
             }
         }
-        stage('Stack') {
+        stage('Test') {
+            when {
+                expression { RUN_TESTS }
+            }
+            environment {
+                NODE_ENV = ''
+            }
             parallel {
                 stage('Back') {
-                    stages {
+                    steps {
-                        stage('Test') {
+                        sh 'node back/tests.js --junit'
-                            when {
+                    }
-                                expression { RUN_TESTS }
+                    post {
-                            }
+                        always {
-                            environment {
+                            junit(
-                                NODE_ENV = ''
+                                testResults: 'junitresults.xml',
-                            }
+                                allowEmptyResults: true
-                            steps {
+                            )
-                                sh 'node back/tests.js --junit'
-                            }
-                            post {
-                                always {
-                                    junit(
-                                        testResults: 'junitresults.xml',
-                                        allowEmptyResults: true
-                                    )
-                                }
-                            }
-                        }
-                        stage('Build') {
-                            when {
-                                expression { RUN_BUILD }
-                            }
-                            environment {
-                                VERSION = readFile 'VERSION.txt'
-                            }
-                            steps {
-                                sh 'docker-compose build back'
-                            }
                         }
                     }
                 }
                 stage('Front') {
-                    when {
+                    steps {
-                        expression { FROM_GIT }
+                        sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
                     }
-                    stages {
+                    post {
-                        stage('Test') {
+                        always {
-                            when {
+                            junit(
-                                expression { RUN_TESTS }
+                                testResults: 'junit.xml',
-                            }
+                                allowEmptyResults: true
-                            environment {
+                            )
-                                NODE_ENV = ''
-                            }
-                            steps {
-                                sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
-                            }
-                            post {
-                                always {
-                                    junit(
-                                        testResults: 'junit.xml',
-                                        allowEmptyResults: true
-                                    )
-                                }
-                            }
-                        }
-                        stage('Build') {
-                            when {
-                                expression { RUN_BUILD }
-                            }
-                            environment {
-                                VERSION = readFile 'VERSION.txt'
-                            }
-                            steps {
-                                sh 'gulp build'
-                                sh 'docker-compose build front'
-                            }
                         }
                     }
                 }
             }
         }
-        stage('Push') {
+        stage('Build') {
             when {
                 expression { RUN_BUILD }
             }
             environment {
-                CREDENTIALS = credentials('docker-registry')
                 VERSION = readFile 'VERSION.txt'
             }
-            steps {
+            parallel {
-                sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
+                stage('Back') {
-                sh 'docker-compose push'
+                    steps {
+                        dockerBuild 'salix-back', '.', 'back/Dockerfile'
+                    }
+                }
+                stage('Front') {
+                    steps {
+                        sh 'gulp build'
+                        dockerBuild 'salix-front', 'front'
+                    }
+                }
+                stage('DB') {
+                    steps {
+                        sh 'npx myt run -t'
+                        sh 'docker exec vn-database sh -c "rm -rf /mysql-template"'
+                        sh 'docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template"'
+                        sh 'docker commit vn-database salix-db:$VERSION'
+                        sh 'docker rm -f vn-database'
+                        dockerPush docker.image("salix-db:${VERSION}")
+                    }
+                }
             }
         }
         stage('Deploy') {
@@ -264,3 +246,19 @@ pipeline {
         }
     }
 }
+
+def dockerBuild(imageName, context, dockerfile = null) {
+    if (dockerfile == null)
+        dockerfile = "${context}/Dockerfile"
+    def baseImage = "${imageName}:${env.VERSION}"
+    def image = docker.build(baseImage, "-f ${dockerfile} ${context}")
+    dockerPush(image)
+}
+
+def dockerPush(image) {
+    docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
+        image.push()
+        image.push(env.BRANCH_NAME)
+        if (IS_LATEST) image.push('latest')
+    }
+}

back/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update \
         graphicsmagick \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
+    && npm install -g corepack@0.31.0 \
     && corepack enable pnpm
 
 # Puppeteer
@@ -24,7 +25,7 @@ RUN apt-get update \
         libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
         libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
         libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
-        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 build-essential \
         fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
 
 # Extra dependencies

back/methods/edi/specs/syncData.spec.js

@@ -0,0 +1,59 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('edi syncData()', function() {
+    const ediModel = models.Edi;
+
+    it('should be insert into the table', async() => {
+        const tx = await ediModel.beginTransaction({});
+        const options = {transaction: tx};
+        let error;
+        try {
+            await models.FloricodeConfig.create({
+                id: 1,
+                url: 'http://sample.com',
+                user: 'sample',
+                password: 'sample'
+            }, options);
+
+            spyOn(ediModel, 'getToken').and.returnValue(Promise.resolve('sampleToken'));
+            spyOn(ediModel, 'getData').and.returnValue(Promise.resolve([
+                {
+                    expiry_date: '2001-01-01',
+                    entry_date: '2001-01-01',
+                    genus_id: 1,
+                    latin_genus_name: 'Oasis',
+                    change_date_time: '2001-03-15T10:30:15+01:00',
+                }, {
+                    expiry_date: null,
+                    entry_date: '2001-01-02',
+                    genus_id: 2,
+                    latin_genus_name: 'Ibiza',
+                    change_date_time: '2001-02-03T18:20:42+00:00',
+                }
+            ]));
+
+            await ediModel.syncData(options);
+
+            const data = await ediModel.rawSql('SELECT * FROM edi.genus', [], options);
+            // The table is deleted within the method itself; it will always be 2
+            expect(data.length).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should throw an error if floricode service is not configured', async function() {
+        let error;
+        try {
+            await ediModel.syncData();
+        } catch (e) {
+            error = e;
+        }
+        expect(error).toBeDefined();
+    });
+});

back/methods/edi/syncData.js

@@ -0,0 +1,93 @@
+const UserError = require('vn-loopback/util/user-error');
+const fs = require('fs-extra');
+const fastCsv = require("fast-csv");
+const axios = require('axios');
+const path = require('path');
+const { pipeline } = require('stream/promises');
+
+module.exports = Self => {
+	Self.remoteMethod('syncData', {
+		description: 'Sync schema data from external provider',
+		accessType: 'WRITE',
+		returns: {
+			type: 'object',
+			root: true
+		},
+		http: {
+			path: `/syncData`,
+			verb: 'POST'
+		}
+	});
+
+	Self.syncData = async options => {
+		const models = Self.app.models;
+		const myOptions = {};
+		if (typeof options == 'object')
+            Object.assign(myOptions, options);
+		let tx, ws;
+		try {
+			const floricodeConfig = await models.FloricodeConfig.findOne({}, myOptions);
+			if (!floricodeConfig) throw new UserError(`Floricode service is not configured`);
+
+			const tables = await models.TableMultiConfig.find({}, myOptions);
+			if (!tables?.length) throw new UserError(`No tables to sync`);
+
+			const token = await Self.getToken(floricodeConfig);
+			for (const table of tables) {
+				const data = await Self.getData(floricodeConfig.url, table.method, token);
+				if (!data) continue;
+
+				if (!myOptions.transaction) {
+					tx = await Self.beginTransaction({});
+					myOptions.transaction = tx;
+				}
+
+				await Self.rawSql(`DELETE FROM edi.??`, [table.toTable], myOptions);
+				ws = fs.createWriteStream(path.join(__dirname, `/${table.toTable}.csv`));
+				await pipeline(fastCsv.write(data, { delimiter: ';' }), ws);
+				const templatePath = path.join(__dirname, `./syncSql/${table.toTable}.sql`);
+				const sqlTemplate = await fs.readFile(templatePath, 'utf8');
+				await Self.rawSql(sqlTemplate, [ws.path], myOptions);
+
+				await fs.remove(ws.path);
+				await table.updateAttribute('updated', Date.vnNew(), myOptions);
+				if (tx) {
+					await tx.commit();
+					delete myOptions.transaction;
+				}
+			}
+		} catch (e) {
+			if (tx) await tx.rollback();
+			if (await fs.pathExists(ws?.path))
+				await fs.remove(ws?.path);
+			throw e;
+		}
+	};
+
+	Self.getToken = async function ({ url, user, password}) {
+		return (await axios.post(`${url}/oauth/token`, {
+			grant_type: 'client_credentials',
+			client_id: user,
+			client_secret: password
+			}, {
+				headers: { 'Content-Type': 'application/x-www-form-urlencoded' } 
+			}
+		)).data.access_token;
+	};
+
+	Self.getData = async function (url, method, token) {
+		let data = [];
+		let count = 0;
+		const maxCount = (await Self.get(`${url}/v2/${method}?$count=true`, token))["@odata.count"];
+		 while (count < maxCount) {
+			const response = await Self.get(`${url}/v2/${method}?$skip=${count}`, token)
+			data.push(...response.value);
+			count += response.value.length;
+		}
+		return data;
+	};
+
+	Self.get = async function get(url, token) {
+		return (await axios.get(url, { headers: { Authorization: `Bearer ${token}` } })).data;
+	};
+};

back/methods/edi/syncSql/bucket.sql

@@ -0,0 +1,14 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`bucket`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11)
+	SET bucket_id = @col3,
+		bucket_type_id = @col5,
+		description = @col6,
+		x_size = @col7,
+		y_size = @col8,
+		z_size = @col9,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col11, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/bucket_type.sql

@@ -0,0 +1,10 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`bucket_type`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5)
+	SET bucket_type_id = @col3,
+		description = @col4,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col5, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/feature.sql

@@ -0,0 +1,11 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`feature`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6)
+	SET item_id = @col3,
+		feature_type_id =  @col4,
+		feature_value = @col5,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col6, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/genus.sql

@@ -0,0 +1,10 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`genus`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5)
+	SET genus_id = @col3,
+		latin_genus_name = @col4,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col5, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/item.sql

@@ -0,0 +1,14 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`item`
+	CHARACTER SET ascii
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11)
+	SET id = @col3,
+		product_name = @col5,
+		name = @col6,
+		plant_id = @col8,
+		group_id = @col10,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col11, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/item_feature.sql

@@ -0,0 +1,12 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`item_feature`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6, @col7)
+	SET item_id = @col3,
+		feature =  @col4,
+		regulation_type = @col5,
+		presentation_order = @col6,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col7, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/item_group.sql

@@ -0,0 +1,10 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`item_group`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5)
+	SET group_code = @col3,
+		dutch_group_description = @col4,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col5, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/plant.sql

@@ -0,0 +1,11 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`plant`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8)
+	SET plant_id = @col4,
+		genus_id = @col5,
+		specie_id = @col6,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col8, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/specie.sql

@@ -0,0 +1,11 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`specie`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6)
+	SET specie_id = @col3,
+		genus_id = @col4,
+		latin_species_name = @col5,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col6, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/supplier.sql

@@ -0,0 +1,11 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`supplier`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n'
+	(@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11, @col12, @col13, @col14, @col15, @col16, @col17, @col18, @col19, @col20, @col21)
+	SET GLNAddressCode = @col3,
+		supplier_id = @col9,
+		company_name = @col4,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col17, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/type.sql

@@ -0,0 +1,10 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`type`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n' (@col1, @col2, @col3, @col4, @col5, @col6)
+	SET type_id = @col3,
+		type_group_id = @col4,
+		description = @col5,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col6, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/edi/syncSql/value.sql

@@ -0,0 +1,10 @@
+LOAD DATA LOCAL INFILE ?
+	INTO TABLE `edi`.`value`
+	FIELDS TERMINATED BY ';'
+	LINES TERMINATED BY '\n' (@col1, @col2, @col3, @col4, @col5, @col6)
+	SET type_id = @col3,
+		type_value =  @col4,
+		type_description = @col5,
+		entry_date = STR_TO_DATE(@col2, '%Y-%m-%d'),
+		expiry_date = STR_TO_DATE(@col1, '%Y-%m-%d'),
+		change_date_time = STR_TO_DATE(REGEXP_REPLACE(@col6, '\\+.*$', ''), '%Y-%m-%dT%H:%i:%s')

back/methods/osticket/sendToSupport.js

@@ -33,25 +33,52 @@ module.exports = Self => {
         const emailUser =
             await Self.app.models.EmailUser.findById(userId, {fields: ['email']});
 
-        let html = `<h2>Motivo: ${reason}</h2>`;
+        const tableStyle = 'width:100%; border-collapse: collapse; text-align: left;';
-        html += `<h3>Usuario: ${userId} ${emailUser.email}</h3>`;
+        const thStyle = 'padding: 8px; border: 1px solid #ddd; background-color: #f4f4f4;';
-        html += `<h3>Additional Data:</h3>`;
+        const tdStyle = 'padding: 8px; border: 1px solid #ddd;';
-        html += '<ul>';
+        const tdBoldStyle = 'padding: 8px; border: 1px solid #ddd; font-weight: bold;';
+        const subTdStyle = 'padding: 6px; border: 1px solid #ddd;';
+        const subTdBoldStyle = 'padding: 6px; border: 1px solid #ddd; font-weight: bold;';
+
+        let html = `
+        <h2>Motivo: ${reason}</h2>
+        <h3>Usuario: ${userId} ${emailUser.email}</h3>
+        <h3>Additional Data:</h3>
+        <table style="${tableStyle}">
+            <thead>
+                <tr>
+                <th style="${thStyle}">Clave</th><th style="${thStyle}">Valor</th></tr>
+            </thead>
+            <tbody>`;
         for (const [key, val] of Object.entries(additionalData)) {
-            if (key !== 'config') html += `<li>${key}: ${parse(val)}</li>`;
+            if (key !== 'config') {
-            else {
+                html += `<tr>
-                html += `<li>${key}:</li><ul style="list-style-type: square;">`;
+                            <td style="${tdBoldStyle}">${key}</td>
-                for (const [confKey, confVal] of Object.entries(val))
+                            <td style="${tdStyle}">${parse(val)}</td>
-                    html += `<li>${confKey}: ${parse(confVal)}</li>`;
+                        </tr>`;
-                html += '</ul>';
+            } else {
+                html += `<tr>
+                            <td style="${tdBoldStyle}">${key}</td>
+                            <td style="${tdStyle}">
+                                <table style="${tableStyle}">
+                <tbody>`;
+                for (const [confKey, confVal] of Object.entries(val)) {
+                    html += `<tr>
+                                <td style="${subTdBoldStyle}">${confKey}</td>
+                                <td style="${subTdStyle}">${parse(confVal)}</td>
+                            </tr>`;
+                }
+                html += `</tbody></table></td></tr>`;
             }
         }
-        html += '</ul>';
+        html += `</tbody></table>`;
 
         const {message, path, name} = additionalData;
+        const err = name && message ? `${name}: ${message}` : name || message || '';
+
         await smtp.send({
             to: `${config.app.reportEmail}, ${emailUser.email}`,
-            subject: `[Support-Salix] ${path} ${name}: ${message}`,
+            subject: `[Support-Salix] ${path.split('?')[0]} ${err}`,
             html
         });
     };

back/methods/workerActivity/add.js

@@ -13,6 +13,11 @@ module.exports = Self => {
                 type: 'string',
                 description: 'Origin model from insert'
             },
+            {
+                arg: 'description',
+                type: 'string',
+                description: 'Action description'
+            },
 
         ],
         http: {
@@ -21,7 +26,7 @@ module.exports = Self => {
         }
     });
 
-    Self.add = async(ctx, code, model, options) => {
+    Self.add = async(ctx, code, model, description, options) => {
         const userId = ctx.req.accessToken.userId;
         const myOptions = {};
 
@@ -29,8 +34,8 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         return await Self.rawSql(`
-            INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model)
+            INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model, description)
-                SELECT ?, ?, ?
+                SELECT ?, ?, ?, ?
                     FROM workerTimeControlConfig wtcc
                         LEFT JOIN (
                             SELECT wa.workerFk,
@@ -45,6 +50,6 @@ module.exports = Self => {
                     WHERE sub.workerFk IS NULL
                         OR sub.code <> ?
                         OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
-        , [userId, code, model, userId, code], myOptions);
+        , [userId, code, model, description, userId, code], myOptions);
     };
 };

back/methods/workerActivity/specs/add.spec.js

@@ -13,7 +13,7 @@ describe('workerActivity insert()', () => {
                 {'code': 'TEST', 'description': 'TEST'}, options
             );
 
-            await models.WorkerActivity.add(ctx, 'TEST', 'APP', options);
+            await models.WorkerActivity.add(ctx, 'TEST', 'APP', 'description', options);
 
             count = await models.WorkerActivity.count(
                 {'workerFK': 1106}, options

back/model-config.json

@@ -70,6 +70,9 @@
     "Expedition_PrintOut": {
         "dataSource": "vn"
     },
+    "FloricodeConfig": {
+        "dataSource": "vn"
+    },
     "Image": {
         "dataSource": "vn"
     },
@@ -154,6 +157,9 @@
     "SaySimpleConfig": {
         "dataSource": "vn"
     },
+    "TableMultiConfig": {
+        "dataSource": "vn"
+    },
     "TempContainer": {
         "dataSource": "tempStorage"
     },

back/models/agency-workCenter.json

@@ -24,7 +24,7 @@
   "relations": {
     "agency": {
 			"type": "belongsTo",
-			"model": "WorkCenter",
+			"model": "Agency",
 			"foreignKey": "agencyFk"
 		},
     "workCenter": {

back/models/edi.js

@@ -1,3 +1,4 @@
 module.exports = Self => {
     require('../methods/edi/updateData')(Self);
+    require('../methods/edi/syncData')(Self);
 };

back/models/floricode-config.json

@@ -0,0 +1,28 @@
+{
+	"name": "FloricodeConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "edi.floricodeConfig"
+		}
+	},
+	"properties": {
+		"id": {
+			"type": "number",
+			"id": true,
+			"required": true
+		},
+		"url": {
+			"type": "string",
+			"required": true
+		},
+		"user": {
+			"type": "string",
+			"required": false
+		},
+		"password": {
+			"type": "string",
+			"required": false
+		}
+	}
+}

back/models/payment.json

@@ -52,7 +52,7 @@
         },
         "payMethod": {
             "type": "belongsTo",
-            "model": "PayMethodFk",
+            "model": "PayMethod",
             "foreignKey": "payMethodFk"
         },
         "company": {

back/models/production-config.json

@@ -12,12 +12,6 @@
 			"required": true,
 			"id": true
 		},
-		"sectorFromCode": {
-			"type": "string"
-		},
-		"sectorToCode": {
-			"type": "string"
-		},
 		"backupPrinterNotificationDelay": {
 			"type": "string"
 		},

back/models/table-multi-config.json

@@ -0,0 +1,24 @@
+{
+	"name": "TableMultiConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "edi.tableMultiConfig"
+		}
+	},
+	"properties": {
+		"id": {
+			"type": "number",
+			"required": true
+		},
+		"toTable": {
+			"type": "string"
+		},
+		"method": {
+			"type": "string"
+		},
+		"updated": {
+			"type": "date"
+		}
+	}
+}

back/models/vn-user.json

@@ -54,7 +54,8 @@
             "type": "string"
         },
         "hasGrant": {
-            "type": "boolean"
+            "type": "boolean",
+            "default": false
         },
         "passExpired": {
             "type": "date"
@@ -168,6 +169,7 @@
                 "emailVerified",
                 "twoFactor"
             ]
+
         }
     }
 }

db/.pullinfo.json

@@ -3,8 +3,8 @@
   "shaSums": {
     "srt": {
       "view": {
-        "routePalletized": "765f8933a6a5a86dfe8f22825cc77351bc8620cdf1be9d3f25abb130460f3a61",
+        "routePalletized": "98d228ced59c8ec590bbaf106cebf47689a02b32e895ba76b5b6e5c05d73cf14",
-        "ticketPalletized": "c327f3243e717cc607f01d3747967ba68158f90ef1038986b0aa6ae6d5ce7309"
+        "ticketPalletized": "60d527908d473b92b70ba2ceed4e9be1f3be7509782f2c0d66d0cb98ecfeee2f"
       }
     },
     "vn": {

db/dump/.dump/data.sql

@@ -4,7 +4,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','11410','7a02af9a3acae14a658de1557baa44542c24d480','2025-01-28 07:44:02','11423');
+INSERT INTO `version` VALUES ('vn-database','11457','80a27e44d935caee5409068a332f13f3e808889d','2025-03-04 07:56:33','11475');
 
 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);
@@ -739,6 +739,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10930','05-payroll_centros.sql',
 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','10936','00-updateACL.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:44',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);
@@ -853,6 +854,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11071','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11073','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-09 07:39:38',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','11076','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:24',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);
@@ -920,6 +922,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11128','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11129','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11130','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11131','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:15',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11132','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11134','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-07-05 11:02:07',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11135','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:16',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11136','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-07-23 08:22:16',NULL,NULL);
@@ -990,6 +993,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11196','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11197','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11198','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:42:49',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11201','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-08-27 13:04:26',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11202','01-updateStateAlertLevel.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11204','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11205','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-04 13:54:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11206','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 07:38:42',NULL,NULL);
@@ -1071,6 +1075,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11297','01-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11298','00-closure.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11300','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-18 08:27:05',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11302','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11306','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11308','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-23 12:41:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11311','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11312','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
@@ -1089,6 +1094,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11327','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11330','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11331','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11332','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11334','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:44',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11336','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11337','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11338','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 09:14:12',NULL,NULL);
@@ -1139,26 +1145,69 @@ INSERT INTO `versionLog` VALUES ('vn-database','11377','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11378','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11379','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11379','01-secScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11383','00-town.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:25',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11383','01-postCode.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:34',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11383','02-province.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:36',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11384','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11385','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:33',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11387','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11389','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:45',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11390','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11391','00-itemAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11393','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:36',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11394','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:46',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11396','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','00-zoneEventPriceOptimum.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','00-zonePriceOptimum.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','01-zoneUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','02-clientAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11398','03-clientConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:43:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11399','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:46',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11400','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-09 09:55:24',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11404','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:46',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11405','00-entryAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11406','00-currrencyAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11406','01-currrencyUpdate.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11407','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11410','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-28 07:44:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11411','00-agencyIncomingForeign.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:36',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11411','01-travelThermographAlter.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11415','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-20 08:12:38',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:37',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','03-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:38',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','04-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','05-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','06-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:40',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','07-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','08-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11416','09-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11418','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-21 11:03:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11419','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11422','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:41',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11423','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-23 15:19:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11424','00-travel.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11425','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11427','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:46',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11428','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11429','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11430','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11432','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-02-06 13:34:31',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11433','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-06 13:45:28',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11436','03-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-18 08:53:47',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11441','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:53:49',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11441','01-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:56:30',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11445','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-02-18 09:52:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11447','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-20 07:31:17',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11454','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:56:30',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11457','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-03-04 07:56:30',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11458','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-02-26 12:58:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11463','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-02-27 19:24:32',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11468','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-03-03 14:42:24',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1258,6 +1307,8 @@ INSERT INTO `role` VALUES (129,'buyerAssistant','Comprador que tienes mas permis
 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 `role` VALUES (131,'supplier','Privilegios básicos de un proveedor',1,'2024-07-05 10:18:58','2024-07-05 10:18:58',19295);
 INSERT INTO `role` VALUES (132,'salesPersonClaim','Departamento de ventas con funciones de reclamaciones',1,'2025-01-17 07:07:40','2025-01-17 07:07:40',19295);
+INSERT INTO `role` VALUES (133,'deliveryFreelancer','Repartidor autónomo',1,'2025-02-18 08:53:36','2025-02-18 08:53:36',10578);
+INSERT INTO `role` VALUES (134,'productionHr','Jefe de producción con permisos de hr',1,'2025-02-27 12:25:45','2025-02-27 12:25:45',13657);
 
 INSERT INTO `roleInherit` VALUES (1,1,2,NULL);
 INSERT INTO `roleInherit` VALUES (2,1,3,NULL);
@@ -1521,7 +1572,6 @@ 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);
@@ -1530,7 +1580,6 @@ INSERT INTO `roleInherit` VALUES (373,131,2,19295);
 INSERT INTO `roleInherit` VALUES (375,120,131,1437);
 INSERT INTO `roleInherit` VALUES (376,124,21,19336);
 INSERT INTO `roleInherit` VALUES (377,47,49,19295);
-INSERT INTO `roleInherit` VALUES (378,101,15,19294);
 INSERT INTO `roleInherit` VALUES (379,103,121,19294);
 INSERT INTO `roleInherit` VALUES (381,119,123,19295);
 INSERT INTO `roleInherit` VALUES (382,48,72,783);
@@ -1538,6 +1587,13 @@ INSERT INTO `roleInherit` VALUES (383,114,111,19295);
 INSERT INTO `roleInherit` VALUES (384,132,18,19295);
 INSERT INTO `roleInherit` VALUES (385,132,72,19295);
 INSERT INTO `roleInherit` VALUES (386,109,132,19295);
+INSERT INTO `roleInherit` VALUES (387,101,122,19295);
+INSERT INTO `roleInherit` VALUES (388,59,58,13657);
+INSERT INTO `roleInherit` VALUES (389,59,111,19295);
+INSERT INTO `roleInherit` VALUES (390,59,35,35559);
+INSERT INTO `roleInherit` VALUES (391,134,50,13657);
+INSERT INTO `roleInherit` VALUES (392,134,37,13657);
+INSERT INTO `roleInherit` VALUES (393,130,49,24503);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -2096,7 +2152,7 @@ INSERT INTO `ACL` VALUES (664,'MailForward','*','*','ALLOW','ROLE','itManagement
 INSERT INTO `ACL` VALUES (667,'VnUser','*','*','ALLOW','ROLE','itManagement',NULL);
 INSERT INTO `ACL` VALUES (668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (669,'VnUser','preview','*','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (670,'VnUser','create','*','ALLOW','ROLE','itManagement',NULL);
+INSERT INTO `ACL` VALUES (670,'VnUser','create','*','ALLOW','ROLE','developerBoss',19295);
 INSERT INTO `ACL` VALUES (672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing',NULL);
 INSERT INTO `ACL` VALUES (674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing',NULL);
@@ -2408,6 +2464,71 @@ INSERT INTO `ACL` VALUES (1013,'Route','optimizePriority','*','ALLOW','ROLE','em
 INSERT INTO `ACL` VALUES (1014,'Worker','canModifyAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (1015,'Worker','__get__sip','READ','ALLOW','ROLE','employee',19294);
 INSERT INTO `ACL` VALUES (1016,'VnUser','adminUser','WRITE','ALLOW','ROLE','sysadmin',10578);
+INSERT INTO `ACL` VALUES (1017,'BusinessReasonEnd','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1018,'CalendarType','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1019,'OccupationCode','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1020,'BusinessReasonEnd','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1021,'WorkerBusinessProfessionalCategory','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1022,'WorkerBusinessAgreement','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1023,'WorkerBusinessType','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1024,'PayrollCategory','find','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1025,'Worker','__get__business','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1026,'Worker','__create__business','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1027,'Business','crud','*','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1028,'Route','getTickets','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1029,'AgencyTerm','filter','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1030,'Route','summary','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1031,'Route','getRouteByAgency','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1032,'Route','filter','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1033,'UserConfig','getUserConfig','*','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1034,'Route','getTickets','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1035,'Route','guessPriority','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1036,'Route','getDeliveryPoint','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1037,'Route','findById','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1038,'Route','sendSms','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1039,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1040,'Client','findById','READ','ALLOW','ROLE','deliveryFreelancer',10578);
+INSERT INTO `ACL` VALUES (1041,'Entry','transfer','WRITE','ALLOW','ROLE','coolerBoss',10578);
+INSERT INTO `ACL` VALUES (1042,'Ticket','itemLack','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1043,'Ticket','itemLackDetail','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1044,'Ticket','split','WRITE','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1045,'Sale','replaceItem','WRITE','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1046,'Ticket','getTicketProblems','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1047,'Vehicle','filter','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1048,'Vehicle','filter','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1049,'Vehicle','find','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1050,'Vehicle','find','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1051,'Vehicle','findById','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1052,'Vehicle','findById','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1053,'Vehicle','__get__active','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1054,'Vehicle','updateAttributes','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1055,'Vehicle','updateAttributes','WRITE','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1056,'Vehicle','deleteById','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1057,'Vehicle','deleteById','WRITE','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1058,'Vehicle','create','WRITE','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1059,'Vehicle','create','WRITE','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1060,'BankPolicy','find','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1061,'BankPolicy','find','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1062,'VehicleState','find','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1063,'VehicleState','find','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1064,'Ppe','find','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1065,'Ppe','find','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1066,'VehicleType','find','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1067,'DeliveryPoint','find','READ','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (1068,'DeliveryPoint','find','READ','ALLOW','ROLE','administrative',10578);
+INSERT INTO `ACL` VALUES (1069,'Entry','getBuyList','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1070,'Entry','getBuyUltimate','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1071,'Entry','search','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1072,'Entry','create','WRITE','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1073,'Entry','cloneEntry','WRITE','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1074,'Entry','deleteEntry','WRITE','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1075,'Entry','recalcEntryPrices','WRITE','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1076,'EntryType','find','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1077,'EntryConfig','findOne','READ','ALLOW','ROLE','buyer',10578);
+INSERT INTO `ACL` VALUES (1078,'WorkerDms','hasHighPrivs','READ','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1079,'Business','updateAttributes','WRITE','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1080,'Worker','__get__business','READ','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1081,'Worker','getWorkerBusiness','READ','ALLOW','ROLE','hr',10578);
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2706,77 +2827,80 @@ 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,132,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,136,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,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',8,9,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',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,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',14,39,NULL,72,1,1,1,12,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,41,NULL,72,1,1,1,13,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,1,NULL,NULL,NULL,'ON_PREPARATION');
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
-INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',40,41,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',42,43,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',42,91,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',44,95,NULL,0,0,0,1,25,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',96,97,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',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',98,99,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',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',98,99,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',102,103,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',104,105,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',102,103,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',106,107,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',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',45,46,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',108,109,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',21,22,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',23,24,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',106,109,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',110,113,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',110,111,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',114,115,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',45,46,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',47,48,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
-INSERT INTO `department` VALUES (61,NULL,'VNH',112,115,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (61,NULL,'VNH',116,119,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',116,117,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',120,121,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',25,26,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',118,119,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',122,123,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',47,48,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',49,50,4250,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',120,121,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',124,125,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',122,123,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',126,127,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',113,114,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',117,118,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',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
-INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',49,50,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 (92,NULL,'EQUIPO SILVERIO',51,52,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',51,52,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',53,54,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',53,54,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',55,56,24065,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',55,56,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 (96,NULL,'EQUIPO C LOPEZ',57,58,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',57,58,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 (115,NULL,'EQUIPO CLAUDI',59,60,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',59,60,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 (123,NULL,'EQUIPO ELENA BASCUÑANA',61,62,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',124,125,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',128,129,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',61,62,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',63,64,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (126,'preserved','PRESERVADO',29,30,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',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
 INSERT INTO `department` VALUES (130,'reviewers','REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',107,108,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',111,112,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',63,64,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 (132,NULL,'EQUIPO DC',65,66,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,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',65,66,9751,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 (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',67,68,9751,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',67,68,8964,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 (134,'portugalTeam','EQUIPO PORTUGAL',69,70,8964,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',126,127,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',130,131,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',128,129,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',132,133,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',130,131,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',134,135,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',69,70,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',71,72,3803,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',71,72,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',73,74,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',73,74,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
+INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',75,76,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
-INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',75,76,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
+INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',77,78,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
-INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',77,78,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
+INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',79,80,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
-INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',79,80,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'es_levante@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'es_levante@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
-INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',81,82,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'es_noroeste@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',83,84,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'es_noroeste@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',83,84,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'es_noreste@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
+INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',85,86,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'es_noreste@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
-INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',85,86,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'es_sur@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',87,88,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'es_sur@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
-INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',87,88,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'es_centro@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',89,90,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'es_centro@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
-INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',89,90,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',NULL);
+INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',91,92,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',NULL);
 INSERT INTO `department` VALUES (156,NULL,'COCINA',37,38,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (157,NULL,'RECICLAJE',39,40,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (158,'franceTeamVip','EQUIPO FRANCIA VIP',93,94,NULL,0,0,0,2,0,43,'/1/43/','fr_vip_equipo',0,'fr_vip@verdnatura.es',0,0,0,0,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);
 INSERT INTO `docuware` VALUES (3,'hr','RRHH','find','Búsqueda','N__DOCUMENTO',3);
 
+INSERT INTO `itemPackingType` VALUES ('A','Altillo',1);
 INSERT INTO `itemPackingType` VALUES ('F','Fruta y Verdura',0);
 INSERT INTO `itemPackingType` VALUES ('H','Horizontal',1);
 INSERT INTO `itemPackingType` VALUES ('P','Pienso',0);
@@ -2878,21 +3002,21 @@ INSERT INTO `state` VALUES (13,'En Reparto',11,4,'ON_DELIVERY',13,0,1,0,0,0,0,0,
 INSERT INTO `state` VALUES (14,'Preparado',6,2,'PREPARED',14,0,1,0,2,0,0,1,0,'warning');
 INSERT INTO `state` VALUES (15,'Pte Recogida',12,4,'WAITING_FOR_PICKUP',15,0,1,0,0,0,0,0,0,NULL);
 INSERT INTO `state` VALUES (16,'Entregado',13,4,'DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
-INSERT INTO `state` VALUES (20,'Asignado',4,0,'PICKER_DESIGNED',20,1,0,0,0,0,0,2,0,'success');
+INSERT INTO `state` VALUES (20,'Asignado',4,1,'PICKER_DESIGNED',20,1,0,0,0,0,0,2,0,'success');
 INSERT INTO `state` VALUES (21,'Retornado',4,2,'PRINTED_BACK',21,0,0,0,0,0,0,2,0,'success');
 INSERT INTO `state` VALUES (22,'Pte. Ampliar',2,0,'EXPANDABLE',22,0,0,0,0,0,0,4,1,'alert');
-INSERT INTO `state` VALUES (23,'URGENTE',5,2,'LAST_CALL',23,1,0,1,0,0,0,4,1,'success');
+INSERT INTO `state` VALUES (23,'URGENTE',5,1,'LAST_CALL',23,1,0,1,0,0,0,4,1,'success');
 INSERT INTO `state` VALUES (24,'Encadenado',4,0,'CHAINED',24,0,0,0,0,0,0,3,1,'success');
 INSERT INTO `state` VALUES (25,'Embarcando',3,0,'BOARDING',25,1,0,0,0,0,0,3,0,'alert');
-INSERT INTO `state` VALUES (26,'Prep Previa',5,0,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
+INSERT INTO `state` VALUES (26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',28,1,0,0,1,0,0,2,0,'warning');
-INSERT INTO `state` VALUES (28,'Previa OK',3,0,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
+INSERT INTO `state` VALUES (28,'Previa OK',3,1,'OK PREVIOUS',28,1,0,1,1,1,1,3,0,'warning');
-INSERT INTO `state` VALUES (29,'Previa Impreso',4,0,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (29,'Previa Impreso',4,1,'PRINTED PREVIOUS',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (31,'Polizon Impreso',4,2,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',29,1,0,1,0,0,1,2,0,'success');
-INSERT INTO `state` VALUES (33,'Auto_Impreso',4,0,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
+INSERT INTO `state` VALUES (33,'Auto_Impreso',4,1,'PRINTED_AUTO',29,1,0,1,0,0,1,2,0,'success');
 INSERT INTO `state` VALUES (34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',34,0,0,0,0,0,0,4,1,'alert');
 INSERT INTO `state` VALUES (35,'Semi-Encajado',9,3,'HALF_PACKED',10,0,1,0,0,0,0,1,0,NULL);
-INSERT INTO `state` VALUES (36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
+INSERT INTO `state` VALUES (36,'Previa Revisando',3,1,'PREVIOUS_CONTROL',37,1,0,0,4,0,1,2,0,'warning');
-INSERT INTO `state` VALUES (37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
+INSERT INTO `state` VALUES (37,'Previa Revisado',3,1,'PREVIOUS_CONTROLLED',29,1,0,1,0,0,1,2,0,'warning');
 INSERT INTO `state` VALUES (38,'Prep Cámara',6,2,'COOLER_PREPARATION',14,0,0,0,2,0,0,2,0,'warning');
 INSERT INTO `state` VALUES (42,'Entregado en parte',13,3,'PARTIAL_DELIVERED',16,0,1,0,0,0,0,0,0,NULL);
 INSERT INTO `state` VALUES (43,'Preparación por caja',6,2,'BOX_PICKING',42,0,0,0,2,0,0,2,0,'warning');
@@ -2902,7 +3026,7 @@ INSERT INTO `ticketUpdateAction` VALUES (2,'Convertir en maná','mana');
 
 INSERT INTO `ticketCanAdvanceConfig` VALUES (1,5);
 
-INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0);
+INSERT INTO `volumeConfig` VALUES (1,2.67,1.60,0.8,150,0.30,120,57,2.0,50,200,10,167.0,1.70);
 
 INSERT INTO `workerActivityType` VALUES ('CLAIM','RECLAMACIONES');
 INSERT INTO `workerActivityType` VALUES ('DELIVERY','REPARTO');

db/dump/.dump/privileges.sql

@@ -326,7 +326,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','printQueue','juan@db
 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','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 ('','vn','buyer','itemType','guillermo@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','artificialBoss','state','alexm@%','0000-00-00 00:00:00','Select','');
@@ -561,7 +561,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_t
 INSERT IGNORE INTO `tables_priv` VALUES ('','vncontrol','employee','accion','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','volumeConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','currency','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerBoss','tag','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','currency','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','creditClassification','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financial','creditInsurance','alexm@%','0000-00-00 00:00:00','Select','');
@@ -752,11 +751,9 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','dua','alexm@%','0000-0
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','duaEntry','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','expeditionTruck','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','moving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDetail','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','adminBoss','gastos_resumen','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDms','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','vehicle','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','awb','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machine','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas_dits','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerTimeControlMail','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bi','coolerBoss','rotacion','alexm@%','0000-00-00 00:00:00','Select','');
@@ -770,7 +767,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','lastRFID','alex
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','person__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','config','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','expedition','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','travel','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','itemPicker','buy','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas_Auto','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','machine','alexm@%','0000-00-00 00:00:00','Select','');
@@ -835,6 +831,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','bi','salesPerson','tarifa_component
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expeditionLog','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bs','salesPerson','clientNewBorn','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleItemShelving__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','ticketDms','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','srt','employee','expedition','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingStock','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleParking__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -889,7 +886,6 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','supplierAgenc
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packager','franceExpressConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','manager','ticketLog','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketCollection','alexm@%','0000-00-00 00:00:00','Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ticketDms','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketObservation','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logistic','ticketPackaging','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketPackaging','alexm@%','0000-00-00 00:00:00','Select','');
@@ -917,7 +913,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','train','alexm
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','trainingCenter','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','trainingCourse','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','trainingCourseType','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','travel','alexm@%','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerBusinessType','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logistic','travelClonedWeekly','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bi','employee','facturacion_media_anual','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','travelObservation','alexm@%','0000-00-00 00:00:00','Select','');
@@ -1240,7 +1236,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','visitAccess','ro
 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','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','ticketDms','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','marketingBoss','itemTypeI18n','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','time','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_Articles_botanical','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','inventoryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1285,7 +1281,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','company','juan@db-pr
 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','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','cooler','itemShelving','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','agencyIncoming','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','addressObservation','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','negativeOrigin','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1505,6 +1501,36 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemSoldOutTa
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemDurationTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemGrowingTag','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','receipt','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','machine','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packagerBoss','awb','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','machineDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','machineDms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','tag','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packagerBoss','buy','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','packagerBoss','genericAllocation','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','Tintas','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','productionCountry','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','teamBoss','workerTimeControlConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','Entradas','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','Compres','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','packagerBoss','buySource','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','payment','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Tickets','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Update');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','payMethod','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmap','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmapStop','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmapAddress','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmap','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmapStop','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmapAddress','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','volumeConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Update');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','travel','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','supplierExpense','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','gastos_resumen','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','temperature','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionBoss','packaging','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','roadmapEta','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','town','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 */;
@@ -1564,6 +1590,8 @@ INSERT IGNORE INTO `columns_priv` VALUES ('','pbx','grafana','sip','user_id','00
 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','deliveryBoss','volumeConfig','localPalletM3','0000-00-00 00:00:00','Update');
+INSERT IGNORE INTO `columns_priv` VALUES ('','vn2008','administrative','Tickets','Bultos','0000-00-00 00:00:00','Update');
 INSERT IGNORE INTO `columns_priv` VALUES ('','vn','employee','business','workerFk','0000-00-00 00:00:00','Select');
 INSERT IGNORE INTO `columns_priv` VALUES ('','vn','employee','business','id','0000-00-00 00:00:00','Select');
 INSERT IGNORE INTO `columns_priv` VALUES ('','vn','employee','business','departmentFk','0000-00-00 00:00:00','Select');
@@ -1882,7 +1910,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofmonth','F
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financial','addAccountReconciliation','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockBuyedByWorker','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getsplit','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1897,7 +1924,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_getCommission'
 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 ('','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 ('','vn','coolerBoss','entry_moveNotPrinted','PROCEDURE','carlosap@db-proxy1.servers.dc.verdnatura.es','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 ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1975,9 +2002,8 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','util','productionAssi','midnight','F
 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','production','itemshelving_transfer','PROCEDURE','alexm@db-proxy1.servers.dc.verdnatura.es','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','production','ticket_doCmr','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','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','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');
@@ -1992,7 +2018,6 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','cache','buyer','last_buy_refresh','P
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','supplierpackaging_reportsource','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','cache','buyer','stock_refresh','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','itemshelvingproblem','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','itemshelvingradar','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','cache','employee','visible_refresh','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','quarterfirstday','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','hr','workertimecontrol_sendmailbydepartment','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2162,6 +2187,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','collection_printstic
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','deviceproductionuser_getworker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_printlabelprevious','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_isoutclosurezone','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','entry_lock','PROCEDURE','jgallego@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticketstatetoday_setstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','device_checklogin','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','worker_getfromhasmistake','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -2212,6 +2238,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','entry_getTransfe
 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','packagerBoss','item_comparative','PROCEDURE','carlosap@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');
@@ -2243,6 +2270,15 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_secto
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','saleSplit','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemShelvingSale_deleteAdded','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_getUltimate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','entry_isintrastat','FUNCTION','carlosap@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','entry_clone','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','buy_getUltimate','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','ticket_clone','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','deliveryBoss','roadmap_cloneDay','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','deliveryBoss','getTimeBetweenRoadmapAddresses','FUNCTION','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','zone_getLeaves','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','balance_create','PROCEDURE','jgallego@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','entry_fixMisfit','PROCEDURE','carlosap@db-proxy1.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 */;
@@ -2257,6 +2293,7 @@ USE `mysql`;
 
 /*!40000 ALTER TABLE `global_priv` DISABLE KEYS */;
 INSERT IGNORE INTO `global_priv` VALUES ('','account','{\"access\": 0, \"is_role\": true,\"version_id\":100707}');
+INSERT IGNORE INTO `global_priv` VALUES ('','adminAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 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}');
@@ -2307,6 +2344,7 @@ INSERT IGNORE INTO `global_priv` VALUES ('','marketing','{\"access\": 0, \"is_ro
 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 ('','packagerBoss','{\"access\":0,\"version_id\":101106,\"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\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','preservedBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');

db/dump/.dump/triggers.sql

@@ -1,5 +1,5 @@
 /*M!999999\- enable the sandbox mode */ 
--- MariaDB dump 10.19  Distrib 10.5.26-MariaDB, for debian-linux-gnu (x86_64)
+-- MariaDB dump 10.19  Distrib 10.5.28-MariaDB, for debian-linux-gnu (x86_64)
 --
 -- Host: db.verdnatura.es    Database: account
 -- ------------------------------------------------------
@@ -2668,6 +2668,7 @@ trig:BEGIN
 		THEN
 
 		CALL entry_isEditable(OLD.entryFk);
+		CALL entry_isEditable(NEW.entryFk);
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
@@ -4979,7 +4980,6 @@ BEGIN
 
 	IF NEW.isBooked = OLD.isBooked AND (
 			NOT (NEW.supplierFk <=> OLD.supplierFk) OR
-			NOT (NEW.dated <=> OLD.dated) OR
 			NOT (NEW.travelFk <=> OLD.travelFk) OR
 			NOT (NEW.companyFk <=> OLD.companyFk) OR
 			NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) OR
@@ -6994,11 +6994,57 @@ DELIMITER ;;
 	BEFORE INSERT ON `mandate`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
 	IF (NEW.code IS NULL) THEN
 		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
-		    FROM information_schema.TABLES 
+			FROM information_schema.TABLES
-		    WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
+			WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
-    END IF;
+	END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`mandate_beforeUpdate`
+	BEFORE INSERT ON `mandate`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`mandate_afterDelete`
+	AFTER DELETE ON `mandate`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO mandateLog
+		SET `action` = 'delete',
+			`changedModel` = 'mandate',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -7978,10 +8024,31 @@ DELIMITER ;;
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.name IS NOT NULL THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NEW.trailerPlate IS NOT NULL OR NEW.tugPlate IS NOT NULL THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
 	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
-	ELSE
+								FROM worker w
-		SET NEW.driverName = NULL;
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END */;;
 DELIMITER ;
@@ -8002,10 +8069,51 @@ DELIMITER ;;
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	IF NEW.driver1Fk IS NOT NULL THEN
+	DECLARE vSeconds INT;
-		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
+
-	ELSE
+	SET NEW.editorFk = account.myUser_getId();
-		SET NEW.driverName = NULL;
+
+	IF NOT (NEW.name <=> OLD.name) THEN
+		SET NEW.name = UCASE(NEW.name);
+	END IF;
+
+	IF NOT (NEW.trailerPlate <=> OLD.trailerPlate) OR NOT (NEW.tugPlate <=> OLD.tugPlate) THEN
+		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
+	END IF;
+
+	IF NOT (NEW.driverName <=> OLD.driverName) THEN
+		SET NEW.driver1Fk = NULL;
+	END IF;
+
+	IF NOT (NEW.driver1Fk <=> OLD.driver1Fk) AND NEW.driver1Fk IS NOT NULL THEN
+		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+								FROM worker w
+								WHERE w.id = NEW.driver1Fk);
+
+		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
+							FROM worker w
+								LEFT JOIN client c ON c.id = w.id
+							WHERE w.id = NEW.driver1Fk);
+	END IF;
+
+	IF NOT (NEW.driverChangeName <=> OLD.driverChangeName) THEN
+		SET NEW.driverChangeFk = NULL;
+	END IF;
+
+	IF NOT (NEW.driverChangeFk <=> OLD.driverChangeFk) AND NEW.driverChangeFk IS NOT NULL THEN
+		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+										FROM worker w
+										WHERE w.id = NEW.driverChangeFk);
+	END IF;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		
+		IF vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
 	END IF;
 END */;;
 DELIMITER ;
@@ -8026,9 +8134,17 @@ DELIMITER ;;
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
 
-	SET NEW.description = UCASE(NEW.description);
+	IF NEW.description IS NOT NULL THEN
+		SET NEW.description = UCASE(NEW.description);
+	END IF;
 
+	IF NEW.roadmapFk IS NOT NULL THEN
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -8048,9 +8164,18 @@ DELIMITER ;;
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
 
-	SET NEW.description = UCASE(NEW.description);
+	IF NOT (NEW.description <=> OLD.description) THEN
+		SET NEW.description = UCASE(NEW.description);
+	END IF;
 
+	IF NOT (NEW.roadmapFk <=> OLD.roadmapFk) OR NOT (NEW.eta <=> OLD.eta) THEN
+
+		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+			CALL util.throw('Departure time can not be after arrival time');
+		END IF;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10577,6 +10702,10 @@ BEGIN
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
+
+	IF NEW.availabled < NEW.landed THEN
+		CALL util.throw('The travel availabled cannot be earlier than landed');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10633,6 +10762,10 @@ BEGIN
 	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
+
+	IF NEW.availabled < NEW.landed THEN
+		CALL util.throw('The travel availabled cannot be earlier than landed');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11244,6 +11377,10 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.priceOptimum = 0 THEN
+		SET NEW.priceOptimum = NEW.price;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11264,6 +11401,10 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NEW.priceOptimum = 0 THEN
+		CALL util.throw('The priceOptimum cannot be 0');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11526,9 +11667,8 @@ BEGIN
 	INSERT INTO zoneLog
 		SET `action` = 'delete',
 			`changedModel` = 'zoneIncluded',
-			`changedModelId` = OLD.zoneFk,
+			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -11611,4 +11751,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-28  7:09:01
+-- Dump completed on 2025-03-04  7:26:57

db/dump/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:10.11.6
+FROM mariadb:10.11.10
 
 ENV TZ Europe/Madrid
 

db/dump/db.cnf

@@ -1,4 +1,5 @@
 [mysqld]
+bind-address = 0.0.0.0
 log-bin = bin.log
 max_binlog_size = 1GB
 binlog_row_image = noblob

db/dump/dump.before.sql

@@ -6,9 +6,10 @@ GRANT SELECT,
         INSERT,
         UPDATE,
         DELETE,
-        DROP,
         CREATE TEMPORARY TABLES,
         EXECUTE,
         EVENT,
-        TRIGGER
+        TRIGGER, -- EXECUTE TRIGGER
+        RELOAD, -- FLUSH PRIVILEGES
+        DROP -- TRUNCATE TABLE
     ON *.* TO 'vn'@'localhost';

db/dump/fixtures.after.sql

@@ -16,8 +16,8 @@ INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, max
 */
 -- XXX: eti
 
-INSERT INTO vn.travel (id,shipped,landed,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk)
+INSERT INTO vn.travel (id,shipped,landed,availabled,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk)
-    VALUES (9,'2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1);
+    VALUES (9,'2022-05-20','2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1);
 /* #5483
 INSERT INTO vn.entry (id, supplierFk, dated, invoiceNumber, evaNotes, travelFk, companyFk)
     VALUES
@@ -77,8 +77,8 @@ INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     ('Otra agencia ', '1', '0', '0');
 
 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
-    ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
+    ('1', '1', 1, '1', '1', '1', '1', 'pc1', 'F', 0),
-    ('1', '1', 1, '2', '1', '1', '1', 'pc00', 'F', 0);
+    ('1', '1', 1, '2', '1', '1', '1', 'pc1', 'F', 0);
 
 INSERT INTO vn.client (id,name,defaultAddressFk,street,fi,email,dueDay,isTaxDataChecked,accountingAccount,city,provinceFk,postcode,socialName,contact,credit,countryFk,quality,riskCalculated) VALUES
     (100,'root',110,'Valle de la muerte','74974747G','root@mydomain.com',0,1,'4300000078','ALGEMESI',1,'46680','rootSocial','rootContact',500.0,1,10,'2025-01-01');
@@ -278,6 +278,15 @@ INSERT INTO `hedera`.`tpvConfig` (currency, terminal, transactionType, maxAmount
 INSERT INTO hedera.tpvMerchantEnable (merchantFk, companyFk)
     VALUES (1, 442);
 
+/* UPDATE vn.ticket t
+	JOIN vn.zone z ON z.id = t.zoneFk
+	SET t.shipped = DATE(t.shipped) +
+		INTERVAL HOUR(z.hour) HOUR +
+		INTERVAL MINUTE(z.hour) MINUTE;
+*/
+UPDATE vn.travel 
+	SET availabled = landed
+	WHERE availabled IS NULL; 
 -- XXX
 
 SET foreign_key_checks = 1;

db/dump/mockDate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockTime()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION util.mockTime()
 	RETURNS DATETIME
 	DETERMINISTIC
 BEGIN
@@ -8,7 +8,7 @@ END$$
 DELIMITER ;
 
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockUtcTime()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION util.mockUtcTime()
 	RETURNS DATETIME
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/myUser_checkLogin.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_checkLogin`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_checkLogin`()
 	RETURNS tinyint(1)
 	DETERMINISTIC
 	READS SQL DATA

db/routines/account/functions/myUser_getId.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_getId`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_getId`()
 	RETURNS int(11)
 	DETERMINISTIC
 	READS SQL DATA

db/routines/account/functions/myUser_getName.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_getName`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_getName`()
 	RETURNS varchar(30) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
 	DETERMINISTIC
 	NO SQL

db/routines/account/functions/myUser_hasPriv.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasPriv`(vChain VARCHAR(100), 
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasPriv`(vChain VARCHAR(100), 
 	vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE')
 )
 	RETURNS tinyint(1)

db/routines/account/functions/myUser_hasRole.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRole`(vRoleName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasRole`(vRoleName VARCHAR(255))
 	RETURNS tinyint(1)
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/myUser_hasRoleId.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRoleId`(vRoleId INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasRoleId`(vRoleId INT)
 	RETURNS tinyint(1)
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/myUser_hasRoutinePriv.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`myUser_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
 	vChain VARCHAR(100)
 )
 	RETURNS tinyint(1)

db/routines/account/functions/passwordGenerate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`passwordGenerate`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`passwordGenerate`()
 	RETURNS text CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
 	NOT DETERMINISTIC
 	READS SQL DATA

db/routines/account/functions/toUnixDays.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`toUnixDays`(vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`toUnixDays`(vDate DATE)
 	RETURNS int(11)
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/user_getMysqlRole.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_getMysqlRole`(vUserName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_getMysqlRole`(vUserName VARCHAR(255))
 	RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/user_getNameFromId.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_getNameFromId`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_getNameFromId`(vSelf INT)
 	RETURNS varchar(30) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/user_hasPriv.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasPriv`(vChain VARCHAR(100), 
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasPriv`(vChain VARCHAR(100), 
 	vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE'), 
 	vUserFk INT
 )

db/routines/account/functions/user_hasRole.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255))
 	RETURNS tinyint(1)
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/user_hasRoleId.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoleId`(vUser VARCHAR(255), vRoleId INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasRoleId`(vUser VARCHAR(255), vRoleId INT)
 	RETURNS tinyint(1)
 	DETERMINISTIC
 BEGIN

db/routines/account/functions/user_hasRoutinePriv.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `account`.`user_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
 	vChain VARCHAR(100),
 	vUserFk INT
 )

db/routines/account/procedures/account_enable.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
 BEGIN
 /**
  * Enables an account and sets up email configuration.

db/routines/account/procedures/myUser_login.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255))
 	READS SQL DATA
 BEGIN
 /**

db/routines/account/procedures/myUser_loginWithKey.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255))
 	READS SQL DATA
 BEGIN
 /**

db/routines/account/procedures/myUser_loginWithName.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_loginWithName`(vUserName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_loginWithName`(vUserName VARCHAR(255))
 	READS SQL DATA
 BEGIN
 /**

db/routines/account/procedures/myUser_logout.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_logout`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`myUser_logout`()
 BEGIN
 /**
  * Logouts the user.

db/routines/account/procedures/role_checkName.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_checkName`(vRoleName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_checkName`(vRoleName VARCHAR(255))
 BEGIN
 /**
  * Checks that role name meets the necessary syntax requirements, otherwise it

db/routines/account/procedures/role_getDescendents.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_getDescendents`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_getDescendents`(vSelf INT)
 BEGIN
 /**
  * Gets the identifiers of all the subroles implemented by a role (Including

db/routines/account/procedures/role_sync.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_sync`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_sync`()
 BEGIN
 /**
  * Synchronize the @roleRole table with the current role hierarchy. This

db/routines/account/procedures/role_syncPrivileges.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_syncPrivileges`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`role_syncPrivileges`()
 BEGIN
 /**
  * Synchronizes permissions of MySQL role users based on role hierarchy.

db/routines/account/procedures/user_checkName.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`user_checkName`(vUserName VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`user_checkName`(vUserName VARCHAR(255))
 BEGIN
 /**
  * Checks that username meets the necessary syntax requirements, otherwise it

db/routines/account/procedures/user_checkPassword.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`user_checkPassword`(vPassword VARCHAR(255))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `account`.`user_checkPassword`(vPassword VARCHAR(255))
 BEGIN
 /**
  * Comprueba si la contraseña cumple los requisitos de seguridad

db/routines/account/triggers/account_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_afterDelete`
 	AFTER DELETE ON `account`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/account_afterInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_afterInsert`
 	AFTER INSERT ON `account`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/account_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_beforeInsert`
 	BEFORE INSERT ON `account`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/account_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`account_beforeUpdate`
 	BEFORE UPDATE ON `account`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailAliasAccount_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAliasAccount_afterDelete`
     AFTER DELETE ON `mailAliasAccount`
     FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailAliasAccount_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeInsert`
     BEFORE INSERT ON `mailAliasAccount`
     FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailAliasAccount_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeUpdate`
     BEFORE UPDATE ON `mailAliasAccount`
     FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailAlias_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAlias_afterDelete`
 	AFTER DELETE ON `mailAlias`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailAlias_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAlias_beforeInsert`
 	BEFORE INSERT ON `mailAlias`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailAlias_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailAlias_beforeUpdate`
 	BEFORE UPDATE ON `mailAlias`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailForward_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailForward_afterDelete`
 	AFTER DELETE ON `mailForward`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailForward_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailForward_beforeInsert`
 	BEFORE INSERT ON `mailForward`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/mailForward_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`mailForward_beforeUpdate`
 	BEFORE UPDATE ON `mailForward`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/roleInherit_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`roleInherit_afterDelete`
 	AFTER DELETE ON `roleInherit`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/roleInherit_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`roleInherit_beforeInsert`
 	BEFORE INSERT ON `roleInherit`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/roleInherit_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`roleInherit_beforeUpdate`
 	BEFORE UPDATE ON `roleInherit`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/role_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`role_afterDelete`
 	AFTER DELETE ON `role`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/role_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`role_beforeInsert`
 	BEFORE INSERT ON `role`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/role_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`role_beforeUpdate`
 	BEFORE UPDATE ON `role`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/user_afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_afterDelete`
 	AFTER DELETE ON `user`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/user_afterInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_afterInsert`
 	AFTER INSERT ON `user`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/user_afterUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_afterUpdate`
 	AFTER UPDATE ON `user`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/user_beforeInsert.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_beforeInsert`
 	BEFORE INSERT ON `user`
 	FOR EACH ROW
 BEGIN

db/routines/account/triggers/user_beforeUpdate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `account`.`user_beforeUpdate`
 	BEFORE UPDATE ON `user`
 	FOR EACH ROW
 BEGIN

db/routines/account/views/accountDovecot.sql

@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `account`.`accountDovecot`
 AS SELECT `u`.`name` AS `name`,

db/routines/account/views/emailUser.sql

@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `account`.`emailUser`
 AS SELECT `u`.`id` AS `userFk`,

db/routines/account/views/myRole.sql

@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `account`.`myRole`
 AS SELECT `r`.`inheritsFrom` AS `id`

db/routines/account/views/myUser.sql

@@ -1,4 +1,4 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `account`.`myUser`
 AS SELECT `u`.`id` AS `id`,

db/routines/bi/procedures/Greuge_Evolution_Add.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`Greuge_Evolution_Add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`Greuge_Evolution_Add`()
 BEGIN
 /*
 	Inserta en la tabla Greuge_Evolution el saldo acumulado de cada cliente,

db/routines/bi/procedures/analisis_ventas_evolution_add.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_evolution_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`analisis_ventas_evolution_add`()
 BEGIN
 	DECLARE vPreviousPeriod INT;
 	DECLARE vCurrentPeriod INT;

db/routines/bi/procedures/analisis_ventas_simple.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_simple`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`analisis_ventas_simple`()
 BEGIN
 /**
  * Vacia y rellena la tabla 'analisis_grafico_simple' desde 'analisis_grafico_ventas'

db/routines/bi/procedures/analisis_ventas_update.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
 BEGIN
 	DECLARE vLastMonth DATE;
 

db/routines/bi/procedures/clean.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`clean`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`clean`()
 BEGIN
 	DECLARE vDateShort DATETIME;
 	DECLARE vDateLong DATETIME;

db/routines/bi/procedures/defaultersFromDate.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
 BEGIN
 
 	SELECT t1.*, c.name Cliente, w.code workerCode, c.payMethodFk pay_met_id, c.dueDay Vencimiento

db/routines/bi/procedures/defaulting.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
 BEGIN
 	DECLARE vDone BOOLEAN;
 	DECLARE vClient INT;

db/routines/bi/procedures/defaulting_launcher.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting_launcher`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`defaulting_launcher`()
 BEGIN
 /**
  * Calcula la morosidad de los clientes.