Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency

.husky/addReferenceTag.js

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

.husky/commit-msg

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

CHANGELOG.md

@@ -5,6 +5,8 @@ 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.16.01] - 2024-04-18
 
 ## [2414.01] - 2024-04-04

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

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

back/methods/collection/getSales.js

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

back/methods/dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        // accessScopes: ['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: ['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: ['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/osticket/sendToSupport.js

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

back/methods/url/getUrl.js

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

back/model-config.json

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

back/models/production-config.json

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

back/models/specs/notificationSubscription.spec.js

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

commitlint.config.js

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

db/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','10962','5411433e529d50d68b3a0675b1a0a6215ea931ca','2024-03-25 17:47:37','10969');
+INSERT INTO `version` VALUES ('vn-database','10970','273507d3b711f272078e83880802d0ef7278d062','2024-04-05 10:33:29','10983');
 
 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);
@@ -673,14 +673,21 @@ INSERT INTO `versionLog` VALUES ('vn-database','10874','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10876','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10878','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10879','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10880','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10881','00-alterTableNotification.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10881','01-notification.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10882','00-vehicle.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10883','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10884','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10885','00-revokeUpdateClient.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10887','00-schemaAndUser.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10887','01-tables.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:33:50',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10888','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-16 07:39:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10889','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-23 09:55:56',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10890','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10891','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10892','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10893','00-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','01-financialProductType.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','02-flight.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10896','03-gastos_resumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:00',NULL,NULL);
@@ -706,6 +713,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','10913','00-firstScript.sql','jen
 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','10918','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:01:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10919','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10922','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-29 13:44:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10923','00-createParkingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10923','01-aclParkingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-21 07:15:51',NULL,NULL);
@@ -714,13 +722,32 @@ 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','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','10953','00-account.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','01-bs.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','02-edi.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','03-hedera.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','04-pbx.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','05-sage.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','06-salix.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','06-srt.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','07-util.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','08-vn.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10953','08-vn2.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10956','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10957','00-aclTicketClone.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-04-04 07:34:58',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10959','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-18 13:32:25',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10962','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-25 08:27:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','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','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);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -735,8 +762,8 @@ INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 09:04:5
 INSERT INTO `role` VALUES (2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 09:04:58','2023-06-02 22:33:28',NULL);
 INSERT INTO `role` VALUES (3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
 INSERT INTO `role` VALUES (5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
-INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
+INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios no autenticados',1,'2017-05-19 09:04:58','2024-04-06 12:05:08',1437);
-INSERT INTO `role` VALUES (9,'developer','Desarrolladores del sistema',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
+INSERT INTO `role` VALUES (9,'developer','Desarrollador raso',1,'2017-05-19 09:04:58','2024-03-27 14:14:58',1437);
 INSERT INTO `role` VALUES (11,'account','Privilegios relacionados con el login',0,'2017-05-19 09:04:58','2017-09-20 19:06:35',NULL);
 INSERT INTO `role` VALUES (13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 09:04:58','2021-06-30 15:29:30',NULL);
 INSERT INTO `role` VALUES (15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 09:04:58','2018-02-12 11:50:10',NULL);
@@ -1309,7 +1336,7 @@ INSERT INTO `ACL` VALUES (274,'InvoiceInLog','*','READ','ALLOW','ROLE','administ
 INSERT INTO `ACL` VALUES (275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant');
-INSERT INTO `ACL` VALUES (279,'MailAlias','*','*','ALLOW','ROLE','marketing');
+INSERT INTO `ACL` VALUES (279,'MailAlias','*','READ','ALLOW','ROLE','marketing');
 INSERT INTO `ACL` VALUES (283,'EntryObservation','*','*','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin');
 INSERT INTO `ACL` VALUES (285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin');
@@ -1777,7 +1804,7 @@ INSERT INTO `ACL` VALUES (804,'DeviceProduction','*','READ','ALLOW','ROLE','empl
 INSERT INTO `ACL` VALUES (805,'Collection','assign','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (806,'ExpeditionPallet','getPallet','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (807,'MachineWorker','updateInTime','WRITE','ALLOW','ROLE','production');
-INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (809,'SaleTracking','delete','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (810,'SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (811,'SaleTracking','setPicked','WRITE','ALLOW','ROLE','production');
@@ -1789,6 +1816,10 @@ INSERT INTO `ACL` VALUES (816,'WorkerActivity','*','*','ALLOW','ROLE','productio
 INSERT INTO `ACL` VALUES (817,'ParkingLog','*','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (818,'ExpeditionPallet','*','READ','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 `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2492,7 +2523,7 @@ USE `cache`;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 INSERT INTO `cache` VALUES (1,'equalizator','00:19:00');
-INSERT INTO `cache` VALUES (2,'available','00:06:00');
+INSERT INTO `cache` VALUES (2,'available','00:01:00');
 INSERT INTO `cache` VALUES (3,'stock','00:30:00');
 INSERT INTO `cache` VALUES (4,'last_buy','23:59:00');
 INSERT INTO `cache` VALUES (5,'weekly_sales','12:00:00');

db/dump/.dump/privileges.sql

@@ -45,6 +45,7 @@ INSERT  IGNORE INTO `db` VALUES ('','account','salix','Y','Y','Y','Y','N','N','N
 INSERT  IGNORE INTO `db` VALUES ('','mysql','salix','Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','psico','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','geo','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
+INSERT  IGNORE INTO `db` VALUES ('','floranet','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','tmp','guest','Y','Y','Y','Y','N','Y','N','N','N','N','Y','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','util','salix','Y','Y','Y','Y','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','dipole','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
@@ -77,6 +78,7 @@ INSERT  IGNORE INTO `db` VALUES ('','bi','developer','Y','Y','Y','Y','N','N','N'
 INSERT  IGNORE INTO `db` VALUES ('','util','grafana','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','mysql','developerBoss','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','rfid','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
+INSERT  IGNORE INTO `db` VALUES ('','floranet','floranet','N','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 */;
@@ -777,7 +779,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','PreciosEspecia
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','movingState','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferState','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicle','alexm@%','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','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','');
@@ -1373,6 +1375,10 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accounting',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','accounting','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','workerActivity','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleState','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','expeditionState','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','specialPrice','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRatio','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1657,9 +1663,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','account','guest','myUser_checkLogin
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','lang','FUNCTION','juan@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofmonth','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','account_conciliacion_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','logistic','add_awb_component','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','productionAssi','agencyModeImbalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1686,7 +1690,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_CURDATE','FUNCTIO
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','client_checkBalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','addressTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','absoluteInventoryHistory','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','client_getSalesPersonByTicket','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','pbx','developer','clientFromPhone','FUNCTION','juan@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','production','log_addWithUser','PROCEDURE','juan@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1694,6 +1698,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_ad
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_delete','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','balanceNestTree_move','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','company_getSuppliersDebt','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','multipleInventoryHistory','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','salesAssistant','defaultersFromDate','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_updatepacking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_updategrouping','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1712,8 +1717,6 @@ 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 ('','vn2008','buyer','historico_absoluto','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','historico_multiple','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','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');
@@ -1792,7 +1795,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','zone_getstate','PRO
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','worker_gethierarchy','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','workertimecontrol_weekcheckbreak','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','ticket_split','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','add_awb_component','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','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');
@@ -2047,6 +2049,7 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"vers
 INSERT  IGNORE INTO `global_priv` VALUES ('','ext','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','floranet','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','grafana','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','greenhouseBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','guest','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 150000, \"max_user_connections\": 200, \"max_statement_time\": 0.000000, \"is_role\": true, \"version_id\": 101106}');

db/dump/.dump/triggers.sql

@@ -820,6 +820,12 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Current Database: `floranet`
+--
+
+USE `floranet`;
+
 --
 -- Current Database: `hedera`
 --
@@ -2289,17 +2295,26 @@ trig: BEGIN
 	DECLARE vGroupingMode TINYINT;
 	DECLARE vGenericFk INT;
 	DECLARE vGenericInDate BOOL;
+	DECLARE vBuyerFk INT;
 
 	IF @isModeInventory THEN
 		LEAVE trig;
 	END IF;
 
+	CALL entry_checkBooked(NEW.entryFk);
 	IF NEW.printedStickers <> 0 THEN
 		CALL util.throw('it is not possible to create buy lines with printedstickers other than 0');
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
 
+	SELECT it.workerFk INTO vBuyerFk
+		FROM item i
+			JOIN itemType it ON it.id = i.typeFk
+		WHERE i.id = NEW.itemFk;
+
+	SET NEW.buyerFk = vBuyerFk;
+
 	CALL buy_checkGrouping(NEW.`grouping`);
 
 	SELECT t.warehouseInFk, t.landed
@@ -2409,11 +2424,13 @@ trig:BEGIN
 	DECLARE vGenericInDate BOOL;
 	DECLARE vIsInventory BOOL;
 	DECLARE vDefaultEntry INT;
+	DECLARE vBuyerFk INT;
 
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
 
+	CALL entry_checkBooked(OLD.entryFk);
 	SET NEW.editorFk = account.myUser_getId();
 
 	SELECT defaultEntry INTO vDefaultEntry
@@ -2467,6 +2484,15 @@ trig:BEGIN
 		SET	NEW.isIgnored = TRUE;
 	END IF;
 
+	IF NOT (NEW.itemFk <=> OLD.itemFk) THEN
+		SELECT it.workerFk INTO vBuyerFk
+			FROM item i
+				JOIN itemType it ON it.id = i.typeFk
+			WHERE i.id = NEW.itemFk;
+
+		SET NEW.buyerFk = vBuyerFk;
+	END IF;
+
 	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
 		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
 		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
@@ -2557,10 +2583,11 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER  `vn`.`buy_beforeDelete`
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`buy_beforeDelete`
-    BEFORE DELETE ON buy
+	BEFORE DELETE ON `buy`
-    FOR EACH ROW
+	FOR EACH ROW
 BEGIN 
+	CALL entry_checkBooked(OLD.entryFk);
 	IF OLD.printedStickers <> 0 THEN
 		CALL util.throw("it is not possible to delete buys with printed labels ");
 	END IF;
@@ -4675,6 +4702,10 @@ BEGIN
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	
+	IF NEW.isBooked = OLD.isBooked THEN
+		CALL entry_checkBooked(OLD.id);
+	END IF;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
@@ -4777,6 +4808,7 @@ DELIMITER ;;
 	BEFORE DELETE ON `entry`
 	FOR EACH ROW
 BEGIN
+	CALL entry_checkBooked(OLD.id);
 	DELETE FROM buy WHERE entryFk = OLD.id;
 END */;;
 DELIMITER ;
@@ -10087,6 +10119,10 @@ BEGIN
 			CALL util.throw('The travel has entries with booked invoices');
 		END IF;
 	END IF;	
+	
+	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
+		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10126,10 +10162,6 @@ BEGIN
 			CALL buy_checkItem();
 		END IF;
 	END IF;
-
-	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
-		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10836,6 +10868,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10856,6 +10889,7 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10865,11 +10899,11 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneIncluded_afterDelete`
 	AFTER DELETE ON `zoneIncluded`
@@ -10880,6 +10914,7 @@ BEGIN
 			`changedModel` = 'zoneIncluded',
 			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
+
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10962,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-03-26  6:55:58
+-- Dump completed on 2024-04-08  7:14:22

db/dump/fixtures.after.sql

@@ -9,6 +9,10 @@ SET foreign_key_checks = 0;
 
 INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled)
     VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
+
+INSERT INTO util.binlogQueue (code,logName, `position`)
+    VALUES ('mylogger', 'bin.000001', 4);
+
 /* #5483
 INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk)
     VALUES(1, NULL, 1, 300, 1);
@@ -113,9 +117,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
     (100, 4, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 4, NULL, 1, 567, 1, '2022-07-12', 0, 0, 6, NULL, NULL, NULL, NULL, NULL),
     (100, 5, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 5, NULL, 1, 567, 1, '2022-07-12', 0, 0, 1, NULL, NULL, NULL, NULL, NULL);
 */
-INSERT INTO vn.sector (description,warehouseFk) VALUES
-    ('Sector One',1);
-
 INSERT INTO vn.saleGroup (userFk,parkingFk,sectorFk) VALUES
     (100,1,1);
 
@@ -156,16 +157,6 @@ INSERT INTO `vn`.`occupationCode` (`code`, `name`)
         ('b', 'Representantes de comercio'),
         ('c', 'Personal de oficios en trabajos de construcción en general, y en instalac.,edificios y obras');
 
-INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`nss`,`codpuesto`,`codempresa`,`codcontrato`,`FAntiguedad`,`grupotarifa`,`codcategoria`,`ContratoTemporal`)
-    VALUES
-        (36,'46/10515497-58',6,20,189,'2009-01-02',5,10,0),
-        (43,'46/10235353-50',7,20,189,'2009-04-21',5,10,0),
-        (76,'46/10250562-30',1,20,189,'2009-09-07',9,5,0),
-        (1106,'46/10297768-94',4,20,100,'2021-03-09',7,18,0),
-        (1107,'46/1627085-11',15,20,402,'2021-03-15',9,6,1),
-        (1108,'46/10446901-41',25,20,502,'2021-03-22',10,29,1),
-        (1109,'46/10552113-8',3,20,402,'2021-03-23',9,9,1),
-        (1110,'46/10723579-75',3,20,402,'2021-03-23',9,9,1);
 
 INSERT INTO `vn`.`trainingCourseType` (`id`, `name`)
     VALUES

db/dump/fixtures.before.sql

@@ -81,7 +81,7 @@ INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPre
 CALL `account`.`role_sync`;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
-    SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
+    SELECT id, LOWER(name), CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
         FROM `account`.`role`
             ORDER BY id;
 
@@ -118,18 +118,18 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
 
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
-        (1101, 'BruceWayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
+        (1101, 'brucewayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
-        (1102, 'PetterParker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
+        (1102, 'petterparker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
-        (1103, 'ClarkKent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
+        (1103, 'clarkkent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
-        (1104, 'TonyStark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
+        (1104, 'tonystark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
-        (1105, 'MaxEisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
+        (1105, 'maxeisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
-        (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
+        (1106, 'davidcharleshaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
-        (1107, 'HankPym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
+        (1107, 'hankpym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
-        (1108, 'CharlesXavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
+        (1108, 'charlesxavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
-        (1109, 'BruceBanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
+        (1109, 'brucebanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
-        (1110, 'JessicaJones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
+        (1110, 'jessicajones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
-        (1111, 'Missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
+        (1111, 'missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
-        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
+        (1112, 'trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
 
 UPDATE account.`user`
     SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
@@ -198,7 +198,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
-UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+UPDATE `vn`.`sector` SET `backupPrinterFk` = 1 WHERE id = 1;
 
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
@@ -1827,9 +1827,9 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`,
 
 INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
     VALUES
-        (1, util.VN_CURDATE(), 1,   1101, 18, 3, 0, util.VN_CURDATE(), 0,  11),
+        (1, util.VN_CURDATE(), 1,   1101, 19, 3, 0, util.VN_CURDATE(), 0,  11),
         (2, util.VN_CURDATE(), 4,   1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
-        (3, util.VN_CURDATE(), 3,   1101, 18, 1, 1, util.VN_CURDATE(), 5, 7),
+        (3, util.VN_CURDATE(), 3,   1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
         (4, util.VN_CURDATE(), 3,   1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
 
 INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
@@ -1880,7 +1880,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
 
 INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
     VALUES
-        (1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
+        (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
         (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
         (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
         (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
@@ -1973,6 +1973,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),
@@ -2813,7 +2822,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 +2835,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 +2856,16 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
 	    (1, 9),
         (1, 3),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
         (1, 9);
 
-INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`)
     VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);
 
 INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
     VALUES
@@ -2913,7 +2925,8 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'development', 'http://localhost:9000/#/'),
         ('hedera', 'development', 'http://localhost:9090/'),
-        ('salix', 'development', 'http://localhost:5000/#!/');
+        ('salix', 'development', 'http://localhost:5000/#!/'),
+        ('docuware', 'development', 'http://docuware');
 
 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
     VALUES
@@ -3223,7 +3236,6 @@ INSERT INTO vn.buy
 		packing = 20,
 		`grouping` = 1,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3262,7 +3274,6 @@ INSERT INTO vn.buy
 		packing = 40,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3301,7 +3312,6 @@ INSERT INTO vn.buy
 		packing = 10,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3348,7 +3358,6 @@ INSERT INTO vn.buy
 		packing = 20,
 		`grouping` = 4,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3387,7 +3396,6 @@ INSERT INTO vn.buy
 		packing = 20,
 		`grouping` = 1,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3427,7 +3435,6 @@ INSERT INTO vn.buy
 		packing = 200,
 		`grouping` = 30,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3467,7 +3474,6 @@ INSERT INTO vn.buy
 		packing = 500,
 		`grouping` = 10,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3507,7 +3513,6 @@ INSERT INTO vn.buy
 		packing = 300,
 		`grouping` = 50,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3547,7 +3552,6 @@ INSERT INTO vn.buy
 		packing = 50,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 1,
 		price2 = 1,
 		price3 = 1,
@@ -3588,7 +3592,6 @@ INSERT vn.buy
 		packing = 5,
 		`grouping` = 2,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3628,7 +3631,6 @@ INSERT vn.buy
 		packing = 100,
 		`grouping` = 5,
 		groupingMode = 1,
-		packageFk = 94,
 		price1 = 7,
 		price2 = 7,
 		price3 = 7,
@@ -3744,5 +3746,23 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 	VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
 
 INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
+    VALUES (1, 10, 9);
+
+INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
+	VALUES
+		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',118.81,'RCBO','debit','10','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',2149.71,'RCBO.AMAZON','debit','122','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
+
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
+	VALUES (1, 1);
+
+
+INSERT INTO vn.workerTeam(id, team, workerFk)
     VALUES
-        (1, 10, 9);
+        (8, 1, 19);

db/routines/account/procedures/user_checkName.sql

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

db/routines/bi/procedures/greuge_dif_porte_add.sql

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

db/routines/floranet/procedures/catalogue_get.sql

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

db/routines/floranet/procedures/contact_request.sql

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

db/routines/floranet/procedures/deliveryDate_get.sql

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

db/routines/floranet/procedures/order_confirm.sql

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

db/routines/floranet/procedures/order_put.sql

@@ -6,7 +6,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vOrder JSON)
 READS SQL DATA
 BEGIN
 /**
- *  Get and process an order
+ *  Get and process an order.
  * 
  * @param vOrder Data of the order
  *

db/routines/floranet/procedures/sliders_get.sql

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

db/routines/util/functions/binlogQueue_getDelay.sql

@@ -0,0 +1,45 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`binlogQueue_getDelay`(vCode VARCHAR(255))
+	RETURNS BIGINT
+	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/vn/events/clientsDisable.sql

@@ -7,9 +7,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
-			JOIN clientType ct ON ct.id = c.typeFk
 		SET u.active = FALSE
-		WHERE ct.code = 'normal'
+		WHERE c.typeFk = 'normal'
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c

db/routines/vn/procedures/addAccountReconciliation.sql

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

db/routines/vn/procedures/agencyVolume.sql

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

db/routines/vn/procedures/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/collection_assign.sql

@@ -15,6 +15,13 @@ proc:BEGIN
 	DECLARE vHasTooMuchCollections BOOL;
 	DECLARE vLockTime INT DEFAULT 15;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK('collection_assign');
+		
+		RESIGNAL;
+	END;
+
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 

db/routines/vn/procedures/collection_new.sql

@@ -219,9 +219,11 @@ proc:BEGIN
 			UPDATE tmp.productionBuffer pb
 					JOIN (
 						SELECT SUM(litros) liters,
-								@lines:= COUNT(*) + @lines `lines`,
+								@lines:= COUNT(*) + @lines,
+								COUNT(*) `lines`,
 								MAX(i.`size`) height,
-								@volume := SUM(sv.volume) + @volume volume
+								@volume := SUM(sv.volume) + @volume,
+								SUM(sv.volume) volume
 							FROM saleVolume sv
 								JOIN sale s ON s.id = sv.saleFk
 								JOIN item i ON i.id = s.itemFk

db/routines/vn/procedures/creditInsurance_getRisk.sql

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

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -33,6 +33,7 @@ BEGIN
 			ii.operated = IFNULL(ii.operated,d.operated),
 			ii.issued = IFNULL(ii.issued,d.issued),
 			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
+			e.isBooked = TRUE,
 			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
 

db/routines/vn/procedures/entry_checkBooked.sql

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

db/routines/vn/procedures/inventoryMake.sql

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

db/routines/vn/procedures/invoiceOut_new.sql

@@ -68,16 +68,21 @@ BEGIN
 	DELETE ti.*
 		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
+			LEFT JOIN address a ON a.id = t.addressFk
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
 			JOIN supplier su ON su.id = t.companyFk
 			JOIN client c ON c.id = t.clientFk
-			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+				AND itc.countryFk = su.countryFk
 		WHERE (YEAR(t.shipped) < 2001 AND  t.isDeleted)
 			OR c.isTaxDataChecked = FALSE
 			OR t.isDeleted
 			OR c.hasToInvoice = FALSE
-			OR itc.id IS NULL;
+			OR itc.id IS NULL
+			OR a.id IS NULL 
+			OR (vTaxArea = 'WORLD' 
+				AND (a.customsAgentFk IS NULL OR a.incotermsFk IS NULL));
 
 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
 		INTO vIsAnySaleToInvoice

db/routines/vn/procedures/itemShelving_add.sql

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

db/routines/vn/procedures/item_getSimilar.sql

@@ -60,7 +60,11 @@ BEGIN
 			(i.value8 <=> its.value8) match8,
 			a.available,
 			IFNULL(ip.counter, 0) `counter`,
-			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
+			CASE
+				WHEN b.groupingMode = 1 THEN b.grouping
+				WHEN b.groupingMode = 2 THEN b.packing
+				ELSE 1
+			END AS minQuantity,
 			iss.visible located
 		FROM vn.item i
 			JOIN cache.available a ON a.item_id = i.id

db/routines/vn/procedures/riskAllClients.sql

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

db/routines/vn/procedures/ticket_doCmr.sql

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

db/routines/vn/procedures/zone_getAddresses.sql

@@ -28,7 +28,7 @@ BEGIN
 	SELECT c.id clientFk,
 				c.name,
 				c.phone,
-				c.mobile,
+				bt.description,
 				c.salesPersonFk,
 				u.name username,
 				aai.invoiced,
@@ -44,10 +44,11 @@ BEGIN
 				LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = c.id
 				LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
 				JOIN vn.clientType ct ON ct.code = c.typeFk
+				JOIN vn.businessType bt ON bt.code = c.businessTypeFk 
 			WHERE a.isActive
 				AND c.isActive
 				AND ct.code = 'normal'
-				AND c.businessTypeFk <> 'worker'
+				AND bt.code <> 'worker'
 			GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

db/routines/vn2008/procedures/account_conciliacion_add.sql

@@ -1,33 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`account_conciliacion_add`()
-BEGIN
-	UPDATE account_conciliacion ac
-		JOIN
-		(
-			SELECT idaccount_conciliacion, @c:= if(@id = id_calculated, @c + 1, 1) contador, 
-					@id:= id_calculated as id_calculated, concat(id_calculated,'(',@c,')') as new_id   
-				FROM account_conciliacion
-			JOIN
-				(
-				select id_calculated, count(*) rep, @c:= 0, @id:= concat('-',id_calculated) 
-					from account_conciliacion
-					group by id_calculated
-					having rep > 1
-				) sub using(id_calculated)
-		) sub2 using(idaccount_conciliacion)
-	SET ac.id_calculated = sub2.new_id;
-
-	INSERT INTO Cajas(Cajafecha, Partida, Serie, Concepto, Entrada, 
-					Salida, Id_Banco,empresa_id, warehouse_id,
-					Proveedores_account_id, id_calculated, InForeignValue, OutForeignValue, Id_Trabajador)
-		SELECT Fechaoperacion, TRUE, 'MB', ac.Concepto, IF(DebeHaber = 2 AND currencyFk = 1, importe,null), 
-				IF(DebeHaber = 1 AND currencyFk = 1, importe, null), a.id, sa.supplierFk, 1,
-				ac.Id_Proveedores_account, ac.id_calculated, IF(DebeHaber = 2 AND NOT currencyFk = 1, importe, null),
-				IF(DebeHaber = 1 AND NOT currencyFk = 1, importe, null), account.myUser_getId()
-			FROM account_conciliacion ac
-				JOIN vn.supplierAccount sa on sa.id = ac.Id_Proveedores_account
-				JOIN vn.accounting a ON a.id = sa.accountingFk
-				LEFT JOIN Cajas c on c.id_calculated = ac.id_calculated
-			WHERE c.Id_Caja IS NULL;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/agencia_volume.sql

@@ -1,44 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencia_volume`()
-BEGIN
-	DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE());
-	DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59');
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
-	CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
-	(
-		ticketFk INT PRIMARY KEY
-		,boxes INT DEFAULT 0
-	);
-
-	INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes)
-	SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox)
-		FROM vn.ticket t
-			JOIN vn.saleVolume sv ON sv.ticketFk = t.id
-			JOIN vn.volumeConfig vc
-		WHERE t.shipped BETWEEN vStarted AND vEnded
-			AND IFNULL(t.packages,0) = 0
-		GROUP BY t.id;
-	SELECT * FROM 
-	(
-	SELECT 	ag.id agency_id,
-			CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia, 
-			count(*) expediciones, 
-			sum(t.packages) Bultos, 
-			sum(tpe.boxes) Faltan
-		FROM vn.ticket t
-			JOIN vn.warehouse w ON w.id = t.warehouseFk 
-			JOIN vn.country c ON w.countryFk = c.id
-			JOIN vn.address a ON a.id = t.addressFk 
-			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-			JOIN vn.agency ag ON ag.id = am.agencyFk 
-			JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
-		WHERE t.shipped BETWEEN vStarted AND vEnded
-			AND ag.isOwn = FALSE
-		GROUP BY ag.id
-	) sub 
-	ORDER BY Agencia;
-			
-	DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/article.sql

@@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article`()
-BEGIN
-/**
- * Crea la tabla temporal: article_inventory
- */  
-	DROP TEMPORARY TABLE IF EXISTS article_inventory;
-	CREATE TEMPORARY TABLE article_inventory
-	(
-		`article_id` INT(11) NOT NULL PRIMARY KEY,
-		`future` DATETIME
-	)
-	ENGINE = MEMORY;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/risk_vs_client_list.sql

@@ -1,84 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`risk_vs_client_list`(maxRiskDate DATE)
-BEGIN
-/**
- * Calcula el riesgo para los clientes activos de la tabla temporal tmp.client_list
- *
- * @deprecated usar vn.client_getDebt
- * @param maxRiskDate Fecha maxima de los registros
- * @return table tmp.risk
- */
-	DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(util.VN_CURDATE()) - 60, util.VN_CURDATE());
-	DECLARE endingDate DATETIME;
-	DECLARE MAX_RISK_ALLOWED INT DEFAULT 200;
-
-	SET maxRiskDate = IFNULL(maxRiskDate, util.VN_CURDATE());
-	SET endingDate = TIMESTAMP(maxRiskDate, '23:59:59');
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list_2;
-	CREATE TEMPORARY TABLE tmp.client_list_2
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT *
-			FROM tmp.client_list;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list_3;
-	CREATE TEMPORARY TABLE tmp.client_list_3
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT *
-			FROM tmp.client_list;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.tickets_sin_facturar;
-	CREATE TEMPORARY TABLE tmp.tickets_sin_facturar
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-			SELECT t.Id_Cliente, floor(IF(cl.isVies, 1, 1.1) * sum(Cantidad * Preu * (100 - Descuento) / 100)) as total
-			FROM Movimientos m
-				JOIN Tickets t on m.Id_Ticket = t.Id_Ticket
-				JOIN tmp.client_list c on c.Id_Cliente = t.Id_Cliente
-				JOIN vn.client cl ON cl.id = t.Id_Cliente
-			WHERE Factura IS NULL
-				AND Fecha BETWEEN startingDate AND endingDate
-			GROUP BY t.Id_Cliente;      
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-	CREATE TEMPORARY TABLE tmp.risk
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT Id_Cliente, SUM(amount) risk, sum(saldo) saldo
-			FROM Clientes c
-			JOIN (
-				SELECT clientFk, SUM(amount) amount,SUM(amount) saldo 
-					FROM vn.clientRisk
-						JOIN tmp.client_list on Id_Cliente = clientFk
-					GROUP BY clientFk
-				UNION ALL
-				SELECT Id_Cliente, SUM(Entregado),SUM(Entregado)
-					FROM Recibos
-						JOIN tmp.client_list_2 using(Id_Cliente)
-					WHERE  Fechacobro > endingDate
-					GROUP BY Id_Cliente
-				UNION ALL
-				SELECT Id_Cliente, total,0
-					FROM tmp.tickets_sin_facturar
-				UNION ALL
-				SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)), CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2))
-					FROM hedera.tpvTransaction t
-						JOIN tmp.client_list_3 on Id_Cliente = t.clientFk
-					WHERE  t.receiptFk IS NULL
-						AND t.status = 'ok'
-					GROUP BY t.clientFk
-			) t ON c.Id_Cliente = t.clientFk
-			WHERE c.activo != FALSE 
-			GROUP BY c.Id_Cliente;
-			
-	DELETE r.*
-		FROM tmp.risk r
-			JOIN vn2008.Clientes c on c.Id_Cliente = r.Id_Cliente
-			JOIN vn2008.pay_met pm on pm.id = c.pay_met_id
-		WHERE IFNULL(r.saldo,0) < 10
-			AND r.risk <= MAX_RISK_ALLOWED
-			AND pm.`name` = 'TARJETA';
-END$$
-DELIMITER ;

db/routines/vn2008/views/Proveedores.sql

@@ -23,7 +23,7 @@ AS SELECT `s`.`id` AS `Id_Proveedor`,
 	`s`.`isOfficial` AS `oficial`,
 	`s`.`workerFk` AS `workerFk`,
 	`s`.`payDay` AS `pay_day`,
-	`s`.`isSerious` AS `serious`,
+	`s`.`isReal` AS `serious`,
 	`s`.`note` AS `notas`,
 	`s`.`taxTypeSageFk` AS `taxTypeSageFk`,
 	`s`.`withholdingSageFk` AS `withholdingSageFk`,

db/routines/vn2008/views/Proveedores_cargueras.sql

@@ -0,0 +1,5 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Proveedores_cargueras`
+AS SELECT `fs`.`supplierFk` AS `Id_Proveedor`
+FROM `vn`.`supplierFreight` `fs`

db/routines/vn2008/views/Tramos.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Tramos`
+AS SELECT `s`.`id` AS `id`,
+	`s`.`section` AS `Tramo`
+FROM `vn`.`timeSlots` `s`

db/routines/vn2008/views/payrollWorker.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_employee`
+AS SELECT `pw`.`workerFkA3` AS `CodTrabajador`,
+	`pw`.`companyFkA3` AS `codempresa`
+FROM `vn`.`payrollWorker` `pw`

db/routines/vn2008/views/payroll_centros.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_centros`
+AS SELECT `pwc`.`workCenterFkA3` AS `cod_centro`,
+	`pwc`.`companyFkA3` AS `codempresa`
+FROM `vn`.`payrollWorkCenter` `pwc`

db/routines/vn2008/views/payroll_conceptos.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_conceptos`
+AS SELECT `pc`.`id` AS `conceptoid`,
+	`pc`.`name` AS `concepto`,
+	`pc`.`isSalaryAgreed` AS `isSalaryAgreed`,
+	`pc`.`isVariable` AS `isVariable`,
+	`pc`.`isException` AS `isException`	
+FROM `vn`.`payrollComponent` `pc`

db/versions/10895-pinkArborvitae/00-firstScript.sql

@@ -0,0 +1,11 @@
+ALTER TABLE `vn`.`packingSite` DROP FOREIGN KEY IF EXISTS `packingSite_FK_4`;
+ALTER TABLE `vn`.`arcRead` DROP FOREIGN KEY IF EXISTS `worker_printer_FK`;
+ALTER TABLE `vn`.`host` DROP FOREIGN KEY IF EXISTS  `configHost_FK`;
+ALTER TABLE `vn`.`operator` DROP FOREIGN KEY IF EXISTS `operator_FK_5`;
+ALTER TABLE `vn`.`packingSite` DROP FOREIGN KEY IF EXISTS `packingSite_FK_1`;
+ALTER TABLE `vn`.`printQueue` DROP FOREIGN KEY IF EXISTS `printQueue_printerFk`;
+ALTER TABLE `vn`.`sector` DROP FOREIGN KEY IF EXISTS `sector_FK_1`;
+ALTER TABLE `vn`.`worker` DROP FOREIGN KEY IF EXISTS `worker_FK`;
+ALTER TABLE dipole.printer DROP FOREIGN KEY IF EXISTS printer_FK;
+ALTER TABLE dipole.expedition_PrintOut DROP FOREIGN KEY IF EXISTS expedition_PrintOut_FK;
+

db/versions/10895-pinkArborvitae/01-secondScript.sql

@@ -0,0 +1,28 @@
+ALTER TABLE `vn`.`printer` MODIFY COLUMN IF EXISTS `id` int unsigned auto_increment NOT NULL;
+
+ALTER TABLE `vn`.`arcRead` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`arcRead` ADD CONSTRAINT `arcRead_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`host` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`host` ADD CONSTRAINT `host_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`operator` MODIFY COLUMN IF EXISTS `labelerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`operator` ADD CONSTRAINT `operator_FK_4` FOREIGN KEY IF NOT EXISTS (labelerFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`packingSite` MODIFY COLUMN  IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`packingSite` ADD CONSTRAINT `packingSite_FK_1` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+
+ALTER TABLE `vn`.`packingSite` MODIFY COLUMN IF EXISTS `printerRfidFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`packingSite` ADD CONSTRAINT `packingSite_FK_4` FOREIGN KEY IF NOT EXISTS(printerRfidFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`printQueue` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`printQueue` ADD CONSTRAINT `printQueue_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`sector` MODIFY COLUMN IF EXISTS `mainPrinterFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`sector` ADD CONSTRAINT `sector_FK` FOREIGN KEY IF NOT EXISTS (mainPrinterFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `dipole`.`printer` MODIFY COLUMN IF EXISTS `id` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `dipole`.`printer` ADD CONSTRAINT `vnPrinter_FK` FOREIGN KEY IF NOT EXISTS (id) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `dipole`.`expedition_PrintOut` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT 0 NOT NULL;
+ALTER TABLE `dipole`.`expedition_PrintOut` ADD CONSTRAINT `expedition_PrintOut_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES printer(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10895-pinkArborvitae/02-thirdScript.sql

@@ -0,0 +1,17 @@
+
+ALTER TABLE `vn`.`productionConfig` ADD IF NOT EXISTS backupPrinterNotificationDelay int unsigned NULL 
+    COMMENT 'Minimum seconds Interval to Prevent Spam from Same-Type Notifications';
+
+ALTER TABLE vn.sector DROP FOREIGN KEY IF EXISTS sector_FK;
+
+ALTER TABLE `vn`.`sector` CHANGE IF EXISTS `mainPrinterFk` `backupPrinterFk` int unsigned DEFAULT NULL NULL;
+
+ALTER TABLE `util`.`notificationSubscription` DROP FOREIGN KEY IF EXISTS `notificationSubscription_ibfk_1`;
+ALTER TABLE `util`.`notificationQueue` DROP FOREIGN KEY IF EXISTS `nnotificationQueue_ibfk_1`;
+ALTER TABLE `util`.`notificationAcl` DROP FOREIGN KEY IF EXISTS `notificationAcl_ibfk_1`;
+
+ALTER TABLE `util`.`notification` MODIFY COLUMN IF EXISTS `id` int(11) auto_increment NOT NULL;
+
+ALTER TABLE `util`.`notificationSubscription` ADD CONSTRAINT `notificationSubscription_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `util`.`notificationQueue` ADD CONSTRAINT `notificationQueue_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `util`.`notificationAcl` ADD CONSTRAINT `notificationAcl_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10895-pinkArborvitae/03-insertBackUpNotification.vn.sql

@@ -0,0 +1,12 @@
+INSERT IGNORE INTO util.notification (name, description)
+	VALUES ('backup-printer-selected','A backup printer has been selected');
+
+INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk) 
+    SELECT id, 10435
+        FROM util.notification
+        WHERE name = 'backup-printer-selected'; 
+
+INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk) 
+    SELECT id, 66
+        FROM util.notification
+        WHERE name = 'backup-printer-selected'; 

db/versions/10900-redOak/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.supplier CHANGE COLUMN isSerious isReal tinyint(1) unsigned NOT NULL DEFAULT 0;

db/versions/10917-aquaPhormium/00-firstScript.sql

@@ -0,0 +1,9 @@
+UPDATE account.user
+SET name = LOWER(name),
+    name = REPLACE(name, ' ', ''),
+    name = REPLACE(name, '.', ''),
+    name = REPLACE(name, 'ñ', 'n'),
+    name = REPLACE(name, '*', ''),
+    name = REPLACE(name, 'ç', 'z'),
+    name = REPLACE(name, 'ã', 'a')
+WHERE NOT active;

db/versions/10930-wheatDendro/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS vn.flight ADD CONSTRAINT flight_airline_FK FOREIGN KEY (airlineFk) 
+    REFERENCES vn.airline(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10930-wheatDendro/01-Tramos.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`Tramos` RENAME `vn`.`timeSlots`;
+
+ALTER TABLE IF EXISTS `vn`.`timeSlots`
+CHANGE COLUMN IF EXISTS `Tramo` `section` time NOT NULL;

db/versions/10930-wheatDendro/02-dock.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`dock` RENAME `vn2008`.`dock__`;
+ALTER TABLE IF EXISTS vn2008.dock__ COMMENT='refs #6371 deprecated 2024-03-05';

db/versions/10930-wheatDendro/03-Proveedores_cargueras.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`Proveedores_cargueras` RENAME `vn`.`supplierFreight`;
+
+ALTER TABLE IF EXISTS `vn`.`supplierFreight`
+CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(10) unsigned NOT NULL;

db/versions/10930-wheatDendro/04-payroll_employee.sql

@@ -0,0 +1,13 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`payroll_employee` RENAME `vn`.`payrollWorker`;
+
+ALTER TABLE IF EXISTS `vn`.`payrollWorker`
+CHANGE COLUMN IF EXISTS `CodTrabajador` `workerFkA3` int(11) NOT NULL COMMENT 'Columna que hace referencia a A3.',
+CHANGE COLUMN IF EXISTS `nss` `nss__` varchar(23) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codpuesto` `codpuesto__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codempresa` `companyFkA3` int(10) NOT NULL COMMENT 'Columna que hace referencia a A3.',
+CHANGE COLUMN IF EXISTS `codcontrato` `codcontrato__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `FAntiguedad` `FAntiguedad__` date NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `grupotarifa` `grupotarifa__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codcategoria` `codcategoria__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `ContratoTemporal` `ContratoTemporal__` tinyint(1) NOT NULL DEFAULT 0 COMMENT '@Deprecated refs #6738 15/03/2024';

db/versions/10930-wheatDendro/05-payroll_centros.sql

@@ -0,0 +1,13 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`payroll_centros` RENAME `vn`.`payrollWorkCenter`;
+
+ALTER TABLE IF EXISTS `vn`.`payrollWorkCenter`
+CHANGE COLUMN IF EXISTS `cod_centro` `workCenterFkA3` int(11) NOT NULL COMMENT 'Columna que hace referencia a A3.',
+CHANGE COLUMN IF EXISTS `Centro` `Centro__` varchar(255) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `nss_cotizacion` `nss_cotizacion__` varchar(15) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `domicilio` `domicilio__` varchar(255) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `poblacion` `poblacion__` varchar(45) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `cp` `cp__` varchar(5) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `empresa_id` `empresa_id__` int(10) NOT NULL COMMENT '@Deprecated refs #6738 15/03/2024',
+CHANGE COLUMN IF EXISTS `codempresa` `companyFkA3` int(11) DEFAULT NULL COMMENT 'Columna que hace referencia a A3.';
+;

db/versions/10930-wheatDendro/06-payroll_conceptos.sql

@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS `vn2008`.`payroll_conceptos` RENAME `vn`.`payrollComponent`;
+
+ALTER TABLE IF EXISTS `vn`.`payrollComponent`
+CHANGE COLUMN IF EXISTS `conceptoid` `id` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `concepto` `name` varchar(255) DEFAULT NULL;

db/versions/10930-wheatDendro/07-Permisos.sql

@@ -0,0 +1,40 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Tramos` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.Tramos TO `employee`;
+GRANT SELECT ON TABLE vn.timeSlots TO `employee`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Proveedores_cargueras` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.Proveedores_cargueras TO `buyer`;
+GRANT SELECT ON TABLE vn.supplierFreight TO `buyer`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_employee` AS
+SELECT 1;
+
+GRANT SELECT,INSERT  ON TABLE vn2008.payroll_employee TO `hr`;
+GRANT SELECT,INSERT  ON TABLE vn.payrollWorker TO `hr`;
+
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_centros` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.payroll_centros TO `hr`;
+GRANT SELECT ON TABLE vn.payrollWorkCenter TO `hr`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`payroll_conceptos` AS
+SELECT 1;
+
+GRANT SELECT,UPDATE ON TABLE vn2008.payroll_conceptos TO `hr`;
+GRANT SELECT,UPDATE ON TABLE vn.payrollComponent TO `hr`;

db/versions/10948-azureSalal/00-addReconciliationConfig.sql

@@ -0,0 +1,8 @@
+	CREATE OR REPLACE TABLE `vn`.`accountReconciliationConfig` (
+	`id` INT AUTO_INCREMENT,
+	`currencyFk` TINYINT(3) unsigned,
+	`warehouseFk` SMALLINT(6) unsigned,
+	PRIMARY KEY (`id`),
+	CONSTRAINT `account_fk_currency` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`),
+	CONSTRAINT `account_fk_warehouse` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/versions/10948-azureSalal/01-addReconciliationConfig.vn.sql

@@ -0,0 +1,2 @@
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk) 
+	VALUES (1, 1);

db/versions/10948-azureSalal/02-grantPrivileges.sql

@@ -0,0 +1,13 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`agencyVolume`()
+BEGIN
+END;
+
+REVOKE EXECUTE ON PROCEDURE `vn2008`.`agencia_volume` FROM `agency`;
+GRANT EXECUTE ON PROCEDURE `vn`.`agencyVolume` TO `agency`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`addAccountReconciliation`()
+BEGIN
+END;
+
+REVOKE EXECUTE ON PROCEDURE `vn2008`.`account_conciliacion_add` FROM `financial`;
+GRANT EXECUTE ON PROCEDURE `vn`.`addAccountReconciliation` TO `financial`;

db/versions/10948-azureSalal/03-modifyColumn.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`accountReconciliation` MODIFY debitCredit ENUM('debit', 'credit');

db/versions/10949-limeLaurel/00-firstScript.sql

@@ -0,0 +1,15 @@
+	INSERT INTO util.notification ( name, description)
+		SELECT  'invoice-ticket-closure',
+				'Tickets not invoiced during the nightly closure ticket process';
+			
+	SET @notificationFk =LAST_INSERT_ID();
+
+	INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk)
+		SELECT  @notificationFk,id 
+			FROM account.role 
+			WHERE name ='administrative';
+
+	INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk)
+		SELECT @notificationFk, id 
+			FROM account.`user`
+			WHERE `name` = 'admon';

db/versions/10967-wheatLilium/00-firstScript.sql

@@ -0,0 +1,4 @@
+-- Place your SQL code here
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES('ItemShelving', 'hasItemOlder', 'READ', 'ALLOW', 'ROLE', 'production');

db/versions/10971-turquoiseRuscus/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn`.`greugeConfig`
+    ADD COLUMN IF NOT EXISTS `daysAgoOffset` int(11) NOT NULL;
+
+UPDATE vn.greugeConfig SET daysAgoOffset=15;

db/versions/10975-whiteIvy/00-action.sql

@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);

db/versions/10975-whiteIvy/01-expeditionFk.sql

@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);

db/versions/10976-greenCamellia/00-firstScript.sql

@@ -0,0 +1,20 @@
+CREATE OR REPLACE TEMPORARY TABLE tmp.claimsWithHasToPickUp
+	SELECT id
+		FROM vn.claim
+		WHERE hasToPickUp;
+
+ALTER TABLE vn.claim CHANGE hasToPickUp pickup ENUM('agency', 'delivery') DEFAULT NULL;
+
+UPDATE vn.claim c
+		JOIN tmp.claimsWithHasToPickUp tmp ON tmp.id = c.id
+	SET c.pickup = 'delivery';
+
+-- Solved bug empty value
+UPDATE vn.claim
+	SET pickup = NULL
+	WHERE pickup = '';
+
+DROP TEMPORARY TABLE tmp.claimsWithHasToPickUp;
+
+INSERT INTO salix.ACL (model,property,accessType,principalId)
+	VALUES ('Application','getEnumValues','*','employee');

db/versions/10977-wheatFern/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.buy DROP COLUMN packageFk;

db/versions/10988-blackIvy/00-pbx_prefix.sql

@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS pbx.prefix (
+    country CHAR(2) NOT NULL COMMENT 'Country code',
+    prefix varchar(100) NOT NULL COMMENT 'Country prefix',
+    CONSTRAINT prefix_pk PRIMARY KEY (country)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE pbx.config
+    CHANGE countryPrefix defaultPrefix varchar(20)
+        CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+ALTER TABLE pbx.config DROP COLUMN IF EXISTS sundayFestive;
+
+CREATE TABLE IF NOT EXISTS pbx.holiday (
+	id INT UNSIGNED auto_increment NOT NULL,
+	country CHAR(2) NOT NULL,
+	`day` DATE NOT NULL,
+	CONSTRAINT holiday_pk PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+CREATE UNIQUE INDEX holiday_country_IDX USING BTREE ON pbx.holiday (country,`day`);
+
+ALTER TABLE pbx.schedule
+    CHANGE timeStart startTime time NOT NULL,
+    CHANGE timeEnd endTime time NOT NULL,
+    DROP FOREIGN KEY schedule_ibfk_1,
+    DROP COLUMN queue,
+    ADD country CHAR(2) NOT NULL,
+    CHANGE weekDay weekDays set('mon','tue','wed','thu','fri','sat','sun') NOT NULL
+        COMMENT '0 = Monday, 6 = Sunday';
+

db/versions/10988-blackIvy/01-pbx_prefix.vn.sql

@@ -0,0 +1,13 @@
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('es','0034');
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('fr','0033');
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('pt','00351');
+
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','es');
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','fr');
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','pt');

db/versions/10990-yellowPalmetto/00-firstScript.sql

@@ -0,0 +1,5 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_getRisk`()
+BEGIN
+END;
+
+GRANT EXECUTE ON PROCEDURE vn.client_getRisk TO financialBoss;

e2e/helpers/selectors.js

@@ -762,7 +762,6 @@ export default {
     claimBasicData: {
         claimState: 'vn-claim-basic-data vn-autocomplete[ng-model="$ctrl.claim.claimStateFk"]',
         packages: 'vn-input-number[ng-model="$ctrl.claim.packages"]',
-        hasToPickUpCheckbox: 'vn-claim-basic-data vn-check[ng-model="$ctrl.claim.hasToPickUp"]',
         saveButton: `button[type=submit]`
     },
     claimDetail: {
@@ -1259,7 +1258,7 @@ export default {
     },
     supplierBasicData: {
         alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
-        isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]',
+        isReal: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isReal"]',
         isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
         isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
         notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',

e2e/paths/02-client/01_create_client.spec.js

@@ -32,7 +32,7 @@ describe('Client create path', () => {
             await page.autocompleteSearch(selectors.createClientView.salesPerson, 'salesPerson');
             await page.autocompleteSearch(selectors.createClientView.businessType, 'florist');
             await page.write(selectors.createClientView.taxNumber, '74451390E');
-            await page.write(selectors.createClientView.userName, 'CaptainMarvel');
+            await page.write(selectors.createClientView.userName, 'captainmarvel');
             await page.write(selectors.createClientView.email, 'CarolDanvers@verdnatura.es');
             await page.waitToClick(selectors.createClientView.createButton);
             const message = await page.waitForSnackbar();

e2e/paths/02-client/07_edit_web_access.spec.js

@@ -29,7 +29,7 @@ describe('Client web access path', () => {
         await page.click($.enableWebAccess);
         await page.click($.saveButton);
         const enableMessage = await page.waitForSnackbar();
-        await page.overwrite($.userName, 'Legion');
+        await page.overwrite($.userName, 'legion');
         await page.overwrite($.email, 'legion@marvel.com');
         await page.click($.saveButton);
         const modifyMessage = await page.waitForSnackbar();
@@ -47,7 +47,7 @@ describe('Client web access path', () => {
         expect(modifyMessage.type).toBe('success');
 
         expect(hasAccess).toBe('unchecked');
-        expect(userName).toEqual('Legion');
+        expect(userName).toEqual('legion');
         expect(email).toEqual('legion@marvel.com');
 
         // expect(logName).toEqual('Legion');

e2e/paths/02-client/09_add_credit.spec.js

@@ -34,6 +34,6 @@ describe('Client Add credit path', () => {
         const result = await page.waitToGetProperty(selectors.clientCredit.firstCreditText, 'innerText');
 
         expect(result).toContain(999);
-        expect(result).toContain('salesAssistant');
+        expect(result).toContain('salesassistant');
     });
 });

e2e/paths/02-client/19_summary.spec.js

@@ -61,7 +61,7 @@ describe('Client summary path', () => {
     it('should display web access details', async() => {
         const result = await page.waitToGetProperty(selectors.clientSummary.userName, 'innerText');
 
-        expect(result).toContain('PetterParker');
+        expect(result).toContain('petterparker');
     });
 
     it('should display business data', async() => {

e2e/paths/05-ticket/05_tracking_state.spec.js

@@ -59,7 +59,7 @@ describe('Ticket Create new tracking state path', () => {
             const result = await page
                 .waitToGetProperty(selectors.createStateView.worker, 'value');
 
-            expect(result).toEqual('salesPerson');
+            expect(result).toEqual('salesperson');
         });
 
         it(`should succesfully create a valid state`, async() => {

e2e/paths/06-claim/01_basic_data.spec.js

@@ -34,15 +34,6 @@ describe('Claim edit basic data path', () => {
         await page.waitForState('claim.card.detail');
     });
 
-    it('should check the "Pick up" checkbox', async() => {
-        await page.reloadSection('claim.card.basicData');
-        await page.waitToClick(selectors.claimBasicData.hasToPickUpCheckbox);
-        await page.waitToClick(selectors.claimBasicData.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
     it('should confirm the claim state was edited', async() => {
         await page.reloadSection('claim.card.basicData');
         await page.waitForSelector(selectors.claimBasicData.claimState);
@@ -51,12 +42,6 @@ describe('Claim edit basic data path', () => {
         expect(result).toEqual('Resuelto');
     });
 
-    it('should confirm the "is paid with mana" and "Pick up" checkbox are checked', async() => {
-        const hasToPickUpCheckbox = await page.checkboxState(selectors.claimBasicData.hasToPickUpCheckbox);
-
-        expect(hasToPickUpCheckbox).toBe('checked');
-    });
-
     it('should confirm the claim packages was edited', async() => {
         const result = await page
             .waitToGetProperty(selectors.claimBasicData.packages, 'value');

e2e/paths/13-supplier/02_basic_data.spec.js

@@ -20,7 +20,7 @@ describe('Supplier basic data path', () => {
     it('should edit the basic data', async() => {
         await page.clearInput(selectors.supplierBasicData.alias);
         await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
-        await page.waitToClick(selectors.supplierBasicData.isSerious);
+        await page.waitToClick(selectors.supplierBasicData.isReal);
         await page.waitToClick(selectors.supplierBasicData.isActive);
         await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
         await page.write(selectors.supplierBasicData.notes, 'Some notes');
@@ -41,8 +41,8 @@ describe('Supplier basic data path', () => {
         expect(result).toEqual('Plants Nick SL');
     });
 
-    it('should check the isSerious checkbox is now checked', async() => {
+    it('should check the isReal checkbox is now checked', async() => {
-        const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
+        const result = await page.checkboxState(selectors.supplierBasicData.isReal);
 
         expect(result).toBe('checked');
     });

e2e/paths/14-account/01_create_and_basic_data.spec.js

@@ -21,7 +21,7 @@ describe('Account create and basic data path', () => {
     });
 
     it('should fill the form and then save it by clicking the create button', async() => {
-        await page.write(selectors.accountIndex.newName, 'Remy');
+        await page.write(selectors.accountIndex.newName, 'remy');
         await page.write(selectors.accountIndex.newNickname, 'Gambit');
         await page.write(selectors.accountIndex.newEmail, 'RemyEtienneLeBeau@verdnatura.es');
         await page.autocompleteSearch(selectors.accountIndex.newRole, 'Trainee');
@@ -39,7 +39,7 @@ describe('Account create and basic data path', () => {
     it('should check the name is as expected', async() => {
         const result = await page.waitToGetProperty(selectors.accountBasicData.name, 'value');
 
-        expect(result).toEqual('Remy');
+        expect(result).toEqual('remy');
     });
 
     it('should check the nickname is as expected', async() => {

e2e/paths/14-account/02_alias_create_and_basic_data.spec.js

@@ -8,7 +8,7 @@ describe('Account Alias create and basic data path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('developer', 'account');
+        await page.loginAndModule('itManagement', 'account');
         await page.accessToSection('account.alias');
     });
 

front/core/components/link-phone/index.html

@@ -5,7 +5,6 @@
             flat
             round
             icon="phone"
-            title="MicroSIP"
             ng-click="$event.stopPropagation();"
         >
         </vn-icon>

front/core/services/auth.js

@@ -86,7 +86,8 @@ export default class Auth {
         return this.$http.get('VnUsers/ShareToken', {
             headers: {Authorization: json.data.token}
         }).then(({data}) => {
-            this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
+            // Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado
+            this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
             this.loadAcls().then(() => {
                 let continueHash = this.$state.params.continue;
                 if (continueHash)

front/core/services/token.js

@@ -59,7 +59,8 @@ export default class Token {
 
     getStorage(storage) {
         this.token = storage.getItem('vnToken');
-        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
+        // Cambio realizado temporalmente
+        this.tokenMultimedia = this.token; // storage.getItem('vnTokenMultimedia');
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);

loopback/common/methods/application/getEnumValues.js

@@ -0,0 +1,56 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('getEnumValues', {
+        description: 'Return enum values of column',
+        accessType: 'EXECUTE',
+        accepts: [
+            {
+                arg: 'schema',
+                type: 'string',
+                description: 'The schema of db',
+                required: true,
+            },
+            {
+                arg: 'table',
+                type: 'string',
+                description: 'The table of schema',
+                required: true,
+            },
+            {
+                arg: 'column',
+                type: 'string',
+                description: 'The column of table',
+                required: true,
+            },
+        ],
+        returns: {
+            type: 'any',
+            root: true
+        },
+        http: {
+            path: `/get-enum-values`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getEnumValues = async(schema, table, column) => {
+        const stmt = new ParameterizedSQL(`
+            SELECT COLUMN_TYPE
+                FROM information_schema.COLUMNS
+                    WHERE TABLE_SCHEMA = ?
+                        AND TABLE_NAME = ?
+                        AND COLUMN_NAME = ?
+                        AND DATA_TYPE = 'enum';`,
+        [schema, table, column]);
+
+        const conn = Self.dataSource.connector;
+        const [result] = await conn.executeStmt(stmt);
+
+        if (!result) throw new UserError(`No results found`);
+
+        const regex = /'([^']*)'/g;
+        return result.COLUMN_TYPE.match(regex).map(match => match.slice(1, -1));
+    };
+};

loopback/common/methods/application/spec/getEnumValues.spec.js

@@ -0,0 +1,35 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Application getEnumValues()', () => {
+    let tx;
+
+    beforeEach(async() => {
+        tx = await models.Application.beginTransaction({});
+        const options = {transaction: tx};
+
+        await models.Application.rawSql(`
+            CREATE TABLE tableWithEnum (
+                direction enum('in', 'out', 'middle'),
+                PRIMARY KEY (direction)
+            ) ENGINE=InnoDB;
+        `, null, options);
+    });
+
+    it('should return three if is ok', async() => {
+        try {
+            const options = {transaction: tx};
+            const response = await models.Application.getEnumValues(
+                'vn',
+                'tableWithEnum',
+                'direction',
+                options
+            );
+
+            expect(response.length).toEqual(3);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});