Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

.eslintrc.yml

@@ -1,6 +1,6 @@
 extends: [eslint:recommended, google, plugin:jasmine/recommended]
 parserOptions:
-    ecmaVersion: 2018
+    ecmaVersion: 2020
     sourceType: "module"
 plugins:
     - jasmine

CHANGELOG.md

@@ -5,13 +5,57 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2326.01] - 2023-06-29
+
+### Added
+
+### Changed
+
+### Fixed
+-
+
+## [2324.01] - 2023-06-08
+
+### Added
+- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
+- (General -> Desplegables) Mejorada eficiencia de carga de datos
+- (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
+- (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
+- (General -> Históricos) Filtro por cambios
+
+### Changed
+- (General -> Permisos) Mejorada seguridad
+- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
+
+### Fixed
+-
+
+
+
+## [2322.01] - 2023-06-01
+
+### Added
+- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
+- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
+- (Trabajadores -> Nuevo trabajador) Permite elegir el método de pago
+
+### Changed
+- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
+
+### Fixed
+- (Tickets -> Líneas) Se permite hacer split de líneas al mismo ticket
+- (Tickets -> Cambiar estado) Ahora muestra la lista completa de todos los estados
+
+
+
 ## [2320.01] - 2023-05-25
 
 ### Added
--
+- (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
+
 
 ### Changed
--
+- (Trabajadores -> Nuevo trabajador) Los clientes se crean sin 'TR' pero se añade tipo de negocio 'Trabajador'
 
 ### Fixed
 -
@@ -23,13 +67,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Usuarios -> Histórico) Nueva sección
 - (Roles -> Histórico) Nueva sección
-- (General -> Traducciones) Correo de bienvenida a clientes al portugués y al francés
+- (Trabajadores -> Dar de alta) Permite elegir el método de pago
 
 ### Changed
 - (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
+- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
 
 ### Fixed
 - (Ticket -> Boxing) Arreglado selección de horas
+- (Cesta -> Índice) Optimizada búsqueda
 
 
 

Dockerfile

@@ -11,9 +11,9 @@ RUN apt-get update \
         ca-certificates \
         gnupg2 \
         graphicsmagick \
-    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g npm@8.19.2
+    && npm install -g npm@9.6.6
 
 # Puppeteer
 

Jenkinsfile

@@ -39,7 +39,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                     sh 'npm install --no-audit --prefer-offline'
                     sh 'gulp install --ci'
                 }
@@ -57,14 +57,14 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v14') {
+                        nodejs('node-v20') {
                             sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=2'
                         }
                     }
                 }
                 stage('Backend') {
                     steps {
-                        nodejs('node-v14') {
+                        nodejs('node-v20') {
                             sh 'npm run test:back:ci'
                         }
                     }
@@ -80,7 +80,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                     sh 'gulp build'
                 }
 

back/locale/account/es.yml

@@ -1,17 +0,0 @@
-name: cuenta
-columns:
-    id: id
-    name: nombre
-    roleFk: rol
-    nickname: apodo
-    lang: idioma
-    password: contraseña
-    bcryptPassword: contraseña bcrypt
-    active: activo
-    email: email
-    emailVerified: email verificado
-    created: creado
-    updated: actualizado
-    image: imagen
-    hasGrant: tiene permiso
-    userFk: usuario

back/methods/collection/newCollection.js

@@ -30,11 +30,11 @@ module.exports = Self => {
 
     Self.newCollection = async(ctx, collectionFk, sectorFk, vWagons) => {
         let query = '';
+        const userId = ctx.req.accessToken.userId;
 
         if (!collectionFk) {
-            const userId = ctx.req.accessToken.userId;
             query = `CALL vn.collectionTrain_newBeta(?,?,?)`;
-            const [result] = await Self.rawSql(query, [sectorFk, vWagons, userId]);
+            const [result] = await Self.rawSql(query, [sectorFk, vWagons, userId], {userId});
             if (result.length == 0)
                 throw new Error(`No collections for today`);
 
@@ -42,16 +42,16 @@ module.exports = Self => {
         }
 
         query = `CALL vn.collectionTicket_get(?)`;
-        const [tickets] = await Self.rawSql(query, [collectionFk]);
+        const [tickets] = await Self.rawSql(query, [collectionFk], {userId});
 
         query = `CALL vn.collectionSale_get(?)`;
-        const [sales] = await Self.rawSql(query, [collectionFk]);
+        const [sales] = await Self.rawSql(query, [collectionFk], {userId});
 
         query = `CALL vn.collectionPlacement_get(?)`;
-        const [placements] = await Self.rawSql(query, [collectionFk]);
+        const [placements] = await Self.rawSql(query, [collectionFk], {userId});
 
         query = `CALL vn.collectionSticker_print(?,?)`;
-        await Self.rawSql(query, [collectionFk, sectorFk]);
+        await Self.rawSql(query, [collectionFk, sectorFk], {userId});
 
         return makeCollection(tickets, sales, placements, collectionFk);
     };

back/methods/docuware/deliveryNoteEmail.js

@@ -4,25 +4,25 @@ module.exports = Self => {
     Self.remoteMethodCtx('deliveryNoteEmail', {
         description: 'Sends the delivery note email with an docuware attached PDF',
         accessType: 'WRITE',
+        accessScopes: ['docuwareDeliveryNoteEmail'],
         accepts: [
             {
                 arg: 'id',
-                type: 'string',
+                type: 'number',
                 required: true,
                 description: 'The ticket id',
-                http: {source: 'path'}
-            },
-            {
-                arg: 'recipient',
-                type: 'string',
-                description: 'The recipient email',
-                required: true,
             },
             {
                 arg: 'recipientId',
                 type: 'number',
                 description: 'The client id',
-                required: false
+                required: true
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: false,
             }
         ],
         returns: [
@@ -41,12 +41,13 @@ module.exports = Self => {
             }
         ],
         http: {
-            path: '/:id/delivery-note-email',
+            path: '/delivery-note-email',
             verb: 'POST'
         }
     });
 
-    Self.deliveryNoteEmail = async(ctx, id) => {
+    Self.deliveryNoteEmail = async(ctx, id, recipientId, recipient) => {
+        const models = Self.app.models;
         const args = Object.assign({}, ctx.args);
         const params = {
             recipient: args.recipient,
@@ -57,9 +58,14 @@ module.exports = Self => {
         for (const param in args)
             params[param] = args[param];
 
+        if (!recipient) {
+            client = await models.Client.findById(recipientId, {fields: ['email']});
+            params.recipient = client.email;
+        }
+
         const email = new Email('delivery-note', params);
 
-        const docuwareFile = await Self.app.models.Docuware.download(ctx, id, 'deliveryNote');
+        const docuwareFile = await models.Docuware.download(ctx, id, 'deliveryNote');
 
         return email.send({
             overrideAttachments: true,

back/methods/edi/sql/item.sql

@@ -1,9 +1,9 @@
 LOAD DATA LOCAL INFILE ?
 	INTO TABLE `edi`.`item`
+	CHARACTER SET ascii
 	FIELDS TERMINATED BY ';'
 	LINES TERMINATED BY '\n' (@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11, @col12)
-	SET
-		id = @col2,
+	SET id = @col2,
 		product_name = @col4,
 		name = @col5,
 		plant_id = @col7,
@@ -11,3 +11,4 @@ LOAD DATA LOCAL INFILE ?
 		entry_date = STR_TO_DATE(@col10, '%Y%m%d'),
 		expiry_date = IFNULL(NULL,STR_TO_DATE(@col11, '%Y%m%d')),
 		change_date_time = STR_TO_DATE(@col12, '%Y%m%d%H%i')
+		

back/methods/edi/updateData.js

@@ -16,14 +16,14 @@ module.exports = Self => {
         }
     });
 
-    Self.updateData = async() => {
+    Self.updateData = async ctx => {
         const models = Self.app.models;
 
         // Get files checksum
         const tx = await Self.beginTransaction({});
 
         try {
-            const options = {transaction: tx};
+            const options = {transaction: tx, userId: ctx.req.accessToken.userId};
             const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
 
             const updatableFiles = [];
@@ -53,9 +53,9 @@ module.exports = Self => {
             const fileNames = updatableFiles.map(file => file.name);
 
             const tables = await Self.rawSql(`
-                SELECT fileName, toTable, file
-                    FROM edi.tableConfig
-                WHERE file IN (?)`, [fileNames], options);
+				SELECT fileName, toTable, file
+					FROM edi.tableConfig
+				WHERE file IN (?)`, [fileNames], options);
 
             for (const table of tables) {
                 const fileName = table.file;
@@ -85,9 +85,9 @@ module.exports = Self => {
             for (const file of updatableFiles) {
                 console.log(`Updating file ${file.name} checksum...`);
                 await Self.rawSql(`
-                        UPDATE edi.fileConfig
-                            SET checksum = ?
-                        WHERE name = ?`,
+						UPDATE edi.fileConfig
+							SET checksum = ?
+						WHERE name = ?`,
                 [file.checksum, file.name], options);
             }
 
@@ -121,7 +121,8 @@ module.exports = Self => {
                 host: ftpConfig.host,
                 username: ftpConfig.user,
                 password: ftpConfig.password,
-                procotol: 'ftp'
+                procotol: 'ftp',
+                additionalLftpCommands: 'set ssl:verify-certificate no'
             });
         }
 
@@ -132,7 +133,7 @@ module.exports = Self => {
         const ftpClient = await getFtpClient();
         console.debug(`Checking checksum for file ${file.name}...`);
 
-        ftpClient.cat(`codes/${file.name}.txt`);
+        ftpClient.cat(`codes/${file.name}.TXT`);
 
         const response = await new Promise((resolve, reject) => {
             ftpClient.exec((err, response) => {
@@ -227,10 +228,10 @@ module.exports = Self => {
 
             await Self.rawSql(sqlTemplate, [filePath], options);
             await Self.rawSql(`
-                        UPDATE edi.tableConfig
-                            SET updated = ?
-                        WHERE fileName = ?
-                `, [Date.vnNew(), baseName], options);
+						UPDATE edi.tableConfig
+							SET updated = ?
+						WHERE fileName = ?
+				`, [Date.vnNew(), baseName], options);
         }
 
         console.log(`Updated table ${toTable}\n`);

back/methods/image/download.js

@@ -67,7 +67,7 @@ module.exports = Self => {
 
         if (!image) return false;
 
-        const hasReadRole = models.ImageCollection.hasReadRole(ctx, collection);
+        const hasReadRole = await models.ImageCollection.hasReadRole(ctx, collection);
         if (!hasReadRole)
             throw new UserError(`You don't have enough privileges`);
 

back/methods/vn-user/acl.js

@@ -23,13 +23,7 @@ module.exports = Self => {
         let models = Self.app.models;
 
         let user = await Self.findById(userId, {
-            fields: ['id', 'name', 'nickname', 'email', 'lang'],
-            include: {
-                relation: 'userConfig',
-                scope: {
-                    fields: ['darkMode']
-                }
-            }
+            fields: ['id', 'name', 'nickname', 'email', 'lang']
         });
 
         let roles = await models.RoleMapping.find({

back/models/image-collection.js

@@ -9,10 +9,11 @@ module.exports = Self => {
      * @return {boolean} True for user with read privileges
      */
     Self.hasReadRole = async(ctx, name, options) => {
-        const collection = await Self.findOne({where: {name}}, {
+        const collection = await Self.findOne({
             include: {
                 relation: 'readRole'
-            }
+            },
+            where: {name}
         }, options);
 
         return await hasRole(ctx, collection, options);

back/tests.js

@@ -34,6 +34,8 @@ async function test() {
         app.boot(bootOptions,
             err => err ? reject(err) : resolve());
     });
+    // FIXME: Workaround to wait for loopback to be ready
+    await app.models.Application.status();
 
     const Jasmine = require('jasmine');
     const jasmine = new Jasmine();

db/Dockerfile

@@ -1,9 +1,10 @@
-FROM mariadb:10.7.3
+FROM mariadb:10.7.5
 
 ENV MYSQL_ROOT_PASSWORD root
 ENV TZ Europe/Madrid
-
+ARG MOCKDATE=2001-01-01 11:00:00
 ARG DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends curl ca-certificates \
     && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
@@ -31,14 +32,15 @@ COPY \
     import-changes.sh \
     config.ini \
     dump/mysqlPlugins.sql \
-    dump/mockDate.sql \
     dump/structure.sql \
+    dump/mockDate.sql \
     dump/dumpedFixtures.sql \
     ./
 RUN gosu mysql docker-init.sh \
     && docker-dump.sh mysqlPlugins \
-    && docker-dump.sh mockDate \
     && docker-dump.sh structure \
+    && sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
+    && docker-dump.sh mockDate \
     && docker-dump.sh dumpedFixtures \
     && gosu mysql docker-temp-stop.sh
 

db/changes/231201/00-wagon.sql

@@ -56,8 +56,6 @@ CREATE TABLE `vn`.`collectionWagonTicket` (
 
 ALTER TABLE `vn`.`wagon` ADD `typeFk` int(11) unsigned NOT NULL;
 ALTER TABLE `vn`.`wagon` ADD `label` int(11) unsigned NOT NULL;
-ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;
-
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('WagonType', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
@@ -70,3 +68,4 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
         ('WagonType', 'createWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'),
         ('WagonType', 'deleteWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'),
         ('WagonType', 'editWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi');
+

db/changes/231801/00-client_setRatingAcl.sql

@@ -27,7 +27,6 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
 		('Client', 'summary', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'updateAddress', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'updateFiscalData', '*', 'ALLOW', 'ROLE', 'employee'),
-		('Client', 'updateUser', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'uploadFile', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'campaignMetricsPdf', '*', 'ALLOW', 'ROLE', 'employee'),
 		('Client', 'campaignMetricsEmail', '*', 'ALLOW', 'ROLE', 'employee'),

db/changes/231801/00-optimiceZoneEstimatedDelivery.sql

@@ -0,0 +1,77 @@
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`zoneEstimatedDelivery` AS
+select
+    `t`.`zoneFk` AS `zoneFk`,
+    cast(`util`.`VN_CURDATE`() + interval hour(ifnull(`zc`.`hour`, `z`.`hour`)) * 60 + minute(ifnull(`zc`.`hour`, `z`.`hour`)) minute as time) AS `hourTheoretical`,
+    cast(sum(`sv`.`volume`) as decimal(5, 1)) AS `totalVolume`,
+    cast(sum(if(`s`.`alertLevel` < 2, `sv`.`volume`, 0)) as decimal(5, 1)) AS `remainingVolume`,
+    greatest(
+        ifnull(`lhp`.`m3`, 0),
+        ifnull(`dl`.`minSpeed`, 0)
+    ) AS `speed`,
+    cast(`zc`.`hour` + interval -sum(if(`s`.`alertLevel` < 2, `sv`.`volume`, 0)) * 60 / greatest(ifnull(`lhp`.`m3`, 0), ifnull(`dl`.`minSpeed`, 0)) minute as time) AS `hourEffective`,
+    floor(-sum(if(`s`.`alertLevel` < 2, `sv`.`volume`, 0)) * 60 / greatest(ifnull(`lhp`.`m3`, 0), ifnull(`dl`.`minSpeed`, 0))) AS `minutesLess`,
+    cast(`zc`.`hour` + interval -sum(if(`s`.`alertLevel` < 2, `sv`.`volume`, 0)) * 60 / greatest(ifnull(`lhp`.`m3`, 0), ifnull(`dl`.`minSpeed`, 0)) minute as time) AS `etc`
+from
+    (
+        (
+            (
+                (
+                    (
+                        (
+                            (
+                                (
+                                    (
+                                        `vn`.`ticket` `t`
+                                    join `vn`.`ticketStateToday` `tst` on
+                                        (
+                                            `tst`.`ticket` = `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`()
+        )
+    )
+where
+    `w`.`hasProduction` <> 0
+    and cast(`t`.`shipped` as date) = `util`.`VN_CURDATE`()
+group by
+    `t`.`zoneFk`;

db/changes/231801/00-ticketConfig.sql

@@ -1 +1 @@
-ALTER TABLE `vn`.`ticketConfig` ADD daysForWarningClaim INT DEFAULT 2 NOT NULL COMMENT 'dias restantes hasta que salte el aviso de reclamación fuerade plazo';
+ALTER TABLE `vn`.`ticketConfig` ADD daysForWarningClaim INT DEFAULT 2 NOT NULL COMMENT 'dias restantes hasta que salte el aviso de reclamación fuera de plazo';

db/changes/231801/01-viewCompany10L.sql

@@ -0,0 +1,12 @@
+-- vn.companyL10n source
+
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`companyL10n` AS
+select
+    `c`.`id` AS `id`,
+    ifnull(`ci`.`footnotes`, `c`.`footnotes`) AS `footnotes`
+from
+    (`vn`.`company` `c`
+left join `vn`.`companyI18n` `ci` on
+    (`ci`.`companyFk` = `c`.`id`
+        and `ci`.`lang` = `util`.`LANG`()));

db/changes/232001/00-clientWorkerName.sql

@@ -0,0 +1,73 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clientCreate`(
+	vFirstname VARCHAR(50),
+    vSurnames VARCHAR(50), 
+    vFi VARCHAR(9), 
+    vAddress TEXT, 
+    vPostcode CHAR(5),
+    vCity VARCHAR(25),
+    vProvinceFk SMALLINT(5),
+    vCompanyFk SMALLINT(5),
+    vPhone VARCHAR(11),
+    vEmail VARCHAR(255),
+    vUserFk INT)
+BEGIN
+/**
+ * Create new client
+ *
+ */
+    DECLARE vPayMethodFk INT DEFAULT 4;
+    DECLARE vDueDay INT DEFAULT 5;
+    DECLARE vDefaultCredit DECIMAL(10, 2) DEFAULT 300.00;
+    DECLARE vIsTaxDataChecked TINYINT(1) DEFAULT 1;
+	DECLARE vHasCoreVnl BOOLEAN DEFAULT TRUE;
+    DECLARE vMandateTypeFk INT DEFAULT 2;
+    
+	INSERT INTO `client` (
+			id,
+			name,
+			street,
+			fi,
+			phone,
+			email,
+			provinceFk,
+			city,
+			postcode,
+			socialName,
+			payMethodFk,
+			dueDay,
+			credit,
+			isTaxDataChecked,
+			hasCoreVnl,
+			isEqualizated)
+		VALUES (
+			vUserFk,
+			CONCAT(vFirstname, ' ', vSurnames),
+			vAddress,
+			TRIM(vFi),
+			vPhone,
+			vEmail,
+			vProvinceFk,
+			vCity,
+			vPostcode,
+			CONCAT(vSurnames, ' ', vFirstname), 
+			vPayMethodFk,
+			vDueDay,
+			vDefaultCredit,
+			vIsTaxDataChecked,
+			vHasCoreVnl,
+			FALSE
+		) ON duplicate key update  
+            payMethodFk = vPayMethodFk,
+			dueDay = vDueDay,
+			credit = vDefaultCredit,
+			isTaxDataChecked = vIsTaxDataChecked,
+			hasCoreVnl = vHasCoreVnl,
+            isActive = TRUE;
+	
+    IF (SELECT COUNT(*) FROM mandate WHERE clientFk = vUserFk AND companyFk = vCompanyFk AND mandateTypeFk = vMandateTypeFk) = 0 THEN
+		INSERT INTO mandate (clientFk, companyFk, mandateTypeFk)
+			VALUES (vUserFk, vCompanyFk, vMandateTypeFk);
+	END IF;
+END$$
+DELIMITER ;

db/changes/232001/00-createWorker.sql

@@ -0,0 +1,14 @@
+INSERT INTO `vn`.`businessType` (`code`, `description`)
+	VALUES ('worker','Trabajador');
+
+ALTER TABLE `vn`.`workerConfig` ADD businessTypeFk varchar(100) NULL
+    COMMENT 'Tipo de negocio por defecto al dar de alta un trabajador nuevo';
+
+UPDATE `vn`.`workerConfig`
+    SET businessTypeFk = 'worker'
+    WHERE id = 1;
+
+ UPDATE `vn`.`client` c
+ 	    JOIN `vn`.`worker` w ON w.id = c.id
+	SET c.name = REPLACE(c.name, 'TR ', ''),
+	    c.businessTypeFk = 'worker';

db/changes/232001/00-invoiceOut_new.sql

@@ -0,0 +1,254 @@
+DROP PROCEDURE IF EXISTS `vn`.`invoiceOut_new`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
+	vSerial VARCHAR(255),
+	vInvoiceDate DATE,
+	vTaxArea VARCHAR(25),
+	OUT vNewInvoiceId INT)
+BEGIN
+/**
+ * Creación de facturas emitidas.
+ * requiere previamente tabla tmp.ticketToInvoice(id).
+ *
+ * @param vSerial serie a la cual se hace la factura
+ * @param vInvoiceDate fecha de la factura
+ * @param vTaxArea tipo de iva en relacion a la empresa y al cliente
+ * @param vNewInvoiceId id de la factura que se acaba de generar
+ * @return vNewInvoiceId
+ */
+	DECLARE vIsAnySaleToInvoice BOOL;
+	DECLARE vIsAnyServiceToInvoice BOOL;
+	DECLARE vNewRef VARCHAR(255);
+	DECLARE vWorker INT DEFAULT account.myUser_getId();
+	DECLARE vCompanyFk INT;
+	DECLARE vInterCompanyFk INT;
+	DECLARE vClientFk INT;
+	DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
+	DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
+	DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
+	DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
+	DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
+	DECLARE vNewInvoiceInFk INT;
+	DECLARE vIsInterCompany BOOL DEFAULT FALSE;
+	DECLARE vIsCEESerial BOOL DEFAULT FALSE;
+	DECLARE vIsCorrectInvoiceDate BOOL;
+	DECLARE vMaxShipped DATE;
+
+	SET vInvoiceDate = IFNULL(vInvoiceDate, util.VN_CURDATE());
+
+	SELECT t.clientFk,
+			t.companyFk,
+			MAX(DATE(t.shipped)),
+			DATE(vInvoiceDate) >= invoiceOut_getMaxIssued(
+				vSerial,
+				t.companyFk,
+				YEAR(vInvoiceDate))
+			INTO vClientFk,
+				vCompanyFk,
+				vMaxShipped,
+				vIsCorrectInvoiceDate
+		FROM tmp.ticketToInvoice tt
+			JOIN ticket t ON t.id = tt.id;
+
+	IF(vMaxShipped > vInvoiceDate) THEN
+		CALL util.throw("Invoice date can't be less than max date");
+	END IF;
+
+	IF NOT vIsCorrectInvoiceDate THEN
+		CALL util.throw('Exists an invoice with a previous date');
+	END IF;
+
+	-- Eliminem de tmp.ticketToInvoice els tickets que no han de ser facturats
+	DELETE ti.*
+		FROM tmp.ticketToInvoice ti
+			JOIN ticket t ON t.id = ti.id
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN supplier su ON su.id = t.companyFk
+			JOIN client c ON c.id = t.clientFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+		WHERE (YEAR(t.shipped) < 2001 AND  t.isDeleted)
+			OR c.isTaxDataChecked = FALSE
+			OR t.isDeleted
+			OR c.hasToInvoice = FALSE
+			OR itc.id IS NULL;
+
+	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
+		INTO vIsAnySaleToInvoice
+		FROM tmp.ticketToInvoice t
+			JOIN sale s ON s.ticketFk = t.id;
+
+	SELECT COUNT(*) > 0 INTO vIsAnyServiceToInvoice
+		FROM tmp.ticketToInvoice t
+			JOIN ticketService ts ON ts.ticketFk = t.id;
+
+	IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
+		AND (vCorrectingSerial = vSerial OR NOT hasAnyNegativeBase())
+	THEN
+
+		-- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+		INSERT INTO invoiceOut(
+			ref,
+			serial,
+			issued,
+			clientFk,
+			dued,
+			companyFk,
+			cplusInvoiceType477Fk
+		)
+			SELECT
+					1,
+					vSerial,
+					vInvoiceDate,
+					vClientFk,
+					getDueDate(vInvoiceDate, dueDay),
+					vCompanyFk,
+					IF(vSerial = vCorrectingSerial,
+						vCplusCorrectingInvoiceTypeFk,
+						IF(vSerial = vSimplifiedSerial,
+							vCplusSimplifiedInvoiceTypeFk,
+							vCplusStandardInvoiceTypeFk))
+				FROM client
+				WHERE id = vClientFk;
+
+		SET vNewInvoiceId = LAST_INSERT_ID();
+
+		SELECT `ref`
+				INTO vNewRef
+			FROM invoiceOut
+			WHERE id = vNewInvoiceId;
+
+		UPDATE ticket t
+				JOIN tmp.ticketToInvoice ti ON ti.id = t.id
+			SET t.refFk = vNewRef;
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
+		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
+			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+				FROM tmp.ticketToInvoice ti
+					LEFT JOIN ticketState ts ON ti.id = ts.ticket
+					JOIN state s
+				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
+
+		INSERT INTO ticketTracking(stateFk,ticketFk,workerFk)
+			SELECT * FROM tmp.updateInter;
+
+		CALL invoiceExpenceMake(vNewInvoiceId);
+		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+
+		UPDATE invoiceOut io
+				JOIN (
+					SELECT SUM(amount) total
+						FROM invoiceOutExpence
+						WHERE invoiceOutFk = vNewInvoiceId
+					) base
+				JOIN (
+					SELECT SUM(vat) total
+						FROM invoiceOutTax
+						WHERE invoiceOutFk = vNewInvoiceId
+					) vat
+			SET io.amount = base.total + vat.total
+			WHERE io.id = vNewInvoiceId;
+
+		DROP TEMPORARY TABLE tmp.updateInter;
+
+		SELECT COUNT(*), id
+				INTO vIsInterCompany, vInterCompanyFk
+			FROM company
+			WHERE clientFk = vClientFk;
+
+		IF (vIsInterCompany) THEN
+
+			INSERT INTO invoiceIn(supplierFk, supplierRef, issued, companyFk)
+				SELECT vCompanyFk, vNewRef, vInvoiceDate, vInterCompanyFk;
+
+			SET vNewInvoiceInFk = LAST_INSERT_ID();
+
+			DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+			CREATE TEMPORARY TABLE tmp.ticket
+				(KEY (ticketFk))
+				ENGINE = MEMORY
+				SELECT id ticketFk
+					FROM tmp.ticketToInvoice;
+
+			CALL `ticket_getTax`('NATIONAL');
+
+			SET @vTaxableBaseServices := 0.00;
+			SET @vTaxCodeGeneral := NULL;
+
+			INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT vNewInvoiceInFk,
+						@vTaxableBaseServices,
+						sub.expenceFk,
+						sub.taxTypeSageFk,
+						sub.transactionTypeSageFk
+					FROM (
+						SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase,
+								i.expenceFk,
+								i.taxTypeSageFk,
+								i.transactionTypeSageFk,
+								@vTaxCodeGeneral := i.taxClassCodeFk
+							FROM tmp.ticketServiceTax tst
+								JOIN invoiceOutTaxConfig i ON i.taxClassCodeFk = tst.code
+							WHERE i.isService
+							HAVING taxableBase
+						) sub;
+
+			INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT vNewInvoiceInFk,
+						SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral,
+						@vTaxableBaseServices, 0) taxableBase,
+						i.expenceFk,
+						i.taxTypeSageFk ,
+						i.transactionTypeSageFk
+					FROM tmp.ticketTax tt
+						JOIN invoiceOutTaxConfig i ON i.taxClassCodeFk = tt.code
+					WHERE !i.isService
+					GROUP BY tt.pgcFk
+					HAVING taxableBase
+					ORDER BY tt.priority;
+
+			CALL invoiceInDueDay_calculate(vNewInvoiceInFk);
+
+			SELECT COUNT(*) INTO vIsCEESerial
+				FROM invoiceOutSerial
+				WHERE code = vSerial;
+
+			IF vIsCEESerial THEN
+
+				INSERT INTO invoiceInIntrastat (
+						invoiceInFk,
+						intrastatFk,
+						amount,
+						stems,
+						countryFk,
+						net)
+					SELECT
+						vNewInvoiceInFk,
+						i.intrastatFk,
+						SUM(CAST((s.quantity * s.price * (100 - s.discount) / 100 ) AS DECIMAL(10, 2))),
+						SUM(CAST(IFNULL(i.stems, 1) * s.quantity AS DECIMAL(10, 2))),
+						su.countryFk,
+						CAST(SUM(IFNULL(i.stems, 1)
+								* s.quantity
+								* IF(ic.grams, ic.grams, IFNULL(i.weightByPiece, 0)) / 1000) AS DECIMAL(10, 2))
+					FROM sale s
+						JOIN ticket t ON s.ticketFk = t.id
+						JOIN supplier su ON su.id = t.companyFk
+						JOIN item i ON i.id = s.itemFk
+						LEFT JOIN itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
+					WHERE t.refFk = vNewRef
+					GROUP BY i.intrastatFk;
+
+			END IF;
+			DROP TEMPORARY TABLE tmp.ticket;
+			DROP TEMPORARY TABLE tmp.ticketAmount;
+			DROP TEMPORARY TABLE tmp.ticketTax;
+			DROP TEMPORARY TABLE tmp.ticketServiceTax;
+		END IF;
+	END IF;
+	DROP TEMPORARY TABLE `tmp`.`ticketToInvoice`;
+END$$
+DELIMITER ;

db/changes/232001/00-wagon.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;

db/changes/232201/00-defaulterView.sql

@@ -0,0 +1,20 @@
+-- vn.defaulter source
+
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`defaulter` AS
+select
+    `d`.`clientFk` AS `clientFk`,
+    `d`.`created` AS `created`,
+    `d`.`amount` AS `amount`,
+    `d`.`defaulterSinced` AS `defaulterSinced`,
+    `d`.`hasChanged` AS `hasChanged`,
+    `c`.`countryFk` AS `country`,
+    `c`.`payMethodFk` AS `payMethod`
+from
+    (((`bs`.`defaulter` `d`
+join `vn`.`client` `c` on
+    (`c`.`id` = `d`.`clientFk`))
+join `vn`.`country` `co` on
+    (`co`.`id` = `c`.`countryFk`))
+join `vn`.`payMethod` `pm` on
+    (`pm`.`id` = `c`.`payMethodFk`));

db/changes/232201/00-procedurecanAdvance.sql

@@ -0,0 +1,127 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
+ *
+ * @param vDateFuture Fecha de los tickets que se quieren adelantar.
+ * @param vDateToAdvance Fecha a cuando se quiere adelantar.
+ * @param vWarehouseFk Almacén
+ */
+ 
+	DECLARE vDateInventory DATE;
+
+	SELECT inventoried INTO vDateInventory FROM config;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+	CREATE TEMPORARY TABLE tmp.stock
+		(itemFk INT PRIMARY KEY,
+		amount INT)
+		ENGINE = MEMORY;
+
+	INSERT INTO tmp.stock(itemFk, amount)
+		SELECT itemFk, SUM(quantity) amount FROM
+		(
+			SELECT itemFk, quantity
+				FROM itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseOutFk = vWarehouseFk
+		) t
+		GROUP BY itemFk HAVING amount != 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+SELECT
+                origin.ticketFk futureId,
+                dest.ticketFk id,
+                dest.state,
+                origin.futureState,
+                origin.futureIpt,
+                dest.ipt,
+                origin.workerFk,
+                origin.futureLiters,
+                origin.futureLines,
+                dest.shipped,
+                origin.shipped futureShipped,
+                dest.totalWithVat,
+                origin.totalWithVat futureTotalWithVat,
+                dest.agency,
+                origin.futureAgency,
+                dest.lines,
+                dest.liters,
+                origin.futureLines - origin.hasStock AS notMovableLines,
+                (origin.futureLines = origin.hasStock) AS isFullMovable,
+                origin.classColor,
+                dest.classColor futureClassColor
+            FROM (
+                    SELECT
+                            s.ticketFk,
+                            t.workerFk,
+                            t.shipped,
+                            t.totalWithVat,
+                            st.name futureState,
+                            t.addressFk,
+                            am.name futureAgency,
+                            count(s.id) futureLines,
+                            GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+                            SUM((s.quantity <= IFNULL(st.amount,0))) hasStock,
+                            st.classColor
+                        FROM ticket t
+                            JOIN sale s ON s.ticketFk = t.id
+                            JOIN saleVolume sv ON sv.saleFk = s.id
+                            JOIN item i ON i.id = s.itemFk
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state st ON st.id = ts.stateFk
+                            JOIN agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                            LEFT JOIN tmp.stock st ON st.itemFk = i.id
+                        WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+                            AND t.warehouseFk = vWarehouseFk
+                        GROUP BY t.id
+                ) origin
+                JOIN (
+                    SELECT
+                            t.id ticketFk,
+                            t.addressFk,
+                            st.name state,
+                            GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+                            t.shipped,
+                            t.totalWithVat,
+                            am.name agency,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                            CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
+                            st.classColor
+                        FROM ticket t
+                            JOIN sale s ON s.ticketFk = t.id
+                            JOIN saleVolume sv ON sv.saleFk = s.id
+                            JOIN item i ON i.id = s.itemFk
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state st ON st.id = ts.stateFk
+                            JOIN agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                        WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+                            AND t.warehouseFk = vWarehouseFk
+                            AND st.order <= 5
+                        GROUP BY t.id
+                ) dest ON dest.addressFk = origin.addressFk
+            WHERE origin.hasStock != 0;
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;

db/changes/232201/00-procedurecanbePostponed.sql

@@ -0,0 +1,72 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, 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 vWarehouseFk Identificador de vn.warehouse
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+	SELECT 	sv.ticketFk id,
+			sub2.id futureId,
+			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.iptd futureIpt,
+			sub2.state futureState,
+			t.clientFk,
+			t.warehouseFk,
+			ts.alertLevel,
+			t.shipped,
+			sub2.shipped futureShipped,
+			t.workerFk,
+			st.code stateCode,
+			sub2.code futureStateCode,
+			st.classColor
+		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.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 futureId;
+END$$
+DELIMITER ;

db/changes/232201/00-workerConfigPayMethod.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`workerConfig` ADD payMethodFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK FOREIGN KEY (roleFk) REFERENCES account.`role`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK_1 FOREIGN KEY (payMethodFk) REFERENCES `vn`.`payMethod`(id) ON DELETE SET NULL ON UPDATE CASCADE;
+
+UPDATE `vn`.`workerConfig`
+    SET payMethodFk = 4
+    WHERE id=1;

db/changes/232202/00-procedurecanAdvance.sql

@@ -0,0 +1,127 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
+ *
+ * @param vDateFuture Fecha de los tickets que se quieren adelantar.
+ * @param vDateToAdvance Fecha a cuando se quiere adelantar.
+ * @param vWarehouseFk Almacén
+ */
+
+	DECLARE vDateInventory DATE;
+
+	SELECT inventoried INTO vDateInventory FROM config;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+	CREATE TEMPORARY TABLE tmp.stock
+		(itemFk INT PRIMARY KEY,
+		amount INT)
+		ENGINE = MEMORY;
+
+	INSERT INTO tmp.stock(itemFk, amount)
+		SELECT itemFk, SUM(quantity) amount FROM
+		(
+			SELECT itemFk, quantity
+				FROM itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseOutFk = vWarehouseFk
+		) t
+		GROUP BY itemFk HAVING amount != 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+SELECT
+                origin.ticketFk futureId,
+                dest.ticketFk id,
+                dest.state,
+                origin.futureState,
+                origin.futureIpt,
+                dest.ipt,
+                origin.workerFk,
+                origin.futureLiters,
+                origin.futureLines,
+                dest.shipped,
+                origin.shipped futureShipped,
+                dest.totalWithVat,
+                origin.totalWithVat futureTotalWithVat,
+                dest.agency,
+                origin.futureAgency,
+                dest.lines,
+                dest.liters,
+                origin.futureLines - origin.hasStock AS notMovableLines,
+                (origin.futureLines = origin.hasStock) AS isFullMovable,
+                origin.classColor futureClassColor,
+                dest.classColor
+            FROM (
+                    SELECT
+                            s.ticketFk,
+                            t.workerFk,
+                            t.shipped,
+                            t.totalWithVat,
+                            st.name futureState,
+                            t.addressFk,
+                            am.name futureAgency,
+                            count(s.id) futureLines,
+                            GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+                            SUM((s.quantity <= IFNULL(st.amount,0))) hasStock,
+                            st.classColor
+                        FROM ticket t
+                            JOIN sale s ON s.ticketFk = t.id
+                            JOIN saleVolume sv ON sv.saleFk = s.id
+                            JOIN item i ON i.id = s.itemFk
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state st ON st.id = ts.stateFk
+                            JOIN agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                            LEFT JOIN tmp.stock st ON st.itemFk = i.id
+                        WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+                            AND t.warehouseFk = vWarehouseFk
+                        GROUP BY t.id
+                ) origin
+                JOIN (
+                    SELECT
+                            t.id ticketFk,
+                            t.addressFk,
+                            st.name state,
+                            GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+                            t.shipped,
+                            t.totalWithVat,
+                            am.name agency,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                            CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
+                            st.classColor
+                        FROM ticket t
+                            JOIN sale s ON s.ticketFk = t.id
+                            JOIN saleVolume sv ON sv.saleFk = s.id
+                            JOIN item i ON i.id = s.itemFk
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state st ON st.id = ts.stateFk
+                            JOIN agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                        WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+                            AND t.warehouseFk = vWarehouseFk
+                            AND st.order <= 5
+                        GROUP BY t.id
+                ) dest ON dest.addressFk = origin.addressFk
+            WHERE origin.hasStock != 0;
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;

db/changes/232202/00-procedurecanbePostponed.sql

@@ -0,0 +1,74 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, 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 vWarehouseFk Identificador de vn.warehouse
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+	SELECT 	sv.ticketFk id,
+			sub2.id futureId,
+			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.iptd futureIpt,
+			sub2.state futureState,
+			t.clientFk,
+			t.warehouseFk,
+			ts.alertLevel,
+			t.shipped,
+			sub2.shipped futureShipped,
+			t.workerFk,
+			st.code stateCode,
+			sub2.code futureStateCode,
+			st.classColor,
+			sub2.classColor futureClassColor
+		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.shipped,
+							st.name state,
+							st.code,
+							st.classColor,
+							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 futureId;
+END$$
+DELIMITER ;

db/changes/232401/00-buyConfig_travelConfig.sql

@@ -0,0 +1,28 @@
+CREATE TABLE `vn`.`buyConfig` (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `monthsAgo` int(11) NOT NULL DEFAULT 6 COMMENT 'Meses desde la última compra',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE `vn`.`travelConfig` (
+    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+    `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen',
+    `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino',
+    `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto',
+    `companyFk` smallint(5) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto',
+    PRIMARY KEY (`id`),
+    KEY `travelConfig_FK` (`warehouseInFk`),
+    KEY `travelConfig_FK_1` (`warehouseOutFk`),
+    KEY `travelConfig_FK_2` (`agencyFk`),
+    KEY `travelConfig_FK_3` (`companyFk`),
+    CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Entry', 'addFromPackaging', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Entry', 'addFromBuy', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Supplier', 'getItemsPackaging', 'READ', 'ALLOW', 'ROLE', 'production');

db/changes/232401/00-printer.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`sector` DROP COLUMN `printerFk`;
+ALTER TABLE `vn`.`sector` ADD COLUMN `mainPrinterFk` tinyint(3) unsigned;
+ALTER TABLE `vn`.`sector` ADD CONSTRAINT sector_FK_1 FOREIGN KEY (mainPrinterFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/232401/00-ticket_warehouse.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`ticket` MODIFY COLUMN warehouseFk smallint(6) unsigned DEFAULT NULL NULL;

db/changes/232401/00-useSpecificsAcls.sql

@@ -0,0 +1,121 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),
+        ('State', 'isSomeEditable', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('State', 'isAllEditable', 'READ', 'ALLOW', 'ROLE', 'production'),
+        ('State', 'isAllEditable', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('Agency', 'seeExpired', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('Agency', 'seeExpired', 'READ', 'ALLOW', 'ROLE', 'productionBoss'),
+        ('Claim', 'createAfterDeadline', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Client', 'editAddressLogifloraAllowed', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Client', 'editFiscalDataWithoutTaxDataCheck', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Client', 'editVerifiedDataWithoutTaxDataCheck', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
+        ('Client', 'editCredit', 'WRITE', 'ALLOW', 'ROLE', 'financialBoss'),
+        ('Client', 'isNotEditableCredit', 'WRITE', 'ALLOW', 'ROLE', 'financialBoss'),
+        ('InvoiceOut', 'canCreatePdf', 'WRITE', 'ALLOW', 'ROLE', 'invoicing'),
+        ('Supplier', 'editPayMethodCheck', 'WRITE', 'ALLOW', 'ROLE', 'financial'),
+        ('Worker', 'isTeamBoss', 'WRITE', 'ALLOW', 'ROLE', 'teamBoss'),
+        ('Worker', 'forceIsSubordinate', 'READ', 'ALLOW', 'ROLE', 'hr'),
+        ('Claim', 'editState', 'WRITE', 'ALLOW', 'ROLE', 'claimManager');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Claim'
+        AND property = '*'
+        AND accessType = '*';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Claim', 'find', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'findById', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'findOne', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'getSummary', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'updateClaim', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'regularizeClaim', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'updateClaimDestination', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'downloadFile', 'READ', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
+        ('Claim', 'filter', 'READ', 'ALLOW', 'ROLE', 'salesPerson'),
+        ('Claim', 'logs', 'READ', 'ALLOW', 'ROLE', 'claimManager');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Ticket'
+        AND property = '*'
+        AND accessType = '*';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Ticket', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getVolume', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getTotalVolume', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'summary', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'priceDifference', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'componentUpdate', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'new', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'isEditable', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'setDeleted', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'restore', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getSales', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getSalesPersonMana', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'makeInvoice', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'updateEditableTicket', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'updateDiscount', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'transferSales', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'sendSms', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'isLocked', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'freightCost', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'getComponentsSum', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Ticket', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'delivery'), -- Change Priority in Route tickets
+        ('Ticket', 'deliveryNoteCsv', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'State'
+        AND property = '*'
+        AND accessType = 'READ';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('State', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('State', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('State', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Worker'
+        AND property = '*'
+        AND accessType = 'READ';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Worker', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'getWorkedHours', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'active', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'activeWithRole', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'uploadFile', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+        ('Worker', 'contracts', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'holidays', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'activeContract', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'activeWithInheritedRole', 'READ', 'ALLOW', 'ROLE', 'employee');
+
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'Client'
+        AND property = 'updateUser'
+        AND accessType = '*';

db/dump/fixtures.sql

@@ -179,6 +179,8 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
+UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
     VALUES
         (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106, NULL, NULL),
@@ -349,20 +351,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
         (4, 'GCN Channel'),
         (5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`,`mailAddress`,`hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`)
     VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'Batman',         'Alfred',           '1007 Mountain Drive, Gotham',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1102,     'Petter Parker',      '87945234L',  'Spider man',     'Aunt May',         '20 Ingram Street, Queens, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1103,     'Clark Kent',         '06815934E',  'Super man',      'lois lane',        '344 Clinton Street, Apartament 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1104,     'Tony Stark',         '06089160W',  'Iron man',       'Pepper Potts',     '10880 Malibu Point, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1105,     'Max Eisenhardt',     '251628698',  'Magneto',        'Rogue',            'Unknown Whereabouts',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'Legion',         'Charles Xavier',   'City of New York, New York, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
-        (1107,     'Hank Pym',           '09854837G',  'Ant man',        'Hawk',             'Anthill, San Francisco, California',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
-        (1108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
-        (1109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
-        (1110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
-        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
-        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
+        (1101,     'Bruce Wayne',        '84612325V',  'Batman',         'Alfred',           '1007 Mountain Drive, Gotham',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1102,     'Petter Parker',      '87945234L',  'Spider man',     'Aunt May',         '20 Ingram Street, Queens, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1103,     'Clark Kent',         '06815934E',  'Super man',      'lois lane',        '344 Clinton Street, Apartament 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1104,     'Tony Stark',         '06089160W',  'Iron man',       'Pepper Potts',     '10880 Malibu Point, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1105,     'Max Eisenhardt',     '251628698',  'Magneto',        'Rogue',            'Unknown Whereabouts',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'Legion',         'Charles Xavier',   'City of New York, New York, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1107,     'Hank Pym',           '09854837G',  'Ant man',        'Hawk',             'Anthill, San Francisco, California',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
+        (1110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
+        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
+        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -707,7 +709,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (15, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1105, 'An incredibly long alias for testing purposes', 125, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
         (16, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
         (17, 1,     7,  2, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1106, 'Many Places',                                   126, NULL,       0, 3,      5, 1, util.VN_CURDATE()),
-        (18, 1,     4,  4, 4,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1108, 'Cerebro',                                       128, NULL,       0, 12,     5, 1, util.VN_CURDATE()),
+        (18, 1,     4,  4, 4,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1108, 'Cerebro',                                       128, NULL,       0, 12,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR)),
         (19, 1,     5,  5, NULL,    util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1109, 'Somewhere in Thailand',                         129, NULL,       1, NULL,   5, 1, util.VN_CURDATE()),
         (20, 1,     5,  5, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand',                         129, NULL,       0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
         (21, NULL,  5,  5, 5,       DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland',                          102, NULL,       0, 13,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
@@ -905,7 +907,7 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
 INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
     VALUES
-        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT',   0,  NULL,   'V',  0, 15,3),
+        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'EMB',   0,  NULL,   'V',  0, 15,3),
         (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
         (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, 5,5),
         (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
@@ -1940,6 +1942,16 @@ INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
         (5, 1102),
         (9, 1201);
 
+INSERT INTO `vn`.`professionalCategory` (`id`, `name`, `level`, `dayBreak`)
+    VALUES
+        (1, 'employee', NULL, NULL),
+        (2, 'florist', NULL, NULL);
+
+INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`)
+    VALUES
+        (1, 'General schedule', 40, 0);
+
+
 DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
@@ -1968,7 +1980,7 @@ UPDATE `vn`.`business`
     WHERE `id`= 1106;
 
 UPDATE `vn`.`business` b
-    SET b.`workerBusinessProfessionalCategoryFk` = 31
+    SET b.`workerBusinessProfessionalCategoryFk` = 2
     WHERE b.`workerFk` = 1110;
 
 UPDATE `vn`.`business` b
@@ -2322,26 +2334,26 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
 
 INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`, `code`)
     VALUES
-        (1,  'Facturas Recibidas',   'recibidas',       NULL,   NULL, 'invoiceIn'),
-        (2,  'Doc oficial',          'oficial',         NULL,   NULL, 'officialDoc'),
-        (3,  'Laboral',              'laboral',         37,     37, 'hhrrData'),
-        (4,  'Albaranes recibidos',  'entradas',        NULL,   NULL, 'deliveryNote'),
-        (5,  'Otros',                'otros',           1,      1,    'miscellaneous'),
-        (6,  'Pruebas',              'pruebas',         NULL,   NULL, 'tests'),
-        (7,  'IAE Clientes',         'IAE_Clientes',    1,      1, 'economicActivitiesTax'),
-        (8,  'Fiscal',               'fiscal',          NULL,   NULL, 'fiscal'),
-        (9,  'Vehiculos',            'vehiculos',       NULL,   NULL, 'vehicles'),
-        (10, 'Plantillas',           'plantillas',      NULL,   NULL, 'templates'),
-        (11, 'Contratos',            'contratos',       NULL,   NULL, 'contracts'),
-        (12, 'ley de pagos',         'ley pagos',       1,      1,    'paymentsLaw'),
-        (13, 'Basura',               'basura',          1,      1,    'trash'),
-        (14, 'Ticket',               'tickets',         1,      1,    'ticket'),
-        (15, 'Presupuestos',         'Presupuestos',    NULL,   NULL, 'budgets'),
-        (16, 'Logistica',            'logistica',       NULL,   NULL, 'logistics'),
-        (17, 'cmr',                  'cmr',             NULL,   NULL, 'cmr'),
-        (18, 'dua',                  'dua',             NULL,   NULL, 'dua'),
-        (19, 'inmovilizado',         'inmovilizado',    NULL,   NULL, 'fixedAssets'),
-        (20, 'Reclamación',          'reclamacion',     1,      1, 'claim');
+        (1,  'Facturas Recibidas',   'recibidas',       NULL,   NULL,   'invoiceIn'),
+        (2,  'Doc oficial',          'oficial',         NULL,   NULL,   'officialDoc'),
+        (3,  'Laboral',              'laboral',         37,     37,     'hhrrData'),
+        (4,  'Albaranes recibidos',  'entradas',        NULL,   NULL,   'deliveryNote'),
+        (5,  'Otros',                'otros',           1,      1,      'miscellaneous'),
+        (6,  'Pruebas',              'pruebas',         NULL,   NULL,   'tests'),
+        (7,  'IAE Clientes',         'IAE_Clientes',    1,      1,      'economicActivitiesTax'),
+        (8,  'Fiscal',               'fiscal',          NULL,   NULL,   'fiscal'),
+        (9,  'Vehiculos',            'vehiculos',       NULL,   NULL,   'vehicles'),
+        (10, 'Plantillas',           'plantillas',      NULL,   NULL,   'templates'),
+        (11, 'Contratos',            'contratos',       NULL,   NULL,   'contracts'),
+        (12, 'ley de pagos',         'ley pagos',       1,      1,      'paymentsLaw'),
+        (13, 'Basura',               'basura',          1,      1,      'trash'),
+        (14, 'Ticket',               'tickets',         1,      1,      'ticket'),
+        (15, 'Presupuestos',         'Presupuestos',    NULL,   NULL,   'budgets'),
+        (16, 'Logistica',            'logistica',       NULL,   NULL,   'logistics'),
+        (17, 'cmr',                  'cmr',             NULL,   NULL,   'cmr'),
+        (18, 'dua',                  'dua',             NULL,   NULL,   'dua'),
+        (19, 'inmovilizado',         'inmovilizado',    NULL,   NULL,   'fixedAssets'),
+        (20, 'Reclamación',          'reclamacion',     1,      1,      'claim');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2719,6 +2731,7 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
         (1, 'print-email', 'notification fixture one'),
         (2, 'invoice-electronic', 'A electronic invoice has been generated'),
+        (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2770,11 +2783,25 @@ UPDATE `account`.`user`
 
 INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
     VALUES
-        (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
-        (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
-        (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
-        (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'");
+        (7,   18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
+        (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
+        (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
+        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"),
+        (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 5689, 'Shield');
 
+
+INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description)
+    VALUES
+        (1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket',    45, 'Spider Man' , NULL, NULL, NULL),
+        (1,   18, 'select', '2001-06-09 11:00:03', 'Ticket',    45, 'Spider Man' , NULL, NULL, NULL),
+        (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale',   69854, 'Armor'      , '{"isPicked": false}','{"isPicked": true}', NULL),
+        (1,   18, 'update', '2001-01-01 10:05:01', 'Sale',   69854, 'Armor'      , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
+        (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale',    5689, 'Shield'     , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
+        (1,   18, 'insert', '2000-12-31 15:00:05', 'Sale',   69854, 'Armor'      , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
+        (1,   18, 'update', '2000-12-28 08:40:45', 'Ticket',    45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL),
+        (1,   18, 'select', '2000-12-27 03:40:30', 'Ticket',    45, NULL         , NULL, NULL, NULL),
+        (1,   18, 'insert', '2000-04-10 09:40:15', 'Sale',    5689, 'Shield'     , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
+        (1,   18, 'insert', '1999-05-09 10:00:00', 'Ticket',    45, 'Super Man'  , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
 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', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
@@ -2801,9 +2828,9 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);
 
-INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk`, `businessTypeFk`)
     VALUES
-        (1, NULL, 1);
+        (1, NULL, 1, 4, 'worker');
 
 INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
     VALUES
@@ -2863,6 +2890,10 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
         (2, 1, 50, 2),
         (3, 1, 0, 3);
 
+INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`)
+    VALUES
+        (1, 1, 1, 1, 442);
 
-
-
+INSERT INTO `vn`.`buyConfig` (`id`, `monthsAgo`)
+    VALUES
+        (1, 6);

db/dump/mockDate.sql

@@ -1,42 +1,33 @@
-CREATE SCHEMA IF NOT EXISTS `util`;
-USE `util`;
+DROP FUNCTION IF EXISTS `util`.`mockTime`;
 
-DELIMITER ;;
-DROP FUNCTION IF EXISTS `util`.`mockedDate`;
-CREATE FUNCTION `util`.`mockedDate`()
-RETURNS DATETIME
-DETERMINISTIC
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTime`() RETURNS datetime
+    DETERMINISTIC
 BEGIN
-    RETURN CONVERT_TZ('2001-01-01 11:00:00', 'utc', 'Europe/Madrid');
-END ;;
+	RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid');
+END$$
 DELIMITER ;
 
-DELIMITER ;;
-DROP FUNCTION IF EXISTS `util`.`VN_CURDATE`;
-CREATE FUNCTION `util`.`VN_CURDATE`()
-RETURNS DATE
-DETERMINISTIC
+DROP FUNCTION IF EXISTS `util`.`mockUtcTime`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockUtcTime`() RETURNS datetime
+    DETERMINISTIC
 BEGIN
-    RETURN DATE(mockedDate());
-END ;;
+	RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid');
+END$$
 DELIMITER ;
 
-DELIMITER ;;
-DROP FUNCTION IF EXISTS `util`.`VN_CURTIME`;
-CREATE FUNCTION `util`.`VN_CURTIME`()
-RETURNS TIME
-DETERMINISTIC
+DROP FUNCTION IF EXISTS `util`.`mockTimeBase`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL) RETURNS datetime
+    DETERMINISTIC
 BEGIN
-    RETURN TIME(mockedDate());
-END ;;
+    RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid');
+END$$
 DELIMITER ;
 
-DELIMITER ;;
-DROP FUNCTION IF EXISTS `util`.`VN_NOW`;
-CREATE FUNCTION `util`.`VN_NOW`()
-RETURNS DATETIME
-DETERMINISTIC
-BEGIN
-    RETURN mockedDate();
-END ;;
-DELIMITER ;

db/export-data.sh

@@ -100,11 +100,8 @@ dump_tables ${TABLES[@]}
 
 TABLES=(
     postgresql
-    calendar_labour_type
     labour_agreement
     media_type
-    professional_category
-    profile_type
 )
 dump_tables ${TABLES[@]}
 

db/export-structure.sh

@@ -93,12 +93,5 @@ mysqldump \
     --databases \
     ${SCHEMAS[@]} \
     ${IGNORETABLES[@]} \
-    | sed 's/\bCURDATE\b/util.VN_CURDATE/ig'\
-    | sed 's/\bCURTIME\b/util.VN_CURTIME/ig' \
-    | sed 's/\bNOW\b/util.VN_NOW/ig' \
-    | sed 's/\bCURRENT_DATE\b/util.VN_CURDATE/ig' \
-    | sed 's/\bCURRENT_TIME\b/util.VN_CURTIME/ig' \
-    | sed 's/\bLOCALTIME\b/util.VN_NOW/ig' \
-    | sed 's/\bLOCALTIMESTAMP\b/util.VN_NOW/ig' \
     | sed 's/ AUTO_INCREMENT=[0-9]* //g' \
     > dump/structure.sql

docker-compose.yml

@@ -43,7 +43,7 @@ services:
           - node.role == worker
       resources:
         limits:
-          memory: 4G
+          memory: 8G
 configs:
   datasources:
     external: true

e2e/helpers/puppeteer.js

@@ -22,7 +22,8 @@ export async function getBrowser() {
         env.E2E_SHOW = true;
     }
 
-    const headless = !env.E2E_SHOW;
+    const headless = env.E2E_SHOW ? false : 'new';
+
     const browser = await Puppeteer.launch({
         args,
         defaultViewport: null,

e2e/helpers/selectors.js

@@ -313,7 +313,7 @@ export default {
         anyClient: 'vn-client-defaulter tbody > tr',
         firstClientName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(2) > span',
         firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(3) > span',
-        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(6) > vn-textarea[ng-model="defaulter.observation"]',
+        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]',
         allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check',
         addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]',
         observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]',
@@ -595,6 +595,8 @@ export default {
         moreMenuUpdateDiscount: 'vn-item[name="discount"]',
         moreMenuRecalculatePrice: 'vn-item[name="calculatePrice"]',
         moreMenuRefund: 'vn-item[name="refund"]',
+        refundWithWarehouse: 'vn-item[name="refundWithWarehouse"]',
+        refundWithoutWarehouse: 'vn-item[name="refundWithoutWarehouse"]',
         moreMenuUpdateDiscountInput: 'vn-input-number[ng-model="$ctrl.edit.discount"] input',
         transferQuantityInput: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable > span > text',
         transferQuantityCell: '.vn-popover.shown vn-table > div > vn-tbody > vn-tr > vn-td-editable',
@@ -625,6 +627,7 @@ export default {
         selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check',
         secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]',
         thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]',
+        fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]',
         deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]',
         transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]',
         moveToTicketInput: 'form vn-input-number[ng-model="$ctrl.transfer.ticketId"] input',

e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js

@@ -64,6 +64,6 @@ describe('SmartTable SearchBar integration', () => {
         await page.reload({
             waitUntil: 'networkidle2'
         });
-        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '13');
+        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '3');
     });
 });

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

@@ -5,8 +5,8 @@ const $ = {
     userName: 'vn-client-web-access vn-textfield[ng-model="$ctrl.account.name"]',
     email: 'vn-client-web-access vn-textfield[ng-model="$ctrl.account.email"]',
     saveButton: 'vn-client-web-access button[type=submit]',
-    nameValue: 'vn-client-log .change:nth-child(1) .basic-json:nth-child(1) vn-json-value',
-    activeValue: 'vn-client-log .change:nth-child(2) .basic-json:nth-child(2) vn-json-value'
+    nameValue: 'vn-client-log .change:nth-child(1) .basic-json:nth-child(2) vn-json-value',
+    activeValue: 'vn-client-log .change:nth-child(2) .basic-json:nth-child(1) vn-json-value'
 };
 
 describe('Client web access path', () => {

e2e/paths/02-client/10_add_greuge.spec.js

@@ -29,19 +29,16 @@ describe('Client Add greuge path', () => {
         expect(message.text).toContain('Some fields are invalid');
     });
 
-    it(`should create a new greuge with all its data`, async() => {
+    it(`should create a new greuge with all its data and confirm the greuge was added to the list`, async() => {
         await page.write(selectors.clientGreuge.amount, '999');
         await page.waitForTextInField(selectors.clientGreuge.amount, '999');
         await page.write(selectors.clientGreuge.description, 'new armor for Batman!');
         await page.waitToClick(selectors.clientGreuge.saveButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the greuge was added to the list', async() => {
         const result = await page.waitToGetProperty(selectors.clientGreuge.firstGreugeText, 'innerText');
 
+        expect(message.text).toContain('Data saved!');
         expect(result).toContain(999);
         expect(result).toContain('new armor for Batman!');
         expect(result).toContain('Diff');

e2e/paths/04-item/02_basic_data.spec.js

@@ -50,6 +50,7 @@ describe('Item Edit basic data path', () => {
 
     it(`should create a new intrastat and save it`, async() => {
         await page.click($.newIntrastatButton);
+        await page.waitForSelector($.intrastatForm);
         await page.fillForm($.intrastatForm, {
             id: '588420239',
             description: 'Tropical Flowers'

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -88,7 +88,8 @@ describe('Item fixed prices path', () => {
 
     it('should reload the section and check the created price has the expected ID', async() => {
         await page.goto(`http://localhost:5000/#!/item/fixed-price`);
-
+        await page.autocompleteSearch($.warehouseFilter, 'Warehouse one');
+        await page.click($.chip);
         const result = await page.waitToGetProperty($.fourthItemID, 'value');
 
         expect(result).toContain('13');

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -220,14 +220,25 @@ describe('Ticket Edit sale path', () => {
 
     it('should log in as salesAssistant and navigate to ticket sales', async() => {
         await page.loginAndModule('salesAssistant', 'ticket');
-        await page.accessToSearchResult('16');
+        await page.accessToSearchResult('17');
         await page.accessToSection('ticket.card.sale');
     });
 
-    it('should select the third sale and create a refund', async() => {
+    it('should select the first sale and create a refund with warehouse', async() => {
         await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuRefund);
+        await page.waitToClick(selectors.ticketSales.refundWithWarehouse);
+        await page.waitForSnackbar();
+        await page.waitForState('ticket.card.sale');
+    });
+
+    it('should select the first sale and create a refund without warehouse', async() => {
+        await page.accessToSearchResult('18');
+        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
+        await page.waitToClick(selectors.ticketSales.moreMenu);
+        await page.waitToClick(selectors.ticketSales.moreMenuRefund);
+        await page.waitToClick(selectors.ticketSales.refundWithoutWarehouse);
         await page.waitForSnackbar();
         await page.waitForState('ticket.card.sale');
     });
@@ -246,7 +257,6 @@ describe('Ticket Edit sale path', () => {
     it('should select the third sale and create a claim of it', async() => {
         await page.accessToSearchResult('16');
         await page.accessToSection('ticket.card.sale');
-        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
@@ -316,7 +326,7 @@ describe('Ticket Edit sale path', () => {
     it('should confirm the transfered quantity is the correct one', async() => {
         const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleQuantityCell, 'innerText');
 
-        expect(result).toContain('10');
+        expect(result).toContain('20');
     });
 
     it('should go back to the original ticket sales section', async() => {

e2e/paths/05-ticket/21_future.spec.js

@@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-// 'https:// redmine.verdnatura.es/issues/5642'
-xdescribe('Ticket Future path', () => {
+describe('Ticket Future path', () => {
     let browser;
     let page;
     let httpRequest;
@@ -22,7 +21,7 @@ xdescribe('Ticket Future path', () => {
         await browser.close();
     });
 
-    it('should show errors snackbar because of the required data', async() => {
+    it('should search with required data, check three last tickets and move to the future', async() => {
         await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketFuture.warehouseFk);
         await page.waitToClick(selectors.ticketFuture.submit);
@@ -43,69 +42,58 @@ xdescribe('Ticket Future path', () => {
         message = await page.waitForSnackbar();
 
         expect(message.text).toContain('originDated is a required argument');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toBeDefined();
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.autocompleteSearch(selectors.ticketFuture.ipt, 'H');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('ipt=H');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.clearInput(selectors.ticketFuture.ipt);
+
+        await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'H');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('futureIpt=H');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.clearInput(selectors.ticketFuture.futureIpt);
+
+        await page.autocompleteSearch(selectors.ticketFuture.state, 'Free');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('state=FREE');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+
+        await page.clearInput(selectors.ticketFuture.state);
+
+        await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free');
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        expect(httpRequest).toContain('futureState=FREE');
+
+        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketFuture.state);
+        await page.clearInput(selectors.ticketFuture.futureState);
+        await page.waitToClick(selectors.ticketFuture.submit);
+
+        await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4);
+        await page.waitToClick(selectors.ticketFuture.multiCheck);
+        await page.waitToClick(selectors.ticketFuture.firstCheck);
+        await page.waitToClick(selectors.ticketFuture.moveButton);
+        await page.waitToClick(selectors.globalItems.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Tickets moved successfully!');
     });
-
-    // it('should search with the required data', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toBeDefined();
-    // });
-
-    // it('should search with the origin IPT', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.ipt, 'H');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('ipt=H');
-    // });
-
-    // it('should search with the destination IPT', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.clearInput(selectors.ticketFuture.ipt);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'H');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('futureIpt=H');
-    // });
-
-    // it('should search with the origin grouped state', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.clearInput(selectors.ticketFuture.futureIpt);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.state, 'Free');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('state=FREE');
-    // });
-
-    // it('should search with the destination grouped state', async() => {
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-
-    //     await page.clearInput(selectors.ticketFuture.state);
-
-    //     await page.autocompleteSearch(selectors.ticketFuture.futureState, 'Free');
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-
-    //     expect(httpRequest).toContain('futureState=FREE');
-
-    //     await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-    //     await page.clearInput(selectors.ticketFuture.futureState);
-    //     await page.waitToClick(selectors.ticketFuture.submit);
-    // });
-
-    // it('should check the three last tickets and move to the future', async() => {
-    //     await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4);
-    //     await page.waitToClick(selectors.ticketFuture.multiCheck);
-    //     await page.waitToClick(selectors.ticketFuture.firstCheck);
-    //     await page.waitToClick(selectors.ticketFuture.moveButton);
-    //     await page.waitToClick(selectors.globalItems.acceptButton);
-    //     const message = await page.waitForSnackbar();
-
-    //     expect(message.text).toContain('Tickets moved successfully!');
-    // });
 });

e2e/paths/05-ticket/22_advance.spec.js

@@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-// 'https:// redmine.verdnatura.es/issues/5642'
-xdescribe('Ticket Advance path', () => {
+describe('Ticket Advance path', () => {
     let browser;
     let page;
     let httpRequest;
@@ -22,7 +21,7 @@ xdescribe('Ticket Advance path', () => {
         await browser.close();
     });
 
-    it('should show errors snackbar because of the required data', async() => {
+    it('should search with the required data, check the first ticket and move to the present', async() => {
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketAdvance.warehouseFk);
 
@@ -44,45 +43,37 @@ xdescribe('Ticket Advance path', () => {
         message = await page.waitForSnackbar();
 
         expect(message.text).toContain('dateFuture is a required argument');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        expect(httpRequest).toBeDefined();
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'H');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        expect(httpRequest).toContain('futureIpt=H');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.futureIpt);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'H');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        expect(httpRequest).toContain('ipt=H');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.ipt);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+
+        await page.waitToClick(selectors.ticketAdvance.firstCheck);
+        await page.waitToClick(selectors.ticketAdvance.moveButton);
+        await page.waitToClick(selectors.ticketAdvance.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Tickets moved successfully!');
     });
-
-    // it('should search with the required data', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-
-    //     expect(httpRequest).toBeDefined();
-    // });
-
-    // it('should search with the origin IPT', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'H');
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-
-    //     expect(httpRequest).toContain('futureIpt=H');
-
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.clearInput(selectors.ticketAdvance.futureIpt);
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-    // });
-
-    // it('should search with the destination IPT', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'H');
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-
-    //     expect(httpRequest).toContain('ipt=H');
-
-    //     await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-    //     await page.clearInput(selectors.ticketAdvance.ipt);
-    //     await page.waitToClick(selectors.ticketAdvance.submit);
-    // });
-
-    // it('should check the first ticket and move to the present', async() => {
-    //     await page.waitToClick(selectors.ticketAdvance.firstCheck);
-    //     await page.waitToClick(selectors.ticketAdvance.moveButton);
-    //     await page.waitToClick(selectors.ticketAdvance.acceptButton);
-    //     const message = await page.waitForSnackbar();
-
-    //     expect(message.text).toContain('Tickets moved successfully!');
-    // });
 });

e2e/paths/06-claim/05_summary.spec.js

@@ -17,7 +17,7 @@ describe('Claim summary path', () => {
     });
 
     it('should navigate to the target claim summary section', async() => {
-        await page.loginAndModule('employee', 'claim');
+        await page.loginAndModule('salesPerson', 'claim');
         await page.accessToSearchResult(claimId);
         await page.waitForState('claim.card.summary');
     });
@@ -49,7 +49,11 @@ describe('Claim summary path', () => {
     });
 
     it(`should click on the first sale ID making the item descriptor visible`, async() => {
-        await page.waitToClick(selectors.claimSummary.firstSaleItemId);
+        const firstItem = selectors.claimSummary.firstSaleItemId;
+        await page.evaluate(selectors => {
+            document.querySelector(selectors).scrollIntoView();
+        }, firstItem);
+        await page.click(firstItem);
         await page.waitImgLoad(selectors.claimSummary.firstSaleDescriptorImage);
         const visible = await page.isVisible(selectors.claimSummary.itemDescriptorPopover);
 

e2e/paths/06-claim/06_descriptor.spec.js

@@ -16,7 +16,7 @@ describe('Claim descriptor path', () => {
     });
 
     it('should now navigate to the target claim summary section', async() => {
-        await page.loginAndModule('employee', 'claim');
+        await page.loginAndModule('salesPerson', 'claim');
         await page.accessToSearchResult(claimId);
         await page.waitForState('claim.card.summary');
     });

e2e/paths/13-supplier/03_fiscal_data.spec.js

@@ -1,5 +1,20 @@
 import getBrowser from '../../helpers/puppeteer';
 
+const $ = {
+    saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
+};
+const $inputs = {
+    province: 'vn-supplier-fiscal-data [name="province"]',
+    country: 'vn-supplier-fiscal-data [name="country"]',
+    postcode: 'vn-supplier-fiscal-data [name="postcode"]',
+    city: 'vn-supplier-fiscal-data [name="city"]',
+    socialName: 'vn-supplier-fiscal-data [name="socialName"]',
+    taxNumber: 'vn-supplier-fiscal-data [name="taxNumber"]',
+    account: 'vn-supplier-fiscal-data [name="account"]',
+    sageWithholding: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageWithholdingFk"]',
+    sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
+};
+
 describe('Supplier fiscal data path', () => {
     let browser;
     let page;

front/core/components/avatar/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../../module';
 import Component from 'core/lib/component';
+import {hashToColor} from '../../lib/string';
 import './style.scss';
 
 /**
@@ -16,13 +17,8 @@ export default class Avatar extends Component {
         this._val = value;
 
         const val = value || '';
-        let hash = 0;
-        for (let i = 0; i < val.length; i++)
-            hash += val.charCodeAt(i);
-        const color = '#' + colors[hash % colors.length];
-
         const el = this.element;
-        el.style.backgroundColor = color;
+        el.style.backgroundColor = hashToColor(val);
         el.title = val;
     }
 }
@@ -35,29 +31,3 @@ ngModule.vnComponent('vnAvatar', {
     },
     transclude: true
 });
-
-const colors = [
-    'e2553d', // Coral
-    'FFA07A', // Salmon
-    'FFDAB9', // Peach
-    'a17077', // Pink
-    'bf0e99', // Pink light
-    '52a500', // Green chartreuse
-    '00aeae', // Cian
-    'b754cf', // Purple middle
-    '8a69cd', // Blue lavender
-    '1fa8a1', // Green ocean
-    'DC143C', // Red crimson
-    '5681cf', // Blue steel
-    'FF1493', // Ping intense
-    '02ba02', // Green lime
-    '1E90FF', // Blue sky
-    '8B008B', // Purple dark
-    'cc7000', // Orange bright
-    '00b5b8', // Turquoise
-    '8B0000', // Red dark
-    '008080', // Green bluish
-    '2F4F4F', // Gray board
-    '7e7e7e', // Gray
-    '5d5d5d', // Gray dark
-];

front/core/components/data-viewer/index.js

@@ -7,11 +7,10 @@ export default class DataViewer {
     }
 
     get status() {
-        if (this.model)
-            return this.model.status;
-
         if (this.isLoading)
             return 'loading';
+        if (this.model)
+            return this.model.status;
         if (!this.data)
             return 'clear';
         if (this.data.length)

front/core/components/json-value/index.js

@@ -2,7 +2,7 @@ import ngModule from '../../module';
 import Component from 'core/lib/component';
 import './style.scss';
 
-const maxStrLen = 50;
+const maxStrLen = 512;
 
 /**
  * Displays pretty JSON value.
@@ -28,6 +28,12 @@ export default class Controller extends Component {
         } else {
             cssClass = type;
             switch (type) {
+            case 'number':
+                if (Number.isInteger(value))
+                    text = value;
+                else
+                    text = Math.round((value + Number.EPSILON) * 1000) / 1000;
+                break;
             case 'boolean':
                 text = value ? '✓' : '✗';
                 cssClass = value ? 'true' : 'false';

front/core/components/json-value/index.spec.js

@@ -75,5 +75,19 @@ describe('Component vnJsonValue', () => {
             expect(el.textContent).toEqual('2050');
             expect(el.className).toContain('json-number');
         });
+
+        it('should display number when value is decimal', () => {
+            controller.value = 10.1;
+
+            expect(el.textContent).toEqual('10.1');
+            expect(el.className).toContain('json-number');
+        });
+
+        it('should display rounded number when value is decimal with lot of decimals', () => {
+            controller.value = 10.124323234;
+
+            expect(el.textContent).toEqual('10.124');
+            expect(el.className).toContain('json-number');
+        });
     });
 });

front/core/components/multi-check/locale/es.yml

@@ -1,3 +1,3 @@
 SelectAllRows: Seleccionar las {{rows}} fila(s)
-All: Se han seleccionado
+Have been selected: Se han seleccionado
 row(s) have been selected.: fila(s).

front/core/components/searchbar/searchbar.js

@@ -203,7 +203,7 @@ export default class Searchbar extends Component {
 
     doSearch(filter, source) {
         if (filter === this.filter && !this.isIndex) return;
-        let promise = this.onSearch({$params: filter});
+        let promise = this.onSearch({$params: filter}, source);
         promise = promise || this.$q.resolve();
         promise.then(data => this.onFilter(filter, source, data));
         this.toBar(filter);
@@ -259,12 +259,6 @@ export default class Searchbar extends Component {
 
         this.filter = filter;
 
-        if (source == 'removeBar') {
-            delete params[this.toRemove];
-            delete this.model.userParams[this.toRemove];
-            this.model.refresh();
-        }
-
         if (!filter && this.model)
             this.model.clear();
         if (source != 'state')
@@ -279,7 +273,7 @@ export default class Searchbar extends Component {
         return {id: params.$row.id};
     }
 
-    onSearch(args) {
+    onSearch(args, source) {
         if (!this.model) return;
         let filter = args.$params;
 
@@ -325,6 +319,12 @@ export default class Searchbar extends Component {
             for (let param in stateFilter.tableQ)
                 params[param] = stateFilter.tableQ[param];
 
+            if (source == 'removeBar') {
+                delete params[this.toRemove];
+                delete this.model.userParams[this.toRemove];
+                delete stateFilter[this.toRemove];
+            }
+
             const newParams = Object.assign(stateFilter, params);
             return this.model.applyParams(newParams)
                 .then(() => this.model.data);

front/core/components/searchbar/searchbar.spec.js

@@ -197,7 +197,7 @@ describe('Component vnSearchbar', () => {
             controller.doSearch(filter, 'any');
             $scope.$apply();
 
-            expect(controller.onSearch).toHaveBeenCalledWith({$params: filter});
+            expect(controller.onSearch).toHaveBeenCalledWith({$params: filter}, 'any');
             expect(controller.onFilter).toHaveBeenCalledWith(filter, 'any', undefined);
         });
     });

front/core/components/th/index.js

@@ -8,18 +8,8 @@ export default class Th {
         $element.on('click', () => this.onToggleOrder());
     }
 
-    /**
-     * Changes the order if the cell has a field and defaultOrder property
-     */
     $onInit() {
         if (!this.field) return;
-
-        if (this.defaultOrder) {
-            this.order = this.defaultOrder;
-            this.table.applyOrder(this.field, this.order);
-            this.updateArrow();
-        }
-
         this.updateArrow();
     }
 
@@ -82,9 +72,6 @@ ngModule.vnComponent('vnTh', {
     template: require('./index.html'),
     transclude: true,
     controller: Th,
-    bindings: {
-        defaultOrder: '@?'
-    },
     require: {
         table: '^^vnTable'
     }

front/core/components/th/index.spec.js

@@ -17,17 +17,6 @@ describe('Component vnTh', () => {
         controller.column.setAttribute('field', 'MyField');
     }));
 
-    describe('onInit()', () => {
-        it(`should define controllers order as per defaultOrder then call setOrder()`, () => {
-            controller.defaultOrder = 'DESC';
-            jest.spyOn(controller.table, 'setOrder');
-            controller.$onInit();
-
-            expect(controller.order).toEqual('DESC');
-            expect(controller.table.setOrder).toHaveBeenCalledWith('MyField', 'DESC');
-        });
-    });
-
     describe('toggleOrder()', () => {
         it(`should change the ordenation to DESC (descendant) if it was ASC (ascendant)`, () => {
             controller.order = 'ASC';

front/core/lib/string.js

@@ -30,3 +30,39 @@ export function camelToKebab(str) {
 export function firstUpper(str) {
     return str.charAt(0).toUpperCase() + str.substr(1);
 }
+
+export function djb2a(string) {
+    let hash = 5381;
+    for (let i = 0; i < string.length; i++)
+        hash = ((hash << 5) + hash) ^ string.charCodeAt(i);
+    return hash >>> 0;
+}
+
+export function hashToColor(value) {
+    return '#' + colors[djb2a(value || '') % colors.length];
+}
+
+const colors = [
+    'b5b941', // Yellow
+    'ae9681', // Peach
+    'd78767', // Salmon
+    'cc7000', // Orange bright
+    'e2553d', // Coral
+    '8B0000', // Red dark
+    'de4362', // Red crimson
+    'FF1493', // Ping intense
+    'be39a2', // Pink light
+    'b754cf', // Purple middle
+    'a87ba8', // Pink
+    '8a69cd', // Blue lavender
+    'ab20ab', // Purple dark
+    '00b5b8', // Turquoise
+    '1fa8a1', // Green ocean
+    '5681cf', // Blue steel
+    '3399fe', // Blue sky
+    '6d9c3e', // Green chartreuse
+    '51bb51', // Green lime
+    '518b8b', // Gray board
+    '7e7e7e', // Gray
+    '5d5d5d', // Gray dark
+];

front/core/styles/text.scss

@@ -38,6 +38,9 @@
 .text-overline {
     font-size: .8rem;
 }
+.text-capitalize {
+    text-transform: capitalize;
+}
 
 h1, h2, h3, h4, h5, h6 {
     padding: 0;

front/core/styles/util.scss

@@ -1,4 +1,11 @@
+@import "./variables";
+@import "./effects";
 
+@mixin mobile {
+    @media screen and (max-width: $mobile-width) {
+        @content;
+    }
+}
 @mixin browser($browser) {
     html[data-browser*="#{$browser}"] & {
         @content;

front/core/styles/variables.scss

@@ -1,5 +1,3 @@
-@import "./util";
-
 $font-size: 11pt;
 $menu-width: 256px;
 $topbar-height: 56px;

front/salix/components/background/style.scss

@@ -1,4 +1,4 @@
-@import "variables";
+@import "util";
 
 @keyframes fadein {
     from {
@@ -16,7 +16,7 @@ vn-background {
     background-color: black;
     z-index: 14;
 
-    @media screen and (max-width: $mobile-width) {
+    @include mobile {
         &.shown {
             display: block;
             opacity: .3;

front/salix/components/descriptor/style.scss

@@ -7,11 +7,13 @@ vn-descriptor-content {
 
     .photo {
         position: relative;
+        width: 100%;
+        text-align: center;
+        overflow: hidden;
 
         & > img[ng-src] {
             min-height: 16em;
             display: block;
-            max-width: 100%;
             height: 256px;
         }
 

front/salix/components/layout/style.scss

@@ -1,4 +1,4 @@
-@import "effects";
+@import "util";
 
 vn-layout {
     & > vn-topbar {
@@ -134,7 +134,7 @@ vn-layout {
             border-radius: 50%;
         }
     }
-    @media screen and (max-width: $mobile-width) {
+    @include mobile {
         & > vn-topbar {
             & > .start > .logo {
                 display: none;

front/salix/components/log/index.html

@@ -10,16 +10,18 @@
 </vn-crud-model>
 <vn-crud-model
     url="{{$ctrl.url}}/{{$ctrl.originId}}/models"
-    data="models"
+    data="$ctrl.models"
     order="changedModel"
     auto-load="true">
 </vn-crud-model>
-<vn-data-viewer model="model" class="vn-w-md vn-px-sm">
+<vn-data-viewer
+    model="model"
+    class="vn-w-sm vn-px-sm vn-pb-xl">
     <div class="change vn-mb-sm" ng-repeat="log in $ctrl.logs">
-        <div class="user-wrapper">
+        <div class="left">
             <vn-avatar class="vn-mt-xs"
                 ng-class="::{system: !log.user}"
-                val="{{::log.user ? log.user.nickname : 'System'}}"
+                val="{{::log.user ? log.user.nickname : $ctrl.$t('System')}}"
                 ng-click="$ctrl.showWorkerDescriptor($event, log)">
                 <img
                     ng-if="::log.user.image"
@@ -29,92 +31,104 @@
             <div class="arrow bg-panel"></div>
             <div class="line"></div>
         </div>
-        <vn-card class="detail vn-pa-sm">
-            <div class="header vn-mb-sm">
-                <div
-                    class="date text-secondary text-caption"
-                    title="{{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}">
-                    {{::$ctrl.relativeDate(log.creationDate)}}
+        <vn-card class="detail">
+            <div class="header vn-pa-sm">
+                <div class="action-model">
+                    <span class="model-name"
+                        ng-if="::$ctrl.showModelName && log.changedModel"
+                        ng-style="::{backgroundColor: $ctrl.hashToColor(log.changedModel)}"
+                        title="{{::log.changedModel}}">
+                        {{::log.changedModelI18n}}
+                    </span>
+                </div>
+                <div
+                    class="action-date text-secondary text-caption vn-ml-sm"
+                    title="{{::log.creationDate | date:'dd/MM/yyyy HH:mm:ss'}}">
+                    {{::$ctrl.relativeDate(log.creationDate)}}
+                    <vn-icon
+                        class="action vn-ml-xs"
+                        ng-class="::$ctrl.actionsClass[log.action]"
+                        icon="{{::$ctrl.actionsIcon[log.action]}}"
+                        translate-attr="::{title: $ctrl.actionsText[log.action]}">
+                    </vn-icon>
                 </div>
-                <span class="chip" ng-class="::$ctrl.actionsClass[log.action]" translate>
-                    {{::$ctrl.actionsText[log.action]}}
-                </span>
             </div>
-            <div
-                class="model vn-mb-sm"
-                title="{{::log.changedModelValue}}"
-                ng-if="::log.changedModel || log.changedModelValue">
-                <span class="model-name"
-                    ng-if="::$ctrl.showModelName"
-                    title="{{::log.changedModel}}">
-                    {{::log.changedModelI18n}}
-                </span>
-                <span class="model-id"
-                    ng-if="::log.changedModelId">
-                    #{{::log.changedModelId}}
-                </span>
-                <span class="model-value">
-                    {{::log.changedModelValue}}
-                </span>
+            <div class="model vn-pb-sm vn-px-sm"
+                ng-if="::$ctrl.showModelName">
+                <span class="model-id" ng-if="::log.changedModelId">#{{::log.changedModelId}}</span>
+                <vn-icon
+                    icon="filter_alt"
+                    translate-attr="{title: 'Show all record changes'}"
+                    ng-click="$ctrl.filterByEntity(log)">
+                </vn-icon>
+                <span class="model-value" title="{{::log.changedModelValue}}">{{::log.changedModelValue}}</span>
             </div>
-            <div class="changes"
-                ng-class="::log.props.length ? 'props' : 'no-props'"
-                vn-id="changes">
-                <vn-icon icon="visibility"
-                    class="expand-button"
-                    ng-click="$ctrl.toggleAttributes(log, changes, true)">
+            <div class="changes vn-pa-sm"
+                ng-class="{expanded: log.expand}"
+                ng-if="::log.props.length || log.description">
+                <vn-icon
+                    icon="expand_more"
+                    translate-attr="{title: 'Details'}"
+                    ng-click="log.expand = !log.expand">
                 </vn-icon>
-                <vn-icon icon="visibility_off"
-                    class="shrink-button"
-                    ng-click="$ctrl.toggleAttributes(log, changes, false)">
-                </vn-icon>
-                <div class="changes-wrapper">
-                    <span ng-if="::log.props.length"
-                        class="attributes">
-                        <span ng-if="!log.expand" ng-repeat="prop in ::log.props"
-                            class="basic-json">
-                            <span class="json-field"
-                                title="{{::prop.name}}">
+                <span ng-if="::log.props.length"
+                    class="attributes">
+                    <span ng-if="!log.expand" ng-repeat="prop in ::log.props"
+                        class="basic-json">
+                        <span class="json-field" title="{{::prop.name}}">
+                            {{::prop.nameI18n}}:
+                        </span>
+                        <vn-json-value value="::prop.val.val"></vn-json-value><span ng-if="::!$last">,</span>
+                    </span>
+                    <div ng-if="log.expand" class="expanded-json">
+                        <div ng-repeat="prop in ::log.props">
+                            <span class="json-field" title="{{::prop.name}}">
                                 {{::prop.nameI18n}}:
                             </span>
-                            <vn-json-value value="::$ctrl.mainVal(prop, log.action)"></vn-json-value><span ng-if="::!$last">,</span>
-                        </span>
-                        <div ng-if="log.expand"
-                            class="expanded-json">
-                            <div ng-repeat="prop in ::log.props">
-                                <span class="json-field"
-                                    title="{{::prop.name}}">
-                                    {{::prop.nameI18n}}:
-                                </span>
-                                <vn-json-value value="::$ctrl.mainVal(prop, log.action)"></vn-json-value>
-                                <span ng-if="::log.action == 'update'">
-                                    ← <vn-json-value value="::prop.old"></vn-json-value>
-                                </span>
-                            </div>
+                            <vn-log-value val="::prop.val"></vn-log-value>
+                            <span ng-if="::log.action == 'update'">
+                                ← <vn-log-value val="::prop.old"></vn-log-value>
+                            </span>
                         </div>
-                    </span>
-                    <span ng-if="::!log.props.length"
-                        class="description">
-                        {{::log.description}}
-                    </span>
-                    <span ng-if="::!log.description && !log.props.length"
-                        class="no-changes"
-                        translate>
-                        No changes
-                    </span>
-                </div>
+                    </div>
+                </span>
+                <span ng-if="::!log.props.length" class="description">
+                    {{::log.description}}
+                </span>
             </vn-card>
         </div>
     </div>
 </vn-data-viewer>
+<vn-float-button
+    ng-if="model.userFilter"
+    icon="filter_alt_off"
+    translate-attr="{title: 'Quit filter'}"
+    ng-click="$ctrl.resetFilter()"
+    fixed-bottom-right>
+</vn-float-button>
 <vn-side-menu side="right">
     <form vn-vertical
         ng-model-options="{updateOn: 'change blur'}"
         class="vn-pa-md filter">
         <vn-textfield
-            label="Name"
-            ng-model="filter.changedModelValue">
+            label="Search"
+            ng-model="filter.search">
+            <append>
+                <vn-icon
+                    icon="info_outline"
+                    vn-tooltip="Search by id or concept"
+                    pointer>
+                </vn-icon>
+            </append>
         </vn-textfield>
+        <vn-autocomplete
+            label="Entity"
+            ng-model="filter.changedModel"
+            value-field="changedModel"
+            show-field="changedModelI18n"
+            data="$ctrl.models"
+            class="changed-model">
+        </vn-autocomplete>
         <vn-vertical>
             <vn-radio
                 label="All"
@@ -131,7 +145,7 @@
                 val="system"
                 ng-model="filter.who">
             </vn-radio>
-        </div>
+        </vn-vertical>
         <vn-autocomplete
             ng-show="filter.who != 'system'"
             label="User"
@@ -159,16 +173,16 @@
                 </div>
             </tpl-item>
         </vn-autocomplete>
-        <vn-autocomplete
-            label="Model"
-            ng-model="filter.changedModel"
-            value-field="changedModel"
-            show-field="changedModel"
-            data="models">
-        </vn-autocomplete>
         <vn-textfield
-            label="Id"
-            ng-model="filter.changedModelId">
+            label="Changes"
+            ng-model="filter.changes">
+            <append>
+                <vn-icon
+                    icon="info_outline"
+                    vn-tooltip="Search by changes"
+                    pointer>
+                </vn-icon>
+            </append>
         </vn-textfield>
         <vn-vertical>
             <vn-check
@@ -176,7 +190,7 @@
                 ng-model="filter.actions.insert">
             </vn-check>
             <vn-check
-                label="Updates"
+                label="Edits"
                 ng-model="filter.actions.update">
             </vn-check>
             <vn-check
@@ -184,10 +198,10 @@
                 ng-model="filter.actions.delete">
             </vn-check>
             <vn-check
-                label="Views"
+                label="Accesses"
                 ng-model="filter.actions.select">
             </vn-check>
-        </div>
+        </vn-vertical>
         <vn-date-picker
             label="Date"
             ng-model="filter.from">
@@ -196,18 +210,6 @@
             label="To"
             ng-model="filter.to">
         </vn-date-picker>
-        <vn-button-bar vn-vertical class="vn-mt-sm">
-            <vn-button
-                label="Filter"
-                ng-click="$ctrl.applyFilter(filter)">
-            </vn-button>
-            <vn-button
-                label="Reset"
-                class="flat"
-                ng-click="$ctrl.resetFilter()"
-                ng-if="model.userFilter">
-            </vn-button>
-        </vn-button-bar>
     </form>
 </vn-side-menu>
 <vn-worker-descriptor-popover vn-id="workerDescriptor">

front/salix/components/log/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../../module';
 import Section from '../section';
+import {hashToColor} from 'core/lib/string';
 import './style.scss';
 
 const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/;
@@ -7,11 +8,12 @@ const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[
 export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
+        this.hashToColor = hashToColor;
         this.actionsText = {
             insert: 'Creates',
-            update: 'Updates',
+            update: 'Edits',
             delete: 'Deletes',
-            select: 'Views'
+            select: 'Accesses'
         };
         this.actionsClass = {
             insert: 'success',
@@ -19,6 +21,12 @@ export default class Controller extends Section {
             delete: 'alert',
             select: 'notice'
         };
+        this.actionsIcon = {
+            insert: 'add',
+            update: 'edit',
+            delete: 'remove',
+            select: 'visibility'
+        };
         this.filter = {
             include: [{
                 relation: 'user',
@@ -55,27 +63,61 @@ export default class Controller extends Section {
 
     set logs(value) {
         this._logs = value;
-        if (!this.logs) return;
+        if (!value) return;
+
         const empty = {};
         const validations = window.validations;
-        for (const log of value) {
-            const oldValues = log.oldInstance || empty;
-            const newValues = log.newInstance || empty;
-            const locale = validations[log.changedModel]?.locale || empty;
-            log.changedModelI18n = locale.name || log.changedModel;
+        const castJsonValue = this.castJsonValue;
 
-            let props = Object.keys(oldValues).concat(Object.keys(newValues));
+        for (const log of value) {
+            const notDelete = log.action != 'delete';
+            const olds = (notDelete ? log.oldInstance : null) || empty;
+            const vals = (notDelete ? log.newInstance : log.oldInstance) || empty;
+            const locale = validations[log.changedModel]?.locale || empty;
+            log.changedModelI18n = firstUpper(locale.name) || log.changedModel;
+
+            let props = Object.keys(olds).concat(Object.keys(vals));
             props = [...new Set(props)];
 
             log.props = [];
             for (const prop of props) {
+                if (prop.endsWith('$')) continue;
                 log.props.push({
                     name: prop,
-                    nameI18n: locale.columns?.[prop] || prop,
-                    old: this.castJsonValue(oldValues[prop]),
-                    new: this.castJsonValue(newValues[prop])
+                    nameI18n: firstUpper(locale.columns?.[prop]) || prop,
+                    old: getVal(olds, prop),
+                    val: getVal(vals, prop)
                 });
             }
+            log.props.sort(
+                (a, b) => a.nameI18n.localeCompare(b.nameI18n));
+        }
+
+        function getVal(vals, prop) {
+            let val, id;
+            const showProp = `${prop}$`;
+
+            if (vals[showProp] != null) {
+                val = vals[showProp];
+                id = vals[prop];
+            } else
+                val = vals[prop];
+
+            return {val: castJsonValue(val), id};
+        }
+    }
+
+    get models() {
+        return this._models;
+    }
+
+    set models(value) {
+        this._models = value;
+        if (!value) return;
+        for (const model of value) {
+            const name = model.changedModel;
+            model.changedModelI18n =
+                firstUpper(window.validations[name]?.locale?.name) || name;
         }
     }
 
@@ -89,15 +131,6 @@ export default class Controller extends Section {
             : value;
     }
 
-    mainVal(prop, action) {
-        return action == 'delete' ? prop.old : prop.new;
-    }
-
-    toggleAttributes(log, changesEl, force) {
-        log.expand = force;
-        changesEl.classList.toggle('expanded', force);
-    }
-
     relativeDate(dateVal) {
         if (dateVal == null) return '';
         const date = new Date(dateVal);
@@ -130,8 +163,18 @@ export default class Controller extends Section {
         function getParam(prop, value) {
             if (value == null || value == '') return null;
             switch (prop) {
-            case 'changedModelValue':
-                return {[prop]: {like: `%${value}%`}};
+            case 'search':
+                const or = [];
+                if (/^\s*[0-9]+\s*$/.test(value))
+                    return {changedModelId: value.trim()};
+                else
+                    return {changedModelValue: {like: `%${value}%`}};
+            case 'changes':
+                return {or: [
+                    {oldJson: {like: `%${value}%`}},
+                    {newJson: {like: `%${value}%`}},
+                    {description: {like: `%${value}%`}}
+                ]};
             case 'who':
                 switch (value) {
                 case 'all':
@@ -178,6 +221,14 @@ export default class Controller extends Section {
         return this.$.model.applyFilter(lbFilter);
     }
 
+    filterByEntity(log) {
+        this.$.filter = {
+            who: 'all',
+            search: log.changedModelId,
+            changedModel: log.changedModel
+        };
+    }
+
     searchUser(search) {
         if (/^[0-9]+$/.test(search)) {
             return {id: search};
@@ -195,6 +246,10 @@ export default class Controller extends Section {
     }
 }
 
+function firstUpper(str) {
+    return str && str.charAt(0).toUpperCase() + str.substr(1);
+}
+
 ngModule.vnComponent('vnLog', {
     controller: Controller,
     template: require('./index.html'),
@@ -206,3 +261,12 @@ ngModule.vnComponent('vnLog', {
         url: '@'
     }
 });
+
+ngModule.component('vnLogValue', {
+    template:
+        '<vn-json-value value="::$ctrl.val.val"></vn-json-value>' +
+        '<span ng-if="::$ctrl.val.id" class="id-value"> #{{::$ctrl.val.id}}</span>',
+    bindings: {
+        val: '<?',
+    }
+});

front/salix/components/log/locale/es.yml

@@ -1,5 +1,11 @@
 Date: Fecha
-Model: Modelo
+Concept: Concepto
+Search: Buscar
+Search by id or concept: Buscar por identificador o concepto
+Search by changes: |
+    Buscar por cambios. Los atributos deben buscarse por su nombre interno,
+    para obtenerlo situar el cursor sobre el atributo.
+Entity: Entidad
 Action: Acción
 Author: Autor
 Before: Antes
@@ -7,12 +13,15 @@ After: Despues
 History: Historial
 Name: Nombre
 Creates: Crea
-Updates: Actualiza
+Edits: Modifica
 Deletes: Elimina
-Views: Visualiza
+Accesses: Accede
+All: Todo
 System: Sistema
+Details: Detalles
 note: nota
 Changes: Cambios
-No changes: No hay cambios
 today: hoy
 yesterday: ayer
+Show all record changes: Mostrar todos los cambios realizados en el registro
+Quit filter: Quitar filtro