Merge branch 'dev' into 6697-removeClaimQuantity

.husky/addReferenceTag.js

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

.husky/commit-msg

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

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [24.20.01] - 2024-05-14
+
+## [24.18.01] - 2024-05-07
+
 ## [24.16.01] - 2024-04-18
 
 ## [2414.01] - 2024-04-04

Jenkinsfile

@@ -24,7 +24,7 @@ node {
         FROM_GIT = env.JOB_NAME.startsWith('gitea/')
         RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
         RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
-
+        env.DEBUG = 'strong-remoting:shared-method'
         // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
@@ -71,6 +71,7 @@ pipeline {
                 stage('Back') {
                     steps {
                         sh 'pnpm install --prefer-offline'
+                        sh 'node node_modules/puppeteer/install.mjs'
                     }
                 }
                 stage('Print') {

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

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

back/methods/collection/getSales.js

@@ -29,6 +29,7 @@ module.exports = Self => {
     });
 
     Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
         const $t = ctx.req.__;

back/methods/dms/downloadFile.js

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

back/methods/docuware/download.js

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

back/methods/image/download.js

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

back/methods/notification/getList.js

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

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

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

back/methods/url/getUrl.js

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

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

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

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

@@ -28,11 +28,25 @@ describe('Renew Token', () => {
     });
 
     it('should renew token', async() => {
+        const {courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['courtesyTime']
+        });
         const mockDate = new Date(startingTime + 26600000);
         jasmine.clock().mockDate(mockDate);
         const {id} = await models.VnUser.renewToken(ctx);
 
         expect(id).not.toEqual(ctx.req.accessToken.id);
+
+        await models.VnUser.logout(ctx.req.accessToken.id);
+        jasmine.clock().tick((courtesyTime + 10) * 1000);
+        let tokenNotExists;
+        try {
+            tokenNotExists = await models.AccessToken.findById(ctx.req.accessToken.id);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(tokenNotExists).toBeNull();
     });
 
     it('NOT should renew', async() => {

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

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

back/model-config.json

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

back/models/production-config.json

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

back/models/specs/notificationSubscription.spec.js

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

commitlint.config.js

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

db/.editorconfig

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

db/dump/.dump/data.sql

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

db/dump/.dump/privileges.sql

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

db/dump/.dump/triggers.sql

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

db/dump/fixtures.after.sql

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

db/dump/fixtures.before.sql

@@ -81,7 +81,7 @@ INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPre
 CALL `account`.`role_sync`;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
-    SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
+    SELECT id, LOWER(name), CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
         FROM `account`.`role`
             ORDER BY id;
 
@@ -118,18 +118,18 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
 
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
-        (1101, 'BruceWayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
+        (1101, 'brucewayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
-        (1102, 'PetterParker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
+        (1102, 'petterparker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
-        (1103, 'ClarkKent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
+        (1103, 'clarkkent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
-        (1104, 'TonyStark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
+        (1104, 'tonystark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
-        (1105, 'MaxEisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
+        (1105, 'maxeisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
-        (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
+        (1106, 'davidcharleshaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
-        (1107, 'HankPym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
+        (1107, 'hankpym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
-        (1108, 'CharlesXavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
+        (1108, 'charlesxavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
-        (1109, 'BruceBanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
+        (1109, 'brucebanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
-        (1110, 'JessicaJones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
+        (1110, 'jessicajones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
-        (1111, 'Missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
+        (1111, 'missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
-        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
+        (1112, 'trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
 
 UPDATE account.`user`
     SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
@@ -198,7 +198,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
-UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+UPDATE `vn`.`sector` SET `backupPrinterFk` = 1 WHERE id = 1;
 
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
@@ -527,7 +527,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (4, 'SalesPerson',      'salesPerson'),
         (5, 'Administrative',   'administrative'),
         (6, 'Weight',           'weight'),
-        (7, 'InvoiceOut',       'invoiceOut');
+        (7, 'InvoiceOut',       'invoiceOut'),
+        (8, 'DropOff',           'dropOff');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -1492,21 +1493,21 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeF
 
 INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
     VALUES
-        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
+        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
-        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  0, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
+        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  NULL, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
-        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  0, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  NULL, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
+        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
+        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
+        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES
@@ -1827,9 +1828,9 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`,
 
 INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
     VALUES
-        (1, util.VN_CURDATE(), 1,   1101, 18, 3, 0, util.VN_CURDATE(), 0,  11),
+        (1, util.VN_CURDATE(), 1,   1101, 19, 3, 0, util.VN_CURDATE(), 0,  11),
         (2, util.VN_CURDATE(), 4,   1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
-        (3, util.VN_CURDATE(), 3,   1101, 18, 1, 1, util.VN_CURDATE(), 5, 7),
+        (3, util.VN_CURDATE(), 3,   1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
         (4, util.VN_CURDATE(), 3,   1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
 
 INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
@@ -1880,7 +1881,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
 
 INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
     VALUES
-        (1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
+        (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
         (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
         (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
         (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
@@ -1973,6 +1974,15 @@ INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxC
         (4, 'Documentos',    1, 2.00,  1, 9,  1),
         (5, 'Documentos',    1, 2.00,  1, 8,  1);
 
+INSERT INTO `pbx`.`config` (id,defaultPrefix)
+    VALUES (1,'0034');
+
+INSERT INTO `pbx`.`prefix` (country, prefix)
+    VALUES
+        ('es', '0034'),
+        ('fr', '0033'),
+        ('pt', '00351');
+
 INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
     VALUES
         (1, 1010),
@@ -2542,15 +2552,15 @@ INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroV
 REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`)
     VALUES
         (1,  1001,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1),
-        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 1, 442, 1),
+        (2,  1002,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1235, 0, 442, 1),
         (3,  1003,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1236, 0, 442, 1),
         (4,  1004,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1237, 0, 442, 1),
-        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 1, 442, 1),
+        (5,  1005,  'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1238, 0, 442, 1),
         (6,  1006,  'R', 2, util.VN_CURDATE(), util.VN_CURDATE(), 1239, 0, 442, 1),
-        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 1, 442, 1),
+        (7,  1007,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1240, 0, 442, 1),
-        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 1, 442, 1),
+        (8,  1008,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1241, 0, 442, 1),
-        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 1, 442, 1),
+        (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1),
-        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
+        (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1);
 
 INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`, `daysAgo`)
     VALUES
@@ -2605,13 +2615,33 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo
         (2, 13.20, 5080000, 15.00, 580, 5),
         (2, 16.10, 6021010, 25.00, 80,  5);
 
-INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
+UPDATE `vn`.`invoiceIn`
-    SELECT t.id
+    SET isBooked = TRUE
-        FROM vn.ticket t
+    WHERE id IN (5, 7, 8, 9, 10);
-            LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id
-        WHERE tr.ticketFk IS NULL;
 
-CALL `vn`.`ticket_doRecalc`();
+DELIMITER $$
+CREATE PROCEDURE `tmp`.`ticket_recalc`()
+BEGIN
+	DECLARE vDone BOOL;
+	DECLARE vTicketFk INT;
+
+	DECLARE cTickets CURSOR FOR SELECT id FROM vn.ticket;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+
+	OPEN cTickets;
+	myLoop: LOOP
+		SET vDone = FALSE;
+		FETCH cTickets INTO vTicketFk;
+		IF vDone THEN LEAVE myLoop; END IF;
+		CALL vn.ticket_recalc(vTicketFk, NULL);
+	END LOOP;
+	CLOSE cTickets;
+END$$
+DELIMITER ;
+
+CALL tmp.ticket_recalc;
+DROP PROCEDURE tmp.ticket_recalc;
 
 UPDATE `vn`.`ticket`
     SET refFk = 'T1111111'
@@ -2813,7 +2843,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
         (5, 'modified-entry', 'An entry has been modified'),
         (6, 'book-entry-deleted', 'accounting entries deleted'),
-        (7, 'zone-included','An email to notify zoneCollisions');
+        (7, 'zone-included','An email to notify zoneCollisions'),
+        (8, 'backup-printer-selected','A backup printer has been selected');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2825,7 +2856,8 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (4, 1),
         (5, 9),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
@@ -2845,15 +2877,16 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
 	    (1, 9),
         (1, 3),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
         (1, 9);
 
-INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`)
     VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);
 
 INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
     VALUES
@@ -2913,7 +2946,8 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'development', 'http://localhost:9000/#/'),
         ('hedera', 'development', 'http://localhost:9090/'),
-        ('salix', 'development', 'http://localhost:5000/#!/');
+        ('salix', 'development', 'http://localhost:5000/#!/'),
+        ('docuware', 'development', 'http://docuware');
 
 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
     VALUES
@@ -3222,7 +3256,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3260,7 +3294,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 40,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3298,7 +3332,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 10,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3344,7 +3378,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 4,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3382,7 +3416,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3421,7 +3455,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 200,
 		`grouping` = 30,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3460,7 +3494,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 500,
 		`grouping` = 10,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3499,7 +3533,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 300,
 		`grouping` = 50,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3538,7 +3572,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 50,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3578,7 +3612,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 5,
 		`grouping` = 2,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3617,7 +3651,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 100,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3733,5 +3767,23 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 	VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
 
 INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
+    VALUES (1, 10, 9);
+
+INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
 	VALUES
-        (1, 10, 9);
+		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',118.81,'RCBO','debit','10','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',2149.71,'RCBO.AMAZON','debit','122','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
+
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
+	VALUES (1, 1);
+
+
+INSERT INTO vn.workerTeam(id, team, workerFk)
+    VALUES
+        (8, 1, 19);

db/routines/account/procedures/user_checkName.sql

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

db/routines/bi/procedures/Greuge_Evolution_Add.sql

@@ -92,12 +92,12 @@ BEGIN
 		UPDATE bi.Greuge_Evolution ge 
 			JOIN (
 				   SELECT cs.Id_Cliente, sum(Valor * Cantidad) as Importe
-					   FROM vn2008.Tickets t
+					   FROM vn.ticket t
-					   JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
+					   JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.addressFk
-					   JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
+					   JOIN vn2008.Movimientos m on m.Id_Ticket = t.id
 					   JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
-				   WHERE t.Fecha >= datFEC 
+				   WHERE t.shipped >= datFEC 
-					   AND t.Fecha < datFEC_TOMORROW
+					   AND t.shipped < datFEC_TOMORROW
 					   AND mc.Id_Componente = 17 -- Recobro
 				   GROUP BY cs.Id_Cliente
 				 ) sub using(Id_Cliente)

db/routines/bi/procedures/analisis_ventas_update.sql

@@ -42,12 +42,12 @@ BEGIN
 			LEFT JOIN vn2008.Trabajadores tr2 ON tr2.Id_Trabajador = tp.Id_Trabajador
 			JOIN vn2008.time tm ON tm.date = bt.fecha
 			JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
-            LEFT JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+			LEFT JOIN vn.ticket t ON t.id = m.Id_Ticket
-            JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
+			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
 			LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
-            LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
+			LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.addressFk
 			LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
-            LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
+			LEFT JOIN vn.warehouse w ON w.id = t.warehouseFk
 		WHERE bt.fecha >= vLastMonth AND r.mercancia;
 END$$
 DELIMITER ;

db/routines/bi/procedures/claim_ratio_routine.sql

@@ -59,18 +59,18 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list
 	(PRIMARY KEY (Id_Ticket))
-	SELECT DISTINCT t.Id_Ticket
+	SELECT DISTINCT t.id Id_Ticket
 			FROM vn2008.Movimientos_componentes mc
 				JOIN vn2008.Movimientos m ON mc.Id_Movimiento = m.Id_Movimiento
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+				JOIN vn.ticket t ON t.id = m.Id_Ticket
-				JOIN vn2008.Tickets_state ts ON ts.Id_Ticket = t.Id_Ticket
+				JOIN vn.ticketLastState ts ON ts.ticketFk = t.id
-				JOIN vn.ticketTracking tt ON tt.id = ts.inter_id
+				JOIN vn.ticketTracking tt ON tt.id = ts.ticketTrackingFk
-				JOIN vn2008.state s ON s.id = tt.stateFk
+				JOIN vn.state s ON s.id = tt.stateFk
 			WHERE mc.Id_Componente = 17
 				AND mc.greuge = 0
-				AND t.Fecha >= '2016-10-01'
+				AND t.shipped >= '2016-10-01'
-				AND t.Fecha < util.VN_CURDATE()
+				AND t.shipped < util.VN_CURDATE()
-				AND s.alert_level >= 3;
+				AND s.alertLevel >= 3;
 
 	DELETE g.*
 			FROM vn.greuge g
@@ -79,18 +79,18 @@ BEGIN
 
 	INSERT INTO vn.greuge(clientFk, description, amount,shipped,
 					greugeTypeFk, ticketFk)
-		SELECT Id_Cliente
+		SELECT t.clientFk
 				,concat('recobro ', m.Id_Ticket), - round(SUM(mc.Valor*Cantidad),2)
 					AS dif
-				,date(t.Fecha)
+				,date(t.shipped)
 				, 2
 				,tt.Id_Ticket
 			FROM vn2008.Movimientos m
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+				JOIN vn.ticket t ON t.id = m.Id_Ticket
-				JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket
+				JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.id
 				JOIN vn2008.Movimientos_componentes mc
 					ON mc.Id_Movimiento = m.Id_Movimiento AND mc.Id_Componente = 17
-			GROUP BY t.Id_Ticket
+			GROUP BY t.id
 				HAVING ABS(dif) > 1;
 
 	UPDATE vn2008.Movimientos_componentes mc

db/routines/bi/procedures/comparativa_add.sql

@@ -15,17 +15,17 @@ BEGIN
     IF lastCOMP < vMaxPeriod - 3 AND vMaxWeek > 3 THEN
     
 		REPLACE vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-			SELECT tm.period as Periodo, m.Id_Article, t.warehouse_id, sum(m.Cantidad), sum(v.importe)
+			SELECT tm.period as Periodo, m.Id_Article, t.warehouseFk, sum(m.Cantidad), sum(v.importe)
             FROM bs.ventas v
             JOIN vn2008.time tm ON tm.date = v.fecha
             JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
             JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
             JOIN vn2008.reinos r ON r.id = tp.reino_id
-            JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+            JOIN vn.ticket t ON t.id = m.Id_Ticket
             WHERE tm.period BETWEEN lastCOMP AND vMaxPeriod - 3
-            AND t.Id_Cliente NOT IN(400,200)
+            AND t.clientFk NOT IN(400,200)
-            AND t.warehouse_id NOT IN (0,13)		
+            AND t.warehouseFk NOT IN (0,13)		
-            GROUP BY m.Id_Article, Periodo, t.warehouse_id;
+            GROUP BY m.Id_Article, Periodo, t.warehouseFk;
 
     END IF;
 END$$

db/routines/bi/procedures/comparativa_add_manual.sql

@@ -25,16 +25,16 @@ BEGIN
 		WHERE Periodo BETWEEN periodStart AND periodEnd;
 
 	INSERT INTO vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-		SELECT tm.period as Periodo, m.Id_Article, t.warehouse_id, sum(m.Cantidad), sum(v.importe)
+		SELECT tm.period as Periodo, m.Id_Article, t.warehouseFk, sum(m.Cantidad), sum(v.importe)
 			FROM bs.ventas v
 				JOIN vn2008.time tm ON tm.date = v.fecha
 				JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
 				JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
 				JOIN vn2008.reinos r ON r.id = tp.reino_id
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+				JOIN vn.ticket t ON t.id = m.Id_Ticket
 			WHERE tm.period BETWEEN periodStart AND periodEnd
-				AND t.Id_Cliente NOT IN(400,200)
+				AND t.clientFk NOT IN(400,200)
-				AND t.warehouse_id NOT IN (0,13)		
+				AND t.warehouseFk NOT IN (0,13)		
-			GROUP BY m.Id_Article, Periodo, t.warehouse_id;
+			GROUP BY m.Id_Article, Periodo, t.warehouseFk;
 END$$
 DELIMITER ;

db/routines/bi/procedures/greuge_dif_porte_add.sql

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

db/routines/bi/views/v_ventas_contables.sql

@@ -11,13 +11,13 @@ AS SELECT `time`.`year` AS `year`,
 FROM (
 		(
 			(
-				`vn2008`.`Tickets` `t`
+				`vn`.`ticket` `t`
-				JOIN `bi`.`f_tvc` ON(`t`.`Id_Ticket` = `bi`.`f_tvc`.`Id_Ticket`)
+				JOIN `bi`.`f_tvc` ON(`t`.`id` = `bi`.`f_tvc`.`Id_Ticket`)
 			)
-			JOIN `vn2008`.`Movimientos` `m` ON(`t`.`Id_Ticket` = `m`.`Id_Ticket`)
+			JOIN `vn2008`.`Movimientos` `m` ON(`t`.`id` = `m`.`Id_Ticket`)
 		)
-		JOIN `vn2008`.`time` ON(`time`.`date` = cast(`t`.`Fecha` AS date))
+		JOIN `vn2008`.`time` ON(`time`.`date` = cast(`t`.`shipped` AS date))
 	)
-WHERE `t`.`Fecha` >= '2014-01-01'
+WHERE `t`.`shipped` >= '2014-01-01'
 GROUP BY `time`.`year`,
 	`time`.`month`

db/routines/bs/procedures/comercialesCompleto.sql

@@ -70,23 +70,23 @@ BEGIN
 				AND (v.fecha BETWEEN TIMESTAMPADD(DAY, - DAY(vDate) + 1, vDate)  AND TIMESTAMPADD(DAY, - 1, vDate))
 		GROUP BY Id_Cliente) mes_actual ON mes_actual.Id_Cliente = c.Id_Cliente
 			LEFT JOIN
-		(SELECT t.Id_Cliente, SUM(m.preu * m.Cantidad * (1 - m.Descuento / 100)) futur
+		(SELECT t.clientFk Id_Cliente, SUM(m.preu * m.Cantidad * (1 - m.Descuento / 100)) futur
-				FROM vn2008.Tickets t
+				FROM vn.ticket t
-					JOIN vn2008.Clientes c ON c.Id_Cliente = t.Id_Cliente
+					JOIN vn2008.Clientes c ON c.Id_Cliente = t.clientFk
-					JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
+					JOIN vn2008.Movimientos m ON m.Id_Ticket = t.id
 					LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
 				WHERE
 					(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					AND t.Fecha BETWEEN vDate AND util.dayEnd(LAST_DAY(vDate))
+					AND t.shipped BETWEEN vDate AND util.dayEnd(LAST_DAY(vDate))
 				GROUP BY Id_Cliente) f ON c.Id_Cliente = f.Id_Cliente
 			LEFT JOIN
-		(SELECT MAX(t.Fecha) LastTicket, c.Id_Cliente
+		(SELECT MAX(t.shipped) LastTicket, c.Id_Cliente
-				FROM vn2008.Tickets t
+				FROM vn.ticket t
-						JOIN vn2008.Clientes c ON c.Id_cliente = t.Id_Cliente
+						JOIN vn2008.Clientes c ON c.Id_cliente = t.clientFk
 						LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
 					WHERE
 						(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					GROUP BY t.Id_Cliente) LastTicket ON LastTicket.Id_Cliente = c.Id_Cliente
+					GROUP BY t.clientFk) LastTicket ON LastTicket.Id_Cliente = c.Id_Cliente
 					LEFT JOIN
 		(
 			SELECT SUM(importe) peso, c.Id_Cliente

db/routines/bs/procedures/manaCustomerUpdate.sql

@@ -68,13 +68,13 @@ BEGIN
                 FROM 
                 (
                     SELECT cs.Id_Cliente, Cantidad * Valor as mana
-                        FROM vn2008.Tickets t
+                        FROM vn.ticket t
                             JOIN vn2008.Consignatarios cs using(Id_Consigna)
-                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
+                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.id
                             JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
                         WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
-                            AND t.Fecha > vFromDated 
+                            AND t.shipped > vFromDated 
-                            AND date(t.Fecha) <= vToDated
+                            AND date(t.shipped) <= vToDated
                     UNION ALL
                     SELECT r.Id_Cliente, - Entregado
                         FROM vn2008.Recibos r

db/routines/bs/procedures/ventas_contables_add.sql

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

db/routines/bs/procedures/ventas_contables_por_cliente.sql

@@ -10,36 +10,36 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 
 	CREATE TEMPORARY TABLE tmp.ticket_list
-		(PRIMARY KEY (Id_Ticket))
+		(PRIMARY KEY (id))
-		SELECT Id_Ticket
+		SELECT t.id
-			FROM vn2008.Tickets t
+			FROM vn.ticket t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
+				JOIN vn.invoiceOut io ON io.id = t.refFk
 			WHERE year(io.issued) = vYear
 				AND month(io.issued) = vMonth;
 
 	SELECT vYear Año,
 			vMonth Mes,
-			t.Id_Cliente,
+			t.clientFk Id_Cliente,
 			round(sum(Cantidad * Preu * (100 - m.Descuento)/100)) Venta,
 			IF(e.empresa_grupo = e2.empresa_grupo,
 				1,
 				IF(e2.empresa_grupo,2,0))
 			AS grupo,
-			t.empresa_id empresa
+			t.companyFk empresa
 		FROM vn2008.Movimientos m 
-			JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+			JOIN vn.ticket t ON t.id = m.Id_Ticket
-			JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
+			JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.addressFk
 			JOIN vn2008.Clientes c ON c.Id_Cliente = cs.Id_Cliente
-			JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket
+			JOIN tmp.ticket_list tt ON tt.id = t.id
 			JOIN vn2008.Articles a ON m.Id_Article = a.Id_Article
-			JOIN vn2008.empresa e ON e.id = t.empresa_id
+			JOIN vn2008.empresa e ON e.id = t.companyFk
 			LEFT JOIN vn2008.empresa e2 ON e2.Id_Cliente = c.Id_Cliente
 			JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
 		WHERE Cantidad <> 0
 			AND Preu <> 0
 			AND m.Descuento <> 100
 			AND a.tipo_id != 188
-		GROUP BY t.Id_Cliente, grupo,t.empresa_id;
+		GROUP BY t.clientFk, grupo,t.companyFk;
 
 	DROP TEMPORARY TABLE tmp.ticket_list;
 

db/routines/edi/procedures/ekt_load.sql

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

db/routines/edi/procedures/floramondo_offerRefresh.sql

@@ -417,7 +417,7 @@ proc: BEGIN
 					o.NumberOfUnits etiquetas,
 					o.NumberOfItemsPerCask packing,
 					GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
-					2, -- Obliga al Packing
+					'packing',
 					o.embalageCode,
 					o.diId
 				FROM edi.offer o

db/routines/floranet/procedures/catalogue_findById.sql

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

db/routines/floranet/procedures/catalogue_get.sql

@@ -4,18 +4,30 @@ DELIMITER $$
 $$
 CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
 READS SQL DATA
-BEGIN
+proc:BEGIN
 /**
- * Returns list, price and all the stuff regarding the floranet items
+ * Returns list, price and all the stuff regarding the floranet items.
  * 
  * @param vLanded Delivery date
  * @param vPostalCode Delivery address postal code
  */
 	DECLARE vLastCatalogueFk INT;
+	DECLARE vLockName VARCHAR(20);
+	DECLARE vLockTime INT;
 
-	START TRANSACTION;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK(vLockName);
 
-	SELECT * FROM catalogue FOR UPDATE;
+		RESIGNAL;
+	END;
+	
+	SET vLockName = 'catalogue_get';
+	SET vLockTime = 15;
+
+	IF NOT GET_LOCK(vLockName, vLockTime) THEN
+		LEAVE proc;
+	END IF;
 
 	SELECT MAX(id) INTO vLastCatalogueFk
 		FROM catalogue;
@@ -46,7 +58,7 @@ BEGIN
 		FROM catalogue
 		WHERE id > IFNULL(vLastCatalogueFk,0);
 
-	COMMIT;
+	DO RELEASE_LOCK(vLockName);
 
 END$$
 DELIMITER ;

db/routines/floranet/procedures/contact_request.sql

@@ -11,7 +11,7 @@ PROCEDURE floranet.contact_request(
 READS SQL DATA
 BEGIN
 /**
- * Set actions for contact request.
+ * Set actions for contact request
  * 
  * @param vPostalCode Delivery address postal code
  */

db/routines/floranet/procedures/deliveryDate_get.sql

@@ -6,7 +6,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPosta
     READS SQL DATA
 BEGIN
 /**
- * Returns available dates for this postalCode, in the next seven days
+ * Returns available dates for this postalCode, in the next seven days.
  * 
  * @param vPostalCode Delivery address postal code
  */

db/routines/floranet/procedures/order_confirm.sql

@@ -7,7 +7,7 @@ CREATE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk I
 READS SQL DATA
 
 BEGIN
-/** Update order.isPaid field
+/** Update order.isPaid field.
  *  
  *  @param vCatalogueFk floranet.catalogue.id
  * 

db/routines/floranet/procedures/order_put.sql

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

db/routines/floranet/procedures/sliders_get.sql

@@ -6,14 +6,15 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.sliders_get()
 READS SQL DATA
 BEGIN
 /**
- * Returns list of url for sliders
+ * Returns list of url for sliders.
  */
 	SELECT 
         CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image) url,
         i.longName
     FROM vn.item i
         JOIN vn.itemType it ON it.id = i.typeFk
-    WHERE it.code IN ('FNR','FNP');
+    WHERE it.code IN ('FNR','FNP')
+   	LIMIT 3;
     
 END$$
 DELIMITER ;

db/routines/hedera/events/order_doRecalc.sql

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

db/routines/hedera/procedures/order_doRecalc.sql

@@ -1,53 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_doRecalc`()
-proc: BEGIN
-/**
- * Recalculates modified orders.
- */
-	DECLARE vDone BOOL;
-	DECLARE vOrderFk INT;
-
-	DECLARE cCur CURSOR FOR
-		SELECT DISTINCT orderFk FROM tOrder;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('hedera.order_doRecalc');
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	IF !GET_LOCK('hedera.order_doRecalc', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	DROP TEMPORARY TABLE IF EXISTS tOrder;
-	CREATE TEMPORARY TABLE tOrder
-		ENGINE = MEMORY
-		SELECT id, orderFk FROM orderRecalc;
-
-	OPEN cCur;
-
-	myLoop: LOOP
-		SET vDone = FALSE;
-		FETCH cCur INTO vOrderFk;
-
-		IF vDone THEN
-			LEAVE myLoop;
-		END IF;
-
-		CALL order_recalc(vOrderFk);
-	END LOOP;
-
-	CLOSE cCur;
-
-	DELETE o FROM orderRecalc o JOIN tOrder t ON t.id = o.id;
-
-	DROP TEMPORARY TABLE tOrder;
-
-	DO RELEASE_LOCK('hedera.order_doRecalc');
-END$$
-DELIMITER ;

db/routines/hedera/procedures/order_requestRecalc.sql

@@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`order_requestRecalc`(vSelf INT)
-proc: BEGIN
-/**
- * Adds a request to recalculate the order total.
- *
- * @param vSelf The order identifier
- */
-	IF vSelf IS NULL THEN
-		LEAVE proc;
-	END IF;
-
-	INSERT INTO orderRecalc SET orderFk = vSelf;
-END$$
-DELIMITER ;

db/routines/hedera/triggers/orderRow_afterDelete.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterDelete`
-	AFTER DELETE ON `orderRow`
-	FOR EACH ROW
-BEGIN
-	CALL stock.log_add('orderRow', NULL, OLD.id);
-    CALL order_requestRecalc(OLD.orderFk);
-END$$
-DELIMITER ;

db/routines/hedera/triggers/orderRow_afterInsert.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterInsert`
-	AFTER INSERT ON `orderRow`
-	FOR EACH ROW
-BEGIN
-	CALL stock.log_add('orderRow', NEW.id, NULL);
-    CALL order_requestRecalc(NEW.orderFk);
-END$$
-DELIMITER ;

db/routines/hedera/triggers/orderRow_afterUpdate.sql

@@ -1,10 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterUpdate`
-	AFTER UPDATE ON `orderRow`
-	FOR EACH ROW
-BEGIN
-	CALL stock.log_add('orderRow', NEW.id, OLD.id);
-    CALL order_requestRecalc(OLD.orderFk);
-    CALL order_requestRecalc(NEW.orderFk);
-END$$
-DELIMITER ;

db/routines/hedera/triggers/order_afterUpdate.sql

@@ -3,14 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_afterUpdate
 	AFTER UPDATE ON `order`
 	FOR EACH ROW
 BEGIN
-	CALL stock.log_add('order', NEW.id, OLD.id);
-    
-    IF !(OLD.address_id <=> NEW.address_id)
-    OR !(OLD.company_id <=> NEW.company_id)
-    OR !(OLD.customer_id <=> NEW.customer_id) THEN
-		CALL order_requestRecalc(NEW.id);
-	END IF;
-
 	IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
 		-- Fallo que se actualiza no se sabe como tickets en este cliente
 		CALL vn.mail_insert(

db/routines/stock/procedures/log_add.sql

@@ -1,21 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_add`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
-proc: BEGIN
-	-- XXX: Disabled while testing
-	LEAVE proc;
-
-	IF vOldId IS NOT NULL AND !(vOldId <=> vNewId) THEN
-		INSERT IGNORE INTO `log` SET
-			tableName = vTableName,
-			tableId = vOldId,
-			operation = 'delete';
-	END IF;
-
-	IF vNewId IS NOT NULL THEN
-		INSERT IGNORE INTO `log` SET
-			tableName = vTableName,
-			tableId = vNewId,
-			operation = 'insert';
-	END IF;
-END$$
-DELIMITER ;

db/routines/util/functions/binlogQueue_getDelay.sql

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

db/routines/util/procedures/slowLog_prune.sql

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

db/routines/vn/events/raidUpdate.sql

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

db/routines/vn/events/ticket_doRecalc.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`ticket_doRecalc`
-	ON SCHEDULE EVERY 10 SECOND
-		STARTS '2022-01-28 09:29:18.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO CALL ticket_doRecalc$$
-DELIMITER ;

db/routines/vn/events/travel_doRecalc.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`travel_doRecalc`
-	ON SCHEDULE EVERY 15 SECOND
-		STARTS '2019-05-17 10:52:29.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO CALL travel_doRecalc$$
-DELIMITER ;

db/routines/vn/functions/getAlert3StateTest.sql

@@ -11,9 +11,9 @@ BEGIN
 	SELECT 
 		a.Vista
 	INTO vDeliveryType 
-		FROM vn2008.Tickets t
+		FROM ticket t
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
+			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
-	WHERE Id_Ticket = vTicket;
+	WHERE t.id = vTicket;
 		
 		CASE vDeliveryType
 			WHEN 1 THEN -- AGENCIAS
@@ -23,11 +23,11 @@ BEGIN
 				SET vCode = 'ON_DELIVERY';
 					
 			ELSE -- MERCADO, OTROS
-				SELECT t.warehouse_id <> w.warehouse_id INTO isWaitingForPickUp
+				SELECT t.warehouseFk <> w.warehouse_id INTO isWaitingForPickUp
-					FROM vn2008.Tickets t 
+					FROM ticket t 
 						LEFT JOIN vn2008.warehouse_pickup w 
-							ON w.agency_id = t.Id_Agencia AND w.warehouse_id = t.warehouse_id
+							ON w.agency_id = t.agencyModeFk AND w.warehouse_id = t.warehouseFk
-					WHERE t.Id_Ticket = vTicket;
+					WHERE t.id = vTicket;
 						
 			IF isWaitingForPickUp THEN
 				SET vCode = 'WAITING_FOR_PICKUP';

db/routines/vn/functions/ticketPositionInPath.sql

@@ -28,10 +28,10 @@ SELECT t.routeFk, t.warehouseFk, IFNULL(ts.productionOrder,0)
 
 SELECT (ag.`name` = 'VN_VALENCIA') 
  INTO vIsValenciaPath
-  FROM vn2008.Rutas r
+  FROM `route` r
-   JOIN vn2008.Agencias a on a.Id_Agencia = r.Id_Agencia
+   JOIN vn2008.Agencias a on a.Id_Agencia = r.agencyModeFk
    JOIN vn2008.agency ag on ag.agency_id = a.agency_id
-  WHERE r.Id_Ruta = vMyPath;
+  WHERE r.id = vMyPath;
 
 IF vIsValenciaPath THEN -- Rutas Valencia
 

db/routines/vn/procedures/addAccountReconciliation.sql

@@ -0,0 +1,66 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`addAccountReconciliation`()
+BEGIN
+/**
+ * Updates duplicate records in the accountReconciliation table,
+ * by assigning them a new identifier and then inserts a new entry in the till table.
+ */
+	UPDATE accountReconciliation ar
+			JOIN (
+				SELECT id,
+						calculatedCode,
+						CONCAT(
+							calculatedCode, 
+							'(', 
+							ROW_NUMBER() OVER (PARTITION BY calculatedCode ORDER BY id),
+							')'
+						) newId
+					FROM accountReconciliation ar
+					WHERE calculatedCode IN (
+						SELECT calculatedCode
+							FROM accountReconciliation
+							GROUP BY calculatedCode
+							HAVING COUNT(*) > 1
+					)
+					ORDER BY calculatedCode, id
+			) sub2 ON ar.id = sub2.id
+		SET ar.calculatedCode = sub2.newId;
+	
+	INSERT INTO till(
+		dated,
+		isAccountable,
+		serie,
+		concept,
+		`in`,
+		`out`,
+		bankFk,
+		companyFk,
+		warehouseFk,
+		supplierAccountFk,
+		calculatedCode,
+		InForeignValue,
+		OutForeignValue,
+		workerFk
+	)
+		SELECT ar.operationDated,
+				TRUE,
+				'MB',
+				ar.concept, 
+				IF(ar.debitCredit = 'credit' AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				IF(ar.debitCredit = 'debit' AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				a.id,
+				sa.supplierFk,
+				arc.warehouseFk,
+				ar.supplierAccountFk,
+				ar.calculatedCode,
+				IF(ar.debitCredit = 'credit' AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				IF(ar.debitCredit = 'debit' AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				account.myUser_getId()
+			FROM accountReconciliation ar
+				JOIN supplierAccount sa ON sa.id = ar.supplierAccountFk
+				JOIN accounting a ON a.id = sa.accountingFk
+				LEFT JOIN till t ON t.calculatedCode = ar.calculatedCode
+				JOIN accountReconciliationConfig arc
+			WHERE t.id IS NULL;
+END$$
+DELIMITER ;

db/routines/vn/procedures/agencyVolume.sql

@@ -0,0 +1,38 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`agencyVolume`()
+BEGIN
+/**
+ * Calculates and presents information on shipment and packaging volumes 
+ * for agencies that are not owned for a specific period.
+ */
+	DECLARE vStarted DATETIME DEFAULT util.VN_CURDATE();
+	DECLARE vEnded DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
+
+	SELECT ag.id agency_id,
+			CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia,
+			COUNT(*) expediciones,
+			SUM(t.packages) Bultos,
+			SUM(tpe.boxes) Faltan
+		FROM ticket t
+			JOIN warehouse w ON w.id = t.warehouseFk
+			JOIN country c ON w.countryFk = c.id
+			JOIN address a ON a.id = t.addressFk
+			JOIN agencyMode am ON am.id = t.agencyModeFk
+			JOIN agency ag ON ag.id = am.agencyFk
+			JOIN (
+				SELECT sv.ticketFk, 
+						CEIL(1000 * SUM(sv.volume) / vc.standardFlowerBox) boxes
+					FROM ticket t
+						JOIN saleVolume sv ON sv.ticketFk = t.id
+						JOIN volumeConfig vc
+					WHERE t.shipped BETWEEN vStarted AND vEnded
+						AND (t.packages IS NULL OR NOT t.packages)
+					GROUP BY t.id
+			) tpe ON tpe.ticketFk = t.id
+		WHERE t.shipped BETWEEN vStarted AND vEnded
+			AND NOT ag.isOwn
+		GROUP BY ag.id
+		ORDER BY Agencia;
+
+END$$
+DELIMITER ;

db/routines/vn/procedures/catalog_componentCalculate.sql

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

db/routines/vn/procedures/client_getRisk.sql

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

db/routines/vn/procedures/collectionPlacement_get.sql

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

db/routines/vn/procedures/collection_assign.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
 )
-proc:BEGIN   
+BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
  * al perfil del usuario y le asigna la más antigua.
@@ -13,11 +13,16 @@ proc:BEGIN
  * @param vCollectionFk Id de colección
  */
 	DECLARE vHasTooMuchCollections BOOL;
-	DECLARE vLockTime INT DEFAULT 15;
+	DECLARE vItemPackingTypeFk VARCHAR(1);
+	DECLARE vWarehouseFk INT;
+	DECLARE vLockName VARCHAR(215);
+	DECLARE vLockTime INT DEFAULT 30;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		DO RELEASE_LOCK('collection_assign');
+		IF vLockName IS NOT NULL THEN
+			DO RELEASE_LOCK(vLockName);
+		END IF;
 		
 		RESIGNAL;
 	END;
@@ -28,17 +33,27 @@ proc:BEGIN
 	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
 		INTO vHasTooMuchCollections
 		FROM tCollection
-			JOIN productionConfig pc ;
+			JOIN productionConfig pc;
 
 	DROP TEMPORARY TABLE tCollection;
 
 	IF vHasTooMuchCollections THEN
 		CALL util.throw('Hay colecciones pendientes');
-		LEAVE proc;
 	END IF;
 
-	IF NOT GET_LOCK('collection_assign',vLockTime) THEN
+	SELECT warehouseFk, itemPackingTypeFk
-		LEAVE proc;
+		INTO vWarehouseFk, vItemPackingTypeFk
+		FROM operator
+		WHERE workerFk = vUserFk;
+
+	SET vLockName = CONCAT_WS('/',
+		'collection_assign',
+		vWarehouseFk,
+		vItemPackingTypeFk
+	);
+
+	IF NOT GET_LOCK(vLockName, vLockTime) THEN
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se eliminan las colecciones sin asignar que estan obsoletas
@@ -90,6 +105,6 @@ proc:BEGIN
 		SET workerFk = vUserFk
 		WHERE id = vCollectionFk;
 
-	DO RELEASE_LOCK('collection_assign');
+	DO RELEASE_LOCK(vLockName);
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_new.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_new`(vUserFk INT, OUT vCollectionFk INT)
-proc:BEGIN
+BEGIN
 /**
  * Genera colecciones de tickets sin asignar trabajador.
  *
@@ -26,7 +26,7 @@ proc:BEGIN
 	DECLARE vHasUniqueCollectionTime BOOL;
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 15;
+	DECLARE vLockTime INT DEFAULT 30;
 	DECLARE vFreeWagonFk INT;
 
 	DECLARE c1 CURSOR FOR
@@ -86,7 +86,7 @@ proc:BEGIN
 	);
 
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		LEAVE proc;
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se prepara el tren, con tantos vagones como sea necesario.

db/routines/vn/procedures/company_getSuppliersDebt.sql

@@ -189,10 +189,10 @@ BEGIN
 			LEFT JOIN supplier s ON s.id = vp.supplierFk
 			LEFT JOIN client c ON c.fi = s.nif
 			LEFT JOIN clientRisk cr ON cr.clientFk = c.id 
+				AND cr.companyFk = vp.companyFk
 			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
 			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
-            LEFT JOIN country co ON co.id = be.countryFk
+			LEFT JOIN country co ON co.id = be.countryFk;
-                AND cr.companyFk = vp.companyFk;
 
 	DROP TEMPORARY TABLE tOpeningBalances;
 	DROP TEMPORARY TABLE tPendingDuedates;

db/routines/vn/procedures/creditInsurance_getRisk.sql

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

db/routines/vn/procedures/creditRecovery.sql

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

db/routines/vn/procedures/entry_checkBooked.sql

@@ -15,7 +15,7 @@ BEGIN
 		FROM `entry`
 		WHERE id = vSelf;
 
-	IF vIsBooked THEN
+	IF vIsBooked AND NOT @isModeInventory THEN
 		CALL util.throw('Entry is already booked');
 	END IF;
 END$$

db/routines/vn/procedures/inventoryMake.sql

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

db/routines/vn/procedures/invoiceFromAddress.sql

@@ -8,12 +8,15 @@ BEGIN
 
 	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;
 
-	CREATE TEMPORARY TABLE `tmp.``ticketToInvoice`
+	CREATE TEMPORARY TABLE `tmp`.`ticketToInvoice`
 		(PRIMARY KEY  (`id`))
 		ENGINE = MEMORY
-		SELECT Id_Ticket id FROM vn2008.Tickets WHERE (Fecha BETWEEN vMinDateTicket
+		SELECT id 
-			AND vMaxTicketDate) AND Id_Consigna = vAddress
+			FROM ticket 
-            AND Factura IS NULL AND empresa_id = vCompany;
+			WHERE (shipped BETWEEN vMinDateTicket AND vMaxTicketDate) 
+				AND addressFk = vAddress
+				AND refFk IS NULL 
+				AND companyFk = vCompany;
 
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceInTax_afterUpsert.sql

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

db/routines/vn/procedures/invoiceInTax_getFromEntries.sql

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

db/routines/vn/procedures/invoiceIn_checkBooked.sql

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

db/routines/vn/procedures/itemShelving_add.sql

@@ -21,7 +21,6 @@ BEGIN
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	
 	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
-
 	SET vQuantity = vQuantity * vPacking;
 
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN

db/routines/vn/procedures/itemShelving_addList.sql

@@ -39,7 +39,7 @@ BEGIN
 		UPDATE vn.itemShelving
 			SET isChecked = vIsChecked
 			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
-				AND itemFk = vItemFk;
+				AND itemFk = vItemFk AND isChecked IS NULL;
 
 		SET vCounter = vCounter + 1;
 	END WHILE;

db/routines/vn/procedures/item_getSimilar.sql

@@ -61,11 +61,12 @@ BEGIN
 			a.available,
 			IFNULL(ip.counter, 0) `counter`,
 			CASE
-				WHEN b.groupingMode = 1 THEN b.grouping
+				WHEN b.groupingMode = 'grouping' THEN b.grouping
-				WHEN b.groupingMode = 2 THEN b.packing
+				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
 			END AS minQuantity,
-			iss.visible located
+			iss.visible located,
+			b.price2
 		FROM vn.item i
 			JOIN cache.available a ON a.item_id = i.id
 				AND a.calc_id = vCalcFk

db/routines/vn/procedures/item_setVisibleDiscard.sql

@@ -13,6 +13,7 @@ BEGIN
  * @param vQuantity a dar de alta/baja
  * @param vAddressFk id address
  */
+
 	DECLARE vTicketFk INT;
 	DECLARE vClientFk INT;
 	DECLARE vDefaultCompanyFk INT;
@@ -33,7 +34,7 @@ BEGIN
 
 	SELECT a.clientFk INTO vClientFk
 		FROM address a
-		WHERE a.id = vAddressFk;
+		WHERE a.id = vAddressShortage;
 
 	SELECT t.id INTO vTicketFk
 		FROM ticket t
@@ -65,7 +66,7 @@ BEGIN
 	INSERT INTO sale(ticketFk, itemFk, concept, quantity)
 		SELECT vTicketFk,
 				vItemFk,
-				CONCAT(longName,' ', worker_getCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+				name,
 				vQuantity
 			FROM item
 			WHERE id = vItemFk;

db/routines/vn/procedures/raidUpdate.sql

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

db/routines/vn/procedures/rateView.sql

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

db/routines/vn/procedures/recipe_Cook.sql

@@ -1,74 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`recipe_Cook`(vItemFk INT, vBunchesQuantity INT, vDate DATE)
-BEGIN
-
-	DECLARE vCalc INT;
-    DECLARE vWarehouseFk INT DEFAULT 1; -- Silla FV
-
-	SET @element := '';
-    SET @counter := 0;
-
-	CALL cache.available_refresh(vCalc, FALSE, vWarehouseFk, vDate);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.recipeCook;
-    
-    CREATE TEMPORARY TABLE tmp.recipeCook
-    SELECT *,
-            @counter := IF(@element = element COLLATE utf8_general_ci , @counter + 1, 1) as counter,
-            @element := element COLLATE utf8_general_ci
-		FROM
-			(
-			SELECT 	i.id itemFk,
-					CONCAT(i.longName, ' (ref: ',i.id,')') longName,
-					i.size,
-					i.inkFk,
-					a.available,
-					r.element,
-					vBunchesQuantity * r.quantity as quantity,
-					r.itemFk as bunchItemFk,
-					IFNULL((i.inkFk = r.inkFk ) ,0)
-						+ IFNULL((i.size = r.size) ,0)
-                        + IFNULL((i.name LIKE CONCAT('%',r.name,'%')) ,0)
-                        + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0) 
-                        + IFNULL((i.typeFk = r.typeFk),0) as matches,
-                    i.typeFk,
-                    rl.previousSelected
-				FROM vn.recipe r 
-					JOIN vn.item i ON (IFNULL(i.name LIKE CONCAT('%',r.name,'%'), 0)
-									OR IFNULL(i.longName LIKE CONCAT('%',r.longName,'%'),0))
-									OR i.typeFk <=> r.typeFk
-					JOIN cache.available a ON a.item_id = i.id AND a.calc_id = vCalc
-                    LEFT JOIN (SELECT recipe_ItemFk, element as log_element, selected_ItemFk, count(*) as previousSelected
-									FROM vn.recipe_log
-                                    GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk 
-																						AND rl.log_element = r.element
-                                                                                        AND rl.selected_ItemFk = i.id
-				WHERE r.itemFk = vItemFk
-					AND a.available > vBunchesQuantity * r.quantity 
-			 UNION ALL
-				 SELECT 100 itemFk,
-							CONCAT('? ',r.element,' ',IFNULL(r.size,''),' ',IFNULL(r.inkFk,'')) as longName,
-							NULL,
-							NULL,
-							0,
-							r.element,
-							vBunchesQuantity * r.quantity as quantity,
-							r.itemFk as bunchItemFk,
-					  -1 as matches,
-                      r.typeFk,
-                      NULL
-					FROM vn.recipe r
-					WHERE r.itemFk = vItemFk
-                    GROUP BY r.element
-			) sub
-             
-            ORDER BY element, matches DESC, previousSelected DESC;
- 
-		SELECT * 
-			FROM tmp.recipeCook
-			WHERE counter < 6
-            OR itemFk = 100 
-            ;
-    
-END$$
-DELIMITER ;

db/routines/vn/procedures/riskAllClients.sql

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

db/routines/vn/procedures/sale_replaceItem.sql

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

db/routines/vn/procedures/ticket_doCmr.sql

@@ -29,7 +29,6 @@ BEGIN
 				JOIN province p ON p.id = a.provinceFk
 				JOIN country co ON co.id = p.countryFk
 				JOIN agencyMode am ON am.id = t.agencyModeFk
-				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 				JOIN company com ON com.id = t.companyFk
 				JOIN client c2 ON c2.id = com.clientFk
@@ -38,12 +37,10 @@ BEGIN
 				LEFT JOIN route r ON r.id = t.routeFk
 				LEFT JOIN worker wo ON wo.id = r.workerFk
 				LEFT JOIN vehicle v ON v.id = r.vehicleFk
-			WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
+			WHERE al.code IN ('PACKED', 'DELIVERED')
-				AND al.code IN ('PACKED', 'DELIVERED')
 				AND co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
-				AND dm.code = 'DELIVERY'
 				AND t.id = vSelf
 			GROUP BY t.id;
 	

db/routines/vn/procedures/ticket_doRecalc.sql

@@ -1,53 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRecalc`()
-proc: BEGIN
-/**
- * Recalculates modified ticket.
- */
-	DECLARE vDone BOOL;
-	DECLARE vTicketFk INT;
-
-	DECLARE cCur CURSOR FOR
-		SELECT DISTINCT ticketFk FROM tTicket;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('vn.ticket_doRecalc');
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	IF !GET_LOCK('vn.ticket_doRecalc', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	DROP TEMPORARY TABLE IF EXISTS tTicket;
-	CREATE TEMPORARY TABLE tTicket
-		ENGINE = MEMORY
-		SELECT id, ticketFk FROM ticketRecalc;
-
-	OPEN cCur;
-
-	myLoop: LOOP
-		SET vDone = FALSE;
-		FETCH cCur INTO vTicketFk;
-
-		IF vDone THEN
-			LEAVE myLoop;
-		END IF;
-
-		CALL ticket_recalc(vTicketFk, NULL);
-	END LOOP;
-
-	CLOSE cCur;
-
-	DELETE tr FROM ticketRecalc tr JOIN tTicket t ON tr.id = t.id;
-
-	DROP TEMPORARY TABLE tTicket;
-
-	DO RELEASE_LOCK('vn.ticket_doRecalc');
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_recalcByScope.sql

@@ -0,0 +1,40 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_recalcByScope`(
+	vScope VARCHAR(255),
+	vId INT
+)
+BEGIN
+/**
+ * Recalculates tickets in an scope.
+ *
+ * @param vScope The scope name
+ * @param vId The scope id
+ */
+	DECLARE vDone BOOL;
+	DECLARE vTicketFk INT;
+
+	DECLARE cTickets CURSOR FOR
+		SELECT id FROM ticket
+			WHERE refFk IS NULL
+				AND ((vScope = 'client' AND clientFk = vId)
+					OR (vScope = 'address' AND addressFk = vId));
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+
+	OPEN cTickets;
+
+	myLoop: LOOP
+		SET vDone = FALSE;
+		FETCH cTickets INTO vTicketFk;
+
+		IF vDone THEN
+			LEAVE myLoop;
+		END IF;
+
+		CALL ticket_recalc(vTicketFk, NULL);
+	END LOOP;
+
+	CLOSE cTickets;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_requestRecalc.sql

@@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_requestRecalc`(vSelf INT)
-proc: BEGIN
-/**
- * Adds a request to recalculate the ticket total.
- *
- * @param vSelf The ticket identifier
- */
-	IF vSelf IS NULL THEN
-		LEAVE proc;
-	END IF;
-
-	INSERT INTO ticketRecalc SET ticketFk = vSelf;
-END$$
-DELIMITER ;

db/routines/vn/procedures/travel_doRecalc.sql

@@ -1,34 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_doRecalc`()
-proc: BEGIN
-/**
-* Recounts the number of entries of changed travels.
-*/
-	DECLARE vTravelFk INT;
-	
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('vn.ticket_doRecalc');
-	END;
-
-	IF !GET_LOCK('vn.travel_doRecalc', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tTravel
-		ENGINE = MEMORY
-		SELECT travelFk FROM travelRecalc;
-
-	UPDATE travel t
-		JOIN tTravel tt ON tt.travelFk = t.id
-		SET t.totalEntries = (
-			SELECT COUNT(e.id) 
-				FROM entry e 
-				WHERE e.travelFk = t.id
-		);
-
-	DELETE tr FROM travelRecalc tr JOIN tTravel t ON tr.travelFk = t.travelFk;
-	DROP TEMPORARY TABLE tTravel;
-	DO RELEASE_LOCK('vn.travel_doRecalc');
-END$$
-DELIMITER ;

db/routines/vn/procedures/travel_recalc.sql

@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_recalc`(vSelf INT)
+proc: BEGIN
+/**
+ * Updates the number of entries assigned to the travel.
+ *
+ * @param vSelf The travel id
+ */
+	UPDATE travel
+		SET totalEntries = (
+			SELECT COUNT(id)
+				FROM entry
+				WHERE travelFk = vSelf
+		)
+		WHERE id = vSelf;
+END$$
+DELIMITER ;

db/routines/vn/procedures/travel_requestRecalc.sql

@@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_requestRecalc`(vSelf INT)
-proc: BEGIN
-/**
- * Adds a request to recount the number of entries for the travel.
- *
- * @param vSelf The travel reference
- */
-	IF vSelf IS NULL THEN
-		LEAVE proc;
-	END IF;
-    
-    INSERT IGNORE INTO travelRecalc SET travelFk = vSelf;
-END$$
-DELIMITER ;

db/routines/vn/triggers/accountReconciliation_beforeInsert.sql

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

db/routines/vn/triggers/address_afterUpdate.sql

@@ -19,18 +19,14 @@ BEGIN
 				WHERE id = NEW.clientFk;
 		END IF;
 	END IF;
+
 	IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN
 		CALL util.throw ('Cannot desactivate the default address');
 	END IF;
 
-	IF NOT (NEW.isEqualizated <=> OLD.isEqualizated) THEN
+	IF (NEW.clientFk <> OLD.clientFk
-		INSERT IGNORE INTO ticketRecalc (ticketFk)
+		OR NEW.isActive <> OLD.isActive
-			SELECT id FROM ticket t 
+		OR NOT (NEW.provinceFk <=> OLD.provinceFk))
-				WHERE t.addressFk = NEW.id
-					AND t.refFk IS NULL;
-	END IF;
-
-	IF (NEW.clientFk <> OLD.clientFk OR NEW.isActive <> OLD.isActive  OR NOT (NEW.provinceFk <=> OLD.provinceFk))
 	AND (SELECT client_hasDifferentCountries(NEW.clientFk)) THEN
 		UPDATE client
 			SET hasToInvoiceByAddress = TRUE

db/routines/vn/triggers/buy_afterDelete.sql

@@ -3,19 +3,14 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterDelete`
 	AFTER DELETE ON `buy`
 	FOR EACH ROW
 trig: BEGIN
-	DECLARE vValues VARCHAR(255);
-
 	IF @isModeInventory OR @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
 
-	CALL stock.log_add('buy', NULL, OLD.id);
-
 	INSERT INTO entryLog
 		SET `action` = 'delete',
 			`changedModel` = 'Buy',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/buy_afterInsert.sql

@@ -7,8 +7,6 @@ trig: BEGIN
 		LEAVE trig;
 	END IF;
 
-	CALL stock.log_add('buy', NEW.id, NULL);
-
 	CALL buy_afterUpsert(NEW.id);
 END$$
 DELIMITER ;

db/routines/vn/triggers/buy_afterUpdate.sql

@@ -12,14 +12,6 @@ trig: BEGIN
 		LEAVE trig;
 	END IF;
 
-	IF !(NEW.id <=> OLD.id)
-	OR !(NEW.entryFk <=> OLD.entryFk)
-	OR !(NEW.itemFk <=> OLD.itemFk)
-	OR !(NEW.quantity <=> OLD.quantity)
-	OR !(NEW.created <=> OLD.created) THEN
-		CALL stock.log_add('buy', NEW.id, OLD.id);
-	END IF;
-
 	CALL buy_afterUpsert(NEW.id);
 
 	SELECT w.isBuyerToBeEmailed, t.landed

db/routines/vn/triggers/buy_beforeInsert.sql

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