From 5c777c705feecca80213dd5a7ef4d70d246e4c26 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 Nov 2023 13:00:20 +0100
Subject: [PATCH 01/18] refs #6434 feat: add new error message

---
 back/methods/vn-user/sign-in.js | 28 +++++++++++++++-------------
 back/models/vn-user.js          | 13 +++++++++++--
 loopback/locale/es.json         |  4 +++-
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/back/methods/vn-user/sign-in.js b/back/methods/vn-user/sign-in.js
index b9e0d2f705..5c84b654e9 100644
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@@ -26,7 +26,7 @@ module.exports = Self => {
         }
     });
 
-    Self.signIn = async function(ctx, user, password, options) {
+    Self.signIn = async function (ctx, user, password, options) {
         const myOptions = {};
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -40,15 +40,17 @@ module.exports = Self => {
         const validCredentials = vnUser
             && await vnUser.hasPassword(password);
 
-        if (validCredentials) {
-            if (!vnUser.active)
-                throw new UserError('User disabled');
-            await Self.sendTwoFactor(ctx, vnUser, myOptions);
-            await Self.passExpired(vnUser, myOptions);
+        if (!validCredentials)
+            throw new UserError('Invalid credentials');
 
-            if (vnUser.twoFactor)
-                throw new ForbiddenError(null, 'REQUIRES_2FA');
-        }
+        if (!vnUser.active)
+            throw new UserError('User disabled');
+
+        await Self.sendTwoFactor(ctx, vnUser, myOptions);
+        await Self.passExpired(vnUser, myOptions);
+
+        if (vnUser.twoFactor)
+            throw new ForbiddenError(null, 'REQUIRES_2FA');
 
         return Self.validateLogin(user, password);
     };
@@ -59,18 +61,18 @@ module.exports = Self => {
 
         if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) {
             const err = new UserError('Pass expired', 'passExpired');
-            err.details = {userId: vnUser.id, twoFactor: vnUser.twoFactor ? true : false};
+            err.details = { userId: vnUser.id, twoFactor: vnUser.twoFactor ? true : false };
             throw err;
         }
     };
 
-    Self.sendTwoFactor = async(ctx, vnUser, myOptions) => {
+    Self.sendTwoFactor = async (ctx, vnUser, myOptions) => {
         if (vnUser.twoFactor === 'email') {
             const $ = Self.app.models;
 
             const code = String(Math.floor(Math.random() * 999999));
             const maxTTL = ((60 * 1000) * 5); // 5 min
-            await $.AuthCode.upsertWithWhere({userFk: vnUser.id}, {
+            await $.AuthCode.upsertWithWhere({ userFk: vnUser.id }, {
                 userFk: vnUser.id,
                 code: code,
                 expires: Date.vnNow() + maxTTL
@@ -87,7 +89,7 @@ module.exports = Self => {
                     ip: ctx.req?.connection?.remoteAddress,
                     device: platform && browser ? platform + ', ' + browser : headers['user-agent'],
                 },
-                req: {getLocale: ctx.req.getLocale},
+                req: { getLocale: ctx.req.getLocale },
             };
 
             await Self.sendTemplate(params, 'auth-code', true);
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index de5bf7b63e..5c6e4a30f7 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -2,6 +2,7 @@ const vnModel = require('vn-loopback/common/models/vn-model');
 const {Email} = require('vn-print');
 const ForbiddenError = require('vn-loopback/util/forbiddenError');
 const LoopBackContext = require('loopback-context');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = function(Self) {
     vnModel(Self);
@@ -121,10 +122,18 @@ module.exports = function(Self) {
     });
 
     Self.validateLogin = async function(user, password) {
-        let loginInfo = Object.assign({password}, Self.userUses(user));
-        token = await Self.login(loginInfo, 'user');
+        const loginInfo = Object.assign({password}, Self.userUses(user));
+        const token = await Self.login(loginInfo, 'user');
 
         const userToken = await token.user.get();
+
+        if (userToken.username !== user) {
+            console.error('ERROR!!! - Signin with other user', userToken, user);
+            throw new UserError('Try again');
+        }
+
+        const userCheck = await Self.app.models.VnUser.findOne({where: {name: user}});
+        if (userToken.id != userCheck.id) await Self.validateLogin(user, password);
         try {
             await Self.app.models.Account.sync(userToken.name, password);
         } catch (err) {
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index b427204587..7cccc0fd0a 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -325,5 +325,7 @@
 	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mímina",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina",
-	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada"
+	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+	"User disabled": "User disabled",
+	"Invalid credentials": "Invalid credentials"
 }

From 7f82243ce6000176d9b9eeab03f81d68c781530f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 Nov 2023 15:00:03 +0100
Subject: [PATCH 02/18] refs #6434 feat: create signInLog table

---
 back/methods/vn-user/sign-in.js               | 19 ++++++----
 db/changes/234801/00-createSignInLogTable.sql | 19 ++++++++++
 modules/account/back/model-config.json        |  3 ++
 modules/account/back/models/sign_in-log.json  | 35 +++++++++++++++++++
 4 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 db/changes/234801/00-createSignInLogTable.sql
 create mode 100644 modules/account/back/models/sign_in-log.json

diff --git a/back/methods/vn-user/sign-in.js b/back/methods/vn-user/sign-in.js
index 5c84b654e9..78d74b147f 100644
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@@ -26,7 +26,7 @@ module.exports = Self => {
         }
     });
 
-    Self.signIn = async function (ctx, user, password, options) {
+    Self.signIn = async function(ctx, user, password, options) {
         const myOptions = {};
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -51,8 +51,13 @@ module.exports = Self => {
 
         if (vnUser.twoFactor)
             throw new ForbiddenError(null, 'REQUIRES_2FA');
-
-        return Self.validateLogin(user, password);
+        const validateLogin = await Self.validateLogin(user, password);
+        await Self.app.models.SignInLog.create({
+            id: validateLogin.token,
+            userFk: vnUser.id,
+            ip: ctx.req.ip
+        });
+        return validateLogin;
     };
 
     Self.passExpired = async vnUser => {
@@ -61,18 +66,18 @@ module.exports = Self => {
 
         if (vnUser.passExpired && vnUser.passExpired.getTime() <= today.getTime()) {
             const err = new UserError('Pass expired', 'passExpired');
-            err.details = { userId: vnUser.id, twoFactor: vnUser.twoFactor ? true : false };
+            err.details = {userId: vnUser.id, twoFactor: vnUser.twoFactor ? true : false};
             throw err;
         }
     };
 
-    Self.sendTwoFactor = async (ctx, vnUser, myOptions) => {
+    Self.sendTwoFactor = async(ctx, vnUser, myOptions) => {
         if (vnUser.twoFactor === 'email') {
             const $ = Self.app.models;
 
             const code = String(Math.floor(Math.random() * 999999));
             const maxTTL = ((60 * 1000) * 5); // 5 min
-            await $.AuthCode.upsertWithWhere({ userFk: vnUser.id }, {
+            await $.AuthCode.upsertWithWhere({userFk: vnUser.id}, {
                 userFk: vnUser.id,
                 code: code,
                 expires: Date.vnNow() + maxTTL
@@ -89,7 +94,7 @@ module.exports = Self => {
                     ip: ctx.req?.connection?.remoteAddress,
                     device: platform && browser ? platform + ', ' + browser : headers['user-agent'],
                 },
-                req: { getLocale: ctx.req.getLocale },
+                req: {getLocale: ctx.req.getLocale},
             };
 
             await Self.sendTemplate(params, 'auth-code', true);
diff --git a/db/changes/234801/00-createSignInLogTable.sql b/db/changes/234801/00-createSignInLogTable.sql
new file mode 100644
index 0000000000..977de46463
--- /dev/null
+++ b/db/changes/234801/00-createSignInLogTable.sql
@@ -0,0 +1,19 @@
+
+
+--
+-- Table structure for table `signInLog`
+--
+
+DROP TABLE IF EXISTS `account`.`signInLog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account`.`signInLog` (
+  `id` varchar(10) NOT NULL ,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `ip` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `userFk` (`userFk`),
+  CONSTRAINT `signInLog_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
diff --git a/modules/account/back/model-config.json b/modules/account/back/model-config.json
index a4eb9fa571..b4bd6dbafd 100644
--- a/modules/account/back/model-config.json
+++ b/modules/account/back/model-config.json
@@ -35,6 +35,9 @@
     "SambaConfig": {
         "dataSource": "vn"
     },
+    "SignInLog": {
+        "dataSource": "vn"
+    },
     "Sip": {
         "dataSource": "vn"
     },
diff --git a/modules/account/back/models/sign_in-log.json b/modules/account/back/models/sign_in-log.json
new file mode 100644
index 0000000000..df9ad8153e
--- /dev/null
+++ b/modules/account/back/models/sign_in-log.json
@@ -0,0 +1,35 @@
+{
+	"name": "SignInLog",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "account.signInLog"
+		}
+	},
+    "properties": {
+        "id": {
+			"id": true,
+			"type": "string",
+			"forceId": false
+		},
+        "creationDate": {
+			"type": "date"
+		},
+        "userFk": {
+			"type": "number"
+		},
+        "ip": {
+			"type": "string"
+		}
+    },
+    "relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "VnUser",
+			"foreignKey": "userFk"
+		}
+	},
+	"scope": {
+		"order": ["creationDate DESC", "id DESC"]
+	}
+}

From add3a81032aae8ecfa41e3fad37179c6b1dacac4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 15 Nov 2023 09:29:26 +0100
Subject: [PATCH 03/18] refs #6434 feat: remove recursively fn

---
 back/methods/vn-user/sign-in.js | 2 ++
 back/models/vn-user.js          | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/methods/vn-user/sign-in.js b/back/methods/vn-user/sign-in.js
index 78d74b147f..e51cf8d8ee 100644
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@@ -51,7 +51,9 @@ module.exports = Self => {
 
         if (vnUser.twoFactor)
             throw new ForbiddenError(null, 'REQUIRES_2FA');
+
         const validateLogin = await Self.validateLogin(user, password);
+
         await Self.app.models.SignInLog.create({
             id: validateLogin.token,
             userFk: vnUser.id,
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index 5c6e4a30f7..00f5cd0b87 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -132,8 +132,6 @@ module.exports = function(Self) {
             throw new UserError('Try again');
         }
 
-        const userCheck = await Self.app.models.VnUser.findOne({where: {name: user}});
-        if (userToken.id != userCheck.id) await Self.validateLogin(user, password);
         try {
             await Self.app.models.Account.sync(userToken.name, password);
         } catch (err) {

From 412cac7e94114a891fc66111133de27eb29e8e40 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 12 Dec 2023 14:42:36 +0100
Subject: [PATCH 04/18] refs #5925 models table docuware

---
 back/methods/docuware/upload.js         |  5 +++++
 back/models/docuwareTablet.json         | 20 ++++++++++++++++++++
 back/models/user-config.json            | 10 +++++++++-
 db/changes/235201/00-tabletDocuware.sql | 24 ++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 back/models/docuwareTablet.json
 create mode 100644 db/changes/235201/00-tabletDocuware.sql

diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index 7055bf8d5c..a587079a2e 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -103,6 +103,11 @@ module.exports = Self => {
                         'FieldName': 'FILTRO_TABLET',
                         'ItemElementName': 'string',
                         'Item': 'Tablet1',
+                    },
+                    {
+                        'FieldName': 'ID_TABLET',
+                        'ItemElementName': 'integer',
+                        'Item': userConfig.tabletFk,
                     }
                 ]
             };
diff --git a/back/models/docuwareTablet.json b/back/models/docuwareTablet.json
new file mode 100644
index 0000000000..dde336bcac
--- /dev/null
+++ b/back/models/docuwareTablet.json
@@ -0,0 +1,20 @@
+{
+	"name": "docuwareTablet",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "vn.docuwareTablet"
+		}
+	},
+	"properties": {
+        "id": {
+            "type": "number"
+        },
+        "name": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        }
+    }
+}
diff --git a/back/models/user-config.json b/back/models/user-config.json
index 52125dc012..35f6aa1e6a 100644
--- a/back/models/user-config.json
+++ b/back/models/user-config.json
@@ -26,6 +26,9 @@
         },
         "darkMode": {
             "type": "boolean"
+        },
+        "tabletFk": {
+            "type": "number"
         }
     },
     "relations": {
@@ -43,6 +46,11 @@
             "type": "belongsTo",
             "model": "VnUser",
             "foreignKey": "userFk"
-          }
+        },
+        "Tablet": {
+            "type": "belongsTo",
+            "model": "docuwareTablet",
+            "foreignKey": "tabletFk"
+        }
     }
 }
diff --git a/db/changes/235201/00-tabletDocuware.sql b/db/changes/235201/00-tabletDocuware.sql
new file mode 100644
index 0000000000..c480c1001a
--- /dev/null
+++ b/db/changes/235201/00-tabletDocuware.sql
@@ -0,0 +1,24 @@
+-- vn.docuwareTablet definition
+
+CREATE TABLE `vn`.`docuwareTablet` (
+  `id` int(3) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+--  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
+INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
+	VALUES (1,'tabletRRHH','tablet de recursos humanos');
+INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
+	VALUES (2,'tabletIT','tablet de IT');
+INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
+	VALUES (3,'tabletCompradores','tablet de compradores');
+INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
+	VALUES (4,'tabletComerciales','tablet de comerciales');
+INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
+	VALUES (5,'tabletAdministracion','tablet de administracion');
+
+ALTER TABLE `vn`.`userConfig`
+ADD COLUMN tabletFk int(3),
+ADD FOREIGN KEY (tabletFk) REFERENCES `vn`.`docuwareTablet`(id);

From 2393625a48ddbaf72f33be6420212fa3b8e3d232 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 13 Dec 2023 08:22:58 +0100
Subject: [PATCH 05/18] refs #5925 Tablet

---
 back/methods/docuware/upload.js | 17 +++++++++++------
 back/models/docuwareTablet.json |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index a587079a2e..0af20b8ac8 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -56,6 +56,16 @@ module.exports = Self => {
                 }]
             });
 
+            // get tablet
+            const tablet = await models.userConfig.findById(id, {
+                include: [{
+                    relation: 'Tablet',
+                    scope: {
+                        fields: ['id']
+                    }
+                }]
+            });
+
             // upload file
             const templateJson = {
                 'Fields': [
@@ -102,12 +112,7 @@ module.exports = Self => {
                     {
                         'FieldName': 'FILTRO_TABLET',
                         'ItemElementName': 'string',
-                        'Item': 'Tablet1',
-                    },
-                    {
-                        'FieldName': 'ID_TABLET',
-                        'ItemElementName': 'integer',
-                        'Item': userConfig.tabletFk,
+                        'Item': tablet.id,
                     }
                 ]
             };
diff --git a/back/models/docuwareTablet.json b/back/models/docuwareTablet.json
index dde336bcac..e9e3b6bad9 100644
--- a/back/models/docuwareTablet.json
+++ b/back/models/docuwareTablet.json
@@ -3,7 +3,7 @@
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "vn.docuwareTablet"
+			"table": "docuwareTablet"
 		}
 	},
 	"properties": {

From 5b3645a6419e765cf186b4280d22594f83acfb7d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 13 Dec 2023 11:59:00 +0100
Subject: [PATCH 06/18] refs #6434 fix: bad merge

---
 back/models/vn-user.js                        | 27 +++++++++++++++++++
 db/changes/234801/00-createSignInLogTable.sql | 19 -------------
 2 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 db/changes/234801/00-createSignInLogTable.sql

diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index d840e34e8f..7b1471e5c2 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -125,6 +125,33 @@ module.exports = function(Self) {
         return email.send();
     });
 
+    /**
+     * Sign-in validate
+     * @param {String} user The user
+     * @param {Object} userToken Options
+     * @param {Object} token accessToken
+     * @param {Object} ctx context
+     */
+    Self.signInValidate = async(user, userToken, token, ctx) => {
+        const [[key, value]] = Object.entries(Self.userUses(user));
+        const isOwner = Self.rawSql(`SELECT ? = ? `, [userToken[key], value]);
+        await Self.app.models.SignInLog.create({
+            userName: user,
+            token: token.id,
+            userFk: userToken.id,
+            ip: ctx.req.ip,
+            owner: isOwner
+        });
+        if (!isOwner)
+            throw new UserError('Try again');
+    };
+
+    /**
+     * Validate login params
+     * @param {String} user The user
+     * @param {String} password
+      * @param {Object} ctx context
+     */
     Self.validateLogin = async function(user, password) {
         let loginInfo = Object.assign({password}, Self.userUses(user));
         token = await Self.login(loginInfo, 'user');
diff --git a/db/changes/234801/00-createSignInLogTable.sql b/db/changes/234801/00-createSignInLogTable.sql
deleted file mode 100644
index 977de46463..0000000000
--- a/db/changes/234801/00-createSignInLogTable.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
---
--- Table structure for table `signInLog`
---
-
-DROP TABLE IF EXISTS `account`.`signInLog`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `account`.`signInLog` (
-  `id` varchar(10) NOT NULL ,
-  `userFk` int(10) unsigned DEFAULT NULL,
-  `creationDate` timestamp NULL DEFAULT current_timestamp(),
-  `ip` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `userFk` (`userFk`),
-  CONSTRAINT `signInLog_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-

From 5f93b8c44032a4b982d23383b8c5158f721e9817 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 13 Dec 2023 12:01:18 +0100
Subject: [PATCH 07/18] refs #6434 fix: bad merge

---
 back/models/vn-user.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index 7b1471e5c2..e14cd30eac 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -152,9 +152,9 @@ module.exports = function(Self) {
      * @param {String} password
       * @param {Object} ctx context
      */
-    Self.validateLogin = async function(user, password) {
-        let loginInfo = Object.assign({password}, Self.userUses(user));
-        token = await Self.login(loginInfo, 'user');
+    Self.validateLogin = async function(user, password, ctx) {
+        const loginInfo = Object.assign({password}, Self.userUses(user));
+        const token = await Self.login(loginInfo, 'user');
 
         const userToken = await token.user.get();
 

From 4e8bec5684935258b23f2d30c568f0ad745c36d8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 13 Dec 2023 12:03:04 +0100
Subject: [PATCH 08/18] refs #5925 user error

---
 back/methods/docuware/upload.js | 2 ++
 loopback/locale/es.json         | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index 0af20b8ac8..5f44e9382b 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -120,6 +120,8 @@ module.exports = Self => {
             if (process.env.NODE_ENV != 'production')
                 throw new UserError('Action not allowed on the test environment');
 
+            if (!tablet.id)
+                throw new UserError('This user does not have an assigned tablet.');
             // delete old
             const docuwareFile = await models.Docuware.checkFile(id, fileCabinet, false);
             if (docuwareFile) {
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 01384efb42..4a2e9a7946 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -329,5 +329,6 @@
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
-}
\ No newline at end of file
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+    "This user does not have an assigned tablet.": "Este usuario no tiene tablet asignada"
+}

From 6af99b7669f0ff0ac8a5b4110993686968d11dd5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 13 Dec 2023 12:07:41 +0100
Subject: [PATCH 09/18] refs #6434 feat: delete records whe !owner

---
 db/changes/235201/00-truncate-where-signInLog.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/changes/235201/00-truncate-where-signInLog.sql

diff --git a/db/changes/235201/00-truncate-where-signInLog.sql b/db/changes/235201/00-truncate-where-signInLog.sql
new file mode 100644
index 0000000000..93d80d7161
--- /dev/null
+++ b/db/changes/235201/00-truncate-where-signInLog.sql
@@ -0,0 +1 @@
+DELETE FROM `account`.`signInLog` where owner <> FALSE

From 5a36fabf058153792cda778c7e0e01c3b52588d1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 13 Dec 2023 12:07:57 +0100
Subject: [PATCH 10/18] refs #6434 feat: insert record just when fail

---
 back/models/vn-user.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index e14cd30eac..1134df3632 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -135,15 +135,16 @@ module.exports = function(Self) {
     Self.signInValidate = async(user, userToken, token, ctx) => {
         const [[key, value]] = Object.entries(Self.userUses(user));
         const isOwner = Self.rawSql(`SELECT ? = ? `, [userToken[key], value]);
-        await Self.app.models.SignInLog.create({
-            userName: user,
-            token: token.id,
-            userFk: userToken.id,
-            ip: ctx.req.ip,
-            owner: isOwner
-        });
-        if (!isOwner)
-            throw new UserError('Try again');
+        if (!isOwner) {
+            await Self.app.models.SignInLog.create({
+                userName: user,
+                token: token.id,
+                userFk: userToken.id,
+                ip: ctx.req.ip,
+                owner: isOwner
+            });
+        }
+        throw new UserError('Try again');
     };
 
     /**

From 11b54d66af6f77158441e0627186c128d3c5234c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 13 Dec 2023 13:31:32 +0100
Subject: [PATCH 11/18] refs #6434 fix: bad merge

---
 back/methods/vn-user/sign-in.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/back/methods/vn-user/sign-in.js b/back/methods/vn-user/sign-in.js
index 9626e2e79d..782046641e 100644
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@@ -40,14 +40,11 @@ module.exports = Self => {
         const validCredentials = vnUser
             && await vnUser.hasPassword(password);
 
-        if (!validCredentials)
-            throw new UserError('Invalid credentials');
-
-        if (!vnUser.active)
-            throw new UserError('User disabled');
-
-        await Self.sendTwoFactor(ctx, vnUser, myOptions);
-        await Self.passExpired(vnUser, myOptions);
+        if (validCredentials) {
+            if (!vnUser.active)
+                throw new UserError('User disabled');
+            await Self.sendTwoFactor(ctx, vnUser, myOptions);
+            await Self.passExpired(vnUser, myOptions);
 
             if (vnUser.twoFactor)
                 throw new ForbiddenError(null, 'REQUIRES_2FA');

From d7454cdb198fab8e5cb0292935a15e90e7378fa7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Dec 2023 11:41:59 +0100
Subject: [PATCH 12/18] refs #6576 fix: correct version

---
 CHANGELOG.md               | 11 ++---------
 db/changes/235201/.gitkeep |  0
 db/dump/fixtures.sql       |  4 ----
 package.json               |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 db/changes/235201/.gitkeep

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfdc563fb4..45912aff3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,17 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2352.01] - 2023-12-28
-
-### Added
-### Changed
-### Fixed
-
 ## [2350.01] - 2023-12-14
 
-### Added
-### Changed
-### Fixed
+### Características Añadidas 🆕
+- **Tickets → Expediciones:** Añadido soporte para Viaexpress
 
 
 ## [2348.01] - 2023-11-30
diff --git a/db/changes/235201/.gitkeep b/db/changes/235201/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index f422dcb451..3354e95c2d 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -5,10 +5,6 @@ SET DEFAULT ROLE 'salix' FOR 'root'@'%';
 CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
-CREATE ROLE 'salix';
-GRANT 'salix' TO 'root'@'%';
-SET DEFAULT ROLE 'salix' FOR 'root'@'%';
-
 UPDATE `util`.`config`
     SET `environment`= 'development';
 
diff --git a/package.json b/package.json
index 66a5cd2fa6..586c963dd6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.52.01",
+    "version": "23.50.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

From 57b3d96628ff5a1d7618d3741373ab84d061e4a4 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Wed, 20 Dec 2023 09:27:25 +0000
Subject: [PATCH 13/18] refs #6434 fix: bad throw error

---
 back/models/vn-user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index 7b8a308c2a..b1d09f0c0b 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -142,8 +142,8 @@ module.exports = function(Self) {
                 ip: ctx.req.ip,
                 owner: isOwner
             });
-        }
         throw new UserError('Try again');
+        }
     };
 
     /**

From cb35c3632802ea9b94d41f8bb9fa321ed4b5c10f Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Wed, 20 Dec 2023 10:59:36 +0000
Subject: [PATCH 14/18] refs #6434 test: update tests

---
 back/methods/vn-user/specs/sign-in.spec.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/back/methods/vn-user/specs/sign-in.spec.js b/back/methods/vn-user/specs/sign-in.spec.js
index 1c4b4af51b..a14dd301ef 100644
--- a/back/methods/vn-user/specs/sign-in.spec.js
+++ b/back/methods/vn-user/specs/sign-in.spec.js
@@ -20,10 +20,7 @@ describe('VnUser Sign-in()', () => {
             let ctx = {req: {accessToken: accessToken}};
             let signInLog = await SignInLog.find({where: {token: accessToken.id}});
 
-            expect(signInLog.length).toEqual(1);
-            expect(signInLog[0].userFk).toEqual(accessToken.userId);
-            expect(signInLog[0].owner).toEqual(true);
-            expect(login.token).toBeDefined();
+            expect(signInLog.length).toEqual(0);
 
             await VnUser.logout(ctx.req.accessToken.id);
         });

From 7b0c5fe0a00b5b8ce3410c8e69736e7615afe2d5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Dec 2023 08:33:50 +0100
Subject: [PATCH 15/18] refs #5739 fix: sql

---
 CHANGELOG.md                                   |  6 ++++++
 .../{235201 => 240001}/00-alterTable.sql       |  0
 .../00-clientCreditLimitToRoleCreditLimit.sql  |  2 +-
 .../{235201 => 240001}/01-procedures.sql       |  0
 db/changes/{235201 => 240001}/02-views.sql     | 18 +++++++++++-------
 db/dump/structure.sql                          |  1 +
 package-lock.json                              |  4 ++--
 package.json                                   |  2 +-
 8 files changed, 22 insertions(+), 11 deletions(-)
 rename db/changes/{235201 => 240001}/00-alterTable.sql (100%)
 rename db/changes/{235201 => 240001}/00-clientCreditLimitToRoleCreditLimit.sql (74%)
 rename db/changes/{235201 => 240001}/01-procedures.sql (100%)
 rename db/changes/{235201 => 240001}/02-views.sql (79%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45912aff3a..b69b8a29b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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).
 
+## [2400.01] - 2024-01-04
+
+### Added
+### Changed
+### Fixed
+
 ## [2350.01] - 2023-12-14
 
 ### Características Añadidas 🆕
diff --git a/db/changes/235201/00-alterTable.sql b/db/changes/240001/00-alterTable.sql
similarity index 100%
rename from db/changes/235201/00-alterTable.sql
rename to db/changes/240001/00-alterTable.sql
diff --git a/db/changes/235201/00-clientCreditLimitToRoleCreditLimit.sql b/db/changes/240001/00-clientCreditLimitToRoleCreditLimit.sql
similarity index 74%
rename from db/changes/235201/00-clientCreditLimitToRoleCreditLimit.sql
rename to db/changes/240001/00-clientCreditLimitToRoleCreditLimit.sql
index bf4cc60029..2bc0f830dd 100644
--- a/db/changes/235201/00-clientCreditLimitToRoleCreditLimit.sql
+++ b/db/changes/240001/00-clientCreditLimitToRoleCreditLimit.sql
@@ -1,4 +1,4 @@
 RENAME TABLE `vn`.`clientCreditLimit` TO `vn`.`roleCreditLimit`;
-ALTER TABLE `vn`.`clientCreditLimit` DROP FOREIGN KEY `clientCreditLimit_FK`;
+ALTER TABLE `vn`.`roleCreditLimit` DROP FOREIGN KEY `clientCreditLimit_FK`;
 ALTER TABLE `vn`.`roleCreditLimit` ADD CONSTRAINT `roleCreditLimit_FK` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
 
diff --git a/db/changes/235201/01-procedures.sql b/db/changes/240001/01-procedures.sql
similarity index 100%
rename from db/changes/235201/01-procedures.sql
rename to db/changes/240001/01-procedures.sql
diff --git a/db/changes/235201/02-views.sql b/db/changes/240001/02-views.sql
similarity index 79%
rename from db/changes/235201/02-views.sql
rename to db/changes/240001/02-views.sql
index 1d031c38d2..86a1049a79 100644
--- a/db/changes/235201/02-views.sql
+++ b/db/changes/240001/02-views.sql
@@ -1,6 +1,9 @@
+CREATE SCHEMA IF NOT EXISTS `vn2008`;
+USE `vn`;
+
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
-	VIEW `vn`.`ticketState`
+	VIEW `ticketState`
 AS SELECT `tt`.`created` AS `updated`,
 	`tt`.`stateFk` AS `stateFk`,
 	`tt`.`userFk` AS `workerFk`,
@@ -15,10 +18,10 @@ AS SELECT `tt`.`created` AS `updated`,
 	`s`.`isPicked` AS `isPicked`
 FROM (
 		(
-			`vn`.`ticketLastState` `tls`
-			JOIN `vn`.`ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`)
+			`ticketLastState` `tls`
+			JOIN `ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`)
 		)
-		JOIN `vn`.`state` `s` ON(`s`.`id` = `tt`.`stateFk`)
+		JOIN `state` `s` ON(`s`.`id` = `tt`.`stateFk`)
 	);
 
 CREATE OR REPLACE DEFINER=`root`@`localhost`
@@ -33,9 +36,10 @@ AS SELECT `tt`.`id` AS `inter_id`,
 	`tt`.`supervisorFk` AS `Id_supervisor`
 FROM `vn`.`ticketTracking` `tt`;
 
-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `ticketStateToday` AS
-SELECT
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+    SQL SECURITY DEFINER
+    VIEW `ticketStateToday`
+AS SELECT
     `ts`.`ticket` AS `ticket`,
     `ts`.`state` AS `state`,
     `ts`.`productionOrder` AS `productionOrder`,
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 1db4252f48..694f745efa 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -26391,6 +26391,7 @@ CREATE TABLE `cplusCorrectingType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+
 --
 -- Table structure for table `cplusRectificationType`
 --
diff --git a/package-lock.json b/package-lock.json
index 78ef939870..27216b2343 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.50.01",
+    "version": "24.00.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.50.01",
+            "version": "24.00.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",
diff --git a/package.json b/package.json
index 586c963dd6..e8ceaf5f14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.50.01",
+    "version": "24.00.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

From 38279b07868591761fcdcfb4d4b1b69992ffa307 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Dec 2023 08:37:30 +0100
Subject: [PATCH 16/18] refs #6594 deploy: init version 24.02

---
 CHANGELOG.md               | 6 ++++++
 db/changes/240201/.gitkeep | 0
 package-lock.json          | 4 ++--
 package.json               | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 db/changes/240201/.gitkeep

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b69b8a29b2..1907f46bd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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).
 
+## [2402.01] - 2024-01-11
+
+### Added
+### Changed
+### Fixed
+
 ## [2400.01] - 2024-01-04
 
 ### Added
diff --git a/db/changes/240201/.gitkeep b/db/changes/240201/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/package-lock.json b/package-lock.json
index 27216b2343..012fb50e75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "24.00.01",
+    "version": "24.02.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "24.00.01",
+            "version": "24.02.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",
diff --git a/package.json b/package.json
index e8ceaf5f14..ab3d99e19f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.00.01",
+    "version": "24.02.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

From dc661f298bfe6c8f4f858bbee0097472435c7379 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Thu, 21 Dec 2023 09:10:18 +0000
Subject: [PATCH 17/18] refs #6434 test: update tests

---
 back/methods/vn-user/specs/renew-token.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/back/methods/vn-user/specs/renew-token.spec.js b/back/methods/vn-user/specs/renew-token.spec.js
index 674ce36f40..146f6eb0cb 100644
--- a/back/methods/vn-user/specs/renew-token.spec.js
+++ b/back/methods/vn-user/specs/renew-token.spec.js
@@ -27,8 +27,10 @@ describe('Renew Token', () => {
         jasmine.clock().uninstall();
     });
 
-    it('should renew process', async() => {
-        jasmine.clock().mockDate(new Date(startingTime + 21600000));
+    it('should renew token', async() => {
+        const mockDate = new Date(startingTime + 26600000);
+        jasmine.clock().mockDate(mockDate);
+        console.log(startingTime, mockDate)
         const {id} = await models.VnUser.renewToken(ctx);
 
         expect(id).not.toEqual(ctx.req.accessToken.id);

From 9951e911ae302e09c08813cbb98ceb038bfbd3c2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Dec 2023 10:39:46 +0100
Subject: [PATCH 18/18] refs #5925 feat(docuware_upload): use
 userConfig.tabletFk

---
 .vscode/settings.json                      |  2 +-
 back/methods/docuware/specs/upload.spec.js | 31 +++++++++++++--
 back/methods/docuware/upload.js            | 46 +++++++++++-----------
 back/models/docuwareTablet.json            |  5 +--
 back/models/user-config.json               |  2 +-
 db/changes/235201/00-tabletDocuware.sql    | 24 -----------
 db/changes/240201/00-tabletDocuware.sql    | 10 +++++
 db/dump/fixtures.sql                       |  5 +++
 loopback/locale/es.json                    |  2 +-
 9 files changed, 70 insertions(+), 57 deletions(-)
 delete mode 100644 db/changes/235201/00-tabletDocuware.sql
 create mode 100644 db/changes/240201/00-tabletDocuware.sql

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 40ec5c0d37..36b7e21d84 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,7 @@
     // Carácter predeterminado de final de línea.
     "files.eol": "\n",
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "search.useIgnoreFiles": false,
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
diff --git a/back/methods/docuware/specs/upload.spec.js b/back/methods/docuware/specs/upload.spec.js
index 3b8c55a504..2577fa42db 100644
--- a/back/methods/docuware/specs/upload.spec.js
+++ b/back/methods/docuware/specs/upload.spec.js
@@ -24,15 +24,40 @@ describe('docuware upload()', () => {
     });
 
     it('should try upload file', async() => {
+        const tx = await models.Docuware.beginTransaction({});
         spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
 
         let error;
         try {
-            await models.Docuware.upload(ctx, ticketIds, fileCabinetName);
+            const options = {transaction: tx};
+            const user = await models.UserConfig.findById(userId, null, options);
+            await user.updateAttribute('tabletFk', 'Tablet1');
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
         } catch (e) {
-            error = e.message;
+            error = e;
+            await tx.rollback();
         }
 
-        expect(error).toEqual('Action not allowed on the test environment');
+        expect(error.message).toEqual('Action not allowed on the test environment');
+    });
+
+    it('should throw error when not have tablet assigned', async() => {
+        const tx = await models.Docuware.beginTransaction({});
+        spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This user does not have an assigned tablet');
     });
 });
diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index 5f44e9382b..27be72295e 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -29,12 +29,24 @@ module.exports = Self => {
         }
     });
 
-    Self.upload = async function(ctx, ticketIds, fileCabinet) {
+    Self.upload = async function(ctx, ticketIds, fileCabinet, options) {
         delete ctx.args.ticketIds;
         const models = Self.app.models;
         const action = 'store';
 
-        const options = await Self.getOptions();
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const userConfig = await models.UserConfig.findById(ctx.req.accessToken.userId, {
+            fields: ['tabletFk']
+        }, myOptions);
+
+        if (!userConfig?.tabletFk)
+            throw new UserError('This user does not have an assigned tablet');
+
+        const docuwareOptions = await Self.getOptions();
         const fileCabinetId = await Self.getFileCabinet(fileCabinet);
         const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
 
@@ -45,7 +57,7 @@ module.exports = Self => {
             const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
                 id,
                 type: 'deliveryNote'
-            });
+            }, myOptions);
             // get ticket data
             const ticket = await models.Ticket.findById(id, {
                 include: [{
@@ -54,17 +66,7 @@ module.exports = Self => {
                         fields: ['id', 'name', 'fi']
                     }
                 }]
-            });
-
-            // get tablet
-            const tablet = await models.userConfig.findById(id, {
-                include: [{
-                    relation: 'Tablet',
-                    scope: {
-                        fields: ['id']
-                    }
-                }]
-            });
+            }, myOptions);
 
             // upload file
             const templateJson = {
@@ -112,7 +114,7 @@ module.exports = Self => {
                     {
                         'FieldName': 'FILTRO_TABLET',
                         'ItemElementName': 'string',
-                        'Item': tablet.id,
+                        'Item': userConfig.tabletFk,
                     }
                 ]
             };
@@ -120,19 +122,17 @@ module.exports = Self => {
             if (process.env.NODE_ENV != 'production')
                 throw new UserError('Action not allowed on the test environment');
 
-            if (!tablet.id)
-                throw new UserError('This user does not have an assigned tablet.');
             // delete old
             const docuwareFile = await models.Docuware.checkFile(id, fileCabinet, false);
             if (docuwareFile) {
                 const deleteJson = {
                     'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
                 };
-                const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
-                await axios.put(deleteUri, deleteJson, options.headers);
+                const deleteUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
+                await axios.put(deleteUri, deleteJson, docuwareOptions.headers);
             }
 
-            const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
+            const uploadUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
             const FormData = require('form-data');
             const data = new FormData();
 
@@ -142,7 +142,7 @@ module.exports = Self => {
                 headers: {
                     'Content-Type': 'multipart/form-data',
                     'X-File-ModifiedDate': Date.vnNew(),
-                    'Cookie': options.headers.headers.Cookie,
+                    'Cookie': docuwareOptions.headers.headers.Cookie,
                     ...data.getHeaders()
                 },
             };
@@ -153,11 +153,11 @@ module.exports = Self => {
                 const $t = ctx.req.__;
                 const message = $t('Failed to upload delivery note', {id});
                 if (uploaded.length)
-                    await models.TicketTracking.setDelivered(ctx, uploaded);
+                    await models.TicketTracking.setDelivered(ctx, uploaded, myOptions);
                 throw new UserError(message);
             }
             uploaded.push(id);
         }
-        return models.TicketTracking.setDelivered(ctx, ticketIds);
+        return models.TicketTracking.setDelivered(ctx, ticketIds, myOptions);
     };
 };
diff --git a/back/models/docuwareTablet.json b/back/models/docuwareTablet.json
index e9e3b6bad9..dbbf62f56e 100644
--- a/back/models/docuwareTablet.json
+++ b/back/models/docuwareTablet.json
@@ -7,10 +7,7 @@
 		}
 	},
 	"properties": {
-        "id": {
-            "type": "number"
-        },
-        "name": {
+        "tablet": {
             "type": "string"
         },
         "description": {
diff --git a/back/models/user-config.json b/back/models/user-config.json
index 35f6aa1e6a..5c5df1b9ef 100644
--- a/back/models/user-config.json
+++ b/back/models/user-config.json
@@ -28,7 +28,7 @@
             "type": "boolean"
         },
         "tabletFk": {
-            "type": "number"
+            "type": "string"
         }
     },
     "relations": {
diff --git a/db/changes/235201/00-tabletDocuware.sql b/db/changes/235201/00-tabletDocuware.sql
deleted file mode 100644
index c480c1001a..0000000000
--- a/db/changes/235201/00-tabletDocuware.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- vn.docuwareTablet definition
-
-CREATE TABLE `vn`.`docuwareTablet` (
-  `id` int(3) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `description` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-
---  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
-INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
-	VALUES (1,'tabletRRHH','tablet de recursos humanos');
-INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
-	VALUES (2,'tabletIT','tablet de IT');
-INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
-	VALUES (3,'tabletCompradores','tablet de compradores');
-INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
-	VALUES (4,'tabletComerciales','tablet de comerciales');
-INSERT INTO `vn`.`docuwareTablet` (`id`,`name`,`description`)
-	VALUES (5,'tabletAdministracion','tablet de administracion');
-
-ALTER TABLE `vn`.`userConfig`
-ADD COLUMN tabletFk int(3),
-ADD FOREIGN KEY (tabletFk) REFERENCES `vn`.`docuwareTablet`(id);
diff --git a/db/changes/240201/00-tabletDocuware.sql b/db/changes/240201/00-tabletDocuware.sql
new file mode 100644
index 0000000000..ffa0226b33
--- /dev/null
+++ b/db/changes/240201/00-tabletDocuware.sql
@@ -0,0 +1,10 @@
+-- vn.docuwareTablet definition
+
+CREATE TABLE `vn`.`docuwareTablet` (
+  `tablet` varchar(100) NOT NULL PRIMARY KEY,
+  `description` varchar(255) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE `vn`.`userConfig`
+ADD COLUMN tabletFk varchar(100) DEFAULT NULL,
+ADD FOREIGN KEY (tabletFk) REFERENCES `vn`.`docuwareTablet`(tablet);
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 8997e40b1e..479704dd96 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -3009,3 +3009,8 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
         (1, 'Error in VAT calculation'),
         (2, 'Error in sales details'),
         (3, 'Error in customer data');
+
+INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`)
+	VALUES
+        ('Tablet1','Jarvis tablet'),
+	    ('Tablet2','Avengers tablet');
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 94bc29a867..a197197ba1 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -330,5 +330,5 @@
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
 	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-    "This user does not have an assigned tablet.": "Este usuario no tiene tablet asignada"
+    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
 }