Merge branch 'test' into dev

Reviewed-on: #3533
Reviewed-by: Juan Ferrer <juan@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 {
-                        stage('Test') {
-                            when {
-                                expression { RUN_TESTS }
-                            }
-                            environment {
-                                NODE_ENV = ''
-                            }
-                            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'
-                            }
+                    steps {
+                        sh 'node back/tests.js --junit'
+                    }
+                    post {
+                        always {
+                            junit(
+                                testResults: 'junitresults.xml',
+                                allowEmptyResults: true
+                            )
                         }
                     }
                 }
                 stage('Front') {
-                    when {
-                        expression { FROM_GIT }
+                    steps {
+                        sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
                     }
-                    stages {
-                        stage('Test') {
-                            when {
-                                expression { RUN_TESTS }
-                            }
-                            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'
-                            }
+                    post {
+                        always {
+                            junit(
+                                testResults: 'junit.xml',
+                                allowEmptyResults: true
+                            )
                         }
                     }
                 }
             }
         }
-        stage('Push') {
+        stage('Build') {
             when {
                 expression { RUN_BUILD }
             }
             environment {
-                CREDENTIALS = credentials('docker-registry')
                 VERSION = readFile 'VERSION.txt'
             }
-            steps {
-                sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
-                sh 'docker-compose push'
+            parallel {
+                stage('Back') {
+                    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

@@ -25,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
@@ -55,4 +55,4 @@ COPY \
     README.md \
     ./
 
-CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]
+CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]

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/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)
-                SELECT ?, ?, ?
+            INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model, description)
+                SELECT ?, ?, ?, ?
                     FROM workerTimeControlConfig wtcc
                         LEFT JOIN (
                             SELECT wa.workerFk,
@@ -43,8 +48,8 @@ module.exports = Self => {
                             LIMIT 1
                         ) sub ON TRUE
                     WHERE sub.workerFk IS NULL
-                        OR sub.code <> ? 
+                        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/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",
-        "ticketPalletized": "c327f3243e717cc607f01d3747967ba68158f90ef1038986b0aa6ae6d5ce7309"
+        "routePalletized": "98d228ced59c8ec590bbaf106cebf47689a02b32e895ba76b5b6e5c05d73cf14",
+        "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','11436','f83055057e5eb15c800033882ea117e6ee646673','2025-02-18 09:15:11','11445');
+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);
@@ -921,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);
@@ -1073,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);
@@ -1091,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);
@@ -1147,16 +1151,20 @@ INSERT INTO `versionLog` VALUES ('vn-database','11383','02-province.sql','jenkin
 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);
@@ -1191,6 +1199,15 @@ INSERT INTO `versionLog` VALUES ('vn-database','11436','00-firstScript.sql','jen
 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 */;
@@ -1291,6 +1308,7 @@ INSERT INTO `role` VALUES (130,'reviewer','Revisor de producción',1,'2024-06-11
 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);
@@ -1554,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);
@@ -1573,6 +1590,10 @@ 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);
 
@@ -2468,6 +2489,46 @@ INSERT INTO `ACL` VALUES (1038,'Route','sendSms','WRITE','ALLOW','ROLE','deliver
 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');
@@ -2766,7 +2827,7 @@ 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,134,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);
@@ -2777,28 +2838,28 @@ INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,41,NULL,72,1,1,1,13,1
 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',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',44,93,NULL,0,0,0,1,24,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',96,97,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',98,99,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',100,101,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',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',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 (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',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',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',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',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',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',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',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',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 (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',108,111,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',112,113,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+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',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',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',114,117,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',118,119,NULL,72,0,0,1,0,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',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',120,121,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',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',122,123,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',124,125,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',115,116,NULL,0,0,0,2,0,61,'/1/61/',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',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',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',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',53,54,3797,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
@@ -2806,18 +2867,18 @@ INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',55,56,24065,
 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',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',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',126,127,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',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,'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',109,110,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',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',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',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',128,129,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',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',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 (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',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',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',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',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');
@@ -2833,6 +2894,7 @@ INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',8
 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);
@@ -2964,7 +3026,7 @@ INSERT INTO `ticketUpdateAction` VALUES (2,'Convertir en maná','mana');
 
 INSERT INTO `ticketCanAdvanceConfig` VALUES (1,5);
 
-INSERT INTO `volumeConfig` VALUES (1,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

@@ -751,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','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','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','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','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','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','');
@@ -769,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','');
@@ -916,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','');
@@ -1504,10 +1501,10 @@ 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-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+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 IGNORE INTO `tables_priv` VALUES ('','vn','hr','machineDms','guillermo@db-proxy2.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','');
@@ -1526,7 +1523,14 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','roadmapAddress','je
 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','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','','Update');
+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 */;
@@ -1586,7 +1590,7 @@ 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','palletM3','0000-00-00 00:00:00','Update');
+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');
@@ -1906,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');
@@ -1921,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');
@@ -2273,6 +2276,9 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','packagerBoss','buy_getUltimate'
 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 */;

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
 -- ------------------------------------------------------
@@ -11377,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 */ ;
@@ -11397,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 */ ;
@@ -11743,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-02-18  8:16:03
+-- 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)
-    VALUES (9,'2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1);
+INSERT INTO vn.travel (id,shipped,landed,availabled,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk)
+    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, '2', '1', '1', '1', 'pc00', 'F', 0);
+    ('1', '1', 1, '1', '1', '1', '1', 'pc1', '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.

db/routines/bi/procedures/facturacion_media_anual_update.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`facturacion_media_anual_update`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`facturacion_media_anual_update`()
 BEGIN
 	TRUNCATE TABLE bs.clientAnnualConsumption;
         

db/routines/bi/procedures/greuge_dif_porte_add.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
 BEGIN
 
 /**