.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,7 +5,13 @@ 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.18.01] - 2024-05-02
+## [24.20.01] - 2024-05-14
+
+### Fixed
+- (Worker -> time-control) Corrección de errores
+- (InvoiceOut -> Crear factura) Cuando falla al crear una factura, se devuelve un error
+
+## [24.18.01] - 2024-05-07
 
 ## [24.16.01] - 2024-04-18
 

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/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/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

@@ -124,6 +124,9 @@
     "Postcode": {
         "dataSource": "vn"
     },
+    "ReferenceRate": {
+        "dataSource": "vn"
+    },
     "SageWithholding": {
         "dataSource": "vn"
     },
@@ -174,5 +177,14 @@
     },
     "WorkerActivityType": {
         "dataSource": "vn"
+    },
+    "ProductionConfig": {
+        "dataSource": "vn"
+    },
+    "AgencyLog": {
+        "dataSource": "vn"
+    },
+    "AgencyWorkCenter": {
+        "dataSource": "vn"
     }
-}
+}

back/models/agency-log.json

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

back/models/agency-workCenter.js

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

back/models/agency-workCenter.json

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

back/models/collection.json

@@ -1,6 +1,11 @@
 {
     "name": "Collection",
     "base": "VnModel",
+    "options": {
+		"mysql": {
+			"table": "collection"
+		}
+	},
     "acls": [{
         "property": "validations",
         "accessType": "EXECUTE",
@@ -9,4 +14,3 @@
         "permission": "ALLOW"
 	}]
 }
-  

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/reference-rate.json

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

back/models/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);
 
@@ -145,7 +146,7 @@ INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)
         ('2', 'No supera PP empresa'),
         ('3', 'Despido');
 
-INSERT INTO `vn2008`.`payroll_categorias` (`codcategoria`, `descripcion`, `Tarifa`)
+INSERT INTO `vn`.`payrollCategories` (`id`, `description`, `rate`)
     VALUES
         ('11', 'INFORMATICA', '2'),
         ('12', 'AUX INFORMATICA', '7');
@@ -156,16 +157,6 @@ INSERT INTO `vn`.`occupationCode` (`code`, `name`)
         ('b', 'Representantes de comercio'),
         ('c', 'Personal de oficios en trabajos de construcción en general, y en instalac.,edificios y obras');
 
-INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`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

@@ -11,7 +11,6 @@ CREATE ROLE 'salix';
 GRANT 'salix' TO 'root'@'%';
 SET DEFAULT ROLE 'salix' FOR 'root'@'%';
 
-CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
 UPDATE `util`.`config`
@@ -160,7 +159,8 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
         (1, 'EUR', 'Euro',          1),
         (2, 'USD', 'Dollar USA',    1.4),
         (3, 'GBP', 'Libra',         1),
-        (4, 'JPY', 'Yen Japones',   1);
+        (4, 'JPY', 'Yen Japones',   1),
+        (5, 'CNY',  'Yuan Chino',   1.2);
 
 INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
     VALUES
@@ -198,7 +198,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
-UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+UPDATE `vn`.`sector` SET `backupPrinterFk` = 1 WHERE id = 1;
 
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
@@ -371,20 +371,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
         (4, 'GCN Channel'),
         (5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
     VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
-        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
-        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
-        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist','normal'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
-        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 'florist','normal'),
-        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses');
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -527,7 +527,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (4, 'SalesPerson',      'salesPerson'),
         (5, 'Administrative',   'administrative'),
         (6, 'Weight',           'weight'),
-        (7, 'InvoiceOut',       'invoiceOut');
+        (7, 'InvoiceOut',       'invoiceOut'),
+        (8, 'DropOff',           'dropOff');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -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`)
@@ -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
@@ -3223,7 +3256,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3261,7 +3294,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 40,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3299,7 +3332,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 10,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3345,7 +3378,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 4,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3383,7 +3416,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 20,
 		`grouping` = 1,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3422,7 +3455,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 200,
 		`grouping` = 30,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3461,7 +3494,7 @@ INSERT INTO vn.buy
 		stickers = 1,
 		packing = 500,
 		`grouping` = 10,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3500,7 +3533,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 300,
 		`grouping` = 50,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3539,7 +3572,7 @@ INSERT INTO vn.buy
 		stickers = 2,
 		packing = 50,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3579,7 +3612,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 5,
 		`grouping` = 2,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3618,7 +3651,7 @@ INSERT vn.buy
 		stickers = 1,
 		packing = 100,
 		`grouping` = 5,
-		groupingMode = 1,
+		groupingMode = 'packing',
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3734,10 +3767,9 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 	VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
 
 INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
-    VALUES
+    VALUES (1, 10, 9);
-        (1, 10, 9);
 
-INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created) 
+INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
 	VALUES
 		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
 		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
@@ -3748,6 +3780,13 @@ INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,value
 		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
 		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
 
-INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk) 
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
-	VALUES
+	VALUES (1, 1);
-		(1, 1);
+
+
+INSERT INTO vn.workerTeam(id, team, workerFk)
+    VALUES
+        (8, 1, 19);
+
+INSERT INTO vn.workCenter (id, name, payrollCenterFk, counter, warehouseFk, street, geoFk, deliveryManAdjustment) 
+    VALUES(100, 'workCenterOne', 1, NULL, 1, 'gotham', NULL, NULL);

db/routines/bi/procedures/Greuge_Evolution_Add.sql

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

db/routines/bi/procedures/analisis_ventas_evolution_add.sql

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

db/routines/bi/procedures/analisis_ventas_update.sql

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

db/routines/bi/procedures/claim_ratio_routine.sql

@@ -13,64 +13,63 @@ BEGIN
 
 	INSERT INTO vn.greuge(shipped, clientFk, description,
 					amount, greugeTypeFk, ticketFk)
-		SELECT cm.Fecha
+		SELECT c.ticketCreated
-			, cm.Id_Cliente
+			, c.clientFk
-			, concat('Claim ',cm.id,' : ', m.Concepte)
+			, concat('Claim ', c.id,' : ', s.concept)
-			,round( -1 * ((sensib -1)/4) * Cantidad *
+			,round( -1 * ((c.responsibility -1)/4) * s.quantity *
-				Preu * (100 - Descuento) / 100, 2) AS Reclamaciones
+				s.price * (100 - s.discount) / 100, 2)
 			, 4
-			, m.Id_Ticket
+			, s.ticketFk
-			FROM vn2008.Movimientos m
+			FROM vn.sale s
-				JOIN vn2008.cl_act ca USING(Id_Movimiento)
+				JOIN vn.claimEnd ce ON ce.saleFk = s.id
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
+				JOIN vn.claim c ON c.id = ce.claimFk
-			WHERE ca.cl_sol_id  NOT IN (1,5)
+			WHERE ce.claimDestinationFk NOT IN (1,5)
-				AND ca.greuge = 0
+				AND NOT ce.isGreuge
-				AND cm.cl_est_id = 3;
+				AND c.claimStateFk = 3;
 
 	-- Reclamaciones que pasan a Maná
 
 	INSERT INTO vn.greuge(shipped, clientFk, description,
 					amount, greugeTypeFk, ticketFk)
-		SELECT cm.Fecha
+		SELECT c.ticketCreated
-			, cm.Id_Cliente
+			, c.clientFk
-			, concat('Claim_mana ',cm.id,' : ', m.Concepte)
+			, concat('Claim_mana ',c.id,' : ', s.concept)
-			,round( ((sensib -1)/4) * Cantidad * Preu * (100 - Descuento) / 100, 2)
+			,round( ((c.responsibility -1)/4) * s.quantity * s.price * (100 - s.discount) / 100, 2)
-				AS Reclamaciones
 			,3
-			,m.Id_Ticket
+			,s.ticketFk
-			FROM vn2008.Movimientos m
+			FROM vn.sale s
-				JOIN vn2008.cl_act ca USING(Id_Movimiento)
+				JOIN vn.claimEnd ce ON ce.saleFk = s.id
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
+				JOIN vn.claim c ON c.id = ce.claimFk
-			WHERE ca.cl_sol_id  NOT IN (1,5)
+			WHERE ce.claimDestinationFk NOT IN (1,5)
-				AND ca.greuge = 0
+				AND NOT ce.isGreuge
-				AND cm.cl_est_id = 3
+				AND c.claimStateFk = 3
-				AND cm.mana;
+				AND c.isChargedToMana;
 
 	-- Marcamos para no repetir
-	UPDATE vn2008.cl_act ca
+	UPDATE vn.claimEnd ce
-				JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
+				JOIN vn.claim c ON c.id = ce.claimFk
-			SET greuge = 1
+			SET c.isChargedToMana = TRUE
-			WHERE ca.cl_sol_id  NOT IN (1,5)
+			WHERE ce.claimDestinationFk NOT IN (1,5)
-				AND ca.greuge = 0
+				AND NOT ce.isGreuge
-				AND cm.cl_est_id = 3;
+				AND c.claimStateFk = 3;
 
 	-- Recobros
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list
 	(PRIMARY KEY (Id_Ticket))
-	SELECT DISTINCT t.Id_Ticket
+	SELECT DISTINCT t.id Id_Ticket
-			FROM vn2008.Movimientos_componentes mc
+			FROM vn.saleComponent sc
-				JOIN vn2008.Movimientos m ON mc.Id_Movimiento = m.Id_Movimiento
+				JOIN vn.sale s ON sc.saleFk = s.id
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+				JOIN vn.ticket t ON t.id = s.ticketFk
-				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 st ON st.id = tt.stateFk
-			WHERE mc.Id_Componente = 17
+			WHERE sc.componentFk = 17
-				AND mc.greuge = 0
+				AND sc.isGreuge = 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 st.alertLevel >= 3;
 
 	DELETE g.*
 			FROM vn.greuge g
@@ -79,25 +78,25 @@ 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)
+				,concat('recobro ', s.ticketFk), - round(SUM(sc.value*s.quantity),2)
-					AS dif
+				AS dif,
-				,date(t.Fecha)
+				date(t.shipped)
 				, 2
 				,tt.Id_Ticket
-			FROM vn2008.Movimientos m
+			FROM vn.sale s
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+				JOIN vn.ticket t ON t.id = s.ticketFk
-				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
+				JOIN vn.saleComponent sc
-					ON mc.Id_Movimiento = m.Id_Movimiento AND mc.Id_Componente = 17
+					ON sc.saleFk = s.id AND sc.componentFk = 17
-			GROUP BY t.Id_Ticket
+			GROUP BY t.id
 				HAVING ABS(dif) > 1;
 
-	UPDATE vn2008.Movimientos_componentes mc
+	UPDATE vn.saleComponent sc
-				JOIN vn2008.Movimientos m ON m.Id_Movimiento = mc.Id_Movimiento
+				JOIN vn.sale s ON s.id = sc.saleFk
-				JOIN tmp.ticket_list tt ON tt.Id_Ticket = m.Id_Ticket
+				JOIN tmp.ticket_list tt ON tt.Id_Ticket = s.ticketFk
-			SET greuge = 1
+			SET sc.isGreuge = 1
-			WHERE Id_Componente = 17;
+			WHERE sc.componentFk = 17;
 
 	/*
 	* Recalculamos la ratio de las reclamaciones, que luego
@@ -105,26 +104,25 @@ BEGIN
 	*/
 
 	REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro)
-		SELECT Id_Cliente, 0,0,0,0
+		SELECT id, 0,0,0,0
-		FROM vn2008.Clientes;
+		FROM vn.client;
 
 	REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro)
 		SELECT fm.Id_Cliente, 12 * fm.Consumo, Reclamaciones,
-				round(Reclamaciones / (12*fm.Consumo),4) AS Ratio, 0
+				round(Reclamaciones / (12*fm.Consumo),4), 0
 			FROM bi.facturacion_media_anual fm
 				LEFT JOIN(
-					SELECT cm.Id_Cliente, round(sum(-1 * ((sensib -1)/4) *
+					SELECT c.clientFk, round(sum(-1 * ((c.responsibility -1)/4) *
-							Cantidad * Preu * (100 - Descuento) / 100))
+							s.quantity * s.price * (100 - s.discount) / 100))
 							AS Reclamaciones
-						FROM vn2008.Movimientos m
+						FROM vn.sale s
-							JOIN vn2008.cl_act ca
+							JOIN vn.claimEnd ce ON ce.saleFk = s.id
-								ON ca.Id_Movimiento = m.Id_Movimiento
+							JOIN vn.claim c ON c.id = ce.claimFk
-							JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id
+						WHERE ce.claimDestinationFk NOT IN (1,5)
-						WHERE ca.cl_sol_id  NOT IN (1,5)
+							AND c.claimStateFk = 3
-							AND cm.cl_est_id = 3
+							AND c.ticketCreated >= TIMESTAMPADD(YEAR, -1, util.VN_CURDATE())
-							AND cm.Fecha >= TIMESTAMPADD(YEAR, -1, util.VN_CURDATE())
+						GROUP BY c.clientFk
-						GROUP BY cm.Id_Cliente
+						) claims ON claims.clientFk = fm.Id_Cliente;
-						) claims ON claims.Id_Cliente = fm.Id_Cliente;
 
 
 	-- Calculamos el porcentaje del recobro para añadirlo al precio de venta
@@ -153,7 +151,7 @@ BEGIN
 	-- CLIENTE 5523, VERDECORA
 	UPDATE bi.claims_ratio SET recobro = GREATEST(0.12, recobro) WHERE Id_Cliente = 5523;
 
-    -- CLIENTE 15979, SERVEIS VETERINARIS
+	-- CLIENTE 15979, SERVEIS VETERINARIS
 	UPDATE bi.claims_ratio SET recobro = GREATEST(0.05, recobro) WHERE Id_Cliente = 15979;
 
 	-- CLIENTE 5189 i 8942, son de CSR i son el mateix client

db/routines/bi/procedures/clean_launcher.sql

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

db/routines/bi/procedures/comparativa_add.sql

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

db/routines/bi/procedures/comparativa_add_manual.sql

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

db/routines/bi/procedures/defaultersFromDate.sql

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

db/routines/bi/procedures/defaulting.sql

@@ -2,21 +2,22 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE)
 BEGIN
 	DECLARE vDone BOOLEAN;
-    DECLARE vClient INT;
+	DECLARE vClient INT;
-    DECLARE vAmount INT;
+	DECLARE vAmount INT;
-    DECLARE vDued DATE;
+	DECLARE vDued DATE;
-    DECLARE vAmountInvoice DECIMAL(10,2);
+	DECLARE vAmountInvoice DECIMAL(10,2);
-    DECLARE vGraceDays INT;
+	DECLARE vGraceDays INT;
 	DECLARE defaulters CURSOR FOR
-		SELECT client, amount, graceDays FROM bi.defaulters d 
+		SELECT d.client, d.amount, pm.graceDays
-				JOIN vn2008.Clientes c ON c.Id_Cliente = d.client
+			FROM bi.defaulters d 
-                JOIN vn2008.pay_met pm ON pm.id = c.pay_met_id
+				JOIN vn.client c ON c.id = d.client
-                WHERE hasChanged AND date = vDate;
+				JOIN vn.payMethod pm ON pm.id = c.payMethodFk
-        
+			WHERE hasChanged AND date = vDate;
+		
 	DECLARE invoices CURSOR FOR
 		SELECT dued Vencimiento, amount importe FROM vn.invoiceOut
 			WHERE issued >= '2016-01-01' AND clientFk = vClient ORDER BY issued DESC;
-        
+		
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	DELETE FROM bi.defaulters WHERE date = vDate;
@@ -26,7 +27,7 @@ BEGIN
 			FROM vn.`client` c
 				LEFT JOIN bi.customerRiskOverdue cro ON c.id = cro.customer_id
 			GROUP BY c.id;
-    
+	
 	-- marcamos si ha cambiado y heredamos la fecha defaulterSince
 	UPDATE bi.defaulters d
 		LEFT JOIN (
@@ -35,16 +36,16 @@ BEGIN
 					WHERE date <= TIMESTAMPADD(DAY,-1, vDate)
 					ORDER BY date DESC
 					LIMIT 10000000000000000000) t GROUP BY client
-		  ) yesterday using(client)
+		) yesterday using(client)
 	SET d.hasChanged = (IFNULL(d.amount,0) <> IFNULL(yesterday.amount,0)),
 		d.defaulterSince = yesterday.defaulterSince,
-        d.frozened = yesterday.frozened
+		d.frozened = yesterday.frozened
 	WHERE d.date = vDate ;
-     
+	
-    OPEN defaulters;
+	OPEN defaulters;
 	defaulters: LOOP
 		SET vDone = FALSE;
-        SET vAmount = 0;
+		SET vAmount = 0;
 		FETCH defaulters INTO vClient,vAmount, vGraceDays;
 		IF vDone THEN
 			LEAVE defaulters;
@@ -60,7 +61,7 @@ BEGIN
 			IF TIMESTAMPADD(DAY, vGraceDays, vDued) <= vDate THEN
 				SET vAmount = vAmount - vAmountInvoice;
 				IF vAmount <= 0 THEN
-                                    
+									
 					UPDATE defaulters SET defaulterSince = vDued
 						WHERE client = vClient and date = vDate;
 						
@@ -73,20 +74,20 @@ BEGIN
 	END LOOP;
 		CLOSE defaulters;
 	
-    DELETE FROM defaulters
+	DELETE FROM defaulters
 		WHERE amount = 0 
 			AND hasChanged = FALSE
-            AND `date` = vDate;
+			AND `date` = vDate;
-        
+		
-    UPDATE defaulters d
+	UPDATE defaulters d
 			JOIN vn.config ON TRUE
 		SET d.frozened = NULL
 		WHERE `date` = vDate 
 			AND d.amount <= config.defaultersMaxAmount;
-		    
+			
-    CALL vn.clientFreeze();
+	CALL vn.clientFreeze();
-    
+	
-    -- actualizamos defaulting
+	-- actualizamos defaulting
 	DELETE FROM bi.defaulting WHERE date = vDate;
 
 	INSERT INTO bi.defaulting(date, amount)

db/routines/bi/views/last_Id_Cubo.sql

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

db/routines/bi/views/v_ventas_contables.sql

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

db/routines/bs/procedures/bancos_evolution_add.sql

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

db/routines/bs/procedures/comercialesCompleto.sql

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

db/routines/bs/procedures/indicatorsUpdate.sql

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

db/routines/bs/procedures/manaCustomerUpdate.sql

@@ -67,20 +67,20 @@ BEGIN
                     vToDated 
                 FROM 
                 (
-                    SELECT cs.Id_Cliente, Cantidad * Valor as mana
+                    SELECT a.clientFk Id_Cliente, s.quantity * sc.value as mana
-                        FROM vn2008.Tickets t
+                        FROM vn.ticket t
-                            JOIN vn2008.Consignatarios cs using(Id_Consigna)
+                            JOIN vn.address a ON a.id = t.addressFk
-                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
+                            JOIN vn.sale s on s.ticketFk = t.id
-                            JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
+                            JOIN vn.saleComponent sc on sc.saleFk = s.id
-                        WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
+                        WHERE sc.componentFk 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
+                    SELECT clientFk, - amountPaid
-                        FROM vn2008.Recibos r
+                        FROM vn.receipt
-                        WHERE Id_Banco = vManaBankId
+                        WHERE bankFk = vManaBankId
-                            AND Fechacobro > vFromDated 
+                            AND payed > vFromDated 
-                            AND Fechacobro <= vToDated
+                            AND payed <= vToDated
                     UNION ALL
                     SELECT clientFk, amount
                         FROM vn.greuge

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

db/routines/bs/procedures/ventas_contables_por_cliente.sql

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

db/routines/bs/procedures/vivosMuertos.sql

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

db/routines/bs/views/VentasPorCliente.sql

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

db/routines/bs/views/bajasLaborales.sql

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

db/routines/bs/views/horasSilla.sql

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

db/routines/bs/views/s1_ticketDetail.sql

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

db/routines/bs/views/s21_saleDetail.sql

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

db/routines/cache/procedures/prod_graphic_refresh.sql

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

db/routines/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;
@@ -71,16 +70,16 @@ proc:BEGIN
 	
 	ELSE
 	
-		INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
+		INSERT IGNORE INTO vn.packaging (id, width, depth, height)
 			SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
 				FROM bucket WHERE bucket_id = vPackage;
 		
 		IF ROW_COUNT() > 0
 		THEN
-			INSERT INTO vn2008.mail SET
+			INSERT INTO vn.mail SET
 				`subject` = 'Cubo añadido',
-				`text` = CONCAT('Se ha añadido el cubo: ', vPackage),
+				`body` = CONCAT('Se ha añadido el cubo: ', vPackage),
-				`to` = 'ekt@verdnatura.es';
+				`receiver` = 'ekt@verdnatura.es';
 		END IF;
 	END IF;
 	
@@ -147,10 +146,10 @@ proc:BEGIN
 				(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
 				IFNULL(vItem, vDefaultEntry) itemFk,
 				e.qty stickers,
-				@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
+				@pac := GREATEST(1, IFNULL(i.stemMultiplier, 1) * e.pac / @t) packing,
 				IFNULL(b.`grouping`, e.pac),
 				@pac * e.qty,
-				vForceToPacking,
+				'packing',
 				IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk),
 				(IFNULL(i.weightByPiece, 0) * @pac) / 1000
 			FROM ekt e 

db/routines/edi/procedures/floramondo_offerRefresh.sql

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

db/routines/floranet/procedures/catalogue_findById.sql

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

db/routines/floranet/procedures/order_put.sql

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

db/routines/hedera/events/order_doRecalc.sql

@@ -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

@@ -2,23 +2,15 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_afterUpdate`
 	AFTER UPDATE ON `order`
 	FOR EACH ROW
-BEGIN
+BEGIN
-	CALL stock.log_add('order', NEW.id, OLD.id);
+	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
-    IF !(OLD.address_id <=> NEW.address_id)
+		CALL vn.mail_insert(
-    OR !(OLD.company_id <=> NEW.company_id)
+			'jgallego@verdnatura.es',
-    OR !(OLD.customer_id <=> NEW.customer_id) THEN
+			'noreply@verdnatura.es',
-		CALL order_requestRecalc(NEW.id);
+			'Actualizada order al address 2850',
-	END IF;
+			CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
-
+		);
-	IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
+	END IF;
-		-- Fallo que se actualiza no se sabe como tickets en este cliente
-		CALL vn.mail_insert(
-			'jgallego@verdnatura.es',
-			'noreply@verdnatura.es',
-			'Actualizada order al address 2850',
-			CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
-		);
-	END IF;
 END$$
 DELIMITER ;

db/routines/sage/procedures/importErrorNotification.sql

@@ -43,7 +43,7 @@ BEGIN
 				WHERE sub.amountTaxableBase<>sub2.amountTaxableBase
 					AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase
 			UNION ALL
-			SELECT CONCAT('- Factura Duplicada: ', mc.Asiento)
+			SELECT CONCAT('- Factura Duplicada: ', accountingEntryFk)
 				FROM accountingEntryError
 		)sub;
 

db/routines/stock/procedures/inbound_addPick.sql

@@ -1,8 +1,8 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_addPick`(
 	vSelf INT,
-    vOutboundFk INT,
+	vOutboundFk INT,
-    vQuantity INT
+	vQuantity INT
 )
 BEGIN
 	INSERT INTO inboundPick

db/routines/stock/procedures/inbound_removePick.sql

@@ -1,9 +1,9 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_removePick`(
 	vSelf INT,
-    vOutboundFk INT,
+	vOutboundFk INT,
-    vQuantity INT,
+	vQuantity INT,
-    vTotalQuantity INT
+	vTotalQuantity INT
 )
 BEGIN
 	IF vQuantity < vTotalQuantity THEN

db/routines/stock/procedures/inbound_requestQuantity.sql

@@ -1,9 +1,9 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_requestQuantity`(
 	vSelf INT,
-    vRequested INT,
+	vRequested INT,
-    vDated DATETIME,
+	vDated DATETIME,
-    OUT vSupplied INT)
+	OUT vSupplied INT)
 BEGIN
 /**
  * Disassociates inbound picks after the given date until the
@@ -29,7 +29,7 @@ BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND
 		SET vDone = TRUE;
-        
+
 	SET vSupplied = 0;
 
 	OPEN vPicks;
@@ -45,7 +45,7 @@ BEGIN
 		SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity);
 		SET vSupplied = vSupplied + vPickGranted;
 		CALL inbound_removePick(vSelf, vOutboundFk, vPickGranted, vPickQuantity);
-		
+
 		UPDATE outbound
 			SET isSync = FALSE,
 				lack = lack + vPickGranted

db/routines/stock/procedures/inbound_sync.sql

@@ -23,7 +23,7 @@ BEGIN
 		SELECT id, lack, lack < quantity
 			FROM outbound
 			WHERE warehouseFk = vWarehouse
-                AND itemFk = vItem
+				AND itemFk = vItem
 				AND dated >= vDated
 				AND (vExpired IS NULL OR dated < vExpired)
 			ORDER BY dated, created;
@@ -51,8 +51,8 @@ BEGIN
 		END IF;
 
 		SET vSupplied = LEAST(vAvailable, vLack);
-        
+
-        IF vSupplied > 0 THEN
+		IF vSupplied > 0 THEN
 			SET vAvailable = vAvailable - vSupplied;
 			UPDATE outbound
 				SET lack = lack - vSupplied
@@ -64,8 +64,8 @@ BEGIN
 			SET vSupplied = vSupplied + vSuppliedFromRequest;
 			SET vAvailable = vAvailable - vSuppliedFromRequest;
 		END IF;
-        
+
-        IF vSupplied > 0 THEN
+		IF vSupplied > 0 THEN
 			CALL inbound_addPick(vSelf, vOutboundFk, vSupplied);
 		END IF;
 

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/stock/procedures/log_refreshAll.sql

@@ -10,7 +10,7 @@ BEGIN
 		DO RELEASE_LOCK('stock.log_sync');
 		RESIGNAL;
 	END;
-    
+
 	IF !GET_LOCK('stock.log_sync', 30) THEN
 		CALL util.throw('Lock timeout exceeded');
 	END IF;

db/routines/stock/procedures/log_refreshBuy.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshBuy`(
-    `vTableName` VARCHAR(255),
+	`vTableName` VARCHAR(255),
-    `vTableId` INT)
+	`vTableId` INT)
 BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
 	CREATE TEMPORARY TABLE tValues
@@ -11,7 +11,7 @@ BEGIN
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
-                e.isRaid,
+				e.isRaid,
 				ADDTIME(t.shipped,
 					IFNULL(t.shipmentHour, '00:00:00')) shipped,
 				t.warehouseOutFk,
@@ -24,7 +24,7 @@ BEGIN
 				ABS(b.quantity) quantity,
 				b.created,
 				b.quantity > 0 isIn,
-                t.shipped < vn.getInventoryDate() lessThanInventory
+				t.shipped < vn.getInventoryDate() lessThanInventory
 			FROM vn.buy b
 				JOIN vn.entry e ON e.id = b.entryFk
 				JOIN vn.travel t ON t.id = e.travelFk
@@ -52,7 +52,7 @@ BEGIN
 				quantity,
 				IF(isIn, isReceived, isDelivered) AND !isRaid
 			FROM tValues
-            WHERE isIn OR !lessThanInventory;
+			WHERE isIn OR !lessThanInventory;
 
 	REPLACE INTO outbound (
 			tableName, tableId, warehouseFk, dated,
@@ -67,7 +67,7 @@ BEGIN
 				quantity,
 				IF(isIn, isDelivered, isReceived) AND !isRaid
 			FROM tValues
-            WHERE !isIn OR !lessThanInventory;
+			WHERE !isIn OR !lessThanInventory;
 
 	DROP TEMPORARY TABLE tValues;
 END$$

db/routines/stock/procedures/log_refreshOrder.sql

@@ -1,13 +1,13 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshOrder`(
-    `vTableName` VARCHAR(255),
+	`vTableName` VARCHAR(255),
-    `vTableId` INT)
+	`vTableId` INT)
 BEGIN
 	DECLARE vExpireTime INT DEFAULT 20;
 	DECLARE vExpired DATETIME DEFAULT TIMESTAMPADD(MINUTE, -vExpireTime, util.VN_NOW());
 
 	DROP TEMPORARY TABLE IF EXISTS tValues;
-    CREATE TEMPORARY TABLE tValues
+	CREATE TEMPORARY TABLE tValues
 		ENGINE = MEMORY
 		SELECT
 				r.id rowFk,
@@ -23,24 +23,24 @@ BEGIN
 					OR (vTableName = 'order' AND o.id = vTableId)
 					OR (vTableName = 'orderRow' AND r.id = vTableId)
 				)
-                AND !o.confirmed
+				AND !o.confirmed
-                AND r.shipment >= vn.getInventoryDate()
+				AND r.shipment >= vn.getInventoryDate()
 				AND r.created >= vExpired
 				AND r.amount != 0;
 
 	REPLACE INTO outbound (
 			tableName, tableId, warehouseFk, dated,
-            itemFk, created, expired, quantity
+			itemFk, created, expired, quantity
 		)
-        SELECT 'orderRow',
+		SELECT 'orderRow',
 				rowFk,
 				warehouseFk,
 				shipped,
 				itemFk,
 				created,
-                TIMESTAMPADD(MINUTE, vExpireTime, created),
+				TIMESTAMPADD(MINUTE, vExpireTime, created),
 				quantity
-            FROM tValues;
+			FROM tValues;
 
 	DROP TEMPORARY TABLE tValues;
 END$$

db/routines/stock/procedures/log_refreshSale.sql

@@ -1,10 +1,10 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshSale`(
-    `vTableName` VARCHAR(255),
+	`vTableName` VARCHAR(255),
-    `vTableId` INT)
+	`vTableId` INT)
 BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
-    CREATE TEMPORARY TABLE tValues
+	CREATE TEMPORARY TABLE tValues
 		ENGINE = MEMORY
 		SELECT
 				m.id saleFk,
@@ -14,7 +14,7 @@ BEGIN
 				t.shipped,
 				ABS(m.quantity) quantity,
 				m.created,
-                TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
+				TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
 				m.quantity < 0 isIn,
 				m.isPicked OR s.alertLevel > 1 isPicked
 			FROM vn.sale m
@@ -32,33 +32,33 @@ BEGIN
 
 	REPLACE INTO inbound (
 			tableName, tableId, warehouseFk, dated,
-            itemFk, expired, quantity, isPicked
+			itemFk, expired, quantity, isPicked
 		)
-        SELECT 'sale',
+		SELECT 'sale',
 				saleFk,
 				warehouseFk,
 				shipped,
 				itemFk,
-                expired,
+				expired,
 				quantity,
-                isPicked
+				isPicked
-            FROM tValues
+			FROM tValues
-            WHERE isIn;
+			WHERE isIn;
 
 	REPLACE INTO outbound (
 			tableName, tableId, warehouseFk, dated,
-            itemFk, created, quantity, isPicked
+			itemFk, created, quantity, isPicked
 		)
-        SELECT 'sale',
+		SELECT 'sale',
 				saleFk,
 				warehouseFk,
 				shipped,
 				itemFk,
 				created,
 				quantity,
-                isPicked
+				isPicked
-            FROM tValues
+			FROM tValues
-            WHERE !isIn;
+			WHERE !isIn;
 
 	DROP TEMPORARY TABLE tValues;
 END$$

db/routines/stock/procedures/outbound_sync.sql

@@ -7,7 +7,7 @@ BEGIN
  * @param vSelf The outbound reference
  */
 	DECLARE vDated DATETIME;
-    DECLARE vItem INT;
+	DECLARE vItem INT;
 	DECLARE vWarehouse INT;
 	DECLARE vLack INT;
 	DECLARE vSupplied INT;
@@ -21,7 +21,7 @@ BEGIN
 		SELECT id, available, available < quantity
 			FROM inbound
 			WHERE warehouseFk = vWarehouse
-                AND itemFk = vItem
+				AND itemFk = vItem
 				AND dated <= vDated
 				AND (expired IS NULL OR expired > vDated)
 			ORDER BY dated;

db/routines/stock/procedures/visible_log.sql

@@ -1,16 +1,16 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`visible_log`(
 	vIsPicked BOOL,
-    vWarehouseFk INT,
+	vWarehouseFk INT,
-    vItemFk INT,
+	vItemFk INT,
-    vQuantity INT
+	vQuantity INT
 )
 proc: BEGIN
 	IF !vIsPicked THEN
 		LEAVE proc;
 	END IF;
 
-    INSERT INTO visible
+	INSERT INTO visible
 		SET itemFk = vItemFk,
 			warehouseFk = vWarehouseFk,
 			quantity = vQuantity

db/routines/stock/triggers/inbound_afterDelete.sql

@@ -12,11 +12,11 @@ BEGIN
 	DELETE FROM inboundPick
 		WHERE inboundFk = OLD.id;
 
-    CALL visible_log(
+	CALL visible_log(
 		OLD.isPicked,
-        OLD.warehouseFk,
+		OLD.warehouseFk,
-        OLD.itemFk,
+		OLD.itemFk,
-        -OLD.quantity
+		-OLD.quantity
 	);
 END$$
 DELIMITER ;

db/routines/stock/triggers/inbound_beforeInsert.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`inbound_beforeInse
 	FOR EACH ROW
 BEGIN
 	SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
-    
+
-    CALL visible_log(
+	CALL visible_log(
 		NEW.isPicked,
-        NEW.warehouseFk,
+		NEW.warehouseFk,
-        NEW.itemFk,
+		NEW.itemFk,
-        NEW.quantity
+		NEW.quantity
 	);
 END$$
 DELIMITER ;

db/routines/stock/triggers/outbound_afterDelete.sql

@@ -12,11 +12,11 @@ BEGIN
 	DELETE FROM inboundPick
 		WHERE outboundFk = OLD.id;
 
-    CALL visible_log(
+	CALL visible_log(
 		OLD.isPicked,
-        OLD.warehouseFk,
+		OLD.warehouseFk,
-        OLD.itemFk,
+		OLD.itemFk,
-        OLD.quantity
+		OLD.quantity
 	);
 END$$
 DELIMITER ;

db/routines/stock/triggers/outbound_beforeInsert.sql

@@ -5,12 +5,12 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`outbound_beforeIns
 BEGIN
 	SET NEW.lack = NEW.quantity;
 	SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
-    
+
-    CALL visible_log(
+	CALL visible_log(
 		NEW.isPicked,
-        NEW.warehouseFk,
+		NEW.warehouseFk,
-        NEW.itemFk,
+		NEW.itemFk,
-        -NEW.quantity
+		-NEW.quantity
 	);
 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/connection_kill.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`connection_kill`(
+	vConnectionId BIGINT
+)
+BEGIN
+/**
+ * Kill a connection
+ *
+ * @param vConnectionId
+ */
+	KILL vConnectionId;
+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

@@ -1,40 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`getAlert3StateTest`(vTicket INT)
-	RETURNS varchar(45) CHARSET latin1 COLLATE latin1_swedish_ci
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	DECLARE vDeliveryType INTEGER DEFAULT 0;
-		DECLARE isWaitingForPickUp BOOLEAN DEFAULT FALSE;
-		DECLARE vCode VARCHAR(45);
-		
-	SELECT 
-		a.Vista
-	INTO vDeliveryType 
-		FROM vn2008.Tickets t
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-	WHERE Id_Ticket = vTicket;
-		
-		CASE vDeliveryType
-			WHEN 1 THEN -- AGENCIAS
-				SET vCode = 'DELIVERED';
-					   
-			WHEN 2 THEN -- REPARTO
-				SET vCode = 'ON_DELIVERY';
-					
-			ELSE -- MERCADO, OTROS
-				SELECT t.warehouse_id <> w.warehouse_id INTO isWaitingForPickUp
-					FROM vn2008.Tickets t 
-						LEFT JOIN vn2008.warehouse_pickup w 
-							ON w.agency_id = t.Id_Agencia AND w.warehouse_id = t.warehouse_id
-					WHERE t.Id_Ticket = vTicket;
-						
-			IF isWaitingForPickUp THEN
-				SET vCode = 'WAITING_FOR_PICKUP';
-					ELSE
-				SET vCode = 'DELIVERED';
-			END IF;
-		END CASE;
-	RETURN vCode;
-END$$
-DELIMITER ;

db/routines/vn/functions/ticketPositionInPath.sql

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

db/routines/vn/functions/ticketSplitCounter.sql

@@ -9,9 +9,9 @@ BEGIN
 	SELECT CONCAT(printedStickers,'/',Total, IF(printedStickers = Total ,' LS','')) INTO vSplitCounter
 		FROM
 		(
-			SELECT count(l.Id_Movimiento) as printedStickers, COUNT(*) as Total
+			SELECT count(sl.saleFk) as printedStickers, COUNT(*) as Total
-				FROM vn.sale s
+				FROM sale s
-					LEFT JOIN vn2008.movement_label l ON l.Id_Movimiento = s.id
+					LEFT JOIN saleLabel sl ON sl.saleFk = s.id
 				WHERE ticketFk = vTicketFk
 		) sub;
         

db/routines/vn/procedures/available_traslate.sql

@@ -0,0 +1,138 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`available_traslate`(
+	vWarehouseLanding INT,
+	vDated DATE,
+	vWarehouseShipment INT)
+proc: BEGIN
+/**
+ * Calcular la disponibilidad dependiendo del almacen 
+ * de origen y destino según la fecha.
+ *
+ * @param vWarehouseLanding Almacén de llegada
+ * @param vDated Fecha del calculo para la disponibilidad de articulos
+ * @param vWarehouseShipment Almacén de destino
+ */
+	DECLARE vDatedFrom DATE;
+	DECLARE vDatedTo DATETIME;
+	DECLARE vDatedReserve DATETIME;
+	DECLARE vDatedInventory DATE;
+
+	IF vDated < util.VN_CURDATE() THEN
+		LEAVE proc;
+	END IF;
+
+	CALL item_getStock (vWarehouseLanding, vDated, NULL);
+
+	-- Calcula algunos parámetros necesarios.
+	SET vDatedFrom = vDated;
+	SET vDatedTo = util.dayEnd (vDated + INTERVAL 4 DAY);
+	SELECT inventoried INTO vDatedInventory FROM config;
+	SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve
+		FROM hedera.orderConfig;
+
+	-- Calcula el ultimo dia de vida para cada producto.
+	CREATE OR REPLACE TEMPORARY TABLE tItemRange
+		(PRIMARY KEY (itemFk))
+		ENGINE = MEMORY
+		SELECT c.itemFk, MAX(t.landed) dated
+			FROM buy c
+				JOIN entry e ON c.entryFk = e.id
+				JOIN travel t ON t.id = e.travelFk
+				JOIN warehouse w ON w.id = t.warehouseInFk
+			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
+				AND t.warehouseInFk = vWarehouseLanding
+				AND NOT e.isExcludedFromAvailable
+				AND NOT e.isRaid
+			GROUP BY c.itemFk;
+
+	-- Tabla con el ultimo dia de last_buy para cada producto 
+	-- que hace un replace de la anterior.
+	CALL buyUltimate(vWarehouseShipment, util.VN_CURDATE());
+
+	INSERT INTO tItemRange
+		SELECT t.itemFk, tr.landed
+			FROM tmp.buyUltimate t
+				JOIN buy b ON b.id = t.buyFk
+				JOIN entry e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
+			WHERE t.warehouseFk = vWarehouseShipment
+				AND NOT e.isRaid
+	ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
+	tr.landed);
+
+	CREATE OR REPLACE TEMPORARY TABLE tItemRangeLive
+		(PRIMARY KEY (itemFk))
+		ENGINE = MEMORY
+		SELECT ir.itemFk, util.dayEnd(ir.dated + INTERVAL it.life DAY) dated
+			FROM tItemRange ir
+				JOIN item i ON i.id = ir.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+			HAVING dated >= vDatedFrom OR dated IS NULL;
+
+	-- Calcula el ATP.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
+		(INDEX (itemFk,warehouseFk))
+		ENGINE = MEMORY
+		SELECT i.itemFk,
+				vWarehouseLanding warehouseFk,
+				i.shipped dated,
+				i.quantity
+			FROM itemTicketOut i
+				JOIN tItemRangeLive ir ON ir.itemFK = i.itemFk
+			WHERE i.shipped >= vDatedFrom
+				AND (ir.dated IS NULL OR i.shipped <= ir.dated)
+				AND i.warehouseFk = vWarehouseLanding
+		UNION ALL
+		SELECT b.itemFk,
+				vWarehouseLanding,
+				t.landed,
+				b.quantity
+			FROM buy b
+				JOIN entry e ON b.entryFk = e.id
+				JOIN travel t ON t.id = e.travelFk
+				JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
+			WHERE NOT e.isExcludedFromAvailable
+				AND b.quantity <> 0
+				AND NOT e.isRaid
+				AND t.warehouseInFk = vWarehouseLanding
+				AND t.landed >= vDatedFrom
+				AND (ir.dated IS NULL OR t.landed <= ir.dated)
+		UNION ALL
+		SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity
+			FROM itemEntryOut i
+				JOIN tItemRangeLive ir ON ir.itemFk = i.itemFk
+			WHERE i.shipped >= vDatedFrom
+				AND (ir.dated IS NULL OR i.shipped <= ir.dated)
+				AND i.warehouseOutFk = vWarehouseLanding
+		UNION ALL
+		SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount
+			FROM hedera.order_row r
+				JOIN hedera.`order` o ON o.id = r.order_id
+				JOIN tItemRangeLive ir ON ir.itemFk = r.item_id
+			WHERE r.shipment >= vDatedFrom
+				AND (ir.dated IS NULL OR r.shipment <= ir.dated)
+				AND r.warehouse_id = vWarehouseLanding
+				AND r.created >= vDatedReserve
+				AND NOT o.confirmed;
+
+	CALL item_getAtp(vDated);
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.availableTraslate
+		(PRIMARY KEY (item_id))
+		ENGINE = MEMORY
+		SELECT t.item_id, SUM(stock) available
+			FROM (
+				SELECT ti.itemFk item_id, stock
+					FROM tmp.itemList ti
+						JOIN tItemRange ir ON ir.itemFk = ti.itemFk
+				UNION ALL
+				SELECT itemFk, quantity
+					FROM tmp.itemAtp
+				) t
+			GROUP BY t.item_id
+			HAVING available <> 0;
+
+	DROP TEMPORARY TABLE tmp.itemList, tItemRange, tItemRangeLive;
+END$$
+DELIMITER ;

db/routines/vn/procedures/balance_create.sql

@@ -0,0 +1,217 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balance_create`(
+	IN vStartingMonth INT,
+	IN vEndingMonth INT,
+	IN vCompany INT,
+	IN vIsConsolidated BOOLEAN,
+	IN vInterGroupSalesIncluded BOOLEAN)
+BEGIN
+/**
+ * Crea un balance financiero para una empresa durante 
+ * un período de tiempo determinado.
+ *
+ * @param vStartingMonth Mes de inicio del período
+ * @param vEndingMonth Mes de finalización del período
+ * @param vCompany Identificador de la empresa
+ * @param vIsConsolidated Indica si se trata de un balance consolidado
+ * @param vInterGroupSalesIncluded Indica si se incluyen las ventas del grupo
+ */
+	DECLARE intGAP INT DEFAULT 7;
+	DECLARE vYears INT DEFAULT 2;
+	DECLARE vYear TEXT;
+	DECLARE vOneYearAgo TEXT;
+	DECLARE vTwoYearsAgo TEXT;
+	DECLARE vQuery TEXT;
+	DECLARE vConsolidatedGroup INT;
+	DECLARE vStartingDate DATE DEFAULT '2020-01-01';
+	DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE());
+	DECLARE vStartingYear INT DEFAULT vCurYear - 2;
+	DECLARE vTable TEXT;
+
+	SET vTable = util.quoteIdentifier('balanceNestTree');
+	SET vYear = util.quoteIdentifier(vCurYear);
+	SET vOneYearAgo = util.quoteIdentifier(vCurYear-1);
+	SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2);
+
+	-- Solicitamos la tabla tmp.nest, como base para el balance.
+	DROP TEMPORARY TABLE IF EXISTS tmp.nest;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'CREATE TEMPORARY TABLE tmp.nest
+			SELECT node.id
+					,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1), 
+					node.name) name,
+					node.lft,
+					node.rgt,
+					COUNT(parent.id) - 1 depth,
+					CAST((node.rgt - node.lft - 1) / 2 AS DECIMAL) sons
+				FROM ', vTable, ' node,
+					', vTable, ' parent
+				WHERE node.lft BETWEEN parent.lft AND parent.rgt
+				GROUP BY node.id
+				ORDER BY node.lft')
+		USING intGAP;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.balance
+		SELECT * FROM tmp.nest;
+
+		SELECT companyGroupFk INTO vConsolidatedGroup
+			FROM company
+			WHERE id = vCompany;
+
+	CREATE OR REPLACE TEMPORARY TABLE tCompanyReceiving
+		SELECT id companyFk
+			FROM company
+			WHERE id = vCompany
+				OR companyGroupFk = IF(vIsConsolidated, vConsolidatedGroup, NULL);
+
+	CREATE OR REPLACE TEMPORARY TABLE tCompanyIssuing
+		SELECT id companyFk
+			FROM supplier p;
+
+		IF NOT vInterGroupSalesIncluded THEN
+
+			DELETE ci
+				FROM tCompanyIssuing ci
+					JOIN company e on e.id = ci.companyFk
+				WHERE e.companyGroupFk = vConsolidatedGroup;
+
+		END IF;
+
+	-- Se calculan las facturas que intervienen, 
+	-- para luego poder servir el desglose desde aqui.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.balanceDetail
+		SELECT cr.companyFk receivingId,
+				ci.companyFk issuingId,
+				YEAR(IFNULL(r.bookEntried,IFNULL(r.booked, r.issued))) `year`,
+				MONTH(IFNULL(r.bookEntried,IFNULL(r.booked, r.issued))) `month`,
+				expenseFk,
+				SUM(taxableBase) amount
+			FROM invoiceIn r
+				JOIN invoiceInTax ri on ri.invoiceInFk = r.id
+				JOIN tCompanyReceiving cr on cr.companyFk = r.companyFk
+				JOIN tCompanyIssuing ci ON ci.companyFk = r.supplierFk
+			WHERE COALESCE(r.bookEntried, r.booked, r.issued) >= vStartingDate
+				AND r.isBooked
+			GROUP BY expenseFk, `year`, `month`, ci.companyFk, cr.companyFk;
+
+	INSERT INTO tmp.balanceDetail(
+			receivingId,
+			issuingId,
+			`year`,
+			`month`,
+			expenseFk,
+			amount)
+		SELECT em.companyFk,
+				em.companyFk,
+				`year`,
+				`month`,
+				expenseFk,
+				SUM(em.amount)
+			FROM expenseManual em
+				JOIN tCompanyReceiving er ON er.companyFk = em.companyFk
+			WHERE `year` >= vStartingYear
+				AND `month` BETWEEN vStartingMonth AND vEndingMonth
+			GROUP BY expenseFk, `year`, `month`, em.companyFk;
+
+	DELETE FROM tmp.balanceDetail
+		WHERE `month` < vStartingMonth
+			OR `month` > vEndingMonth;
+
+	-- Ahora el balance
+	EXECUTE IMMEDIATE CONCAT(
+		'ALTER TABLE tmp.balance
+			ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL ,
+			ADD COLUMN ', vOneYearAgo ,' INT(10) NULL ,
+			ADD COLUMN ', vYear,' INT(10) NULL ,
+			ADD COLUMN expenseFk VARCHAR(10) NULL,
+			ADD COLUMN expenseName VARCHAR(45) NULL');
+
+	-- Añadimos los gastos, para facilitar el formulario
+	UPDATE tmp.balance b
+			JOIN balanceNestTree bnt on bnt.id = b.id
+			JOIN expense e ON e.id = bnt.expenseFk COLLATE utf8_general_ci
+		SET b.expenseFk = e.id COLLATE utf8_general_ci,
+			b.expenseName = e.name COLLATE utf8_general_ci ;
+
+	-- Rellenamos los valores de primer nivel, los que corresponden 
+	-- a los gastos simples.
+	WHILE vYears >= 0 DO
+		SET vQuery = CONCAT(
+			'UPDATE tmp.balance b
+					JOIN (
+						SELECT expenseFk, SUM(amount) amount
+							FROM tmp.balanceDetail
+							WHERE year = ?
+							GROUP BY expenseFk
+					) sub on sub.expenseFk = b.expenseFk COLLATE utf8_general_ci
+				SET ', util.quoteIdentifier(vCurYear - vYears), ' = - amount');
+
+		EXECUTE IMMEDIATE vQuery
+			USING vCurYear - vYears;
+
+		SET vYears = vYears - 1;
+	END WHILE;
+
+	-- Añadimos las ventas.
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tmp.balance b
+				JOIN (
+					SELECT SUM(IF(year = ?, venta, 0)) y2,
+							SUM(IF(year = ?, venta, 0)) y1,
+							SUM(IF(year = ?, venta, 0)) y0,
+							c.Gasto
+						FROM bs.ventas_contables c
+							JOIN tCompanyReceiving cr ON cr.companyFk = c.empresa_id
+						WHERE month BETWEEN ? AND ?
+						GROUP BY c.Gasto
+				) sub ON sub.gasto = b.expenseFk COLLATE utf8_general_ci
+			SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2,
+				b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1,
+				b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0')
+		USING vCurYear-2,
+			vCurYear-1,
+			vCurYear,
+			vStartingMonth,
+			vEndingMonth;
+
+	-- Ventas intra grupo.
+	IF NOT vInterGroupSalesIncluded THEN
+
+		SELECT lft, rgt INTO @groupLft, @groupRgt
+			FROM tmp.balance b
+			WHERE TRIM(b.`name`) = 'Grupo';
+
+		DELETE
+			FROM tmp.balance
+			WHERE lft BETWEEN @groupLft AND @groupRgt;
+
+	END IF;
+
+	-- Rellenamos el valor de los padres con la suma de los hijos.
+	CREATE OR REPLACE TEMPORARY TABLE tmp.balance_aux
+		SELECT * FROM tmp.balance;
+
+	EXECUTE IMMEDIATE
+		CONCAT('UPDATE tmp.balance b
+			JOIN (
+				SELECT b1.id,
+						b1.name,
+						SUM(b2.', vYear,') thisYear,
+						SUM(b2.', vOneYearAgo,') oneYearAgo,
+						SUM(b2.', vTwoYearsAgo,') twoYearsAgo
+					FROM tmp.nest b1
+						JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt
+					GROUP BY b1.id
+				)sub ON sub.id = b.id
+			SET b.', vYear, ' = thisYear,
+				b.', vOneYearAgo, ' = oneYearAgo,
+				b.', vTwoYearsAgo, ' = twoYearsAgo');
+
+	SELECT *, CONCAT('',IFNULL(expenseFk,'')) newgasto
+		FROM tmp.balance;
+
+	DROP TEMPORARY TABLE IF EXISTS tCompanyReceiving, tCompanyIssuing;
+	
+END$$
+DELIMITER ;

db/routines/vn/procedures/buy_chekItem.sql

@@ -19,10 +19,10 @@ BEGIN
 			AND a.hasWeightVolumetric
 		LIMIT 1;
 
-    DROP TEMPORARY TABLE IF EXISTS tmp.buysToCheck;
+    DROP TEMPORARY TABLE tmp.buysToCheck;
 
-	IF hasVolumetricAgency THEN		
+	IF hasVolumetricAgency THEN
-		CALL util.throw('Some purchase line has an item without size or weight per stem in the volumetric agency.');		
+		CALL util.throw('Item lacks size/weight in purchase line at agency');		
 	END IF;		
 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_getDebt.sql

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

db/routines/vn/procedures/client_getRisk.sql

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

db/routines/vn/procedures/collectionPlacement_get.sql

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

db/routines/vn/procedures/collection_assign.sql

@@ -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;
@@ -25,20 +30,29 @@ proc:BEGIN
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 INTO vHasTooMuchCollections
-		INTO vHasTooMuchCollections
+		FROM productionConfig pc
-		FROM tCollection
+			LEFT JOIN tCollection ON TRUE;
-			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('/',
+		vLockName,
+		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 +104,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
@@ -63,7 +63,8 @@ proc:BEGIN
 			o.numberOfWagons,
 			o.trainFk,
 			o.linesLimit,
-			o.volumeLimit
+			o.volumeLimit,
+			pc.collection_new_lockname
 		INTO vMaxTickets,
 				vHasUniqueCollectionTime,
 				vWorkerCode,
@@ -73,20 +74,21 @@ proc:BEGIN
 				vWagons,
 				vTrainFk,
 				vLinesLimit,
-				vVolumeLimit
+				vVolumeLimit,
+				vLockName
 		FROM productionConfig pc
 			JOIN worker w ON w.id = vUserFk
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
 			JOIN operator o ON o.workerFk = vUserFk;
 
 	SET vLockName = CONCAT_WS('/',
-		'collection_new',
+		vLockName,
 		vWarehouseFk,
 		vItemPackingTypeFk
 	);
 
 	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

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

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -2,41 +2,41 @@ 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
+		ENGINE = MEMORY
-	        SELECT * FROM (
+			SELECT * FROM (
-	                SELECT cc.client Id_Cliente, ci.grade
+					SELECT cc.client clientFk, ci.grade
-	                    FROM creditClassification cc
+						FROM creditClassification cc
-	                        JOIN creditInsurance ci ON cc.id = ci.creditClassification
+							JOIN creditInsurance ci ON cc.id = ci.creditClassification
-	                    WHERE dateEnd IS NULL
+						WHERE dateEnd IS NULL
-	                ORDER BY ci.creationDate DESC
+					ORDER BY ci.creationDate DESC
-	                LIMIT 10000000000000000000) t1
+					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.name,
+			c.credit clientCredit,
-	        c.credit clientCredit,
+			c.creditInsurance solunion,
-	        c.creditInsurance solunion,
+			CAST(r.risk AS DECIMAL(10,0)) risk,
-	        CAST(r.risk AS DECIMAL(10,0)) risk,
+			CAST(c.creditInsurance - r.risk AS DECIMAL(10,0)) riskAlive,
-	        CAST(c.creditInsurance - r.risk AS DECIMAL(10,0)) riskAlive,
+			cac.invoiced billedAnnually,
-	        cac.invoiced billedAnnually,
+			c.dueDay,
-	        c.dueDay,
+			cgd.grade,
-	        ci.grade,
+			c2.country
-	        c2.country
+		FROM tmp.clientGetDebt cgd
-	    FROM tmp.client_list ci
+			LEFT JOIN tmp.risk r ON r.clientFk = cgd.clientFk
-	        LEFT JOIN tmp.risk r ON r.Id_Cliente = ci.Id_Cliente
+			JOIN client c ON c.id = cgd.clientFk
-	        JOIN client c ON c.id = ci.Id_Cliente
+			JOIN bs.clientAnnualConsumption cac ON c.id = cac.clientFk
-	        JOIN bs.clientAnnualConsumption cac ON c.id = cac.clientFk
+			JOIN country c2 ON c2.id = c.countryFk
-	        JOIN country c2 ON c2.id = c.countryFk
+		GROUP BY c.id;
-	    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 ;
+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 ;