From e43210af9cf814ccdefb4dd7ce00bbf6da390484 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Jan 2024 09:23:43 +0100
Subject: [PATCH 01/21] fix(driver-route): refs #6684 manage word overflow with
 wordBreak

---
 modules/item/front/basic-data/index.html               | 7 +++++++
 print/templates/reports/driver-route/driver-route.html | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index af76d5966..38c314208 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -49,6 +49,13 @@
                 vn-name="relevancy"
                 rule>
             </vn-input-number>
+            <vn-input-number
+                min="0"
+                label="Size"
+                ng-model="$ctrl.item.size"
+                vn-name="size"
+                rule>
+            </vn-input-number>
         </vn-horizontal>
         <vn-horizontal>
             <vn-input-number
diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html
index 1475b8e77..cf414c4d3 100644
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@@ -129,7 +129,7 @@
                         </tbody>
                     </table>
                     <div v-if="ticket.description" class="text-area">
-                        <p>{{ticket.description}}</p>
+                        <p style="word-break: break-all;">{{ticket.description}}</p>
                     </div>
                 </div>
             </div>

From 4fc71b9798edf7a225b5272acd765a0437b4e58a Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 29 Jan 2024 08:04:52 +0100
Subject: [PATCH 02/21] fix(driverRoute): refs #6684 driverRouteHotFix

---
 print/templates/reports/driver-route/assets/css/style.css | 3 +++
 print/templates/reports/driver-route/driver-route.html    | 2 +-
 print/templates/reports/driver-route/driver-route.js      | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/print/templates/reports/driver-route/assets/css/style.css b/print/templates/reports/driver-route/assets/css/style.css
index 6b76748eb..903d15186 100644
--- a/print/templates/reports/driver-route/assets/css/style.css
+++ b/print/templates/reports/driver-route/assets/css/style.css
@@ -47,6 +47,9 @@ section.text-area {
     padding-right: 1em;
     background-color: #e5e5e5;
 }
+.text-area > p {
+    word-break: break-all;
+}
 
 .route-block {
     margin-bottom: 100px;
diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html
index cf414c4d3..1475b8e77 100644
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@@ -129,7 +129,7 @@
                         </tbody>
                     </table>
                     <div v-if="ticket.description" class="text-area">
-                        <p style="word-break: break-all;">{{ticket.description}}</p>
+                        <p>{{ticket.description}}</p>
                     </div>
                 </div>
             </div>
diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js
index c166e3809..a970da18c 100755
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@@ -5,12 +5,12 @@ module.exports = {
     mixins: [vnReport],
     async serverPrefetch() {
         let ids = this.id;
-
+        console.log(typeof ids);
         const hasMultipleRoutes = String(this.id).includes(',');
         if (hasMultipleRoutes)
             ids = this.id.split(',');
 
-        const routes = await this.rawSqlFromDef('routes', [ids]);
+        const routes = await this.rawSqlFromDef('routes', +[ids]);
         const tickets = await this.rawSqlFromDef('tickets', [ids, ids]);
 
         const map = new Map();

From 194262a93e2fdcd86d14fb0f0bed89d3872d539e Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Mon, 29 Jan 2024 13:48:02 +0100
Subject: [PATCH 03/21] fix: refs #6085 ACL canEditAlias checked, migrated to
 remote hooks

---
 back/models/specs/mailAliasAccount.spec.js    | 17 ------
 .../240404/00-revokeMailAliasAccount.sql      |  5 ++
 gulpfile.js                                   |  4 +-
 loopback/locale/en.json                       |  6 ++-
 loopback/locale/es.json                       |  2 +-
 .../account/back/models/mail-alias-account.js | 52 +++++++++----------
 6 files changed, 38 insertions(+), 48 deletions(-)
 create mode 100644 db/changes/240404/00-revokeMailAliasAccount.sql

diff --git a/back/models/specs/mailAliasAccount.spec.js b/back/models/specs/mailAliasAccount.spec.js
index c13cc7ae8..8f0278a50 100644
--- a/back/models/specs/mailAliasAccount.spec.js
+++ b/back/models/specs/mailAliasAccount.spec.js
@@ -1,23 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('loopback model MailAliasAccount', () => {
-    it('should fail to add a mail Alias if the worker doesnt have ACLs', async() => {
-        const tx = await models.MailAliasAccount.beginTransaction({});
-        let error;
-
-        try {
-            const options = {transaction: tx, accessToken: {userId: 57}};
-            await models.MailAliasAccount.create({mailAlias: 2, account: 5}, options);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            error = e;
-        }
-
-        expect(error.message).toEqual('The alias cant be modified');
-    });
-
     it('should add a mail Alias', async() => {
         const tx = await models.MailAliasAccount.beginTransaction({});
         let error;
diff --git a/db/changes/240404/00-revokeMailAliasAccount.sql b/db/changes/240404/00-revokeMailAliasAccount.sql
new file mode 100644
index 000000000..a86de1f3c
--- /dev/null
+++ b/db/changes/240404/00-revokeMailAliasAccount.sql
@@ -0,0 +1,5 @@
+DELETE FROM salix.ACL
+	WHERE model = 'MailAliasAccount'
+		AND property = 'canEditAlias'
+		AND principalType = 'ROLE'
+		AND principalId = 'marketingBoss';
diff --git a/gulpfile.js b/gulpfile.js
index d7e7d8e86..8614ed1b4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -234,13 +234,13 @@ async function dockerStart() {
     const container = new Docker('salix-db');
     await container.start();
 }
-dockerStart.description = `Starts the salix-db container`;
+dockerStart.description = `Starts the DB container`;
 
 async function docker() {
     const container = new Docker('salix-db');
     await container.run();
 }
-docker.description = `Runs the salix-db container`;
+docker.description = `Builds and starts the DB container`;
 
 module.exports = {
     default: defaultTask,
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 568916bef..fb287d185 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -203,5 +203,7 @@
 	"Cannot past travels with entries": "Cannot past travels with entries",
 	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
 	"Incorrect pin": "Incorrect pin.",
-	"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified"
-}
\ No newline at end of file
+	"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
+	"You are not allowed to modify the alias": "You are not allowed to modify the alias",
+	"You already have the mailAlias": "You already have the mailAlias"
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 5555ef8b0..9163c494f 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -335,6 +335,6 @@
 	"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
 	"Incorrect pin": "Pin incorrecto.",
 	"You already have the mailAlias": "Ya tienes este alias de correo",
-	"The alias cant be modified": "Este alias de correo no puede ser modificado",
+	"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
 	"No tickets to invoice": "No hay tickets para facturar"
 }
diff --git a/modules/account/back/models/mail-alias-account.js b/modules/account/back/models/mail-alias-account.js
index 5eb561408..61ca344e9 100644
--- a/modules/account/back/models/mail-alias-account.js
+++ b/modules/account/back/models/mail-alias-account.js
@@ -1,5 +1,5 @@
 
-const UserError = require('vn-loopback/util/user-error');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
 
 module.exports = Self => {
     Self.rewriteDbError(function(err) {
@@ -8,38 +8,38 @@ module.exports = Self => {
         return err;
     });
 
-    Self.observe('before save', async ctx => {
-        const changes = ctx.currentInstance || ctx.instance;
-
-        await checkModifyPermission(ctx, changes.mailAlias);
+    Self.beforeRemote('create', async function(ctx) {
+        const mailAlias = ctx.args.data?.mailAlias;
+        if (!mailAlias) return;
+        await checkModifyPermission(ctx, mailAlias);
     });
-
-    Self.observe('before delete', async ctx => {
-        const mailAliasAccount = await Self.findById(ctx.where.id);
-
-        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
+    Self.beforeRemote('deleteById', async function(ctx) {
+        const instance = await Self.findById(ctx.args.id,
+            {fields: ['mailAlias']}
+        );
+        await checkModifyPermission(ctx, instance.mailAlias);
     });
 
     async function checkModifyPermission(ctx, mailAliasFk) {
-        const userId = ctx.options.accessToken.userId;
         const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
 
-        const roles = await models.RoleMapping.find({
-            fields: ['roleId'],
-            where: {principalId: userId}
+        const canEditAlias = await models.ACL.checkAccessAcl(ctx,
+            'MailAliasAccount', 'canEditAlias', 'WRITE');
+        if (canEditAlias) return;
+
+        const allowedRoles = await models.MailAliasAcl.find({
+            fields: ['roleFk'],
+            where: {mailAliasFk}
         });
+        const nRoles = allowedRoles.length &&
+            await models.RoleMapping.count({
+                principalId: userId,
+                principalType: 'USER',
+                roleId: {inq: allowedRoles.map(x => x.roleFk)}
+            });
 
-        const availableMailAlias = await models.MailAliasAcl.findOne({
-            fields: ['mailAliasFk'],
-            include: {relation: 'mailAlias'},
-            where: {
-                roleFk: {
-                    inq: roles.map(role => role.roleId),
-                },
-                mailAliasFk
-            }
-        });
-
-        if (!availableMailAlias) throw new UserError('The alias cant be modified');
+        if (!nRoles)
+            throw new ForbiddenError('You are not allowed to modify the alias');
     }
 };

From 7d4b6132ec1392fa0154302bcd67658b27999fb4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 31 Jan 2024 12:30:57 +0100
Subject: [PATCH 04/21] fix(css): refs #6684 driverRouteReport

---
 modules/item/front/basic-data/index.html                  | 7 -------
 print/templates/reports/driver-route/assets/css/style.css | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 38c314208..af76d5966 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -49,13 +49,6 @@
                 vn-name="relevancy"
                 rule>
             </vn-input-number>
-            <vn-input-number
-                min="0"
-                label="Size"
-                ng-model="$ctrl.item.size"
-                vn-name="size"
-                rule>
-            </vn-input-number>
         </vn-horizontal>
         <vn-horizontal>
             <vn-input-number
diff --git a/print/templates/reports/driver-route/assets/css/style.css b/print/templates/reports/driver-route/assets/css/style.css
index 903d15186..101ef7b3f 100644
--- a/print/templates/reports/driver-route/assets/css/style.css
+++ b/print/templates/reports/driver-route/assets/css/style.css
@@ -46,9 +46,9 @@ section.text-area {
     padding-left: 1em;
     padding-right: 1em;
     background-color: #e5e5e5;
-}
-.text-area > p {
-    word-break: break-all;
+    & > p {
+        word-break: break-all;
+    }
 }
 
 .route-block {

From 4ba76291c141a6d9d142d870de1a40d4557641b7 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 31 Jan 2024 12:33:52 +0100
Subject: [PATCH 05/21] remove(console.log): refs #6684 driverRouteFix

---
 print/templates/reports/driver-route/driver-route.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js
index a970da18c..ad8ad62ee 100755
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@@ -5,12 +5,11 @@ module.exports = {
     mixins: [vnReport],
     async serverPrefetch() {
         let ids = this.id;
-        console.log(typeof ids);
         const hasMultipleRoutes = String(this.id).includes(',');
         if (hasMultipleRoutes)
             ids = this.id.split(',');
 
-        const routes = await this.rawSqlFromDef('routes', +[ids]);
+        const routes = await this.rawSqlFromDef('routes', [ids]);
         const tickets = await this.rawSqlFromDef('tickets', [ids, ids]);
 
         const map = new Map();

From 550e3991cd2b303338f3049a0c33e2cfaebc6f6f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 31 Jan 2024 12:50:32 +0100
Subject: [PATCH 06/21] fix(warning): refs #6684 fix vue warning

---
 print/templates/reports/driver-route/driver-route.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js
index ad8ad62ee..bfe04f337 100755
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@@ -29,7 +29,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: Number,
+            type: String,
             required: true,
             description: 'The route id'
         }

From ff225400761f87ff27bd310e655c63ce0030d0bb Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 5 Feb 2024 12:48:43 +0100
Subject: [PATCH 07/21] fix: hotfix puppeteer updated

---
 package-lock.json | 1155 +++++++++++++++++++++++++++------------------
 package.json      |    2 +-
 2 files changed, 706 insertions(+), 451 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 36e11dc8f..96d3bbc09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
                 "node-ssh": "^11.0.0",
                 "object-diff": "0.0.4",
                 "object.pick": "^1.3.0",
-                "puppeteer": "^20.3.0",
+                "puppeteer": "^20.9.0",
                 "read-chunk": "^3.2.0",
                 "require-yaml": "0.0.1",
                 "smbhash": "0.0.1",
@@ -2907,17 +2907,15 @@
             }
         },
         "node_modules/@puppeteer/browsers": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.3.0.tgz",
-            "integrity": "sha512-an3QdbNPkuU6qpxpbssxAbjRLJcF+eP4L8UqIY3+6n0sbaVxw5pz7PiCLy9g32XEZuoamUlV5ZQPnA6FxvkIHA==",
+            "version": "1.4.6",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.6.tgz",
+            "integrity": "sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==",
             "dependencies": {
                 "debug": "4.3.4",
                 "extract-zip": "2.0.1",
-                "http-proxy-agent": "5.0.0",
-                "https-proxy-agent": "5.0.1",
                 "progress": "2.0.3",
-                "proxy-from-env": "1.1.0",
-                "tar-fs": "2.1.1",
+                "proxy-agent": "6.3.0",
+                "tar-fs": "3.0.4",
                 "unbzip2-stream": "1.4.3",
                 "yargs": "17.7.1"
             },
@@ -2925,7 +2923,7 @@
                 "browsers": "lib/cjs/main-cli.js"
             },
             "engines": {
-                "node": ">=16.0.0"
+                "node": ">=16.3.0"
             },
             "peerDependencies": {
                 "typescript": ">= 4.7.4"
@@ -2936,25 +2934,6 @@
                 }
             }
         },
-        "node_modules/@puppeteer/browsers/node_modules/@tootallnate/once": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-            "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@puppeteer/browsers/node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dependencies": {
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6.0.0"
-            }
-        },
         "node_modules/@puppeteer/browsers/node_modules/ansi-regex": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -2979,31 +2958,6 @@
                 }
             }
         },
-        "node_modules/@puppeteer/browsers/node_modules/http-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-            "dependencies": {
-                "@tootallnate/once": "2",
-                "agent-base": "6",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/@puppeteer/browsers/node_modules/https-proxy-agent": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-            "dependencies": {
-                "agent-base": "6",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/@puppeteer/browsers/node_modules/is-fullwidth-code-point": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -3093,6 +3047,11 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/@tootallnate/quickjs-emscripten": {
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+            "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
+        },
         "node_modules/@types/babel__core": {
             "version": "7.1.19",
             "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
@@ -3359,9 +3318,9 @@
             "dev": true
         },
         "node_modules/@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+            "version": "2.10.3",
+            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+            "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
             "optional": true,
             "dependencies": {
                 "@types/node": "*"
@@ -4300,6 +4259,11 @@
                 "proxy-from-env": "^1.1.0"
             }
         },
+        "node_modules/b4a": {
+            "version": "1.6.4",
+            "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+            "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
+        },
         "node_modules/babel-jest": {
             "version": "26.6.3",
             "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
@@ -4606,6 +4570,14 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/basic-ftp": {
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.4.tgz",
+            "integrity": "sha512-8PzkB0arJFV4jJWSGOYR+OEic6aeKMu/osRhBULN6RY0ykby6LKhbmuQ5ublvaas5BOwboah5D87nrHyuh8PPA==",
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
         "node_modules/batch": {
             "version": "0.6.1",
             "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
@@ -5568,10 +5540,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/chownr": {
-            "version": "1.1.4",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-        },
         "node_modules/chrome-trace-event": {
             "version": "1.0.3",
             "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
@@ -5580,9 +5548,9 @@
             }
         },
         "node_modules/chromium-bidi": {
-            "version": "0.4.9",
-            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.9.tgz",
-            "integrity": "sha512-u3DC6XwgLCA9QJ5ak1voPslCmacQdulZNCPsI3qNXxSnEcZS7DFIbww+5RM2bznMEje7cc0oydavRLRvOIZtHw==",
+            "version": "0.4.16",
+            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
+            "integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
             "dependencies": {
                 "mitt": "3.0.0"
             },
@@ -6202,9 +6170,9 @@
             "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
         },
         "node_modules/cosmiconfig": {
-            "version": "8.1.3",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-            "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
+            "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
             "dependencies": {
                 "import-fresh": "^3.2.1",
                 "js-yaml": "^4.1.0",
@@ -6487,6 +6455,14 @@
             "version": "2.0.0",
             "integrity": "sha512-APql/TZ6FdLEpf2z7/X2a2zyqK8juYtqaSVqxw9mYoQ64CXkfU15AeLh8pUszT8+fnYjgm6t0aIYpWKJbnLkuA=="
         },
+        "node_modules/data-uri-to-buffer": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz",
+            "integrity": "sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg==",
+            "engines": {
+                "node": ">= 14"
+            }
+        },
         "node_modules/data-urls": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -6645,7 +6621,8 @@
         },
         "node_modules/deep-is": {
             "version": "0.1.4",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+            "dev": true
         },
         "node_modules/deepmerge": {
             "version": "4.2.2",
@@ -6871,6 +6848,30 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/degenerator": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+            "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+            "dependencies": {
+                "ast-types": "^0.13.4",
+                "escodegen": "^2.1.0",
+                "esprima": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/degenerator/node_modules/ast-types": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+            "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+            "dependencies": {
+                "tslib": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/del": {
             "version": "2.2.2",
             "integrity": "sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==",
@@ -6973,9 +6974,9 @@
             "dev": true
         },
         "node_modules/devtools-protocol": {
-            "version": "0.0.1120988",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1120988.tgz",
-            "integrity": "sha512-39fCpE3Z78IaIPChJsP6Lhmkbf4dWXOmzLk/KFTdRkNk/0JymRIfUynDVRndV9HoDz8PyalK1UH21ST/ivwW5Q=="
+            "version": "0.0.1147663",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
+            "integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ=="
         },
         "node_modules/diff": {
             "version": "1.4.0",
@@ -7480,14 +7481,13 @@
             }
         },
         "node_modules/escodegen": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-            "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+            "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
             "dependencies": {
                 "esprima": "^4.0.1",
                 "estraverse": "^5.2.0",
-                "esutils": "^2.0.2",
-                "optionator": "^0.8.1"
+                "esutils": "^2.0.2"
             },
             "bin": {
                 "escodegen": "bin/escodegen.js",
@@ -7508,42 +7508,6 @@
                 "node": ">=4.0"
             }
         },
-        "node_modules/escodegen/node_modules/levn": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-            "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-            "dependencies": {
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/escodegen/node_modules/optionator": {
-            "version": "0.8.3",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-            "dependencies": {
-                "deep-is": "~0.1.3",
-                "fast-levenshtein": "~2.0.6",
-                "levn": "~0.3.0",
-                "prelude-ls": "~1.1.2",
-                "type-check": "~0.3.2",
-                "word-wrap": "~1.2.3"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/escodegen/node_modules/prelude-ls": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-            "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/escodegen/node_modules/source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7553,17 +7517,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/escodegen/node_modules/type-check": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-            "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-            "dependencies": {
-                "prelude-ls": "~1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/eslint": {
             "version": "7.32.0",
             "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
@@ -8359,6 +8312,11 @@
             "version": "3.1.3",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
         },
+        "node_modules/fast-fifo": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+            "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+        },
         "node_modules/fast-json-patch": {
             "version": "2.2.1",
             "integrity": "sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==",
@@ -8379,7 +8337,8 @@
         },
         "node_modules/fast-levenshtein": {
             "version": "2.0.6",
-            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+            "dev": true
         },
         "node_modules/fast-safe-stringify": {
             "version": "2.1.1",
@@ -8989,11 +8948,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-        },
         "node_modules/fs-extra": {
             "version": "5.0.0",
             "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
@@ -9321,6 +9275,54 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/get-uri": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
+            "integrity": "sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==",
+            "dependencies": {
+                "basic-ftp": "^5.0.2",
+                "data-uri-to-buffer": "^6.0.0",
+                "debug": "^4.3.4",
+                "fs-extra": "^8.1.0"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/get-uri/node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/get-uri/node_modules/fs-extra": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^4.0.0",
+                "universalify": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=6 <7 || >=8"
+            }
+        },
+        "node_modules/get-uri/node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
         "node_modules/get-value": {
             "version": "2.0.6",
             "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
@@ -11940,8 +11942,9 @@
             }
         },
         "node_modules/ip": {
-            "version": "1.1.5",
-            "integrity": "sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA=="
+            "version": "1.1.8",
+            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+            "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
         },
         "node_modules/ip-regex": {
             "version": "2.1.0",
@@ -17453,6 +17456,14 @@
             "version": "2.6.2",
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
         },
+        "node_modules/netmask": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+            "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
         "node_modules/next-tick": {
             "version": "1.1.0",
             "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
@@ -17499,9 +17510,9 @@
             }
         },
         "node_modules/node-fetch": {
-            "version": "2.6.11",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-            "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
             "dependencies": {
                 "whatwg-url": "^5.0.0"
             },
@@ -18695,6 +18706,106 @@
                 "node": ">=6"
             }
         },
+        "node_modules/pac-proxy-agent": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
+            "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
+            "dependencies": {
+                "@tootallnate/quickjs-emscripten": "^0.23.0",
+                "agent-base": "^7.0.2",
+                "debug": "^4.3.4",
+                "get-uri": "^6.0.1",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.2",
+                "pac-resolver": "^7.0.0",
+                "socks-proxy-agent": "^8.0.2"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/pac-proxy-agent/node_modules/agent-base": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+            "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+            "dependencies": {
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/pac-proxy-agent/node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+            "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+            "dependencies": {
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+            "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+            "dependencies": {
+                "agent-base": "^7.0.2",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/pac-proxy-agent/node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+            "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+            "dependencies": {
+                "agent-base": "^7.0.2",
+                "debug": "^4.3.4",
+                "socks": "^2.7.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/pac-resolver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
+            "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==",
+            "dependencies": {
+                "degenerator": "^5.0.0",
+                "ip": "^1.1.8",
+                "netmask": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
         "node_modules/package-json": {
             "version": "6.5.0",
             "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
@@ -19499,6 +19610,101 @@
                 "node": ">= 0.10"
             }
         },
+        "node_modules/proxy-agent": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz",
+            "integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==",
+            "dependencies": {
+                "agent-base": "^7.0.2",
+                "debug": "^4.3.4",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.0",
+                "lru-cache": "^7.14.1",
+                "pac-proxy-agent": "^7.0.0",
+                "proxy-from-env": "^1.1.0",
+                "socks-proxy-agent": "^8.0.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/proxy-agent/node_modules/agent-base": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+            "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+            "dependencies": {
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/proxy-agent/node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+            "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+            "dependencies": {
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+            "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+            "dependencies": {
+                "agent-base": "^7.0.2",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/proxy-agent/node_modules/lru-cache": {
+            "version": "7.18.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+            "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/proxy-agent/node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+            "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+            "dependencies": {
+                "agent-base": "^7.0.2",
+                "debug": "^4.3.4",
+                "socks": "^2.7.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
         "node_modules/proxy-from-env": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -19567,14 +19773,18 @@
             }
         },
         "node_modules/puppeteer": {
-            "version": "20.3.0",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.3.0.tgz",
-            "integrity": "sha512-OJIsxC3PcU6fAWfp1BX0oKj62FFxhxwpakGAcGVbyfqfDrNmkFjpzb0XrMsgnQxCJmoLpTZKHRXDFxEDnLqkow==",
+            "version": "20.9.0",
+            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.9.0.tgz",
+            "integrity": "sha512-kAglT4VZ9fWEGg3oLc4/de+JcONuEJhlh3J6f5R1TLkrY/EHHIHxWXDOzXvaxQCtedmyVXBwg8M+P8YCO/wZjw==",
+            "deprecated": "< 21.5.0 is no longer supported",
             "hasInstallScript": true,
             "dependencies": {
-                "@puppeteer/browsers": "1.3.0",
-                "cosmiconfig": "8.1.3",
-                "puppeteer-core": "20.3.0"
+                "@puppeteer/browsers": "1.4.6",
+                "cosmiconfig": "8.2.0",
+                "puppeteer-core": "20.9.0"
+            },
+            "engines": {
+                "node": ">=16.3.0"
             }
         },
         "node_modules/puppeteer-cluster": {
@@ -19607,19 +19817,19 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "node_modules/puppeteer-core": {
-            "version": "20.3.0",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.3.0.tgz",
-            "integrity": "sha512-264pBrIui5bO6NJeOcbJrLa0OCwmA4+WK00JMrLIKTfRiqe2gx8KWTzLsjyw/bizErp3TKS7vt/I0i5fTC+mAw==",
+            "version": "20.9.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
+            "integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
             "dependencies": {
-                "@puppeteer/browsers": "1.3.0",
-                "chromium-bidi": "0.4.9",
-                "cross-fetch": "3.1.6",
+                "@puppeteer/browsers": "1.4.6",
+                "chromium-bidi": "0.4.16",
+                "cross-fetch": "4.0.0",
                 "debug": "4.3.4",
-                "devtools-protocol": "0.0.1120988",
+                "devtools-protocol": "0.0.1147663",
                 "ws": "8.13.0"
             },
             "engines": {
-                "node": ">=16.0.0"
+                "node": ">=16.3.0"
             },
             "peerDependencies": {
                 "typescript": ">= 4.7.4"
@@ -19630,6 +19840,14 @@
                 }
             }
         },
+        "node_modules/puppeteer-core/node_modules/cross-fetch": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+            "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+            "dependencies": {
+                "node-fetch": "^2.6.12"
+            }
+        },
         "node_modules/puppeteer-core/node_modules/debug": {
             "version": "4.3.4",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -19673,6 +19891,11 @@
             "version": "2.2.0",
             "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
         },
+        "node_modules/queue-tick": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+            "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+        },
         "node_modules/quick-lru": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
@@ -21466,7 +21689,6 @@
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
             "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-            "dev": true,
             "engines": {
                 "node": ">= 6.0.0",
                 "npm": ">= 3.0.0"
@@ -21668,7 +21890,6 @@
             "version": "2.7.1",
             "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
             "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-            "dev": true,
             "dependencies": {
                 "ip": "^2.0.0",
                 "smart-buffer": "^4.2.0"
@@ -21730,8 +21951,7 @@
         "node_modules/socks/node_modules/ip": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-            "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
-            "dev": true
+            "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
         },
         "node_modules/source-map": {
             "version": "0.5.6",
@@ -22196,6 +22416,15 @@
                 "node": ">=0.8.0"
             }
         },
+        "node_modules/streamx": {
+            "version": "2.15.7",
+            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.7.tgz",
+            "integrity": "sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA==",
+            "dependencies": {
+                "fast-fifo": "^1.1.0",
+                "queue-tick": "^1.0.1"
+            }
+        },
         "node_modules/string_decoder": {
             "version": "0.10.31",
             "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
@@ -23110,121 +23339,23 @@
             }
         },
         "node_modules/tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+            "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
             "dependencies": {
-                "chownr": "^1.1.1",
                 "mkdirp-classic": "^0.5.2",
                 "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
+                "tar-stream": "^3.1.5"
             }
         },
         "node_modules/tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+            "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
             "dependencies": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/tar-stream/node_modules/base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/tar-stream/node_modules/bl": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-            "dependencies": {
-                "buffer": "^5.5.0",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
-            }
-        },
-        "node_modules/tar-stream/node_modules/buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
-            }
-        },
-        "node_modules/tar-stream/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/tar-stream/node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/tar-stream/node_modules/string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
+                "b4a": "^1.6.4",
+                "fast-fifo": "^1.2.0",
+                "streamx": "^2.15.0"
             }
         },
         "node_modules/tar/node_modules/chownr": {
@@ -23747,8 +23878,7 @@
         "node_modules/tslib": {
             "version": "2.5.2",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
-            "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==",
-            "dev": true
+            "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
         },
         "node_modules/tunnel-agent": {
             "version": "0.6.0",
@@ -25530,6 +25660,7 @@
         "node_modules/word-wrap": {
             "version": "1.2.3",
             "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -29429,34 +29560,19 @@
             "optional": true
         },
         "@puppeteer/browsers": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.3.0.tgz",
-            "integrity": "sha512-an3QdbNPkuU6qpxpbssxAbjRLJcF+eP4L8UqIY3+6n0sbaVxw5pz7PiCLy9g32XEZuoamUlV5ZQPnA6FxvkIHA==",
+            "version": "1.4.6",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.6.tgz",
+            "integrity": "sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==",
             "requires": {
                 "debug": "4.3.4",
                 "extract-zip": "2.0.1",
-                "http-proxy-agent": "5.0.0",
-                "https-proxy-agent": "5.0.1",
                 "progress": "2.0.3",
-                "proxy-from-env": "1.1.0",
-                "tar-fs": "2.1.1",
+                "proxy-agent": "6.3.0",
+                "tar-fs": "3.0.4",
                 "unbzip2-stream": "1.4.3",
                 "yargs": "17.7.1"
             },
             "dependencies": {
-                "@tootallnate/once": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-                    "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="
-                },
-                "agent-base": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-                    "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-                    "requires": {
-                        "debug": "4"
-                    }
-                },
                 "ansi-regex": {
                     "version": "5.0.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -29470,25 +29586,6 @@
                         "ms": "2.1.2"
                     }
                 },
-                "http-proxy-agent": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-                    "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-                    "requires": {
-                        "@tootallnate/once": "2",
-                        "agent-base": "6",
-                        "debug": "4"
-                    }
-                },
-                "https-proxy-agent": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-                    "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-                    "requires": {
-                        "agent-base": "6",
-                        "debug": "4"
-                    }
-                },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -29553,6 +29650,11 @@
             "version": "1.1.2",
             "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
         },
+        "@tootallnate/quickjs-emscripten": {
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+            "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
+        },
         "@types/babel__core": {
             "version": "7.1.19",
             "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
@@ -29818,9 +29920,9 @@
             "dev": true
         },
         "@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+            "version": "2.10.3",
+            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+            "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
             "optional": true,
             "requires": {
                 "@types/node": "*"
@@ -30541,6 +30643,11 @@
                 "proxy-from-env": "^1.1.0"
             }
         },
+        "b4a": {
+            "version": "1.6.4",
+            "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+            "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
+        },
         "babel-jest": {
             "version": "26.6.3",
             "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
@@ -30771,6 +30878,11 @@
             "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
             "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
         },
+        "basic-ftp": {
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.4.tgz",
+            "integrity": "sha512-8PzkB0arJFV4jJWSGOYR+OEic6aeKMu/osRhBULN6RY0ykby6LKhbmuQ5ublvaas5BOwboah5D87nrHyuh8PPA=="
+        },
         "batch": {
             "version": "0.6.1",
             "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
@@ -31516,18 +31628,14 @@
                 }
             }
         },
-        "chownr": {
-            "version": "1.1.4",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-        },
         "chrome-trace-event": {
             "version": "1.0.3",
             "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
         },
         "chromium-bidi": {
-            "version": "0.4.9",
-            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.9.tgz",
-            "integrity": "sha512-u3DC6XwgLCA9QJ5ak1voPslCmacQdulZNCPsI3qNXxSnEcZS7DFIbww+5RM2bznMEje7cc0oydavRLRvOIZtHw==",
+            "version": "0.4.16",
+            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
+            "integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
             "requires": {
                 "mitt": "3.0.0"
             }
@@ -31999,9 +32107,9 @@
             "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
         },
         "cosmiconfig": {
-            "version": "8.1.3",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-            "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
+            "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
             "requires": {
                 "import-fresh": "^3.2.1",
                 "js-yaml": "^4.1.0",
@@ -32204,6 +32312,11 @@
             "version": "2.0.0",
             "integrity": "sha512-APql/TZ6FdLEpf2z7/X2a2zyqK8juYtqaSVqxw9mYoQ64CXkfU15AeLh8pUszT8+fnYjgm6t0aIYpWKJbnLkuA=="
         },
+        "data-uri-to-buffer": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz",
+            "integrity": "sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg=="
+        },
         "data-urls": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -32324,7 +32437,8 @@
         },
         "deep-is": {
             "version": "0.1.4",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+            "dev": true
         },
         "deepmerge": {
             "version": "4.2.2",
@@ -32490,6 +32604,26 @@
                 }
             }
         },
+        "degenerator": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+            "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+            "requires": {
+                "ast-types": "^0.13.4",
+                "escodegen": "^2.1.0",
+                "esprima": "^4.0.1"
+            },
+            "dependencies": {
+                "ast-types": {
+                    "version": "0.13.4",
+                    "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+                    "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+                    "requires": {
+                        "tslib": "^2.0.1"
+                    }
+                }
+            }
+        },
         "del": {
             "version": "2.2.2",
             "integrity": "sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==",
@@ -32567,9 +32701,9 @@
             "dev": true
         },
         "devtools-protocol": {
-            "version": "0.0.1120988",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1120988.tgz",
-            "integrity": "sha512-39fCpE3Z78IaIPChJsP6Lhmkbf4dWXOmzLk/KFTdRkNk/0JymRIfUynDVRndV9HoDz8PyalK1UH21ST/ivwW5Q=="
+            "version": "0.0.1147663",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
+            "integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ=="
         },
         "diff": {
             "version": "1.4.0",
@@ -33009,14 +33143,13 @@
             "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
         },
         "escodegen": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-            "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+            "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
             "requires": {
                 "esprima": "^4.0.1",
                 "estraverse": "^5.2.0",
                 "esutils": "^2.0.2",
-                "optionator": "^0.8.1",
                 "source-map": "~0.6.1"
             },
             "dependencies": {
@@ -33025,46 +33158,11 @@
                     "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
                     "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
                 },
-                "levn": {
-                    "version": "0.3.0",
-                    "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-                    "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-                    "requires": {
-                        "prelude-ls": "~1.1.2",
-                        "type-check": "~0.3.2"
-                    }
-                },
-                "optionator": {
-                    "version": "0.8.3",
-                    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-                    "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-                    "requires": {
-                        "deep-is": "~0.1.3",
-                        "fast-levenshtein": "~2.0.6",
-                        "levn": "~0.3.0",
-                        "prelude-ls": "~1.1.2",
-                        "type-check": "~0.3.2",
-                        "word-wrap": "~1.2.3"
-                    }
-                },
-                "prelude-ls": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-                    "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
-                },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "optional": true
-                },
-                "type-check": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-                    "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-                    "requires": {
-                        "prelude-ls": "~1.1.2"
-                    }
                 }
             }
         },
@@ -33658,6 +33756,11 @@
             "version": "3.1.3",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
         },
+        "fast-fifo": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+            "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+        },
         "fast-json-patch": {
             "version": "2.2.1",
             "integrity": "sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==",
@@ -33677,7 +33780,8 @@
         },
         "fast-levenshtein": {
             "version": "2.0.6",
-            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+            "dev": true
         },
         "fast-safe-stringify": {
             "version": "2.1.1",
@@ -34144,11 +34248,6 @@
             "version": "0.5.2",
             "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
         },
-        "fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-        },
         "fs-extra": {
             "version": "5.0.0",
             "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
@@ -34405,6 +34504,42 @@
                 "pump": "^3.0.0"
             }
         },
+        "get-uri": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
+            "integrity": "sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==",
+            "requires": {
+                "basic-ftp": "^5.0.2",
+                "data-uri-to-buffer": "^6.0.0",
+                "debug": "^4.3.4",
+                "fs-extra": "^8.1.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.3.4",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+                    "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "fs-extra": {
+                    "version": "8.1.0",
+                    "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+                    "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+                    "requires": {
+                        "graceful-fs": "^4.2.0",
+                        "jsonfile": "^4.0.0",
+                        "universalify": "^0.1.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+                }
+            }
+        },
         "get-value": {
             "version": "2.0.6",
             "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
@@ -36535,8 +36670,9 @@
             "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="
         },
         "ip": {
-            "version": "1.1.5",
-            "integrity": "sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA=="
+            "version": "1.1.8",
+            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+            "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
         },
         "ip-regex": {
             "version": "2.1.0",
@@ -40946,6 +41082,11 @@
             "version": "2.6.2",
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
         },
+        "netmask": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+            "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
+        },
         "next-tick": {
             "version": "1.1.0",
             "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
@@ -40976,9 +41117,9 @@
             "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
         },
         "node-fetch": {
-            "version": "2.6.11",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-            "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
             "requires": {
                 "whatwg-url": "^5.0.0"
             }
@@ -41851,6 +41992,82 @@
             "version": "2.2.0",
             "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
+        "pac-proxy-agent": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
+            "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
+            "requires": {
+                "@tootallnate/quickjs-emscripten": "^0.23.0",
+                "agent-base": "^7.0.2",
+                "debug": "^4.3.4",
+                "get-uri": "^6.0.1",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.2",
+                "pac-resolver": "^7.0.0",
+                "socks-proxy-agent": "^8.0.2"
+            },
+            "dependencies": {
+                "agent-base": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+                    "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+                    "requires": {
+                        "debug": "^4.3.4"
+                    }
+                },
+                "debug": {
+                    "version": "4.3.4",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+                    "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "http-proxy-agent": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+                    "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+                    "requires": {
+                        "agent-base": "^7.1.0",
+                        "debug": "^4.3.4"
+                    }
+                },
+                "https-proxy-agent": {
+                    "version": "7.0.2",
+                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+                    "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+                    "requires": {
+                        "agent-base": "^7.0.2",
+                        "debug": "4"
+                    }
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+                },
+                "socks-proxy-agent": {
+                    "version": "8.0.2",
+                    "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+                    "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+                    "requires": {
+                        "agent-base": "^7.0.2",
+                        "debug": "^4.3.4",
+                        "socks": "^2.7.1"
+                    }
+                }
+            }
+        },
+        "pac-resolver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
+            "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==",
+            "requires": {
+                "degenerator": "^5.0.0",
+                "ip": "^1.1.8",
+                "netmask": "^2.0.2"
+            }
+        },
         "package-json": {
             "version": "6.5.0",
             "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
@@ -42444,6 +42661,77 @@
                 "ipaddr.js": "1.9.1"
             }
         },
+        "proxy-agent": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz",
+            "integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==",
+            "requires": {
+                "agent-base": "^7.0.2",
+                "debug": "^4.3.4",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.0",
+                "lru-cache": "^7.14.1",
+                "pac-proxy-agent": "^7.0.0",
+                "proxy-from-env": "^1.1.0",
+                "socks-proxy-agent": "^8.0.1"
+            },
+            "dependencies": {
+                "agent-base": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+                    "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+                    "requires": {
+                        "debug": "^4.3.4"
+                    }
+                },
+                "debug": {
+                    "version": "4.3.4",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+                    "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "http-proxy-agent": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+                    "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+                    "requires": {
+                        "agent-base": "^7.1.0",
+                        "debug": "^4.3.4"
+                    }
+                },
+                "https-proxy-agent": {
+                    "version": "7.0.2",
+                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+                    "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+                    "requires": {
+                        "agent-base": "^7.0.2",
+                        "debug": "4"
+                    }
+                },
+                "lru-cache": {
+                    "version": "7.18.3",
+                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+                    "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+                },
+                "socks-proxy-agent": {
+                    "version": "8.0.2",
+                    "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+                    "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+                    "requires": {
+                        "agent-base": "^7.0.2",
+                        "debug": "^4.3.4",
+                        "socks": "^2.7.1"
+                    }
+                }
+            }
+        },
         "proxy-from-env": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -42508,13 +42796,13 @@
             }
         },
         "puppeteer": {
-            "version": "20.3.0",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.3.0.tgz",
-            "integrity": "sha512-OJIsxC3PcU6fAWfp1BX0oKj62FFxhxwpakGAcGVbyfqfDrNmkFjpzb0XrMsgnQxCJmoLpTZKHRXDFxEDnLqkow==",
+            "version": "20.9.0",
+            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.9.0.tgz",
+            "integrity": "sha512-kAglT4VZ9fWEGg3oLc4/de+JcONuEJhlh3J6f5R1TLkrY/EHHIHxWXDOzXvaxQCtedmyVXBwg8M+P8YCO/wZjw==",
             "requires": {
-                "@puppeteer/browsers": "1.3.0",
-                "cosmiconfig": "8.1.3",
-                "puppeteer-core": "20.3.0"
+                "@puppeteer/browsers": "1.4.6",
+                "cosmiconfig": "8.2.0",
+                "puppeteer-core": "20.9.0"
             }
         },
         "puppeteer-cluster": {
@@ -42538,18 +42826,26 @@
             }
         },
         "puppeteer-core": {
-            "version": "20.3.0",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.3.0.tgz",
-            "integrity": "sha512-264pBrIui5bO6NJeOcbJrLa0OCwmA4+WK00JMrLIKTfRiqe2gx8KWTzLsjyw/bizErp3TKS7vt/I0i5fTC+mAw==",
+            "version": "20.9.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
+            "integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
             "requires": {
-                "@puppeteer/browsers": "1.3.0",
-                "chromium-bidi": "0.4.9",
-                "cross-fetch": "3.1.6",
+                "@puppeteer/browsers": "1.4.6",
+                "chromium-bidi": "0.4.16",
+                "cross-fetch": "4.0.0",
                 "debug": "4.3.4",
-                "devtools-protocol": "0.0.1120988",
+                "devtools-protocol": "0.0.1147663",
                 "ws": "8.13.0"
             },
             "dependencies": {
+                "cross-fetch": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+                    "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+                    "requires": {
+                        "node-fetch": "^2.6.12"
+                    }
+                },
                 "debug": {
                     "version": "4.3.4",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -42577,6 +42873,11 @@
             "version": "2.2.0",
             "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
         },
+        "queue-tick": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+            "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+        },
         "quick-lru": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
@@ -43964,8 +44265,7 @@
         "smart-buffer": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-            "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-            "dev": true
+            "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
         },
         "smbhash": {
             "version": "0.0.1",
@@ -44131,7 +44431,6 @@
             "version": "2.7.1",
             "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
             "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-            "dev": true,
             "requires": {
                 "ip": "^2.0.0",
                 "smart-buffer": "^4.2.0"
@@ -44140,8 +44439,7 @@
                 "ip": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-                    "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
-                    "dev": true
+                    "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
                 }
             }
         },
@@ -44548,6 +44846,15 @@
             "version": "0.1.2",
             "integrity": "sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA=="
         },
+        "streamx": {
+            "version": "2.15.7",
+            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.7.tgz",
+            "integrity": "sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA==",
+            "requires": {
+                "fast-fifo": "^1.1.0",
+                "queue-tick": "^1.0.1"
+            }
+        },
         "string_decoder": {
             "version": "0.10.31",
             "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
@@ -45267,75 +45574,23 @@
             }
         },
         "tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+            "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
             "requires": {
-                "chownr": "^1.1.1",
                 "mkdirp-classic": "^0.5.2",
                 "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
+                "tar-stream": "^3.1.5"
             }
         },
         "tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+            "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
             "requires": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "dependencies": {
-                "base64-js": {
-                    "version": "1.5.1",
-                    "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-                    "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-                },
-                "bl": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-                    "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-                    "requires": {
-                        "buffer": "^5.5.0",
-                        "inherits": "^2.0.4",
-                        "readable-stream": "^3.4.0"
-                    }
-                },
-                "buffer": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-                    "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-                    "requires": {
-                        "base64-js": "^1.3.1",
-                        "ieee754": "^1.1.13"
-                    }
-                },
-                "readable-stream": {
-                    "version": "3.6.2",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-                    "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                },
-                "safe-buffer": {
-                    "version": "5.2.1",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-                },
-                "string_decoder": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-                    "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-                    "requires": {
-                        "safe-buffer": "~5.2.0"
-                    }
-                }
+                "b4a": "^1.6.4",
+                "fast-fifo": "^1.2.0",
+                "streamx": "^2.15.0"
             }
         },
         "teeny-request": {
@@ -45714,8 +45969,7 @@
         "tslib": {
             "version": "2.5.2",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
-            "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==",
-            "dev": true
+            "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="
         },
         "tunnel-agent": {
             "version": "0.6.0",
@@ -48060,7 +48314,8 @@
         },
         "word-wrap": {
             "version": "1.2.3",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "dev": true
         },
         "wrap-ansi": {
             "version": "7.0.0",
diff --git a/package.json b/package.json
index f13c44162..f700bd07d 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
         "node-ssh": "^11.0.0",
         "object-diff": "0.0.4",
         "object.pick": "^1.3.0",
-        "puppeteer": "^20.3.0",
+        "puppeteer": "^20.9.0",
         "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
         "smbhash": "0.0.1",

From c9785e76da4d341a06bf946252f1e5c5fc3166a6 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 5 Feb 2024 12:56:23 +0100
Subject: [PATCH 08/21] fix: hotfix puppeteer updated to 21.11.0

---
 db/remotes/dev.ini        |   6 +
 db/remotes/production.ini |   6 +
 package-lock.json         | 365 ++++++++++++--------------------------
 package.json              |   2 +-
 4 files changed, 129 insertions(+), 250 deletions(-)
 create mode 100644 db/remotes/dev.ini
 create mode 100644 db/remotes/production.ini

diff --git a/db/remotes/dev.ini b/db/remotes/dev.ini
new file mode 100644
index 000000000..a613510ea
--- /dev/null
+++ b/db/remotes/dev.ini
@@ -0,0 +1,6 @@
+[client]
+host = dev-db.verdnatura.es
+port = 3307
+user = jgallego
+password = 9b7620x.
+default-character-set=utf8
diff --git a/db/remotes/production.ini b/db/remotes/production.ini
new file mode 100644
index 000000000..0896a9b7a
--- /dev/null
+++ b/db/remotes/production.ini
@@ -0,0 +1,6 @@
+[client]
+host = db.verdnatura.es
+port = 3308
+user = jgallego
+password = 9b7620x.
+default-character-set=utf8
diff --git a/package-lock.json b/package-lock.json
index 96d3bbc09..a29413292 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
                 "node-ssh": "^11.0.0",
                 "object-diff": "0.0.4",
                 "object.pick": "^1.3.0",
-                "puppeteer": "^20.9.0",
+                "puppeteer": "^21.11.0",
                 "read-chunk": "^3.2.0",
                 "require-yaml": "0.0.1",
                 "smbhash": "0.0.1",
@@ -2907,39 +2907,23 @@
             }
         },
         "node_modules/@puppeteer/browsers": {
-            "version": "1.4.6",
-            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.6.tgz",
-            "integrity": "sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==",
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.9.1.tgz",
+            "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
             "dependencies": {
                 "debug": "4.3.4",
                 "extract-zip": "2.0.1",
                 "progress": "2.0.3",
-                "proxy-agent": "6.3.0",
+                "proxy-agent": "6.3.1",
                 "tar-fs": "3.0.4",
                 "unbzip2-stream": "1.4.3",
-                "yargs": "17.7.1"
+                "yargs": "17.7.2"
             },
             "bin": {
                 "browsers": "lib/cjs/main-cli.js"
             },
             "engines": {
                 "node": ">=16.3.0"
-            },
-            "peerDependencies": {
-                "typescript": ">= 4.7.4"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@puppeteer/browsers/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "engines": {
-                "node": ">=8"
             }
         },
         "node_modules/@puppeteer/browsers/node_modules/debug": {
@@ -2958,68 +2942,11 @@
                 }
             }
         },
-        "node_modules/@puppeteer/browsers/node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/@puppeteer/browsers/node_modules/ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
-        "node_modules/@puppeteer/browsers/node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@puppeteer/browsers/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@puppeteer/browsers/node_modules/y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/@puppeteer/browsers/node_modules/yargs": {
-            "version": "17.7.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-            "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-            "dependencies": {
-                "cliui": "^8.0.1",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.3",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^21.1.1"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
         "node_modules/@sindresorhus/is": {
             "version": "2.1.1",
             "integrity": "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==",
@@ -5548,11 +5475,12 @@
             }
         },
         "node_modules/chromium-bidi": {
-            "version": "0.4.16",
-            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
-            "integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
+            "version": "0.5.8",
+            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.8.tgz",
+            "integrity": "sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==",
             "dependencies": {
-                "mitt": "3.0.0"
+                "mitt": "3.0.1",
+                "urlpattern-polyfill": "10.0.0"
             },
             "peerDependencies": {
                 "devtools-protocol": "*"
@@ -6170,20 +6098,28 @@
             "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
         },
         "node_modules/cosmiconfig": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-            "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+            "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
             "dependencies": {
-                "import-fresh": "^3.2.1",
+                "env-paths": "^2.2.1",
+                "import-fresh": "^3.3.0",
                 "js-yaml": "^4.1.0",
-                "parse-json": "^5.0.0",
-                "path-type": "^4.0.0"
+                "parse-json": "^5.2.0"
             },
             "engines": {
                 "node": ">=14"
             },
             "funding": {
                 "url": "https://github.com/sponsors/d-fischer"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.9.5"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
         "node_modules/cosmiconfig/node_modules/parse-json": {
@@ -6203,14 +6139,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/cosmiconfig/node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/cross-fetch": {
             "version": "3.1.6",
             "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz",
@@ -6974,9 +6902,9 @@
             "dev": true
         },
         "node_modules/devtools-protocol": {
-            "version": "0.0.1147663",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
-            "integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ=="
+            "version": "0.0.1232444",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
+            "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg=="
         },
         "node_modules/diff": {
             "version": "1.4.0",
@@ -7333,7 +7261,6 @@
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
             "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-            "dev": true,
             "engines": {
                 "node": ">=6"
             }
@@ -17014,9 +16941,9 @@
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         },
         "node_modules/mitt": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-            "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+            "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
         },
         "node_modules/mixin-deep": {
             "version": "1.3.2",
@@ -19611,18 +19538,18 @@
             }
         },
         "node_modules/proxy-agent": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz",
-            "integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
+            "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
             "dependencies": {
                 "agent-base": "^7.0.2",
                 "debug": "^4.3.4",
                 "http-proxy-agent": "^7.0.0",
-                "https-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.2",
                 "lru-cache": "^7.14.1",
-                "pac-proxy-agent": "^7.0.0",
+                "pac-proxy-agent": "^7.0.1",
                 "proxy-from-env": "^1.1.0",
-                "socks-proxy-agent": "^8.0.1"
+                "socks-proxy-agent": "^8.0.2"
             },
             "engines": {
                 "node": ">= 14"
@@ -19773,18 +19700,20 @@
             }
         },
         "node_modules/puppeteer": {
-            "version": "20.9.0",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.9.0.tgz",
-            "integrity": "sha512-kAglT4VZ9fWEGg3oLc4/de+JcONuEJhlh3J6f5R1TLkrY/EHHIHxWXDOzXvaxQCtedmyVXBwg8M+P8YCO/wZjw==",
-            "deprecated": "< 21.5.0 is no longer supported",
+            "version": "21.11.0",
+            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.11.0.tgz",
+            "integrity": "sha512-9jTHuYe22TD3sNxy0nEIzC7ZrlRnDgeX3xPkbS7PnbdwYjl2o/z/YuCrRBwezdKpbTDTJ4VqIggzNyeRcKq3cg==",
             "hasInstallScript": true,
             "dependencies": {
-                "@puppeteer/browsers": "1.4.6",
-                "cosmiconfig": "8.2.0",
-                "puppeteer-core": "20.9.0"
+                "@puppeteer/browsers": "1.9.1",
+                "cosmiconfig": "9.0.0",
+                "puppeteer-core": "21.11.0"
+            },
+            "bin": {
+                "puppeteer": "lib/esm/puppeteer/node/cli.js"
             },
             "engines": {
-                "node": ">=16.3.0"
+                "node": ">=16.13.2"
             }
         },
         "node_modules/puppeteer-cluster": {
@@ -19817,27 +19746,19 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "node_modules/puppeteer-core": {
-            "version": "20.9.0",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
-            "integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
+            "version": "21.11.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.11.0.tgz",
+            "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
             "dependencies": {
-                "@puppeteer/browsers": "1.4.6",
-                "chromium-bidi": "0.4.16",
+                "@puppeteer/browsers": "1.9.1",
+                "chromium-bidi": "0.5.8",
                 "cross-fetch": "4.0.0",
                 "debug": "4.3.4",
-                "devtools-protocol": "0.0.1147663",
-                "ws": "8.13.0"
+                "devtools-protocol": "0.0.1232444",
+                "ws": "8.16.0"
             },
             "engines": {
-                "node": ">=16.3.0"
-            },
-            "peerDependencies": {
-                "typescript": ">= 4.7.4"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "node": ">=16.13.2"
             }
         },
         "node_modules/puppeteer-core/node_modules/cross-fetch": {
@@ -24505,6 +24426,11 @@
             "version": "1.3.2",
             "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
         },
+        "node_modules/urlpattern-polyfill": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+            "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
+        },
         "node_modules/use": {
             "version": "3.1.1",
             "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
@@ -25797,9 +25723,9 @@
             }
         },
         "node_modules/ws": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-            "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+            "version": "8.16.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+            "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
             "engines": {
                 "node": ">=10.0.0"
             },
@@ -25922,7 +25848,6 @@
             "version": "17.7.2",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
             "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-            "dev": true,
             "dependencies": {
                 "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
@@ -25948,7 +25873,6 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -25957,7 +25881,6 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -25966,7 +25889,6 @@
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -25980,7 +25902,6 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -25992,7 +25913,6 @@
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
             "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true,
             "engines": {
                 "node": ">=10"
             }
@@ -29560,24 +29480,19 @@
             "optional": true
         },
         "@puppeteer/browsers": {
-            "version": "1.4.6",
-            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.6.tgz",
-            "integrity": "sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==",
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.9.1.tgz",
+            "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
             "requires": {
                 "debug": "4.3.4",
                 "extract-zip": "2.0.1",
                 "progress": "2.0.3",
-                "proxy-agent": "6.3.0",
+                "proxy-agent": "6.3.1",
                 "tar-fs": "3.0.4",
                 "unbzip2-stream": "1.4.3",
-                "yargs": "17.7.1"
+                "yargs": "17.7.2"
             },
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-                },
                 "debug": {
                     "version": "4.3.4",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -29586,52 +29501,10 @@
                         "ms": "2.1.2"
                     }
                 },
-                "is-fullwidth-code-point": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-                },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-                },
-                "string-width": {
-                    "version": "4.2.3",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-                    "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-                    "requires": {
-                        "emoji-regex": "^8.0.0",
-                        "is-fullwidth-code-point": "^3.0.0",
-                        "strip-ansi": "^6.0.1"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                },
-                "y18n": {
-                    "version": "5.0.8",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-                    "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-                },
-                "yargs": {
-                    "version": "17.7.1",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-                    "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-                    "requires": {
-                        "cliui": "^8.0.1",
-                        "escalade": "^3.1.1",
-                        "get-caller-file": "^2.0.5",
-                        "require-directory": "^2.1.1",
-                        "string-width": "^4.2.3",
-                        "y18n": "^5.0.5",
-                        "yargs-parser": "^21.1.1"
-                    }
                 }
             }
         },
@@ -31633,11 +31506,12 @@
             "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
         },
         "chromium-bidi": {
-            "version": "0.4.16",
-            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
-            "integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
+            "version": "0.5.8",
+            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.8.tgz",
+            "integrity": "sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==",
             "requires": {
-                "mitt": "3.0.0"
+                "mitt": "3.0.1",
+                "urlpattern-polyfill": "10.0.0"
             }
         },
         "ci-info": {
@@ -32107,14 +31981,14 @@
             "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
         },
         "cosmiconfig": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-            "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+            "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
             "requires": {
-                "import-fresh": "^3.2.1",
+                "env-paths": "^2.2.1",
+                "import-fresh": "^3.3.0",
                 "js-yaml": "^4.1.0",
-                "parse-json": "^5.0.0",
-                "path-type": "^4.0.0"
+                "parse-json": "^5.2.0"
             },
             "dependencies": {
                 "parse-json": {
@@ -32127,11 +32001,6 @@
                         "json-parse-even-better-errors": "^2.3.0",
                         "lines-and-columns": "^1.1.6"
                     }
-                },
-                "path-type": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-                    "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
                 }
             }
         },
@@ -32701,9 +32570,9 @@
             "dev": true
         },
         "devtools-protocol": {
-            "version": "0.0.1147663",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
-            "integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ=="
+            "version": "0.0.1232444",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
+            "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg=="
         },
         "diff": {
             "version": "1.4.0",
@@ -33020,8 +32889,7 @@
         "env-paths": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-            "dev": true
+            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
         },
         "envinfo": {
             "version": "7.8.1",
@@ -40698,9 +40566,9 @@
             }
         },
         "mitt": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-            "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+            "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
         },
         "mixin-deep": {
             "version": "1.3.2",
@@ -42662,18 +42530,18 @@
             }
         },
         "proxy-agent": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz",
-            "integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
+            "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
             "requires": {
                 "agent-base": "^7.0.2",
                 "debug": "^4.3.4",
                 "http-proxy-agent": "^7.0.0",
-                "https-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.2",
                 "lru-cache": "^7.14.1",
-                "pac-proxy-agent": "^7.0.0",
+                "pac-proxy-agent": "^7.0.1",
                 "proxy-from-env": "^1.1.0",
-                "socks-proxy-agent": "^8.0.1"
+                "socks-proxy-agent": "^8.0.2"
             },
             "dependencies": {
                 "agent-base": {
@@ -42796,13 +42664,13 @@
             }
         },
         "puppeteer": {
-            "version": "20.9.0",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.9.0.tgz",
-            "integrity": "sha512-kAglT4VZ9fWEGg3oLc4/de+JcONuEJhlh3J6f5R1TLkrY/EHHIHxWXDOzXvaxQCtedmyVXBwg8M+P8YCO/wZjw==",
+            "version": "21.11.0",
+            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.11.0.tgz",
+            "integrity": "sha512-9jTHuYe22TD3sNxy0nEIzC7ZrlRnDgeX3xPkbS7PnbdwYjl2o/z/YuCrRBwezdKpbTDTJ4VqIggzNyeRcKq3cg==",
             "requires": {
-                "@puppeteer/browsers": "1.4.6",
-                "cosmiconfig": "8.2.0",
-                "puppeteer-core": "20.9.0"
+                "@puppeteer/browsers": "1.9.1",
+                "cosmiconfig": "9.0.0",
+                "puppeteer-core": "21.11.0"
             }
         },
         "puppeteer-cluster": {
@@ -42826,16 +42694,16 @@
             }
         },
         "puppeteer-core": {
-            "version": "20.9.0",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
-            "integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
+            "version": "21.11.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.11.0.tgz",
+            "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
             "requires": {
-                "@puppeteer/browsers": "1.4.6",
-                "chromium-bidi": "0.4.16",
+                "@puppeteer/browsers": "1.9.1",
+                "chromium-bidi": "0.5.8",
                 "cross-fetch": "4.0.0",
                 "debug": "4.3.4",
-                "devtools-protocol": "0.0.1147663",
-                "ws": "8.13.0"
+                "devtools-protocol": "0.0.1232444",
+                "ws": "8.16.0"
             },
             "dependencies": {
                 "cross-fetch": {
@@ -46438,6 +46306,11 @@
                 "prepend-http": "^2.0.0"
             }
         },
+        "urlpattern-polyfill": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+            "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
+        },
         "use": {
             "version": "3.1.1",
             "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
@@ -48416,9 +48289,9 @@
             }
         },
         "ws": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-            "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+            "version": "8.16.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+            "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
             "requires": {}
         },
         "x-xss-protection": {
@@ -48504,7 +48377,6 @@
             "version": "17.7.2",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
             "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-            "dev": true,
             "requires": {
                 "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
@@ -48518,20 +48390,17 @@
                 "ansi-regex": {
                     "version": "5.0.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
+                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
                 },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-                    "dev": true
+                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
                 },
                 "string-width": {
                     "version": "4.2.3",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
                     "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-                    "dev": true,
                     "requires": {
                         "emoji-regex": "^8.0.0",
                         "is-fullwidth-code-point": "^3.0.0",
@@ -48542,7 +48411,6 @@
                     "version": "6.0.1",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
                     "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
                     "requires": {
                         "ansi-regex": "^5.0.1"
                     }
@@ -48550,8 +48418,7 @@
                 "y18n": {
                     "version": "5.0.8",
                     "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-                    "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-                    "dev": true
+                    "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
                 }
             }
         },
diff --git a/package.json b/package.json
index f700bd07d..5d5435b85 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
         "node-ssh": "^11.0.0",
         "object-diff": "0.0.4",
         "object.pick": "^1.3.0",
-        "puppeteer": "^20.9.0",
+        "puppeteer": "^21.11.0",
         "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
         "smbhash": "0.0.1",

From 759ff45a271214ca822fc45d8ff3b14dbe8df9bb Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 5 Feb 2024 13:13:00 +0100
Subject: [PATCH 09/21] fix: hotfix DEBUG enabled

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f09a626a2..200ba4123 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
             steps {
                 script {
                     // Uncomment to enable debugging
-                    //env.DEBUG = 'strong-remoting:http-context,strong-remoting:shared-method'
+                    env.DEBUG = 'strong-remoting:shared-method,puppeteer-cluster:*'
 
                     switch (env.BRANCH_NAME) {
                         case 'master':

From 693a39d34a5f9290c87074311cea061192f8403e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 5 Feb 2024 13:19:44 +0100
Subject: [PATCH 10/21] fix: hotfix puppeteer CONCURRENCY_PAGE

---
 print/core/cluster.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print/core/cluster.js b/print/core/cluster.js
index a75c4cf24..f24b383a9 100644
--- a/print/core/cluster.js
+++ b/print/core/cluster.js
@@ -6,7 +6,7 @@ module.exports = {
     init() {
         if (this.pool) return;
         Cluster.launch({
-            concurrency: Cluster.CONCURRENCY_CONTEXT,
+            concurrency: Cluster.CONCURRENCY_PAGE,
             maxConcurrency: cpus().length,
             puppeteerOptions: {
                 headless: 'new',

From 15ac5472801b6774e969a862d0f4b086ca30664a Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Mon, 5 Feb 2024 14:38:22 +0100
Subject: [PATCH 11/21] fix: hotfix disable DEBUG

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 200ba4123..596de40ea 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
             steps {
                 script {
                     // Uncomment to enable debugging
-                    env.DEBUG = 'strong-remoting:shared-method,puppeteer-cluster:*'
+                    // env.DEBUG = 'strong-remoting:shared-method,puppeteer-cluster:*'
 
                     switch (env.BRANCH_NAME) {
                         case 'master':

From 9ee0669903ecff05ea8fa48c091cbc10da0c1cda Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 7 Feb 2024 11:27:18 +0100
Subject: [PATCH 12/21] hotfix kmMax

---
 loopback/locale/es.json            | 2 +-
 modules/route/back/models/route.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 9163c494f..81bd564aa 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -139,7 +139,7 @@
 	"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",
-	"Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
+	"Distance must be lesser than 4000": "La distancia debe ser inferior a 4000",
 	"This ticket is deleted": "Este ticket está eliminado",
 	"Unable to clone this travel": "No ha sido posible clonar este travel",
 	"This thermograph id already exists": "La id del termógrafo ya existe",
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index 9b5f3564f..48ed0a50c 100644
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@@ -21,16 +21,16 @@ module.exports = Self => {
     require('../methods/route/getByWorker')(Self);
 
     Self.validate('kmStart', validateDistance, {
-        message: 'Distance must be lesser than 1000'
+        message: 'Distance must be lesser than 4000'
     });
 
     Self.validate('kmEnd', validateDistance, {
-        message: 'Distance must be lesser than 1000'
+        message: 'Distance must be lesser than 4000'
     });
 
     function validateDistance(err) {
         const routeTotalKm = this.kmEnd - this.kmStart;
-        const routeMaxKm = 1000;
+        const routeMaxKm = 4000;
         if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
             err();
     }

From 380e0ef651dca7102a880af39c8f389bf94cb9b8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 12 Feb 2024 08:44:54 +0100
Subject: [PATCH 13/21] refs #2687 fix: clone Travel as user action

---
 .../01-update_procedure_TravelCloneWithEntries.sql          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql b/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
index b0c177b9a..59041a5b3 100644
--- a/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
+++ b/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
@@ -27,7 +27,7 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
-    DECLARE vTx BOOLEAN DEFAULT !@@in_transaction;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
@@ -41,8 +41,8 @@ BEGIN
 		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-
-	CALL util.tx_start(vTx);
+   
+    CALL util.tx_start(vTx);  
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk

From e79bdb4456d27a2f11805f863bd7521850086a17 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 12 Feb 2024 08:45:07 +0100
Subject: [PATCH 14/21] refs #2687 test: fix

---
 .../back/methods/travel/specs/cloneWithEntries.spec.js       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
index 74ec10155..950da7bb1 100644
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@@ -27,7 +27,10 @@ describe('Travel cloneWithEntries()', () => {
             expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
             expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
             expect(travelEntries.length).toBeGreaterThan(0);
-
+            await models.Entry.destroyAll({
+                travelFk: newTravelId
+            }, options);
+            await models.Travel.destroyById(newTravelId, options);
             await tx.rollback();
             const travelRemoved = await models.Travel.findById(newTravelId, options);
 

From 4d7bc482ec75733ed880c2c6853e46f4cffd1b22 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 12 Feb 2024 10:10:30 +0100
Subject: [PATCH 15/21] refs #6742 fix(invoice_pdf): incotermsFk

---
 .../reports/invoice-incoterms/sql/incoterms.sql     |  2 +-
 .../templates/reports/invoice/sql/hasIncoterms.sql  | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/print/templates/reports/invoice-incoterms/sql/incoterms.sql b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
index b36f50084..81c0ec189 100644
--- a/print/templates/reports/invoice-incoterms/sql/incoterms.sql
+++ b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
@@ -15,7 +15,7 @@ SELECT pack.packages,
         LEFT JOIN vn.province p ON p.id = c.provinceFk
         JOIN vn.ticket t ON t.refFk = io.ref
         JOIN vn.address a ON a.id = t.addressFk
-        LEFT JOIN vn.incoterms ic ON ic.code = a.incotermsFk
+        JOIN vn.incoterms ic ON ic.code = a.incotermsFk
         LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
         JOIN vn.sale s ON s.ticketFk = t.id
         JOIN (
diff --git a/print/templates/reports/invoice/sql/hasIncoterms.sql b/print/templates/reports/invoice/sql/hasIncoterms.sql
index 40a6db384..176fb30a6 100644
--- a/print/templates/reports/invoice/sql/hasIncoterms.sql
+++ b/print/templates/reports/invoice/sql/hasIncoterms.sql
@@ -1,8 +1,5 @@
-SELECT IF(incotermsFk IS NULL, FALSE, TRUE) AS hasIncoterms
-    FROM ticket t
-        JOIN invoiceOut io ON io.ref = t.refFk
-        JOIN client c ON c.id = t.clientFk  
-        JOIN address a ON a.id = t.addressFk  
-    WHERE t.refFk = ?
-        AND IF(c.hasToinvoiceByAddress = FALSE, c.defaultAddressFk, TRUE)  
-    LIMIT 1
\ No newline at end of file
+SELECT COUNT(*) AS hasIncoterms
+    FROM invoiceOut io
+       JOIN vn.invoiceOutSerial ios ON ios.code = io.serial
+            AND ios.taxAreaFk = 'WORLD'
+    WHERE io.ref = ?

From b9a624d9cd8b863d1073800767a389d6d7595c1c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Feb 2024 08:45:50 +0100
Subject: [PATCH 16/21] refs #2687 feat: create util.procedures

---
 db/routines/util/procedures/tx_commit.sql     | 15 +++++++++
 db/routines/util/procedures/tx_rollback.sql   | 15 +++++++++
 db/routines/util/procedures/tx_start.sql      | 17 ++++++++++
 .../vn/procedures/travel_cloneWithEntries.sql | 32 +++++++++----------
 modules/route/front/create/index.html         |  1 +
 5 files changed, 64 insertions(+), 16 deletions(-)
 create mode 100644 db/routines/util/procedures/tx_commit.sql
 create mode 100644 db/routines/util/procedures/tx_rollback.sql
 create mode 100644 db/routines/util/procedures/tx_start.sql

diff --git a/db/routines/util/procedures/tx_commit.sql b/db/routines/util/procedures/tx_commit.sql
new file mode 100644
index 000000000..11be92c2e
--- /dev/null
+++ b/db/routines/util/procedures/tx_commit.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+$$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(IN tx BOOL)
+BEGIN
+/**
+ * Procedimiento para confirmar los cambios asociados a una transacción
+ *
+ * @param tx BOOL es true si existe transacción asociada
+*/
+    IF tx THEN
+        COMMIT;
+    END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/util/procedures/tx_rollback.sql b/db/routines/util/procedures/tx_rollback.sql
new file mode 100644
index 000000000..b6ac2cd12
--- /dev/null
+++ b/db/routines/util/procedures/tx_rollback.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+$$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(tx BOOL)
+BEGIN
+/**
+ * Procedimiento para deshacer los cambios asociados a una transacción
+ *
+ * @param tx BOOL es true si existe transacción asociada
+*/
+    IF tx THEN
+        ROLLBACK;
+    END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/util/procedures/tx_start.sql b/db/routines/util/procedures/tx_start.sql
new file mode 100644
index 000000000..6e513790b
--- /dev/null
+++ b/db/routines/util/procedures/tx_start.sql
@@ -0,0 +1,17 @@
+
+
+DELIMITER $$
+$$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(tx BOOL)
+BEGIN
+/**
+ * Procedimiento para iniciar una transacción
+ *
+ * @param tx BOOL es true si existe transacción asociada
+*/
+    IF tx THEN
+        START TRANSACTION;
+    END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/travel_cloneWithEntries.sql b/db/routines/vn/procedures/travel_cloneWithEntries.sql
index 840152c44..7cf9ee5ef 100644
--- a/db/routines/vn/procedures/travel_cloneWithEntries.sql
+++ b/db/routines/vn/procedures/travel_cloneWithEntries.sql
@@ -1,21 +1,20 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_cloneWithEntries`(
-	IN vTravelFk INT, 
-	IN vDateStart DATE, 
+	IN vTravelFk INT,
+	IN vDateStart DATE,
 	IN vDateEnd DATE,
 	IN vWarehouseOutFk INT,
-	IN vWarehouseInFk INT, 
-	IN vRef VARCHAR(255), 
-	IN vAgencyModeFk INT, 
+	IN vWarehouseInFk INT,
+	IN vRef VARCHAR(255),
+	IN vAgencyModeFk INT,
 	OUT vNewTravelFk INT)
 BEGIN
 /**
  * Clona un travel junto con sus entradas y compras
- *
  * @param vTravelFk travel plantilla a clonar
  * @param vDateStart fecha del shipment del nuevo travel
  * @param vDateEnd fecha del landing del nuevo travel
- * @param vWarehouseOutFk fecha del salida del nuevo travel
+ * @param vWarehouseOutFk warehouse del salida del nuevo travel
  * @param vWarehouseInFk warehouse de landing del nuevo travel
  * @param vRef referencia del nuevo travel
  * @param vAgencyModeFk del nuevo travel
@@ -25,34 +24,35 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
+    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
 	DECLARE vRsEntry CURSOR FOR
 		SELECT e.id
 			FROM entry e
 				JOIN travel t ON t.id = e.travelFk
 			WHERE e.travelFk = vTravelFk;
-		
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN 
-		ROLLBACK;
+	BEGIN
+		CALL util.tx_rollback(vTx);
 		RESIGNAL;
 	END;
-	
-	START TRANSACTION;
+
+    CALL util.tx_start(vTx);
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
 			FROM travel
 			WHERE id = vTravelFk;
-	
+
 	SET vNewTravelFk = LAST_INSERT_ID();
 
 	SET vDone = FALSE;
 	SET @isModeInventory = TRUE;
 
 	OPEN vRsEntry;
-	
+
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vRsEntry INTO vAuxEntryFk;
@@ -62,7 +62,7 @@ BEGIN
 		END IF;
 
 		CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
-		CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+        CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
 
 		SELECT evaNotes INTO vEvaNotes
 			FROM entry
@@ -76,6 +76,6 @@ BEGIN
 	SET @isModeInventory = FALSE;
 	CLOSE vRsEntry;
 
-	COMMIT;
+    CALL util.tx_commit(vTx);
 END$$
 DELIMITER ;
diff --git a/modules/route/front/create/index.html b/modules/route/front/create/index.html
index de341220e..b76878f2e 100644
--- a/modules/route/front/create/index.html
+++ b/modules/route/front/create/index.html
@@ -22,6 +22,7 @@
                 label="Vehicle"
                 ng-model="$ctrl.route.vehicleFk"
                 url="Vehicles"
+                where="{warehouseFk: $ctrl.vnConfig.warehouseFk}"
                 show-field="numberPlate">
             </vn-autocomplete>
             <vn-autocomplete

From fb1d11af170fd2a484023d60186dd72fde9e5b23 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Feb 2024 09:32:44 +0100
Subject: [PATCH 17/21] refs #2687 feat: comments

---
 db/routines/util/procedures/tx_commit.sql   | 2 --
 db/routines/util/procedures/tx_rollback.sql | 2 --
 db/routines/util/procedures/tx_start.sql    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/db/routines/util/procedures/tx_commit.sql b/db/routines/util/procedures/tx_commit.sql
index 11be92c2e..121c3803b 100644
--- a/db/routines/util/procedures/tx_commit.sql
+++ b/db/routines/util/procedures/tx_commit.sql
@@ -1,6 +1,4 @@
 DELIMITER $$
-$$
-
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(IN tx BOOL)
 BEGIN
 /**
diff --git a/db/routines/util/procedures/tx_rollback.sql b/db/routines/util/procedures/tx_rollback.sql
index b6ac2cd12..b9e7224e1 100644
--- a/db/routines/util/procedures/tx_rollback.sql
+++ b/db/routines/util/procedures/tx_rollback.sql
@@ -1,6 +1,4 @@
 DELIMITER $$
-$$
-
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(tx BOOL)
 BEGIN
 /**
diff --git a/db/routines/util/procedures/tx_start.sql b/db/routines/util/procedures/tx_start.sql
index 6e513790b..3cce946fa 100644
--- a/db/routines/util/procedures/tx_start.sql
+++ b/db/routines/util/procedures/tx_start.sql
@@ -1,8 +1,6 @@
 
 
 DELIMITER $$
-$$
-
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(tx BOOL)
 BEGIN
 /**

From 3ff3c812ed2cd5ee4ec02b7f98d7cf49a09cd8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Wed, 14 Feb 2024 20:15:34 +0100
Subject: [PATCH 18/21] refs #2687 fix: remove bad changes file

---
 modules/route/front/create/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/route/front/create/index.html b/modules/route/front/create/index.html
index b76878f2e..de341220e 100644
--- a/modules/route/front/create/index.html
+++ b/modules/route/front/create/index.html
@@ -22,7 +22,6 @@
                 label="Vehicle"
                 ng-model="$ctrl.route.vehicleFk"
                 url="Vehicles"
-                where="{warehouseFk: $ctrl.vnConfig.warehouseFk}"
                 show-field="numberPlate">
             </vn-autocomplete>
             <vn-autocomplete

From d9756a0f3f5074cb516458f222b7edea7c7dc09f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 15 Feb 2024 07:49:57 +0100
Subject: [PATCH 19/21] refs #2687 feat: comments

---
 db/routines/util/procedures/tx_commit.sql   |  8 ++++----
 db/routines/util/procedures/tx_rollback.sql |  8 ++++----
 db/routines/util/procedures/tx_start.sql    | 10 ++++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/db/routines/util/procedures/tx_commit.sql b/db/routines/util/procedures/tx_commit.sql
index 121c3803b..fdf2f3ddb 100644
--- a/db/routines/util/procedures/tx_commit.sql
+++ b/db/routines/util/procedures/tx_commit.sql
@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(IN tx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(isTx BOOL)
 BEGIN
 /**
- * Procedimiento para confirmar los cambios asociados a una transacción
+ * Confirma los cambios asociados a una transacción.
  *
- * @param tx BOOL es true si existe transacción asociada
+ * @param isTx es true si existe transacción asociada
 */
-    IF tx THEN
+    IF isTx THEN
         COMMIT;
     END IF;
 END$$
diff --git a/db/routines/util/procedures/tx_rollback.sql b/db/routines/util/procedures/tx_rollback.sql
index b9e7224e1..96571af2c 100644
--- a/db/routines/util/procedures/tx_rollback.sql
+++ b/db/routines/util/procedures/tx_rollback.sql
@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(tx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(isTx BOOL)
 BEGIN
 /**
- * Procedimiento para deshacer los cambios asociados a una transacción
+ * Deshace los cambios asociados a una transacción.
  *
- * @param tx BOOL es true si existe transacción asociada
+ * @param isTx es true si existe transacción asociada
 */
-    IF tx THEN
+    IF isTx THEN
         ROLLBACK;
     END IF;
 END$$
diff --git a/db/routines/util/procedures/tx_start.sql b/db/routines/util/procedures/tx_start.sql
index 3cce946fa..9d9f16bb7 100644
--- a/db/routines/util/procedures/tx_start.sql
+++ b/db/routines/util/procedures/tx_start.sql
@@ -1,14 +1,12 @@
-
-
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(tx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(isTx BOOL)
 BEGIN
 /**
- * Procedimiento para iniciar una transacción
+ * Inicia una transacción.
  *
- * @param tx BOOL es true si existe transacción asociada
+ * @param isTx es true si existe transacción asociada
 */
-    IF tx THEN
+    IF isTx THEN
         START TRANSACTION;
     END IF;
 END$$

From 2703d50cbf1fbd67d3bcafd63d242cbdb94c28d6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 15 Feb 2024 09:39:02 +0100
Subject: [PATCH 20/21] refs #6859 fix(account): changePassword name

---
 modules/account/front/descriptor/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/account/front/descriptor/index.js b/modules/account/front/descriptor/index.js
index 18d93b924..de41d619d 100644
--- a/modules/account/front/descriptor/index.js
+++ b/modules/account/front/descriptor/index.js
@@ -71,7 +71,7 @@ class Controller extends Descriptor {
         const params = {newPassword: this.newPassword};
 
         if (this.askOldPass) {
-            method = 'changePassword';
+            method = 'change-password';
             params.oldPassword = this.oldPassword;
         } else
             method = 'setPassword';

From 6685a201143a320920bbe04db7f8d0d1bd32d415 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 15 Feb 2024 10:04:15 +0100
Subject: [PATCH 21/21] build: refs #6859 myt pull db

---
 db/.pullinfo.json                             |   4 +
 .../bi/procedures/analisis_ventas_update.sql  |   8 +-
 .../vn/functions/hasAnyNegativeBase.sql       |  31 +--
 .../vn/functions/hasAnyPositiveBase.sql       |  30 ++
 db/routines/vn/procedures/clean.sql           |   8 +-
 .../vn/procedures/collection_assign.sql       |   8 +-
 .../vn/procedures/duaInvoiceInBooking.sql     |  78 +++---
 db/routines/vn/procedures/getTaxBases.sql     |  32 +++
 db/routines/vn/procedures/inventoryMake.sql   | 258 +++++++++---------
 .../vn/procedures/inventoryMakeLauncher.sql   |   9 +-
 .../vn/procedures/invoiceInTaxMakeByDua.sql   |  39 +--
 .../vn/procedures/invoiceInTax_getFromDua.sql |  33 ++-
 .../invoiceInTax_getFromEntries.sql           |  17 +-
 .../vn/procedures/itemProposal_Add.sql        |   2 +-
 .../itemShelving_selfConsumption.sql          |  11 +-
 db/routines/vn/procedures/test.sql            |   6 -
 .../vn/procedures/ticket_getMovable.sql       |  59 ++--
 .../vn/triggers/calendar_afterDelete.sql      |  12 +-
 .../vn/triggers/calendar_beforeInsert.sql     |   2 +-
 .../vn/triggers/calendar_beforeUpdate.sql     |  12 +-
 ...reInser.sql => saleGroup_beforeInsert.sql} |   0
 .../workerTimeControl_afterDelete.sql         |  12 +-
 .../workerTimeControl_beforeInsert.sql        |  12 +-
 .../workerTimeControl_beforeUpdate.sql        |  12 +-
 db/routines/vn/views/awbVolume.sql            |   2 +-
 .../vn/views/expeditionPallet_Print.sql       |   2 +-
 .../vn/views/itemShelvingAvailable.sql        |   2 +-
 db/routines/vn/views/ticketStateToday.sql     |  11 +-
 .../vn/views/zoneEstimatedDelivery.sql        |  67 +++--
 .../vn2008/procedures/recobro_credito.sql     |   2 +-
 db/routines/vn2008/views/v_xsubcuentas.sql    |  28 +-
 31 files changed, 464 insertions(+), 345 deletions(-)
 create mode 100644 db/.pullinfo.json
 create mode 100644 db/routines/vn/functions/hasAnyPositiveBase.sql
 create mode 100644 db/routines/vn/procedures/getTaxBases.sql
 delete mode 100644 db/routines/vn/procedures/test.sql
 rename db/routines/vn/triggers/{saleGroup_beforeInser.sql => saleGroup_beforeInsert.sql} (100%)

diff --git a/db/.pullinfo.json b/db/.pullinfo.json
new file mode 100644
index 000000000..20a294f1f
--- /dev/null
+++ b/db/.pullinfo.json
@@ -0,0 +1,4 @@
+{
+  "lastPull": "2024-02-15T08:58:24.000Z",
+  "shaSums": {}
+}
\ No newline at end of file
diff --git a/db/routines/bi/procedures/analisis_ventas_update.sql b/db/routines/bi/procedures/analisis_ventas_update.sql
index 04f9b6483..383d102b5 100644
--- a/db/routines/bi/procedures/analisis_ventas_update.sql
+++ b/db/routines/bi/procedures/analisis_ventas_update.sql
@@ -1,5 +1,5 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
 BEGIN
 	DECLARE vLastMonth DATE;
 
@@ -49,5 +49,5 @@ BEGIN
             LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
             LEFT JOIN vn2008.warehouse w ON w.id = t.warehouse_id
         WHERE bt.fecha >= vLastMonth AND r.mercancia;
-END$$
-DELIMITER ;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/functions/hasAnyNegativeBase.sql b/db/routines/vn/functions/hasAnyNegativeBase.sql
index 3b96a3d22..97d1e7328 100644
--- a/db/routines/vn/functions/hasAnyNegativeBase.sql
+++ b/db/routines/vn/functions/hasAnyNegativeBase.sql
@@ -4,32 +4,25 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyNegativeBase`(
 	DETERMINISTIC
 BEGIN
 
-/*	Calcula si existe alguna base imponible negativa
-*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+/**
+*	Calcula si existe alguna base imponible negativa
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
 *
 *	returns BOOLEAN
 */
+
 	DECLARE hasAnyNegativeBase BOOLEAN;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-	CREATE TEMPORARY TABLE tmp.ticket
-		(KEY (ticketFk))
-		ENGINE = MEMORY
-		SELECT id ticketFk
-			FROM tmp.ticketToInvoice;
+    CALL getTaxBases();
 
-	CALL ticket_getTax(NULL);
+	SELECT negative INTO hasAnyNegativeBase
+        FROM tmp.taxBases
+        LIMIT 1;
 
-	SELECT COUNT(*) INTO hasAnyNegativeBase
-		FROM(
-			SELECT SUM(taxableBase) as taxableBase
-				FROM tmp.ticketTax
-				GROUP BY pgcFk
-				HAVING taxableBase < 0
-			) t;
-
-	DROP TEMPORARY TABLE tmp.ticketTax;
-	DROP TEMPORARY TABLE tmp.ticket;
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
 
 	RETURN hasAnyNegativeBase;
 
diff --git a/db/routines/vn/functions/hasAnyPositiveBase.sql b/db/routines/vn/functions/hasAnyPositiveBase.sql
new file mode 100644
index 000000000..7222c3b2a
--- /dev/null
+++ b/db/routines/vn/functions/hasAnyPositiveBase.sql
@@ -0,0 +1,30 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyPositiveBase`()
+	RETURNS tinyint(1)
+	DETERMINISTIC
+BEGIN
+
+/**
+*	Calcula si existe alguna base imponible positiva
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
+*
+*	returns BOOLEAN
+*/
+
+	DECLARE hasAnyPositiveBase BOOLEAN;
+
+    CALL getTaxBases();
+
+	SELECT positive INTO hasAnyPositiveBase
+        FROM tmp.taxBases
+        LIMIT 1;
+
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
+
+	RETURN hasAnyPositiveBase;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/clean.sql b/db/routines/vn/procedures/clean.sql
index 1734bea98..57df1b707 100644
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@@ -9,6 +9,7 @@ BEGIN
 	DECLARE v26Month DATE;
 	DECLARE v3Month DATE;
 	DECLARE vTrashId VARCHAR(15);
+	DECLARE v2Years DATE;
 	DECLARE v5Years DATE;
 
 	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
@@ -18,6 +19,7 @@ BEGIN
 	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
 	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
 	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
+	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
 	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
 
 	DELETE FROM ticketParking WHERE created < vDateShort;
@@ -162,7 +164,11 @@ BEGIN
 		FROM tmp.duaToDelete tmp
 		JOIN vn.dua d ON d.id = tmp.id;
 
-	DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+	DELETE a
+		FROM vn.awb a
+			LEFT JOIN vn.travel t ON t.awbFk = a.id
+		WHERE a.created < v2Years
+			AND t.id IS NULL;
 
 	-- Borra los registros de collection y ticketcollection
 	DELETE FROM vn.collection  WHERE created < vDateShort;
diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql
index 0918bf1da..6d31fbc8f 100644
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
-)
+)
 proc:BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
@@ -84,5 +84,5 @@ proc:BEGIN
 		WHERE id = vCollectionFk;
 
 	DO RELEASE_LOCK('collection_assign');
-END$$
-DELIMITER ;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/duaInvoiceInBooking.sql b/db/routines/vn/procedures/duaInvoiceInBooking.sql
index 9e794f0ed..dd5ab8fd2 100644
--- a/db/routines/vn/procedures/duaInvoiceInBooking.sql
+++ b/db/routines/vn/procedures/duaInvoiceInBooking.sql
@@ -1,70 +1,74 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`duaInvoiceInBooking`(vDuaFk INT)
 BEGIN
-
+/**
+ * Genera el asiento de un DUA y marca las entradas como confirmadas
+ *  
+ * @param vDuaFk Id del dua a recalcular
+ */
 	DECLARE done BOOL DEFAULT FALSE;
 	DECLARE vInvoiceFk INT;
-    DECLARE vASIEN BIGINT DEFAULT 0;
-    DECLARE vCounter INT DEFAULT 0;
-    
+	DECLARE vASIEN BIGINT DEFAULT 0;
+	DECLARE vCounter INT DEFAULT 0;
+
 	DECLARE rs CURSOR FOR
-		SELECT e.invoiceInFk
+		SELECT DISTINCT e.invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
-                JOIN invoiceIn ii ON ii.id = e.invoiceInFk
-            WHERE de.duaFk = vDuaFk
+				JOIN invoiceIn ii ON ii.id = e.invoiceInFk
+			WHERE de.duaFk = vDuaFk
 				AND de.customsValue
 				AND ii.isBooked = FALSE;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 
 	OPEN rs;
-     
+		
 	UPDATE invoiceIn ii
 			JOIN entry e ON e.invoiceInFk = ii.id
-            JOIN duaEntry de ON de.entryFk = e.id
-            JOIN dua d ON d.id = de.duaFk
+			JOIN duaEntry de ON de.entryFk = e.id
+			JOIN dua d ON d.id = de.duaFk
 		SET ii.isBooked = TRUE,
 			ii.booked = IFNULL(ii.booked,d.booked),
 			ii.operated = IFNULL(ii.operated,d.operated),
-            ii.issued = IFNULL(ii.issued,d.issued),
-            ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
-            e.isConfirmed = TRUE
+			ii.issued = IFNULL(ii.issued,d.issued),
+			ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried),
+			e.isConfirmed = TRUE
 		WHERE d.id = vDuaFk;
-    
-    SELECT IFNULL(ASIEN,0) INTO vASIEN
+
+	SELECT IFNULL(ASIEN,0) INTO vASIEN
 		FROM dua
 			WHERE id = vDuaFk;
-    
+
 	FETCH rs INTO vInvoiceFk;
-     
+		
 	WHILE NOT done DO
 
 		CALL invoiceIn_booking(vInvoiceFk);
-        
-        IF vCounter > 0 OR vASIEN > 0 THEN
-        
+		
+		IF vCounter > 0 OR vASIEN > 0 THEN
+		
 			UPDATE vn2008.XDiario x
-				JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
-                SET x.ASIEN = vASIEN;
-        
-        ELSE
-        
-			SELECT lastBookEntry INTO vASIEN FROM vn.ledgerConfig;
-            
+				JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
+				SET x.ASIEN = vASIEN;
+		
+		ELSE
+		
+			SELECT lastBookEntry INTO vASIEN FROM ledgerConfig;
+			
 		END IF;
-			     
-        SET vCounter = vCounter + 1;
-        
+					
+		SET vCounter = vCounter + 1;
+		
 		FETCH rs INTO vInvoiceFk;
 
 	END WHILE;
-    
-    CLOSE rs;
-    
-    UPDATE dua 
-        SET ASIEN = vASIEN
-        WHERE id = vDuaFk;
-        
+
+	CLOSE rs;
+
+	UPDATE dua 
+		SET ASIEN = vASIEN
+		WHERE id = vDuaFk;
+		
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/getTaxBases.sql b/db/routines/vn/procedures/getTaxBases.sql
new file mode 100644
index 000000000..54932aa4f
--- /dev/null
+++ b/db/routines/vn/procedures/getTaxBases.sql
@@ -0,0 +1,32 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`getTaxBases`()
+BEGIN
+/**
+*   Calcula y devuelve en número de bases imponibles postivas y negativas
+*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+*
+*	returns tmp.taxBases
+*/
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
+		(KEY (ticketFk))
+		ENGINE = MEMORY
+		SELECT id ticketFk
+			FROM tmp.ticketToInvoice;
+
+	CALL ticket_getTax(NULL);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.taxBases;
+	CREATE TEMPORARY TABLE tmp.taxBases
+		ENGINE = MEMORY
+		SELECT
+                SUM(taxableBase > 0) as positive,
+				SUM(taxableBase < 0) as negative
+			FROM(
+				SELECT SUM(taxableBase) taxableBase
+					FROM tmp.ticketTax
+					GROUP BY pgcFk
+				) t;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/inventoryMake.sql b/db/routines/vn/procedures/inventoryMake.sql
index 0def763dc..ed6a7fa43 100644
--- a/db/routines/vn/procedures/inventoryMake.sql
+++ b/db/routines/vn/procedures/inventoryMake.sql
@@ -1,182 +1,175 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMake`(vDate DATE, vWh INT)
-proc: BEGIN
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMake`(vInventoryDate DATE)
+BEGIN
 /**
-* Recalcula los inventarios de todos los almacenes, si vWh = 0
+* Recalculate the inventories
 *
-* @param vDate Fecha de los nuevos inventarios
-* @param vWh almacen al cual hacer el inventario
+* @param vInventoryDate date for the new inventory
 */
-
 	DECLARE vDone BOOL;
 	DECLARE vEntryFk INT;
 	DECLARE vTravelFk INT;
 	DECLARE vDateLastInventory DATE;
-	DECLARE vDateYesterday DATETIME DEFAULT vDate - INTERVAL 1 SECOND;
+	DECLARE vDateYesterday DATETIME DEFAULT vInventoryDate - INTERVAL 1 SECOND;
 	DECLARE vWarehouseOutFkInventory INT;
 	DECLARE vInventorySupplierFk INT;
 	DECLARE vAgencyModeFkInventory INT;
+	DECLARE vMaxRecentInventories INT;
+	DECLARE vWarehouseFk INT;
 
 	DECLARE cWarehouses CURSOR FOR
 		SELECT id
 			FROM warehouse
-			WHERE isInventory
-				AND vWh IN (0,id);
+			WHERE isInventory;
+	
+	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
+	SELECT inventorySupplierFk	INTO vInventorySupplierFk FROM entryConfig LIMIT 1;
+	SELECT inventoried INTO vDateLastInventory FROM config LIMIT 1;
+	SELECT maxRecentInventories,
+			warehouseOutFk,
+			agencyModeFk
+			INTO vMaxRecentInventories,
+				vWarehouseOutFkInventory,
+				vAgencyModeFkInventory
+		FROM inventoryConfig 
+		LIMIT 1;
+
+	IF vDateLastInventory IS NULL 
+		OR vInventorySupplierFk IS NULL
+		OR vMaxRecentInventories IS NULL 
+		OR vInventoryDate IS NULL 
+		OR vWarehouseOutFkInventory IS NULL
+		OR vAgencyModeFkInventory IS NULL THEN
+		CALL util.throw('Some config parameters are not set');
+	END IF;
+	
+	START TRANSACTION;
+
 	OPEN cWarehouses;
+	-- Environment variable to disable the triggers of the affected tables
 	SET @isModeInventory := TRUE;
 	l: LOOP
-
 		SET vDone = FALSE;
-		FETCH cWarehouses INTO vWh;
+		SET vEntryFk = NULL;
+		SET vTravelFk = NULL;
+
+		FETCH cWarehouses INTO vWarehouseFk;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		SELECT w.id INTO vWarehouseOutFkInventory
-			FROM warehouse w
-			WHERE w.code = 'inv';
-
-		SELECT inventorySupplierFk	INTO vInventorySupplierFk
-			FROM entryConfig;
-
-		SELECT am.id INTO vAgencyModeFkInventory
-				FROM agencyMode am
-					where code = 'inv';
-
-		SELECT MAX(landed) INTO vDateLastInventory
-			FROM travel tr
-				JOIN entry e ON e.travelFk = tr.id
-				JOIN buy b ON b.entryFk = e.id
-			WHERE warehouseOutFk = vWarehouseOutFkInventory
-				AND landed < vDate
-				AND e.supplierFk = vInventorySupplierFk
-				AND warehouseInFk = vWh
-				AND NOT isRaid;
-
-		IF vDateLastInventory IS NULL THEN
-			SELECT inventoried INTO vDateLastInventory FROM config;
-		END IF;
-
-		-- Generamos travel, si no existe.
-		SET vTravelFK = 0;
-
+		-- Generate travel, if it does not exist
 		SELECT id INTO vTravelFk
 			FROM travel
 			WHERE warehouseOutFk = vWarehouseOutFkInventory
-				AND warehouseInFk = vWh
-				AND landed = vDate
+				AND warehouseInFk = vWarehouseFk
+				AND landed = vInventoryDate
 				AND agencyModeFk = vAgencyModeFkInventory
 				AND ref = 'inventario'
 			LIMIT 1;
 
-		IF NOT vTravelFK THEN
-
-			INSERT INTO travel SET
-				warehouseOutFk = vWarehouseOutFkInventory,
-				warehouseInFk = vWh,
-				shipped = vDate,
-				landed = vDate,
-				agencyModeFk = vAgencyModeFkInventory,
-				ref = 'inventario',
-				isDelivered = TRUE,
-				isReceived = TRUE;
+		IF vTravelFk IS NULL THEN
+			INSERT INTO travel 
+				SET warehouseOutFk = vWarehouseOutFkInventory,
+					warehouseInFk = vWarehouseFk,
+					shipped = vInventoryDate,
+					landed = vInventoryDate,
+					agencyModeFk = vAgencyModeFkInventory,
+					ref = 'inventario',
+					isDelivered = TRUE,
+					isReceived = TRUE;
 
 			SELECT LAST_INSERT_ID() INTO vTravelFk;
-
 		END IF;
 
-		-- Generamos entrada si no existe, o la vaciamos.
-		SET vEntryFk = 0;
-
+		-- Generate an entry if it does not exist, or we empty it
 		SELECT id INTO vEntryFk
 			FROM entry
 			WHERE supplierFk = vInventorySupplierFk
 			AND travelFk = vTravelFk;
 
-		IF NOT vEntryFk THEN
-
-			INSERT INTO entry SET
-				supplierFk = vInventorySupplierFk,
-				isConfirmed = TRUE,
-				isOrdered = TRUE,
-				travelFk = vTravelFk;
+		IF vEntryFk IS NULL THEN
+			INSERT INTO entry 
+				SET supplierFk = vInventorySupplierFk,
+					isConfirmed = TRUE,
+					isOrdered = TRUE,
+					travelFk = vTravelFk;
 
 			SELECT LAST_INSERT_ID() INTO vEntryFk;
-
 		ELSE
-
 			DELETE FROM buy WHERE entryFk = vEntryFk;
-
 		END IF;
 
-		-- Preparamos tabla auxilar
-		CREATE OR REPLACE TEMPORARY TABLE tmp.inventory (
-				itemFk INT(11) NOT NULL PRIMARY KEY,
-				quantity int(11) DEFAULT '0',
-				buyingValue decimal(10,4) DEFAULT '0.0000',
-				freightValue decimal(10,3) DEFAULT '0.000',
-				packing int(11) DEFAULT '0',
-				`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
-				groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
-				comissionValue decimal(10,3) DEFAULT '0.000',
-				packageValue decimal(10,3) DEFAULT '0.000',
-				packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
-				price1 decimal(10,2) DEFAULT '0.00',
-				price2 decimal(10,2) DEFAULT '0.00',
-				price3 decimal(10,2) DEFAULT '0.00',
-				minPrice decimal(10,2) DEFAULT '0.00',
-				producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-		INDEX (itemFK)) ENGINE = MEMORY;
+		-- Prepare the auxiliary table
+		CREATE OR REPLACE TEMPORARY TABLE tInventory (
+			itemFk INT(11) NOT NULL PRIMARY KEY,
+			quantity int(11) DEFAULT '0',
+			buyingValue decimal(10,4) DEFAULT '0.0000',
+			freightValue decimal(10,3) DEFAULT '0.000',
+			packing int(11) DEFAULT '0',
+			`grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
+			groupingMode tinyint(4) NOT NULL DEFAULT 0 ,
+			comissionValue decimal(10,3) DEFAULT '0.000',
+			packageValue decimal(10,3) DEFAULT '0.000',
+			packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
+			price1 decimal(10,2) DEFAULT '0.00',
+			price2 decimal(10,2) DEFAULT '0.00',
+			price3 decimal(10,2) DEFAULT '0.00',
+			minPrice decimal(10,2) DEFAULT '0.00',
+			producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+			INDEX (itemFK)
+		) ENGINE = MEMORY;
 
-		-- Compras
-		INSERT INTO tmp.inventory(itemFk,quantity)
+		-- Buys
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT b.itemFk, SUM(b.quantity)
 				FROM buy b
 					JOIN entry e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
-				WHERE tr.warehouseInFk = vWh
-					AND tr.landed BETWEEN vDateLastInventory
-					AND vDateYesterday
+				WHERE tr.warehouseInFk = vWarehouseFk
+					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
 					AND NOT isRaid
 				GROUP BY b.itemFk;
-	SELECT vDateLastInventory , vDateYesterday;
 
-		-- Traslados
-		INSERT INTO tmp.inventory(itemFk, quantity)
+		-- Transfers
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT itemFk, quantityOut
-			FROM (
+				FROM (
 					SELECT b.itemFk,- SUM(b.quantity) quantityOut
 						FROM buy b
 							JOIN entry e ON e.id = b.entryFk
 							JOIN travel tr ON tr.id = e.travelFk
-						WHERE tr.warehouseOutFk = vWh
-							AND tr.shipped BETWEEN vDateLastInventory
-							AND vDateYesterday
+						WHERE tr.warehouseOutFk = vWarehouseFk
+							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
 							AND NOT isRaid
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;
 
-		-- Ventas
-		INSERT INTO tmp.inventory(itemFk,quantity)
+		-- Sales
+		INSERT INTO tInventory(itemFk, quantity)
 			SELECT itemFk, saleOut
-			FROM (
+				FROM (
 					SELECT s.itemFk, - SUM(s.quantity) saleOut
 						FROM sale s
 							JOIN ticket t ON t.id = s.ticketFk
-						WHERE t.warehouseFk = vWh
+						WHERE t.warehouseFk = vWarehouseFk
 							AND t.shipped BETWEEN vDateLastInventory AND vDateYesterday
 						GROUP BY s.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity,0) + sub.saleOut;
 
-		-- Actualiza valores de la ultima compra
-		UPDATE tmp.inventory inv
-				JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWh
+		-- Update values of the last purchase
+		UPDATE tInventory inv
+				JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWarehouseFk
 				JOIN buy b ON b.id = lb.buy_id
 				JOIN item i ON i.id = b.itemFk
 				LEFT JOIN producer p ON p.id = i.producerFk
@@ -194,7 +187,7 @@ proc: BEGIN
 				inv.minPrice = b.minPrice,
 				inv.producer = p.name;
 
-		INSERT INTO buy( itemFk,
+		INSERT INTO buy(itemFk,
 				quantity,
 				buyingValue,
 				freightValue,
@@ -224,42 +217,53 @@ proc: BEGIN
 					price3,
 					minPrice,
 					vEntryFk
-				FROM tmp.inventory;
+				FROM tInventory;
 
-		SELECT vWh, COUNT(*), util.VN_NOW() FROM tmp.inventory;
-
-	-- Actualizamos el campo lastUsed de item
-	UPDATE item i
-			JOIN tmp.inventory i2 ON i2.itemFk = i.id
-		SET i.lastUsed = NOW()
-		WHERE i2.quantity;
-
-	-- DROP TEMPORARY TABLE tmp.inventory;
+		-- Update the 'lastUsed' field of the item
+		UPDATE item i
+				JOIN tInventory i2 ON i2.itemFk = i.id
+			SET i.lastUsed = NOW()
+			WHERE i2.quantity;
+	
+		DROP TEMPORARY TABLE tInventory;
 
 	END LOOP;
-
+	
 	CLOSE cWarehouses;
 
-	UPDATE config SET inventoried = vDate;
-	SET @isModeInventory := FALSE;
+	UPDATE config SET inventoried = vInventoryDate;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	CREATE TEMPORARY TABLE tmp.entryToDelete
-		(INDEX(entryId) USING BTREE) ENGINE = MEMORY
-		SELECT e.id as entryId,
-				t.id as travelId
+	SET @isModeInventory := FALSE;
+	
+	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
+		(INDEX(entryId)) ENGINE = MEMORY
+		SELECT e.id entryId,
+				t.id travelId
 			FROM travel t
 				JOIN `entry` e ON e.travelFk = t.id
+				JOIN (
+					SELECT t.shipped
+						FROM travel t
+							JOIN `entry` e ON e.travelFk = t.id
+						WHERE e.supplierFk = vInventorySupplierFk
+							AND t.shipped <= vInventoryDate
+						GROUP BY t.shipped
+						ORDER BY t.shipped DESC
+						OFFSET vMaxRecentInventories ROWS
+				) sub
 			WHERE e.supplierFk = vInventorySupplierFk
-				AND t.shipped <= util.VN_CURDATE() - INTERVAL 12 DAY
-				AND (DAY(t.shipped) <> 1 OR shipped < util.VN_CURDATE() - INTERVAL 12 DAY);
+				AND t.shipped IN (sub.shipped);
 
-	DELETE e
+	DELETE e 
 		FROM `entry` e
-			JOIN tmp.entryToDelete tmp ON tmp.entryId = e.id;
+			JOIN tEntryToDelete tmp ON tmp.entryId = e.id;
 
 	DELETE IGNORE t
 		FROM travel t
-			JOIN tmp.entryToDelete tmp ON tmp.travelId = t.id;
+			JOIN tEntryToDelete tmp ON tmp.travelId = t.id;
+
+	DROP TEMPORARY TABLE IF EXISTS tEntryToDelete;
+
+	COMMIT;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/inventoryMakeLauncher.sql b/db/routines/vn/procedures/inventoryMakeLauncher.sql
index 6f362f70e..717e3c163 100644
--- a/db/routines/vn/procedures/inventoryMakeLauncher.sql
+++ b/db/routines/vn/procedures/inventoryMakeLauncher.sql
@@ -2,10 +2,11 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`inventoryMakeLauncher`()
 BEGIN
 /**
- * Recalcula los inventarios de todos los almacenes.
+ * Recalculate the inventories of all warehouses
  */
-
-	call vn.inventoryMake(TIMESTAMPADD(DAY, -10, util.VN_CURDATE()), 0);
-
+	CALL inventoryMake(
+		util.VN_CURDATE() - 
+		INTERVAL (SELECT daysInPastForInventory FROM inventoryConfig LIMIT 1) DAY
+	);
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/invoiceInTaxMakeByDua.sql b/db/routines/vn/procedures/invoiceInTaxMakeByDua.sql
index f41504669..2ff478d6b 100644
--- a/db/routines/vn/procedures/invoiceInTaxMakeByDua.sql
+++ b/db/routines/vn/procedures/invoiceInTaxMakeByDua.sql
@@ -1,32 +1,35 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(vDuaFk INT)
 BEGIN
-
-	DECLARE done BOOL DEFAULT FALSE;
+/**
+ * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
+ *  
+ * @param vDuaFk Id del dua a recalcular
+ */
+	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceInFk INT;
 
-	DECLARE rs CURSOR FOR
-			SELECT invoiceInFk
-				FROM entry e
-					JOIN duaEntry de ON de.entryFk = e.id
-				WHERE de.duaFk = vDuaFk;
+	DECLARE vInvoices CURSOR FOR
+		SELECT DISTINCT invoiceInFk
+			FROM entry e
+				JOIN duaEntry de ON de.entryFk = e.id
+			WHERE de.duaFk = vDuaFk;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	OPEN rs;
+	OPEN vInvoices;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vInvoices INTO vInvoiceInFk;
 
-	FETCH rs INTO vInvoiceInFk;
-
-	WHILE NOT done DO
+		IF vDone THEN
+			LEAVE l;
+		END IF;
 
 		CALL vn2008.recibidaIvaInsert(vInvoiceInFk);
 		CALL invoiceInDueDay_recalc(vInvoiceInFk);
 
-		FETCH rs INTO vInvoiceInFk;
-
-	END WHILE;
-
-	CLOSE rs;
-
+	END LOOP;
+	CLOSE vInvoices;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/invoiceInTax_getFromDua.sql b/db/routines/vn/procedures/invoiceInTax_getFromDua.sql
index c7574f72f..bf2cbe61e 100644
--- a/db/routines/vn/procedures/invoiceInTax_getFromDua.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromDua.sql
@@ -1,32 +1,35 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromDua`(vDuaFk INT)
 BEGIN
-
-	DECLARE done BOOL DEFAULT FALSE;
+/**
+ * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
+ *  
+ * @param vDuaFk Id del dua a recalcular
+ */
+	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vInvoiceInFk INT;
 
-	DECLARE rs CURSOR FOR
-		SELECT invoiceInFk
+	DECLARE vInvoices CURSOR FOR
+		SELECT DISTINCT invoiceInFk
 			FROM entry e
 				JOIN duaEntry de ON de.entryFk = e.id
 			WHERE de.duaFk = vDuaFk;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	OPEN rs;
+	OPEN vInvoices;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vInvoices INTO vInvoiceInFk;
 
-	FETCH rs INTO vInvoiceInFk;
-
-	WHILE NOT done DO
+		IF vDone THEN
+			LEAVE l;
+		END IF;
 
 		CALL invoiceInTax_getFromEntries(vInvoiceInFk);
 		CALL invoiceInDueDay_calculate(vInvoiceInFk);
-        
-		FETCH rs INTO vInvoiceInFk;
-
-	END WHILE;
-
-	CLOSE rs;
 
+	END LOOP;
+	CLOSE vInvoices;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
index 14cc43e15..5a53b7543 100644
--- a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
@@ -1,13 +1,22 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vId INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vInvoiceInFk INT)
 BEGIN
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
 	DECLARE vExpenseFk VARCHAR(10);
+	DECLARE vIsBooked BOOLEAN DEFAULT FALSE;
 
+	SELECT isBooked INTO vIsBooked  
+		FROM invoiceIn ii 
+		WHERE id = vInvoiceInFk;
+
+	IF vIsBooked THEN 
+		CALL util.throw('A booked invoice cannot be modified');
+	END IF;
+	
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr
-			JOIN invoiceIn ii ON ii.id = vId
+			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
 		WHERE rr.dated <= ii.issued 
 			AND rr.currencyFk = ii.currencyFk ;
 
@@ -24,7 +33,7 @@ BEGIN
 		LIMIT 1;
 		
 	DELETE FROM invoiceInTax 
-		WHERE invoiceInFk = vId;
+		WHERE invoiceInFk = vInvoiceInFk;
 
 	INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, foreignValue, taxTypeSageFk, transactionTypeSageFk)
 		SELECT ii.id,
@@ -39,7 +48,7 @@ BEGIN
 				JOIN buy b ON b.entryFk = e.id
 				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk 
 					AND rr.dated = ii.issued
-			WHERE ii.id = vId 
+			WHERE ii.id = vInvoiceInFk 
 			HAVING taxableBase IS NOT NULL;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/itemProposal_Add.sql b/db/routines/vn/procedures/itemProposal_Add.sql
index 5a01cb67a..ac4dfa5d5 100644
--- a/db/routines/vn/procedures/itemProposal_Add.sql
+++ b/db/routines/vn/procedures/itemProposal_Add.sql
@@ -67,4 +67,4 @@ BEGIN
 
 	COMMIT;
 END$$
-DELIMITER ;
\ No newline at end of file
+DELIMITER ;
diff --git a/db/routines/vn/procedures/itemShelving_selfConsumption.sql b/db/routines/vn/procedures/itemShelving_selfConsumption.sql
index aa6c34199..c974d9903 100644
--- a/db/routines/vn/procedures/itemShelving_selfConsumption.sql
+++ b/db/routines/vn/procedures/itemShelving_selfConsumption.sql
@@ -20,20 +20,23 @@ BEGIN
 	DECLARE vCompanyFk INT;
 	DECLARE vAgencyModeFk INT;
 	DECLARE vItemShelvingFk INT;
+	DECLARE vAddressFk INT;
 
 	SELECT c.id,
 			pc.clientSelfConsumptionFk,
-			s.warehouseFk
+			s.warehouseFk,
+			pc.addressSelfConsumptionFk
 			INTO vCompanyFk,
 			vClientFk,
-			vWarehouseFk
+			vWarehouseFk,
+			vAddressFk
 		FROM company c
 			JOIN address a ON a.clientFk = c.clientFk
 			JOIN warehouse w ON w.addressFk = a.id
 			JOIN sector s ON s.warehouseFk = w.id
 			JOIN parking p ON p.sectorFk = s.id
 			JOIN shelving s2 ON s2.parkingFk = p.id
-			JOIN productionConfig pc ON TRUE
+			JOIN productionConfig pc
 		WHERE s2.code = vShelvingFk;
 
 	IF vClientFk IS NULL THEN
@@ -65,7 +68,7 @@ BEGIN
 			vClientFk,
 			vWarehouseFk,
 			CURDATE(),
-			NULL,
+			vAddressFk,
 			vCompanyFk,
 			NULL,
 			vTicketFk
diff --git a/db/routines/vn/procedures/test.sql b/db/routines/vn/procedures/test.sql
deleted file mode 100644
index 69340291d..000000000
--- a/db/routines/vn/procedures/test.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`test`()
-BEGIN
-select 'procedimiento ejecutado con éxito';
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/ticket_getMovable.sql b/db/routines/vn/procedures/ticket_getMovable.sql
index b69fa220a..eee165538 100644
--- a/db/routines/vn/procedures/ticket_getMovable.sql
+++ b/db/routines/vn/procedures/ticket_getMovable.sql
@@ -1,44 +1,55 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_getMovable`(
+	vTicketFk INT,
+	vNewShipped DATETIME,
+	vWarehouseFk INT
+)
 BEGIN
 /**
  * Cálcula el stock movible para los artículos de un ticket
- * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * vNewShipped debe ser menor que vOldShipped, en los otros casos se
  * asume que siempre es posible
  *
  * @param vTicketFk -> Ticket
- * @param vDatedNew -> Nueva fecha
+ * @param vNewShipped -> Nueva fecha
  * @return Sales con Movible
-*/    
-    DECLARE vDatedOld DATETIME;
-	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
+*/
+    DECLARE vOldShipped DATETIME;
 
-    SELECT t.shipped INTO vDatedOld
-        FROM ticket t 
+    SELECT t.shipped INTO vOldShipped
+        FROM ticket t
         WHERE t.id = vTicketFk;
 
-    CALL item_getStock(vWarehouseFk, vDatedNew, NULL); 
-    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
-	
-    SELECT s.id, 
-			s.itemFk, 
-			s.quantity, 
-			s.concept, 
-			s.price, 
+	-- Añadimos un dia más para calcular el stock hasta vNewShipped inclusive
+    CALL item_getStock(vWarehouseFk, DATE_ADD(vNewShipped, INTERVAL 1 DAY), NULL);
+    CALL item_getMinacum(
+		vWarehouseFk,
+		vNewShipped,
+		DATEDIFF(DATE_SUB(vOldShipped, INTERVAL 1 DAY), vNewShipped),
+		NULL
+	);
+
+    SELECT s.id,
+			s.itemFk,
+			s.quantity,
+			s.concept,
+			s.price,
 			s.reserved,
-			s.discount,  
-			i.image, 
-			i.subName, 
+			s.discount,
+			i.image,
+			i.subName,
 			il.stock + IFNULL(im.amount, 0) AS movable
         FROM ticket t
             JOIN sale s ON s.ticketFk = t.id
-            JOIN item i ON i.id = s.itemFk 
-            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
+            JOIN item i ON i.id = s.itemFk
+            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk
+				AND im.warehouseFk = vWarehouseFk
             LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
         WHERE t.id = vTicketFk;
 
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
-    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum; 
-    
+    DROP TEMPORARY TABLE IF EXISTS
+		tmp.itemList,
+		tmp.itemMinacum;
+
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/calendar_afterDelete.sql b/db/routines/vn/triggers/calendar_afterDelete.sql
index acd2c55b7..5d0114ea8 100644
--- a/db/routines/vn/triggers/calendar_afterDelete.sql
+++ b/db/routines/vn/triggers/calendar_afterDelete.sql
@@ -1,12 +1,12 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_afterDelete`
-	AFTER DELETE ON `calendar`
-	FOR EACH ROW
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_afterDelete`
+	AFTER DELETE ON `calendar`
+	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
 			`changedModel` = 'Calendar',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-END$$
-DELIMITER ;
\ No newline at end of file
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/calendar_beforeInsert.sql b/db/routines/vn/triggers/calendar_beforeInsert.sql
index 9e51e6d18..3e265a099 100644
--- a/db/routines/vn/triggers/calendar_beforeInsert.sql
+++ b/db/routines/vn/triggers/calendar_beforeInsert.sql
@@ -5,4 +5,4 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeInsert
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 END$$
-DELIMITER ;
\ No newline at end of file
+DELIMITER ;
diff --git a/db/routines/vn/triggers/calendar_beforeUpdate.sql b/db/routines/vn/triggers/calendar_beforeUpdate.sql
index bb1ba53c3..f015dc29a 100644
--- a/db/routines/vn/triggers/calendar_beforeUpdate.sql
+++ b/db/routines/vn/triggers/calendar_beforeUpdate.sql
@@ -1,8 +1,8 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeUpdate`
-	BEFORE UPDATE ON `calendar`
-	FOR EACH ROW
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeUpdate`
+	BEFORE UPDATE ON `calendar`
+	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-END$$
-DELIMITER ;
\ No newline at end of file
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/saleGroup_beforeInser.sql b/db/routines/vn/triggers/saleGroup_beforeInsert.sql
similarity index 100%
rename from db/routines/vn/triggers/saleGroup_beforeInser.sql
rename to db/routines/vn/triggers/saleGroup_beforeInsert.sql
diff --git a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
index 6f0f00dbf..19653c913 100644
--- a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
+++ b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
@@ -1,12 +1,12 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterDelete`
-	AFTER DELETE ON `workerTimeControl`
-	FOR EACH ROW
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterDelete`
+	AFTER DELETE ON `workerTimeControl`
+	FOR EACH ROW
 BEGIN
 	INSERT INTO workerLog
 		SET `action` = 'delete',
 			`changedModel` = 'WorkerTimeControl',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-END$$
-DELIMITER ;
\ No newline at end of file
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql
index a899b879a..ad7acb784 100644
--- a/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql
+++ b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql
@@ -1,8 +1,8 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeInsert`
-	BEFORE INSERT ON `workerTimeControl`
-	FOR EACH ROW
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeInsert`
+	BEFORE INSERT ON `workerTimeControl`
+	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-END$$
-DELIMITER ;
\ No newline at end of file
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql
index 969e08711..bb391ad61 100644
--- a/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql
+++ b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql
@@ -1,8 +1,8 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeUpdate`
-	BEFORE UPDATE ON `workerTimeControl`
-	FOR EACH ROW
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeUpdate`
+	BEFORE UPDATE ON `workerTimeControl`
+	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-END$$
-DELIMITER ;
\ No newline at end of file
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/views/awbVolume.sql b/db/routines/vn/views/awbVolume.sql
index 2c77973ca..df3b1ed1a 100644
--- a/db/routines/vn/views/awbVolume.sql
+++ b/db/routines/vn/views/awbVolume.sql
@@ -28,4 +28,4 @@ FROM (
 		JOIN `vn`.`volumeConfig` `vc`
 	)
 WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1)
-	AND t.awbFk	
\ No newline at end of file
+	AND `t`.`awbFk` <> 0
diff --git a/db/routines/vn/views/expeditionPallet_Print.sql b/db/routines/vn/views/expeditionPallet_Print.sql
index 4e9e8cb0e..07627e817 100644
--- a/db/routines/vn/views/expeditionPallet_Print.sql
+++ b/db/routines/vn/views/expeditionPallet_Print.sql
@@ -9,7 +9,7 @@ AS SELECT `et2`.`description` AS `truck`,
 	`et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
-		`r`.`created` > util.VN_CURDATE() + INTERVAL 1 DAY,
+		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
 		ucase(dayname(`r`.`created`)),
 		NULL
 	) AS `nombreDia`
diff --git a/db/routines/vn/views/itemShelvingAvailable.sql b/db/routines/vn/views/itemShelvingAvailable.sql
index ee4ef62b6..868d6a963 100644
--- a/db/routines/vn/views/itemShelvingAvailable.sql
+++ b/db/routines/vn/views/itemShelvingAvailable.sql
@@ -1,7 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`itemShelvingAvailable`
-AS SELECT `s`.`id` `saleFk`,
+AS SELECT `s`.`id` AS `saleFk`,
 	`tst`.`updated` AS `Modificado`,
 	`s`.`ticketFk` AS `ticketFk`,
 	0 AS `isPicked`,
diff --git a/db/routines/vn/views/ticketStateToday.sql b/db/routines/vn/views/ticketStateToday.sql
index 2ee65b7c2..1f10aceb1 100644
--- a/db/routines/vn/views/ticketStateToday.sql
+++ b/db/routines/vn/views/ticketStateToday.sql
@@ -1,8 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`ticketStateToday`
-AS SELECT
-	`ts`.`ticketFk` AS `ticketFk`,
+AS SELECT `ts`.`ticketFk` AS `ticketFk`,
 	`ts`.`state` AS `state`,
 	`ts`.`productionOrder` AS `productionOrder`,
 	`ts`.`alertLevel` AS `alertLevel`,
@@ -10,6 +9,8 @@ AS SELECT
 	`ts`.`code` AS `code`,
 	`ts`.`updated` AS `updated`,
 	`ts`.`isPicked` AS `isPicked`
-FROM `ticketState` `ts`
-	JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
+FROM (
+		`vn`.`ticketState` `ts`
+		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
+	)
+WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
diff --git a/db/routines/vn/views/zoneEstimatedDelivery.sql b/db/routines/vn/views/zoneEstimatedDelivery.sql
index 621d1a8f0..081ccb0bd 100644
--- a/db/routines/vn/views/zoneEstimatedDelivery.sql
+++ b/db/routines/vn/views/zoneEstimatedDelivery.sql
@@ -1,25 +1,48 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`zoneEstimatedDelivery`
-	AS SELECT t.zoneFk,
-		zc.`hour` zoneClosureHour,
-		z.`hour` zoneHour,
-		sv.volume volume,
-		al.hasToRecalcPrice,
-		lhp.m3,
-		dl.minSpeed
-	FROM ticket t
-		JOIN ticketStateToday tst ON tst.ticketFk = t.id
-		JOIN state s ON	s.id = tst.state
-		JOIN saleVolume sv ON sv.ticketFk = t.id
-		LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
-		JOIN warehouse w ON w.id = t.warehouseFk
-		JOIN warehouseAlias wa ON wa.id = w.aliasFk
-		STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
-		LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
-			AND zc.dated = util.VN_CURDATE()
-		LEFT JOIN cache.departure_limit dl ON dl.warehouse_id = t.warehouseFk
-			AND dl.fecha = util.VN_CURDATE()
-		JOIN alertLevel al ON al.id = s.alertLevel
-	WHERE w.hasProduction
-		AND DATE(t.shipped) = util.VN_CURDATE()
+AS SELECT `t`.`zoneFk` AS `zoneFk`,
+	`zc`.`hour` AS `zoneClosureHour`,
+	`z`.`hour` AS `zoneHour`,
+	`sv`.`volume` AS `volume`,
+	`al`.`hasToRecalcPrice` AS `hasToRecalcPrice`,
+	`lhp`.`m3` AS `m3`,
+	`dl`.`minSpeed` AS `minSpeed`
+FROM (
+		(
+			(
+				(
+					(
+						(
+							(
+								(
+									(
+										(
+											`vn`.`ticket` `t`
+											JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`)
+										)
+										JOIN `vn`.`state` `s` ON(`s`.`id` = `tst`.`state`)
+									)
+									JOIN `vn`.`saleVolume` `sv` ON(`sv`.`ticketFk` = `t`.`id`)
+								)
+								LEFT JOIN `vn`.`lastHourProduction` `lhp` ON(`lhp`.`warehouseFk` = `t`.`warehouseFk`)
+							)
+							JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`)
+						)
+						JOIN `vn`.`warehouseAlias` `wa` ON(`wa`.`id` = `w`.`aliasFk`)
+					) STRAIGHT_JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
+				)
+				LEFT JOIN `vn`.`zoneClosure` `zc` ON(
+					`zc`.`zoneFk` = `t`.`zoneFk`
+					AND `zc`.`dated` = `util`.`VN_CURDATE`()
+				)
+			)
+			LEFT JOIN `cache`.`departure_limit` `dl` ON(
+				`dl`.`warehouse_id` = `t`.`warehouseFk`
+				AND `dl`.`fecha` = `util`.`VN_CURDATE`()
+			)
+		)
+		JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `s`.`alertLevel`)
+	)
+WHERE `w`.`hasProduction` <> 0
+	AND cast(`t`.`shipped` AS date) = `util`.`VN_CURDATE`()
diff --git a/db/routines/vn2008/procedures/recobro_credito.sql b/db/routines/vn2008/procedures/recobro_credito.sql
index ca5304b6c..fbb5ea1aa 100644
--- a/db/routines/vn2008/procedures/recobro_credito.sql
+++ b/db/routines/vn2008/procedures/recobro_credito.sql
@@ -52,4 +52,4 @@ BEGIN
 	DROP TEMPORARY TABLE clientes_credit;
 	COMMIT;
 END$$
-DELIMITER ;
\ No newline at end of file
+DELIMITER ;
diff --git a/db/routines/vn2008/views/v_xsubcuentas.sql b/db/routines/vn2008/views/v_xsubcuentas.sql
index a200e4ad9..7f2075a83 100644
--- a/db/routines/vn2008/views/v_xsubcuentas.sql
+++ b/db/routines/vn2008/views/v_xsubcuentas.sql
@@ -17,7 +17,7 @@ AS SELECT `Clientes`.`Cuenta` AS `COD`,
 	`province`.`name` AS `PROVINCIA`,
 	`Clientes`.`codPostal` AS `CODPOSTAL`,
 	`p`.`Codigo` AS `country_code`,
-	sub.`empresa_id` AS `empresa_id`,
+	`sub`.`empresa_id` AS `empresa_id`,
 	substr(
 		`Clientes`.`e-mail`,
 		1,
@@ -49,9 +49,7 @@ FROM (
 						`Recibos`.`empresa_id` AS `empresa_id`
 					FROM `vn2008`.`Recibos`
 					WHERE `Recibos`.`Fechacobro` > `util`.`VN_CURDATE`() + INTERVAL -2 MONTH
-				) sub ON(
-					`Clientes`.`id_cliente` = sub.`Id_Cliente`
-				)
+				) `sub` ON(`Clientes`.`id_cliente` = `sub`.`Id_Cliente`)
 			)
 			LEFT JOIN `vn2008`.`Paises` `p` ON(`p`.`Id` = `Clientes`.`Id_Pais`)
 		)
@@ -60,7 +58,7 @@ FROM (
 		)
 	)
 GROUP BY `Clientes`.`id_cliente`,
-	sub.`empresa_id`
+	`sub`.`empresa_id`
 UNION ALL
 SELECT `Proveedores`.`cuenta` AS `Cuenta`,
 	`Proveedores`.`Proveedor` AS `Proveedor`,
@@ -78,7 +76,7 @@ SELECT `Proveedores`.`cuenta` AS `Cuenta`,
 	`prov`.`name` AS `Provincia`,
 	`Proveedores`.`codpos` AS `CP`,
 	`p`.`Codigo` AS `country_code`,
-	sub.`empresa_id` AS `empresa_id`,
+	`sub`.`empresa_id` AS `empresa_id`,
 	substr(
 		`c`.`email`,
 		1,
@@ -104,8 +102,8 @@ FROM (
 						WHERE `pago`.`fecha` > `util`.`VN_CURDATE`() + INTERVAL -3 MONTH
 						GROUP BY `pago`.`id_proveedor`,
 							`pago`.`empresa_id`
-					) sub ON(
-						`Proveedores`.`Id_Proveedor` = sub.`proveedor_id`
+					) `sub` ON(
+						`Proveedores`.`Id_Proveedor` = `sub`.`proveedor_id`
 					)
 				)
 				LEFT JOIN `vn2008`.`Paises` `p` ON(`p`.`Id` = `Proveedores`.`pais_id`)
@@ -117,8 +115,8 @@ FROM (
 		LEFT JOIN `vn`.`supplierContact` `c` ON(`c`.`supplierFk` = `Proveedores`.`Id_Proveedor`)
 	)
 WHERE `Proveedores`.`oficial` <> 0
-GROUP BY sub.`proveedor_id`,
-	sub.`empresa_id`
+GROUP BY `sub`.`proveedor_id`,
+	`sub`.`empresa_id`
 UNION ALL
 SELECT `Gastos`.`Id_Gasto` COLLATE utf8mb3_unicode_ci AS `Id_Gasto`,
 	`Gastos`.`Gasto` COLLATE utf8mb3_unicode_ci AS `Gasto`,
@@ -160,7 +158,7 @@ SELECT lpad(right(`Proveedores`.`cuenta`, 5), 10, '47510000') AS `Cuenta`,
 	`prov`.`name` AS `Provincia`,
 	`Proveedores`.`codpos` AS `CP`,
 	`p`.`Codigo` AS `country_code`,
-	sub.`empresa_id` AS `empresa_id`,
+	`sub`.`empresa_id` AS `empresa_id`,
 	substr(
 		`c`.`email`,
 		1,
@@ -186,8 +184,8 @@ FROM (
 						WHERE `pago`.`fecha` > `util`.`VN_CURDATE`() + INTERVAL -3 MONTH
 						GROUP BY `pago`.`id_proveedor`,
 							`pago`.`empresa_id`
-					) sub ON(
-						`Proveedores`.`Id_Proveedor` = sub.`proveedor_id`
+					) `sub` ON(
+						`Proveedores`.`Id_Proveedor` = `sub`.`proveedor_id`
 					)
 				)
 				LEFT JOIN `vn2008`.`Paises` `p` ON(`p`.`Id` = `Proveedores`.`pais_id`)
@@ -203,5 +201,5 @@ WHERE (
 		OR `Proveedores`.`cuenta` LIKE '_____2____'
 	)
 	AND `Proveedores`.`oficial` = 1
-GROUP BY sub.`proveedor_id`,
-	sub.`empresa_id`
+GROUP BY `sub`.`proveedor_id`,
+	`sub`.`empresa_id`