Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

2023-06-09 10:49:21 +02:00 · 2023-06-09 10:49:21 +02:00 · 7fd87c4b04
parent 790de4f05f b81b6c7020
commit 7fd87c4b04
483 changed files with 25214 additions and 23424 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,17 +5,74 @@ 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).

-## [2316.01] - 2023-05-04
+## [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
+
+### Changed
+- (General -> Permisos) Mejorada seguridad
+
+### 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
+-
+
+
+
+## [2318.01] - 2023-05-08

 ### Added
 - (Usuarios -> Histórico) Nueva sección
 - (Roles -> Histórico) Nueva sección
+- (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
+


 ## [2314.01] - 2023-04-20
--- a/4
+++ b/4
@ -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

--- a/9
+++ b/9
@ -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'
                }
@ -52,18 +52,19 @@ pipeline {
            }}}
            environment {
                NODE_ENV = ""
+                TZ = 'Europe/Madrid'
            }
            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'
                        }
                    }
@ -79,7 +80,7 @@ pipeline {
                CREDENTIALS = credentials('docker-registry')
            }
            steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                    sh 'gulp build'
                }

--- a/back/methods/collection/setSaleQuantity.js
+++ b/back/methods/collection/setSaleQuantity.js
@ -40,8 +40,7 @@ module.exports = Self => {
        try {
            const sale = await models.Sale.findById(saleId, null, myOptions);
            const saleUpdated = await sale.updateAttributes({
-                originalQuantity: sale.quantity,
-                quantity: quantity
+                quantity
            }, myOptions);

            if (tx) await tx.commit();
--- a/back/methods/collection/spec/setSaleQuantity.spec.js
+++ b/back/methods/collection/spec/setSaleQuantity.spec.js
@ -30,7 +30,7 @@ describe('setSaleQuantity()', () => {
            await models.Collection.setSaleQuantity(saleId, newQuantity, options);
            const updateSale = await models.Sale.findById(saleId, null, options);

-            expect(updateSale.originalQuantity).toEqual(originalSale.quantity);
+            expect(updateSale.quantity).not.toEqual(originalSale.quantity);
            expect(updateSale.quantity).toEqual(newQuantity);

            await tx.rollback();
--- a/back/methods/docuware/deliveryNoteEmail.js
+++ b/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,
--- a/back/methods/edi/sql/item.sql
+++ b/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')
+		
--- a/back/methods/edi/updateData.js
+++ b/back/methods/edi/updateData.js
@ -3,236 +3,237 @@ const path = require('path');
 const fs = require('fs-extra');

 module.exports = Self => {
-    Self.remoteMethodCtx('updateData', {
-        description: 'Updates schema data from external provider',
-        accessType: 'WRITE',
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/updateData`,
-            verb: 'POST'
-        }
-    });
+	Self.remoteMethodCtx('updateData', {
+		description: 'Updates schema data from external provider',
+		accessType: 'WRITE',
+		returns: {
+			type: 'object',
+			root: true
+		},
+		http: {
+			path: `/updateData`,
+			verb: 'POST'
+		}
+	});

-    Self.updateData = async() => {
-        const models = Self.app.models;
+	Self.updateData = async() => {
+		const models = Self.app.models;

-        // Get files checksum
-        const tx = await Self.beginTransaction({});
+		// Get files checksum
+		const tx = await Self.beginTransaction({});

-        try {
-            const options = {transaction: tx};
-            const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
+		try {
+			const options = {transaction: tx};
+			const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);

-            const updatableFiles = [];
-            for (const file of files) {
-                const fileChecksum = await getChecksum(file);
+			const updatableFiles = [];
+			for (const file of files) {
+				const fileChecksum = await getChecksum(file);

-                if (file.checksum != fileChecksum) {
-                    updatableFiles.push({
-                        name: file.name,
-                        checksum: fileChecksum
-                    });
-                } else
-                    console.debug(`File already updated, skipping...`);
-            }
+				if (file.checksum != fileChecksum) {
+					updatableFiles.push({
+						name: file.name,
+						checksum: fileChecksum
+					});
+				} else
+					console.debug(`File already updated, skipping...`);
+			}

-            if (updatableFiles.length === 0)
-                return false;
+			if (updatableFiles.length === 0)
+				return false;

-            // Download files
-            const container = await models.TempContainer.container('edi');
-            const tempPath = path.join(container.client.root, container.name);
+			// Download files
+			const container = await models.TempContainer.container('edi');
+			const tempPath = path.join(container.client.root, container.name);

-            let remoteFile;
-            let tempDir;
-            let tempFile;
+			let remoteFile;
+			let tempDir;
+			let tempFile;

-            const fileNames = updatableFiles.map(file => file.name);
+			const fileNames = updatableFiles.map(file => file.name);

-            const tables = await Self.rawSql(`
-                SELECT fileName, toTable, file
-                    FROM edi.tableConfig
-                WHERE file IN (?)`, [fileNames], options);
+			const tables = await Self.rawSql(`
+				SELECT fileName, toTable, file
+					FROM edi.tableConfig
+				WHERE file IN (?)`, [fileNames], options);

-            for (const table of tables) {
-                const fileName = table.file;
+			for (const table of tables) {
+				const fileName = table.file;

-                remoteFile = `codes/${fileName}.ZIP`;
-                tempDir = `${tempPath}/${fileName}`;
-                tempFile = `${tempPath}/${fileName}.zip`;
+				remoteFile = `codes/${fileName}.ZIP`;
+				tempDir = `${tempPath}/${fileName}`;
+				tempFile = `${tempPath}/${fileName}.zip`;

-                try {
-                    await fs.readFile(tempFile);
-                } catch (error) {
-                    if (error.code === 'ENOENT') {
-                        console.debug(`Downloading file ${fileName}...`);
-                        const downloadOutput = await downloadFile(remoteFile, tempFile);
-                        if (downloadOutput.error)
-                            continue;
-                    }
-                }
+				try {
+					await fs.readFile(tempFile);
+				} catch (error) {
+					if (error.code === 'ENOENT') {
+						console.debug(`Downloading file ${fileName}...`);
+						const downloadOutput = await downloadFile(remoteFile, tempFile);
+						if (downloadOutput.error)
+							continue;
+					}
+				}

-                await extractFile(fileName, tempFile, tempDir);
+				await extractFile(fileName, tempFile, tempDir);

-                console.debug(`Updating table ${table.toTable}...`);
-                await dumpData(tempDir, table, options);
-            }
+				console.debug(`Updating table ${table.toTable}...`);
+				await dumpData(tempDir, table, options);
+			}

-            // Update files checksum
-            for (const file of updatableFiles) {
-                console.log(`Updating file ${file.name} checksum...`);
-                await Self.rawSql(`
-                        UPDATE edi.fileConfig
-                            SET checksum = ?
-                        WHERE name = ?`,
-                [file.checksum, file.name], options);
-            }
+			// Update files checksum
+			for (const file of updatableFiles) {
+				console.log(`Updating file ${file.name} checksum...`);
+				await Self.rawSql(`
+						UPDATE edi.fileConfig
+							SET checksum = ?
+						WHERE name = ?`,
+				[file.checksum, file.name], options);
+			}

-            await tx.commit();
+			await tx.commit();

-            // Clean files
-            try {
-                console.debug(`Cleaning files...`);
-                await fs.remove(tempPath);
-            } catch (error) {
-                if (error.code !== 'ENOENT')
-                    throw e;
-            }
+			// Clean files
+			try {
+				console.debug(`Cleaning files...`);
+				await fs.remove(tempPath);
+			} catch (error) {
+				if (error.code !== 'ENOENT')
+					throw e;
+			}

-            return true;
-        } catch (error) {
-            await tx.rollback();
-            throw error;
-        }
-    };
+			return true;
+		} catch (error) {
+			await tx.rollback();
+			throw error;
+		}
+	};

-    let ftpClient;
-    async function getFtpClient() {
-        if (!ftpClient) {
-            const [ftpConfig] = await Self.rawSql('SELECT host, user, password FROM edi.ftpConfig');
-            console.debug(`Openning FTP connection to ${ftpConfig.host}...\n`);
+	let ftpClient;
+	async function getFtpClient() {
+		if (!ftpClient) {
+			const [ftpConfig] = await Self.rawSql('SELECT host, user, password FROM edi.ftpConfig');
+			console.debug(`Openning FTP connection to ${ftpConfig.host}...\n`);

-            const FtpClient = require('ftps');
+			const FtpClient = require('ftps');

-            ftpClient = new FtpClient({
-                host: ftpConfig.host,
-                username: ftpConfig.user,
-                password: ftpConfig.password,
-                procotol: 'ftp'
-            });
-        }
+			ftpClient = new FtpClient({
+				host: ftpConfig.host,
+				username: ftpConfig.user,
+				password: ftpConfig.password,
+				procotol: 'ftp',
+				additionalLftpCommands: 'set ssl:verify-certificate no'
+			});
+		}

-        return ftpClient;
-    }
+		return ftpClient;
+	}

-    async function getChecksum(file) {
-        const ftpClient = await getFtpClient();
-        console.debug(`Checking checksum for file ${file.name}...`);
+	async function getChecksum(file) {
+		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) => {
-                if (err || response.error) {
-                    console.debug(`Error downloading checksum file... ${response.error}`);
-                    return reject(err);
-                }
+		const response = await new Promise((resolve, reject) => {
+			ftpClient.exec((err, response) => {
+				if (err || response.error) {
+					console.debug(`Error downloading checksum file... ${response.error}`);
+					return reject(err);
+				}

-                resolve(response);
-            });
-        });
+				resolve(response);
+			});
+		});

-        if (response && response.data) {
-            const fileContents = response.data;
-            const rows = fileContents.split('\n');
-            const row = rows[4];
-            const columns = row.split(/\s+/);
+		if (response && response.data) {
+			const fileContents = response.data;
+			const rows = fileContents.split('\n');
+			const row = rows[4];
+			const columns = row.split(/\s+/);

-            let fileChecksum;
-            if (file.keyValue)
-                fileChecksum = columns[1];
+			let fileChecksum;
+			if (file.keyValue)
+				fileChecksum = columns[1];

-            if (!file.keyValue)
-                fileChecksum = columns[0];
+			if (!file.keyValue)
+				fileChecksum = columns[0];

-            return fileChecksum;
-        }
-    }
+			return fileChecksum;
+		}
+	}

-    async function downloadFile(remoteFile, tempFile) {
-        const ftpClient = await getFtpClient();
+	async function downloadFile(remoteFile, tempFile) {
+		const ftpClient = await getFtpClient();

-        ftpClient.get(remoteFile, tempFile);
+		ftpClient.get(remoteFile, tempFile);

-        return new Promise((resolve, reject) => {
-            ftpClient.exec((err, response) => {
-                if (err || response.error) {
-                    console.debug(`Error downloading file... ${response.error}`);
-                    return reject(err);
-                }
+		return new Promise((resolve, reject) => {
+			ftpClient.exec((err, response) => {
+				if (err || response.error) {
+					console.debug(`Error downloading file... ${response.error}`);
+					return reject(err);
+				}

-                resolve(response);
-            });
-        });
-    }
+				resolve(response);
+			});
+		});
+	}

-    async function extractFile(fileName, tempFile, tempDir) {
-        const JSZip = require('jszip');
+	async function extractFile(fileName, tempFile, tempDir) {
+		const JSZip = require('jszip');

-        try {
-            await fs.mkdir(tempDir);
-            console.debug(`Extracting file ${fileName}...`);
-        } catch (error) {
-            if (error.code !== 'EEXIST')
-                throw e;
-        }
+		try {
+			await fs.mkdir(tempDir);
+			console.debug(`Extracting file ${fileName}...`);
+		} catch (error) {
+			if (error.code !== 'EEXIST')
+				throw e;
+		}

-        const fileStream = await fs.readFile(tempFile);
-        if (fileStream) {
-            const zip = new JSZip();
-            const zipContents = await zip.loadAsync(fileStream);
+		const fileStream = await fs.readFile(tempFile);
+		if (fileStream) {
+			const zip = new JSZip();
+			const zipContents = await zip.loadAsync(fileStream);

-            if (!zipContents) return;
+			if (!zipContents) return;

-            const fileNames = Object.keys(zipContents.files);
+			const fileNames = Object.keys(zipContents.files);

-            for (const fileName of fileNames) {
-                const fileContent = await zip.file(fileName).async('nodebuffer');
-                const dest = path.join(tempDir, fileName);
-                await fs.writeFile(dest, fileContent);
-            }
-        }
-    }
+			for (const fileName of fileNames) {
+				const fileContent = await zip.file(fileName).async('nodebuffer');
+				const dest = path.join(tempDir, fileName);
+				await fs.writeFile(dest, fileContent);
+			}
+		}
+	}

-    async function dumpData(tempDir, table, options) {
-        const toTable = table.toTable;
-        const baseName = table.fileName;
+	async function dumpData(tempDir, table, options) {
+		const toTable = table.toTable;
+		const baseName = table.fileName;

-        console.log(`Emptying table ${toTable}...`);
-        const tableName = `edi.${toTable}`;
-        await Self.rawSql(`DELETE FROM ??`, [tableName]);
+		console.log(`Emptying table ${toTable}...`);
+		const tableName = `edi.${toTable}`;
+		await Self.rawSql(`DELETE FROM ??`, [tableName]);

-        const dirFiles = await fs.readdir(tempDir);
-        const files = dirFiles.filter(file => file.startsWith(baseName));
+		const dirFiles = await fs.readdir(tempDir);
+		const files = dirFiles.filter(file => file.startsWith(baseName));

-        for (const file of files) {
-            console.log(`Dumping data from file ${file}...`);
+		for (const file of files) {
+			console.log(`Dumping data from file ${file}...`);

-            const templatePath = path.join(__dirname, `./sql/${toTable}.sql`);
-            const sqlTemplate = await fs.readFile(templatePath, 'utf8');
-            const filePath = path.join(tempDir, file);
+			const templatePath = path.join(__dirname, `./sql/${toTable}.sql`);
+			const sqlTemplate = await fs.readFile(templatePath, 'utf8');
+			const filePath = path.join(tempDir, file);

-            await Self.rawSql(sqlTemplate, [filePath], options);
-            await Self.rawSql(`
-                        UPDATE edi.tableConfig
-                            SET updated = ?
-                        WHERE fileName = ?
-                `, [Date.vnNew(), baseName], options);
-        }
+			await Self.rawSql(sqlTemplate, [filePath], options);
+			await Self.rawSql(`
+						UPDATE edi.tableConfig
+							SET updated = ?
+						WHERE fileName = ?
+				`, [Date.vnNew(), baseName], options);
+		}

-        console.log(`Updated table ${toTable}\n`);
-    }
+		console.log(`Updated table ${toTable}\n`);
+	}
 };
--- a/back/methods/image/download.js
+++ b/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`);

--- a/back/methods/vn-user/acl.js
+++ b/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({
--- a/back/models/image-collection.js
+++ b/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);
--- a/back/tests.js
+++ b/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();
--- a/db/.archive/225201/00-invoiceOut_new.sql
+++ b/db/.archive/225201/00-invoiceOut_new.sql
@ -8,7 +8,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
 BEGIN
 /**
 * Creación de facturas emitidas.
- * requiere previamente tabla ticketToInvoice(id).
+ * requiere previamente tabla tmp.ticketToInvoice(id).
 *
 * @param vSerial serie a la cual se hace la factura
 * @param vInvoiceDate fecha de la factura
@ -36,13 +36,13 @@ BEGIN

 	SELECT t.clientFk, t.companyFk
 			INTO vClient, vCompany
-		FROM ticketToInvoice tt
+		FROM tmp.ticketToInvoice tt
 			JOIN ticket t ON t.id = tt.id
 		LIMIT 1;

-	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	-- Eliminem de tmp.ticketToInvoice els tickets que no han de ser facturats
 	DELETE ti.*
-		FROM ticketToInvoice 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
@ -57,7 +57,7 @@ BEGIN

 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
 			INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			LEFT JOIN sale s ON s.ticketFk = t.id
 			LEFT JOIN ticketService ts ON ts.ticketFk = t.id;

@ -100,13 +100,13 @@ BEGIN
 			WHERE id = vNewInvoiceId;

 		UPDATE ticket t
-				JOIN ticketToInvoice ti ON ti.id = t.id
+				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 ticketToInvoice ti
+				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);
@ -116,7 +116,7 @@ BEGIN

 		INSERT INTO ticketLog (action, userFk, originFk, description)
 			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
-				FROM ticketToInvoice ti;
+				FROM tmp.ticketToInvoice ti;

 		CALL invoiceExpenceMake(vNewInvoiceId);
 		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
@ -159,7 +159,7 @@ BEGIN
 				(KEY (ticketFk))
 				ENGINE = MEMORY
 				SELECT id ticketFk
-					FROM ticketToInvoice;
+					FROM tmp.ticketToInvoice;

 			CALL `ticket_getTax`('NATIONAL');

@ -220,6 +220,6 @@ BEGIN

 	END IF;

-	DROP TEMPORARY TABLE `ticketToInvoice`;
+	DROP TEMPORARY TABLE `tmp`.`ticketToInvoice`;
 END$$
 DELIMITER ;
--- a/db/.archive/230202/00-itemConfig.sql
+++ b/db/.archive/230202/00-itemConfig.sql
--- a/db/.archive/230401/00-ACL.sql
+++ b/db/.archive/230401/00-ACL.sql
--- a/db/.archive/230401/00-ACL_tag_update.sql
+++ b/db/.archive/230401/00-ACL_tag_update.sql
--- a/db/.archive/230401/00-createWorker.sql
+++ b/db/.archive/230401/00-createWorker.sql
--- a/db/.archive/230401/00-ticket_canAdvance.sql
+++ b/db/.archive/230401/00-ticket_canAdvance.sql
--- a/db/.archive/230401/00-updateIsToBeMailed.sql
+++ b/db/.archive/230401/00-updateIsToBeMailed.sql
--- a/db/.archive/230403/00-clienteCompensado.sql
+++ b/db/.archive/230403/00-clienteCompensado.sql
--- a/db/.archive/230404/00-ticket_canAdvance.sql
+++ b/db/.archive/230404/00-ticket_canAdvance.sql
--- a/db/.archive/230601/00-acl_claim.sql
+++ b/db/.archive/230601/00-acl_claim.sql
--- a/db/.archive/230601/00-acl_notifications.sql
+++ b/db/.archive/230601/00-acl_notifications.sql
--- a/db/.archive/230601/00-itemConfig_warehouseFk.sql
+++ b/db/.archive/230601/00-itemConfig_warehouseFk.sql
--- a/db/.archive/230601/00-uniqueKeyNotificationSubscription.sql
+++ b/db/.archive/230601/00-uniqueKeyNotificationSubscription.sql
--- a/db/.archive/230601/01-alter_notSubs.sql
+++ b/db/.archive/230601/01-alter_notSubs.sql
--- a/db/.archive/230801/00-acl_itemConfig.sql
+++ b/db/.archive/230801/00-acl_itemConfig.sql
--- a/db/.archive/230801/00-supplierIsVies.sql
+++ b/db/.archive/230801/00-supplierIsVies.sql
--- a/db/.archive/230801/00-workerLocker.sql
+++ b/db/.archive/230801/00-workerLocker.sql
--- a/db/.archive/230801/01-sage_supplierAdd.sql
+++ b/db/.archive/230801/01-sage_supplierAdd.sql
--- a/db/.archive/231001/00-delivery.sql
+++ b/db/.archive/231001/00-delivery.sql
--- a/db/.archive/231001/00-invoiceOut.sql
+++ b/db/.archive/231001/00-invoiceOut.sql
--- a/db/.archive/231001/00-invoiceOut_getWeight.sql
+++ b/db/.archive/231001/00-invoiceOut_getWeight.sql
--- a/db/.archive/231001/00-report.sql
+++ b/db/.archive/231001/00-report.sql
--- a/db/.archive/231001/01-invoiceOut_getMaxIssued.sql
+++ b/db/.archive/231001/01-invoiceOut_getMaxIssued.sql
--- a/db/.archive/231001/02-invoiceOut_new.sql
+++ b/db/.archive/231001/02-invoiceOut_new.sql
@ -10,7 +10,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
 BEGIN
 /**
 * Creación de facturas emitidas.
- * requiere previamente tabla ticketToInvoice(id).
+ * requiere previamente tabla tmp.ticketToInvoice(id).
 *
 * @param vSerial serie a la cual se hace la factura
 * @param vInvoiceDate fecha de la factura
@ -49,7 +49,7 @@ BEGIN
 				vCompanyFk,
 				vMaxShipped,
 				vIsCorrectInvoiceDate
-		FROM ticketToInvoice tt
+		FROM tmp.ticketToInvoice tt
 			JOIN ticket t ON t.id = tt.id;

 	IF(vMaxShipped > vInvoiceDate) THEN
@ -60,9 +60,9 @@ BEGIN
 		CALL util.throw('Exists an invoice with a previous date');
 	END IF;

-	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	-- Eliminem de tmp.ticketToInvoice els tickets que no han de ser facturats
 	DELETE ti.*
-		FROM ticketToInvoice 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
@ -77,11 +77,11 @@ BEGIN

 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
 		INTO vIsAnySaleToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			JOIN sale s ON s.ticketFk = t.id;

 	SELECT COUNT(*) > 0 INTO vIsAnyServiceToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			JOIN ticketService ts ON ts.ticketFk = t.id;

 	IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
@ -121,13 +121,13 @@ BEGIN
 			WHERE id = vNewInvoiceId;

 		UPDATE ticket t
-				JOIN ticketToInvoice ti ON ti.id = t.id
+				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 ticketToInvoice ti
+				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);
@ -137,7 +137,7 @@ BEGIN

 		INSERT INTO ticketLog (action, userFk, originFk, description)
 			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
-				FROM ticketToInvoice ti;
+				FROM tmp.ticketToInvoice ti;

 		CALL invoiceExpenceMake(vNewInvoiceId);
 		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
@ -175,7 +175,7 @@ BEGIN
 				(KEY (ticketFk))
 				ENGINE = MEMORY
 				SELECT id ticketFk
-					FROM ticketToInvoice;
+					FROM tmp.ticketToInvoice;

 			CALL `ticket_getTax`('NATIONAL');

@ -253,6 +253,6 @@ BEGIN
 			DROP TEMPORARY TABLE tmp.ticketServiceTax;
 		END IF;
 	END IF;
-	DROP TEMPORARY TABLE `ticketToInvoice`;
+	DROP TEMPORARY TABLE tmp.`ticketToInvoice`;
 END$$
 DELIMITER ;
--- a/db/.archive/231001/03-ticketPackaging_add.sql
+++ b/db/.archive/231001/03-ticketPackaging_add.sql
--- a/db/Dockerfile
+++ b/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

--- a/db/changes/231201/00-wagon.sql
+++ b/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');
+
--- a/db/changes/231801/00-accountCountry.sql
+++ b/db/changes/231801/00-accountCountry.sql
--- a/db/changes/231801/00-aclClientInforma.sql
+++ b/db/changes/231801/00-aclClientInforma.sql
--- a/db/changes/231801/00-acl_receiptEmail.sql
+++ b/db/changes/231801/00-acl_receiptEmail.sql
--- a/db/changes/231801/00-clientInforma.sql
+++ b/db/changes/231801/00-clientInforma.sql
--- a/db/changes/231801/00-client_setRatingAcl.sql
+++ b/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'),
--- a/db/changes/231801/00-deleteProcs_refund.sql
+++ b/db/changes/231801/00-deleteProcs_refund.sql
--- a/db/changes/231801/00-deviceProduction.sql
+++ b/db/changes/231801/00-deviceProduction.sql
--- a/db/changes/231801/00-kkearEntryNotes.sql
+++ b/db/changes/231801/00-kkearEntryNotes.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`entry` DROP COLUMN `notes`;
--- a/db/changes/231801/00-newCompanyI18n.sql
+++ b/db/changes/231801/00-newCompanyI18n.sql
--- a/db/changes/231801/00-newTableWeb.sql
+++ b/db/changes/231801/00-newTableWeb.sql
--- a/db/changes/231801/00-observationEmailACL.sql
+++ b/db/changes/231801/00-observationEmailACL.sql
--- a/db/changes/231801/00-optimiceZoneEstimatedDelivery.sql
+++ b/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`;
--- a/db/changes/231801/00-saleTracking.sql
+++ b/db/changes/231801/00-saleTracking.sql
@ -0,0 +1,5 @@
+DROP PROCEDURE IF EXISTS `vn`.`sale_setQuantity`;
+DROP PROCEDURE IF EXISTS `vn`.`collection_updateSale`;
+DROP PROCEDURE IF EXISTS `vn`.`replaceMovimientosMark`;
+DROP PROCEDURE IF EXISTS `vn`.`saleTracking_Replace`;
+DROP PROCEDURE IF EXISTS `vn`.`sale_updateOriginalQuantity`;
--- a/db/changes/231801/00-ticketConfig.sql
+++ b/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';
--- a/db/changes/231801/00-updateIsVies.sql
+++ b/db/changes/231801/00-updateIsVies.sql
@ -0,0 +1,5 @@
+    UPDATE `vn`.`supplier` s
+            JOIN `vn`.`country` c ON c.id = s.countryFk
+        SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
+        WHERE s.isVies = TRUE
+            AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);
--- a/db/changes/231801/00-updateisViesClient.sql
+++ b/db/changes/231801/00-updateisViesClient.sql
@ -0,0 +1,5 @@
+UPDATE IGNORE `vn`.`client` c
+        JOIN `vn`.`country` co ON co.id = c.countryFk
+    SET c.fi = MID(REPLACE(c.fi, ' ', ''), 3, LENGTH(REPLACE(c.fi, ' ', '')) - 1)
+    WHERE c.isVies = TRUE
+        AND co.code = LEFT(REPLACE(c.fi, ' ', ''), 2);
--- a/db/changes/231801/00-userAcl.sql
+++ b/db/changes/231801/00-userAcl.sql
--- a/db/changes/231801/00-userRoleLog.sql
+++ b/db/changes/231801/00-userRoleLog.sql
--- a/db/changes/231801/01-viewCompany10L.sql
+++ b/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`()));
--- a/db/changes/232001/00-clientWorkerName.sql
+++ b/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 ;
--- a/db/changes/232001/00-createWorker.sql
+++ b/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';
--- a/db/changes/232001/00-invoiceOut_new.sql
+++ b/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 ;
--- a/db/changes/232001/00-wagon.sql
+++ b/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;
--- a/db/changes/232201/00-defaulterView.sql
+++ b/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`));
--- a/db/changes/232201/00-procedurecanAdvance.sql
+++ b/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 ;
--- a/db/changes/232201/00-procedurecanbePostponed.sql
+++ b/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 ;
--- a/db/changes/232201/00-workerConfigPayMethod.sql
+++ b/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;
--- a/db/changes/232202/00-procedurecanAdvance.sql
+++ b/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 ;
--- a/db/changes/232202/00-procedurecanbePostponed.sql
+++ b/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 ;
--- a/db/changes/232401/.gitkeep
+++ b/db/changes/232401/.gitkeep
--- a/db/changes/232401/00-buyConfig_travelConfig.sql
+++ b/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');
--- a/db/changes/232401/00-printer.sql
+++ b/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;
--- a/db/changes/232401/00-ticket_warehouse.sql
+++ b/db/changes/232401/00-ticket_warehouse.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`ticket` MODIFY COLUMN warehouseFk smallint(6) unsigned DEFAULT NULL NULL;
--- a/db/changes/232401/00-useSpecificsAcls.sql
+++ b/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 = '*';
--- a/db/changes/232601/.gitkeep
+++ b/db/changes/232601/.gitkeep
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
--- a/db/dump/fixtures.sql
+++ b/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),
@ -1409,16 +1411,16 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
        (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,   'seventh travel',   2, 1),
        (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,   'eight travel',     1, 2);

-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `notes`, `evaNotes`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
    VALUES
-        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, 0, '',    ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0, 'this is the note two',    'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0, 'this is the note three',  'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0, 'this is the note four',   'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0, 'this is the note five',   'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0, 'this is the note six',    'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0, 'this is the note seven',  'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1, '',  '');
+        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, 0,    ''),
+        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0,    'observation two'),
+        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0,  'observation three'),
+        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0,   'observation four'),
+        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0,   'observation five'),
+        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0,    'observation six'),
+        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  '');

 INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWaste`, `rate`)
    VALUES
@ -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,10 +2783,23 @@ 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'");
+
+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
@ -2801,9 +2827,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 +2889,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);
--- a/db/dump/mockDate.sql
+++ b/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 ;
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
--- a/db/export-data.sh
+++ b/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[@]}

--- a/db/export-structure.sh
+++ b/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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -43,7 +43,7 @@ services:
          - node.role == worker
      resources:
        limits:
-          memory: 4G
+          memory: 8G
 configs:
  datasources:
    external: true
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@ -414,7 +414,7 @@ let actions = {
        const selector = 'vn-snackbar .shape.shown';
        await this.waitForSelector(selector);

-        let message = await this.evaluate(selector => {
+        const message = await this.evaluate(selector => {
            const shape = document.querySelector(selector);
            const message = {
                text: shape.querySelector('.text').innerText
@ -431,6 +431,8 @@ let actions = {
            return message;
        }, selector);

+        message.isSuccess = message.type == 'success';
+
        await this.hideSnackbar();
        return message;
    },
@ -466,28 +468,6 @@ let actions = {
        }, selector);
    },

-    clearInput: async function(selector) {
-        await this.waitForSelector(selector);
-
-        let field = await this.evaluate(selector => {
-            return document.querySelector(`${selector} input`).closest('.vn-field').$ctrl.field;
-        }, selector);
-
-        if ((field != null && field != '') || field == '0') {
-            let coords = await this.evaluate(selector => {
-                let rect = document.querySelector(selector).getBoundingClientRect();
-                return {x: rect.x + (rect.width / 2), y: rect.y + (rect.height / 2), width: rect.width};
-            }, selector);
-            await this.mouse.move(coords.x, coords.y);
-            await this.waitForSelector(`${selector} [icon="clear"]`, {visible: true});
-            await this.waitToClick(`${selector} [icon="clear"]`);
-        }
-
-        await this.evaluate(selector => {
-            return document.querySelector(`${selector} input`).closest('.vn-field').$ctrl.field == '';
-        }, selector);
-    },
-
    autocompleteSearch: async function(selector, searchValue) {
        let builtSelector = await this.selectorFormater(selector);

@ -519,17 +499,15 @@ let actions = {

    checkboxState: async function(selector) {
        await this.waitForSelector(selector);
-        return this.evaluate(selector => {
-            let checkbox = document.querySelector(selector);
-            switch (checkbox.$ctrl.field) {
-            case null:
-                return 'intermediate';
-            case true:
-                return 'checked';
-            default:
-                return 'unchecked';
-            }
-        }, selector);
+        const value = await this.getInputValue(selector);
+        switch (value) {
+        case null:
+            return 'intermediate';
+        case true:
+            return 'checked';
+        default:
+            return 'unchecked';
+        }
    },

    isDisabled: async function(selector) {
@ -622,6 +600,138 @@ let actions = {

    waitForContentLoaded: async function() {
        await this.waitForSpinnerLoad();
+    },
+
+    async getInputValue(selector) {
+        return this.evaluate(selector => {
+            const input = document.querySelector(selector);
+            return input.$ctrl.field;
+        }, selector);
+    },
+
+    async getValue(selector) {
+        return await this.waitToGetProperty(selector, 'value');
+    },
+
+    async innerText(selector) {
+        const element = await this.$(selector);
+        const handle = await element.getProperty('innerText');
+        return handle.jsonValue();
+    },
+
+    async setInput(selector, value) {
+        const input = await this.$(selector);
+        const tagName = (await input.evaluate(e => e.tagName)).toLowerCase();
+
+        switch (tagName) {
+        case 'vn-textfield':
+        case 'vn-datalist':
+        case 'vn-input-number':
+            await this.clearInput(selector);
+            if (value)
+                await this.write(selector, value.toString());
+            break;
+        case 'vn-autocomplete':
+            if (value)
+                await this.autocompleteSearch(selector, value.toString());
+            else
+                await this.clearInput(selector);
+            break;
+        case 'vn-date-picker':
+            if (value)
+                await this.pickDate(selector, value);
+            else
+                await this.clearInput(selector);
+            break;
+        case 'vn-input-time':
+            if (value)
+                await this.pickTime(selector, value);
+            else
+                await this.clearInput(selector);
+            break;
+        case 'vn-check':
+            for (let i = 0; i < 3; i++) {
+                if (await this.getInput(selector) == value) break;
+                await this.click(selector);
+            }
+            break;
+        }
+    },
+
+    async getInput(selector) {
+        const input = await this.$(selector);
+        const tagName = (await input.evaluate(e => e.tagName)).toLowerCase();
+        let el;
+        let value;
+
+        switch (tagName) {
+        case 'vn-textfield':
+        case 'vn-autocomplete':
+        case 'vn-input-time':
+        case 'vn-datalist':
+            el = await input.$('input');
+            value = await el.getProperty('value');
+            return value.jsonValue();
+        case 'vn-check':
+        case 'vn-input-number':
+            return await this.getInputValue(selector);
+        case 'vn-textarea':
+            el = await input.$('textarea');
+            value = await el.getProperty('value');
+            return value.jsonValue();
+        case 'vn-date-picker':
+            el = await input.$('input');
+            value = await el.getProperty('value');
+            if (value) {
+                const date = new Date(await value.jsonValue());
+                date.setUTCHours(0, 0, 0, 0);
+                return date;
+            } else
+                return null;
+        default:
+            value = await this.innerText(selector);
+            return value.jsonValue();
+        }
+    },
+
+    async clearInput(selector) {
+        await this.waitForSelector(selector);
+
+        let field = await this.evaluate(selector => {
+            return document.querySelector(`${selector} input`).closest('.vn-field').$ctrl.field;
+        }, selector);
+
+        if ((field != null && field != '') || field == '0') {
+            let coords = await this.evaluate(selector => {
+                let rect = document.querySelector(selector).getBoundingClientRect();
+                return {x: rect.x + (rect.width / 2), y: rect.y + (rect.height / 2), width: rect.width};
+            }, selector);
+            await this.mouse.move(coords.x, coords.y);
+            await this.waitForSelector(`${selector} [icon="clear"]`, {visible: true});
+            await this.waitToClick(`${selector} [icon="clear"]`);
+        }
+
+        await this.evaluate(selector => {
+            return document.querySelector(`${selector} input`).closest('.vn-field').$ctrl.field == '';
+        }, selector);
+    },
+
+    async fetchForm(selector, inputNames) {
+        const values = {};
+        for (const inputName of inputNames)
+            values[inputName] = await this.getInput(`${selector} [vn-name="${inputName}"]`);
+        return values;
+    },
+
+    async fillForm(selector, values) {
+        for (const inputName in values)
+            await this.setInput(`${selector} [vn-name="${inputName}"]`, values[inputName]);
+    },
+
+    async sendForm(selector, values) {
+        if (values) await this.fillForm(selector, values);
+        await this.click(`${selector} button[type=submit]`);
+        return await this.waitForSnackbar();
    }
 };

@ -629,12 +739,14 @@ export function extendPage(page) {
    for (let name in actions) {
        page[name] = async(...args) => {
            try {
-                return actions[name].apply(page, args);
+                return await actions[name].apply(page, args);
            } catch (err) {
                let stringArgs = args
-                    .map(i => typeof i == 'function' ? 'Function' : i)
+                    .map(i => typeof i == 'function' ? 'Function' : `'${i}'`)
                    .join(', ');
-                throw new Error(`.${name}(${stringArgs}): ${err.message}`);
+                const myErr = new Error(`${err.message}\n  at Page.${name}(${stringArgs})`);
+                myErr.stack = err.stack;
+                throw myErr;
            }
        };
    }
--- a/e2e/helpers/puppeteer.js
+++ b/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,
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -193,10 +193,6 @@ export default {
        saveNewPoscode: '#savePostcode',
        createButton: 'vn-client-create button[type=submit]'
    },
-    clientDescriptor: {
-        moreMenu: 'vn-client-descriptor vn-icon-button[icon=more_vert]',
-        simpleTicketButton: '.vn-menu [name="simpleTicket"]'
-    },
    clientBasicData: {
        name: 'vn-client-basic-data vn-textfield[ng-model="$ctrl.client.name"]',
        contact: 'vn-client-basic-data vn-textfield[ng-model="$ctrl.client.contact"]',
@ -231,23 +227,6 @@ export default {
        saveButton: 'button[type=submit]',
        watcher: 'vn-client-fiscal-data vn-watcher'
    },
-    clientBillingData: {
-        payMethod: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.payMethodFk"]',
-        IBAN: 'vn-client-billing-data vn-textfield[ng-model="$ctrl.client.iban"]',
-        dueDay: 'vn-client-billing-data vn-input-number[ng-model="$ctrl.client.dueDay"]',
-        receivedCoreLCRCheckbox: 'vn-client-billing-data vn-check[label="Received LCR"]',
-        receivedCoreVNLCheckbox: 'vn-client-billing-data vn-check[label="Received core VNL"]',
-        receivedB2BVNLCheckbox: 'vn-client-billing-data vn-check[label="Received B2B VNL"]',
-        swiftBic: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.bankEntityFk"]',
-        newBankEntityButton: 'vn-client-billing-data vn-icon-button[vn-tooltip="New bank entity"] > button',
-        newBankEntityName: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.data.name"]',
-        newBankEntityBIC: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.data.bic"]',
-        newBankEntityCountry: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.data.countryFk"]',
-        newBankEntityCode: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.data.id"]',
-        acceptBankEntityButton: '.vn-dialog.shown button[response="accept"]',
-        saveButton: 'vn-client-billing-data button[type=submit]',
-        watcher: 'vn-client-billing-data vn-watcher'
-    },
    clientAddresses: {
        addressesButton: 'vn-left-menu a[ui-sref="client.card.address.index"]',
        createAddress: 'vn-client-address-index vn-float-button',
@ -283,12 +262,6 @@ export default {
        cancelEditAddressButton: 'vn-client-address-edit > form > vn-button-bar > vn-button > button',
        watcher: 'vn-client-address-edit vn-watcher'
    },
-    clientWebAccess: {
-        enableWebAccessCheckbox: 'vn-check[label="Enable web access"]',
-        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: 'button[type=submit]'
-    },
    clientNotes: {
        addNoteFloatButton: 'vn-float-button',
        note: 'vn-textarea[ng-model="$ctrl.note.text"]',
@ -312,30 +285,6 @@ export default {
    clientMandate: {
        firstMandateText: 'vn-client-mandate vn-card vn-table vn-tbody > vn-tr'
    },
-    clientLog: {
-        lastModificationPreviousValue: 'vn-client-log vn-tr table tr td.before',
-        lastModificationCurrentValue: 'vn-client-log vn-tr table tr td.after',
-        namePreviousValue: 'vn-client-log vn-tr table tr:nth-child(1) td.before',
-        nameCurrentValue: 'vn-client-log vn-tr table tr:nth-child(1) td.after',
-        activePreviousValue: 'vn-client-log vn-tr:nth-child(2) table tr:nth-child(2) td.before',
-        activeCurrentValue: 'vn-client-log vn-tr:nth-child(2) table tr:nth-child(2) td.after'
-
-    },
-    clientBalance: {
-        company: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]',
-        newPaymentButton: `vn-float-button`,
-        newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.bankFk"]',
-        newPaymentAmount: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.amountPaid"]',
-        newDescription: 'vn-textfield[ng-model="$ctrl.receipt.description"]',
-        deliveredAmount: '.vn-dialog vn-input-number[ng-model="$ctrl.deliveredAmount"]',
-        refundAmount: '.vn-dialog vn-input-number[ng-model="$ctrl.amountToReturn"]',
-        saveButton: '.vn-dialog.shown [response="accept"]',
-        anyBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr',
-        firstLineBalance: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)',
-        firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable',
-        firstLineReferenceInput: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable > div > field > vn-textfield',
-        compensationButton: 'vn-client-balance-index vn-icon-button[vn-dialog="send_compensation"]'
-    },
    webPayment: {
        confirmFirstPaymentButton: 'vn-client-web-payment vn-tr:nth-child(1) vn-icon-button[icon="done_all"]',
        firstPaymentConfirmed: 'vn-client-web-payment vn-tr:nth-child(1) vn-icon[icon="check"]'
@ -364,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"]',
@ -481,10 +430,6 @@ export default {
        packingOut: 'vn-input-number[ng-model="$ctrl.item.packingOut"]',
        isActiveCheckbox: 'vn-check[label="Active"]',
        priceInKgCheckbox: 'vn-check[label="Price in kg"]',
-        newIntrastatButton: 'vn-item-basic-data vn-icon-button[vn-tooltip="New intrastat"] > button',
-        newIntrastatId: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.newIntrastat.intrastatId"]',
-        newIntrastatDescription: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.newIntrastat.description"]',
-        acceptIntrastatButton: '.vn-dialog.shown button[response="accept"]',
        submitBasicDataButton: `button[type=submit]`
    },
    itemTags: {
@ -637,13 +582,6 @@ export default {
        saveButton: '.vn-dialog.shown [response="accept"]',
        expeditionRow: 'vn-ticket-expedition vn-table vn-tbody > vn-tr'
    },
-    ticketPackages: {
-        firstPackage: 'vn-autocomplete[label="Package"]',
-        firstQuantity: 'vn-ticket-package vn-horizontal:nth-child(1) vn-input-number[ng-model="package.quantity"]',
-        firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]',
-        addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]',
-        savePackagesButton: `button[type=submit]`
-    },
    ticketSales: {
        setOk: 'vn-ticket-sale vn-tool-bar > vn-button[label="Ok"] > button',
        saleLine: 'vn-table div > vn-tbody > vn-tr vn-check',
@ -657,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',
@ -687,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',
@ -888,15 +829,6 @@ export default {
        landedDatePicker: 'vn-date-picker[label="Landed"]',
        createButton: 'button[type=submit]'
    },
-    orderSummary: {
-        id: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(1) span',
-        alias: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) span',
-        consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(6) span',
-        subtotal: 'vn-order-summary vn-one.taxes > p:nth-child(1)',
-        vat: 'vn-order-summary vn-one.taxes > p:nth-child(2)',
-        total: 'vn-order-summary vn-one.taxes > p:nth-child(3)',
-        sale: 'vn-order-summary vn-tbody > vn-tr',
-    },
    orderCatalog: {
        plantRealmButton: 'vn-order-catalog > vn-side-menu vn-icon[icon="icon-plant"]',
        type: 'vn-order-catalog vn-autocomplete[data="$ctrl.itemTypes"]',
@ -914,14 +846,6 @@ export default {
        fifthFilterRemoveButton: 'vn-order-catalog > vn-side-menu .chips > vn-chip:nth-child(5) vn-icon[icon=cancel]',
        sixthFilterRemoveButton: 'vn-order-catalog > vn-side-menu .chips > vn-chip:nth-child(6) vn-icon[icon=cancel]',
    },
-    orderBasicData: {
-        client: 'vn-autocomplete[label="Client"]',
-        address: 'vn-autocomplete[label="Address"]',
-        agency: 'vn-autocomplete[label="Agency"]',
-        observation: 'vn-textarea[label="Notes"]',
-        saveButton: `button[type=submit]`,
-        acceptButton: '.vn-confirm.shown button[response="accept"]'
-    },
    orderLine: {
        orderSubtotal: 'vn-order-line .header :first-child',
        firstLineDeleteButton: 'vn-order-line vn-tbody > vn-tr:nth-child(1) vn-icon[icon="delete"]',
@ -961,16 +885,6 @@ export default {
        goToRouteSummaryButton: 'vn-route-summary > vn-card > h5 > a',

    },
-    routeBasicData: {
-        worker: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.workerFk"]',
-        vehicle: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.vehicleFk"]',
-        kmStart: 'vn-route-basic-data vn-input-number[ng-model="$ctrl.route.kmStart"]',
-        kmEnd: 'vn-route-basic-data vn-input-number[ng-model="$ctrl.route.kmEnd"]',
-        createdDate: 'vn-route-basic-data vn-date-picker[ng-model="$ctrl.route.created"]',
-        startedHour: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.started"]',
-        finishedHour: 'vn-route-basic-data vn-input-time[ng-model="$ctrl.route.finished"]',
-        saveButton: 'vn-route-basic-data button[type=submit]'
-    },
    routeTickets: {
        firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-input-number[ng-model="ticket.priority"]',
        firstTicketCheckbox: 'vn-route-tickets vn-tr:nth-child(1) vn-check',
@ -1255,22 +1169,6 @@ export default {
        confirmed: 'vn-entry-summary vn-check[label="Confirmed"]',
        anyBuyLine: 'vn-entry-summary tr.dark-row'
    },
-    entryBasicData: {
-        reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
-        invoiceNumber: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.invoiceNumber"]',
-        notes: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.notes"]',
-        observations: 'vn-entry-basic-data vn-textarea[ng-model="$ctrl.entry.observation"]',
-        supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
-        currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',
-        commission: 'vn-entry-basic-data vn-input-number[ng-model="$ctrl.entry.commission"]',
-        company: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.companyFk"]',
-        ordered: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isOrdered"]',
-        confirmed: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isConfirmed"]',
-        inventory: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isExcludedFromAvailable"]',
-        raid: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isRaid"]',
-        booked: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isBooked"]',
-        save: 'vn-entry-basic-data button[type=submit]',
-    },
    entryDescriptor: {
        agency: 'vn-entry-descriptor div.body vn-label-value:nth-child(1) span',
        travelsQuicklink: 'vn-entry-descriptor vn-quick-link[icon="local_airport"] > a',
@ -1361,18 +1259,6 @@ export default {
        notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
        saveButton: 'vn-supplier-basic-data button[type="submit"]',
    },
-    supplierFiscalData: {
-        socialName: 'vn-supplier-fiscal-data vn-textfield[ng-model="$ctrl.supplier.name"]',
-        taxNumber: 'vn-supplier-fiscal-data vn-textfield[ng-model="$ctrl.supplier.nif"]',
-        account: 'vn-supplier-fiscal-data vn-textfield[ng-model="$ctrl.supplier.account"]',
-        sageTaxType: 'vn-supplier-fiscal-data vn-autocomplete[ng-model="$ctrl.supplier.sageTaxTypeFk"]',
-        sageWihholding: 'vn-supplier-fiscal-data vn-autocomplete[ng-model="$ctrl.supplier.sageWithholdingFk"]',
-        postCode: 'vn-supplier-fiscal-data vn-datalist[ng-model="$ctrl.supplier.postCode"]',
-        city: 'vn-supplier-fiscal-data vn-datalist[ng-model="$ctrl.supplier.city"]',
-        province: 'vn-supplier-fiscal-data vn-autocomplete[ng-model="$ctrl.supplier.provinceFk"]',
-        country: 'vn-supplier-fiscal-data vn-autocomplete[ng-model="$ctrl.supplier.countryFk"]',
-        saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
-    },
    supplierBillingData: {
        payMethod: 'vn-supplier-billing-data vn-autocomplete[ng-model="$ctrl.supplier.payMethodFk"]',
        payDem: 'vn-supplier-billing-data vn-autocomplete[ng-model="$ctrl.supplier.payDemFk"]',
--- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
+++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
@ -15,81 +15,55 @@ describe('SmartTable SearchBar integration', () => {
        await browser.close();
    });

-    describe('as filters in smart-table section', () => {
-        it('should search by type in searchBar', async() => {
-            await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
-            await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
-            await page.waitToClick(selectors.itemsIndex.advancedSearchButton);
-            await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);
+    it('should search by type in searchBar, reload page and have same results', async() => {
+        await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
+        await page.waitToClick(selectors.itemsIndex.advancedSearchButton);
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);
+
+        await page.reload({
+            waitUntil: 'networkidle2'
        });

-        it('should reload page and have same results', async() => {
-            await page.reload({
-                waitUntil: 'networkidle2'
-            });
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);

-            await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);
+        await page.waitToClick(selectors.itemsIndex.advancedSmartTableButton);
+        await page.write(selectors.itemsIndex.advancedSmartTableGrouping, '1');
+        await page.keyboard.press('Enter');
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
+
+        await page.reload({
+            waitUntil: 'networkidle2'
        });

-        it('should search by grouping in smartTable', async() => {
-            await page.waitToClick(selectors.itemsIndex.advancedSmartTableButton);
-            await page.write(selectors.itemsIndex.advancedSmartTableGrouping, '1');
-            await page.keyboard.press('Enter');
-            await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
-        });
-
-        it('should now reload page and have same results', async() => {
-            await page.reload({
-                waitUntil: 'networkidle2'
-            });
-
-            await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
-        });
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
    });

-    describe('as filters in section without smart-table', () => {
-        it('go to zone section', async() => {
-            await page.loginAndModule('salesPerson', 'zone');
-            await page.waitToClick(selectors.globalItems.searchButton);
-        });
+    it('should filter in section without smart-table and search in searchBar go to zone section', async() => {
+        await page.loginAndModule('salesPerson', 'zone');
+        await page.waitToClick(selectors.globalItems.searchButton);

-        it('should search in searchBar first time', async() => {
-            await page.doSearch('A');
-            const count = await page.countElement(selectors.zoneIndex.searchResult);
+        await page.doSearch('A');
+        const firstCount = await page.countElement(selectors.zoneIndex.searchResult);

-            expect(count).toEqual(7);
-        });
+        await page.doSearch('A');
+        const secondCount = await page.countElement(selectors.zoneIndex.searchResult);

-        it('should search in searchBar second time', async() => {
-            await page.doSearch('A');
-            const count = await page.countElement(selectors.zoneIndex.searchResult);
-
-            expect(count).toEqual(7);
-        });
-
-        it('should search in searchBar third time', async() => {
-            await page.doSearch('A');
-            const count = await page.countElement(selectors.zoneIndex.searchResult);
-
-            expect(count).toEqual(7);
-        });
+        expect(firstCount).toEqual(7);
+        expect(secondCount).toEqual(7);
    });

-    describe('as orders', () => {
-        it('should order by first id', async() => {
-            await page.loginAndModule('developer', 'item');
-            await page.accessToSection('item.fixedPrice');
-            await page.keyboard.press('Enter');
+    it('should order orders by first id and order by last id, reload page and have same order', async() => {
+        await page.loginAndModule('developer', 'item');
+        await page.accessToSection('item.fixedPrice');
+        await page.keyboard.press('Enter');

-            await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '1');
-        });
+        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '1');

-        it('should order by last id, reload page and have same order', async() => {
-            await page.waitToClick(selectors.itemFixedPrice.orderColumnId);
-            await page.reload({
-                waitUntil: 'networkidle2'
-            });
-            await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '13');
+        await page.waitToClick(selectors.itemFixedPrice.orderColumnId);
+        await page.reload({
+            waitUntil: 'networkidle2'
        });
+        await page.waitForTextInField(selectors.itemFixedPrice.firstItemID, '3');
    });
 });
--- a/e2e/paths/02-client/03_edit_fiscal_data.spec.js
+++ b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
@ -171,100 +171,40 @@ describe('Client Edit fiscalData path', () => {
            expect(result).toEqual('SMASH');
        });

-        it('should confirm the fiscal id have been edited', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.fiscalId, 'value');
+        it('should confirm the fiscal data have been edited', async() => {
+            const fiscalId = await page.waitToGetProperty(selectors.clientFiscalData.fiscalId, 'value');
+            const address = await page.waitToGetProperty(selectors.clientFiscalData.address, 'value');
+            const postcode = await page.waitToGetProperty(selectors.clientFiscalData.postcode, 'value');
+            const sageTax = await page.waitToGetProperty(selectors.clientFiscalData.sageTax, 'value');
+            const sageTransaction = await page.waitToGetProperty(selectors.clientFiscalData.sageTransaction, 'value');
+            const city = await page.waitToGetProperty(selectors.clientFiscalData.city, 'value');
+            const province = await page.waitToGetProperty(selectors.clientFiscalData.province, 'value');
+            const country = await page.waitToGetProperty(selectors.clientFiscalData.country, 'value');
+            const active = await page.checkboxState(selectors.clientFiscalData.activeCheckbox);
+            const frozen = await page.checkboxState(selectors.clientFiscalData.frozenCheckbox);
+            const hasToInvoice = await page.checkboxState(selectors.clientFiscalData.hasToInvoiceCheckbox);
+            const vies = await page.checkboxState(selectors.clientFiscalData.viesCheckbox);
+            const notifyByMail = await page.checkboxState(selectors.clientFiscalData.notifyByMailCheckbox);
+            const invoiceByAddress = await page.checkboxState(selectors.clientFiscalData.invoiceByAddressCheckbox);
+            const equalizationTax = await page.checkboxState(selectors.clientFiscalData.equalizationTaxCheckbox);
+            const verifiedData = await page.checkboxState(selectors.clientFiscalData.verifiedDataCheckbox);

-            expect(result).toEqual('94980061C');
-        });
-
-        it('should confirm the address have been edited', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.address, 'value');
-
-            expect(result).toEqual('Somewhere edited');
-        });
-
-        it('should confirm the postcode have been edited', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.postcode, 'value');
-
-            expect(result).toContain('46000');
-        });
-
-        it('should confirm the sageTax have been edited', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.sageTax, 'value');
-
-            expect(result).toEqual('Operaciones no sujetas');
-        });
-
-        it('should confirm the sageTransaction have been edited', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.sageTransaction, 'value');
-
-            expect(result).toEqual('36: Regularización de inversiones');
-        });
-
-        it('should confirm the city have been autocompleted', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.city, 'value');
-
-            expect(result).toEqual('Valencia');
-        });
-
-        it(`should confirm the province have been autocompleted`, async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.province, 'value');
-
-            expect(result).toContain('Province one');
-        });
-
-        it('should confirm the country have been autocompleted', async() => {
-            const result = await page.waitToGetProperty(selectors.clientFiscalData.country, 'value');
-
-            expect(result).toEqual('España');
-        });
-
-        it('should confirm active checkbox is unchecked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.activeCheckbox);
-
-            expect(result).toBe('unchecked');
-        });
-
-        it('should confirm frozen checkbox is checked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.frozenCheckbox);
-
-            expect(result).toBe('checked');
-        });
-
-        it('should confirm Has to invoice checkbox is unchecked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.hasToInvoiceCheckbox);
-
-            expect(result).toBe('unchecked');
-        });
-
-        it('should confirm Vies checkbox is checked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.viesCheckbox);
-
-            expect(result).toBe('checked');
-        });
-
-        it('should confirm Notify by email checkbox is unchecked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.notifyByMailCheckbox);
-
-            expect(result).toBe('unchecked');
-        });
-
-        it('should confirm invoice by address checkbox is checked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.invoiceByAddressCheckbox);
-
-            expect(result).toBe('checked');
-        });
-
-        it('should confirm Equalization tax checkbox is unchecked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.equalizationTaxCheckbox);
-
-            expect(result).toBe('unchecked');
-        });
-
-        it('should confirm Verified data checkbox is checked', async() => {
-            const result = await page.checkboxState(selectors.clientFiscalData.verifiedDataCheckbox);
-
-            expect(result).toBe('checked');
+            expect(fiscalId).toEqual('94980061C');
+            expect(address).toEqual('Somewhere edited');
+            expect(postcode).toContain('46000');
+            expect(sageTax).toEqual('Operaciones no sujetas');
+            expect(sageTransaction).toEqual('Regularización de inversiones');
+            expect(city).toEqual('Valencia');
+            expect(province).toContain('Province one');
+            expect(country).toEqual('España');
+            expect(active).toBe('unchecked');
+            expect(frozen).toBe('checked');
+            expect(hasToInvoice).toBe('unchecked');
+            expect(vies).toBe('checked');
+            expect(notifyByMail).toBe('unchecked');
+            expect(invoiceByAddress).toBe('checked');
+            expect(equalizationTax).toBe('unchecked');
+            expect(verifiedData).toBe('checked');
        });

        // confirm invoice by address checkbox gets checked if the EQtax differs between addresses step 1
--- a/e2e/paths/02-client/04_edit_billing_data.spec.js
+++ b/e2e/paths/02-client/04_edit_billing_data.spec.js
@ -1,6 +1,23 @@
-import selectors from '../../helpers/selectors';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    payMethod: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.payMethodFk"]',
+    IBAN: 'vn-client-billing-data vn-textfield[ng-model="$ctrl.client.iban"]',
+    dueDay: 'vn-client-billing-data vn-input-number[ng-model="$ctrl.client.dueDay"]',
+    receivedCoreLCRCheckbox: 'vn-client-billing-data vn-check[label="Received LCR"]',
+    receivedCoreVNLCheckbox: 'vn-client-billing-data vn-check[label="Received core VNL"]',
+    receivedB2BVNLCheckbox: 'vn-client-billing-data vn-check[label="Received B2B VNL"]',
+    swiftBic: 'vn-client-billing-data vn-autocomplete[ng-model="$ctrl.client.bankEntityFk"]',
+    newBankEntityButton: 'vn-client-billing-data vn-icon-button[vn-tooltip="New bank entity"] > button',
+    newBankEntityName: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.data.name"]',
+    newBankEntityBIC: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.data.bic"]',
+    newBankEntityCountry: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.data.countryFk"]',
+    newBankEntityCode: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.data.id"]',
+    acceptBankEntityButton: '.vn-dialog.shown button[response="accept"]',
+    saveButton: 'vn-client-billing-data button[type=submit]',
+    watcher: 'vn-client-billing-data vn-watcher'
+};
+
 describe('Client Edit billing data path', () => {
    let browser;
    let page;
@ -17,93 +34,72 @@ describe('Client Edit billing data path', () => {
    });

    it(`should attempt to edit the billing data without an IBAN but fail`, async() => {
-        await page.autocompleteSearch(selectors.clientBillingData.payMethod, 'PayMethod with IBAN');
-        await page.autocompleteSearch(selectors.clientBillingData.swiftBic, 'BBKKESMMMMM');
-        await page.clearInput(selectors.clientBillingData.dueDay);
-        await page.write(selectors.clientBillingData.dueDay, '60');
-        await page.waitForTextInField(selectors.clientBillingData.dueDay, '60');
-        await page.waitToClick(selectors.clientBillingData.receivedCoreLCRCheckbox);
-        await page.waitToClick(selectors.clientBillingData.receivedCoreVNLCheckbox);
-        await page.waitToClick(selectors.clientBillingData.receivedB2BVNLCheckbox);
-        await page.waitToClick(selectors.clientBillingData.saveButton);
+        await page.autocompleteSearch($.payMethod, 'PayMethod with IBAN');
+        await page.autocompleteSearch($.swiftBic, 'BBKKESMMMMM');
+        await page.clearInput($.dueDay);
+        await page.write($.dueDay, '60');
+        await page.waitForTextInField($.dueDay, '60');
+        await page.waitToClick($.receivedCoreLCRCheckbox);
+        await page.waitToClick($.receivedCoreVNLCheckbox);
+        await page.waitToClick($.receivedB2BVNLCheckbox);
+        await page.waitToClick($.saveButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('That payment method requires an IBAN');
    });

    it(`should create a new BIC code`, async() => {
-        await page.waitToClick(selectors.clientBillingData.newBankEntityButton);
-        await page.write(selectors.clientBillingData.newBankEntityName, 'Gotham City Bank');
-        await page.write(selectors.clientBillingData.newBankEntityBIC, 'GTHMCT');
-        await page.autocompleteSearch(selectors.clientBillingData.newBankEntityCountry, 'España');
-        await page.write(selectors.clientBillingData.newBankEntityCode, '9999');
-        await page.waitToClick(selectors.clientBillingData.acceptBankEntityButton);
+        await page.waitToClick($.newBankEntityButton);
+        await page.write($.newBankEntityName, 'Gotham City Bank');
+        await page.write($.newBankEntityBIC, 'GTHMCT');
+        await page.autocompleteSearch($.newBankEntityCountry, 'España');
+        await page.write($.newBankEntityCode, '9999');
+        await page.waitToClick($.acceptBankEntityButton);
        const message = await page.waitForSnackbar();
-        await page.waitForTextInField(selectors.clientBillingData.swiftBic, 'Gotham City Bank');
-        const newcode = await page.waitToGetProperty(selectors.clientBillingData.swiftBic, 'value');
-
-        expect(newcode).toEqual('GTHMCT Gotham City Bank');
+        await page.waitForTextInField($.swiftBic, 'GTHMCT');
+        const newcode = await page.waitToGetProperty($.swiftBic, 'value');

+        expect(newcode).toEqual('GTHMCT');
        expect(message.text).toContain('Data saved!');
    });

    it(`should confirm the IBAN pay method was sucessfully saved`, async() => {
-        const payMethod = await page.waitToGetProperty(selectors.clientBillingData.payMethod, 'value');
+        const payMethod = await page.waitToGetProperty($.payMethod, 'value');

        expect(payMethod).toEqual('PayMethod with IBAN');
    });

    it(`should clear the BIC code field, update the IBAN to see how he BIC code autocompletes`, async() => {
-        await page.write(selectors.clientBillingData.IBAN, 'ES9121000418450200051332');
+        await page.write($.IBAN, 'ES9121000418450200051332');
        await page.keyboard.press('Tab');
        await page.keyboard.press('Tab');
-        await page.waitForTextInField(selectors.clientBillingData.swiftBic, 'caixesbb');
-        let automaticCode = await page.waitToGetProperty(selectors.clientBillingData.swiftBic, 'value');
+        await page.waitForTextInField($.swiftBic, 'caixesbb');
+        let automaticCode = await page.waitToGetProperty($.swiftBic, 'value');

-        expect(automaticCode).toEqual('CAIXESBB Caixa Bank');
+        expect(automaticCode).toEqual('CAIXESBB');
    });

    it(`should save the form with all its new data`, async() => {
-        await page.waitForWatcherData(selectors.clientBillingData.watcher);
-        await page.waitToClick(selectors.clientBillingData.saveButton);
+        await page.waitForWatcherData($.watcher);
+        await page.waitToClick($.saveButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Notification sent!');
    });

-    it('should confirm the due day have been edited', async() => {
-        const dueDate = await page.waitToGetProperty(selectors.clientBillingData.dueDay, 'value');
+    it('should confirm the billing data have been edited', async() => {
+        const dueDate = await page.waitToGetProperty($.dueDay, 'value');
+        const IBAN = await page.waitToGetProperty($.IBAN, 'value');
+        const swiftBic = await page.waitToGetProperty($.swiftBic, 'value');
+        const receivedCoreLCR = await page.checkboxState($.receivedCoreLCRCheckbox);
+        const receivedCoreVNL = await page.checkboxState($.receivedCoreVNLCheckbox);
+        const receivedB2BVNL = await page.checkboxState($.receivedB2BVNLCheckbox);

        expect(dueDate).toEqual('60');
-    });
-
-    it('should confirm the IBAN was saved', async() => {
-        const IBAN = await page.waitToGetProperty(selectors.clientBillingData.IBAN, 'value');
-
        expect(IBAN).toEqual('ES9121000418450200051332');
-    });
-
-    it('should confirm the swift / BIC code was saved', async() => {
-        const code = await page.waitToGetProperty(selectors.clientBillingData.swiftBic, 'value');
-
-        expect(code).toEqual('CAIXESBB Caixa Bank');
-    });
-
-    it('should confirm Received LCR checkbox is checked', async() => {
-        const result = await page.checkboxState(selectors.clientBillingData.receivedCoreLCRCheckbox);
-
-        expect(result).toBe('checked');
-    });
-
-    it('should confirm Received core VNL checkbox is unchecked', async() => {
-        const result = await page.checkboxState(selectors.clientBillingData.receivedCoreVNLCheckbox);
-
-        expect(result).toBe('unchecked');
-    });
-
-    it('should confirm Received B2B VNL checkbox is unchecked', async() => {
-        const result = await page.checkboxState(selectors.clientBillingData.receivedB2BVNLCheckbox);
-
-        expect(result).toBe('unchecked');
+        expect(swiftBic).toEqual('CAIXESBB');
+        expect(receivedCoreLCR).toBe('checked');
+        expect(receivedCoreVNL).toBe('unchecked');
+        expect(receivedB2BVNL).toBe('unchecked');
    });
 });
--- a/e2e/paths/02-client/07_edit_web_access.spec.js
+++ b/e2e/paths/02-client/07_edit_web_access.spec.js
@ -1,88 +1,56 @@
-/* eslint max-len: ["error", { "code": 150 }]*/
-import selectors from '../../helpers/selectors';
 import getBrowser from '../../helpers/puppeteer';

-describe('Client Edit web access path', () => {
+const $ = {
+    enableWebAccess: 'vn-client-web-access vn-check[label="Enable web access"]',
+    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(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', () => {
    let browser;
    let page;
+
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
        await page.loginAndModule('salesPerson', 'client');
        await page.accessToSearchResult('max');
-        await page.accessToSection('client.card.webAccess');
    });

    afterAll(async() => {
        await browser.close();
    });

-    it('should uncheck the Enable web access checkbox', async() => {
-        await page.waitToClick(selectors.clientWebAccess.enableWebAccessCheckbox);
-        await page.waitToClick(selectors.clientWebAccess.saveButton);
-        const message = await page.waitForSnackbar();
+    it('should modify and save web access attributes', async() => {
+        await page.accessToSection('client.card.webAccess');
+        await page.click($.enableWebAccess);
+        await page.click($.saveButton);
+        const enableMessage = await page.waitForSnackbar();
+        await page.overwrite($.userName, 'Legion');
+        await page.overwrite($.email, 'legion@marvel.com');
+        await page.click($.saveButton);
+        const modifyMessage = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should update the name`, async() => {
-        await page.clearInput(selectors.clientWebAccess.userName);
-        await page.write(selectors.clientWebAccess.userName, 'Legion');
-        await page.waitToClick(selectors.clientWebAccess.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should update the email`, async() => {
-        await page.clearInput(selectors.clientWebAccess.email);
-        await page.write(selectors.clientWebAccess.email, 'legion@marvel.com');
-        await page.waitToClick(selectors.clientWebAccess.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should reload the section and confirm web access is now unchecked', async() => {
        await page.reloadSection('client.card.webAccess');
-        const result = await page.checkboxState(selectors.clientWebAccess.enableWebAccessCheckbox);
+        const hasAccess = await page.checkboxState($.enableWebAccess);
+        const userName = await page.getValue($.userName);
+        const email = await page.getValue($.email);

-        expect(result).toBe('unchecked');
-    });
-
-    it('should confirm web access name have been updated', async() => {
-        const result = await page.waitToGetProperty(selectors.clientWebAccess.userName, 'value');
-
-        expect(result).toEqual('Legion');
-    });
-
-    it('should confirm web access email have been updated', async() => {
-        const result = await page.waitToGetProperty(selectors.clientWebAccess.email, 'value');
-
-        expect(result).toEqual('legion@marvel.com');
-    });
-
-    it(`should navigate to the log section`, async() => {
        await page.accessToSection('client.card.log');
-    });
+        const logName = await page.innerText($.nameValue);
+        const logActive = await page.innerText($.activeValue);

-    it(`should confirm the last log shows the updated client name and no modifications on active checkbox`, async() => {
-        let namePreviousValue = await page
-            .waitToGetProperty(selectors.clientLog.namePreviousValue, 'innerText');
-        let nameCurrentValue = await page
-            .waitToGetProperty(selectors.clientLog.nameCurrentValue, 'innerText');
+        expect(enableMessage.type).toBe('success');
+        expect(modifyMessage.type).toBe('success');

-        expect(namePreviousValue).toEqual('MaxEisenhardt');
-        expect(nameCurrentValue).toEqual('Legion');
-    });
+        expect(hasAccess).toBe('unchecked');
+        expect(userName).toEqual('Legion');
+        expect(email).toEqual('legion@marvel.com');

-    it(`should confirm the penultimate log shows the updated active and no modifications on client name`, async() => {
-        let activePreviousValue = await page
-            .waitToGetProperty(selectors.clientLog.activePreviousValue, 'innerText');
-        let activeCurrentValue = await page
-            .waitToGetProperty(selectors.clientLog.activeCurrentValue, 'innerText');
-
-        expect(activePreviousValue).toEqual('✓');
-        expect(activeCurrentValue).toEqual('✗');
+        expect(logName).toEqual('Legion');
+        expect(logActive).toEqual('✗');
    });
 });
--- a/e2e/paths/02-client/10_add_greuge.spec.js
+++ b/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');
--- a/e2e/paths/02-client/14_balance.spec.js
+++ b/e2e/paths/02-client/14_balance.spec.js
@ -1,6 +1,17 @@
 import selectors from '../../helpers/selectors';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    company: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]',
+    newPaymentButton: `vn-float-button`,
+    newPayment: '.vn-dialog.shown',
+    refundAmount: '.vn-dialog.shown [vn-name="amountToReturn"]',
+    saveButton: '.vn-dialog.shown [response="accept"]',
+    firstLineBalance: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)',
+    firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable',
+    firstLineReferenceInput: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable vn-textfield',
+};
+
 describe('Client balance path', () => {
    let browser;
    let page;
@ -18,125 +29,100 @@ describe('Client balance path', () => {
    it('should now edit the local user config data', async() => {
        await page.waitToClick(selectors.globalItems.userMenuButton);
        await page.autocompleteSearch(selectors.globalItems.userLocalCompany, 'CCs');
-        const message = await page.waitForSnackbar();
+        const companyMessage = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should access to the balance section to check the data shown matches the local settings', async() => {
        await page.accessToSection('client.card.balance.index');
-        let result = await page.waitToGetProperty(selectors.clientBalance.company, 'value');
+        const company = await page.getValue($.company);

-        expect(result).toEqual('CCs');
-    });
-
-    it('should now clear the user local settings', async() => {
        await page.waitToClick(selectors.globalItems.userMenuButton);
        await page.clearInput(selectors.globalItems.userConfigThirdAutocomplete);
        const message = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should reload the section', async() => {
        await page.closePopup();
        await page.reloadSection('client.card.balance.index');
+
+        expect(companyMessage.isSuccess).toBeTrue();
+        expect(company).toEqual('CCs');
+        expect(message.isSuccess).toBeTrue();
    });

    it('should create a new payment that clears the debt', async() => {
-        await page.closePopup();
-        await page.waitToClick(selectors.clientBalance.newPaymentButton);
-        await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Cash');
-        await page.clearInput(selectors.clientBalance.newDescription);
-        await page.write(selectors.clientBalance.newDescription, 'Description');
-        await page.waitToClick(selectors.clientBalance.saveButton);
+        await page.waitToClick($.newPaymentButton);
+        await page.fillForm($.newPayment, {
+            bank: 'Cash',
+            description: 'Description',
+            viewReceipt: false
+        });
+        await page.respondToDialog('accept');
        const message = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
+        expect(message.isSuccess).toBeTrue();
    });

-    it('should edit the 1st line reference', async() => {
-        await page.waitToClick(selectors.clientBalance.firstLineReference);
-        await page.write(selectors.clientBalance.firstLineReferenceInput, 'Miscellaneous payment');
+    it('should edit the 1st line reference and check data', async() => {
+        await page.waitToClick($.firstLineReference);
+        await page.write($.firstLineReferenceInput, 'Miscellaneous payment');
        await page.keyboard.press('Enter');
        const message = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check balance is now 0, the reference was saved and the company is now VNL becouse the user local settings were removed', async() => {
        await page.waitForSpinnerLoad();
-        let company = await page
-            .waitToGetProperty(selectors.clientBalance.company, 'value');
-
-        let reference = await page
-            .waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
-
-        let firstBalanceLine = await page
-            .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');
+        let company = await page.getValue($.company);
+        let reference = await page.innerText($.firstLineReference);
+        let firstBalanceLine = await page.innerText($.firstLineBalance);

+        expect(message.isSuccess).toBeTrue();
        expect(company).toEqual('VNL');
        expect(reference).toEqual('Miscellaneous payment');
        expect(firstBalanceLine).toContain('0.00');
    });

-    it('should create a new payment and check the cash comparison works correctly', async() => {
-        const amountPaid = '100';
-        const cashHanded = '500';
-        const expectedRefund = '400';
-
-        await page.waitToClick(selectors.clientBalance.newPaymentButton);
-        await page.write(selectors.clientBalance.newPaymentAmount, amountPaid);
-        await page.clearInput(selectors.clientBalance.newDescription);
-        await page.write(selectors.clientBalance.newDescription, 'Payment');
-        await page.write(selectors.clientBalance.deliveredAmount, cashHanded);
-        const refund = await page.waitToGetProperty(selectors.clientBalance.refundAmount, 'value');
-        await page.waitToClick(selectors.clientBalance.saveButton);
+    it('should create a new payment, check the cash comparison works correctly and balance value is -100', async() => {
+        await page.waitToClick($.newPaymentButton);
+        await page.fillForm($.newPayment, {
+            amountPaid: 100,
+            description: 'Payment',
+            deliveredAmount: 500,
+            viewReceipt: false
+        });
+        const refund = await page.getValue($.refundAmount);
+        await page.respondToDialog('accept');
        const message = await page.waitForSnackbar();

-        expect(refund).toEqual(expectedRefund);
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check the balance value is now -100', async() => {
-        let result = await page
-            .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');
+        const result = await page.innerText($.firstLineBalance);

+        expect(refund).toEqual('400');
+        expect(message.isSuccess).toBeTrue();
        expect(result).toContain('-€100.00');
    });

    it('should create a new payment and check the cash exceeded the maximum', async() => {
-        const amountPaid = '1001';
-
-        await page.closePopup();
-        await page.waitToClick(selectors.clientBalance.newPaymentButton);
-        await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Cash');
-        await page.write(selectors.clientBalance.newPaymentAmount, amountPaid);
-        await page.clearInput(selectors.clientBalance.newDescription);
-        await page.write(selectors.clientBalance.newDescription, 'Payment');
-        await page.waitToClick(selectors.clientBalance.saveButton);
+        await page.waitToClick($.newPaymentButton);
+        await page.fillForm($.newPayment, {
+            bank: 'Cash',
+            amountPaid: 1001,
+            description: 'Payment'
+        });
+        await page.waitToClick($.saveButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Amount exceeded');
    });

-    it('should create a new payment that sets the balance back to the original negative value', async() => {
+    it('should create a new payment that sets the balance back to negative value and check it', async() => {
        await page.closePopup();
-        await page.waitToClick(selectors.clientBalance.newPaymentButton);
-        await page.autocompleteSearch(selectors.clientBalance.newPaymentBank, 'Pay on receipt');
-        await page.overwrite(selectors.clientBalance.newPaymentAmount, '-150');
-        await page.clearInput(selectors.clientBalance.newDescription);
-        await page.write(selectors.clientBalance.newDescription, 'Description');
-        await page.waitToClick(selectors.clientBalance.saveButton);
+        await page.waitToClick($.newPaymentButton);
+
+        await page.fillForm($.newPayment, {
+            bank: 'Pay on receipt',
+            amountPaid: -150,
+            description: 'Description'
+        });
+        await page.respondToDialog('accept');
        const message = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check balance is now 50', async() => {
-        let result = await page
-            .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');
+        const result = await page.innerText($.firstLineBalance);

+        expect(message.isSuccess).toBeTrue();
        expect(result).toEqual('€50.00');
    });

@ -149,12 +135,9 @@ describe('Client balance path', () => {
        await page.waitForState('client.index');
    });

-    it('should now search for the user Petter Parker', async() => {
+    it('should now search for the user Petter Parker not check the payment button is not present', async() => {
        await page.accessToSearchResult('Petter Parker');
        await page.accessToSection('client.card.balance.index');
-    });
-
-    it('should not be able to click the new payment button as it isnt present', async() => {
-        await page.waitForSelector(selectors.clientBalance.newPaymentButton, {hidden: true});
+        await page.waitForSelector($.newPaymentButton, {hidden: true});
    });
 });
--- a/e2e/paths/02-client/23_send_compensation.spec.js
+++ b/e2e/paths/02-client/23_send_compensation.spec.js
@ -1,6 +1,11 @@
-import selectors from '../../helpers/selectors';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    company: 'vn-client-balance-index vn-autocomplete[ng-model="$ctrl.companyId"]',
+    compensationButton: 'vn-client-balance-index vn-icon-button[vn-dialog="send_compensation"]',
+    saveButton: '.vn-dialog.shown [response="accept"]'
+};
+
 describe('Client Send balance compensation', () => {
    let browser;
    let page;
@ -17,9 +22,9 @@ describe('Client Send balance compensation', () => {
    });

    it(`should click on send compensation button`, async() => {
-        await page.autocompleteSearch(selectors.clientBalance.company, 'VNL');
-        await page.waitToClick(selectors.clientBalance.compensationButton);
-        await page.waitToClick(selectors.clientBalance.saveButton);
+        await page.autocompleteSearch($.company, 'VNL');
+        await page.waitToClick($.compensationButton);
+        await page.waitToClick($.saveButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Notification sent!');
--- a/e2e/paths/04-item/02_basic_data.spec.js
+++ b/e2e/paths/04-item/02_basic_data.spec.js
@ -1,14 +1,23 @@
-import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    form: 'vn-item-basic-data form',
+    intrastatForm: '.vn-dialog.shown form',
+    newIntrastatButton: 'vn-item-basic-data vn-icon-button[vn-tooltip="New intrastat"] > button'
+};
+
 describe('Item Edit basic data path', () => {
    let browser;
    let page;
+
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
        await page.loginAndModule('buyer', 'item');
        await page.accessToSearchResult('Melee weapon combat fist 15cm');
+    });
+
+    beforeEach(async() => {
        await page.accessToSection('item.card.basicData');
    });

@ -16,124 +25,43 @@ describe('Item Edit basic data path', () => {
        await browser.close();
    });

-    it(`should check the descritor edit button is visible for buyer`, async() => {
-        await page.waitForSelector(selectors.itemDescriptor.editButton, {visible: true});
-    });
+    it(`should edit the item basic data and confirm the item data was edited`, async() => {
+        const values = {
+            name: 'Rose of Purity',
+            longName: 'RS Rose of Purity',
+            type: 'Anthurium',
+            intrastat: 'Coral y materiales similares',
+            origin: 'Spain',
+            relevancy: 1,
+            generic: 'Pallet',
+            isActive: false,
+            priceInKg: true,
+            isFragile: true,
+            packingOut: 5
+        };

-    it(`should edit the item basic data`, async() => {
-        await page.clearInput(selectors.itemBasicData.name);
-        await page.write(selectors.itemBasicData.name, 'Rose of Purity');
-        await page.clearInput(selectors.itemBasicData.longName);
-        await page.write(selectors.itemBasicData.longName, 'RS Rose of Purity');
-        await page.autocompleteSearch(selectors.itemBasicData.type, 'Anthurium');
-        await page.autocompleteSearch(selectors.itemBasicData.intrastat, 'Coral y materiales similares');
-        await page.autocompleteSearch(selectors.itemBasicData.origin, 'Spain');
-        await page.clearInput(selectors.itemBasicData.relevancy);
-        await page.write(selectors.itemBasicData.relevancy, '1');
-        await page.clearInput(selectors.itemBasicData.generic);
-        await page.autocompleteSearch(selectors.itemBasicData.generic, '16');
-        await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
-        await page.waitToClick(selectors.itemBasicData.priceInKgCheckbox);
-        await page.waitToClick(selectors.itemBasicData.isFragile);
-        await page.write(selectors.itemBasicData.packingOut, '5');
-        await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should create a new intrastat`, async() => {
-        await page.waitToClick(selectors.itemBasicData.newIntrastatButton);
-        await page.write(selectors.itemBasicData.newIntrastatId, '588420239');
-        await page.write(selectors.itemBasicData.newIntrastatDescription, 'Tropical Flowers');
-        await page.waitToClick(selectors.itemBasicData.acceptIntrastatButton);
-        await page.waitForTextInField(selectors.itemBasicData.intrastat, 'Tropical Flowers');
-        let newcode = await page.waitToGetProperty(selectors.itemBasicData.intrastat, 'value');
-
-        expect(newcode).toEqual('588420239 Tropical Flowers');
-    });
-
-    it('should save with the new intrastat', async() => {
-        await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the item name was edited`, async() => {
+        const message = await page.sendForm($.form, values);
        await page.reloadSection('item.card.basicData');
-        const result = await page.waitToGetProperty(selectors.itemBasicData.name, 'value');
+        const formValues = await page.fetchForm($.form, Object.keys(values));

-        expect(result).toEqual('Rose of Purity');
+        expect(message.isSuccess).toBeTrue();
+        expect(formValues).toEqual(values);
    });

-    it(`should confirm the item type was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.type, 'value');
+    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'
+        });
+        await page.respondToDialog('accept');

-        expect(result).toEqual('Anthurium');
-    });
+        const message = await page.sendForm($.form);
+        await page.reloadSection('item.card.basicData');
+        const formValues = await page.fetchForm($.form, ['intrastat']);

-    it(`should confirm the item intrastat was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.intrastat, 'value');
-
-        expect(result).toEqual('588420239 Tropical Flowers');
-    });
-
-    it(`should confirm the item relevancy was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.relevancy, 'value');
-
-        expect(result).toEqual('1');
-    });
-
-    it(`should confirm the item origin was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.origin, 'value');
-
-        expect(result).toEqual('Spain');
-    });
-
-    it(`should confirm the item generic was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.generic, 'value');
-
-        expect(result).toEqual('16 - Pallet');
-    });
-
-    it(`should confirm the item long name was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.longName, 'value');
-
-        expect(result).toEqual('RS Rose of Purity');
-    });
-
-    it('should confirm isFragile checkbox is unchecked', async() => {
-        const result = await page
-            .checkboxState(selectors.itemBasicData.isFragile);
-
-        expect(result).toBe('checked');
-    });
-
-    it('should confirm isActive checkbox is unchecked', async() => {
-        const result = await page
-            .checkboxState(selectors.itemBasicData.isActiveCheckbox);
-
-        expect(result).toBe('unchecked');
-    });
-
-    it('should confirm the priceInKg checkbox is checked', async() => {
-        const result = await page
-            .checkboxState(selectors.itemBasicData.priceInKgCheckbox);
-
-        expect(result).toBe('checked');
-    });
-
-    it(`should confirm the item packingOut was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBasicData.packingOut, 'value');
-
-        expect(result).toEqual('5');
+        expect(message.isSuccess).toBeTrue();
+        expect(formValues).toEqual({intrastat: 'Tropical Flowers'});
    });
 });
--- a/e2e/paths/04-item/03_tax.spec.js
+++ b/e2e/paths/04-item/03_tax.spec.js
@ -53,12 +53,4 @@ describe('Item edit tax path', () => {

        expect(firstVatType).toEqual('Reduced VAT');
    });
-
-    // # #2680 Undo changes button bugs
-    xit(`should now click the undo changes button and see the form is restored`, async() => {
-        await page.waitToClick(selectors.itemTax.undoChangesButton);
-        const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value');
-
-        expect(firstVatType).toEqual('General VAT');
-    });
 });
--- a/e2e/paths/04-item/07_create.spec.js
+++ b/e2e/paths/04-item/07_create.spec.js
@ -1,6 +1,10 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    form: 'vn-item-create form'
+};
+
 describe('Item Create', () => {
    let browser;
    let page;
@ -14,13 +18,6 @@ describe('Item Create', () => {
        await browser.close();
    });

-    it(`should search for the item Infinity Gauntlet to confirm it isn't created yet`, async() => {
-        await page.doSearch('Infinity Gauntlet');
-        const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
-
-        expect(resultsCount).toEqual(0);
-    });
-
    it('should access to the create item view by clicking the create floating button', async() => {
        await page.waitToClick(selectors.itemsIndex.createItemButton);
        await page.waitForState('item.create');
@ -37,44 +34,32 @@ describe('Item Create', () => {
    });

    it('should throw an error when insert an invalid priority', async() => {
-        await page.write(selectors.itemCreateView.temporalName, 'Infinity Gauntlet');
-        await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
-        await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
-        await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
-        await page.clearInput(selectors.itemCreateView.priority);
-        await page.waitToClick(selectors.itemCreateView.createButton);
-        const message = await page.waitForSnackbar();
+        const values = {
+            name: 'Infinity Gauntlet',
+            type: 'Crisantemo',
+            intrastat: 'Coral y materiales similares',
+            origin: 'Holand',
+            priority: null
+        };
+        const message = await page.sendForm($.form, values);

        expect(message.text).toContain('Valid priorities');
    });

    it('should create the Infinity Gauntlet item', async() => {
-        await page.autocompleteSearch(selectors.itemCreateView.priority, '2');
-        await page.waitToClick(selectors.itemCreateView.createButton);
-        const message = await page.waitForSnackbar();
+        const values = {
+            name: 'Infinity Gauntlet',
+            type: 'Crisantemo',
+            intrastat: 'Coral y materiales similares',
+            origin: 'Holand',
+            priority: '2'
+        };

-        expect(message.text).toContain('Data saved!');
-    });
+        await page.fillForm($.form, values);
+        const formValues = await page.fetchForm($.form, Object.keys(values));
+        const message = await page.sendForm($.form);

-    it('should confirm Infinity Gauntlet item was created', async() => {
-        let result = await page
-            .waitToGetProperty(selectors.itemBasicData.name, 'value');
-
-        expect(result).toEqual('Infinity Gauntlet');
-
-        result = await page
-            .waitToGetProperty(selectors.itemBasicData.type, 'value');
-
-        expect(result).toEqual('Crisantemo');
-
-        result = await page
-            .waitToGetProperty(selectors.itemBasicData.intrastat, 'value');
-
-        expect(result).toEqual('5080000 Coral y materiales similares');
-
-        result = await page
-            .waitToGetProperty(selectors.itemBasicData.origin, 'value');
-
-        expect(result).toEqual('Holand');
+        expect(message.isSuccess).toBeTrue();
+        expect(formValues).toEqual(values);
    });
 });
--- a/e2e/paths/04-item/13_fixedPrice.spec.js
+++ b/e2e/paths/04-item/13_fixedPrice.spec.js
@ -1,6 +1,8 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';

+const $ = selectors.itemFixedPrice;
+
 describe('Item fixed prices path', () => {
    let browser;
    let page;
@ -22,63 +24,63 @@ describe('Item fixed prices path', () => {
    });

    it('should filter using all the fields', async() => {
-        await page.write(selectors.itemFixedPrice.generalSearchFilter, 'item');
+        await page.write($.generalSearchFilter, 'item');
        await page.keyboard.press('Enter');

        expect(httpRequest).toContain('search=item');

-        await page.click(selectors.itemFixedPrice.chip);
-        await page.click(selectors.itemFixedPrice.reignFilter);
+        await page.click($.chip);
+        await page.click($.reignFilter);

        expect(httpRequest).toContain('categoryFk');

-        await page.autocompleteSearch(selectors.itemFixedPrice.typeFilter, 'Alstroemeria');
+        await page.autocompleteSearch($.typeFilter, 'Alstroemeria');

        expect(httpRequest).toContain('typeFk');

-        await page.click(selectors.itemFixedPrice.chip);
-        await page.autocompleteSearch(selectors.itemFixedPrice.buyerFilter, 'buyerNick');
+        await page.click($.chip);
+        await page.autocompleteSearch($.buyerFilter, 'buyerNick');

        expect(httpRequest).toContain('buyerFk');

-        await page.click(selectors.itemFixedPrice.chip);
-        await page.autocompleteSearch(selectors.itemFixedPrice.warehouseFilter, 'Algemesi');
+        await page.click($.chip);
+        await page.autocompleteSearch($.warehouseFilter, 'Algemesi');

        expect(httpRequest).toContain('warehouseFk');

-        await page.click(selectors.itemFixedPrice.chip);
-        await page.click(selectors.itemFixedPrice.mineFilter);
+        await page.click($.chip);
+        await page.click($.mineFilter);

        expect(httpRequest).toContain('mine=true');

-        await page.click(selectors.itemFixedPrice.chip);
-        await page.click(selectors.itemFixedPrice.hasMinPriceFilter);
+        await page.click($.chip);
+        await page.click($.hasMinPriceFilter);

        expect(httpRequest).toContain('hasMinPrice=true');

-        await page.click(selectors.itemFixedPrice.chip);
-        await page.click(selectors.itemFixedPrice.addTag);
-        await page.autocompleteSearch(selectors.itemFixedPrice.tagFilter, 'Color');
-        await page.autocompleteSearch(selectors.itemFixedPrice.tagValueFilter, 'Brown');
+        await page.click($.chip);
+        await page.click($.addTag);
+        await page.autocompleteSearch($.tagFilter, 'Color');
+        await page.autocompleteSearch($.tagValueFilter, 'Brown');

        expect(httpRequest).toContain('tags');

-        await page.click(selectors.itemFixedPrice.chip);
+        await page.click($.chip);
    });

    it('should click on the add new fixed price button', async() => {
-        await page.waitToClick(selectors.itemFixedPrice.add);
-        await page.waitForSelector(selectors.itemFixedPrice.fourthFixedPrice);
+        await page.waitToClick($.add);
+        await page.waitForSelector($.fourthFixedPrice);
    });

    it('should fill the fixed price data', async() => {
        const now = Date.vnNew();
-        await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
-        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
-        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');
-        await page.write(selectors.itemFixedPrice.fourthMinPrice, '1');
-        await page.pickDate(selectors.itemFixedPrice.fourthStarted, now);
-        await page.pickDate(selectors.itemFixedPrice.fourthEnded, now);
+        await page.autocompleteSearch($.fourthWarehouse, 'Warehouse one');
+        await page.writeOnEditableTD($.fourthGroupingPrice, '1');
+        await page.writeOnEditableTD($.fourthPackingPrice, '1');
+        await page.write($.fourthMinPrice, '1');
+        await page.pickDate($.fourthStarted, now);
+        await page.pickDate($.fourthEnded, now);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Data saved!');
@ -86,8 +88,9 @@ 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`);
-
-        const result = await page.waitToGetProperty(selectors.itemFixedPrice.fourthItemID, 'value');
+        await page.autocompleteSearch($.warehouseFilter, 'Warehouse one');
+        await page.click($.chip);
+        const result = await page.waitToGetProperty($.fourthItemID, 'value');

        expect(result).toContain('13');
    });
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/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);
@ -425,20 +435,6 @@ describe('Ticket Edit sale path', () => {
        expect(result).toBeFalsy();
    });

-    // tickets no longer update their totals instantly, a task performed ever 5-10 mins does it. disabled this test until it changes.
-    xit('should update all sales discount', async() => {
-        await page.closePopup();
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuUpdateDiscount);
-        await page.waitForSelector(selectors.ticketSales.moreMenuUpdateDiscountInput);
-        await page.type(selectors.ticketSales.moreMenuUpdateDiscountInput, '100');
-        await page.keyboard.press('Enter');
-        await page.waitForTextInElement(selectors.ticketSales.totalImport, '0.00');
-        const result = await page.waitToGetProperty(selectors.ticketSales.totalImport, 'innerText');
-
-        expect(result).toContain('0.00');
-    });
-
    it('should log in as Production role and go to a target ticket summary', async() => {
        await page.loginAndModule('production', 'ticket');
        await page.accessToSearchResult('13');
--- a/e2e/paths/05-ticket/04_packages.spec.js
+++ b/e2e/paths/05-ticket/04_packages.spec.js
@ -1,6 +1,13 @@
-import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    firstPackage: 'vn-autocomplete[label="Package"]',
+    firstQuantity: 'vn-ticket-package vn-horizontal:nth-child(1) vn-input-number[ng-model="package.quantity"]',
+    firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]',
+    addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]',
+    savePackagesButton: `button[type=submit]`
+};
+
 describe('Ticket Create packages path', () => {
    let browser;
    let page;
@ -18,19 +25,19 @@ describe('Ticket Create packages path', () => {
    });

    it(`should attempt create a new package but receive an error if package is blank`, async() => {
-        await page.waitToClick(selectors.ticketPackages.firstRemovePackageButton);
-        await page.waitToClick(selectors.ticketPackages.addPackageButton);
-        await page.write(selectors.ticketPackages.firstQuantity, '99');
-        await page.waitToClick(selectors.ticketPackages.savePackagesButton);
+        await page.waitToClick($.firstRemovePackageButton);
+        await page.waitToClick($.addPackageButton);
+        await page.write($.firstQuantity, '99');
+        await page.waitToClick($.savePackagesButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Package cannot be blank');
    });

    it(`should delete the first package and receive and error to save a new one with blank quantity`, async() => {
-        await page.clearInput(selectors.ticketPackages.firstQuantity);
-        await page.autocompleteSearch(selectors.ticketPackages.firstPackage, 'Container medical box 1m');
-        await page.waitToClick(selectors.ticketPackages.savePackagesButton);
+        await page.clearInput($.firstQuantity);
+        await page.autocompleteSearch($.firstPackage, 'Container medical box 1m');
+        await page.waitToClick($.savePackagesButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Some fields are invalid');
@ -40,15 +47,15 @@ describe('Ticket Create packages path', () => {
        const result = await page
            .evaluate(selector => {
                return document.querySelector(`${selector} input`).checkValidity();
-            }, selectors.ticketPackages.firstQuantity);
+            }, $.firstQuantity);

        expect(result).toBeTruthy();
    });

    it(`should create a new package with correct data`, async() => {
-        await page.clearInput(selectors.ticketPackages.firstQuantity);
-        await page.write(selectors.ticketPackages.firstQuantity, '-99');
-        await page.waitToClick(selectors.ticketPackages.savePackagesButton);
+        await page.clearInput($.firstQuantity);
+        await page.write($.firstQuantity, '-99');
+        await page.waitToClick($.savePackagesButton);
        const message = await page.waitForSnackbar();

        expect(message.text).toContain('Data saved!');
@ -56,15 +63,15 @@ describe('Ticket Create packages path', () => {

    it(`should confirm the first select is the expected one`, async() => {
        await page.reloadSection('ticket.card.package');
-        await page.waitForTextInField(selectors.ticketPackages.firstPackage, 'Container medical box 1m');
-        const result = await page.waitToGetProperty(selectors.ticketPackages.firstPackage, 'value');
+        await page.waitForTextInField($.firstPackage, 'Container medical box 1m');
+        const result = await page.waitToGetProperty($.firstPackage, 'value');

-        expect(result).toEqual('7 : Container medical box 1m');
+        expect(result).toEqual('Container medical box 1m');
    });

    it(`should confirm quantity is just a number and the string part was ignored by the imput number`, async() => {
-        await page.waitForTextInField(selectors.ticketPackages.firstQuantity, '-99');
-        const result = await page.waitToGetProperty(selectors.ticketPackages.firstQuantity, 'value');
+        await page.waitForTextInField($.firstQuantity, '-99');
+        const result = await page.waitToGetProperty($.firstQuantity, 'value');

        expect(result).toEqual('-99');
    });
--- a/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
+++ b/e2e/paths/05-ticket/15_create_ticket_from_client.spec.js
@ -1,6 +1,11 @@
-import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';

+const $ = {
+    form: 'vn-ticket-create-card',
+    moreMenu: 'vn-client-descriptor vn-icon-button[icon=more_vert]',
+    simpleTicketButton: '.vn-menu [name="simpleTicket"]'
+};
+
 describe('Ticket create from client path', () => {
    let browser;
    let page;
@ -16,20 +21,17 @@ describe('Ticket create from client path', () => {
        await browser.close();
    });

-    it('should click the create simple ticket on the descriptor menu', async() => {
-        await page.waitToClick(selectors.clientDescriptor.moreMenu);
-        await page.waitToClick(selectors.clientDescriptor.simpleTicketButton);
+    it('should create simple ticket and check if the client details are the expected ones', async() => {
+        await page.waitToClick($.moreMenu);
+        await page.waitToClick($.simpleTicketButton);
        await page.waitForState('ticket.create');
-    });

-    it('should check if the client details are the expected ones', async() => {
-        const client = await page
-            .waitToGetProperty(selectors.createTicketView.client, 'value');
+        const values = {
+            client: 'Petter Parker',
+            address: 'Petter Parker'
+        };
+        const formValues = await page.fetchForm($.form, Object.keys(values));

-        const address = await page
-            .waitToGetProperty(selectors.createTicketView.address, 'value');
-
-        expect(client).toContain('Petter Parker');
-        expect(address).toContain('20 Ingram Street');
+        expect(formValues).toEqual(values);
    });
 });
--- a/e2e/paths/05-ticket/18_index_payout.spec.js
+++ b/e2e/paths/05-ticket/18_index_payout.spec.js
@ -1,5 +1,10 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
+const $ = {
+    newPayment: '.vn-dialog.shown',
+    anyBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr',
+    firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable'
+};

 describe('Ticket index payout path', () => {
    let browser;
@ -8,17 +13,14 @@ describe('Ticket index payout path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
+        await page.loginAndModule('administrative', 'ticket');
+        await page.waitForState('ticket.index');
    });

    afterAll(async() => {
        await browser.close();
    });

-    it('should navigate to the ticket index', async() => {
-        await page.loginAndModule('administrative', 'ticket');
-        await page.waitForState('ticket.index');
-    });
-
    it('should check the second ticket from a client and 1 of another', async() => {
        await page.waitToClick(selectors.globalItems.searchButton);
        await page.waitToClick(selectors.ticketsIndex.thirdTicketCheckbox);
@ -42,27 +44,27 @@ describe('Ticket index payout path', () => {
        await page.waitForSelector(selectors.ticketsIndex.payoutCompany);
    });

-    it('should fill the company and bank to perform a payout', async() => {
-        await page.autocompleteSearch(selectors.ticketsIndex.payoutCompany, 'VNL');
-        await page.autocompleteSearch(selectors.ticketsIndex.payoutBank, 'cash');
-        await page.write(selectors.clientBalance.newPaymentAmount, '100');
-        await page.write(selectors.ticketsIndex.payoutDescription, 'Payment');
-        await page.waitToClick(selectors.ticketsIndex.submitPayout);
+    it('should fill the company and bank to perform a payout  and check a new balance line was entered', async() => {
+        await page.fillForm($.newPayment, {
+            company: 'VNL',
+            bank: 'cash',
+            amountPaid: 100,
+            description: 'Payment',
+            viewReceipt: false
+        });
+        await page.respondToDialog('accept');
        const message = await page.waitForSnackbar();

-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should navigate to the client balance section and check a new balance line was entered', async() => {
        await page.waitToClick(selectors.globalItems.homeButton);
        await page.selectModule('client');
        await page.accessToSearchResult('1101');
        await page.accessToSection('client.card.balance.index');
-        await page.waitForSelector(selectors.clientBalance.anyBalanceLine);
-        const count = await page.countElement(selectors.clientBalance.anyBalanceLine);
-        const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
+        await page.waitForSelector($.anyBalanceLine);
+        const count = await page.countElement($.anyBalanceLine);
+        const reference = await page.innerText($.firstLineReference);

+        expect(message.isSuccess).toBeTrue();
        expect(count).toEqual(4);
-        expect(reference).toContain('Cash, Albaran: 7, 8Payment');
+        expect(reference).toContain('Payment');
    });
 });
--- a/e2e/paths/05-ticket/21_future.spec.js
+++ b/e2e/paths/05-ticket/21_future.spec.js
@ -21,7 +21,7 @@ describe('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);
@ -42,25 +42,19 @@ describe('Ticket Future path', () => {
        message = await page.waitForSnackbar();

        expect(message.text).toContain('originDated is a required argument');
-    });

-    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);
@ -69,9 +63,7 @@ describe('Ticket Future path', () => {
        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);
@ -80,9 +72,7 @@ describe('Ticket Future path', () => {
        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);
@ -93,45 +83,16 @@ describe('Ticket Future path', () => {
        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);
-    });

-    it('should search in smart-table with an ID Origin', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableId, '1');
-        await page.keyboard.press('Enter');
-
-        expect(httpRequest).toContain('id');
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-    });
-
-    it('should search in smart-table with an IPT Destination', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.autocompleteSearch(selectors.ticketFuture.tableFutureIpt, 'H');
-
-        expect(httpRequest).toContain('futureIpt');
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-    });
-
-    it('should search in smart-table with an ID Destination', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableFutureId, '1');
-        await page.keyboard.press('Enter');
-
-        expect(httpRequest).toContain('futureId');
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        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();
+        message = await page.waitForSnackbar();

        expect(message.text).toContain('Tickets moved successfully!');
    });
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE;
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`ticket` MODIFY COLUMN warehouseFk smallint(6) unsigned DEFAULT NULL NULL;