Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance

2023-02-10 09:02:44 +01:00 · 2023-02-10 09:02:44 +01:00 · a468fb2c66
parent 9dc07d88d6 a094eedfe3
commit a468fb2c66
140 changed files with 2236 additions and 965 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,20 +5,44 @@ 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).

-## [2302.01] - 2023-01-12
+## [2304.01] - 2023-02-09

 ### Added
- [General](Inicio) Permite recuperar la contraseña
- [Ticket](Opciones) Subir albarán a Docuware
- [Ticket](Opciones) Enviar correo con PDF de Docuware
- [Artículo](Datos Básicos) Añadido campo Unidades/Caja
+- (Rutas) Al descargar varias facturas se comprime en un zip
+- (Trabajadores -> Nuevo trabajador)  Nueva sección
+- (Tickets -> Adelantar tickets) Añadidos campos "líneas" y "litros" al ticket origen
+- (Tickets -> Adelantar tickets) Nuevo icono muestra cuando las agencias de los tickets origen/destino son distintas

 ### Changed
- [Reclamaciones](Descriptor) Cambiado el campo Agencia por Zona
- [Tickets](Líneas preparadas) Actualizada sección para que sea más visual
+- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
+- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
+- (Rutas -> Sumario/Tickets) Actualizados campos de los tickets
+- (Proveedores -> Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
+- (Tickets -> Adelantar tickets) Cambiados selectores de estado por checks "Pendiente origen/destino"
+- (Tickets -> Adelantar tickets) Cambiado stock de destino a origen.

 ### Fixed
- [General] Al utilizar el traductor de Google se descuadraban los iconos
+- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
+- (Cliente -> Datos Fiscales) No se permite seleccionar 'Notificar vía e-mail' a los clientes sin e-mail
+- (Tickets -> Datos básicos) Permite guardar la hora de envío
+- (Tickets -> Añadir pago) Eliminado "null" en las referencias
+- (Tickets -> Adelantar tickets) Permite ordenar por importe
+- (Tickets -> Adelantar tickets) El filtrado por encajado muestra también los tickets sin tipo de encajado
+
+## [2302.01] - 2023-01-26
+
+### Added
+- (General -> Inicio) Permite recuperar la contraseña
+- (Tickets -> Opciones) Subir albarán a Docuware
+- (Tickets -> Opciones) Enviar correo con PDF de Docuware
+- (Artículos -> Datos Básicos) Añadido campo Unidades/Caja
+
+### Changed
+- (Reclamaciones -> Descriptor) Cambiado el campo Agencia por Zona
+- (Tickets -> Líneas preparadas) Actualizada sección para que sea más visual
+
+### Fixed
+- (General) Al utilizar el traductor de Google se descuadraban los iconos

 ### Removed
- [Tickets](Control clientes) Eliminada sección
+- (Tickets -> Control clientes) Eliminada sección
--- a/db/changes/230201/00-SupplierUniqueKey.sql
+++ b/db/changes/230201/00-SupplierUniqueKey.sql
@ -0,0 +1 @@
+ALTER TABLE `vn`.`supplier` ADD UNIQUE (name, countryFk);
--- a/db/changes/230201/00-validPriorities_ItemConfig.sql
+++ b/db/changes/230201/00-validPriorities_ItemConfig.sql
@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`itemConfig` ADD defaultTag INT DEFAULT 56 NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultTag) REFERENCES vn.tag(id);
+ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
+ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';
+
+INSERT INTO `salix`.`ACL`
+(model, property, accessType, permission, principalType, principalId)
+VALUES('ItemConfig', '*', 'READ', 'ALLOW', 'ROLE', 'buyer');
--- a/db/changes/230202/00-itemConfig.sql
+++ b/db/changes/230202/00-itemConfig.sql
@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`itemConfig` ADD defaultTag INT DEFAULT 56 NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultTag) REFERENCES vn.tag(id);
+ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
+ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';
+
+INSERT INTO `salix`.`ACL`
+(model, property, accessType, permission, principalType, principalId)
+VALUES('ItemConfig', '*', 'READ', 'ALLOW', 'ROLE', 'buyer');
--- a/db/changes/230401/00-ACL_tag_update.sql
+++ b/db/changes/230401/00-ACL_tag_update.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Tag', 'onSubmit', 'WRITE', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/230401/00-createWorker.sql
+++ b/db/changes/230401/00-createWorker.sql
@ -0,0 +1,24 @@
+UPDATE `salix`.`ACL`
+SET accessType='READ'
+WHERE model='Worker'
+    AND property='*'
+    AND accessType='*'
+    AND permission='ALLOW'
+    AND principalType='ROLE'
+    AND principalId='employee';
+
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Worker', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+        ('Worker', 'createAbsence', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'updateAbsence', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'deleteAbsence', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'new', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+        ('Role', '*', 'READ', 'ALLOW', 'ROLE', 'hr');
+
+ALTER TABLE `vn`.`workerConfig` ADD roleFk int(10) unsigned NOT NULL COMMENT 'Rol por defecto al dar de alta un trabajador nuevo';
+UPDATE `vn`.`workerConfig`
+    SET roleFk = 1
+    WHERE id = 1;
+
--- a/db/changes/230401/00-ticket_canAdvance.sql
+++ b/db/changes/230401/00-ticket_canAdvance.sql
@ -0,0 +1,110 @@
+DROP PROCEDURE IF EXISTS vn.ticket_canAdvance;
+
+DELIMITER $$
+$$
+CREATE 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 vn.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 vn.itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM vn.itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM vn.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 s.ticketFk futureId,
+			t2.ticketFk id,
+			count(DISTINCT s.id) saleCount,
+            t2.state,
+			t2.isNotValidated,
+            st.name futureState,
+			st.isNotValidated futureIsNotValidated,
+			GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+			t2.ipt,
+			t.workerFk,
+			CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+			CAST(COUNT(*) AS DECIMAL(10,0)) `futureLines`,
+			t2.shipped,
+			t.shipped futureShipped,
+			t2.totalWithVat,
+			t.totalWithVat futureTotalWithVat,
+            t2.agency,
+            am.name futureAgency,
+            t2.lines,
+            t2.liters,
+            SUM((s.quantity <= IFNULL(st.amount,0))) hasStock
+		FROM vn.ticket t
+			JOIN vn.ticketState ts ON ts.ticketFk = t.id
+			JOIN vn.state st ON st.id = ts.stateFk
+			JOIN vn.saleVolume sv ON t.id = sv.ticketFk
+			JOIN (SELECT
+                        t2.id ticketFk,
+                        t2.addressFk,
+                        st.isNotValidated,
+                        st.name state,
+                        GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+                        t2.shipped,
+                        t2.totalWithVat,
+                        am.name agency,
+                        CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                        CAST(COUNT(*) AS DECIMAL(10,0)) `lines`
+						FROM vn.ticket t2
+                            JOIN vn.saleVolume sv ON t2.id = sv.ticketFk
+							JOIN vn.sale s ON s.ticketFk = t2.id
+							JOIN vn.item i ON i.id = s.itemFk
+							JOIN vn.ticketState ts ON ts.ticketFk = t2.id
+							JOIN vn.state st ON st.id = ts.stateFk
+                            JOIN vn.agencyMode am ON t2.agencyModeFk = am.id
+							LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+						WHERE t2.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+							AND t2.warehouseFk = vWarehouseFk
+						GROUP BY t2.id) t2 ON t2.addressFk = t.addressFk
+			JOIN vn.sale s ON s.ticketFk = t.id
+			JOIN vn.item i ON i.id = s.itemFk
+            JOIN vn.agencyMode am ON t.agencyModeFk = am.id
+			LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+            LEFT JOIN tmp.stock st ON st.itemFk = s.itemFk
+		WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+			AND t.warehouseFk = vWarehouseFk
+		GROUP BY t.id;
+
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;
--- a/db/changes/230401/00-updateIsToBeMailed.sql
+++ b/db/changes/230401/00-updateIsToBeMailed.sql
@ -0,0 +1,6 @@
+UPDATE `vn`.`client`
+    SET isToBeMailed = FALSE
+    WHERE
+        mailAddress is NULL
+        AND email is NULL
+        AND isToBeMailed = TRUE;
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -2632,7 +2632,7 @@ INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`

 INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
 VALUES
-    (1, 1, DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
+    (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
    (2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=8, 8, 15) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100);

 INSERT INTO `vn`.`zoneExclusionGeo` (`zoneExclusionFk`, `geoFk`)
@ -2722,6 +2722,10 @@ INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPack
    VALUES
        (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);

+INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`)
+    VALUES
+        (0, 0, 24, '', '[1,2,3]', 2, 56);
+
 INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
    VALUES
        (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
@ -2750,10 +2754,14 @@ INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
    VALUES
        ('foo', 'master', NULL, NULL),
        ('bar', 'test', 9, util.VN_NOW());
-INSERT INTO `vn`.`ticketLog` (`id`, `originFk`, `userFk`, `action`, `changedModel`, `oldInstance`, `newInstance`, `changedModelId`)
-    VALUES
-        (1, 1, 9, 'insert', 'Ticket', '{}', '{"clientFk":1, "nickname": "Bat cave"}', 1);

+INSERT INTO `vn`.`profileType` (`id`, `name`)
+    VALUES
+        (1, 'working');
+
+INSERT INTO `vn`.`newWorkerConfig` (`id`, `street`, `provinceFk`, `companyFk`, `profileTypeFk`, `roleFk`)
+    VALUES
+        (1, 'S/ ', 1, 442, 1, 1);

 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
    VALUES
@ -2764,3 +2772,7 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
    VALUES
        (1, 1);

+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
+    VALUES
+        (1, NULL, 1);
+
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@ -80203,4 +80203,3 @@ USE `vncontrol`;
 -- Dump completed on 2022-11-21  7:57:28


-
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -58,6 +58,7 @@ export default {
        deleteAccount: '.vn-menu [name="deleteUser"]',
        setPassword: '.vn-menu [name="setPassword"]',
        activateAccount: '.vn-menu [name="enableAccount"]',
+        disableAccount: '.vn-menu [name="disableAccount"]',
        activateUser: '.vn-menu [name="activateUser"]',
        deactivateUser: '.vn-menu [name="deactivateUser"]',
        newPassword: 'vn-textfield[ng-model="$ctrl.newPassword"]',
@ -428,6 +429,7 @@ export default {
    },
    itemCreateView: {
        temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]',
+        priority: 'vn-autocomplete[ng-model="$ctrl.item.priority"]',
        type: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
        intrastat: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]',
        origin: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]',
@ -521,7 +523,7 @@ export default {
    },
    itemLog: {
        anyLineCreated: 'vn-item-log > vn-log vn-tbody > vn-tr',
-        fifthLineCreatedProperty: 'vn-item-log > vn-log vn-tbody > vn-tr:nth-child(5) table tr:nth-child(3) td.after',
+        fifthLineCreatedProperty: 'vn-item-log > vn-log vn-tbody > vn-tr:nth-child(5) table tr:nth-child(2) td.after',
    },
    ticketSummary: {
        header: 'vn-ticket-summary > vn-card > h5',
@ -776,6 +778,8 @@ export default {
        ipt: 'vn-autocomplete[label="Destination IPT"]',
        tableIpt: 'vn-autocomplete[name="ipt"]',
        tableFutureIpt: 'vn-autocomplete[name="futureIpt"]',
+        futureState: 'vn-check[label="Pending Origin"]',
+        state: 'vn-check[label="Pending Destination"]',
        warehouseFk: 'vn-autocomplete[label="Warehouse"]',
        tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
        moveButton: 'vn-button[vn-tooltip="Advance tickets"]',
@ -940,9 +944,9 @@ export default {
    routeSummary: {
        header: 'vn-route-summary > vn-card > h5',
        cost: 'vn-route-summary vn-label-value[label="Cost"]',
-        firstTicketID: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(2) > span',
+        firstTicketID: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(10) > span',
        firstTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor',
-        firstAlias: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(3) > span',
+        firstAlias: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(5) > span',
        firstClientDescriptor: '.vn-popover.shown vn-client-descriptor',
        goToRouteSummaryButton: 'vn-route-summary > vn-card > h5 > a',

@ -966,6 +970,7 @@ export default {
        confirmButton: '.vn-confirm.shown button[response="accept"]'
    },
    workerSummary: {
+        summaryIcon: 'vn-worker-descriptor a[title="Go to module summary"]',
        header: 'vn-worker-summary h5',
        id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
        email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
@ -1018,6 +1023,25 @@ export default {
        furlough: 'vn-worker-calendar > vn-side-menu [name="absenceTypes"] > vn-chip:nth-child(4)',
        halfFurlough: 'vn-worker-calendar > vn-side-menu [name="absenceTypes"] > vn-chip:nth-child(5)',
    },
+    workerCreate: {
+        newWorkerButton: 'vn-worker-index a[ui-sref="worker.create"]',
+        firstname: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.firstName"]',
+        lastname: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.lastNames"]',
+        birth: 'vn-worker-create vn-date-picker[ng-model="$ctrl.worker.birth"]',
+        fi: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.fi"]',
+        code: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.code"]',
+        phone: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.phone"]',
+        city: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.city"]',
+        postcode: 'vn-worker-create vn-datalist[ng-model="$ctrl.worker.postcode"]',
+        street: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.street"]',
+        user: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.name"]',
+        email: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.email"]',
+        boss: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bossFk"]',
+        role: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.roleFk"]',
+        iban: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.iban"]',
+        switft: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bankEntityFk"]',
+        createButton: 'vn-worker-create vn-submit[label="Create"]',
+    },
    invoiceOutIndex: {
        topbarSearch: 'vn-searchbar',
        searchResult: 'vn-invoice-out-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
--- a/e2e/paths/03-worker/04_time_control.spec.js
+++ b/e2e/paths/03-worker/04_time_control.spec.js
@ -23,6 +23,7 @@ describe('Worker time control path', () => {

    it('should go to the next month, go to current month and go 1 month in the past', async() => {
        let date = new Date();
+        date.setDate(1);
        date.setMonth(date.getMonth() + 1);
        let month = date.toLocaleString('default', {month: 'long'});

@ -32,6 +33,7 @@ describe('Worker time control path', () => {
        expect(result).toContain(month);

        date = new Date();
+        date.setDate(1);
        month = date.toLocaleString('default', {month: 'long'});

        await page.click(selectors.workerTimeControl.previousMonthButton);
@ -40,6 +42,7 @@ describe('Worker time control path', () => {
        expect(result).toContain(month);

        date = new Date();
+        date.setDate(1);
        date.setMonth(date.getMonth() - 1);
        const timestamp = Math.round(date.getTime() / 1000);
        month = date.toLocaleString('default', {month: 'long'});
--- a/e2e/paths/03-worker/06_create.spec.js
+++ b/e2e/paths/03-worker/06_create.spec.js
@ -0,0 +1,74 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Worker create path', () => {
+    let browser;
+    let page;
+    let newWorker;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('hr', 'worker');
+        await page.waitToClick(selectors.workerCreate.newWorkerButton);
+        await page.waitForState('worker.create');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should insert default data', async() => {
+        await page.write(selectors.workerCreate.firstname, 'Victor');
+        await page.write(selectors.workerCreate.lastname, 'Von Doom');
+        await page.write(selectors.workerCreate.fi, '78457139E');
+        await page.write(selectors.workerCreate.phone, '12356789');
+        await page.write(selectors.workerCreate.postcode, '46680');
+        await page.write(selectors.workerCreate.street, 'S/ Doomstadt');
+        await page.write(selectors.workerCreate.email, 'doctorDoom@marvel.com');
+        await page.write(selectors.workerCreate.iban, 'ES9121000418450200051332');
+        await page.autocompleteSearch(selectors.workerCreate.switft, 'BBKKESMMMMM');
+
+        // should check for autocompleted worker code and worker user name
+        const workerCode = await page
+            .waitToGetProperty(selectors.workerCreate.code, 'value');
+
+        newWorker = await page
+            .waitToGetProperty(selectors.workerCreate.user, 'value');
+
+        expect(workerCode).toEqual('VVD');
+        expect(newWorker).toContain('victorvd');
+
+        // should fail if necessary data is void
+        await page.waitToClick(selectors.workerCreate.createButton);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('is a required argument');
+
+        // should create a new worker and go to worker basic data'
+        await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
+        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryBoss');
+        await page.waitToClick(selectors.workerCreate.createButton);
+        message = await page.waitForSnackbar();
+        await page.waitForState('worker.card.basicData');
+
+        expect(message.text).toContain('Data saved!');
+
+        // 'rollback'
+        await page.loginAndModule('sysadmin', 'account');
+        await page.accessToSearchResult(newWorker);
+
+        await page.waitToClick(selectors.accountDescriptor.menuButton);
+        await page.waitToClick(selectors.accountDescriptor.deactivateUser);
+        await page.waitToClick(selectors.accountDescriptor.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('User deactivated!');
+
+        await page.waitToClick(selectors.accountDescriptor.menuButton);
+        await page.waitToClick(selectors.accountDescriptor.disableAccount);
+        await page.waitToClick(selectors.accountDescriptor.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Account disabled!');
+    });
+});
--- a/e2e/paths/04-item/07_create.spec.js
+++ b/e2e/paths/04-item/07_create.spec.js
@ -36,11 +36,20 @@ describe('Item Create', () => {
        await page.waitForState('item.create');
    });

-    it('should create the Infinity Gauntlet item', async() => {
+    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();
+
+        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();

--- a/e2e/paths/05-ticket/22_advance.spec.js
+++ b/e2e/paths/05-ticket/22_advance.spec.js
@ -54,7 +54,7 @@ describe('Ticket Advance path', () => {
        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
        await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'Horizontal');
        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);

        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
        await page.clearInput(selectors.ticketAdvance.ipt);
@ -66,7 +66,7 @@ describe('Ticket Advance path', () => {
        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
        await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'Horizontal');
        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);

        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
        await page.clearInput(selectors.ticketAdvance.futureIpt);
@ -96,42 +96,7 @@ describe('Ticket Advance path', () => {
        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
    });

-    it('should search in smart-table with stock', async() => {
-        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
-        await page.write(selectors.ticketAdvance.tableStock, '5');
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 2);
-
-        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
-    it('should search in smart-table with especified Lines', async() => {
-        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
-        await page.write(selectors.ticketAdvance.tableLines, '0');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-
-        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
-    it('should search in smart-table with especified Liters', async() => {
-        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
-        await page.write(selectors.ticketAdvance.tableLiters, '0');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-
-        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
-    it('should check the three last tickets and move to the future', async() => {
+    it('should check the one ticket and move to the present', async() => {
        await page.waitToClick(selectors.ticketAdvance.multiCheck);
        await page.waitToClick(selectors.ticketAdvance.moveButton);
        await page.waitToClick(selectors.ticketAdvance.acceptButton);
--- a/front/core/components/button-menu/index.js
+++ b/front/core/components/button-menu/index.js
@ -87,6 +87,7 @@ ngModule.vnComponent('vnButtonMenu', {
        selectFields: '<?',
        initialData: '<?',
        showFilter: '<?',
+        fields: '<?',
        field: '=?',
        url: '@?',
        data: '<?',
--- a/front/core/components/crud-model/crud-model.js
+++ b/front/core/components/crud-model/crud-model.js
@ -147,28 +147,17 @@ export default class CrudModel extends ModelProxy {
        this.moreRows = null;
    }

-    /**
-     * Saves current changes on the server.
-     *
-     * @return {Promise} The save request promise
-     */
-    save() {
-        if (!this.isChanged)
-            return this.$q.resolve();
+    getChanges() {
+        if (!this.isChanged) return null;

-        let deletes = [];
-        let updates = [];
-        let creates = [];
-        let orgDeletes = [];
-        let orgUpdates = [];
-        let orgCreates = [];
+        const deletes = [];
+        const updates = [];
+        const creates = [];

-        let pk = this.primaryKey;
+        const pk = this.primaryKey;

-        for (let row of this.removed) {
+        for (let row of this.removed)
            deletes.push(row.$orgRow[pk]);
-            orgDeletes.push(row);
-        }

        for (let row of this.data) {
            if (row.$isNew) {
@ -178,7 +167,6 @@ export default class CrudModel extends ModelProxy {
                        data[prop] = row[prop];
                }
                creates.push(row);
-                orgCreates.push(row);
            } else if (row.$oldData) {
                let data = {};
                for (let prop in row.$oldData)
@ -187,28 +175,38 @@ export default class CrudModel extends ModelProxy {
                    data,
                    where: {[pk]: row.$orgRow[pk]}
                });
-                orgUpdates.push(row);
            }
        }

-        let changes = {deletes, updates, creates};
+        const changes = {deletes, updates, creates};

        for (let prop in changes) {
            if (changes[prop].length === 0)
                changes[prop] = undefined;
        }

-        if (!changes)
-            return this.$q.resolve();
+        return changes;
+    }

+    /**
+     * Saves current changes on the server.
+     *
+     * @return {Promise} The save request promise
+     */
+    save() {
+        const pk = this.primaryKey;
+        const changes = this.getChanges();
+        if (!changes) return this.$q.resolve();
+
+        const creates = changes.creates || [];
        let url = this.saveUrl ? this.saveUrl : `${this._url}/crud`;
        return this.$http.post(url, changes)
            .then(res => {
                const created = res.data;

                // Apply new data to created instances
-                for (let i = 0; i < orgCreates.length; i++) {
-                    const row = orgCreates[i];
+                for (let i = 0; i < creates.length; i++) {
+                    const row = creates[i];
                    row[pk] = created[i][pk];

                    for (let prop in row) {
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@ -42,6 +42,7 @@ vn-log {
            & > td.after,
            & > th.after {
                width: 40%;
+                white-space: pre-line;
            }
        }
    }
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -67,7 +67,7 @@
 	"Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
 	"Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+	"Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
 	"Claim state has changed to incomplete": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *incomplete*",
 	"Claim state has changed to canceled": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *canceled*",
 	"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
@ -137,15 +137,18 @@
 	"Password does not meet requirements": "Password does not meet requirements",
 	"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
 	"Not enough privileges to edit a client": "Not enough privileges to edit a client",
-    "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
+	"Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
 	"You don't have grant privilege": "You don't have grant privilege",
 	"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
-    "Email verify": "Email verify",
+	"Email verify": "Email verify",
 	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-    "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production",
 	"App locked": "App locked by user {{userId}}",
-    "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
-    "Receipt's bank was not found": "Receipt's bank was not found",
-    "This receipt was not compensated": "This receipt was not compensated",
-    "Client's email was not found": "Client's email was not found"
+	"The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
+	"Receipt's bank was not found": "Receipt's bank was not found",
+	"This receipt was not compensated": "This receipt was not compensated",
+	"Client's email was not found": "Client's email was not found",
+	"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
+	"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
+	"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
+	"Valid priorities: 1,2,3": "Valid priorities: 1,2,3"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -84,7 +84,6 @@
 	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
 	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
 	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
-	"Sale(s) blocked, contact production": "Linea(s) bloqueada(s), contacte con produccion",
 	"Please select at least one sale": "Por favor selecciona al menos una linea",
 	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@ -252,9 +251,18 @@
 	"Receipt's bank was not found": "No se encontró el banco del recibo",
 	"This receipt was not compensated": "Este recibo no ha sido compensado",
 	"Client's email was not found": "No se encontró el email del cliente",
+	"This worker code already exists": "Este codigo de trabajador ya existe",
+	"This personal mail already exists": "Este correo personal ya existe",
+	"This worker already exists": "Este trabajador ya existe",
 	"App name does not exist": "El nombre de aplicación no es válido",
 	"Try again": "Vuelve a intentarlo",
 	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
 	"Failed to upload file": "Error al subir archivo",
-	"The DOCUWARE PDF document does not exists": "The DOCUWARE PDF document does not exists"
-}
+	"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
+    "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+    "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+    "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
+	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
+	"There is no assigned email for this client": "No hay correo asignado para este cliente"
+}
+
--- a/loopback/util/not-found-error.js
+++ b/loopback/util/not-found-error.js
@ -0,0 +1,9 @@
+module.exports = class NotFoundError extends Error {
+    constructor(message = 'Not found', code = 'NOT_FOUND', ...translateArgs) {
+        super(message);
+        this.name = 'NotFoundError';
+        this.statusCode = 404;
+        this.code = code;
+        this.translateArgs = translateArgs;
+    }
+};
--- a/modules/claim/front/card/index.js
+++ b/modules/claim/front/card/index.js
@ -19,10 +19,26 @@ class Controller extends ModuleCard {
                }, {
                    relation: 'ticket',
                    scope: {
-                        fields: ['zoneFk'],
-                        include: {
-                            relation: 'zone'
-                        }
+                        fields: ['zoneFk', 'addressFk'],
+                        include: [
+                            {
+                                relation: 'zone',
+                                scope: {
+                                    fields: ['name']
+                                }
+                            },
+                            {
+                                relation: 'address',
+                                scope: {
+                                    fields: ['provinceFk'],
+                                    include: {
+                                        relation: 'province',
+                                        scope: {
+                                            fields: ['name']
+                                        }
+                                    }
+                                }
+                            }]
                    }
                }, {
                    relation: 'claimState',
--- a/modules/claim/front/descriptor/index.html
+++ b/modules/claim/front/descriptor/index.html
@ -55,9 +55,13 @@
                <span
                    ng-click="zoneDescriptor.show($event, $ctrl.claim.ticket.zoneFk)"
                    class="link">
-                    {{$ctrl.claim.ticket.zoneFk}}
+                    {{$ctrl.claim.ticket.zone.name}}
                </span>
            </vn-label-value>
+            <vn-label-value
+                label="Province"
+                value="{{$ctrl.claim.ticket.address.province.name}}">
+            </vn-label-value>
            <vn-label-value
                label="Ticket">
                <span
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@ -141,6 +141,16 @@ module.exports = Self => {
        done();
    }

+    Self.validateAsync('isToBeMailed', isToBeMailed, {
+        message: 'There is no assigned email for this client'
+    });
+
+    function isToBeMailed(err, done) {
+        if (this.isToBeMailed == true && !this.email)
+            err();
+        done();
+    }
+
    Self.validateAsync('defaultAddressFk', isActive,
        {message: 'Unable to default a disabled consignee'}
    );
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@ -58,14 +58,13 @@ class Controller extends Dialog {

        if (value) {
            const accountingType = value.accountingType;
+
            this.viewReceipt = accountingType.code == 'cash';
-            if (this.originalDescription) {
-                this.receipt.description =
-                `${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`;
-            } else {
-                this.receipt.description =
-                `${accountingType && accountingType.receiptDescription}`;
-            }
+            if (accountingType.receiptDescription != null) {
+                this.receipt.description = accountingType.receiptDescription;
+                if (this.originalDescription) this.receipt.description += `, ${this.originalDescription}`;
+            } else if (this.originalDescription)
+                this.receipt.description = this.originalDescription;
            this.maxAmount = accountingType && accountingType.maxAmount;

            this.receipt.payed = new Date();
--- a/modules/entry/front/latest-buys/locale/es.yml
+++ b/modules/entry/front/latest-buys/locale/es.yml
@ -1,5 +1,5 @@
 Edit buy(s): Editar compra(s)
-Buying value: Precio
+Buying value: Coste
 Freight value: Porte
 Commission value: Comisión
 Package value: Embalaje
@ -16,4 +16,4 @@ Field to edit: Campo a editar
 PackageName: Cubo
 Edit: Editar
 buy(s): compra(s)
-Package out: Embalaje envíos
+Package out: Embalaje envíos
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@ -38,7 +38,7 @@
        </vn-one>
        <vn-one>
            <vn-label-value label="Reference">
-                <span 
+                <span
                    ng-click="travelDescriptor.show($event, $ctrl.entryData.travel.id)"
                    class="link">
                    {{$ctrl.entryData.travel.ref}}
@ -114,8 +114,7 @@
                        <th translate center field="grouping">Grouping</th>
                        <th translate center field="buyingValue">Buying value</th>
                        <th translate center field="price3">Import</th>
-                        <th translate center expand field="price2">Grouping price</th>
-                        <th translate center expand field="price3">Packing price</th>
+                        <th translate center expand field="price">PVP</th>
                    </tr>
                </thead>
                <tbody ng-repeat="line in buys">
@ -125,19 +124,18 @@
                        <td center title="{{::line.packageFk | dashIfEmpty}}">{{::line.packageFk | dashIfEmpty}}</td>
                        <td center title="{{::line.weight}}">{{::line.weight}}</td>
                        <td center>
-                            <vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}"> 
+                            <vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}">
                                <span>{{::line.packing | dashIfEmpty}}</span>
                            </vn-chip>
                        </td>
                        <td center>
-                            <vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}"> 
+                            <vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}">
                                <span>{{::line.grouping | dashIfEmpty}}</span>
                            </vn-chip>
                        </vn-td>
                        <td center title="{{::line.buyingValue | currency: 'EUR':2}}">{{::line.buyingValue | currency: 'EUR':2}}</td>
                        <td center title="{{::line.quantity * line.buyingValue | currency: 'EUR':2}}">{{::line.quantity * line.buyingValue | currency: 'EUR':2}}</td>
-                        <td center title="{{::line.price2 | currency: 'EUR':2}}">{{::line.price2 | currency: 'EUR':2}}</td>
-                        <td center title="{{::line.price3 | currency: 'EUR':2}}">{{::line.price3 | currency: 'EUR':2}}</td>
+                        <td center title="Grouping / Packing">{{::line.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::line.price3 | currency: 'EUR':2 | dashIfEmpty}}</td>
                    </tr>
                    <tr class="dark-row">
                        <td shrink>
@ -195,7 +193,7 @@
    vn-id="item-descriptor"
    warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
-<vn-travel-descriptor-popover 
+<vn-travel-descriptor-popover
    vn-id="travelDescriptor">
 </vn-travel-descriptor-popover>

--- a/modules/invoiceIn/back/models/invoice-in.json
+++ b/modules/invoiceIn/back/models/invoice-in.json
@ -94,11 +94,6 @@
            "model": "Supplier",
            "foreignKey": "supplierFk"
        },
-        "supplierContact": {
-            "type": "hasMany",
-            "model": "SupplierContact",
-            "foreignKey": "supplierFk"
-        },
        "currency": {
            "type": "belongsTo",
            "model": "Currency",
--- a/modules/invoiceIn/front/card/index.js
+++ b/modules/invoiceIn/front/card/index.js
@ -6,13 +6,15 @@ class Controller extends ModuleCard {
        const filter = {
            include: [
                {
-                    relation: 'supplier'
-                },
-                {
-                    relation: 'supplierContact',
+                    relation: 'supplier',
                    scope: {
-                        where: {
-                            email: {neq: null}
+                        include: {
+                            relation: 'contacts',
+                            scope: {
+                                where: {
+                                    email: {neq: null},
+                                }
+                            }
                        }
                    }
                },
--- a/modules/invoiceIn/front/descriptor/index.html
+++ b/modules/invoiceIn/front/descriptor/index.html
@ -40,7 +40,7 @@
        </vn-item>
        <vn-item
            ng-if="$ctrl.isAgricultural()"
-            ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplierContact[0].email})"
+            ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplier.contacts[0].email})"
            translate>
            Send agricultural receipt as PDF
        </vn-item>
--- a/modules/item/back/methods/item/new.js
+++ b/modules/item/back/methods/item/new.js
@ -37,7 +37,8 @@ module.exports = Self => {
            'typeFk',
            'intrastatFk',
            'originFk',
-            'relevancy'
+            'priority',
+            'tag'
        ];

        for (const key in params) {
@ -46,10 +47,14 @@ module.exports = Self => {
        }

        try {
+            const itemConfig = await models.ItemConfig.findOne({fields: ['validPriorities']}, myOptions);
+            if (!itemConfig.validPriorities.includes(params.priority))
+                throw new UserError(`Valid priorities: ${[...itemConfig.validPriorities]}`);
+
            const provisionalName = params.provisionalName;
            delete params.provisionalName;

-            const itemType = await models.ItemType.findById(params.typeFk, myOptions);
+            const itemType = await models.ItemType.findById(params.typeFk, {fields: ['isLaid']}, myOptions);

            params.isLaid = itemType.isLaid;

@ -63,13 +68,14 @@ module.exports = Self => {

            await Self.rawSql(query, null, myOptions);

-            let nameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}});
+            const nameTag = await models.Tag.findById(params.tag, {fields: ['id']}, myOptions);

            let newTags = [];

-            newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: '2'});
+            newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: item.priority});
            typeTags.forEach(typeTag => {
-                newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
+                if (nameTag.id != typeTag.tagFk)
+                    newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
            });

            await models.ItemTag.create(newTags, myOptions);
--- a/modules/item/back/methods/item/specs/new.spec.js
+++ b/modules/item/back/methods/item/specs/new.spec.js
@ -11,7 +11,8 @@ describe('item new()', () => {
                originFk: 1,
                provisionalName: 'planta',
                typeFk: 2,
-                relevancy: 0
+                priority: 2,
+                tag: 1
            };

            let item = await models.Item.new(itemParams, options);
@ -20,7 +21,7 @@ describe('item new()', () => {

            item.isLaid = itemType.isLaid;

-            const temporalNameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}}, options);
+            const temporalNameTag = await models.Tag.findById(itemParams.tag, {fields: ['id']}, options);

            const temporalName = await models.ItemTag.findOne({
                where: {
@ -31,7 +32,7 @@ describe('item new()', () => {

            item = await models.Item.findById(item.id, null, options);

-            itemType = await models.ItemType.findById(item.typeFk, options);
+            itemType = await models.ItemType.findById(item.typeFk, {fields: ['isLaid']}, options);

            item.isLaid = itemType.isLaid;

--- a/modules/item/back/methods/tag/onSubmit.js
+++ b/modules/item/back/methods/tag/onSubmit.js
@ -0,0 +1,81 @@
+
+module.exports = function(Self) {
+    Self.remoteMethodCtx('onSubmit', {
+        description: 'Save model changes',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'creates',
+                type: ['object'],
+                description: 'The itemTags records to create'
+            }, {
+                arg: 'deletes',
+                type: ['number'],
+                description: 'The itemTags ids to delete'
+            }, {
+                arg: 'updates',
+                type: ['object'],
+                description: 'The itemTags records to update'
+            }, {
+                arg: 'maxPriority',
+                type: 'number',
+                description: 'The maxPriority value'
+            }
+        ],
+        returns: {
+            root: true,
+            type: 'object'
+        },
+        http: {
+            verb: 'PATCH',
+            path: '/onSubmit'
+        }
+    });
+
+    Self.onSubmit = async(ctx, options) => {
+        const models = Self.app.models;
+        const args = ctx.args;
+        let tx;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            if (args.deletes) {
+                for (const itemTagId of args.deletes)
+                    await models.ItemTag.destroyById(itemTagId, myOptions);
+            }
+
+            if (args.updates) {
+                for (const row of args.updates) {
+                    if (row.data.priority) {
+                        const itemTag = await models.ItemTag.findById(row.where.id, null, myOptions);
+                        await itemTag.updateAttributes({
+                            priority: row.data.priority + args.maxPriority
+                        }, myOptions);
+                    }
+                }
+                for (const row of args.updates) {
+                    const itemTag = await models.ItemTag.findById(row.where.id, null, myOptions);
+                    await itemTag.updateAttributes(row.data, myOptions);
+                }
+            }
+
+            if (args.creates) {
+                for (const itemTag of args.creates)
+                    await models.ItemTag.create(itemTag, myOptions);
+            }
+
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
--- a/modules/item/back/methods/tag/specs/onSubmit.spec.js
+++ b/modules/item/back/methods/tag/specs/onSubmit.spec.js
@ -0,0 +1,96 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('tag onSubmit()', () => {
+    it('should delete a tag', async() => {
+        const tx = await models.Item.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const deletes = [40];
+            const ctx = {
+                args: {
+                    deletes: deletes
+                }
+            };
+            await models.Tag.onSubmit(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should update a tag', async() => {
+        const tx = await models.Item.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const updates = [{data: {value: 'Container  Test'}, where: {id: 36}}];
+            const ctx = {
+                args: {
+                    updates: updates
+                }
+            };
+            await models.Tag.onSubmit(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should create a tag', async() => {
+        const tx = await models.Item.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const creates = [{
+                'itemFk': '6',
+                'priority': 8,
+                '$orgIndex': null,
+                '$oldData': null,
+                '$isNew': true,
+                'tagFk': 3,
+                'value': 'madera'
+            }];
+            const ctx = {
+                args: {
+                    creates: creates
+                }
+            };
+            await models.Tag.onSubmit(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should swap priority for two tags', async() => {
+        const tx = await models.Item.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const updates = [
+                {data: {priority: 2}, where: {id: 36}},
+                {data: {priority: 1}, where: {id: 37}}
+            ];
+            const ctx = {
+                args: {
+                    updates: updates,
+                    maxPriority: 7,
+
+                }
+            };
+            await models.Tag.onSubmit(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
--- a/modules/item/back/models/item-config.json
+++ b/modules/item/back/models/item-config.json
@ -16,6 +16,22 @@
        "wasteRecipients": {
            "type": "string",
            "description": "Buyers waste report recipients"
+        },
+        "validPriorities": {
+            "type": "array"
+        },
+        "defaultPriority": {
+            "type": "int"
+        },
+        "defaultTag": {
+            "type": "int"
+        }
+    },
+    "relations": {
+        "tag": {
+            "type": "belongsTo",
+            "model": "Tag",
+            "foreignKey": "defaultTag"
        }
    }
-}
+}
--- a/modules/item/back/models/tag.js
+++ b/modules/item/back/models/tag.js
@ -1,3 +1,4 @@
 module.exports = Self => {
    require('../methods/tag/filterValue')(Self);
+    require('../methods/tag/onSubmit')(Self);
 };
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@ -16,10 +16,24 @@
    <vn-card class="vn-pa-lg">
        <vn-horizontal>
            <vn-textfield
-                label="Temporal name" 
-                ng-model="$ctrl.item.provisionalName" 
+                label="Name"
+                ng-model="$ctrl.item.provisionalName"
                vn-focus>
            </vn-textfield>
+            <vn-autocomplete
+                ng-model="$ctrl.item.tag"
+                url="Tags"
+                show-field="name"
+                value-field="id"
+                label="Tag">
+            </vn-autocomplete>
+            <vn-autocomplete
+                data="$ctrl.validPriorities"
+                label="Priority"
+                ng-model="$ctrl.item.priority"
+                show-field="priority"
+                value-field="priority">
+            </vn-autocomplete>
        </vn-horizontal>
        <vn-horizontal>
            <vn-autocomplete
--- a/modules/item/front/create/index.js
+++ b/modules/item/front/create/index.js
@ -4,9 +4,25 @@ import Section from 'salix/components/section';
 class Controller extends Section {
    constructor($element, $) {
        super($element, $);
-        this.item = {
-            relevancy: 0
-        };
+        this.fetchDefaultPriorityTag();
+    }
+
+    fetchDefaultPriorityTag() {
+        this.validPriorities = [];
+        const filter = {fields: ['defaultPriority', 'defaultTag', 'validPriorities'], limit: 1};
+        this.$http.get(`ItemConfigs`, {filter})
+            .then(res => {
+                if (res.data) {
+                    const dataRow = res.data[0];
+                    dataRow.validPriorities.forEach(priority => {
+                        this.validPriorities.push({priority});
+                    });
+                    this.item = {
+                        priority: dataRow.defaultPriority,
+                        tag: dataRow.defaultTag
+                    };
+                }
+            });
    }

    onSubmit() {
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@ -9,13 +9,18 @@
 </vn-crud-model>

 <vn-card class="vn-w-md vn-pa-md">
+    <vn-horizontal>
    <vn-horizontal>
        <vn-date-picker class="vn-pa-xs"
+            vn-one
+            label="Since"
            vn-one
            label="Since"
            ng-model="$ctrl.dateFrom">
        </vn-date-picker>
        <vn-date-picker class="vn-pa-xs"
+            vn-one
+            label="To"
            vn-one
            label="To"
            ng-model="$ctrl.dateTo">
@ -50,6 +55,7 @@
                <vn-tbody>
                    <vn-tr ng-repeat="entry in entries">
                        <vn-td center>
+                            <vn-check
                            <vn-check
                                ng-model="entry.isIgnored"
                                disabled="true">
@ -84,11 +90,11 @@
                            class="expendable">
                                <span
                                    vn-tooltip="
-                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
-                                    {{::entry.cost | dashIfEmpty}}
+                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':2 | dashIfEmpty}}">
+                                    {{::entry.cost | currency: 'EUR':2 | dashIfEmpty}}
                                </span>
                        </vn-td>
                        <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
--- a/modules/item/front/tags/index.html
+++ b/modules/item/front/tags/index.html
@ -19,7 +19,7 @@
    data="tags"
    auto-load="true">
 </vn-crud-model>
-<form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
+<form name="form" class="vn-w-md">
    <vn-card class="vn-pa-lg">
        <vn-horizontal ng-repeat="itemTag in $ctrl.itemTags">
            <vn-autocomplete vn-two vn-id="tag" vn-focus
@ -74,8 +74,9 @@
    </vn-card>
    <vn-button-bar>
        <vn-submit
+            ng-click="$ctrl.onSubmit()"
            disabled="!watcher.dataChanged()"
            label="Save">
        </vn-submit>
    </vn-button-bar>
-</form>
+</form>
--- a/modules/item/front/tags/index.js
+++ b/modules/item/front/tags/index.js
@ -29,11 +29,17 @@ class Controller extends Section {
    }

    onSubmit() {
-        this.$.watcher.check();
-        this.$.model.save().then(() => {
+        const changes = this.$.model.getChanges();
+        const data = {
+            creates: changes.creates,
+            deletes: changes.deletes,
+            updates: changes.updates,
+            maxPriority: this.getHighestPriority()
+        };
+        this.$http.patch(`Tags/onSubmit`, data).then(() => {
+            this.$.model.refresh();
            this.$.watcher.notifySaved();
            this.$.watcher.updateOriginalData();
-            this.card.reload();
        });
    }
 }
--- a/modules/route/back/methods/route/downloadZip.js
+++ b/modules/route/back/methods/route/downloadZip.js
@ -0,0 +1,62 @@
+const JSZip = require('jszip');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('downloadZip', {
+        description: 'Download a zip file with multiple routes pdfs',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'string',
+                description: 'The routes ids',
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'string',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'string',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/downloadZip',
+            verb: 'GET'
+        }
+    });
+
+    Self.downloadZip = async function(ctx, id, options) {
+        const models = Self.app.models;
+        const myOptions = {};
+        const zip = new JSZip();
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const ids = id.split(',');
+        for (let id of ids) {
+            ctx.args.id = id;
+            const routePdf = await models.Route.driverRoutePdf(ctx, id);
+            const fileName = extractFileName(routePdf[2]);
+            const body = routePdf[0];
+
+            zip.file(fileName, body);
+        }
+
+        const stream = zip.generateNodeStream({streamFiles: true});
+
+        return [stream, 'application/zip', `filename="download.zip"`];
+    };
+
+    function extractFileName(str) {
+        const matches = str.match(/"(.*?)"/);
+        return matches ? matches[1] : str;
+    }
+};
--- a/modules/route/back/methods/route/getTickets.js
+++ b/modules/route/back/methods/route/getTickets.js
@ -50,14 +50,17 @@ module.exports = Self => {
            am.name AS agencyModeName,
            u.nickname AS userNickname,
            vn.ticketTotalVolume(t.id) AS volume,
-            tob.description
+            tob.description,
+            GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt
        FROM vn.route r
            JOIN ticket t ON t.routeFk = r.id
+            JOIN vn.sale s ON s.ticketFk = t.id
+            JOIN vn.item i ON i.id = s.itemFk
            LEFT JOIN ticketState ts ON ts.ticketFk = t.id
            LEFT JOIN state st ON st.id = ts.stateFk
            LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
            LEFT JOIN observationType ot ON ot.code = 'delivery'
-            LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id 
+            LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
                AND tob.observationTypeFk = ot.id
            LEFT JOIN address a ON a.id = t.addressFk
            LEFT JOIN agencyMode  am ON am.id = t.agencyModeFk
@ -70,7 +73,9 @@ module.exports = Self => {
        const where = filter.where;
        where['r.id'] = filter.id;

-        stmt.merge(conn.makeSuffix(filter));
+        stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge(conn.makeGroupBy('t.id'));
+        stmt.merge(conn.makeOrderBy(filter.order));

        const tickets = await conn.executeStmt(stmt, myOptions);

--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@ -13,6 +13,7 @@ module.exports = Self => {
    require('../methods/route/driverRoutePdf')(Self);
    require('../methods/route/driverRouteEmail')(Self);
    require('../methods/route/sendSms')(Self);
+    require('../methods/route/downloadZip')(Self);

    Self.validate('kmStart', validateDistance, {
        message: 'Distance must be lesser than 1000'
--- a/modules/route/front/index/index.js
+++ b/modules/route/front/index/index.js
@ -34,12 +34,22 @@ export default class Controller extends Section {
    }

    showRouteReport() {
-        const routes = [];
+        const routesIds = [];
        for (let route of this.checked)
-            routes.push(route.id);
-        const routesId = routes.join(',');
+            routesIds.push(route.id);
+        const stringRoutesIds = routesIds.join(',');

-        this.vnReport.show(`Routes/${routesId}/driver-route-pdf`);
+        if (this.checked.length <= 1) {
+            const url = `api/Routes/${stringRoutesIds}/driver-route-pdf?access_token=${this.vnToken.token}`;
+            window.open(url, '_blank');
+        } else {
+            const serializedParams = this.$httpParamSerializer({
+                access_token: this.vnToken.token,
+                id: stringRoutesIds
+            });
+            const url = `api/Routes/downloadZip?${serializedParams}`;
+            window.open(url, '_blank');
+        }
    }

    openClonationDialog() {
--- a/modules/route/front/index/index.spec.js
+++ b/modules/route/front/index/index.spec.js
@ -44,17 +44,15 @@ describe('Component vnRouteIndex', () => {

    describe('showRouteReport()', () => {
        it('should call to the vnReport show method', () => {
-            controller.vnReport.show = jest.fn();
+            jest.spyOn(window, 'open').mockReturnThis();

            const data = controller.$.model.data;
            data[0].checked = true;
            data[2].checked = true;

-            const routeIds = '1,3';
-
            controller.showRouteReport();

-            expect(controller.vnReport.show).toHaveBeenCalledWith(`Routes/${routeIds}/driver-route-pdf`);
+            expect(window.open).toHaveBeenCalled();
        });
    });

--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@ -10,26 +10,26 @@
    </h5>
    <vn-horizontal>
        <vn-one>
-            <vn-label-value label="Id" 
+            <vn-label-value label="Id"
                value="{{$ctrl.summary.route.id}}">
            </vn-label-value>
-            <vn-label-value label="Date" 
+            <vn-label-value label="Date"
                value="{{$ctrl.summary.route.created | date: 'dd/MM/yyyy'}}">
            </vn-label-value>
-            <vn-label-value label="Agency" 
+            <vn-label-value label="Agency"
                value="{{$ctrl.summary.route.agencyMode.name}}">
            </vn-label-value>
-            <vn-label-value label="Vehicle" 
+            <vn-label-value label="Vehicle"
                value="{{$ctrl.summary.route.vehicle.numberPlate}}">
            </vn-label-value>
            <vn-label-value label="Driver">
-                <span 
+                <span
                    ng-click="workerDescriptor.show($event, $ctrl.summary.route.workerFk)"
                    class="link">
                    {{$ctrl.summary.route.worker.user.name}}
                </span>
            </vn-label-value>
-            <vn-label-value label="Cost" 
+            <vn-label-value label="Cost"
                value="{{$ctrl.summary.route.cost | currency: 'EUR':2}}">
            </vn-label-value>
        </vn-one>
@ -40,35 +40,35 @@
            <vn-label-value label="Finishing time"
                value="{{$ctrl.summary.route.finished | date: 'HH:MM'}}">
            </vn-label-value>
-            <vn-label-value label="Km Start" 
+            <vn-label-value label="Km Start"
                value="{{$ctrl.summary.route.kmStart}}">
            </vn-label-value>
-            <vn-label-value label="Km End" 
+            <vn-label-value label="Km End"
                value="{{$ctrl.summary.route.kmEnd}}">
            </vn-label-value>
-            <vn-label-value label="Volume" 
+            <vn-label-value label="Volume"
                value="{{$ctrl.summary.route.m3 | dashIfEmpty}} / {{$ctrl.summary.route.vehicle.m3  | dashIfEmpty}} m³">
            </vn-label-value>
-            <vn-label-value label="Packages" 
+            <vn-label-value label="Packages"
                value="{{$ctrl.packagesTotal}}">
            </vn-label-value>
        </vn-one>
        <vn-one>
            <vn-textarea
                disabled="true"
-                label="Description" 
+                label="Description"
                ng-model="$ctrl.summary.route.description">
            </vn-textarea>
        </vn-one>
        <vn-auto>
            <h4 ng-show="$ctrl.isDelivery">
-                <a 
+                <a
                    ui-sref="route.card.tickets({id:$ctrl.route.id})"
                    target="_self">
                    <span translate vn-tooltip="Go to">Ticket</span>
                </a>
            </h4>
-            <h4 
+            <h4
                translate
                ng-show="!$ctrl.isDelivery">
                Ticket
@ -77,45 +77,49 @@
                <vn-thead>
                    <vn-tr>
                        <vn-th shrink>Order</vn-th>
-                        <vn-th number>Ticket id</vn-th>
-                        <vn-th>Alias</vn-th>
+                        <vn-th>Street</vn-th>
+                        <vn-th>City</vn-th>
+                        <vn-th shrink>PC</vn-th>
+                        <vn-th>Client</vn-th>
+                        <vn-th>Warehouse</vn-th>
                        <vn-th number shrink>Packages</vn-th>
                        <vn-th shrink>m³</vn-th>
-                        <vn-th>Warehouse</vn-th>
-                        <vn-th shrink>PC</vn-th>
-                        <vn-th>Street</vn-th>
+                        <vn-th shrink>Packaging</vn-th>
+                        <vn-th number>Ticket</vn-th>
                        <vn-th shrink></vn-th>
                    </vn-tr>
                </vn-thead>
                <vn-tbody>
                    <vn-tr ng-repeat="ticket in $ctrl.summary.tickets">
                        <vn-td shrink>{{ticket.priority | dashIfEmpty}}</vn-td>
+                        <vn-td expand title="{{ticket.address.street}}">{{ticket.street}}</vn-td>
+                        <vn-td expand>{{ticket.city}}</vn-td>
+                        <vn-td shrink>{{ticket.postalCode}}</vn-td>
+                        <vn-td>
+                            <span
+                                ng-click="clientDescriptor.show($event, ticket.clientFk)"
+                                class="link">
+                                {{ticket.nickname}}
+                            </span>
+                       </vn-td>
+                       <vn-td>{{ticket.warehouseName}}</vn-td>
+                        <vn-td number shrink>{{ticket.packages}}</vn-td>
+                        <vn-td shrink>{{ticket.volume}}</vn-td>
+                        <vn-td shrink>{{ticket.ipt}}</vn-td>
                        <vn-td number>
-                            <span 
+                            <span
                                ng-click="ticketDescriptor.show($event, ticket.id)"
                                class="link">
                                {{ticket.id}}
                            </span>
                        </vn-td>
                        <vn-td>
-                            <span 
-                                ng-click="clientDescriptor.show($event, ticket.clientFk)"
-                                class="link">
-                                {{ticket.nickname}}
-                            </span>
-                       </vn-td>
-                        <vn-td number shrink>{{ticket.packages}}</vn-td>
-                        <vn-td shrink>{{ticket.volume}}</vn-td>
-                        <vn-td>{{ticket.warehouseName}}</vn-td>
-                        <vn-td shrink>{{ticket.postalCode}}</vn-td>
-                        <vn-td expand title="{{ticket.address.street}}">{{ticket.street}}</vn-td>
-                        <vn-td shrink> 
-                            <vn-icon
-                                ng-if="ticket.notes.length"
-                                vn-tooltip="{{ticket.notes[0].description}}"
-                                icon="insert_drive_file"
-                                class="bright">
-                            </vn-icon>
+                            <vn-icon-button
+                                ng-if="::ticket.description"
+                                vn-tooltip="{{::ticket.description}}"
+                                icon="icon-notes"
+                                tabindex="-1">
+                            </vn-icon-button>
                        </vn-td>
                    </vn-tr>
                </vn-tbody>
@ -123,12 +127,12 @@
        </vn-auto>
    </vn-horizontal>
 </vn-card>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
    vn-id="ticketDescriptor">
 </vn-ticket-descriptor-popover>
 <vn-client-descriptor-popover
    vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
    vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@ -6,9 +6,9 @@
    data="$ctrl.tickets"
    auto-load="true">
 </vn-crud-model>
-<vn-data-viewer 
+<vn-data-viewer
    model="model">
-    <form 
+    <form
        class="vn-w-xl"
        name="form">
        <vn-card>
@ -25,18 +25,18 @@
                    vn-tooltip="Open buscaman"
                    icon="icon-buscaman">
                </vn-button>
-                <vn-button 
+                <vn-button
                    disabled="!$ctrl.isChecked"
                    ng-click="$ctrl.deletePriority()"
                    vn-tooltip="Delete priority"
                    icon="filter_alt">
                </vn-button>
-                <vn-button 
+                <vn-button
                    ng-click="$ctrl.setOrderedPriority($ctrl.tickets)"
                    vn-tooltip="Renumber all tickets in the order you see on the screen"
                    icon="format_list_numbered">
                </vn-button>
-                <vn-button 
+                <vn-button
                    vn-acl="deliveryBoss"
                    vn-acl-action="remove"
                    disabled="!$ctrl.isChecked"
@ -59,8 +59,10 @@
                        <vn-th field="city">City</vn-th>
                        <vn-th field="postalCode" translate-attr="{title: 'Postcode'}" shrink>PC</vn-th>
                        <vn-th field="clientFk" expand>Client</vn-th>
+                        <vn-th field="warehouse" expand>Warehouse</vn-th>
                        <vn-th field="packages" shrink>Packages</vn-th>
                        <vn-th field="volume" shrink>m³</vn-th>
+                        <vn-th field="packaging" shrink>Packaging</vn-th>
                        <vn-th field="id" number>Ticket</vn-th>
                        <vn-th shrink></vn-th>
                        <vn-th shrink></vn-th>
@ -100,8 +102,10 @@
                                {{::ticket.nickname}}
                            </span>
                        </vn-td>
+                        <vn-td>{{ticket.warehouseName}}</vn-td>
                        <vn-td shrink>{{::ticket.packages}}</vn-td>
                        <vn-td shrink>{{::ticket.volume | number:2}}</vn-td>
+                        <vn-td shrink>{{::ticket.ipt}}</vn-td>
                        <vn-td number>
                            <span
                                ng-click="ticketDescriptor.show($event, ticket.id)"
@ -140,13 +144,13 @@
        </vn-card>
    </form>
 </vn-data-viewer>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
    vn-id="ticketDescriptor">
 </vn-ticket-descriptor-popover>
 <vn-client-descriptor-popover
    vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
-<vn-confirm 
+<vn-confirm
    vn-id="confirm"
    question="Delete ticket from route?"
    on-accept="$ctrl.removeTicketFromRoute($index)">
@ -160,7 +164,7 @@
 <div fixed-bottom-right>
    <vn-vertical style="align-items: center;">
        <a vn-bind="+">
-            <vn-button 
+            <vn-button
                class="round md vn-mb-sm"
                ng-click="$ctrl.$.ticketPopup.show()"
                icon="add"
@ -172,14 +176,14 @@
        </a>
    </vn-vertical>
 </div>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
    vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
-<vn-client-descriptor-popover 
+<vn-client-descriptor-popover
    vn-id="client-descriptor">
 </vn-client-descriptor-popover>
 <!-- SMS Dialog -->
 <vn-route-sms
    vn-id="sms"
    sms="$ctrl.newSMS">
-</vn-route-sms>
+</vn-route-sms>
--- a/modules/shelving/front/routes.json
+++ b/modules/shelving/front/routes.json
@ -1,12 +1,12 @@
 {
    "module": "shelving",
    "name": "Shelvings",
-    "icon" : "contact_support",
+    "icon" : "icon-inventory",
    "dependencies": ["worker"],
    "validations" : true,
    "menus": {
        "main": [
-            {"state": "shelving.index", "icon": "contact_support"}
+            {"state": "shelving.index", "icon": "icon-inventory"}
        ],
        "card": [
            {"state": "shelving.card.basicData", "icon": "settings"},
@ -20,7 +20,7 @@
            "abstract": true,
            "component": "vn-shelving",
            "description": "Shelvings"
-        }, 
+        },
        {
            "url": "/index?q",
            "state": "shelving.index",
@ -32,13 +32,13 @@
            "state": "shelving.create",
            "component": "vn-shelving-create",
            "description": "New shelving"
-        }, 
+        },
        {
            "url": "/:id",
            "state": "shelving.card",
            "abstract": true,
            "component": "vn-shelving-card"
-        }, 
+        },
        {
            "url": "/summary",
            "state": "shelving.card.summary",
@ -47,7 +47,7 @@
            "params": {
                "shelving": "$ctrl.shelving"
            }
-        }, 
+        },
        {
            "url": "/basic-data",
            "state": "shelving.card.basicData",
@ -56,7 +56,7 @@
            "params": {
                "shelving": "$ctrl.shelving"
            }
-        }, 
+        },
        {
            "url" : "/log",
            "state": "shelving.card.log",
@ -64,4 +64,4 @@
            "description": "Log"
        }
    ]
-}
+}
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@ -16,10 +16,6 @@ module.exports = Self => {
        message: 'The social name cannot be empty'
    });

-    Self.validatesUniquenessOf('name', {
-        message: 'The supplier name must be unique'
-    });
-
    if (this.city) {
        Self.validatesPresenceOf('city', {
            message: 'City cannot be empty'
@ -117,6 +113,27 @@ module.exports = Self => {
            throw new UserError('You can not modify is pay method checked');
    });

+    Self.validateAsync('name', 'countryFk', hasSupplierSameName, {
+        message: 'A supplier with the same name already exists. Change the country.'
+    });
+
+    async function hasSupplierSameName(err, done) {
+        if (!this.name || !this.countryFk) done();
+        const supplier = await Self.app.models.Supplier.findOne(
+            {
+                where: {
+                    name: this.name,
+                    countryFk: this.countryFk
+                },
+                fields: ['id']
+            });
+
+        if (supplier && supplier.id != this.id)
+            err();
+
+        done();
+    }
+
    Self.observe('before save', async function(ctx) {
        const changes = ctx.data || ctx.instance;
        const orgData = ctx.currentInstance;
--- a/modules/supplier/front/agency-term/index/index.html
+++ b/modules/supplier/front/agency-term/index/index.html
@ -24,36 +24,42 @@
            </vn-textfield>
            <vn-input-number 
                type="number"
+                step="0.01"
                label="Minimum M3"
                ng-model="supplierAgencyTerm.minimumM3"
                rule>
            </vn-input-number>
            <vn-input-number 
                type="number"
+                step="0.01"
                label="Package Price"
                ng-model="supplierAgencyTerm.packagePrice"
                rule>
            </vn-input-number>
            <vn-input-number 
                type="number"
+                step="0.01"
                label="Km Price"
                ng-model="supplierAgencyTerm.kmPrice"
                rule>
            </vn-input-number>
            <vn-input-number 
                type="number"
+                step="0.01"
                label="M3 Price"
                ng-model="supplierAgencyTerm.m3Price"
                rule>
            </vn-input-number>
            <vn-input-number 
                type="number"
+                step="0.01"
                label="Route Price"
                ng-model="supplierAgencyTerm.routePrice"
                rule>
            </vn-input-number>
            <vn-input-number 
                type="number"
+                step="0.01"
                label="Minimum Km"
                ng-model="supplierAgencyTerm.minimumKm"
                rule>
--- a/modules/ticket/back/methods/sale/canEdit.js
+++ b/modules/ticket/back/methods/sale/canEdit.js
@ -56,6 +56,13 @@ module.exports = Self => {
        const shouldEditCloned = canEditCloned || !hasSaleCloned;
        const shouldEditFloramondo = canEditFloramondo || !hasSaleFloramondo;

-        return shouldEditTracked && shouldEditCloned && shouldEditFloramondo;
+        if (!shouldEditTracked)
+            throw new UserError('It is not possible to modify tracked sales');
+        if (!shouldEditCloned)
+            throw new UserError('It is not possible to modify cloned sales');
+        if (!shouldEditFloramondo)
+            throw new UserError('It is not possible to modify sales that their articles are from Floramondo');
+
+        return true;
    };
 };
--- a/modules/ticket/back/methods/sale/deleteSales.js
+++ b/modules/ticket/back/methods/sale/deleteSales.js
@ -43,9 +43,7 @@ module.exports = Self => {
        try {
            const saleIds = sales.map(sale => sale.id);

-            const canEditSales = await models.Sale.canEdit(ctx, saleIds, myOptions);
-            if (!canEditSales)
-                throw new UserError(`Sale(s) blocked, please contact production`);
+            await models.Sale.canEdit(ctx, saleIds, myOptions);

            const ticket = await models.Ticket.findById(ticketId, {
                include: {
--- a/modules/ticket/back/methods/sale/recalculatePrice.js
+++ b/modules/ticket/back/methods/sale/recalculatePrice.js
@ -37,9 +37,7 @@ module.exports = Self => {
        try {
            const salesIds = sales.map(sale => sale.id);

-            const canEditSale = await models.Sale.canEdit(ctx, salesIds, myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
+            await models.Sale.canEdit(ctx, salesIds, myOptions);

            const query = `
                DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
--- a/modules/ticket/back/methods/sale/reserve.js
+++ b/modules/ticket/back/methods/sale/reserve.js
@ -51,9 +51,7 @@ module.exports = Self => {
        try {
            const salesIds = sales.map(sale => sale.id);

-            const canEditSale = await models.Sale.canEdit(ctx, salesIds, myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
+            await models.Sale.canEdit(ctx, salesIds, myOptions);

            let changesMade = '';
            const promises = [];
--- a/modules/ticket/back/methods/sale/specs/canEdit.spec.js
+++ b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
@ -50,7 +50,7 @@ describe('sale canEdit()', () => {

        it('should return false if any of the sales has a saleTracking record', async() => {
            const tx = await models.Sale.beginTransaction({});
-
+            let error;
            try {
                const options = {transaction: tx};

@ -59,15 +59,15 @@ describe('sale canEdit()', () => {

                const sales = [31];

-                const result = await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(false);
-
+                await models.Sale.canEdit(ctx, sales, options);
                await tx.rollback();
            } catch (e) {
                await tx.rollback();
-                throw e;
+                error = e;
            }
+
+            expect(error).toEqual(
+                new Error('It is not possible to modify tracked sales'));
        });
    });

@ -75,22 +75,22 @@ describe('sale canEdit()', () => {
        const saleCloned = [29];
        it('should return false if any of the sales is cloned', async() => {
            const tx = await models.Sale.beginTransaction({});
-
+            let error;
            try {
                const options = {transaction: tx};

                const buyerId = 35;
                const ctx = {req: {accessToken: {userId: buyerId}}};

-                const result = await models.Sale.canEdit(ctx, saleCloned, options);
-
-                expect(result).toEqual(false);
-
+                await models.Sale.canEdit(ctx, saleCloned, options);
                await tx.rollback();
            } catch (e) {
                await tx.rollback();
-                throw e;
+                error = e;
            }
+
+            expect(error).toEqual(
+                new Error('It is not possible to modify cloned sales'));
        });

        it('should return true if any of the sales is cloned and has the correct role', async() => {
@ -130,7 +130,7 @@ describe('sale canEdit()', () => {
        it('should return false if any of the sales isFloramondo', async() => {
            const tx = await models.Sale.beginTransaction({});
            const sales = [26];
-
+            let error;
            try {
                const options = {transaction: tx};

@ -140,15 +140,15 @@ describe('sale canEdit()', () => {
                const saleToEdit = await models.Sale.findById(sales[0], null, options);
                await saleToEdit.updateAttribute('itemFk', 9, options);

-                const result = await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(false);
-
+                await models.Sale.canEdit(ctx, sales, options);
                await tx.rollback();
            } catch (e) {
                await tx.rollback();
-                throw e;
+                error = e;
            }
+
+            expect(error).toEqual(
+                new Error('It is not possible to modify sales that their articles are from Floramondo'));
        });

        it('should return true if any of the sales is of isFloramondo and has the correct role', async() => {
--- a/modules/ticket/back/methods/sale/updateConcept.js
+++ b/modules/ticket/back/methods/sale/updateConcept.js
@ -40,10 +40,7 @@ module.exports = Self => {
        try {
            const currentLine = await models.Sale.findById(id, null, myOptions);

-            const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
-
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
+            await models.Sale.canEdit(ctx, [id], myOptions);

            const line = await currentLine.updateAttributes({concept: newConcept}, myOptions);

--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@ -66,9 +66,7 @@ module.exports = Self => {

            const sale = await models.Sale.findById(id, filter, myOptions);

-            const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
+            await models.Sale.canEdit(ctx, [id], myOptions);

            const oldPrice = sale.price;
            const userId = ctx.req.accessToken.userId;
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@ -41,9 +41,7 @@ module.exports = Self => {
        }

        try {
-            const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
-            if (!canEditSale)
-                throw new UserError(`Sale(s) blocked, please contact production`);
+            await models.Sale.canEdit(ctx, [id], myOptions);

            const filter = {
                include: {
--- a/modules/ticket/back/methods/state/editableStates.js
+++ b/modules/ticket/back/methods/state/editableStates.js
@ -24,7 +24,7 @@ module.exports = Self => {
        if (typeof options == 'object')
            Object.assign(myOptions, options);

-        let statesList = await models.State.find({where: filter.where}, myOptions);
+        let statesList = await models.State.find(filter, myOptions);
        const isProduction = await models.Account.hasRole(userId, 'production', myOptions);
        const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson', myOptions);
        const isAdministrative = await models.Account.hasRole(userId, 'administrative', myOptions);
--- a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
@ -89,7 +89,7 @@ describe('ticket getTicketsAdvance()', () => {
                dateFuture: tomorrow,
                dateToAdvance: today,
                warehouseFk: 1,
-                ipt: 'Vertical'
+                ipt: 'V'
            };

            const ctx = {req: {accessToken: {userId: 9}}, args};
@ -114,7 +114,7 @@ describe('ticket getTicketsAdvance()', () => {
                dateFuture: tomorrow,
                dateToAdvance: today,
                warehouseFk: 1,
-                tfIpt: 'Vertical'
+                tfIpt: 'V'
            };

            const ctx = {req: {accessToken: {userId: 9}}, args};
--- a/modules/ticket/front/advance-search-panel/index.js
+++ b/modules/ticket/front/advance-search-panel/index.js
@ -5,24 +5,9 @@ class Controller extends SearchPanel {
    constructor($, $element) {
        super($, $element);
        this.filter = this.$.filter;
-        this.getGroupedStates();
        this.getItemPackingTypes();
    }

-    getGroupedStates() {
-        let groupedStates = [];
-        this.$http.get('AlertLevels').then(res => {
-            for (let state of res.data) {
-                groupedStates.push({
-                    id: state.id,
-                    code: state.code,
-                    name: this.$t(state.code)
-                });
-            }
-            this.groupedStates = groupedStates;
-        });
-    }
-
    getItemPackingTypes() {
        let itemPackingTypes = [];
        const filter = {
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@ -72,13 +72,22 @@
                        <th field="futureShipped">
                            <span translate>Date</span>
                        </th>
-                        <th field="futureIpt" title="Item Packing Type">
+                        <th field="futureIpt" title="{{'Item Packing Type' | translate}}">
                            <span>IPT</span>
                        </th>
                        <th field="futureState">
                            <span translate>State</span>
                        </th>
-                        <th field="totalWithVat">
+                        <th field="futureLiters">
+                            <span translate>Liters</span>
+                        </th>
+                        <th field="hasStock">
+                            <span>Stock</span>
+                        </th>
+                        <th field="futureLines">
+                            <span translate>Lines</span>
+                        </th>
+                        <th field="futureTotalWithVat">
                            <span translate>Import</span>
                        </th>
                    </tr>
@ -91,6 +100,13 @@
                                vn-click-stop>
                            </vn-check>
                        </td>
+                        <td>
+                            <vn-icon
+                                ng-show="ticket.futureAgency !== ticket.agency"
+                                icon="icon-agency-term"
+                                vn-tooltip="{{$ctrl.agencies(ticket.futureAgency, ticket.agency)}}">
+                            </vn-icon>
+                        </td>
                        <td>
                            <vn-icon
                                ng-show="ticket.futureAgency !== ticket.agency"
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@ -1,5 +1,6 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
+import './style.scss';

 export default class Controller extends Section {
    constructor($element, $) {
@ -65,12 +66,15 @@ export default class Controller extends Section {
        let today = new Date();
        const tomorrow = new Date(today);
        tomorrow.setDate(tomorrow.getDate() + 1);
-        this.filterParams = {
-            dateFuture: tomorrow,
-            dateToAdvance: today,
-            warehouseFk: this.vnConfig.warehouseFk
-        };
-        this.$.model.applyFilter(null, this.filterParams);
+        this.$http.get(`UserConfigs/getUserConfig`)
+            .then(res => {
+                this.filterParams = {
+                    dateFuture: tomorrow,
+                    dateToAdvance: today,
+                    warehouseFk: res.data.warehouseFk
+                };
+                this.$.model.addFilter({}, this.filterParams);
+            });
    }

    compareDate(date) {
@ -168,6 +172,10 @@ export default class Controller extends Section {
            return {'liters': value};
        case 'lines':
            return {'lines': value};
+        case 'futureLiters':
+            return {'futureLiters': value};
+        case 'futureLines':
+            return {'futureLines': value};
        case 'ipt':
            return {or:
                [
--- a/modules/ticket/front/advance/style.scss
+++ b/modules/ticket/front/advance/style.scss
@ -0,0 +1,7 @@
+@import "variables";
+
+vn-ticket-advance{
+    vn-icon {
+        color: #f7931e
+    }
+}
--- a/modules/ticket/front/basic-data/step-one/index.js
+++ b/modules/ticket/front/basic-data/step-one/index.js
@ -75,8 +75,10 @@ class Controller extends Component {
    }

    set shipped(value) {
+        if (new Date(this.ticket.shipped).toDateString() != value.toDateString())
+            value.setHours(0, 0, 0, 0);
+
        this.ticket.shipped = value;
-        this.ticket.shipped.setHours(0, 0, 0, 0);
        this.getLanded({
            shipped: value,
            addressFk: this.ticket.addressFk,
--- a/modules/ticket/front/future/index.js
+++ b/modules/ticket/front/future/index.js
@ -59,12 +59,15 @@ export default class Controller extends Section {
    setDefaultFilter() {
        const today = new Date();

-        this.filterParams = {
-            originDated: today,
-            futureDated: today,
-            warehouseFk: this.vnConfig.warehouseFk
-        };
-        this.$.model.applyFilter(null, this.filterParams);
+        this.$http.get(`UserConfigs/getUserConfig`)
+            .then(res => {
+                this.filterParams = {
+                    originDated: today,
+                    futureDated: today,
+                    warehouseFk: res.data.warehouseFk
+                };
+                this.$.model.applyFilter(null, this.filterParams);
+            });
    }

    compareDate(date) {
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@ -22,6 +22,7 @@
                    disabled="!$ctrl.isEditable"
                    label="State"
                    value-field="code"
+                    fields="['id', 'name', 'alertLevel', 'code']"
                    url="States/editableStates"
                    on-change="$ctrl.changeState(value)">
                </vn-button-menu>
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@ -1,6 +1,6 @@
 <vn-card class="summary">
    <h5>
-        <a 
+        <a
            ng-if="::$ctrl.summary.id"
            vn-tooltip="Go to the ticket"
            ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})"
@ -8,36 +8,37 @@
            <vn-icon-button icon="launch"></vn-icon-button>
        </a>
        <span>
-            Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} 
+            Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}}
            ({{$ctrl.summary.client.id}}) - {{$ctrl.summary.nickname}}
        </span>
-        <vn-button-menu 
+        <vn-button-menu
            disabled="!$ctrl.isEditable"
            class="message"
            label="Change state"
            value-field="code"
+            fields="['id', 'name', 'alertLevel', 'code']"
            url="States/editableStates"
            on-change="$ctrl.changeState(value)">
        </vn-button-menu>
-        <vn-ticket-descriptor-menu 
+        <vn-ticket-descriptor-menu
            ng-if="!$ctrl.isOnTicketCard"
-            ticket-id="$ctrl.summary.id" 
+            ticket-id="$ctrl.summary.id"
            parent-reload="$ctrl.reload()"
        />
    </h5>
    <vn-horizontal>
        <vn-one>
-            <vn-label-value label="State" 
+            <vn-label-value label="State"
                value="{{$ctrl.summary.ticketState.state.name}}">
            </vn-label-value>
            <vn-label-value label="Salesperson">
-                <span 
+                <span
                    ng-click="workerDescriptor.show($event, $ctrl.summary.client.salesPersonFk)"
                    class="link">
                    {{$ctrl.summary.client.salesPersonUser.name}}
                </span>
            </vn-label-value>
-            <vn-label-value label="Agency" 
+            <vn-label-value label="Agency"
                value="{{$ctrl.summary.agencyMode.name}}">
            </vn-label-value>
            <vn-label-value label="Zone">
@ -47,11 +48,11 @@
                    {{$ctrl.summary.zone.name}}
                </span>
            </vn-label-value>
-            <vn-label-value label="Warehouse" 
+            <vn-label-value label="Warehouse"
                value="{{$ctrl.summary.warehouse.name}}">
            </vn-label-value>
            <vn-label-value label="Route">
-                <span 
+                <span
                    ng-click="routeDescriptor.show($event, $ctrl.summary.routeFk)"
                    class="link">
                    {{$ctrl.summary.routeFk}}
@ -66,17 +67,17 @@
            </vn-label-value>
        </vn-one>
        <vn-two>
-            <vn-label-value label="Shipped" 
+            <vn-label-value label="Shipped"
                value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}">
            </vn-label-value>
-            <vn-label-value label="Landed" 
+            <vn-label-value label="Landed"
                value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}">
            </vn-label-value>
-            <vn-label-value label="Package size" 
+            <vn-label-value label="Package size"
                value="{{$ctrl.summary.packages}}">
            </vn-label-value>
            <vn-label-value label="Address phone"
-                ng-if="$ctrl.summary.address.phone != null" 
+                ng-if="$ctrl.summary.address.phone != null"
                value="{{$ctrl.summary.address.phone}}">
            </vn-label-value>
            <vn-label-value label="Address mobile"
@ -109,7 +110,7 @@
        </vn-one>
        <vn-auto name="sales">
            <h4>
-                <a 
+                <a
                    ui-sref="ticket.card.sale({id:$ctrl.ticket.id})"
                    target="_self">
                    <span translate vn-tooltip="Go to">Sale</span>
@ -146,13 +147,13 @@
                                    vn-tooltip="{{::$ctrl.$t('Claim')}}: {{::sale.claimBeginning.claimFk}}">
                                </vn-icon>
                            </a>
-                            <vn-icon 
-                                ng-show="::(sale.visible < 0)" 
+                            <vn-icon
+                                ng-show="::(sale.visible < 0)"
                                color-main
                                icon="warning"
                                vn-tooltip="Visible: {{::sale.visible || 0}}">
                            </vn-icon>
-                            <vn-icon ng-show="sale.reserved" 
+                            <vn-icon ng-show="sale.reserved"
                                icon="icon-reserve"
                                translate-attr="{title: 'Reserved'}">
                            </vn-icon>
@ -170,22 +171,22 @@
                            </vn-icon>
                        </vn-td>
                        <vn-td number shrink>
-                            <span 
+                            <span
                                ng-click="itemDescriptor.show($event, sale.itemFk, sale.id, $ctrl.ticket.shipped)"
                                class="link">
                                {{sale.itemFk | zeroFill:6}}
                            </span>
                        </vn-td>
                        <vn-td number shrink>
-                            <vn-chip 
-                                class="transparent" 
+                            <vn-chip
+                                class="transparent"
                                ng-class="{'alert': sale.visible < 0}">
                                {{::sale.visible}}
                            </vn-chip>
                        </vn-td>
                        <vn-td number shrink>
-                            <vn-chip 
-                                class="transparent" 
+                            <vn-chip
+                                class="transparent"
                                ng-class="{'alert': sale.available < 0}">
                                {{::sale.available}}
                            </vn-chip>
@ -216,7 +217,7 @@
        </vn-auto>
        <vn-one ng-if="$ctrl.summary.packagings.length != 0">
            <h4>
-                <a 
+                <a
                    ui-sref="ticket.card.package({id:$ctrl.ticket.id})"
                    target="_self">
                    <span translate vn-tooltip="Go to">Packages</span>
@ -241,7 +242,7 @@
        </vn-one>
        <vn-one class="services" ng-if="$ctrl.summary.services.length != 0">
            <h4>
-                <a 
+                <a
                    ui-sref="ticket.card.service({id:$ctrl.ticket.id})"
                    target="_self">
                    <span translate vn-tooltip="Go to">Service</span>
@ -276,7 +277,7 @@
    <vn-horizontal>
        <vn-auto ng-if="$ctrl.summary.requests.length != 0">
            <h4>
-                <a 
+                <a
                    ui-sref="ticket.card.request.index({id:$ctrl.ticket.id})"
                    target="_self">
                    <span translate vn-tooltip="Go to">Purchase request</span>
@ -304,7 +305,7 @@
                        <vn-td number>{{::request.quantity}}</vn-td>
                        <vn-td number>{{::request.price}}</vn-td>
                        <vn-td number>
-                            <span 
+                            <span
                                ng-show="::request.saleFk"
                                ng-click="itemDescriptor.show($event, request.sale.itemFk, request.sale.id)"
                                class="link">
@ -336,9 +337,9 @@
 <vn-invoice-out-descriptor-popover
    vn-id="invoice-out-descriptor">
 </vn-invoice-out-descriptor-popover>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
    vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
-<vn-zone-descriptor-popover 
+<vn-zone-descriptor-popover
    vn-id="zoneDescriptor">
-</vn-zone-descriptor-popover>
+</vn-zone-descriptor-popover>
--- a/modules/worker/back/methods/worker/new.js
+++ b/modules/worker/back/methods/worker/new.js
@ -0,0 +1,256 @@
+/* eslint max-len: ["error", { "code": 130 }]*/
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('new', {
+        description: 'Creates a new worker and returns the id',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'fi',
+                type: 'string',
+                description: `The worker fi`,
+                required: true,
+            },
+            {
+                arg: 'name',
+                type: 'string',
+                description: `The user name`,
+                required: true,
+            },
+            {
+                arg: 'firstName',
+                type: 'string',
+                description: `The worker firstname`,
+                required: true,
+            },
+            {
+                arg: 'lastNames',
+                type: 'string',
+                description: `The worker lastnames`,
+                required: true,
+            },
+            {
+                arg: 'email',
+                type: 'string',
+                description: `The worker email`,
+                required: true,
+            },
+            {
+                arg: 'street',
+                type: 'string',
+                description: `The worker address`,
+                required: true,
+            },
+            {
+                arg: 'city',
+                type: 'string',
+                description: `The worker city`,
+                required: true,
+            },
+            {
+                arg: 'provinceFk',
+                type: 'number',
+                description: `The worker province`,
+                required: true,
+            },
+            {
+                arg: 'iban',
+                type: 'string',
+                description: `The worker iban`,
+                required: true,
+            },
+            {
+                arg: 'bankEntityFk',
+                type: 'number',
+                description: `The worker bank entity`,
+                required: true,
+            },
+            {
+                arg: 'companyFk',
+                type: 'number',
+                description: `The worker company`,
+                required: true,
+            },
+            {
+                arg: 'postcode',
+                type: 'string',
+                description: `The worker postcode`,
+                required: true,
+            },
+            {
+                arg: 'phone',
+                type: 'string',
+                description: `The worker phone`,
+                required: true,
+            },
+            {
+                arg: 'code',
+                type: 'string',
+                description: `The worker code`,
+                required: true,
+            },
+            {
+                arg: 'bossFk',
+                type: 'number',
+                description: `The worker boss`,
+                required: true,
+            },
+            {
+                arg: 'birth',
+                type: 'date',
+                description: `The worker birth`,
+                required: true,
+            }
+        ],
+        returns: {
+            type: 'number',
+            root: true,
+        },
+        http: {
+            path: `/new`,
+            verb: 'POST',
+        },
+    });
+
+    Self.new = async(ctx, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        const args = ctx.args;
+
+        let tx;
+
+        if (typeof options == 'object') Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        let client;
+
+        try {
+            client = await models.Client.findOne(
+                {
+                    where: {fi: args.fi},
+                },
+                myOptions
+            );
+
+            if (!client) {
+                const nickname = args.firstName.concat(' ', args.lastNames);
+                const workerConfig = await models.WorkerConfig.findOne({fields: ['roleFk']});
+                const [randomPassword] = await models.Worker.rawSql(
+                    'SELECT account.passwordGenerate() as password;'
+                );
+
+                const user = await models.Account.create(
+                    {
+                        name: args.name,
+                        nickname,
+                        password: randomPassword.password,
+                        email: args.email,
+                        roleFk: workerConfig.roleFk,
+                    },
+                    myOptions
+                );
+
+                await models.UserAccount.create(
+                    {
+                        id: user.id,
+                    },
+                    myOptions
+                );
+
+                await models.Worker.rawSql(
+                    'CALL vn.clientCreate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+                    [
+                        args.firstName,
+                        args.lastNames,
+                        args.fi,
+                        args.street,
+                        args.postalCode,
+                        args.city,
+                        args.provinceFk,
+                        args.companyFk,
+                        args.phone,
+                        args.email,
+                        user.id,
+                    ],
+                    myOptions
+                );
+
+                const address = await models.Address.create(
+                    {
+                        clientFk: user.id,
+                        street: args.street,
+                        city: args.city,
+                        provinceFk: args.provinceFk,
+                        postalCode: args.postalCode,
+                        mobile: args.phone,
+                        nickname: nickname,
+                        isDefaultAddress: true,
+                    },
+                    myOptions
+                );
+
+                client = await models.Client.findById(
+                    user.id,
+                    {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk']},
+                    myOptions
+                );
+
+                await client.updateAttributes(
+                    {
+                        iban: args.iban,
+                        bankEntityFk: args.bankEntityFk,
+                        defaultAddressFk: address.id,
+                    },
+                    myOptions
+                );
+            }
+
+            const user = await models.Account.findById(client.id, null, myOptions);
+            await user.updateAttribute('email', args.email, myOptions);
+
+            await models.Worker.rawSql(
+                'CALL vn.workerCreate(?, ?, ?, ?, ?, ?, ?)',
+                [
+                    args.firstName,
+                    args.lastNames,
+                    args.code,
+                    args.bossFk,
+                    client.id,
+                    args.fi,
+                    args.birth,
+                ],
+                myOptions
+            );
+
+            if (tx) await tx.commit();
+        } catch (error) {
+            if (tx) await tx.rollback();
+            const code = error.code;
+            const message = error.sqlMessage;
+
+            if (code === 'ER_DUP_ENTRY' && message.includes(`for key 'mail'`))
+                throw new UserError(`This personal mail already exists`);
+
+            if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`))
+                throw new UserError(`This worker code already exists`);
+
+            if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`))
+                throw new UserError(`This worker already exists`);
+
+            throw error;
+        }
+
+        await models.user.resetPassword({
+            email: args.email,
+            emailTemplate: 'worker-welcome',
+            id: client.id
+        });
+
+        return {id: client.id};
+    };
+};
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@ -0,0 +1,139 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('Worker new', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    const employeeId = 1;
+    const defaultWorker = {
+        fi: '78457139E',
+        name: 'defaultWorker',
+        firstName: 'default',
+        lastNames: 'worker',
+        email: 'defaultWorker@mydomain.com',
+        street: 'S/ defaultWorkerStreet',
+        city: 'defaultWorkerCity',
+        provinceFk: 1,
+        iban: 'ES8304879798578129532677',
+        bankEntityFk: 128,
+        companyFk: 442,
+        postcode: '46680',
+        phone: '123456789',
+        code: 'DWW',
+        bossFk: 9,
+        birth: '2022-12-11T23:00:00.000Z'
+    };
+
+    it('should return error if personal mail already exists', async() => {
+        const user = await models.Account.findById(employeeId, {fields: ['email']});
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {email: user.email})
+            };
+
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This personal mail already exists');
+    });
+
+    it('should return error if worker code already exists', async() => {
+        const worker = await models.Worker.findById(employeeId, {fields: ['code']});
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {code: worker.code})
+            };
+
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This worker code already exists');
+    });
+
+    it('should return error if worker already exists', async() => {
+        const worker = await models.Client.findById(employeeId, {fields: ['fi']});
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {fi: worker.fi})
+            };
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This worker already exists');
+    });
+
+    it('should create a new worker', async() => {
+        const newWorker = await models.Worker.new({args: defaultWorker});
+
+        await models.Worker.destroyById(newWorker.id);
+        await models.Address.destroyAll({clientFk: newWorker.id});
+        await models.Mandate.destroyAll({clientFk: newWorker.id});
+        await models.Client.destroyById(newWorker.id);
+        await models.Account.destroyById(newWorker.id);
+
+        expect(newWorker.id).toBeDefined();
+    });
+
+    it('should create a new worker in client', async() => {
+        const bruceWayneId = 1101;
+        const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
+
+        const newWorkerData = {
+            args: Object.assign(
+                {},
+                defaultWorker,
+                {
+                    fi: client.fi,
+                    email: client.email
+                })
+        };
+        const newWorker = await models.Worker.new(newWorkerData);
+
+        await models.Worker.destroyById(newWorker.id);
+
+        expect(newWorker.id).toEqual(bruceWayneId);
+    });
+});
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@ -1,7 +1,7 @@
 {
    "AbsenceType": {
        "dataSource": "vn"
-    }, 
+    },
    "Calendar": {
        "dataSource": "vn"
    },
@ -16,13 +16,19 @@
    },
    "Department": {
        "dataSource": "vn"
-    }, 
+    },
+    "Device": {
+        "dataSource": "vn"
+    },
    "EducationLevel": {
        "dataSource": "vn"
    },
    "Journey": {
        "dataSource": "vn"
    },
+    "ProfileType":{
+        "dataSource": "vn"
+    },
    "Time": {
        "dataSource": "vn"
    },
@ -32,39 +38,42 @@
    "WorkCenterHoliday": {
        "dataSource": "vn"
    },
-    "WorkerDms": {
+    "Worker": {
        "dataSource": "vn"
    },
-    "Worker": {
+    "WorkerConfig": {
+        "dataSource": "vn"
+    },
+    "WorkerDepartment": {
+        "dataSource": "vn"
+    },
+    "WorkerDisableExcluded": {
+        "dataSource": "vn"
+    },
+    "WorkerDms": {
        "dataSource": "vn"
    },
    "WorkerLabour": {
        "dataSource": "vn"
    },
+    "WorkerLog": {
+        "dataSource": "vn"
+    },
    "WorkerMana": {
        "dataSource": "vn"
    },
+    "WorkerMedia": {
+        "dataSource": "vn"
+    },
    "WorkerTeam": {
        "dataSource": "vn"
    },
    "WorkerTeamCollegues": {
        "dataSource": "vn"
    },
-    "WorkerMedia": {
-        "dataSource": "vn"
-    },
-    "WorkerDepartment": {
-        "dataSource": "vn"
-    },    
    "WorkerTimeControl": {
        "dataSource": "vn"
    },
-    "Device": {
-        "dataSource": "vn"
-    },
-    "WorkerLog": {
-        "dataSource": "vn"
-    },
    "WorkerTimeControlConfig": {
        "dataSource": "vn"
    },
@ -73,9 +82,6 @@
    },
    "WorkerTimeControlMail": {
        "dataSource": "vn"
-    },
-    "WorkerDisableExcluded": {
-        "dataSource": "vn"
    }
 }

--- a/modules/worker/back/models/profile-type.json
+++ b/modules/worker/back/models/profile-type.json
@ -0,0 +1,19 @@
+{
+    "name": "ProfileType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "profileType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}
--- a/modules/worker/back/models/worker-config.json
+++ b/modules/worker/back/models/worker-config.json
@ -0,0 +1,27 @@
+{
+    "name": "WorkerConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "roleFk": {
+            "type": "number"
+        }
+    },
+	"acls": [
+        {
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+        }
+    ]
+}
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@ -13,4 +13,5 @@ module.exports = Self => {
    require('../methods/worker/contracts')(Self);
    require('../methods/worker/holidays')(Self);
    require('../methods/worker/activeContract')(Self);
+    require('../methods/worker/new')(Self);
 };
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@ -52,6 +52,9 @@
        },
        "mobileExtension": {
            "type" : "number"
+        },
+        "code": {
+            "type" : "string"
        }
    },
    "relations": {
@ -91,4 +94,4 @@
            "foreignKey": "sectorFk"
        }
    }
-}
+}
--- a/modules/worker/front/create/index.html
+++ b/modules/worker/front/create/index.html
@ -0,0 +1,194 @@
+<vn-watcher
+    vn-id="watcher"
+    url="Workers/new"
+    data="$ctrl.worker"
+    insert-mode="true"
+    form="form">
+</vn-watcher>
+<form name="form" vn-http-submit="$ctrl.onSubmit()" class="vn-w-md">
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Firstname"
+                ng-model="$ctrl.worker.firstName"
+                rule
+                on-change="$ctrl.generateCodeUser()"
+                vn-focus>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Lastname"
+                on-change="$ctrl.generateCodeUser()"
+                ng-model="$ctrl.worker.lastNames"
+                rule>
+            </vn-textfield>
+            <vn-date-picker
+                vn-one
+                label="Birth"
+                ng-model="$ctrl.worker.birth">
+            </vn-date-picker>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Fi"
+                ng-model="$ctrl.worker.fi"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Code"
+                ng-model="$ctrl.worker.code"
+                maxLength="3"
+                on-change="$ctrl.worker.code = $ctrl.worker.code.toUpperCase()"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Phone"
+                ng-model="$ctrl.worker.phone"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-datalist
+                label="Postcode"
+                vn-one
+                ng-model="$ctrl.worker.postcode"
+                selection="$ctrl.postcode"
+                url="Postcodes/location"
+                fields="['code','townFk']"
+                order="code, townFk"
+                value-field="code"
+                show-field="code"
+                rule>
+                <tpl-item>
+                    {{code}} - {{town.name}} ({{town.province.name}},
+                    {{town.province.country.country}})
+                </tpl-item>
+                <append>
+                    <vn-icon-button
+                        icon="add_circle"
+                        vn-tooltip="New postcode"
+                        ng-click="postcode.open()"
+                        vn-acl="deliveryBoss"
+                        vn-acl-action="remove">
+                    </vn-icon-button>
+                </append>
+            </vn-datalist>
+            <vn-autocomplete
+                vn-id="province"
+                label="Province"
+                ng-model="$ctrl.worker.provinceFk"
+                selection="$ctrl.province"
+                url="Provinces/location"
+                fields="['id', 'name', 'countryFk']"
+                rule>
+                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-datalist
+                vn-id="town"
+                label="City"
+                ng-model="$ctrl.worker.city"
+                selection="$ctrl.town"
+                url="Towns/location"
+                fields="['id', 'name', 'provinceFk']"
+                value-field="name">
+                <tpl-item>
+                    {{name}}, {{province.name}}
+                    ({{province.country.country}})
+                </tpl-item>
+            </vn-datalist>
+            <vn-textfield
+                vn-two
+                label="Street"
+                ng-model="$ctrl.worker.street"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                label="Web user"
+                ng-model="$ctrl.worker.name"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                label="Personal email"
+                ng-model="$ctrl.worker.email"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                vn-id="company"
+                ng-model="$ctrl.worker.companyFk"
+                url="Companies"
+                show-field="code"
+                value-field="id"
+                label="Company">
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                ng-model="$ctrl.worker.bossFk"
+                url="Workers/activeWithInheritedRole"
+                show-field="nickname"
+                search-function="{firstName: $search}"
+                where="{role: 'employee'}"
+                label="Boss">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="IBAN"
+                ng-model="$ctrl.worker.iban"
+                rule
+                on-change="$ctrl.autofillBic()">
+            </vn-textfield>
+            <vn-autocomplete
+                vn-one
+                label="Swift / BIC"
+                url="BankEntities"
+                ng-model="$ctrl.worker.bankEntityFk"
+                fields="['name']"
+                initial-data="$ctrl.worker.bankEntityFk"
+                on-change="$ctrl.autofillBic()"
+                search-function="{or: [{bic: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
+                value-field="id"
+                show-field="bic"
+                vn-acl="salesAssistant, hr"
+                disabled="$ctrl.ibanCountry == 'ES'">
+                <tpl-item>{{bic}} {{name}}</tpl-item>
+                <append>
+                    <vn-icon-button
+                        vn-auto
+                        icon="add_circle"
+                        vn-click-stop="bankEntity.show({countryFk: $ctrl.worker.countryFk})"
+                        vn-tooltip="New bank entity"
+                        vn-acl="salesAssistant, hr">
+                    </vn-icon-button>
+                </append>
+        </vn-autocomplete>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="worker.index">
+        </vn-button>
+    </vn-button-bar>
+</form>
+<!-- New postcode dialog -->
+<vn-geo-postcode
+    vn-id="postcode"
+    on-response="$ctrl.onResponse($response)">
+</vn-geo-postcode>
--- a/modules/worker/front/create/index.js
+++ b/modules/worker/front/create/index.js
@ -0,0 +1,127 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.worker = {companyFk: this.vnConfig.user.companyFk};
+    }
+
+    onSubmit() {
+        return this.$.watcher.submit().then(json => {
+            this.$state.go('worker.card.basicData', {id: json.data.id});
+        });
+    }
+
+    autofillBic() {
+        if (!this.worker || !this.worker.iban) return;
+
+        let bankEntityId = parseInt(this.worker.iban.substr(4, 4));
+        let filter = {where: {id: bankEntityId}};
+
+        if (this.ibanCountry != 'ES') return;
+
+        this.$http.get(`BankEntities`, {filter}).then(response => {
+            const hasData = response.data && response.data[0];
+
+            if (hasData)
+                this.worker.bankEntityFk = response.data[0].id;
+            else if (!hasData)
+                this.worker.bankEntityFk = null;
+        });
+    }
+
+    generateCodeUser() {
+        if (!this.worker.firstName || !this.worker.lastNames) return;
+
+        const totalName = this.worker.firstName.concat(' ' + this.worker.lastNames).toLowerCase();
+        const totalNameArray = totalName.split(' ');
+        let newCode = '';
+
+        for (let part of totalNameArray)
+            newCode += part.charAt(0);
+
+        this.worker.code = newCode.toUpperCase().slice(0, 3);
+        this.worker.name = totalNameArray[0] + newCode.slice(1);
+
+        if (!this.worker.companyFk)
+            this.worker.companyFk = this.vnConfig.user.companyFk;
+    }
+
+    get province() {
+        return this._province;
+    }
+
+    // Province auto complete
+    set province(selection) {
+        this._province = selection;
+
+        if (!selection) return;
+
+        const country = selection.country;
+
+        if (!this.worker.countryFk)
+            this.worker.countryFk = country.id;
+    }
+
+    get town() {
+        return this._town;
+    }
+
+    // Town auto complete
+    set town(selection) {
+        this._town = selection;
+
+        if (!selection) return;
+
+        const province = selection.province;
+        const country = province.country;
+        const postcodes = selection.postcodes;
+
+        if (!this.worker.provinceFk)
+            this.worker.provinceFk = province.id;
+
+        if (!this.worker.countryFk)
+            this.worker.countryFk = country.id;
+
+        if (postcodes.length === 1)
+            this.worker.postcode = postcodes[0].code;
+    }
+
+    get postcode() {
+        return this._postcode;
+    }
+
+    // Postcode auto complete
+    set postcode(selection) {
+        this._postcode = selection;
+
+        if (!selection) return;
+
+        const town = selection.town;
+        const province = town.province;
+        const country = province.country;
+
+        if (!this.worker.city)
+            this.worker.city = town.name;
+
+        if (!this.worker.provinceFk)
+            this.worker.provinceFk = province.id;
+
+        if (!this.worker.countryFk)
+            this.worker.countryFk = country.id;
+    }
+
+    onResponse(response) {
+        this.worker.postcode = response.code;
+        this.worker.city = response.city;
+        this.worker.provinceFk = response.provinceFk;
+    }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnWorkerCreate', {
+    template: require('./index.html'),
+    controller: Controller
+});
--- a/modules/worker/front/create/index.spec.js
+++ b/modules/worker/front/create/index.spec.js
@ -0,0 +1,133 @@
+import './index';
+
+describe('Worker', () => {
+    describe('Component vnWorkerCreate', () => {
+        let $scope;
+        let $state;
+        let controller;
+
+        beforeEach(ngModule('worker'));
+
+        beforeEach(inject(($componentController, $rootScope, _$state_) => {
+            $scope = $rootScope.$new();
+            $state = _$state_;
+            $scope.watcher = {
+                submit: () => {
+                    return {
+                        then: callback => {
+                            callback({data: {id: '1234'}});
+                        }
+                    };
+                }
+            };
+            const $element = angular.element('<vn-worker-create></vn-worker-create>');
+            controller = $componentController('vnWorkerCreate', {$element, $scope});
+            controller.worker = {};
+            controller.vnConfig = {user: {companyFk: 1}};
+        }));
+
+        describe('onSubmit()', () => {
+            it(`should call submit() on the watcher then expect a callback`, () => {
+                jest.spyOn($state, 'go');
+                controller.onSubmit();
+
+                expect(controller.$state.go).toHaveBeenCalledWith('worker.card.basicData', {id: '1234'});
+            });
+        });
+
+        describe('province() setter', () => {
+            it(`should set countryFk property`, () => {
+                controller.worker.countryFk = null;
+                controller.province = {
+                    id: 1,
+                    name: 'New york',
+                    country: {
+                        id: 2,
+                        name: 'USA'
+                    }
+                };
+
+                expect(controller.worker.countryFk).toEqual(2);
+            });
+        });
+
+        describe('town() setter', () => {
+            it(`should set provinceFk property`, () => {
+                controller.town = {
+                    provinceFk: 1,
+                    code: 46001,
+                    province: {
+                        id: 1,
+                        name: 'New york',
+                        country: {
+                            id: 2,
+                            name: 'USA'
+                        }
+                    },
+                    postcodes: []
+                };
+
+                expect(controller.worker.provinceFk).toEqual(1);
+            });
+
+            it(`should set provinceFk property and fill the postalCode if there's just one`, () => {
+                controller.town = {
+                    provinceFk: 1,
+                    code: 46001,
+                    province: {
+                        id: 1,
+                        name: 'New york',
+                        country: {
+                            id: 2,
+                            name: 'USA'
+                        }
+                    },
+                    postcodes: [{code: '46001'}]
+                };
+
+                expect(controller.worker.provinceFk).toEqual(1);
+                expect(controller.worker.postcode).toEqual('46001');
+            });
+        });
+
+        describe('postcode() setter', () => {
+            it(`should set the town, provinceFk and contryFk properties`, () => {
+                controller.postcode = {
+                    townFk: 1,
+                    code: 46001,
+                    town: {
+                        id: 1,
+                        name: 'New York',
+                        province: {
+                            id: 1,
+                            name: 'New york',
+                            country: {
+                                id: 2,
+                                name: 'USA'
+                            }
+                        }
+                    }
+                };
+
+                expect(controller.worker.city).toEqual('New York');
+                expect(controller.worker.provinceFk).toEqual(1);
+                expect(controller.worker.countryFk).toEqual(2);
+            });
+        });
+
+        describe('generateCodeUser()', () => {
+            it(`should generate worker code, name and company `, () => {
+                controller.worker = {
+                    firstName: 'default',
+                    lastNames: 'generate worker'
+                };
+
+                controller.generateCodeUser();
+
+                expect(controller.worker.code).toEqual('DGW');
+                expect(controller.worker.name).toEqual('defaultgw');
+                expect(controller.worker.companyFk).toEqual(controller.vnConfig.user.companyFk);
+            });
+        });
+    });
+});
--- a/modules/worker/front/create/locale/es.yml
+++ b/modules/worker/front/create/locale/es.yml
@ -0,0 +1,12 @@
+Firstname: Nombre
+Lastname: Apellidos
+Fi: DNI/NIF/NIE
+Birth: Fecha de nacimiento
+Code: Código de trabajador
+Province: Provincia
+City: Población
+ProfileType: Tipo de perfil
+Street: Dirección
+Postcode: Código postal
+Web user: Usuario Web
+Access permission: Permiso de acceso
--- a/modules/worker/front/index.js
+++ b/modules/worker/front/index.js
@ -4,6 +4,7 @@ import './main';
 import './index/';
 import './summary';
 import './card';
+import './create';
 import './descriptor';
 import './descriptor-popover';
 import './search-panel';
--- a/modules/worker/front/index/index.html
+++ b/modules/worker/front/index/index.html
@ -6,23 +6,23 @@
    class="vn-w-sm">
    <vn-card>
        <div class="vn-list separated">
-        <a 
+        <a
            ng-repeat="worker in model.data track by worker.id"
            ui-sref="worker.card.summary({id: worker.id})"
            translate-attr="{title: 'View worker'}"
            class="vn-item search-result">
            <vn-item-section>
                <h6>{{::worker.nickname}}</h6>
-                <vn-label-value label="Id" 
+                <vn-label-value label="Id"
                    value="{{::worker.id}}">
                </vn-label-value>
-                <vn-label-value label="User" 
+                <vn-label-value label="User"
                    value="{{::worker.userName}}">
                </vn-label-value>
-                <vn-label-value label="Email" 
+                <vn-label-value label="Email"
                    value="{{::worker.email}}">
                </vn-label-value>
-                <vn-label-value label="Department" 
+                <vn-label-value label="Department"
                    value="{{::worker.department}}">
                </vn-label-value>
            </vn-item-section>
@ -42,8 +42,16 @@
        </div>
    </vn-card>
 </vn-data-viewer>
+<a ui-sref="worker.create"
+    vn-tooltip="New worker"
+    vn-bind="+"
+    vn-acl="hr"
+    vn-acl-action="remove"
+    fixed-bottom-right>
+    <vn-float-button icon="person_add"></vn-float-button>
+</a>
 <vn-popup vn-id="preview">
    <vn-worker-summary
        worker="$ctrl.selectedWorker">
    </vn-worker-summary>
-</vn-popup>
+</vn-popup>
--- a/modules/worker/front/index/locale/es.yml
+++ b/modules/worker/front/index/locale/es.yml
@ -0,0 +1 @@
+New worker: Nuevo trabajador
--- a/modules/worker/front/routes.json
+++ b/modules/worker/front/routes.json
@ -16,7 +16,7 @@
            {"state": "worker.card.timeControl", "icon": "access_time"},
            {"state": "worker.card.dms.index", "icon": "cloud_upload"},
            {
-                "icon": "icon-wiki", 
+                "icon": "icon-wiki",
                "external":true,
                "url": "http://wiki.verdnatura.es",
                "description": "Wikipedia"
@ -134,6 +134,13 @@
                "worker": "$ctrl.worker"
            },
            "acl": ["hr"]
+        },
+        {
+            "url": "/create",
+            "state": "worker.create",
+            "component": "vn-worker-create",
+            "description": "New worker",
+            "acl": ["hr"]
        }
    ]
-}
+}
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "23.02.03",
+    "version": "23.04.01",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",
--- a/print/core/mixins/vn-report.js
+++ b/print/core/mixins/vn-report.js
@ -0,0 +1,23 @@
+const Component = require(`vn-print/core/component`);
+const reportHeader = new Component('report-header');
+const reportFooter = new Component('report-footer');
+const reportBody = new Component('report-body');
+const NotFoundError = require('vn-loopback/util/not-found-error');
+
+module.exports = {
+    components: {
+        'report-body': reportBody.build(),
+        'report-header': reportHeader.build(),
+        'report-footer': reportFooter.build()
+    },
+    methods: {
+        checkMainEntity: function(entity) {
+            if (entity == null)
+                throw new NotFoundError();
+        },
+        formatDate: function(date, format) {
+            const filters = this.$options.filters;
+            return filters.date(date, format);
+        }
+    },
+};
--- a/print/templates/email/email-verify/email-verify.js
+++ b/print/templates/email/email-verify/email-verify.js
@ -10,7 +10,7 @@ module.exports = {
    },
    props: {
        url: {
-            type: [String],
+            type: String,
            required: true
        }
    }
--- a/print/templates/email/printer-setup/locale/es.yml
+++ b/print/templates/email/printer-setup/locale/es.yml
@ -8,8 +8,8 @@ description:
    <a href='https://www.youtube.com/watch?v=qhb0kgQF3o8' title='Youtube' target='_blank'
    style='color:#8dba25'>https://www.youtube.com/watch?v=qhb0kgQF3o8</a>. También
    necesitarás el QLabel, el programa para imprimir las cintas.
-  downloadFrom: Puedes descargarlo desde este enlace <a href='https://godex.s3-accelerate.amazonaws.com/gGnOPoojkP6vC1lgmrbEqQ.file?v01'
-    title='Descargar QLabel' target='_blank' style='color:#8dba25'>https://godex.s3-accelerate.amazonaws.com/gGnOPoojkP6vC1lgmrbEqQ.file?v01</a>
+  downloadFrom: Puedes descargarlo desde este enlace <a href='https://cdn.verdnatura.es/public/QLabel_IV_V1.37_Install_en.exe'
+    title='Descargar QLabel' target='_blank' style='color:#8dba25'>https://cdn.verdnatura.es/public/QLabel_IV_V1.37_Install_en.exe</a>
  downloadDriver: En este enlace puedes descargar el driver de la impresora <a href='https://es.seagullscientific.com/support/downloads/drivers/godex/download/'
    title='Descargar driver' target='_blank' style='color:#8dba25'>https://es.seagullscientific.com/support/downloads/drivers/godex/download/</a>
 sections:
--- a/print/templates/email/recover-password/recover-password.js
+++ b/print/templates/email/recover-password/recover-password.js
@ -10,7 +10,7 @@ module.exports = {
    },
    props: {
        url: {
-            type: [String],
+            type: String,
            required: true
        }
    }
--- a/print/templates/email/worker-welcome/assets/css/import.js
+++ b/print/templates/email/worker-welcome/assets/css/import.js
@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();
--- a/print/templates/email/worker-welcome/locale/es.yml
+++ b/print/templates/email/worker-welcome/locale/es.yml
@ -0,0 +1,8 @@
+subject: Bienvenido a Verdnatura
+title: "¡Te damos la bienvenida!"
+dearWorker: Estimado trabajador
+workerData: 'Estos son los datos de tu usuario de Verdnatura.
+    Usuario: <strong>{0}</strong>. Haz click aquí para
+    <a href="{1}"
+        title="Cambiar contraseña" target="_blank" style="color: #8dba25">establecer tu contraseña
+    </a>.'
--- a/print/templates/email/worker-welcome/sql/worker.sql
+++ b/print/templates/email/worker-welcome/sql/worker.sql
@ -0,0 +1,7 @@
+SELECT
+    u.id,
+    u.name,
+    e.email
+FROM account.user u
+    LEFT JOIN account.emailUser e ON e.userFk = u.id
+WHERE u.id = ?;
--- a/print/templates/email/worker-welcome/worker-welcome.html
+++ b/print/templates/email/worker-welcome/worker-welcome.html
@ -0,0 +1,9 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title', [id]) }}</h1>
+            <p>{{ $t('dearWorker') }},</p>
+            <p v-html="$t('workerData', [this.worker.name, this.url])"></p>
+        </div>
+    </div>
+</email-body>
--- a/print/templates/email/worker-welcome/worker-welcome.js
+++ b/print/templates/email/worker-welcome/worker-welcome.js
@ -0,0 +1,27 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'worker-welcome',
+    async serverPrefetch() {
+        this.worker = await this.fetchWorker(this.id);
+    },
+    methods: {
+        fetchWorker(id) {
+            return this.findOneFromDef('worker', [id]);
+        },
+    },
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true
+        },
+        url: {
+            type: String,
+            required: true
+        }
+    }
+};
--- a/print/templates/reports/balance-compensation/balance-compensation.html
+++ b/print/templates/reports/balance-compensation/balance-compensation.html
@ -3,7 +3,7 @@
        <div class="grid-block">
            <div class="columns">
                <div class="size50">
-                    <p style="text-align: right">{{$t('Place')}} {{currentDate()}}</p>
+                    <p style="text-align: right">{{$t('Place')}} {{formatDate(new Date(), '%d-%m-%Y')}}</p>
                    <h3 style="text-align: center; margin-top: 8%">{{$t('Compensation') | uppercase}}</h3>
                    <p style="margin-top: 8%">{{$t('In one hand')}}:</p>
                    <p style="text-align: justify">
@ -17,7 +17,7 @@
                    </p>
                    <h4 style="text-align: center; margin-top: 10%">{{$t('Agree') | uppercase}}</h4>
                    <p style="margin-top: 8%; text-align: justify">
-                        {{$t('Date')}} {{client.payed | date('%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} €
+                        {{$t('Date')}} {{formatDate(client.payed, '%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} €
                        {{$t('From client')}} {{client.name}} {{$t('Toclient')}} {{company.name}}.
                    </p>
                    <p style="margin-top: 8%">
--- a/print/templates/reports/balance-compensation/balance-compensation.js
+++ b/print/templates/reports/balance-compensation/balance-compensation.js
@ -1,28 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');

 module.exports = {
    name: 'balance-compensation',
+    mixins: [vnReport],
    async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.company = await this.fetchCompany(this.id);
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchCompany(id) {
-            return this.findOneFromDef('company', [id]);
-        },
-
-        currentDate() {
-            const current = new Date();
-            const date = `${current.getDate()}/${current.getMonth() + 1}/${current.getFullYear()}`;
-            return date;
-        }
-    },
-    components: {
-        'report-body': reportBody.build()
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.company = await this.findOneFromDef('company', [this.id]);
    },
    props: {
        id: {
--- a/print/templates/reports/balance-compensation/sql/client.sql
+++ b/print/templates/reports/balance-compensation/sql/client.sql
@ -8,5 +8,4 @@ SELECT
        r.payed
    FROM client c
        JOIN receipt r ON r.clientFk = c.id
-        JOIN supplier s ON c.fi = s.nif
-    WHERE r.id = ?
+    WHERE r.id = ?
--- a/print/templates/reports/campaign-metrics/campaign-metrics.html
+++ b/print/templates/reports/campaign-metrics/campaign-metrics.html
@ -13,11 +13,11 @@
                                </tr>
                                <tr>
                                    <td class="font gray">{{$t('From')}}</td>
-                                    <th>{{from | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(from, '%d-%m-%Y')}}</th>
                                </tr>
                                <tr>
                                    <td class="font gray">{{$t('To')}}</td>
-                                    <th>{{to | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(to, '%d-%m-%Y')}}</th>
                                </tr>
                            </tbody>
                        </table>
--- a/print/templates/reports/campaign-metrics/campaign-metrics.js
+++ b/print/templates/reports/campaign-metrics/campaign-metrics.js
@ -1,27 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');

 module.exports = {
    name: 'campaign-metrics',
+    mixins: [vnReport],
    async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id, this.from, this.to);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id, from, to) {
-            return this.rawSqlFromDef('sales', [id, from, to]);
-        },
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.rawSqlFromDef('sales', [this.id, this.from, this.to]);
    },
    props: {
        id: {
--- a/print/templates/reports/claim-pickup-order/claim-pickup-order.html
+++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.html
@ -20,7 +20,7 @@
                            </tr>
                            <tr>
                                <td class="font gray uppercase">{{$t('date')}}</td>
-                                <th>{{dated}}</th>
+                                <th>{{formatDate(new Date(), '%d-%m-%Y')}}</th>
                            </tr>
                        </tbody>
                    </table>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				ALTER TABLE `vn`.`supplier` ADD UNIQUE (name, countryFk);
				@ -80203,4 +80203,3 @@ USE `vncontrol`;
				`-- Dump completed on 2022-11-21 7:57:28`