Merge branch 'dev' into 7181-risk_vs_client_list

2024-04-11 07:29:32 +00:00 · 2024-04-11 07:29:32 +00:00 · c9b2bb5b5e
parent b1dc5efc8b 7ddc0b087e
commit c9b2bb5b5e
73 changed files with 1327 additions and 669 deletions
--- a/CHANGELOG.md
+++ b/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
--- a/back/methods/chat/spec/send.spec.js
+++ b/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);
    });
--- a/back/methods/collection/getSales.js
+++ b/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.__;
--- a/back/methods/url/getUrl.js
+++ b/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;
    };
 };
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

-INSERT INTO `version` VALUES ('vn-database','10970','7ea917dc4db761955007c73bbd4667a0e44b8e9c','2024-04-05 07:49:24','10981');
+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);
@ -762,7 +762,7 @@ 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','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);
@ -1819,7 +1819,7 @@ INSERT INTO `ACL` VALUES (819,'Ticket','addSaleByCode','WRITE','ALLOW','ROLE','p
 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','developer');
+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');
--- a/db/dump/.dump/privileges.sql
+++ b/db/dump/.dump/privileges.sql
@ -1378,6 +1378,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','machineDetai
 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 */;
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
@ -11740,6 +11740,417 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;

+--
+-- Current Database: `floranet`
+--
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `floranet` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
+
+USE `floranet`;
+
+--
+-- Table structure for table `addressPostCode`
+--
+
+DROP TABLE IF EXISTS `addressPostCode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `addressPostCode` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `addressFk` int(11) NOT NULL,
+  `postCode` varchar(30) NOT NULL,
+  `hoursInAdvance` int(10) unsigned NOT NULL DEFAULT 24,
+  `dayOfWeek` int(10) unsigned NOT NULL,
+  `deliveryCost` decimal(10,2) NOT NULL DEFAULT 0.00,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `addressPostCode_unique` (`postCode`,`addressFk`,`dayOfWeek`),
+  KEY `addressPostCode_address_FK` (`addressFk`),
+  CONSTRAINT `addressPostCode_address_FK` FOREIGN KEY (`addressFk`) REFERENCES `vn`.`address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Client''s address registered for floranet network';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `builder`
+--
+
+DROP TABLE IF EXISTS `builder`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `builder` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemFk` int(11) NOT NULL,
+  `elementFk` int(11) NOT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  KEY `builder_FK` (`itemFk`),
+  KEY `builder_FK_1` (`elementFk`),
+  CONSTRAINT `builder_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `builder_FK_1` FOREIGN KEY (`elementFk`) REFERENCES `element` (`itemFk`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links handmade products with their elements';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `catalogue`
+--
+
+DROP TABLE IF EXISTS `catalogue`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `catalogue` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `price` decimal(10,2) NOT NULL,
+  `itemFk` int(11) NOT NULL,
+  `dated` date DEFAULT NULL,
+  `postalCode` varchar(12) DEFAULT NULL,
+  `type` varchar(50) DEFAULT NULL,
+  `image` varchar(255) DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `payed` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `itemFk` (`itemFk`),
+  CONSTRAINT `catalogue_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `element`
+--
+
+DROP TABLE IF EXISTS `element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `element` (
+  `itemFk` int(11) NOT NULL,
+  `typeFk` smallint(5) unsigned DEFAULT NULL,
+  `size` int(11) DEFAULT NULL,
+  `inkFk` char(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `name` varchar(30) DEFAULT NULL,
+  `quantity` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`itemFk`),
+  KEY `element_FK` (`itemFk`),
+  KEY `element_FK_1` (`typeFk`),
+  KEY `element_FK_2` (`inkFk`),
+  KEY `element_FK_3` (`originFk`),
+  CONSTRAINT `element_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_2` FOREIGN KEY (`inkFk`) REFERENCES `vn`.`ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_3` FOREIGN KEY (`originFk`) REFERENCES `vn`.`origin` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Filtro para localizar posibles items que coincidan con la descripción';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `order`
+--
+
+DROP TABLE IF EXISTS `order`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `order` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `catalogueFk` int(11) DEFAULT NULL,
+  `customerName` varchar(100) DEFAULT NULL,
+  `email` varchar(100) DEFAULT NULL,
+  `customerPhone` varchar(15) DEFAULT NULL,
+  `message` varchar(255) DEFAULT NULL,
+  `deliveryName` varchar(100) DEFAULT NULL,
+  `address` varchar(200) DEFAULT NULL,
+  `deliveryPhone` varchar(100) DEFAULT NULL,
+  `isPaid` tinyint(1) NOT NULL DEFAULT 0,
+  `payed` datetime DEFAULT NULL,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `catalogueFk` (`catalogueFk`),
+  CONSTRAINT `order_ibfk_1` FOREIGN KEY (`catalogueFk`) REFERENCES `catalogue` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping events for database 'floranet'
+--
+/*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
+/*!50106 DROP EVENT IF EXISTS `clean` */;
+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  = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET @saved_time_zone      = @@time_zone */ ;;
+/*!50003 SET time_zone             = 'SYSTEM' */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `clean` ON SCHEDULE EVERY 1 DAY STARTS '2024-01-01 23:00:00' ON COMPLETION PRESERVE ENABLE DO BEGIN
+	DELETE 
+		FROM `order`
+		WHERE created < CURDATE()
+			AND isPaid = FALSE;
+
+	DELETE c.*
+		FROM catalogue c
+			LEFT JOIN `order` o ON o.catalogueFk = c.id 
+		WHERE c.created < CURDATE()
+			AND o.id IS NULL;
+END */ ;;
+/*!50003 SET time_zone             = @saved_time_zone */ ;;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;;
+/*!50003 SET character_set_results = @saved_cs_results */ ;;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;;
+DELIMITER ;
+/*!50106 SET TIME_ZONE= @save_time_zone */ ;
+
+--
+-- Dumping routines for database 'floranet'
+--
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `catalogue_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalogue_get`(vLanded DATE, vPostalCode VARCHAR(15))
+    READS SQL DATA
+BEGIN
+/**
+ * Returns list, price and all the stuff regarding the floranet items
+ * 
+ * @param vLanded Delivery date
+ * @param vPostalCode Delivery address postal code
+ */
+	DECLARE vLastCatalogueFk INT;
+
+	START TRANSACTION;
+
+	SELECT * FROM catalogue FOR UPDATE;
+
+	SELECT MAX(id) INTO vLastCatalogueFk
+		FROM catalogue;
+
+	INSERT INTO catalogue(
+					name,
+					price,
+					itemFk,
+					dated,
+					postalCode,
+					`type`,
+					image,
+					description
+				)
+		SELECT 	i.name,
+				i.`size`,
+				i.id,
+				vLanded,
+				vPostalCode,
+				it.name, 
+				CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image), 
+				i.description
+			FROM vn.item i
+				JOIN vn.itemType it ON it.id = i.typeFk
+			WHERE it.code IN ('FNR','FNP');
+
+	SELECT *
+		FROM catalogue
+		WHERE id > IFNULL(vLastCatalogueFk,0);
+
+	COMMIT;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `contact_request` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `contact_request`(
+	vName VARCHAR(100),
+	vPhone VARCHAR(15),
+	vEmail VARCHAR(100),
+	vMessage TEXT)
+    READS SQL DATA
+BEGIN
+/**
+ * Set actions for contact request.
+ * 
+ * @param vPostalCode Delivery address postal code
+ */
+	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `deliveryDate_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deliveryDate_get`(vPostalCode VARCHAR(15))
+    READS SQL DATA
+BEGIN
+/**
+ * Returns available dates for this postalCode, in the next seven days
+ * 
+ * @param vPostalCode Delivery address postal code
+ */
+	DECLARE vCurrentDayOfWeek INT;
+
+	SET vCurrentDayOfWeek = DAYOFWEEK(NOW());
+
+	SELECT DISTINCT nextDay 
+		FROM (
+				SELECT CURDATE() + INTERVAL IF(
+					apc.dayOfWeek >= vCurrentDayOfWeek,
+					apc.dayOfWeek - vCurrentDayOfWeek,
+					7 - apc.dayOfWeek
+					) DAY nextDay,
+	NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime
+	FROM addressPostCode apc
+		WHERE apc.postCode = vPostalCode
+	HAVING nextDay > minDeliveryTime) sub;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `order_confirm` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_confirm`(vCatalogueFk INT)
+    READS SQL DATA
+BEGIN
+/** Update order.isPaid field
+ *  
+ *  @param vCatalogueFk floranet.catalogue.id
+ * 
+ *  @returns floranet.order.isPaid
+ */
+	UPDATE `order`
+		SET isPaid = TRUE,
+			payed = NOW()
+		WHERE catalogueFk = vCatalogueFk;
+
+	SELECT isPaid
+		FROM `order`
+		WHERE catalogueFk = vCatalogueFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `order_put` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_put`(vOrder JSON)
+    READS SQL DATA
+BEGIN
+/**
+ *  Get and process an order
+ * 
+ * @param vOrder Data of the order
+ *
+ *	Customer data: <customerName>, <email>, <customerPhone>
+ *
+ *	Item data: <catalogueFk>, <message>	
+ *
+ *	Delivery data: <deliveryName>, <address>, <deliveryPhone>
+ *
+ */
+	INSERT IGNORE INTO `order`(
+							catalogueFk,
+							customerName,
+							email,
+							customerPhone,
+							message,
+							deliveryName,
+							address,
+							deliveryPhone
+	)
+		VALUES (JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.catalogueFk')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerName')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.email')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerPhone')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.message')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryName')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.address')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryPhone'))
+		);
+
+	SELECT LAST_INSERT_ID() orderFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sliders_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sliders_get`()
+    READS SQL DATA
+BEGIN
+/**
+ * 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');
+    
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Current Database: `hedera`
 --
@ -86045,6 +86456,12 @@ USE `edi`;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;

+--
+-- Current Database: `floranet`
+--
+
+USE `floranet`;
+
 --
 -- Current Database: `hedera`
 --
@ -91244,4 +91661,4 @@ USE `vn2008`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2024-04-05  7:59:52
+-- Dump completed on 2024-04-08  7:13:58
--- a/db/dump/.dump/triggers.sql
+++ b/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`
 --
@ -10991,4 +10997,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2024-04-05  8:00:14
+-- Dump completed on 2024-04-08  7:14:22
--- a/db/dump/fixtures.before.sql
+++ b/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'),
-        (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'),
-        (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'),
-        (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'),
-        (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'),
-        (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'),
-        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
+        (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'),
+        (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'),
+        (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'),
+        (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'),
+        (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'),
+        (1111, 'missing',            'Missing',              '$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)
@ -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);
@ -2913,7 +2913,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
@ -3735,3 +3736,18 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 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);
--- a/db/routines/account/procedures/user_checkName.sql
+++ b/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;
--- a/db/routines/bi/procedures/greuge_dif_porte_add.sql
+++ b/db/routines/bi/procedures/greuge_dif_porte_add.sql
@ -1,8 +1,19 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
 BEGIN
-	DECLARE datSTART DATETIME DEFAULT TIMESTAMPADD(DAY,-60,util.VN_CURDATE()); -- '2019-07-01'
-	DECLARE datEND DATETIME DEFAULT TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
+
+/**
+ * Calculates the greuge based on a specific date in the 'grievanceConfig' table
+ */
+
+	DECLARE vDateStarted DATETIME;
+	DECLARE vDateEnded DATETIME DEFAULT (util.VN_CURDATE() - INTERVAL 1 DAY);
+	DECLARE vDaysAgoOffset INT;
+
+	SELECT daysAgoOffset INTO vDaysAgoOffset
+		FROM vn.greugeConfig;
+
+	SET vDateStarted = util.VN_CURDATE() - INTERVAL vDaysAgoOffset DAY;

 	DROP TEMPORARY TABLE IF EXISTS tmp.dp;

@ -11,35 +22,34 @@ BEGIN
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk,
-			SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) AS teorico,
-			00000.00 as practico,
-			00000.00 as greuge,
+				SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) teorico,
+				00000.00 practico,
+				00000.00 greuge,
 				t.clientFk,
 				t.shipped
-		FROM
-			vn.ticket t
-			JOIN vn2008.Clientes cli ON cli.Id_cliente = t.clientFk
+			FROM vn.ticket t
+				JOIN vn.client c ON c.id = t.clientFk
 				LEFT JOIN vn.expedition e ON e.ticketFk = t.id
 				JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
 				JOIN vn.zone z ON t.zoneFk = z.id
-		WHERE
-			t.shipped between datSTART AND datEND
-				AND cli.`real`
-				AND t.companyFk IN (442 , 567)
-				AND z.isVolumetric = FALSE
+				JOIN vn.company cp ON cp.id = t.companyFk
+			WHERE t.shipped BETWEEN vDateStarted AND vDateEnded
+				AND c.isRelevant
+				AND cp.code IN ('VNL', 'VNH')
+				AND NOT z.isVolumetric
 			GROUP BY t.id;

 	-- Agencias que cobran por volumen
 	INSERT INTO tmp.dp
 		SELECT sv.ticketFk,
-			SUM(IFNULL(sv.freight,0)) AS teorico,
-			00000.00 as practico,
-			00000.00 as greuge,
+				SUM(IFNULL(sv.freight,0)) teorico,
+				00000.00 practico,
+				00000.00 greuge,
 				sv.clientFk,
 				sv.shipped
 			FROM vn.saleVolume sv
 				JOIN vn.zone z ON z.id = sv.zoneFk
-				AND sv.shipped BETWEEN datSTART AND datEND
+					AND sv.shipped BETWEEN vDateStarted AND vDateEnded
 					AND z.isVolumetric != FALSE
 			GROUP BY sv.ticketFk;

@ -48,11 +58,12 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.dp_aux
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT dp.ticketFk, sum(Cantidad * Valor) as valor
+		SELECT dp.ticketFk, SUM(s.quantity * sc.value) valor
 			FROM tmp.dp
-		JOIN vn2008.Movimientos m ON m.Id_Ticket = dp.ticketFk
-		JOIN vn2008.Movimientos_componentes mc using(Id_Movimiento)
-		WHERE mc.Id_Componente = 15
+				JOIN vn.sale s ON s.ticketFk = dp.ticketFk
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id
+				JOIN vn.component c ON c.id = sc.componentFk
+			WHERE c.code = 'delivery'
 			GROUP BY dp.ticketFk;

 	UPDATE tmp.dp
@ -64,10 +75,11 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.dp_aux
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT dp.ticketFk, sum(g.amount) Importe
+		SELECT dp.ticketFk, SUM(g.amount) Importe
 			FROM tmp.dp
 				JOIN vn.greuge g ON g.ticketFk = dp.ticketFk
-				WHERE g.greugeTypeFk = 1 -- dif_porte
+				JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
+			WHERE gt.code = 'freightDifference' -- dif_porte
 			GROUP BY dp.ticketFk;

 	UPDATE tmp.dp
@ -75,12 +87,12 @@ BEGIN
 		SET greuge = IFNULL(Importe,0);

 	INSERT INTO vn.greuge (clientFk,description,amount,shipped,greugeTypeFk,ticketFk)
-		SELECT dp.clientFk
-			  , concat('dif_porte ', dp.ticketFk)
-			  , round(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) as Importe
-			  , date(dp.shipped)
-			  , 1
-			  ,dp.ticketFk
+		SELECT dp.clientFk,
+				CONCAT('dif_porte ', dp.ticketFk), 
+				ROUND(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) Importe,
+				date(dp.shipped), 
+				1,
+				dp.ticketFk
 			FROM tmp.dp
 				JOIN vn.client c ON c.id = dp.clientFk
 			WHERE ABS(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0)) > 1
--- a/db/routines/floranet/procedures/catalogue_get.sql
+++ b/db/routines/floranet/procedures/catalogue_get.sql
@ -4,7 +4,7 @@ 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
 * 
@ -12,10 +12,22 @@ BEGIN
 * @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 ;
--- a/db/routines/floranet/procedures/sliders_get.sql
+++ b/db/routines/floranet/procedures/sliders_get.sql
@ -13,7 +13,8 @@ BEGIN
        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 ;
--- a/db/routines/vn/procedures/addAccountReconciliation.sql
+++ b/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 ;
--- a/db/routines/vn/procedures/agencyVolume.sql
+++ b/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 ;
--- a/db/routines/vn/procedures/entry_checkBooked.sql
+++ b/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$$
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/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
--- a/db/routines/vn2008/procedures/account_conciliacion_add.sql
+++ b/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 ;
--- a/db/routines/vn2008/procedures/agencia_volume.sql
+++ b/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 ;
--- a/db/routines/vn2008/procedures/article.sql
+++ b/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 ;
--- a/db/routines/vn2008/views/Proveedores.sql
+++ b/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`,
--- a/db/versions/10900-redOak/00-firstScript.sql
+++ b/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;
--- a/db/versions/10917-aquaPhormium/00-firstScript.sql
+++ b/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;
--- a/db/versions/10948-azureSalal/00-addReconciliationConfig.sql
+++ b/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;
--- a/db/versions/10948-azureSalal/01-addReconciliationConfig.vn.sql
+++ b/db/versions/10948-azureSalal/01-addReconciliationConfig.vn.sql
@ -0,0 +1,2 @@
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk) 
+	VALUES (1, 1);
--- a/db/versions/10948-azureSalal/02-grantPrivileges.sql
+++ b/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`;
--- a/db/versions/10948-azureSalal/03-modifyColumn.sql
+++ b/db/versions/10948-azureSalal/03-modifyColumn.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`accountReconciliation` MODIFY debitCredit ENUM('debit', 'credit');
--- a/db/versions/10971-turquoiseRuscus/00-firstScript.sql
+++ b/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;
--- a/db/versions/10976-greenCamellia/00-firstScript.sql
+++ b/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');
--- a/e2e/helpers/selectors.js
+++ b/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"]',
--- a/e2e/paths/02-client/01_create_client.spec.js
+++ b/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();
--- a/e2e/paths/02-client/07_edit_web_access.spec.js
+++ b/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');
--- a/e2e/paths/02-client/09_add_credit.spec.js
+++ b/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');
    });
 });
--- a/e2e/paths/02-client/19_summary.spec.js
+++ b/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() => {
--- a/e2e/paths/05-ticket/05_tracking_state.spec.js
+++ b/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() => {
--- a/e2e/paths/06-claim/01_basic_data.spec.js
+++ b/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');
--- a/e2e/paths/13-supplier/02_basic_data.spec.js
+++ b/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() => {
-        const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
+    it('should check the isReal checkbox is now checked', async() => {
+        const result = await page.checkboxState(selectors.supplierBasicData.isReal);

        expect(result).toBe('checked');
    });
--- a/e2e/paths/14-account/01_create_and_basic_data.spec.js
+++ b/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() => {
--- a/front/core/services/auth.js
+++ b/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)
--- a/loopback/common/methods/application/getEnumValues.js
+++ b/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));
+    };
+};
--- a/loopback/common/methods/application/spec/getEnumValues.spec.js
+++ b/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;
+        }
+    });
+});
--- a/loopback/common/models/application.js
+++ b/loopback/common/models/application.js
@ -5,4 +5,5 @@ module.exports = function(Self) {
    require('../methods/application/execute')(Self);
    require('../methods/application/executeProc')(Self);
    require('../methods/application/executeFunc')(Self);
+    require('../methods/application/getEnumValues')(Self);
 };
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -68,7 +68,7 @@
    "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
    "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
    "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked, with the pickup type *{{claimPickup}}*",
    "Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
    "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
    "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
@ -89,6 +89,8 @@
    "landed": "Landed",
    "addressFk": "Address",
    "companyFk": "Company",
+    "agency": "Agency",
+    "delivery": "Delivery",
    "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
    "The social name cannot be empty": "The social name cannot be empty",
    "The nif cannot be empty": "The nif cannot be empty",
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -135,7 +135,7 @@
 	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
 	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*, con el tipo de recogida *{{claimPickup}}*",
 	"Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
 	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
 	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
@ -168,6 +168,8 @@
 	"landed": "F. entrega",
 	"addressFk": "Consignatario",
 	"companyFk": "Empresa",
+	"agency": "Agencia",
+	"delivery": "Reparto",
 	"The social name cannot be empty": "La razón social no puede quedar en blanco",
 	"The nif cannot be empty": "El NIF no puede quedar en blanco",
 	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
@ -349,5 +351,6 @@
 	"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
 	"The line could not be marked": "La linea no puede ser marcada",
 	"This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
-    "They're not your subordinate": "No es tu subordinado/a."
+	"They're not your subordinate": "No es tu subordinado/a.",
+	"No results found": "No se han encontrado resultados"
 }
--- a/modules/claim/back/locale/claim/en.yml
+++ b/modules/claim/back/locale/claim/en.yml
@ -6,7 +6,6 @@ columns:
    isChargedToMana: charged to mana
    created: created
    responsibility: responsibility
-    hasToPickUp: has to pickUp
    ticketFk: ticket
    claimStateFk: claim state
    workerFk: worker
--- a/modules/claim/back/locale/claim/es.yml
+++ b/modules/claim/back/locale/claim/es.yml
@ -6,7 +6,6 @@ columns:
    isChargedToMana: cargado al maná
    created: creado
    responsibility: responsabilidad
-    hasToPickUp: es recogida
    ticketFk: ticket
    claimStateFk: estado reclamación
    workerFk: trabajador
--- a/modules/claim/back/methods/claim/specs/log.spec.js
+++ b/modules/claim/back/methods/claim/specs/log.spec.js
@ -11,7 +11,7 @@ describe('claim log()', () => {
            model: 'Claim',
            action: 'update',
            changes: [
-                {property: 'hasToPickUp', before: false, after: true}
+                {property: 'pickup', before: null, after: 'agency'}
            ]
        };

--- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
@ -86,7 +86,7 @@ describe('Update Claim', () => {
                args: {
                    observation: 'valid observation',
                    claimStateFk: pendingState,
-                    hasToPickUp: false
+                    pickup: null
                }
            };
            ctx.req.__ = i18n.__;
@ -124,7 +124,7 @@ describe('Update Claim', () => {
                args: {
                    observation: 'valid observation',
                    claimStateFk: canceledState,
-                    hasToPickUp: false
+                    pickup: null
                }
            };
            ctx.req.__ = i18n.__;
@ -163,7 +163,7 @@ describe('Update Claim', () => {
                    claimStateFk: 3,
                    workerFk: 5,
                    observation: 'another valid observation',
-                    hasToPickUp: true
+                    pickup: 'agency'
                }
            };
            ctx.req.__ = i18n.__;
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@ -27,8 +27,8 @@ module.exports = Self => {
            type: 'string'
        },
        {
-            arg: 'hasToPickUp',
-            type: 'boolean'
+            arg: 'pickup',
+            type: 'any'
        },
        {
            arg: 'packages',
@ -72,9 +72,7 @@ module.exports = Self => {
            // Get sales person from claim client
            const salesPerson = claim.client().salesPersonUser();

-            let changedHasToPickUp = false;
-            if (args.hasToPickUp)
-                changedHasToPickUp = true;
+            const changedPickup = args.pickup != claim.pickup;

            // Validate when claimState has been changed
            if (args.claimStateFk) {
@ -82,15 +80,15 @@ module.exports = Self => {
                const canEditNewState = await models.ClaimState.isEditable(ctx, args.claimStateFk, myOptions);
                const canEditState = await models.ACL.checkAccessAcl(ctx, 'Claim', 'editState', 'WRITE');

-                if (!canEditOldState || !canEditNewState || changedHasToPickUp && !canEditState)
+                if (!canEditOldState || !canEditNewState || changedPickup && !canEditState)
                    throw new UserError(`You don't have enough privileges to change that field`);
            }

            delete args.ctx;
            const updatedClaim = await claim.updateAttributes(args, myOptions);

-            // When hasToPickUp has been changed
-            if (salesPerson && changedHasToPickUp && updatedClaim.hasToPickUp)
+            // When pickup has been changed
+            if (salesPerson && changedPickup && updatedClaim.pickup)
                await notifyPickUp(ctx, salesPerson.id, claim);

            // When claimState has been changed
@ -132,7 +130,8 @@ module.exports = Self => {
        const message = $t('Claim will be picked', {
            claimId: claim.id,
            clientName: claim.client().name,
-            claimUrl: `${url}claim/${claim.id}/summary`
+            claimUrl: `${url}claim/${claim.id}/summary`,
+            claimPickup: $t(claim.pickup)
        });
        await models.Chat.sendCheckingPresence(ctx, workerId, message);
    }
--- a/modules/claim/back/models/claim.json
+++ b/modules/claim/back/models/claim.json
@ -31,8 +31,8 @@
        "responsibility": {
            "type": "number"
        },
-        "hasToPickUp": {
-            "type": "boolean"
+        "pickup": {
+            "type": "string"
        },
        "ticketFk": {
            "type": "number"
--- a/modules/claim/front/action/index.spec.js
+++ b/modules/claim/front/action/index.spec.js
@ -85,7 +85,7 @@ describe('claim', () => {
            it('should perform a patch query and show a success message', () => {
                jest.spyOn(controller.vnApp, 'showSuccess');

-                const data = {hasToPickUp: true};
+                const data = {pickup: 'agency'};
                $httpBackend.expect('PATCH', `Claims/1/updateClaimAction`, data).respond({});
                controller.save(data);
                $httpBackend.flush();
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@ -49,13 +49,6 @@
                label="Packages received"
                ng-model="$ctrl.claim.packages">
            </vn-input-number>
-            <vn-check
-                class="vn-mr-md"
-                label="Pick up"
-                ng-model="$ctrl.claim.hasToPickUp"
-                vn-acl="claimManager"
-                title="{{'When checked will notify to the salesPerson' | translate}}">
-            </vn-check>
        </vn-horizontal>
    </vn-card>
    <vn-button-bar>
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@ -49,13 +49,6 @@
                label="Attended by"
                value="{{$ctrl.summary.claim.worker.user.nickname}}">
            </vn-label-value>
-            <vn-check
-                class="vn-mr-md"
-                label="Pick up"
-                ng-model="$ctrl.summary.claim.hasToPickUp"
-                title="{{'When checked will notify to the salesPerson' | translate}}"
-                disabled="true">
-            </vn-check>
        </vn-auto>
        <vn-auto>
            <h4 ng-show="$ctrl.isSalesPerson && $ctrl.summary.observations.length">
--- a/modules/client/back/methods/client/specs/createWithUser.spec.js
+++ b/modules/client/back/methods/client/specs/createWithUser.spec.js
@ -3,8 +3,8 @@ const LoopBackContext = require('loopback-context');

 describe('Client Create', () => {
    const newAccount = {
-        userName: 'Deadpool',
-        email: 'Deadpool@marvel.com',
+        userName: 'deadpool',
+        email: 'deadpool@marvel.com',
        fi: '16195279J',
        name: 'Wade',
        socialName: 'DEADPOOL MARVEL',
@ -31,7 +31,7 @@ describe('Client Create', () => {
        });
    });

-    it(`should not find Deadpool as he's not created yet`, async() => {
+    it(`should not find deadpool as he's not created yet`, async() => {
        const tx = await models.Client.beginTransaction({});

        try {
--- a/modules/client/back/models/specs/client.spec.js
+++ b/modules/client/back/models/specs/client.spec.js
@ -31,8 +31,8 @@ describe('Client Model', () => {

            await models.Client.notifyAssignment(instance, previousWorkerId, currentWorkerId);

-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@DavidCharlesHaller', `Client assignment has changed`);
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@davidcharleshaller', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@hankpym', `Client assignment has changed`);
        });

        it('should call to the Chat send() method for the previous worker', async() => {
@ -40,7 +40,7 @@ describe('Client Model', () => {

            await models.Client.notifyAssignment(instance, null, currentWorkerId);

-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@hankpym', `Client assignment has changed`);
        });

        it('should call to the Chat send() method for the current worker', async() => {
@ -48,7 +48,7 @@ describe('Client Model', () => {

            await models.Client.notifyAssignment(instance, previousWorkerId, null);

-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@DavidCharlesHaller', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@davidcharleshaller', `Client assignment has changed`);
        });
    });

--- a/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
@ -1,4 +1,4 @@
-const {models} = require('vn-loopback/server/server');
+const { models } = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');

 // #6276
@ -8,11 +8,11 @@ describe('ItemShelving upsertItem()', () => {
    let options;
    let tx;

-    beforeEach(async() => {
+    beforeEach(async () => {
        ctx = {
            req: {
-                accessToken: {userId: 9},
-                headers: {origin: 'http://localhost'}
+                accessToken: { userId: 9 },
+                headers: { origin: 'http://localhost' }
            },
            args: {}
        };
@ -21,36 +21,37 @@ describe('ItemShelving upsertItem()', () => {
            active: ctx.req
        });

-        options = {transaction: tx};
+        options = { transaction: tx };
        tx = await models.ItemShelving.beginTransaction({});
        options.transaction = tx;
    });

-    afterEach(async() => {
+    afterEach(async () => {
        await tx.rollback();
    });

-    xit('should add two new records', async() => {
+    it('should add two new records', async () => {
        const shelvingFk = 'ZPP';
        const items = [1, 1, 1, 2];

        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
-        const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
+        const itemShelvings = await models.ItemShelving.find({ where: { shelvingFk } }, options);

        expect(itemShelvings.length).toEqual(2);
    });

-    xit('should update the visible items', async() => {
+    it('should update the visible items', async () => {
        const shelvingFk = 'GVC';
        const items = [2, 2];
-        const {visible: itemsBefore} = await models.ItemShelving.findOne({
-            where: {shelvingFk, itemFk: items[0]}
+        const { visible: visibleItemsBefore } = await models.ItemShelving.findOne({
+            where: { shelvingFk, itemFk: items[0] }
        }, options);
        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
-        const {visible: itemsAfter} = await models.ItemShelving.findOne({
-            where: {shelvingFk, itemFk: items[0]}
+
+        const { visible: visibleItemsAfter } = await models.ItemShelving.findOne({
+            where: { shelvingFk, itemFk: items[0] }
        }, options);

-        expect(itemsAfter).toEqual(itemsBefore + 2);
+        expect(visibleItemsAfter).toEqual(visibleItemsBefore + 2);
    });
 });
--- a/modules/supplier/back/locale/supplier/en.yml
+++ b/modules/supplier/back/locale/supplier/en.yml
@ -11,7 +11,7 @@ columns:
    postcodeFk: postcode
    isActive: active
    isOfficial: official
-    isSerious: serious
+    isReal: real
    isTrucker: trucker
    note: note
    street: street
--- a/modules/supplier/back/locale/supplier/es.yml
+++ b/modules/supplier/back/locale/supplier/es.yml
@ -11,7 +11,7 @@ columns:
    postcodeFk: código postal
    isActive: activo
    isOfficial: oficial
-    isSerious: serio
+    isReal: real
    isTrucker: camionero
    note: nota
    street: calle
--- a/modules/supplier/back/methods/supplier/getSummary.js
+++ b/modules/supplier/back/methods/supplier/getSummary.js
@ -25,7 +25,7 @@ module.exports = Self => {
                'id',
                'name',
                'nickname',
-                'isSerious',
+                'isReal',
                'isActive',
                'note',
                'nif',
--- a/modules/supplier/back/models/supplier.json
+++ b/modules/supplier/back/models/supplier.json
@ -48,7 +48,7 @@
        "isOfficial": {
            "type": "boolean"
        },
-        "isSerious": {
+        "isReal": {
            "type": "boolean"
        },
        "isTrucker": {
--- a/modules/supplier/front/basic-data/index.html
+++ b/modules/supplier/front/basic-data/index.html
@ -26,7 +26,7 @@
        <vn-horizontal>
            <vn-check
                label="Verified"
-                ng-model="$ctrl.supplier.isSerious">
+                ng-model="$ctrl.supplier.isReal">
            </vn-check>
            <vn-check
                label="Active"
--- a/modules/supplier/front/descriptor/index.html
+++ b/modules/supplier/front/descriptor/index.html
@ -32,7 +32,7 @@
            <vn-icon
                vn-tooltip="Unverified supplier"
                icon="icon-supplierfalse"
-                ng-if="$ctrl.supplier.isSerious == false">
+                ng-if="$ctrl.supplier.isReal == false">
            </vn-icon>
        </div>
        <div class="quicklinks">
--- a/modules/supplier/front/descriptor/index.js
+++ b/modules/supplier/front/descriptor/index.js
@ -40,7 +40,7 @@ class Controller extends Descriptor {
                'payDemFk',
                'payDay',
                'isActive',
-                'isSerious',
+                'isReal',
                'isTrucker',
                'account'
            ],
--- a/modules/supplier/front/descriptor/index.spec.js
+++ b/modules/supplier/front/descriptor/index.spec.js
@ -26,7 +26,7 @@ describe('Supplier Component vnSupplierDescriptor', () => {
                    'payDemFk',
                    'payDay',
                    'isActive',
-                    'isSerious',
+                    'isReal',
                    'isTrucker',
                    'account'
                ],
--- a/modules/supplier/front/summary/index.html
+++ b/modules/supplier/front/summary/index.html
@ -44,7 +44,7 @@
                </vn-label-value>
                <vn-check
                    label="Verified" 
-                    ng-model="$ctrl.summary.isSerious" 
+                    ng-model="$ctrl.summary.isReal"
                    disabled="true">
                </vn-check>
                <vn-check
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@ -1,4 +1,5 @@
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const {mergeFilters, mergeWhere} = require('vn-loopback/util/filter');

 module.exports = Self => {
    Self.remoteMethodCtx('filter', {
@ -33,28 +34,31 @@ module.exports = Self => {
        const userId = ctx.req.accessToken.userId;
        const models = Self.app.models;

+        // Get ids alloweds
        const account = await models.VnUser.findById(userId);
        const stmt = new ParameterizedSQL(
-            `SELECT d.id dmsFk, d.reference, d.description, d.file, d.created, d.hardCopyNumber, d.hasFile
+            `SELECT d.id, d.id dmsFk
                FROM workerDocument wd
                    JOIN dms d ON d.id = wd.document
                    JOIN dmsType dt ON dt.id = d.dmsTypeFk
                    LEFT JOIN account.roleRole rr ON rr.inheritsFrom = dt.readRoleFk AND rr.role = ?
                `, [account.roleFk]
        );
-        const oldWhere = filter.where;
        const yourOwnDms = {and: [{isReadableByWorker: true}, {worker: userId}]};
-
-        filter.where = {
-            and: [{
+        const where = {
            or: [yourOwnDms, {
                role: {
                    neq: null
                }
            }]
-            }, oldWhere]};
-        stmt.merge(conn.makeSuffix(filter));
-        const workerDms = await conn.executeStmt(stmt);
+        };
+        stmt.merge(conn.makeSuffix(mergeWhere(filter.where, where)));
+
+        // Get workerDms alloweds
+        const dmsIds = await conn.executeStmt(stmt);
+        const allowedIds = dmsIds.map(dms => dms.id);
+        const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
+        let workerDms = await models.WorkerDms.find(allowedFilter);

        // Get docuware info
        const docuware = await models.Docuware.findOne({
@ -63,28 +67,43 @@ module.exports = Self => {
        });
        const docuwareDmsType = docuware.dmsTypeFk;
        let workerDocuware = [];
-        if (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType))) {
+        if (!filter.skip && (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType)))) {
            const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
            const docuwareParse = {
                'Filename': 'dmsFk',
                'Tipo Documento': 'description',
                'Stored on': 'created',
-                'Document ID': 'id'
+                'Document ID': 'id',
+                'URL': 'download',
+                'Stored by': 'name',
+                'Estado': 'state'
            };

            workerDocuware =
            await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
+            const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
            for (document of workerDocuware) {
+                const docuwareId = document.id;
                const defaultData = {
-                    file: 'dw' + document.id + '.png',
+                    id: docuwareId,
+                    workerFk: id,
+                    dmsFk: docuwareId,
+                    dms: {
+                        id: docuwareId,
+                        file: docuwareId + '.pdf',
                        isDocuware: true,
-                    hardCopyNumber: null,
                        hasFile: false,
                        reference: worker.fi,
-                    dmsFk: 'DW' + document.id
+                        dmsFk: docuwareId,
+                        url,
+                        description: document.description + ' - ' + document.state,
+                        download: document.download,
+                        created: document.created,
+                        dmsType: {name: 'Docuware'},
+                        worker: {id: null, user: {name: document.name}},
+                    }
                };
-
-                document = Object.assign(document, defaultData);
+                Object.assign(document, defaultData);
            }
        }
        return workerDms.concat(workerDocuware);
--- a/modules/worker/back/methods/worker/specs/activeWithInheritedRole.spec.js
+++ b/modules/worker/back/methods/worker/specs/activeWithInheritedRole.spec.js
@ -6,7 +6,7 @@ describe('Worker activeWithInheritedRole', () => {
        allRolesCount = await app.models.VnRole.count();
    });

-    it('should return the workers with an inherited role of salesPerson', async() => {
+    it('should return the workers with an inherited role of salesperson', async() => {
        const filter = {where: {role: 'salesPerson'}};
        const result = await app.models.Worker.activeWithInheritedRole(filter);

--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@ -20,7 +20,7 @@ describe('Worker new', () => {
    const employeeId = 1;
    const defaultWorker = {
        fi: '78457139E',
-        name: 'DEFAULTERWORKER',
+        name: 'defaulterworker',
        firstName: 'DEFAULT',
        lastNames: 'WORKER',
        email: 'defaultWorker@mydomain.com',
--- a/modules/worker/front/dms/index/index.html
+++ b/modules/worker/front/dms/index/index.html
@ -2,6 +2,7 @@
    vn-id="model"
    url="WorkerDms/{{$ctrl.$params.id}}/filter"
    link="{worker: $ctrl.$params.id}"
+    filter="$ctrl.filter"
    limit="20"
    data="$ctrl.workerDms"
    order="dmsFk DESC"
@ -28,37 +29,37 @@
        </vn-thead>
        <vn-tbody>
            <vn-tr ng-repeat="document in $ctrl.workerDms">
-                <vn-td number shrink>{{::document.dmsFk}}</vn-td>
+                <vn-td number shrink>{{::document.id}}</vn-td>
                <vn-td shrink number>
-                    <span class="chip" title="{{::document.hardCopyNumber}}"
+                    <span class="chip" title="{{::document.dms.hardCopyNumber}}"
                        ng-class="{'message': document.hardCopyNumber}">
-                        {{::document.hardCopyNumber}}
+                        {{::document.dms.hardCopyNumber}}
                    </span>
                </vn-td>
                <vn-td expand>
-                    <span title="{{::document.reference}}">
-                        {{::document.reference}}
+                    <span title="{{::document.dms.reference}}">
+                        {{::document.dms.reference}}
                    </span>
                </vn-td>
                <vn-td expand>
-                    <span title="{{::document.description}}">
-                        {{::document.description}}
+                    <span title="{{::document.dms.description}}">
+                        {{::document.dms.description}}
                    </span>
                </vn-td>
                <vn-td shrink>
                    <vn-check
-                        ng-model="document.hasFile"
+                        ng-model="document.dms.hasFile"
                        disabled="true">
                    </vn-check>
                </vn-td>
                <vn-td shrink>
                    <span title="{{'Download file' | translate}}" class="link"
-                        ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
-                        {{::document.file}}
+                        ng-click="$ctrl.downloadFile(document.dmsFk, document.dms.isDocuware)">
+                        {{::document.dms.file}}
                    </span>
                </vn-td>
                <vn-td shrink-datetime>
-                    {{::document.created | date:'dd/MM/yyyy HH:mm'}}
+                    {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
                </vn-td>
                <vn-td shrink>
                    <vn-icon-button title="{{'Download file' | translate}}"
@ -66,7 +67,7 @@
                        ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
                    </vn-icon-button>
                </vn-td>
-                <vn-td expand ng-if="::!document.isDocuware">
+                <vn-td expand ng-if="::!document.dms.isDocuware">
                    <vn-icon-button ui-sref="worker.card.dms.edit({dmsId: {{::document.dmsFk}}})"
                        icon="edit"
                        title="{{'Edit file' | translate}}">
@ -78,7 +79,7 @@
                        tabindex="-1">
                    </vn-icon-button>
                </vn-td>
-                <vn-td expand ng-if="::document.isDocuware">
+                <vn-td expand ng-if="::document.dms.isDocuware">
                    <vn-icon-button
                        icon="open_in_new"
                        ng-click="$ctrl.openDocuware()"
--- a/modules/worker/front/dms/index/index.js
+++ b/modules/worker/front/dms/index/index.js
@ -6,6 +6,45 @@ class Controller extends Component {
    constructor($element, $, vnFile) {
        super($element, $);
        this.vnFile = vnFile;
+        this.filter = {
+            include: {
+                relation: 'dms',
+                scope: {
+                    fields: [
+                        'dmsTypeFk',
+                        'reference',
+                        'hardCopyNumber',
+                        'workerFk',
+                        'description',
+                        'hasFile',
+                        'file',
+                        'created',
+                        'companyFk',
+                        'warehouseFk',
+                    ],
+                    include: [
+                        {
+                            relation: 'dmsType',
+                            scope: {
+                                fields: ['name'],
+                            },
+                        },
+                        {
+                            relation: 'worker',
+                            scope: {
+                                fields: ['id'],
+                                include: {
+                                    relation: 'user',
+                                    scope: {
+                                        fields: ['name'],
+                                    },
+                                },
+                            },
+                        },
+                    ],
+                },
+            },
+        };
    }

    deleteDms(index) {
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@ -4,10 +4,11 @@ import './style.scss';
 import UserError from 'core/lib/user-error';

 class Controller extends Section {
-    constructor($element, $, vnWeekDays) {
+    constructor($element, $, vnWeekDays, moment) {
        super($element, $);
        this.weekDays = [];
        this.weekdayNames = vnWeekDays.locales;
+        this.moment = moment;
        this.entryDirections = [
            {code: 'in', description: this.$t('In')},
            {code: 'middle', description: this.$t('Intermediate')},
@ -364,14 +365,8 @@ class Controller extends Section {
    }

    getWeekNumber(date) {
-        const tempDate = new Date(date);
-        let dayOfWeek = tempDate.getDay();
-        dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
-        const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
-        const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
-        const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
-        const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
-        return weekNumber;
+        const tempDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
+        return this.moment(tempDate).isoWeek();
    }

    isSatisfied() {
@ -499,7 +494,7 @@ class Controller extends Section {
    }
 }

-Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
+Controller.$inject = ['$element', '$scope', 'vnWeekDays', 'moment'];

 ngModule.vnComponent('vnWorkerTimeControl', {
    template: require('./index.html'),
--- a/myt.config.yml
+++ b/myt.config.yml
@ -11,6 +11,7 @@ schemas:
  - cache
  - dipole
  - edi
+  - floranet
  - hedera
  - pbx
  - psico
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "24.16.0",
+    "version": "24.18.0",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",
				`@ -0,0 +1 @@`
				`ALTER TABLE vn.supplier CHANGE COLUMN isSerious isReal tinyint(1) unsigned NOT NULL DEFAULT 0;`
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`accountReconciliation` MODIFY debitCredit ENUM('debit', 'credit');