Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat

.gitignore

@@ -2,10 +2,11 @@ coverage
 node_modules
 dist
 storage
+.idea
 npm-debug.log
 .eslintcache
 datasources.*.json
 print.*.json
 db.json
 junit.xml
-.DS_Store
+.DS_Store

.vscode/settings.json

@@ -1,8 +1,8 @@
-// Coloque su configuración en este archivo para sobrescribir la configuración predeterminada y de usuario.
-{
-    // Carácter predeterminado de final de línea.
-    "files.eol": "\n",
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-    }
-}
+// Coloque su configuración en este archivo para sobrescribir la configuración predeterminada y de usuario.
+{
+    // Carácter predeterminado de final de línea.
+    "files.eol": "\n",
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    }
+}

Dockerfile

@@ -1,32 +1,43 @@
-FROM debian:stretch-slim
+FROM debian:bullseye-slim
 ENV TZ Europe/Madrid
 
 ARG DEBIAN_FRONTEND=noninteractive
+
+# NodeJs
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         curl \
         ca-certificates \
         gnupg2 \
-        libfontconfig lftp \
-    && apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
-      libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
-      libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
-      libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
-      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs \
+    && npm install -g npm@8.19.2
+
+# Puppeteer
+
+RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        nodejs \
-    && apt-get purge -y --auto-remove \
-        gnupg2 \
+        libfontconfig lftp xvfb gconf-service libasound2 libatk1.0-0 libc6 \
+        libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 \
+        libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
+        libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
+        libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
+        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+        fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
     && rm -rf /var/lib/apt/lists/* \
     && npm -g install pm2
 
+# Salix
+
 WORKDIR /salix
+
+COPY print/package.json print/package-lock.json print/
+RUN npm --prefix ./print install --omit=dev ./print
+
 COPY package.json package-lock.json ./
 COPY loopback/package.json loopback/
-COPY print/package.json print/
-RUN npm install --only=prod
-RUN npm --prefix ./print install --only=prod ./print
+RUN npm install --omit=dev
 
 COPY loopback loopback
 COPY back back

Jenkinsfile

@@ -1,5 +1,4 @@
 #!/usr/bin/env groovy
-
 pipeline {
     agent any
     options {
@@ -62,13 +61,13 @@ pipeline {
                         }
                     }
                 }
-            //     stage('Backend') {
-            //         steps {
-            //             nodejs('node-v14') {
-            //                 sh 'npm run test:back:ci'
-            //             }
-            //         }
-            //     }
+                stage('Backend') {
+                    steps {
+                        nodejs('node-v14') {
+                            sh 'npm run test:back:ci'
+                        }
+                    }
+                }
             }
         }
         stage('Build') {

back/methods/account/recover-password.js

@@ -0,0 +1,30 @@
+module.exports = Self => {
+    Self.remoteMethod('recoverPassword', {
+        description: 'Send email to the user',
+        accepts: [
+            {
+                arg: 'email',
+                type: 'string',
+                description: 'The email of user',
+                required: true
+            }
+        ],
+        http: {
+            path: `/recoverPassword`,
+            verb: 'POST'
+        }
+    });
+
+    Self.recoverPassword = async function(email) {
+        const models = Self.app.models;
+
+        try {
+            await models.user.resetPassword({email, emailTemplate: 'recover-password'});
+        } catch (err) {
+            if (err.code === 'EMAIL_NOT_FOUND')
+                return;
+            else
+                throw err;
+        }
+    };
+};

back/methods/account/specs/set-password.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('account changePassword()', () => {
+describe('account setPassword()', () => {
     it('should throw an error when password does not meet requirements', async() => {
         let req = app.models.Account.setPassword(1, 'insecurePass');
 

back/methods/chat/notifyIssues.js

@@ -32,7 +32,7 @@ module.exports = Self => {
         let message = $t(`There's a new urgent ticket:`);
         const ostUri = 'https://cau.verdnatura.es/scp/tickets.php?id=';
         tickets.forEach(ticket => {
-            message += `\r\n[ID: *${ticket.number}* - ${ticket.subject} (@${ticket.username})](${ostUri + ticket.id})`;
+            message += `\r\n[ID: ${ticket.number} - ${ticket.subject} @${ticket.username}](${ostUri + ticket.id})`;
         });
 
         const department = await models.Department.findOne({
@@ -42,7 +42,5 @@ module.exports = Self => {
 
         if (channelName)
             return Self.send(ctx, `#${channelName}`, `@all ➔ ${message}`);
-
-        return;
     };
 };

back/methods/chat/spec/notifyIssue.spec.js

@@ -27,7 +27,7 @@ describe('Chat notifyIssue()', () => {
             subject: 'Issue title'}
         ]);
         // eslint-disable-next-line max-len
-        const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: *00001* - Issue title (@batman)](https://cau.verdnatura.es/scp/tickets.php?id=1)`;
+        const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: 00001 - Issue title @batman](https://cau.verdnatura.es/scp/tickets.php?id=1)`;
 
         const department = await app.models.Department.findById(departmentId);
         let orgChatName = department.chatName;

back/methods/dms/deleteTrashFiles.js

@@ -47,20 +47,22 @@ module.exports = Self => {
         for (let dms of dmsToDelete) {
             const pathHash = DmsContainer.getHash(dms.id);
             const dmsContainer = await DmsContainer.container(pathHash);
-            const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
             try {
+                const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
                 await fs.unlink(dstFile);
             } catch (err) {
-                continue;
+                if (err.code != 'ENOENT' && dms.file)
+                    throw err;
             }
+
+            await dms.destroy(myOptions);
+
             const dstFolder = path.join(dmsContainer.client.root, pathHash);
             try {
                 await fs.rmdir(dstFolder);
             } catch (err) {
                 continue;
             }
-
-            await dms.destroy(myOptions);
         }
     };
 };

back/methods/notification/clean.js

@@ -29,6 +29,9 @@ module.exports = Self => {
 
         try {
             const config = await models.NotificationConfig.findOne({}, myOptions);
+
+            if (!config.cleanDays) return;
+
             const cleanDate = new Date();
             cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
 
@@ -36,11 +39,11 @@ module.exports = Self => {
                 where: {status: {inq: status}},
                 created: {lt: cleanDate}
             }, myOptions);
-
-            if (tx) await tx.commit();
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
+
+        if (tx) await tx.commit();
     };
 };

back/methods/notification/send.js

@@ -1,5 +1,4 @@
 const {Email} = require('vn-print');
-const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.remoteMethod('send', {
@@ -35,7 +34,10 @@ module.exports = Self => {
                                 include: {
                                     relation: 'user',
                                     scope: {
-                                        fields: ['name', 'email', 'lang']
+                                        fields: ['name', 'lang'],
+                                        include: {
+                                            relation: 'emailUser'
+                                        }
                                     }
                                 }
                             }
@@ -56,7 +58,7 @@ module.exports = Self => {
             for (const notificationUser of queue.notification().subscription()) {
                 try {
                     const sendParams = {
-                        recipient: notificationUser.user().email,
+                        recipient: notificationUser.user().emailUser().email,
                         lang: notificationUser.user().lang
                     };
 

back/models/account.js

@@ -1,4 +1,7 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
 const md5 = require('md5');
+const LoopBackContext = require('loopback-context');
+const {Email} = require('vn-print');
 
 module.exports = Self => {
     require('../methods/account/login')(Self);
@@ -6,6 +9,7 @@ module.exports = Self => {
     require('../methods/account/acl')(Self);
     require('../methods/account/change-password')(Self);
     require('../methods/account/set-password')(Self);
+    require('../methods/account/recover-password')(Self);
     require('../methods/account/validate-token')(Self);
     require('../methods/account/privileges')(Self);
 
@@ -27,17 +31,62 @@ module.exports = Self => {
             ctx.data.password = md5(ctx.data.password);
     });
 
+    Self.afterRemote('prototype.patchAttributes', async(ctx, instance) => {
+        if (!ctx.args || !ctx.args.data.email) return;
+        const models = Self.app.models;
+
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;
+        const url = origin.split(':');
+
+        const userId = ctx.instance.id;
+        const user = await models.user.findById(userId);
+
+        class Mailer {
+            async send(verifyOptions, cb) {
+                const params = {
+                    url: verifyOptions.verifyHref,
+                    recipient: verifyOptions.to,
+                    lang: ctx.req.getLocale()
+                };
+
+                const email = new Email('email-verify', params);
+                email.send();
+
+                cb(null, verifyOptions.to);
+            }
+        }
+
+        const options = {
+            type: 'email',
+            to: instance.email,
+            from: {},
+            redirect: `${origin}/#!/account/${instance.id}/basic-data?emailConfirmed`,
+            template: false,
+            mailer: new Mailer,
+            host: url[1].split('/')[2],
+            port: url[2],
+            protocol: url[0],
+            user: Self
+        };
+
+        await user.verify(options);
+    });
+
     Self.remoteMethod('getCurrentUserData', {
         description: 'Gets the current user data',
         accepts: [
             {
                 arg: 'ctx',
-                type: 'Object',
+                type: 'object',
                 http: {source: 'context'}
             }
         ],
         returns: {
-            type: 'Object',
+            type: 'object',
             root: true
         },
         http: {
@@ -58,7 +107,7 @@ module.exports = Self => {
      *
      * @param {Integer} userId The user id
      * @param {String} name The role name
-     * @param {Object} options Options
+     * @param {object} options Options
      * @return {Boolean} %true if user has the role, %false otherwise
      */
     Self.hasRole = async function(userId, name, options) {
@@ -70,8 +119,8 @@ module.exports = Self => {
      * Get all user roles.
      *
      * @param {Integer} userId The user id
-     * @param {Object} options Options
-     * @return {Object} User role list
+     * @param {object} options Options
+     * @return {object} User role list
      */
     Self.getRoles = async(userId, options) => {
         let result = await Self.rawSql(

back/models/account.json

@@ -40,6 +40,9 @@
 		"email": {
 			"type": "string"
 		},
+        "emailVerified": {
+			"type": "boolean"
+		},
 		"created": {
 			"type": "date"
 		},
@@ -88,16 +91,23 @@
 			"principalType": "ROLE",
 			"principalId": "$everyone",
 			"permission": "ALLOW"
-		},
+        },
+        {
+            "property": "recoverPassword",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
 		{
-			"property": "logout",
+            "property": "logout",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
 		},
 		{
-			"property": "validateToken",
+            "property": "validateToken",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",

back/models/chat.js

@@ -4,4 +4,23 @@ module.exports = Self => {
     require('../methods/chat/sendCheckingPresence')(Self);
     require('../methods/chat/notifyIssues')(Self);
     require('../methods/chat/sendQueued')(Self);
+
+    Self.observe('before save', async function(ctx) {
+        if (!ctx.isNewInstance) return;
+
+        let {message} = ctx.instance;
+        if (!message) return;
+
+        const parts = message.match(/(?<=\[)[a-zA-Z0-9_\-+!@#$%^&*()={};':"\\|,.<>/?\s]*(?=])/g);
+        if (!parts) return;
+
+        const replacedParts = parts.map(part => {
+            return part.replace(/[!$%^&*()={};':"\\,.<>/?]/g, '');
+        });
+
+        for (const [index, part] of parts.entries())
+            message = message.replace(part, replacedParts[index]);
+
+        ctx.instance.message = message;
+    });
 };

back/models/specs/account.spec.js

@@ -1,14 +1,14 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
 describe('loopback model Account', () => {
     it('should return true if the user has the given role', async() => {
-        let result = await app.models.Account.hasRole(1, 'employee');
+        let result = await models.Account.hasRole(1, 'employee');
 
         expect(result).toBeTruthy();
     });
 
     it('should return false if the user doesnt have the given role', async() => {
-        let result = await app.models.Account.hasRole(1, 'administrator');
+        let result = await models.Account.hasRole(1, 'administrator');
 
         expect(result).toBeFalsy();
     });

back/models/specs/user.spec.js

@@ -0,0 +1,32 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('account recoverPassword()', () => {
+    const userId = 1107;
+
+    const activeCtx = {
+        accessToken: {userId: userId},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    it('should send email with token', async() => {
+        const userId = 1107;
+        const user = await models.Account.findById(userId);
+
+        await models.Account.recoverPassword(user.email);
+
+        const result = await models.AccessToken.findOne({where: {userId: userId}});
+
+        expect(result).toBeDefined();
+    });
+});

back/models/user.js

@@ -0,0 +1,27 @@
+const LoopBackContext = require('loopback-context');
+const {Email} = require('vn-print');
+
+module.exports = function(Self) {
+    Self.on('resetPasswordRequest', async function(info) {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;
+
+        const user = await Self.app.models.Account.findById(info.user.id);
+        const params = {
+            recipient: info.email,
+            lang: user.lang,
+            url: `${origin}/#!/reset-password?access_token=${info.accessToken.id}`
+        };
+
+        const options = Object.assign({}, info.options);
+        for (const param in options)
+            params[param] = options[param];
+
+        const email = new Email(options.emailTemplate, params);
+
+        return email.send();
+    });
+};

db/changes/10470-family/00-accountingType.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`accountingType` ADD daysInFuture INT NULL;
-ALTER TABLE `vn`.`accountingType` MODIFY COLUMN daysInFuture int(11) DEFAULT 0 NULL;
-UPDATE `vn`.`accountingType` SET daysInFuture=1 WHERE id=8;

db/changes/10470-family/00-aclItemType.sql

@@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');

db/changes/10470-family/00-aclMdb.sql

@@ -1,14 +0,0 @@
-CREATE TABLE IF NOT EXISTS `vn`.`mdbBranch` (
-	`name` VARCHAR(255),
-    PRIMARY KEY(`name`)
-);
-
-CREATE TABLE IF NOT EXISTS `vn`.`mdbVersion` (
-	`app` VARCHAR(255) NOT NULL,
-	`branchFk` VARCHAR(255) NOT NULL,
-	`version` INT,
-    CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `vn`.`mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-INSERT IGNORE INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES(318, 'MdbVersion', '*', '*', 'ALLOW', 'ROLE', 'developer');

db/changes/10470-family/00-chat.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`chat` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `senderFk` int(10) unsigned DEFAULT NULL,
-  `recipient` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `dated` date DEFAULT NULL,
-  `checkUserStatus` tinyint(1) DEFAULT NULL,
-  `message` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` tinyint(1) DEFAULT NULL,
-  `attempts` int(1) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `chat_FK` (`senderFk`),
-  CONSTRAINT `chat_FK` FOREIGN KEY (`senderFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

db/changes/10470-family/00-creditInsurance.sql

@@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance` ADD creditClassificationFk int(11) NULL;
-
-UPDATE `vn`.`creditInsurance` AS `destiny`
-   SET `destiny`.`creditClassificationFk`= (SELECT creditClassification FROM `vn`.`creditInsurance` AS `origin` WHERE `origin`.id = `destiny`.id);
-
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10470-family/00-defaultViewConfig.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
-VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}');
-

db/changes/10470-family/00-ticket_doRefund.sql

@@ -1,127 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(OUT vNewTicket INT)
-BEGIN
-/**
- * Crea un ticket de abono a partir de tmp.sale y/o tmp.ticketService
- * 
- * @return vNewTicket
- */  
-	DECLARE vDone BIT DEFAULT 0;
-	DECLARE vClientFk MEDIUMINT;
-	DECLARE vWarehouse TINYINT;
-	DECLARE vCompany MEDIUMINT;
-	DECLARE vAddress MEDIUMINT;
-	DECLARE vRefundAgencyMode INT;
-	DECLARE vItemFk INT;
-	DECLARE vQuantity DECIMAL (10,2);
-	DECLARE vConcept VARCHAR(50);
-	DECLARE vPrice DECIMAL (10,2);
-	DECLARE vDiscount TINYINT;
-	DECLARE vSaleNew INT;
-	DECLARE vSaleMain INT;
-	DECLARE vZoneFk INT;
-	DECLARE vDescription VARCHAR(50);
-	DECLARE vTaxClassFk INT;
-	DECLARE vTicketServiceTypeFk INT;
-	DECLARE vOriginTicket INT;
-
-	DECLARE cSales CURSOR FOR
-		SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
-			FROM tmp.sale s;
-
-	DECLARE cTicketServices CURSOR FOR
-		SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
-			FROM tmp.ticketService ts;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	SELECT sub.ticketFk INTO vOriginTicket
-		FROM (
-			SELECT s.ticketFk
-				FROM tmp.sale s
-			UNION ALL
-			SELECT ts.ticketFk
-				FROM tmp.ticketService ts
-		) sub
-	LIMIT 1;
-
-	SELECT id INTO vRefundAgencyMode
-		FROM agencyMode WHERE `name` = 'ABONO';
-
-	SELECT clientFk, warehouseFk, companyFk, addressFk 
-			INTO vClientFk, vWarehouse, vCompany, vAddress
-		FROM ticket
-		WHERE id = vOriginTicket;
-
-	SELECT id INTO vZoneFk
-		FROM zone WHERE agencyModeFk = vRefundAgencyMode
-		LIMIT 1;
-
-	INSERT INTO vn.ticket (
-			clientFk,
-			shipped,
-			addressFk,
-			agencyModeFk,
-			nickname,
-			warehouseFk,
-			companyFk,
-			landed,
-			zoneFk
-		)
-		SELECT
-					vClientFk,
-					CURDATE(),
-					vAddress,
-					vRefundAgencyMode,
-					a.nickname,
-					vWarehouse,
-					vCompany,
-					CURDATE(),
-					vZoneFk
-			FROM address a
-			WHERE a.id = vAddress;
-
-	SET vNewTicket = LAST_INSERT_ID();
-
-	SET vDone := FALSE;
-	OPEN cSales;
-	FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
-			VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
-	SET vSaleNew = LAST_INSERT_ID();
-
-	INSERT INTO vn.saleComponent(saleFk,componentFk,`value`) 
-		SELECT vSaleNew,componentFk,`value`
-			FROM vn.saleComponent
-			WHERE saleFk = vSaleMain;
-
-		FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	END WHILE;
-	CLOSE cSales;
-
-	SET vDone := FALSE;
-	OPEN cTicketServices;
-	FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.ticketService(description, quantity, price, taxClassFk, ticketFk, ticketServiceTypeFk)
-			VALUES(vDescription, vQuantity, vPrice, vTaxClassFk, vNewTicket, vTicketServiceTypeFk);
-
-		FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	END WHILE;
-	CLOSE cTicketServices;
-
-	INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
-		VALUES(vNewTicket, vOriginTicket);
-END$$
-DELIMITER ;

db/changes/10470-family/01-creditInsuranceTriggers.sql

@@ -1,11 +0,0 @@
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
-	BEFORE INSERT ON `creditInsurance`
-	FOR EACH ROW
-BEGIN
-	IF NEW.creditClassificationFk THEN
-		SET NEW.creditClassification = NEW.creditClassificationFk;
-	END IF;
-END$$
-DELIMITER ;

db/changes/10470-family/01-tableConfig.sql

@@ -1 +0,0 @@
-RENAME TABLE `edi`.`fileConfig` to `edi`.`tableConfig`;

db/changes/10470-family/02-fileConfig.sql

@@ -1,22 +0,0 @@
-CREATE TABLE `edi`.`fileConfig`
-(
-    name     varchar(25)             NOT NULL,
-    checksum text                    NULL,
-    keyValue tinyint(1) default true NOT NULL,
-    constraint fileConfig_pk
-        primary key (name)
-);
-
-create unique index fileConfig_name_uindex
-    on  `edi`.`fileConfig` (name);
-
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('FEC010104', null, 0);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('VBN020101', null, 1);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('florecompc2', null, 1);
-

db/changes/10471-family/00-chat.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`chat` MODIFY COLUMN message TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` MODIFY COLUMN dated DATETIME DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` ADD error TEXT NULL;

db/changes/10472-family/00-creditInsurance.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-ACL.sql

@@ -1,21 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES 
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Sale','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),
-		('ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),
-		('ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),
-		('Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),
-		('Client','updateUser','WRITE','ALLOW','ROLE','salesPerson');
-
-DELETE FROM `salix`.`ACL` WHERE id=313;
-
-UPDATE `salix`.`ACL`
-	SET principalId='invoicing'
-	WHERE id=297;

db/changes/10480-june/00-aclZoneExclusionGeos.sql

@@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ZoneExclusionGeo', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('ZoneExclusionGeo', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');

db/changes/10480-june/00-albaran_gestdoc.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn2008`.`albaran_gestdoc` DROP FOREIGN KEY fk_albaran_gestdoc_gestdoc1;
-ALTER TABLE `vn2008`.`albaran_gestdoc` ADD CONSTRAINT albaran_gestdoc_FK FOREIGN KEY (gestdoc_id) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-client.sql

@@ -1,3 +0,0 @@
-alter table `vn`.`client`
-    add hasIncoterms tinyint(1) default 0 not null comment 'Received incoterms authorization from client';
-

db/changes/10480-june/00-deprecations.sql

@@ -1,13 +0,0 @@
-DROP FUNCTION `account`.`userGetId`;
-DROP FUNCTION `account`.`myUserGetName`;
-DROP FUNCTION `account`.`myUserGetId`;
-DROP FUNCTION `account`.`myUserHasRole`;
-DROP FUNCTION `account`.`myUserHasRoleId`;
-DROP FUNCTION `account`.`userGetName`;
-DROP FUNCTION `account`.`userHasRole`;
-DROP FUNCTION `account`.`userHasRoleId`;
-DROP PROCEDURE `account`.`myUserLogout`;
-DROP PROCEDURE `account`.`userLogin`;
-DROP PROCEDURE `account`.`userLoginWithKey`;
-DROP PROCEDURE `account`.`userLoginWithName`;
-DROP PROCEDURE `account`.`userSetPassword`;

db/changes/10480-june/00-item.sql

@@ -1 +0,0 @@
-ALTER TABLE `vn`.`item` MODIFY COLUMN description TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/changes/10480-june/00-route.sql

@@ -1,10 +0,0 @@
-UPDATE `vn`.`route` r
-      JOIN(SELECT r.id, wl.workcenterFk 
-            FROM `vn`.`route` r     
-              JOIN `vn`.`routeLog` rl ON rl.originFk = r.id
-              JOIN `vn`.`workerLabour` wl ON wl.workerFk = rl.userFk 
-                AND r.created BETWEEN wl.started AND IFNULL(wl.ended, r.created)
-            WHERE r.created BETWEEN '2021-12-01' AND CURDATE()     
-              AND rl.action = 'insert'
-          )sub ON sub.id = r.id 
-    SET r.commissionWorkCenterFk = sub.workcenterFk;

db/changes/10480-june/00-sample.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`sample` (code, description, isVisible, hasCompany, hasPreview, datepickerEnabled)
-VALUES ('incoterms-authorization', 'Autorización de incoterms', 1, 1, 1, 0);

db/changes/10480-june/00-shelving.sql

@@ -1,18 +0,0 @@
-ALTER TABLE `vn`.`itemShelving` DROP FOREIGN KEY itemShelving_fk2;
-ALTER TABLE `vn`.`shelvingLog` DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE `vn`.`smartTag` DROP FOREIGN KEY smartTag_shelving_fk;
-ALTER TABLE `vn`.`workerShelving` DROP FOREIGN KEY workerShelving_shelving_fk;
-
-ALTER TABLE `vn`.`shelving` DROP PRIMARY KEY;
-ALTER TABLE `vn`.`shelving` ADD id INT auto_increment PRIMARY KEY NULL;
-ALTER TABLE `vn`.`shelving` CHANGE id id int(11) auto_increment NOT NULL FIRST;
-ALTER TABLE `vn`.`shelving` ADD CONSTRAINT shelving_UN UNIQUE KEY (code);
-
-ALTER TABLE `vn`.`itemShelving` ADD CONSTRAINT itemShelving_fk2 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE vn.shelvingLog MODIFY COLUMN originFk INT NOT NULL;
-ALTER TABLE vn.shelvingLog ADD CONSTRAINT shelvingLog_FK FOREIGN KEY (originFk) REFERENCES vn.shelving(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-ticketRefund_beforeUpsert.sql

@@ -1,21 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticketRefund_beforeUpsert`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_beforeUpsert`(vRefundTicketFk INT, vOriginalTicketFk INT)
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-	IF vRefundTicketFk = vOriginalTicketFk THEN
-		CALL util.throw('Original ticket and refund ticket has same id');
-	END IF;
-
-    SELECT COUNT(*) INTO vAlreadyExists
-		FROM ticketRefund 
-		WHERE originalTicketFk = vOriginalTicketFk; 
-	
-	IF vAlreadyExists > 0 THEN
-		CALL util.throw('This ticket is already a refund');
-	END IF;
-END$$
-DELIMITER ;

db/changes/10480-june/01-claimObservation.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`claimObservation` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `claimFk` int(10) unsigned NOT NULL,
-  `workerFk` int(10) unsigned DEFAULT NULL,
-  `text` text COLLATE utf8_unicode_ci NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `worker_key` (`workerFk`),
-  KEY `claim_key` (`claimFk`),
-  KEY `claimObservation_created_IDX` (`created`) USING BTREE,
-  CONSTRAINT `claimObservation_ibfk_1` FOREIGN KEY (`claimFk`) REFERENCES `vn`.`claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `claimObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) COMMENT='Todas las observaciones referentes a una reclamación'

db/changes/10480-june/02-claimTextMigration.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`claimObservation` (`claimFk`, `text`, `created`)
-SELECT `id`, `observation`, `created` FROM `vn`.`claim`

db/changes/10480-june/04-aclParking.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Parking','*','*','ALLOW','ROLE','employee')

db/changes/10480-june/04-aclShelving.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Shelving','*','*','ALLOW','ROLE','employee')

db/changes/10481-june/00-aclOsTicket.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('OsTicket', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10481-june/00-aclOsTicketConfig.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('OsTicketConfig', '*', '*', 'ALLOW', 'ROLE', 'it');

db/changes/10481-june/00-osTicketConfig.sql

@@ -1,16 +0,0 @@
-CREATE TABLE `vn`.`osTicketConfig` (
-  `id` int(11) NOT NULL,
-  `host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `oldStatus` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `newStatusId` int(11) DEFAULT NULL,
-  `action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `day` int(11) DEFAULT NULL,
-  `comment` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `hostDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `userDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `passwordDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `portDb` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/changes/224702/00-invoiceInPdf.sql

@@ -1,4 +1,4 @@
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('InvoiceIn', 'invoiceInPdf', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-        ('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+        ('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

db/changes/224902/00-aclUserPassword.sql

@@ -0,0 +1,2 @@
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'UserPassword';

db/changes/224902/00-workerTimeControlMail.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`workerTimeControlMail` CHANGE emailResponse reason text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/changes/224903/00-ACL_notification_InvoiceE.sql

@@ -1,3 +1,2 @@
 INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES 
-		('ShelvingLog','*','READ','ALLOW','ROLE','employee');
+	VALUES ('NotificationQueue','*','*','ALLOW','ROLE','employee');

db/changes/224903/00-aclInvoiceOut.sql

@@ -0,0 +1,7 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('InvoiceOut', 'clientsToInvoice', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('InvoiceOut', 'invoiceClient', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');        

db/changes/224903/00-alter_expedition_itemFk.sql

@@ -0,0 +1 @@
+Alter table `vn`.`expedition` RENAME COLUMN itemFk TO itemFk__;

db/changes/224903/00-clientHasInvoiceElectronic.sql

@@ -0,0 +1,8 @@
+ALTER TABLE
+    `vn`.`client`
+ADD
+    COLUMN `hasElectronicInvoice` TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'Registro de facturas mediante FACe'
+AFTER
+    `hasInvoiceSimplified`;
+
+-- sería más correcto hasElectronicInvoice pero ya existe un campo hasInvoiceSimplified

db/changes/224903/00-collection_missingTrash.sql

@@ -0,0 +1 @@
+DROP PROCEDURE IF EXISTS `vn`.`collection_missingTrash`;

db/changes/224903/00-deleteInvoiceOutQueue.sql

@@ -0,0 +1 @@
+DROP TABLE `vn`.`invoiceOutQueue`;

db/changes/224903/00-editTrackedACL.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Sale', 'editTracked', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Sale', 'editFloramondo', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant');

db/changes/224903/00-greuge.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`greuge` CHANGE `userFK` `userFk` int(10) unsigned DEFAULT NULL NULL;

db/changes/224903/00-insert_notification_invoiceE.sql

@@ -0,0 +1 @@
+insert into `util`.`notification` (`id`, `name`,`description`) values (2, 'invoiceElectronic', 'A electronic invoice has been generated');

db/changes/224903/00-isCompensationACL.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Receipt', 'balanceCompensationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Receipt', 'balanceCompensationPdf', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/224903/00-ticket_canMerge.sql

@@ -0,0 +1,14 @@
+DROP PROCEDURE IF EXISTS `vn`.`ticket_canMerge`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canMerge`(vDated DATE, vScopeDays INT, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
+BEGIN
+ CALL vn.ticket_canbePostponed(vDated,TIMESTAMPADD(DAY, vScopeDays, vDated),vLitersMax,vLinesMax,vWarehouseFk);
+END  $$
+DELIMITER ;
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+VALUES
+    ('Ticket', 'getTicketsFuture', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Ticket', 'merge', 'WRITE', 'ALLOW', 'ROLE', 'employee');

db/changes/224903/00-ticket_canbePostponed.sql

@@ -0,0 +1,79 @@
+DROP PROCEDURE IF EXISTS `vn`.`ticket_canbePostponed`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
+ *
+ * @param vOriginDated Fecha en cuestión
+ * @param vFutureDated Fecha en el futuro a sondear
+ * @param vLitersMax Volumen máximo de los tickets a catapultar
+ * @param vLinesMax Número máximo de lineas de los tickets a catapultar
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+	SELECT 	sv.ticketFk id,
+			GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+			CAST(sum(litros) AS DECIMAL(10,0)) liters,
+			CAST(count(*) AS DECIMAL(10,0)) `lines`,
+			st.name state,
+			sub2.id ticketFuture,
+			t.landed originETD,
+			sub2.landed destETD,
+			sub2.iptd tfIpt,
+			sub2.state tfState,
+			t.clientFk,
+			t.warehouseFk,
+			ts.alertLevel,
+			t.shipped,
+			sub2.shipped tfShipped,
+			t.workerFk,
+			st.code code,
+			sub2.code tfCode
+		FROM vn.saleVolume sv
+			JOIN vn.sale s ON s.id = sv.saleFk
+			JOIN vn.item i ON i.id = s.itemFk
+			JOIN vn.ticket t ON t.id = sv.ticketFk
+			JOIN vn.address a ON a.id = t.addressFk
+			JOIN vn.province p ON p.id = a.provinceFk
+			JOIN vn.country c ON c.id = p.countryFk
+			JOIN vn.ticketState ts ON ts.ticketFk = t.id
+			JOIN vn.state st ON st.id = ts.stateFk
+			JOIN vn.alertLevel al ON al.id = ts.alertLevel
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN (
+				SELECT *
+					FROM (
+						SELECT
+							t.addressFk ,
+							t.id,
+							t.landed,
+							t.shipped,
+							st.name state,
+							st.code code,
+							GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
+							FROM vn.ticket t
+								JOIN vn.ticketState ts ON ts.ticketFk = t.id
+								JOIN vn.state st ON st.id = ts.stateFk
+								JOIN vn.sale s ON s.ticketFk = t.id
+								JOIN vn.item i ON i.id = s.itemFk
+							WHERE t.shipped BETWEEN vFutureDated
+											AND util.dayend(vFutureDated)
+								AND t.warehouseFk = vWarehouseFk
+							GROUP BY t.id
+					) sub
+					GROUP BY sub.addressFk
+				) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
+		WHERE t.shipped BETWEEN vOriginDated AND util.dayend(vOriginDated)
+			AND t.warehouseFk = vWarehouseFk
+			AND al.code = 'FREE'
+			AND tp.ticketFk IS NULL
+		GROUP BY sv.ticketFk
+		HAVING liters <= IFNULL(vLitersMax, 9999) AND `lines` <= IFNULL(vLinesMax, 9999) AND ticketFuture;
+END$$
+DELIMITER ;
+

db/changes/224903/00-timeBusiness_calculate.sql

@@ -0,0 +1,88 @@
+DROP PROCEDURE IF EXISTS `vn`.`timeBusiness_calculate`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+/**
+ * Horas que debe trabajar un empleado según contrato y día.
+ * @param vDatedFrom workerTimeControl
+ * @param vDatedTo workerTimeControl
+ * @table tmp.user(userFk)
+ * @return tmp.timeBusinessCalculate
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate;
+	CREATE TEMPORARY TABLE tmp.timeBusinessCalculate
+			(INDEX (departmentFk))
+		SELECT dated,
+				businessFk,
+				userFk,
+				departmentFk,
+				hourStart,
+				hourEnd,
+				timeTable,
+				timeWorkSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeWorkSexagesimal,
+				timeWorkSeconds / 3600 timeWorkDecimal,
+				timeWorkSeconds timeBusinessSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeBusinessSexagesimal,
+				timeWorkSeconds / 3600 timeBusinessDecimal,
+				name type,
+				permissionRate,
+				hoursWeek,
+				discountRate,
+				isAllowedToWork
+			FROM(SELECT t.dated,
+						b.id businessFk,
+						w.userFk,
+						b.departmentFk,
+						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5) ORDER BY j.start ASC SEPARATOR ' - ')) hourStart ,
+						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) hourEnd,
+						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5), " - ",  LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) timeTable,
+						IF(j.start = NULL, 0, IFNULL(SUM(TIME_TO_SEC(j.end)) - SUM(TIME_TO_SEC(j.start)), 0)) timeWorkSeconds,
+						at2.name,
+						at2.permissionRate,
+						at2.discountRate,
+						cl.hours_week hoursWeek,
+						at2.isAllowedToWork
+					FROM time t
+						LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
+						LEFT JOIN worker w ON w.id = b.workerFk
+						JOIN tmp.`user` u ON u.userFK = w.userFK
+						LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
+						LEFT JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk
+						LEFT JOIN postgresql.journey j ON j.business_id = b.id AND j.day_id = WEEKDAY(t.dated) + 1
+						LEFT JOIN postgresql.calendar_employee ce ON ce.businessFk = b.id AND ce.date = t.dated
+						LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+					WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+					GROUP BY w.userFk, t.dated
+				)sub;
+
+	UPDATE tmp.timeBusinessCalculate t
+		LEFT JOIN  postgresql.journey j ON j.business_id = t.businessFk
+		SET t.timeWorkSeconds = t.hoursWeek / 5 * 3600,
+			t.timeWorkSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeWorkDecimal =  t.hoursWeek / 5,
+			t.timeBusinessSeconds = t.hoursWeek / 5 * 3600,
+			t.timeBusinessSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeBusinessDecimal = t.hoursWeek / 5
+		WHERE DAYOFWEEK(t.dated) IN(2,3,4,5,6) AND j.journey_id IS NULL  ;
+
+	UPDATE tmp.timeBusinessCalculate t
+		SET t.timeWorkSeconds = t.timeWorkSeconds - (t.timeWorkSeconds * permissionRate)  ,
+			t.timeWorkSexagesimal = SEC_TO_TIME ((t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)) * 3600),
+			t.timeWorkDecimal = t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)
+		WHERE permissionRate <> 0;
+
+	UPDATE tmp.timeBusinessCalculate t
+			JOIN calendarHolidays ch ON ch.dated = t.dated
+			JOIN business b ON b.id = t.businessFk
+				AND b.workcenterFk = ch.workcenterFk
+		SET t.timeWorkSeconds = 0,
+			t.timeWorkSexagesimal = 0,
+			t.timeWorkDecimal = 0,
+			t.permissionrate = 1,
+			t.type = 'Festivo'
+		WHERE t.type IS NULL;
+END$$
+DELIMITER ;

db/changes/224903/01-updateClientHasInvoiceElectronic.sql

@@ -0,0 +1,6 @@
+UPDATE
+    `vn`.`client`
+SET
+    hasElectronicInvoice = TRUE
+WHERE
+    businessTypeFk = 'officialOrganism';

db/changes/225001/.gitkeep

@@ -0,0 +1 @@
+Delete this file

db/docker.js

@@ -47,12 +47,8 @@ module.exports = class Docker {
         if (ci) network = `--network="${networkName}"`;
 
         log('Starting container...');
-        const container = await this.execP(`
-            docker run \
-                ${network} \
-                --env RUN_CHOWN=${runChown} \
-                -d ${dockerArgs} salix-db
-        `);
+        const container = await this.execP(
+            `docker run ${network} --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
         this.id = container.stdout.trim();
 
         try {

db/dump/dumpedFixtures.sql

@@ -22,7 +22,7 @@ USE `util`;
 
 LOCK TABLES `config` WRITE;
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
-INSERT INTO `config` VALUES (1,'10480',0,'production',NULL);
+INSERT INTO `config` VALUES (1,'224602',0,'production',NULL);
 /*!40000 ALTER TABLE `config` ENABLE KEYS */;
 UNLOCK TABLES;
 

db/dump/fixtures.sql

@@ -686,7 +686,10 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (24 ,NULL,  8,  1, 7,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,       0, 5,      5, 1, util.VN_CURDATE()),
         (25 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
         (26 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'An incredibly long alias for testing purposes', 1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,       0, 1,      5, 1, util.VN_CURDATE());
+        (27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
+        (28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
+        (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
+        (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
@@ -918,7 +921,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
         (3, 'Perdida', 'LOST');
 
 
-INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
+INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk__`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
     VALUES
         (1,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  15,      1,  18, 'UR9000006041',   94, 1,   'pc1'),
         (2,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  16,      2,  18, 'UR9000006041',   94, 1,   NULL),
@@ -984,7 +987,10 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (30, 4, 18, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (31, 2, 23, 'Melee weapon combat fist 15cm',    -5, 7.08,   0, 0, 0, util.VN_CURDATE()),
         (32, 1, 24, 'Ranged weapon longbow 2m',         -1, 8.07,   0, 0, 0, util.VN_CURDATE()),
-        (33, 5, 14, 'Ranged weapon pistol 9mm',          50, 1.79,   0, 0, 0, util.VN_CURDATE());
+        (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE()),
+        (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
     VALUES
@@ -1146,10 +1152,11 @@ INSERT INTO `vncontrol`.`accion`(`accion_id`, `accion`)
 
 INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `actionFk`, `id`, `stateFk`)
     VALUES
-        (1, 0, util.VN_CURDATE(), 5,  55, 3, 1, 14),
-        (1, 1, util.VN_CURDATE(), 5,  54, 3, 2, 8),
-        (2, 1, util.VN_CURDATE(), 10, 40, 4, 3, 8),
-        (3, 1, util.VN_CURDATE(), 2,  40, 4, 4, 8);
+        (1,     0,  util.VN_CURDATE(), 5,  55, 3, 1, 14),
+        (1,     1,  util.VN_CURDATE(), 5,  54, 3, 2, 8),
+        (2,     1,  util.VN_CURDATE(), 10, 40, 4, 3, 8),
+        (3,     1,  util.VN_CURDATE(), 2,  40, 4, 4, 8),
+        (31,    1,  util.VN_CURDATE(), -5,  40, 4, 5, 8);
 
 INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`)
     VALUES
@@ -1356,7 +1363,8 @@ INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
         (2, 1),
         (3, 2),
         (4, 4),
-        (5, 6);
+        (5, 6),
+        (15, 6);
 
 INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`)
     VALUES
@@ -1851,7 +1859,8 @@ INSERT INTO `vn`.`receipt`(`id`, `invoiceFk`, `amountPaid`, `payed`, `workerFk`,
         (1, 'Cobro web',            100.50, util.VN_CURDATE(),                             9, 1, 1101, util.VN_CURDATE(),                             442, 1),
         (2, 'Cobro web',            200.50, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY),  9, 1, 1101, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY),  442, 1),
         (3, 'Cobro en efectivo',    300.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 9, 1, 1102, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), 442, 0),
-        (4, 'Cobro en efectivo',    400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 1, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0);
+        (4, 'Cobro en efectivo',    400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 1, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0),
+        (5, 'Compensación',         400.00, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 9, 3, 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), 442, 0);
 
 INSERT INTO `vn`.`workerTeam`(`id`, `team`, `workerFk`)
     VALUES
@@ -2267,12 +2276,16 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`)
     VALUES
         (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR));
 
-INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`)
+INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `isSendMail`)
     VALUES
-        (1106, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in'),
-        (1106, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle'),
-        (1106, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle'),
-        (1106, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out');
+        (1106, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in',     0),
+        (1106, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 0),
+        (1106, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 0),
+        (1106, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out',    0),
+        (1107, CONCAT(util.VN_CURDATE(), ' 07:00'), TRUE, 'in',     1),
+        (1107, CONCAT(util.VN_CURDATE(), ' 10:00'), TRUE, 'middle', 1),
+        (1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1),
+        (1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out',    1);
 
 INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`, `code`)
     VALUES
@@ -2551,10 +2564,6 @@ UPDATE `vn`.`route`
 UPDATE `vn`.`route`
     SET `invoiceInFk`=2
     WHERE `id`=2;
-INSERT INTO `bs`.`salesPerson` (`workerFk`, `year`, `month`, `portfolioWeight`)
-    VALUES
-        (18,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  807.23),
-        (19,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  34.40);
 
 INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
     VALUES
@@ -2708,10 +2717,18 @@ INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `lev
     VALUES
         (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
 
+INSERT INTO `vn`.`saleCloned` (`saleClonedFk`, `saleOriginalFk`)
+    VALUES
+        (29, 25);
+
 UPDATE `account`.`user`
     SET `hasGrant` = 1
         WHERE `id` = 66;
 
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
-        (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
+        (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
+
+INSERT INTO `vn`.`ticketLog` (`id`, `originFk`, `userFk`, `action`, `changedModel`, `oldInstance`, `newInstance`, `changedModelId`)
+    VALUES
+        (1, 1, 9, 'insert', 'Ticket', '{}', '{"clientFk":1, "nickname": "Bat cave"}', 1);

db/dump/structure.sql

@@ -19,6 +19,7 @@
 -- Current Database: `account`
 --
 
+
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `account` /*!40100 DEFAULT CHARACTER SET utf8mb3 */;
 
 USE `account`;
@@ -27518,7 +27519,7 @@ CREATE TABLE `expedition` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `agencyModeFk` int(11) NOT NULL,
   `ticketFk` int(10) NOT NULL,
-  `isBox` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
+  `freightItemFk` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
   `created` timestamp NULL DEFAULT current_timestamp(),
   `isRefund__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
   `isPickUp__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
@@ -27534,7 +27535,7 @@ CREATE TABLE `expedition` (
   `hasNewRoute` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`id`),
   KEY `index1` (`agencyModeFk`),
-  KEY `index2` (`isBox`),
+  KEY `index2` (`freightItemFk`),
   KEY `index3` (`created`),
   KEY `index4` (`ticketFk`),
   KEY `expedition_fk3_idx` (`packagingFk`),
@@ -27567,7 +27568,7 @@ BEGIN
 
     DECLARE vShipFk INT;
 
-	IF NEW.isBox > 0 THEN
+	IF NEW.freightItemFk > 0 THEN
 
 		UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
 
@@ -27638,7 +27639,7 @@ DELIMITER ;;
 BEGIN
     UPDATE ticket t
         SET packages = (SELECT COUNT(counter)-1
-		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.isBox)
+		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
 		WHERE t.id = OLD.ticketFk;
 
 END */;;
@@ -36287,7 +36288,7 @@ CREATE TABLE `sorter` (
   `created` datetime NOT NULL,
   `routeFk` int(10) unsigned NOT NULL,
   `ticketFk` int(10) NOT NULL,
-  `isBox` int(11) DEFAULT 1,
+  `freightItemFk` int(11) DEFAULT 1,
   `itemFk` int(11) DEFAULT NULL,
   `width` decimal(10,2) DEFAULT 0.00,
   `depth` decimal(10,2) DEFAULT 0.00,
@@ -44956,7 +44957,7 @@ BEGIN
 		SELECT SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) INTO deliveryPrice
 			FROM vn.ticket t
 				LEFT JOIN expedition e ON e.ticketFk = t.id
-				JOIN expeditionBoxVol ebv ON ebv.boxFk = e.isBox
+				JOIN expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
 			WHERE t.id = vTicketFk;
 
 	END IF;
@@ -46492,7 +46493,7 @@ BEGIN
 			LEFT JOIN item i ON i.id = b.itemFk
 			LEFT JOIN itemType it ON it.id = i.typeFk
 			LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-			LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox
+			LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.freightItemFk
 			JOIN volumeConfig vc ON TRUE
 		WHERE b.id = vSelf;
 
@@ -53229,7 +53230,7 @@ BEGIN
 			INNER JOIN vn.ticketState ts ON ts.ticketFk = exp.ticketFk
 			LEFT JOIN vn.address a ON t.addressFk = a.id
 			LEFT JOIN vn.warehouse w ON t.warehouseFk = w.id
-		WHERE t.routeFk = vRouteFk AND exp.isBox > 0;
+		WHERE t.routeFk = vRouteFk AND exp.freightItemFk > 0;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -53760,7 +53761,7 @@ BEGIN
 						GROUP BY sub.ticketFk
 						) sub2 ON sub2.ticketFk = t.id
 			LEFT JOIN expeditionStateType est ON est.id  = e.stateTypeFk
-		WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE
+		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END ;;
 DELIMITER ;
@@ -81043,4 +81044,3 @@ USE `vncontrol`;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 -- Dump completed on 2022-09-16 10:44:31
-