diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8a04cfe8..aa63ad637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,28 +5,66 @@ 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).
 
+## [2308.01] - 2023-03-09
+
+### Added
+-
+
+### Changed
+-
+
+### Fixed
+-
+
+## [2306.01] - 2023-02-23
+
+### Added
+- (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
+- (Artículos) El visible y disponible se calcula a partir de un almacén diferente dependiendo de la sección en la que te encuentres. Se ha añadido un icono que informa sobre a partir de que almacén se esta calculando.
+
+### Changed
+- (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario
+
+### Fixed
+- (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
+- (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
+- (Artículos) El disponible en la vista previa se muestra correctamente
+
 ## [2304.01] - 2023-02-09
 
 ### Added
-- 
+- (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
-- 
+- (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
-- 
+- (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 
+- (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 
+- (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
diff --git a/back/methods/account/recover-password.js b/back/methods/account/recover-password.js
index ddea76829..787a45284 100644
--- a/back/methods/account/recover-password.js
+++ b/back/methods/account/recover-password.js
@@ -3,9 +3,9 @@ module.exports = Self => {
         description: 'Send email to the user',
         accepts: [
             {
-                arg: 'email',
+                arg: 'user',
                 type: 'string',
-                description: 'The email of user',
+                description: 'The user name or email',
                 required: true
             }
         ],
@@ -15,11 +15,20 @@ module.exports = Self => {
         }
     });
 
-    Self.recoverPassword = async function(email) {
+    Self.recoverPassword = async function(user) {
         const models = Self.app.models;
 
+        const usesEmail = user.indexOf('@') !== -1;
+        if (!usesEmail) {
+            const account = await models.Account.findOne({
+                fields: ['email'],
+                where: {name: user}
+            });
+            user = account.email;
+        }
+
         try {
-            await models.user.resetPassword({email, emailTemplate: 'recover-password'});
+            await models.user.resetPassword({email: user, emailTemplate: 'recover-password'});
         } catch (err) {
             if (err.code === 'EMAIL_NOT_FOUND')
                 return;
diff --git a/back/methods/campaign/latest.js b/back/methods/campaign/latest.js
index a418f1267..56ab81330 100644
--- a/back/methods/campaign/latest.js
+++ b/back/methods/campaign/latest.js
@@ -22,7 +22,7 @@ module.exports = Self => {
 
     Self.latest = async filter => {
         const conn = Self.dataSource.connector;
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setFullYear(minDate.getFullYear() - 1);
 
         const where = {dated: {gte: minDate}};
diff --git a/back/methods/campaign/spec/latest.spec.js b/back/methods/campaign/spec/latest.spec.js
index a71849b59..59e4c1e7a 100644
--- a/back/methods/campaign/spec/latest.spec.js
+++ b/back/methods/campaign/spec/latest.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 
 describe('campaign latest()', () => {
     it('should return the campaigns from the last year', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         const result = await app.models.Campaign.latest();
         const randomIndex = Math.floor(Math.random() * result.length);
         const campaignDated = result[randomIndex].dated;
@@ -12,7 +12,7 @@ describe('campaign latest()', () => {
     });
 
     it('should return the campaigns from the current year', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         const currentYear = now.getFullYear();
         const result = await app.models.Campaign.latest({
             where: {dated: {like: `%${currentYear}%`}}
diff --git a/back/methods/campaign/spec/upcoming.spec.js b/back/methods/campaign/spec/upcoming.spec.js
index 14bffe3cf..2aec5117f 100644
--- a/back/methods/campaign/spec/upcoming.spec.js
+++ b/back/methods/campaign/spec/upcoming.spec.js
@@ -4,7 +4,7 @@ describe('campaign upcoming()', () => {
     it('should return the upcoming campaign but from the last year', async() => {
         const response = await app.models.Campaign.upcoming();
         const campaignDated = response.dated;
-        const now = new Date();
+        const now = Date.vnNew();
 
         expect(campaignDated).toEqual(jasmine.any(Date));
         expect(campaignDated).toBeLessThanOrEqual(now);
diff --git a/back/methods/campaign/upcoming.js b/back/methods/campaign/upcoming.js
index 2f1a5a377..c98fee6e5 100644
--- a/back/methods/campaign/upcoming.js
+++ b/back/methods/campaign/upcoming.js
@@ -14,7 +14,7 @@ module.exports = Self => {
     });
 
     Self.upcoming = async() => {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setFullYear(minDate.getFullYear() - 1);
 
         return Self.findOne({
diff --git a/back/methods/chat/getServiceAuth.js b/back/methods/chat/getServiceAuth.js
index 827092109..ff14e76cb 100644
--- a/back/methods/chat/getServiceAuth.js
+++ b/back/methods/chat/getServiceAuth.js
@@ -21,7 +21,7 @@ module.exports = Self => {
 
         if (!this.login) return;
 
-        if (Date.now() > this.login.expires)
+        if (Date.vnNow() > this.login.expires)
             this.login = await requestToken();
 
         return this.login;
@@ -48,7 +48,7 @@ module.exports = Self => {
                     userId: requestData.userId,
                     token: requestData.authToken
                 },
-                expires: Date.now() + (1000 * 60 * tokenLifespan)
+                expires: Date.vnNow() + (1000 * 60 * tokenLifespan)
             };
         }
     }
diff --git a/back/methods/chat/send.js b/back/methods/chat/send.js
index c5c8feead..915120d49 100644
--- a/back/methods/chat/send.js
+++ b/back/methods/chat/send.js
@@ -33,7 +33,7 @@ module.exports = Self => {
             await models.Chat.create({
                 senderFk: sender.id,
                 recipient: to,
-                dated: new Date(),
+                dated: Date.vnNew(),
                 checkUserStatus: 0,
                 message: message,
                 status: 0,
diff --git a/back/methods/chat/sendCheckingPresence.js b/back/methods/chat/sendCheckingPresence.js
index 075591969..883a1b693 100644
--- a/back/methods/chat/sendCheckingPresence.js
+++ b/back/methods/chat/sendCheckingPresence.js
@@ -49,7 +49,7 @@ module.exports = Self => {
         await models.Chat.create({
             senderFk: sender.id,
             recipient: `@${recipient.name}`,
-            dated: new Date(),
+            dated: Date.vnNew(),
             checkUserStatus: 1,
             message: message,
             status: 0,
diff --git a/back/methods/chat/spec/sendQueued.spec.js b/back/methods/chat/spec/sendQueued.spec.js
index bbf5a73c7..ed791756b 100644
--- a/back/methods/chat/spec/sendQueued.spec.js
+++ b/back/methods/chat/spec/sendQueued.spec.js
@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('Chat sendCheckingPresence()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(6, 0);
     const chatModel = models.Chat;
 
diff --git a/back/methods/collection/setSaleQuantity.js b/back/methods/collection/setSaleQuantity.js
index b6c56ddc4..4ac3d6d4b 100644
--- a/back/methods/collection/setSaleQuantity.js
+++ b/back/methods/collection/setSaleQuantity.js
@@ -24,7 +24,7 @@ module.exports = Self => {
         }
     });
 
-    Self.setSaleQuantity = async(saleId, quantity) => {
+    Self.setSaleQuantity = async(saleId, quantity, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
diff --git a/back/methods/dms/deleteTrashFiles.js b/back/methods/dms/deleteTrashFiles.js
index f14e65e9f..239d654ef 100644
--- a/back/methods/dms/deleteTrashFiles.js
+++ b/back/methods/dms/deleteTrashFiles.js
@@ -32,7 +32,7 @@ module.exports = Self => {
             where: {code: 'trash'}
         }, myOptions);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setMonth(date.getMonth() - 4);
 
         const dmsToDelete = await models.Dms.find({
diff --git a/back/methods/dms/saveSign.js b/back/methods/dms/saveSign.js
index f668c5ed2..ed462a301 100644
--- a/back/methods/dms/saveSign.js
+++ b/back/methods/dms/saveSign.js
@@ -163,7 +163,7 @@ module.exports = Self => {
                     fields: ['alertLevel']
                 });
 
-                signedTime ? signedTime != undefined : signedTime = new Date();
+                signedTime ? signedTime != undefined : signedTime = Date.vnNew();
 
                 if (alertLevel >= 2) {
                     let dir;
diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index b5ee3d18f..ea9ee3622 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -127,7 +127,7 @@ module.exports = Self => {
         const uploadOptions = {
             headers: {
                 'Content-Type': 'multipart/form-data',
-                'X-File-ModifiedDate': new Date(),
+                'X-File-ModifiedDate': Date.vnNew(),
                 'Cookie': options.headers.headers.Cookie,
                 ...data.getHeaders()
             },
diff --git a/back/methods/edi/updateData.js b/back/methods/edi/updateData.js
index c5705513f..232695f4e 100644
--- a/back/methods/edi/updateData.js
+++ b/back/methods/edi/updateData.js
@@ -230,7 +230,7 @@ module.exports = Self => {
                         UPDATE edi.tableConfig
                             SET updated = ?
                         WHERE fileName = ?
-                `, [new Date(), baseName], options);
+                `, [Date.vnNew(), baseName], options);
         }
 
         console.log(`Updated table ${toTable}\n`);
diff --git a/back/methods/notification/clean.js b/back/methods/notification/clean.js
index bdc6737df..8ce32d389 100644
--- a/back/methods/notification/clean.js
+++ b/back/methods/notification/clean.js
@@ -32,7 +32,7 @@ module.exports = Self => {
 
             if (!config.cleanDays) return;
 
-            const cleanDate = new Date();
+            const cleanDate = Date.vnNew();
             cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
 
             await models.NotificationQueue.destroyAll({
diff --git a/back/methods/notification/specs/clean.spec.js b/back/methods/notification/specs/clean.spec.js
index 4c9dc563d..857886a64 100644
--- a/back/methods/notification/specs/clean.spec.js
+++ b/back/methods/notification/specs/clean.spec.js
@@ -10,7 +10,7 @@ describe('Notification Clean()', () => {
         const notification = await models.Notification.findOne({}, options);
         const notificationConfig = await models.NotificationConfig.findOne({});
 
-        const cleanDate = new Date();
+        const cleanDate = Date.vnNew();
         cleanDate.setDate(cleanDate.getDate() - (notificationConfig.cleanDays + 1));
 
         let before;
diff --git a/back/models/company.json b/back/models/company.json
index a36b43b69..f16c5762f 100644
--- a/back/models/company.json
+++ b/back/models/company.json
@@ -20,10 +20,9 @@
             "type": "date"
         }
     },
-
     "scope": {
         "where" :{
             "expired": null
         }
     }
-}
\ No newline at end of file
+}
diff --git a/back/models/image.js b/back/models/image.js
index f7063c654..e8cab11aa 100644
--- a/back/models/image.js
+++ b/back/models/image.js
@@ -77,7 +77,7 @@ module.exports = Self => {
             const newImage = await Self.upsertWithWhere(data, {
                 name: fileName,
                 collectionFk: collectionName,
-                updated: (new Date).getTime()
+                updated: Date.vnNow()
             }, myOptions);
 
             // Resizes and saves the image
diff --git a/back/models/notificationAcl.json b/back/models/notificationAcl.json
index e3e97f52d..a20187961 100644
--- a/back/models/notificationAcl.json
+++ b/back/models/notificationAcl.json
@@ -6,6 +6,16 @@
 			"table": "util.notificationAcl"
 		}
 	},
+    "properties":{
+        "notificationFk": {
+            "id": true,
+            "type": "number"
+          },
+          "roleFk":{
+            "id": true,
+            "type": "number"
+          }
+    },
 	"relations": {
         "notification": {
             "type": "belongsTo",
diff --git a/back/models/notificationSubscription.js b/back/models/notificationSubscription.js
new file mode 100644
index 000000000..f1b2811fa
--- /dev/null
+++ b/back/models/notificationSubscription.js
@@ -0,0 +1,62 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.observe('before save', async function(ctx) {
+        const models = Self.app.models;
+        const userId = ctx.options.accessToken.userId;
+        const user = await ctx.instance.userFk;
+        const modifiedUser = await getUserToModify(null, user, models);
+
+        if (userId != modifiedUser.id && userId != modifiedUser.bossFk)
+            throw new UserError('You dont have permission to modify this user');
+    });
+
+    Self.remoteMethod('deleteNotification', {
+        description: 'Deletes a notification subscription',
+        accepts: [
+            {
+                arg: 'ctx',
+                type: 'object',
+                http: {source: 'context'}
+            },
+            {
+                arg: 'notificationId',
+                type: 'number',
+                required: true
+            },
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            verb: 'POST',
+            path: '/deleteNotification'
+        }
+    });
+
+    Self.deleteNotification = async function(ctx, notificationId) {
+        const models = Self.app.models;
+        const user = ctx.req.accessToken.userId;
+        const modifiedUser = await getUserToModify(notificationId, null, models);
+
+        if (user != modifiedUser.id && user != modifiedUser.bossFk)
+            throw new UserError('You dont have permission to modify this user');
+
+        await models.NotificationSubscription.destroyById(notificationId);
+    };
+
+    async function getUserToModify(notificationId, userFk, models) {
+        let userToModify = userFk;
+        if (notificationId) {
+            const subscription = await models.NotificationSubscription.findById(notificationId);
+            userToModify = subscription.userFk;
+        }
+        return await models.Worker.findOne({
+            fields: ['id', 'bossFk'],
+            where: {
+                id: userToModify
+            }
+        });
+    }
+};
diff --git a/back/models/notificationSubscription.json b/back/models/notificationSubscription.json
index 43fa6db27..a640e0917 100644
--- a/back/models/notificationSubscription.json
+++ b/back/models/notificationSubscription.json
@@ -7,15 +7,18 @@
 		}
 	},
     "properties": {
-        "notificationFk": {
+        "id": {
             "type": "number",
             "id": true,
-            "description": "Identifier"
+            "description": "Primary key"
+        },
+        "notificationFk": {
+            "type": "number",
+            "description": "Foreign key to Notification"
         },
         "userFk": {
             "type": "number",
-            "id": true,
-            "description": "Identifier"
+            "description": "Foreign key to Account"
         }
     },
 	"relations": {
diff --git a/back/models/specs/notificationSubscription.spec.js b/back/models/specs/notificationSubscription.spec.js
new file mode 100644
index 000000000..c7f37abed
--- /dev/null
+++ b/back/models/specs/notificationSubscription.spec.js
@@ -0,0 +1,74 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('loopback model NotificationSubscription', () => {
+    it('Should fail to delete a notification if the user is not editing itself or a subordinate', async() => {
+        const tx = await models.NotificationSubscription.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const user = 9;
+            const notificationSubscriptionId = 2;
+            const ctx = {req: {accessToken: {userId: user}}};
+            const notification = await models.NotificationSubscription.findById(notificationSubscriptionId);
+
+            let error;
+
+            try {
+                await models.NotificationSubscription.deleteNotification(ctx, notification.id, options);
+            } catch (e) {
+                error = e;
+            }
+
+            expect(error.message).toContain('You dont have permission to modify this user');
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('Should delete a notification if the user is editing itself', async() => {
+        const tx = await models.NotificationSubscription.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const user = 9;
+            const notificationSubscriptionId = 4;
+            const ctx = {req: {accessToken: {userId: user}}};
+            const notification = await models.NotificationSubscription.findById(notificationSubscriptionId);
+
+            await models.NotificationSubscription.deleteNotification(ctx, notification.id, options);
+
+            const deletedNotification = await models.NotificationSubscription.findById(notificationSubscriptionId);
+
+            expect(deletedNotification).toBeNull();
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('Should delete a notification if the user is editing a subordinate', async() => {
+        const tx = await models.NotificationSubscription.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const user = 9;
+            const notificationSubscriptionId = 5;
+            const ctx = {req: {accessToken: {userId: user}}};
+            const notification = await models.NotificationSubscription.findById(notificationSubscriptionId);
+
+            await models.NotificationSubscription.deleteNotification(ctx, notification.id, options);
+
+            const deletedNotification = await models.NotificationSubscription.findById(notificationSubscriptionId);
+
+            expect(deletedNotification).toBeNull();
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
+
diff --git a/db/changes/230201/00-SupplierUniqueKey.sql b/db/changes/230201/00-SupplierUniqueKey.sql
new file mode 100644
index 000000000..9c0d4a192
--- /dev/null
+++ b/db/changes/230201/00-SupplierUniqueKey.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`supplier` ADD UNIQUE (name, countryFk);
diff --git a/db/changes/230201/00-kkearSaleChecked.sql b/db/changes/230201/00-kkearSaleChecked.sql
index 03e854bbd..3ea107da5 100644
--- a/db/changes/230201/00-kkearSaleChecked.sql
+++ b/db/changes/230201/00-kkearSaleChecked.sql
@@ -1,2 +1,173 @@
 DELETE FROM `salix`.`ACL` WHERE model="SaleChecked";
 DROP TABLE IF EXISTS `vn`.`saleChecked`;
+DROP PROCEDURE IF EXISTS `vn`.`clean`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
+BEGIN
+	DECLARE vDateShort DATETIME;
+	DECLARE vOneYearAgo DATE;
+	DECLARE vFourYearsAgo DATE;
+	DECLARE v18Month DATE;
+	DECLARE v26Month DATE;
+	DECLARE v3Month DATE;
+	DECLARE vTrashId VARCHAR(15);
+
+	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
+	SET vOneYearAgo = util.VN_CURDATE() - INTERVAL 1 YEAR;
+	SET vFourYearsAgo = util.VN_CURDATE() - INTERVAL 4 YEAR;
+	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
+	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
+	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
+
+	DELETE FROM ticketParking WHERE created < vDateShort;
+	DELETE FROM routesMonitor WHERE dated < vDateShort;
+	DELETE FROM workerTimeControlLog WHERE created < vDateShort;
+	DELETE FROM `message` WHERE sendDate < vDateShort;
+	DELETE FROM messageInbox WHERE sendDate < vDateShort;
+	DELETE FROM messageInbox WHERE sendDate < vDateShort;
+	DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
+	DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
+	DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
+	DELETE FROM entryLog WHERE creationDate < vDateShort;
+	DELETE IGNORE FROM expedition WHERE created < v26Month;
+	DELETE FROM sms WHERE created < v18Month;
+	DELETE FROM saleTracking WHERE created < vOneYearAgo;
+	DELETE FROM ticketTracking WHERE created < v18Month;
+	DELETE tobs FROM ticketObservation tobs
+		JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
+	DELETE FROM sharingCart where ended < vDateShort;
+	DELETE FROM sharingClient where ended < vDateShort;
+	DELETE tw.* FROM ticketWeekly tw
+		LEFT JOIN sale s ON s.ticketFk = tw.ticketFk WHERE s.itemFk IS NULL;
+	DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
+	DELETE FROM message WHERE sendDate < vDateShort;
+	-- Robert ubicacion anterior de trevelLog comentario para debug
+	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
+	DELETE bm
+		FROM buyMark bm
+			JOIN buy b ON b.id = bm.id
+			JOIN entry e ON e.id = b.entryFk
+			JOIN travel t ON t.id = e.travelFk
+		WHERE t.landed <= vDateShort;
+	DELETE FROM vn.buy WHERE created < vDateShort AND entryFk = 9200;
+	DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
+	DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
+	DELETE FROM vn.itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
+	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < vDateShort;
+
+	-- Equipos duplicados
+	DELETE w.*
+		FROM workerTeam w
+		JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
+				FROM workerTeam
+				GROUP BY team,workerFk
+				HAVING duplicated
+			 ) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
+
+	DELETE sc
+		FROM  saleComponent sc
+			JOIN sale s ON s.id=  sc.saleFk
+			JOIN ticket t ON t.id= s.ticketFk
+		WHERE t.shipped < v18Month;
+
+	DELETE c
+		FROM vn.claim c
+			JOIN vn.claimState cs ON cs.id = c.claimStateFk
+		WHERE cs.description = "Anulado" AND
+			c.created < vDateShort;
+	DELETE
+		FROM vn.expeditionTruck
+		WHERE ETD < v3Month;
+
+	-- borrar travels sin entradas
+	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
+	CREATE TEMPORARY TABLE tmp.thermographToDelete
+		SELECT th.id,th.dmsFk
+		FROM vn.travel t
+			LEFT JOIN vn.entry e ON e.travelFk = t.id
+			JOIN vn.travelThermograph th ON th.travelFk = t.id
+		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+
+	SELECT dt.id INTO vTrashId
+		FROM vn.dmsType dt
+		WHERE dt.code = 'trash';
+
+	UPDATE tmp.thermographToDelete th
+		JOIN vn.dms d ON d.id = th.dmsFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE th
+		FROM tmp.thermographToDelete tmp
+		JOIN vn.travelThermograph th ON th.id = tmp.id;
+
+	DELETE t
+		FROM vn.travel t
+		LEFT JOIN vn.entry e ON e.travelFk = t.id
+		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+
+	UPDATE dms d
+			JOIN dmsType dt ON dt.id = d.dmsTypeFk
+		SET d.dmsTypeFk = vTrashId
+		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
+
+	-- borrar entradas sin compras
+	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
+	CREATE TEMPORARY TABLE tmp.entryToDelete
+		SELECT e.*
+			FROM vn.entry e
+			LEFT JOIN vn.buy b ON b.entryFk = e.id
+			JOIN vn.entryConfig  ec ON e.id != ec.defaultEntry
+		WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
+
+	DELETE e
+		FROM vn.entry e
+		JOIN tmp.entryToDelete tmp ON tmp.id = e.id;
+
+	-- borrar de route registros menores a 4 años
+	DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
+	CREATE TEMPORARY TABLE tmp.routeToDelete
+		SELECT *
+		FROM vn.route r
+		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());
+
+	UPDATE  tmp.routeToDelete tmp
+		JOIN vn.dms d ON d.id = tmp.gestdocFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE r
+		FROM tmp.routeToDelete tmp
+		JOIN vn.route r ON  r.id = tmp.id;
+
+	-- borrar registros de dua y awb menores a 2 años
+	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
+	CREATE TEMPORARY TABLE tmp.duaToDelete
+		SELECT *
+			FROM vn.dua
+			WHERE operated < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+
+	UPDATE  tmp.duaToDelete tm
+		JOIN vn.dms d ON d.id = tm.gestdocFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE d
+		FROM tmp.duaToDelete tmp
+		JOIN vn.dua d ON d.id = tmp.id;
+
+	DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+
+	-- Borra los registros de collection y ticketcollection
+	DELETE FROM vn.collection  WHERE created < vDateShort;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
+	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
+	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
+
+	DELETE FROM travelLog WHERE creationDate < v3Month;
+
+	CALL shelving_clean;
+
+END$$
+DELIMITER ;
diff --git a/db/changes/230201/00-validPriorities_ItemConfig.sql b/db/changes/230201/00-validPriorities_ItemConfig.sql
index a793997d0..0b32d5de8 100644
--- a/db/changes/230201/00-validPriorities_ItemConfig.sql
+++ b/db/changes/230201/00-validPriorities_ItemConfig.sql
@@ -3,7 +3,3 @@ ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultT
 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');
diff --git a/db/changes/230202/00-itemConfig.sql b/db/changes/230202/00-itemConfig.sql
new file mode 100644
index 000000000..0b32d5de8
--- /dev/null
+++ b/db/changes/230202/00-itemConfig.sql
@@ -0,0 +1,5 @@
+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';
diff --git a/db/changes/230401/00-ACL_tag_update.sql b/db/changes/230401/00-ACL_tag_update.sql
new file mode 100644
index 000000000..3c103e990
--- /dev/null
+++ 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');
diff --git a/db/changes/230401/00-createWorker.sql b/db/changes/230401/00-createWorker.sql
new file mode 100644
index 000000000..7ca2c41ee
--- /dev/null
+++ 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;
+
diff --git a/db/changes/230401/00-ticket_canAdvance.sql b/db/changes/230401/00-ticket_canAdvance.sql
new file mode 100644
index 000000000..fd9d451bf
--- /dev/null
+++ 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 ;
diff --git a/db/changes/230401/00-updateIsToBeMailed.sql b/db/changes/230401/00-updateIsToBeMailed.sql
new file mode 100644
index 000000000..1bb177f57
--- /dev/null
+++ 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;
diff --git a/db/changes/230402/00-invoiceOut_getWeight.sql b/db/changes/230402/00-invoiceOut_getWeight.sql
new file mode 100644
index 000000000..4ca284857
--- /dev/null
+++ b/db/changes/230402/00-invoiceOut_getWeight.sql
@@ -0,0 +1,30 @@
+DROP FUNCTION IF EXISTS `vn`.`invoiceOut_getWeight`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceOut_getWeight`(vInvoice VARCHAR(15)) RETURNS decimal(10,2)
+    READS SQL DATA
+BEGIN
+/**
+ * Calcula el peso de una factura emitida
+ *
+ * @param vInvoice Id de la factura
+ * @return vTotalWeight peso de la factura
+ */
+	DECLARE vTotalWeight DECIMAL(10,2);
+
+	SELECT SUM(CAST(IFNULL(i.stems, 1)
+				* s.quantity
+				* IF(ic.grams, ic.grams, IFNULL(i.weightByPiece, 0)) / 1000 AS DECIMAL(10,2)))
+			INTO vTotalWeight
+		FROM ticket t
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemCost ic ON ic.itemFk = i.id
+				AND ic.warehouseFk = t.warehouseFk
+		WHERE t.refFk = vInvoice
+			AND i.intrastatFk;
+
+	RETURN vTotalWeight;
+END$$
+DELIMITER ;
diff --git a/db/changes/230403/00-clienteCompensado.sql b/db/changes/230403/00-clienteCompensado.sql
new file mode 100644
index 000000000..ff1982b93
--- /dev/null
+++ b/db/changes/230403/00-clienteCompensado.sql
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Client', 'getClientOrSupplierReference', 'READ', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/changes/230404/00-ticket_canAdvance.sql b/db/changes/230404/00-ticket_canAdvance.sql
new file mode 100644
index 000000000..d7386e9d1
--- /dev/null
+++ b/db/changes/230404/00-ticket_canAdvance.sql
@@ -0,0 +1,127 @@
+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 config;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+	CREATE TEMPORARY TABLE tmp.stock
+		(itemFk INT PRIMARY KEY,
+		amount INT)
+		ENGINE = MEMORY;
+
+	INSERT INTO tmp.stock(itemFk, amount)
+		SELECT itemFk, SUM(quantity) amount FROM
+		(
+			SELECT itemFk, quantity
+				FROM itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM itemEntryOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseOutFk = vWarehouseFk
+		) t
+		GROUP BY itemFk HAVING amount != 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+
+        SELECT
+                origin.ticketFk futureId,
+                dest.ticketFk id,
+                dest.state,
+                origin.futureState,
+                origin.futureIpt,
+                dest.ipt,
+                origin.workerFk,
+                origin.futureLiters,
+                origin.futureLines,
+                dest.shipped,
+                origin.shipped futureShipped,
+                dest.totalWithVat,
+                origin.totalWithVat futureTotalWithVat,
+                dest.agency,
+                origin.futureAgency,
+                dest.lines,
+                dest.liters,
+                origin.futureLines - origin.hasStock AS notMovableLines,
+                (origin.futureLines = origin.hasStock) AS isFullMovable
+            FROM (
+                    SELECT
+                            s.ticketFk,
+                            t.workerFk,
+                            t.shipped,
+                            t.totalWithVat,
+                            st.name futureState,
+                            t.addressFk,
+                            am.name futureAgency,
+                            count(s.id) futureLines,
+                            GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+                            SUM((s.quantity <= IFNULL(st.amount,0))) hasStock
+                        FROM ticket t
+                            JOIN sale s ON s.ticketFk = t.id
+                            JOIN saleVolume sv ON sv.saleFk = s.id
+                            JOIN item i ON i.id = s.itemFk
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state st ON st.id = ts.stateFk
+                            JOIN agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                            LEFT JOIN tmp.stock st ON st.itemFk = i.id
+                        WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+                            AND t.warehouseFk = vWarehouseFk
+                        GROUP BY t.id
+                ) origin
+                JOIN (
+                    SELECT
+                            t.id ticketFk,
+                            t.addressFk,
+                            st.name state,
+                            GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+                            t.shipped,
+                            t.totalWithVat,
+                            am.name agency,
+                            CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                            CAST(COUNT(*) AS DECIMAL(10,0)) `lines`
+                        FROM ticket t
+                            JOIN sale s ON s.ticketFk = t.id
+                            JOIN saleVolume sv ON sv.saleFk = s.id
+                            JOIN item i ON i.id = s.itemFk
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state st ON st.id = ts.stateFk
+                            JOIN agencyMode am ON t.agencyModeFk = am.id
+                            LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                        WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+                            AND t.warehouseFk = vWarehouseFk
+                            AND st.order <= 5
+                        GROUP BY t.id
+                ) dest ON dest.addressFk = origin.addressFk
+            WHERE origin.hasStock != 0;
+
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;
diff --git a/db/changes/230601/00-acl_notifications.sql b/db/changes/230601/00-acl_notifications.sql
new file mode 100644
index 000000000..ab40b16a5
--- /dev/null
+++ b/db/changes/230601/00-acl_notifications.sql
@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,principalId)
+	VALUES 
+	('NotificationSubscription','*','*','employee'),
+	('NotificationAcl','*','READ','employee');
diff --git a/db/changes/230601/00-itemConfig_warehouseFk.sql b/db/changes/230601/00-itemConfig_warehouseFk.sql
new file mode 100644
index 000000000..c860986d6
--- /dev/null
+++ b/db/changes/230601/00-itemConfig_warehouseFk.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `vn`.`itemConfig` ADD warehouseFk smallint(6) unsigned NULL;
+UPDATE `vn`.`itemConfig`
+	SET warehouseFk=60
+WHERE id=0;
diff --git a/db/changes/230601/00-uniqueKeyNotificationSubscription.sql b/db/changes/230601/00-uniqueKeyNotificationSubscription.sql
new file mode 100644
index 000000000..623ecf770
--- /dev/null
+++ b/db/changes/230601/00-uniqueKeyNotificationSubscription.sql
@@ -0,0 +1,4 @@
+ALTER TABLE
+    `util`.`notificationSubscription`
+ADD
+    CONSTRAINT `notificationSubscription_UN` UNIQUE KEY (`notificationFk`, `userFk`);
\ No newline at end of file
diff --git a/db/changes/230601/01-alter_notSubs.sql b/db/changes/230601/01-alter_notSubs.sql
new file mode 100644
index 000000000..07ea7c2bf
--- /dev/null
+++ b/db/changes/230601/01-alter_notSubs.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `util`.`notificationSubscription`
+ADD `id` int(11) auto_increment NULL,
+DROP PRIMARY KEY,
+ADD CONSTRAINT PRIMARY KEY (`id`);
+
+ALTER TABLE `util`.`notificationSubscription`
+ADD KEY `notificationSubscription_ibfk_1` (`notificationFk`);
diff --git a/db/changes/230401/.gitkeep b/db/changes/230801/.gitkeep
similarity index 100%
rename from db/changes/230401/.gitkeep
rename to db/changes/230801/.gitkeep
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 27e72708f..6f766f8ad 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2,7 +2,33 @@ CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
 UPDATE `util`.`config`
-    SET `environment`= 'test';
+    SET `environment`= 'development';
+
+-- FOR MOCK vn.time
+
+DROP PROCEDURE IF EXISTS `vn`.`mockVnTime`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`mockVnTime`()
+BEGIN
+
+		DECLARE vDate DATE;
+	SET vDate = '2000-01-01';
+
+	WHILE ( YEAR(vDate) <= 2002 ) DO
+	    INSERT IGNORE INTO vn.`time` (dated, period, `month`, `year`, `day`, week, yearMonth, salesYear)
+			VALUES (vDate, CONCAT(YEAR(vDate), (WEEK(vDate)+1)), MONTH(vDate), YEAR(vDate), DAY(vDate), WEEK(vDate)+1, CONCAT(YEAR(vDate), MONTH(vDate)), YEAR(vDate));
+
+	    SET vDate = DATE_ADD(vDate, INTERVAL 1 DAY);
+	END WHILE;
+
+END$$
+DELIMITER ;
+
+CALL `vn`.`mockVnTime`();
+DROP PROCEDURE IF EXISTS `vn`.`mockVnTime`;
+-- END MOCK vn.time
 
 ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1;
 ALTER TABLE `vn`.`address` AUTO_INCREMENT = 1;
@@ -691,7 +717,8 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
         (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
         (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE());
+        (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
+        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
@@ -934,10 +961,10 @@ INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`,
         (7,  2, 4, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),  1,  18, NULL,             94, NULL,NULL),
         (8,  3, 5, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),  1,  18, NULL,             94, 1,   NULL),
         (9,  3, 6, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  1,  18, NULL,             94, 2,   NULL),
-        (10, 7, 7, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
-        (11, 7, 8, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
-        (12, 7, 9, 71, NOW(),                                           1,  18, NULL,             94, 3,   NULL),
-        (13, 1, 10,71, NOW(),                                           1,  18, NULL,             94, 3,   NULL);
+        (10, 7, 7, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (11, 7, 8, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (12, 7, 9, 71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL),
+        (13, 1, 10,71, util.VN_NOW(),                                           1,  18, NULL,             94, 3,   NULL);
 
 
 INSERT INTO `vn`.`expeditionState`(`id`, `created`, `expeditionFk`, `typeFk`, `userFk`)
@@ -993,7 +1020,9 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE());
+        (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
+        (39, 1, 32,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
     VALUES
@@ -1910,7 +1939,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
     ENGINE = MEMORY
-    SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL +1 YEAR)), '-12-25'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+    SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)), '-12-25') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`;
 
 INSERT INTO `vn`.`business`(`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`,  `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
@@ -1920,7 +1949,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
     ENGINE = MEMORY
-    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)) as ended, '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`
 			WHERE `w`.`id` = 1109;
 
@@ -1954,10 +1983,6 @@ INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`
         (100,   'INDEFINIDO A TIEMPO COMPLETO',                     1, 1, 1),
         (109,   'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO',  1, 1, 1);
 
-INSERT INTO `vn`.`businessCategory` (`id`, `description`, `rate`)
-    VALUES
-        (1, 'basic employee', 1);
-
 UPDATE `vn`.`business` b
     SET `rate` = 7,
         `workerBusinessCategoryFk` = 1,
@@ -2629,7 +2654,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`)
@@ -2705,7 +2730,10 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
     VALUES
         (1, 1109),
         (1, 1110),
-        (3, 1109);
+        (3, 1109),
+	    (1,9),
+        (1,3);
+
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
@@ -2719,9 +2747,9 @@ 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`)
+INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`, `warehouseFk`)
     VALUES
-        (0, 0, 24, '', '[1,2,3]', 2, 56);
+        (0, 0, 24, '', '[1,2,3]', 2, 56, 60);
 
 INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
     VALUES
@@ -2751,10 +2779,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
@@ -2765,3 +2797,7 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);
 
+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
+    VALUES
+        (1, NULL, 1);
+
diff --git a/db/dump/mockDate.sql b/db/dump/mockDate.sql
index c63c2d76c..937da071c 100644
--- a/db/dump/mockDate.sql
+++ b/db/dump/mockDate.sql
@@ -3,18 +3,17 @@ USE `util`;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`mockedDate`;
-CREATE FUNCTION `util`.`mockedDate`() 
+CREATE FUNCTION `util`.`mockedDate`()
 RETURNS DATETIME
 DETERMINISTIC
 BEGIN
-    RETURN NOW();
-    -- '2022-01-19 08:00:00'
+    RETURN CONVERT_TZ('2001-01-01 11:00:00', 'utc', 'Europe/Madrid');
 END ;;
 DELIMITER ;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`VN_CURDATE`;
-CREATE FUNCTION `util`.`VN_CURDATE`() 
+CREATE FUNCTION `util`.`VN_CURDATE`()
 RETURNS DATE
 DETERMINISTIC
 BEGIN
@@ -24,7 +23,7 @@ DELIMITER ;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`VN_CURTIME`;
-CREATE FUNCTION `util`.`VN_CURTIME`() 
+CREATE FUNCTION `util`.`VN_CURTIME`()
 RETURNS TIME
 DETERMINISTIC
 BEGIN
@@ -34,10 +33,10 @@ DELIMITER ;
 
 DELIMITER ;;
 DROP FUNCTION IF EXISTS `util`.`VN_NOW`;
-CREATE FUNCTION `util`.`VN_NOW`() 
+CREATE FUNCTION `util`.`VN_NOW`()
 RETURNS DATETIME
 DETERMINISTIC
 BEGIN
-    RETURN mockedDate(); 
+    RETURN mockedDate();
 END ;;
-DELIMITER ;
\ No newline at end of file
+DELIMITER ;
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 772d6055d..3186fa01f 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -26286,6 +26286,7 @@ CREATE TABLE `entry` (
   `typeFk` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT 'Tipo de entrada',
   `reference` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT 'Referencia para eti',
   `ref` varchar(50) GENERATED ALWAYS AS (`invoiceNumber`) VIRTUAL COMMENT 'Columna virtual provisional para Salix',
+  `observationEditorFk` INT(10) unsigned NULL COMMENT 'Último usuario que ha modificado el campo evaNotes',
   PRIMARY KEY (`id`),
   KEY `Id_Proveedor` (`supplierFk`),
   KEY `Fecha` (`dated`),
@@ -26300,7 +26301,8 @@ CREATE TABLE `entry` (
   CONSTRAINT `entry_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `entryType` (`code`) ON UPDATE CASCADE,
   CONSTRAINT `entry_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `entry_ibfk_6` FOREIGN KEY (`travelFk`) REFERENCES `travel` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `entry_ibfk_7` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
+  CONSTRAINT `entry_ibfk_7` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `entry_observationEditorFk` FOREIGN KEY (`observationEditorFk`) REFERENCES `account`.`user`(`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -80203,4 +80205,3 @@ USE `vncontrol`;
 -- Dump completed on 2022-11-21  7:57:28
 
 
-
diff --git a/db/tests/vn/buyUltimate.spec.js b/db/tests/vn/buyUltimate.spec.js
index e0b3fa568..4c98945c1 100644
--- a/db/tests/vn/buyUltimate.spec.js
+++ b/db/tests/vn/buyUltimate.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('buyUltimate()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it(`should create buyUltimate temporal table and update it's values`, async() => {
         let stmts = [];
         let stmt;
diff --git a/db/tests/vn/buyUltimateFromInterval.spec.js b/db/tests/vn/buyUltimateFromInterval.spec.js
index b5e6970f7..7a4a79d47 100644
--- a/db/tests/vn/buyUltimateFromInterval.spec.js
+++ b/db/tests/vn/buyUltimateFromInterval.spec.js
@@ -5,7 +5,7 @@ describe('buyUltimateFromInterval()', () => {
     let today;
     let future;
     beforeAll(() => {
-        let now = new Date();
+        let now = Date.vnNew();
         now.setHours(0, 0, 0, 0);
         today = now;
 
diff --git a/db/tests/vn/ticketCalculateClon.spec.js b/db/tests/vn/ticketCalculateClon.spec.js
index 03814682d..a3c790492 100644
--- a/db/tests/vn/ticketCalculateClon.spec.js
+++ b/db/tests/vn/ticketCalculateClon.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('ticket ticketCalculateClon()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it('should add the ticket to the order containing the original ticket', async() => {
         let stmts = [];
         let stmt;
diff --git a/db/tests/vn/ticketCreateWithUser.spec.js b/db/tests/vn/ticketCreateWithUser.spec.js
index 1c13be1b3..4aeece564 100644
--- a/db/tests/vn/ticketCreateWithUser.spec.js
+++ b/db/tests/vn/ticketCreateWithUser.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('ticket ticketCreateWithUser()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it('should confirm the procedure creates the expected ticket', async() => {
         let stmts = [];
         let stmt;
diff --git a/db/tests/vn/timeBusiness_calculateByUser.spec.js b/db/tests/vn/timeBusiness_calculateByUser.spec.js
index 441f567ac..5fe51d8f8 100644
--- a/db/tests/vn/timeBusiness_calculateByUser.spec.js
+++ b/db/tests/vn/timeBusiness_calculateByUser.spec.js
@@ -3,9 +3,9 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('timeBusiness_calculateByUser()', () => {
     it('should return the expected hours for today', async() => {
-        let start = new Date();
+        let start = Date.vnNew();
         start.setHours(0, 0, 0, 0);
-        let end = new Date();
+        let end = Date.vnNew();
         end.setHours(0, 0, 0, 0);
 
         let stmts = [];
diff --git a/db/tests/vn/timeControl_calculateByUser.spec.js b/db/tests/vn/timeControl_calculateByUser.spec.js
index 2aa16c7a4..73e00ec3a 100644
--- a/db/tests/vn/timeControl_calculateByUser.spec.js
+++ b/db/tests/vn/timeControl_calculateByUser.spec.js
@@ -3,11 +3,11 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 describe('timeControl_calculateByUser()', () => {
     it(`should return today's worked hours`, async() => {
-        let start = new Date();
+        let start = Date.vnNew();
         start.setHours(0, 0, 0, 0);
         start.setDate(start.getDate() - 1);
 
-        let end = new Date();
+        let end = Date.vnNew();
         end.setHours(0, 0, 0, 0);
         end.setDate(end.getDate() + 1);
 
@@ -17,7 +17,7 @@ describe('timeControl_calculateByUser()', () => {
         stmts.push('START TRANSACTION');
 
         stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS 
+            DROP TEMPORARY TABLE IF EXISTS
                 tmp.timeControlCalculate,
                 tmp.timeBusinessCalculate
         `);
@@ -48,14 +48,14 @@ describe('timeControl_calculateByUser()', () => {
     });
 
     it(`should return the worked hours between last sunday and monday`, async() => {
-        let lastSunday = new Date();
+        let lastSunday = Date.vnNew();
         let daysSinceSunday = lastSunday.getDay();
         if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
             daysSinceSunday = 7;
         lastSunday.setHours(23, 0, 0, 0);
         lastSunday.setDate(lastSunday.getDate() - daysSinceSunday);
 
-        let monday = new Date();
+        let monday = Date.vnNew();
         let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday)
         monday.setHours(7, 0, 0, 0);
         monday.setDate(monday.getDate() - daysSinceMonday);
@@ -66,7 +66,7 @@ describe('timeControl_calculateByUser()', () => {
         stmts.push('START TRANSACTION');
 
         stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS 
+            DROP TEMPORARY TABLE IF EXISTS
                 tmp.timeControlCalculate,
                 tmp.timeBusinessCalculate
         `);
diff --git a/db/tests/vn/zone_getLanded.spec.js b/db/tests/vn/zone_getLanded.spec.js
index 5f82156d3..888d7c132 100644
--- a/db/tests/vn/zone_getLanded.spec.js
+++ b/db/tests/vn/zone_getLanded.spec.js
@@ -6,7 +6,7 @@ describe('zone zone_getLanded()', () => {
         let stmts = [];
         let stmt;
         stmts.push('START TRANSACTION');
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         let params = {
@@ -40,7 +40,7 @@ describe('zone zone_getLanded()', () => {
     it(`should return data for a shipped tomorrow`, async() => {
         let stmts = [];
         let stmt;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         stmts.push('START TRANSACTION');
diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 7bf56e2c8..7d80c69ee 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -436,7 +436,7 @@ let actions = {
     },
 
     pickDate: async function(selector, date) {
-        date = date || new Date();
+        date = date || Date.vnNew();
 
         const timeZoneOffset = date.getTimezoneOffset() * 60000;
         const localDate = (new Date(date.getTime() - timeZoneOffset))
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index e9d9d0580..efaa13ee3 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -31,7 +31,7 @@ export default {
     },
     recoverPassword: {
         recoverPasswordButton: 'vn-login a[ui-sref="recover-password"]',
-        email: 'vn-recover-password vn-textfield[ng-model="$ctrl.email"]',
+        email: 'vn-recover-password vn-textfield[ng-model="$ctrl.user"]',
         sendEmailButton: 'vn-recover-password vn-submit',
     },
     accountIndex: {
@@ -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"]',
@@ -561,15 +562,15 @@ export default {
         payoutBank: '.vn-dialog vn-autocomplete[ng-model="$ctrl.bankFk"]',
         payoutDescription: 'vn-textfield[ng-model="$ctrl.receipt.description"]',
         submitPayout: '.vn-dialog button[response="accept"]',
-        searchWeeklyResult: 'vn-ticket-weekly-index vn-table vn-tbody > vn-tr',
+        searchWeeklyResult: 'vn-ticket-weekly-index vn-card smart-table slot-table table tbody tr',
         searchResultDate: 'vn-ticket-summary [label=Landed] span',
         topbarSearch: 'vn-searchbar',
         moreMenu: 'vn-ticket-index vn-icon-button[icon=more_vert]',
-        fourthWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tbody vn-tr:nth-child(4)',
-        fiveWeeklyTicket: 'vn-ticket-weekly-index vn-table vn-tbody vn-tr:nth-child(5)',
-        weeklyTicket: 'vn-ticket-weekly-index vn-table > div > vn-tbody > vn-tr',
-        firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-tr:nth-child(1) vn-icon-button[icon="delete"]',
-        firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-tr:nth-child(1) [ng-model="weekly.agencyModeFk"]',
+        fourthWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(4)',
+        fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)',
+        weeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table table tbody tr',
+        firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(1) vn-icon-button[icon="delete"]',
+        firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(1) [ng-model="weekly.agencyModeFk"]',
         acceptDeleteTurn: '.vn-confirm.shown button[response="accept"]'
     },
     createTicketView: {
@@ -777,18 +778,16 @@ export default {
         ipt: 'vn-autocomplete[label="Destination IPT"]',
         tableIpt: 'vn-autocomplete[name="ipt"]',
         tableFutureIpt: 'vn-autocomplete[name="futureIpt"]',
-        futureState: 'vn-autocomplete[label="Origin Grouped State"]',
-        state: 'vn-autocomplete[label="Destination Grouped State"]',
+        isFullMovable: 'vn-check[ng-model="filter.isFullMovable"]',
         warehouseFk: 'vn-autocomplete[label="Warehouse"]',
         tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
         moveButton: 'vn-button[vn-tooltip="Advance tickets"]',
         acceptButton: '.vn-confirm.shown button[response="accept"]',
-        multiCheck: 'vn-multi-check',
+        firstCheck: 'tbody > tr:nth-child(1) > td > vn-check',
         tableId: 'vn-textfield[name="id"]',
         tableFutureId: 'vn-textfield[name="futureId"]',
         tableLiters: 'vn-textfield[name="liters"]',
         tableLines: 'vn-textfield[name="lines"]',
-        tableStock: 'vn-textfield[name="hasStock"]',
         submit: 'vn-submit[label="Search"]',
         table: 'tbody > tr:not(.empty-rows)'
     },
@@ -943,9 +942,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',
 
@@ -969,6 +968,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',
@@ -1021,6 +1021,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',
@@ -1239,6 +1258,21 @@ export default {
         importBuysButton: 'vn-entry-buy-import button[type="submit"]'
     },
     entryLatestBuys: {
+        table: 'tbody > tr:not(.empty-rows)',
+        chip: 'vn-chip > vn-icon',
+        generalSearchInput: 'vn-textfield[ng-model="$ctrl.filter.search"]',
+        firstReignIcon: 'vn-horizontal.item-category  vn-one',
+        typeInput: 'vn-autocomplete[ng-model="$ctrl.filter.typeFk"]',
+        salesPersonInput: 'vn-autocomplete[ng-model="$ctrl.filter.salesPersonFk"]',
+        supplierInput: 'vn-autocomplete[ng-model="$ctrl.filter.supplierFk"]',
+        fromInput: 'vn-date-picker[ng-model="$ctrl.filter.from"]',
+        toInput: 'vn-date-picker[ng-model="$ctrl.filter.to"]',
+        activeCheck: 'vn-check[ng-model="$ctrl.filter.active"]',
+        floramondoCheck: 'vn-check[ng-model="$ctrl.filter.floramondo"]',
+        visibleCheck: 'vn-check[ng-model="$ctrl.filter.visible"]',
+        addTagButton: 'vn-icon-button[vn-tooltip="Add tag"]',
+        itemTagInput: 'vn-autocomplete[ng-model="itemTag.tagFk"]',
+        itemTagValueInput: 'vn-autocomplete[ng-model="itemTag.value"]',
         firstBuy: 'vn-entry-latest-buys tbody > tr:nth-child(1)',
         allBuysCheckBox: 'vn-entry-latest-buys thead vn-check',
         secondBuyCheckBox: 'vn-entry-latest-buys tbody tr:nth-child(2) vn-check[ng-model="buy.checked"]',
diff --git a/e2e/helpers/tests.js b/e2e/helpers/tests.js
index aac9963dd..992ec051f 100644
--- a/e2e/helpers/tests.js
+++ b/e2e/helpers/tests.js
@@ -1,6 +1,7 @@
 require('@babel/register')({presets: ['@babel/env']});
 require('core-js/stable');
 require('regenerator-runtime/runtime');
+require('vn-loopback/server/boot/date')();
 
 const axios = require('axios');
 const Docker = require('../../db/docker.js');
diff --git a/e2e/paths/01-salix/04_recoverPassword.spec.js b/e2e/paths/01-salix/04_recoverPassword.spec.js
index e6cb02ab1..aa0389648 100644
--- a/e2e/paths/01-salix/04_recoverPassword.spec.js
+++ b/e2e/paths/01-salix/04_recoverPassword.spec.js
@@ -26,7 +26,7 @@ describe('RecoverPassword path', async() => {
         expect(message.text).toContain('Notification sent!');
     });
 
-    it('should send email', async() => {
+    it('should send email using email', async() => {
         await page.waitForState('login');
         await page.waitToClick(selectors.recoverPassword.recoverPasswordButton);
 
@@ -37,4 +37,16 @@ describe('RecoverPassword path', async() => {
 
         expect(message.text).toContain('Notification sent!');
     });
+
+    it('should send email using username', async() => {
+        await page.waitForState('login');
+        await page.waitToClick(selectors.recoverPassword.recoverPasswordButton);
+
+        await page.write(selectors.recoverPassword.email, 'BruceWayne');
+        await page.waitToClick(selectors.recoverPassword.sendEmailButton);
+        const message = await page.waitForSnackbar();
+        await page.waitForState('login');
+
+        expect(message.text).toContain('Notification sent!');
+    });
 });
diff --git a/e2e/paths/02-client/20_credit_insurance.spec.js b/e2e/paths/02-client/20_credit_insurance.spec.js
index 904a51145..a4f148b8f 100644
--- a/e2e/paths/02-client/20_credit_insurance.spec.js
+++ b/e2e/paths/02-client/20_credit_insurance.spec.js
@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Client credit insurance path', () => {
     let browser;
     let page;
-    let previousMonth = new Date();
+    let previousMonth = Date.vnNew();
     previousMonth.setMonth(previousMonth.getMonth() - 1);
 
     beforeAll(async() => {
diff --git a/e2e/paths/03-worker/04_time_control.spec.js b/e2e/paths/03-worker/04_time_control.spec.js
index bba7ced89..eb1417ba9 100644
--- a/e2e/paths/03-worker/04_time_control.spec.js
+++ b/e2e/paths/03-worker/04_time_control.spec.js
@@ -22,7 +22,8 @@ describe('Worker time control path', () => {
     const hankPymId = 1107;
 
     it('should go to the next month, go to current month and go 1 month in the past', async() => {
-        let date = new Date();
+        let date = Date.vnNew();
+        date.setDate(1);
         date.setMonth(date.getMonth() + 1);
         let month = date.toLocaleString('default', {month: 'long'});
 
@@ -31,7 +32,8 @@ describe('Worker time control path', () => {
 
         expect(result).toContain(month);
 
-        date = new Date();
+        date = Date.vnNew();
+        date.setDate(1);
         month = date.toLocaleString('default', {month: 'long'});
 
         await page.click(selectors.workerTimeControl.previousMonthButton);
@@ -39,7 +41,8 @@ describe('Worker time control path', () => {
 
         expect(result).toContain(month);
 
-        date = new Date();
+        date = Date.vnNew();
+        date.setDate(1);
         date.setMonth(date.getMonth() - 1);
         const timestamp = Math.round(date.getTime() / 1000);
         month = date.toLocaleString('default', {month: 'long'});
diff --git a/e2e/paths/03-worker/05_calendar.spec.js b/e2e/paths/03-worker/05_calendar.spec.js
index c310baf5a..f0af0a053 100644
--- a/e2e/paths/03-worker/05_calendar.spec.js
+++ b/e2e/paths/03-worker/05_calendar.spec.js
@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 
 describe('Worker calendar path', () => {
     const reasonableTimeBetweenClicks = 300;
-    const date = new Date();
+    const date = Date.vnNew();
     const lastYear = (date.getFullYear() - 1).toString();
 
     let browser;
diff --git a/e2e/paths/03-worker/06_create.spec.js b/e2e/paths/03-worker/06_create.spec.js
new file mode 100644
index 000000000..5f6f5cf9f
--- /dev/null
+++ 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!');
+    });
+});
diff --git a/e2e/paths/04-item/13_fixedPrice.spec.js b/e2e/paths/04-item/13_fixedPrice.spec.js
index 40ccc009e..1b0f82d83 100644
--- a/e2e/paths/04-item/13_fixedPrice.spec.js
+++ b/e2e/paths/04-item/13_fixedPrice.spec.js
@@ -22,7 +22,7 @@ describe('Item fixed prices path', () => {
     });
 
     it('should fill the fixed price data', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
         await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
         await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');
diff --git a/e2e/paths/05-ticket/06_basic_data_steps.spec.js b/e2e/paths/05-ticket/06_basic_data_steps.spec.js
index fa901e325..55aec45fb 100644
--- a/e2e/paths/05-ticket/06_basic_data_steps.spec.js
+++ b/e2e/paths/05-ticket/06_basic_data_steps.spec.js
@@ -93,7 +93,7 @@ describe('Ticket Edit basic data path', () => {
 
     it(`should split ticket without negatives`, async() => {
         const newAgency = 'Gotham247';
-        const newDate = new Date();
+        const newDate = Date.vnNew();
         newDate.setDate(newDate.getDate() - 1);
 
         await page.accessToSearchResult('14');
@@ -127,7 +127,7 @@ describe('Ticket Edit basic data path', () => {
     });
 
     it(`should old ticket have old date and agency`, async() => {
-        const oldDate = new Date();
+        const oldDate = Date.vnNew();
         const oldAgency = 'Super-Man delivery';
 
         await page.accessToSearchResult('14');
diff --git a/e2e/paths/05-ticket/14_create_ticket.spec.js b/e2e/paths/05-ticket/14_create_ticket.spec.js
index 48b4ebdd0..80c288a01 100644
--- a/e2e/paths/05-ticket/14_create_ticket.spec.js
+++ b/e2e/paths/05-ticket/14_create_ticket.spec.js
@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Ticket create path', () => {
     let browser;
     let page;
-    let nextMonth = new Date();
+    let nextMonth = Date.vnNew();
     nextMonth.setMonth(nextMonth.getMonth() + 1);
 
     beforeAll(async() => {
diff --git a/e2e/paths/05-ticket/16_summary.spec.js b/e2e/paths/05-ticket/16_summary.spec.js
index 960998c7d..a6017e454 100644
--- a/e2e/paths/05-ticket/16_summary.spec.js
+++ b/e2e/paths/05-ticket/16_summary.spec.js
@@ -55,7 +55,7 @@ describe('Ticket Summary path', () => {
         let result = await page
             .waitToGetProperty(selectors.ticketSummary.firstSaleItemId, 'innerText');
 
-        expect(result).toContain('000002');
+        expect(result).toContain('2');
     });
 
     it(`should click on the first sale ID to make the item descriptor visible`, async() => {
diff --git a/e2e/paths/05-ticket/18_index_payout.spec.js b/e2e/paths/05-ticket/18_index_payout.spec.js
index 220dacf61..89b5937a1 100644
--- a/e2e/paths/05-ticket/18_index_payout.spec.js
+++ b/e2e/paths/05-ticket/18_index_payout.spec.js
@@ -63,6 +63,6 @@ describe('Ticket index payout path', () => {
         const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
 
         expect(count).toEqual(4);
-        expect(reference).toContain('Cash, Albaran: 7, 8Payment');
+        expect(reference).toContain('Cash,Albaran: 7, 8Payment');
     });
 });
diff --git a/e2e/paths/05-ticket/22_advance.spec.js b/e2e/paths/05-ticket/22_advance.spec.js
index 6aaa81591..c92cd7a20 100644
--- a/e2e/paths/05-ticket/22_advance.spec.js
+++ b/e2e/paths/05-ticket/22_advance.spec.js
@@ -4,12 +4,17 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Ticket Advance path', () => {
     let browser;
     let page;
+    const httpRequests = [];
 
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('employee', 'ticket');
         await page.accessToSection('ticket.advance');
+        page.on('request', req => {
+            if (req.url().includes(`Tickets/getTicketsAdvance`))
+                httpRequests.push(req.url());
+        });
     });
 
     afterAll(async() => {
@@ -43,116 +48,74 @@ describe('Ticket Advance path', () => {
     it('should search with the required data', async() => {
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        expect(httpRequests.length).toBeGreaterThan(0);
     });
 
     it('should search with the origin IPT', async() => {
-        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.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.clearInput(selectors.ticketAdvance.ipt);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
-    it('should search with the destination IPT', async() => {
         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);
+
+        const request = httpRequests.find(req => req.includes(('futureIpt=H')));
+
+        expect(request).toBeDefined();
+
+        httpRequests.splice(httpRequests.indexOf(request), 1);
 
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
         await page.clearInput(selectors.ticketAdvance.futureIpt);
         await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
     });
 
-    it('should search with the origin grouped state', async() => {
+    it('should search with the destination IPT', async() => {
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.autocompleteSearch(selectors.ticketAdvance.futureState, 'Free');
+        await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'Horizontal');
         await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        const request = httpRequests.find(req => req.includes(('ipt=H')));
+
+        expect(request).toBeDefined();
+
+        httpRequests.splice(httpRequests.indexOf(request), 1);
 
         await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.clearInput(selectors.ticketAdvance.futureState);
+        await page.clearInput(selectors.ticketAdvance.ipt);
         await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
-    it('should search with the destination grouped state', async() => {
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.autocompleteSearch(selectors.ticketAdvance.state, 'Free');
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
-
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.clearInput(selectors.ticketAdvance.state);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
     });
 
     it('should search in smart-table with an IPT Origin', async() => {
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.autocompleteSearch(selectors.ticketAdvance.tableFutureIpt, 'Vertical');
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        const request = httpRequests.find(req => req.includes(('futureIpt')));
+
+        expect(request).toBeDefined();
+
+        httpRequests.splice(httpRequests.indexOf(request), 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 an IPT Destination', async() => {
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.autocompleteSearch(selectors.ticketAdvance.tableIpt, 'Vertical');
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        const request = httpRequests.find(req => req.includes(('ipt')));
+
+        expect(request).toBeDefined();
+
+        httpRequests.splice(httpRequests.indexOf(request), 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 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() => {
-        await page.waitToClick(selectors.ticketAdvance.multiCheck);
+    it('should check the first ticket and move to the present', async() => {
+        await page.waitToClick(selectors.ticketAdvance.firstCheck);
         await page.waitToClick(selectors.ticketAdvance.moveButton);
         await page.waitToClick(selectors.ticketAdvance.acceptButton);
         const message = await page.waitForSnackbar();
diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
index 00b021f88..758dc2ee3 100644
--- a/e2e/paths/06-claim/05_summary.spec.js
+++ b/e2e/paths/06-claim/05_summary.spec.js
@@ -45,7 +45,7 @@ describe('Claim summary path', () => {
     it('should display the claimed line(s)', async() => {
         const result = await page.waitToGetProperty(selectors.claimSummary.firstSaleItemId, 'innerText');
 
-        expect(result).toContain('000002');
+        expect(result).toContain('2');
     });
 
     it(`should click on the first sale ID making the item descriptor visible`, async() => {
diff --git a/e2e/paths/08-route/02_basic_data.spec.js b/e2e/paths/08-route/02_basic_data.spec.js
index b1440f2d1..ff8361499 100644
--- a/e2e/paths/08-route/02_basic_data.spec.js
+++ b/e2e/paths/08-route/02_basic_data.spec.js
@@ -18,7 +18,7 @@ describe('Route basic Data path', () => {
     });
 
     it('should edit the route basic data', async() => {
-        const nextMonth = new Date();
+        const nextMonth = Date.vnNew();
         nextMonth.setMonth(nextMonth.getMonth() + 1);
 
         await page.autocompleteSearch(selectors.routeBasicData.worker, 'adminBossNick');
diff --git a/e2e/paths/09-invoice-in/03_basic_data.spec.js b/e2e/paths/09-invoice-in/03_basic_data.spec.js
index 0a28ed191..778b5949c 100644
--- a/e2e/paths/09-invoice-in/03_basic_data.spec.js
+++ b/e2e/paths/09-invoice-in/03_basic_data.spec.js
@@ -19,7 +19,7 @@ describe('InvoiceIn basic data path', () => {
     });
 
     it(`should edit the invoiceIn basic data`, async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         await page.pickDate(selectors.invoiceInBasicData.issued, now);
         await page.pickDate(selectors.invoiceInBasicData.operated, now);
         await page.autocompleteSearch(selectors.invoiceInBasicData.supplier, 'Verdnatura');
diff --git a/e2e/paths/09-invoice-out/02_descriptor.spec.js b/e2e/paths/09-invoice-out/02_descriptor.spec.js
index 8d403e083..5169345bc 100644
--- a/e2e/paths/09-invoice-out/02_descriptor.spec.js
+++ b/e2e/paths/09-invoice-out/02_descriptor.spec.js
@@ -100,7 +100,7 @@ describe('InvoiceOut descriptor path', () => {
         });
 
         it(`should check the invoiceOut booked in the summary data`, async() => {
-            let today = new Date();
+            let today = Date.vnNew();
 
             let day = today.getDate();
             if (day < 10) day = `0${day}`;
diff --git a/e2e/paths/10-travel/01_create.spec.js b/e2e/paths/10-travel/01_create.spec.js
index e5d812ebd..15da42d5d 100644
--- a/e2e/paths/10-travel/01_create.spec.js
+++ b/e2e/paths/10-travel/01_create.spec.js
@@ -4,7 +4,7 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Travel create path', () => {
     let browser;
     let page;
-    const date = new Date();
+    const date = Date.vnNew();
     const day = 15;
     date.setDate(day);
 
diff --git a/e2e/paths/10-travel/02_basic_data_and_log.spec.js b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
index a231a70b2..341b38f59 100644
--- a/e2e/paths/10-travel/02_basic_data_and_log.spec.js
+++ b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
@@ -22,7 +22,7 @@ describe('Travel basic data path', () => {
     });
 
     it('should set a wrong delivery date then receive an error on submit', async() => {
-        const lastMonth = new Date();
+        const lastMonth = Date.vnNew();
         lastMonth.setMonth(lastMonth.getMonth() - 1);
 
         await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js
index f459ef043..77b26b676 100644
--- a/e2e/paths/10-travel/03_descriptor.spec.js
+++ b/e2e/paths/10-travel/03_descriptor.spec.js
@@ -123,7 +123,7 @@ describe('Travel descriptor path', () => {
     });
 
     it('should update the landed date to a future date to enable cloneWithEntries', async() => {
-        const nextMonth = new Date();
+        const nextMonth = Date.vnNew();
         nextMonth.setMonth(nextMonth.getMonth() + 1);
         await page.pickDate(selectors.travelBasicData.deliveryDate, nextMonth);
         await page.waitToClick(selectors.travelBasicData.save);
diff --git a/e2e/paths/12-entry/03_latestBuys.spec.js b/e2e/paths/12-entry/03_latestBuys.spec.js
index 553d41b95..a73e12659 100644
--- a/e2e/paths/12-entry/03_latestBuys.spec.js
+++ b/e2e/paths/12-entry/03_latestBuys.spec.js
@@ -4,10 +4,15 @@ import getBrowser from '../../helpers/puppeteer';
 describe('Entry lastest buys path', () => {
     let browser;
     let page;
+    const httpRequests = [];
 
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
+        page.on('request', req => {
+            if (req.url().includes(`Buys/latestBuysFilter`))
+                httpRequests.push(req.url());
+        });
         await page.loginAndModule('buyer', 'entry');
     });
 
@@ -20,6 +25,87 @@ describe('Entry lastest buys path', () => {
         await page.waitForSelector(selectors.entryLatestBuys.editBuysButton, {visible: false});
     });
 
+    it('should filter by name', async() => {
+        await page.write(selectors.entryLatestBuys.generalSearchInput, 'Melee');
+        await page.keyboard.press('Enter');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('search=Melee')))).toBeDefined();
+    });
+
+    it('should filter by reign and type', async() => {
+        await page.click(selectors.entryLatestBuys.firstReignIcon);
+        await page.autocompleteSearch(selectors.entryLatestBuys.typeInput, 'Alstroemeria');
+        await page.click(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('categoryFk')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('typeFk')))).toBeDefined();
+    });
+
+    it('should filter by from date', async() => {
+        await page.pickDate(selectors.entryLatestBuys.fromInput, new Date());
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('from')))).toBeDefined();
+    });
+
+    it('should filter by to date', async() => {
+        await page.pickDate(selectors.entryLatestBuys.toInput, new Date());
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('to')))).toBeDefined();
+    });
+
+    it('should filter by sales person', async() => {
+        await page.autocompleteSearch(selectors.entryLatestBuys.salesPersonInput, 'buyerNick');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('salesPersonFk')))).toBeDefined();
+    });
+
+    it('should filter by supplier', async() => {
+        await page.autocompleteSearch(selectors.entryLatestBuys.supplierInput, 'Farmer King');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('supplierFk')))).toBeDefined();
+    });
+
+    it('should filter by active', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.activeCheck);
+        await page.waitToClick(selectors.entryLatestBuys.activeCheck);
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('active=true')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('active=false')))).toBeDefined();
+    });
+
+    it('should filter by visible', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.visibleCheck);
+        await page.waitToClick(selectors.entryLatestBuys.visibleCheck);
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('visible=true')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('visible=false')))).toBeDefined();
+    });
+
+    it('should filter by floramondo', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.floramondoCheck);
+        await page.waitToClick(selectors.entryLatestBuys.floramondoCheck);
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('floramondo=true')))).toBeDefined();
+        expect(httpRequests.find(req => req.includes(('floramondo=false')))).toBeDefined();
+    });
+
+    it('should filter by tag Color', async() => {
+        await page.waitToClick(selectors.entryLatestBuys.addTagButton);
+        await page.autocompleteSearch(selectors.entryLatestBuys.itemTagInput, 'Color');
+        await page.autocompleteSearch(selectors.entryLatestBuys.itemTagValueInput, 'Brown');
+        await page.waitToClick(selectors.entryLatestBuys.chip);
+
+        expect(httpRequests.find(req => req.includes(('tags')))).toBeDefined();
+    });
+
     it('should select all lines but one and then check the edit buys button appears', async() => {
         await page.waitToClick(selectors.entryLatestBuys.allBuysCheckBox);
         await page.waitToClick(selectors.entryLatestBuys.secondBuyCheckBox);
diff --git a/front/core/components/button-menu/index.js b/front/core/components/button-menu/index.js
index c19962b08..e9e4e5ab7 100644
--- 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: '<?',
diff --git a/front/core/components/calendar/index.js b/front/core/components/calendar/index.js
index 85b51fd04..17ccbf041 100644
--- a/front/core/components/calendar/index.js
+++ b/front/core/components/calendar/index.js
@@ -15,7 +15,7 @@ export default class Calendar extends FormInput {
     constructor($element, $scope, vnWeekDays, moment) {
         super($element, $scope);
         this.weekDays = vnWeekDays.locales;
-        this.defaultDate = new Date();
+        this.defaultDate = Date.vnNew();
         this.displayControls = true;
         this.moment = moment;
     }
@@ -115,8 +115,8 @@ export default class Calendar extends FormInput {
         let wday = date.getDay();
         let month = date.getMonth();
 
-        const currentDay = new Date().getDate();
-        const currentMonth = new Date().getMonth();
+        const currentDay = Date.vnNew().getDate();
+        const currentMonth = Date.vnNew().getMonth();
 
         let classes = {
             today: day === currentDay && month === currentMonth,
diff --git a/front/core/components/calendar/index.spec.js b/front/core/components/calendar/index.spec.js
index e3a3b0f87..c4ad6f14b 100644
--- a/front/core/components/calendar/index.spec.js
+++ b/front/core/components/calendar/index.spec.js
@@ -2,7 +2,7 @@ describe('Component vnCalendar', () => {
     let controller;
     let $element;
 
-    let date = new Date();
+    let date = Date.vnNew();
     date.setHours(0, 0, 0, 0);
     date.setDate(1);
 
@@ -48,7 +48,7 @@ describe('Component vnCalendar', () => {
         it(`should return the selected element, then emit a 'selection' event`, () => {
             jest.spyOn(controller, 'emit');
 
-            const day = new Date();
+            const day = Date.vnNew();
             day.setHours(0, 0, 0, 0);
 
             const clickEvent = new Event('click');
diff --git a/front/core/components/crud-model/crud-model.js b/front/core/components/crud-model/crud-model.js
index 16b837d6a..421a79f9b 100644
--- 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) {
diff --git a/front/core/components/date-picker/index.spec.js b/front/core/components/date-picker/index.spec.js
index f76396311..13ab1d70a 100644
--- a/front/core/components/date-picker/index.spec.js
+++ b/front/core/components/date-picker/index.spec.js
@@ -4,7 +4,7 @@ describe('Component vnDatePicker', () => {
     let $ctrl;
 
     let today;
-    today = new Date();
+    today = Date.vnNew();
     today.setHours(0, 0, 0, 0);
 
     beforeEach(ngModule('vnCore'));
diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss
index 9012b8c4c..0d539b029 100644
--- a/front/core/components/field/style.scss
+++ b/front/core/components/field/style.scss
@@ -82,8 +82,6 @@
                     }
                     &[type=time],
                     &[type=date] {
-                        clip-path: inset(0 20px 0 0);
-
                         &::-webkit-inner-spin-button,
                         &::-webkit-clear-button {
                             display: none;
@@ -99,7 +97,7 @@
                     }
                     &[type=number] {
                         -moz-appearance: textfield;
-    
+
                         &::-webkit-outer-spin-button,
                         &::-webkit-inner-spin-button {
                             -webkit-appearance: none;
diff --git a/front/core/components/input-time/index.js b/front/core/components/input-time/index.js
index 0d01fbd32..67fa9d6fd 100644
--- a/front/core/components/input-time/index.js
+++ b/front/core/components/input-time/index.js
@@ -31,7 +31,7 @@ export default class InputTime extends Field {
 
             date = this.modelDate
                 ? new Date(this.modelDate)
-                : new Date();
+                : Date.vnNew();
             date.setHours(split[0], split[1], 0, 0);
         }
 
diff --git a/front/core/components/input-time/index.spec.js b/front/core/components/input-time/index.spec.js
index abb684df8..7b4f1c823 100644
--- a/front/core/components/input-time/index.spec.js
+++ b/front/core/components/input-time/index.spec.js
@@ -20,7 +20,7 @@ describe('Component vnInputTime', () => {
 
     describe('field() setter', () => {
         it(`should display the formated the date`, () => {
-            let date = new Date();
+            let date = Date.vnNew();
             $ctrl.field = date;
             let displayed = $filter('date')(date, 'HH:mm');
 
diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js
index 770dcdf32..ad9883950 100644
--- a/front/core/components/smart-table/index.js
+++ b/front/core/components/smart-table/index.js
@@ -478,8 +478,8 @@ export default class SmartTable extends Component {
 
         const params = {q: JSON.stringify(stateFilter)};
 
-        this.$state.go(this.$state.current.name, params, {location: 'replace'});
-        this.refresh();
+        this.$state.go(this.$state.current.name, params, {location: 'replace'})
+            .then(() => this.refresh());
     }
 
     applySort() {
@@ -499,8 +499,8 @@ export default class SmartTable extends Component {
         stateFilter.tableOrder = order;
 
         const params = {q: JSON.stringify(stateFilter)};
-        this.$state.go(this.$state.current.name, params, {location: 'replace'});
-        this.refresh();
+        this.$state.go(this.$state.current.name, params, {location: 'replace'})
+            .then(() => this.refresh());
     }
 
     filterSanitizer(field) {
@@ -589,7 +589,7 @@ export default class SmartTable extends Component {
     refresh() {
         this.isRefreshing = true;
         this.model.refresh()
-            .then(() => this.isRefreshing = false);
+            .finally(() => this.isRefreshing = false);
     }
 }
 
diff --git a/front/core/components/smart-table/index.spec.js b/front/core/components/smart-table/index.spec.js
index 5fd4c33b7..5a1be98e1 100644
--- a/front/core/components/smart-table/index.spec.js
+++ b/front/core/components/smart-table/index.spec.js
@@ -160,7 +160,7 @@ describe('Component smartTable', () => {
     describe('applySort()', () => {
         it('should call the $state go and model refresh without making changes on the model order', () => {
             controller.$state = {
-                go: jest.fn(),
+                go: jest.fn().mockReturnValue(new Promise(resolve => resolve())),
                 current: {
                     name: 'section'
                 }
@@ -171,13 +171,12 @@ describe('Component smartTable', () => {
 
             expect(controller.model.order).toBeUndefined();
             expect(controller.$state.go).toHaveBeenCalled();
-            expect(controller.refresh).toHaveBeenCalled();
         });
 
         it('should call the $state go and model refresh after setting model order according to the controller sortCriteria', () => {
             const orderBy = {field: 'myField', sortType: 'ASC'};
             controller.$state = {
-                go: jest.fn(),
+                go: jest.fn().mockReturnValue(new Promise(resolve => resolve())),
                 current: {
                     name: 'section'
                 }
@@ -190,7 +189,6 @@ describe('Component smartTable', () => {
 
             expect(controller.model.order).toEqual(`${orderBy.field} ${orderBy.sortType}`);
             expect(controller.$state.go).toHaveBeenCalled();
-            expect(controller.refresh).toHaveBeenCalled();
         });
     });
 
@@ -293,12 +291,10 @@ describe('Component smartTable', () => {
             controller.$inputsScope = {
                 searchProps: {}
             };
-            jest.spyOn(controller, 'refresh');
 
             controller.defaultFilter();
 
             expect(controller.model.addFilter).toHaveBeenCalled();
-            expect(controller.refresh).toHaveBeenCalled();
         });
     });
 
diff --git a/front/core/filters/index.js b/front/core/filters/index.js
index 2c3f77ebe..6097a18a1 100644
--- a/front/core/filters/index.js
+++ b/front/core/filters/index.js
@@ -3,5 +3,4 @@ import './ucwords';
 import './dash-if-empty';
 import './percentage';
 import './currency';
-import './zero-fill';
 import './id';
diff --git a/front/core/filters/specs/zero-fill.spec.js b/front/core/filters/specs/zero-fill.spec.js
deleted file mode 100644
index 97f04c655..000000000
--- a/front/core/filters/specs/zero-fill.spec.js
+++ /dev/null
@@ -1,25 +0,0 @@
-describe('ZeroFill filter', () => {
-    let zeroFillFilter;
-
-    beforeEach(ngModule('vnCore'));
-
-    beforeEach(inject(_zeroFillFilter_ => {
-        zeroFillFilter = _zeroFillFilter_;
-    }));
-
-    it('should return null for a input null', () => {
-        expect(zeroFillFilter(null, null)).toBeNull();
-    });
-
-    it('should return a positive number pads a number with five zeros', () => {
-        expect(zeroFillFilter(1, 5)).toBe('00001');
-    });
-
-    it('should return negative number pads a number with five zeros', () => {
-        expect(zeroFillFilter(-1, 5)).toBe('-00001');
-    });
-
-    it('should return zero number with zero zeros', () => {
-        expect(zeroFillFilter(0, 1)).toBe('0');
-    });
-});
diff --git a/front/core/filters/zero-fill.js b/front/core/filters/zero-fill.js
deleted file mode 100644
index c4d76b96f..000000000
--- a/front/core/filters/zero-fill.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import ngModule from '../module';
-
-/**
- * Pads a number with zeros.
- *
- * @param {Number} input The number to pad
- * @param {Number} padLength The resulting number of digits
- * @return {String} The zero-filled number
- */
-export default function zeroFill() {
-    return function(input, padLength) {
-        if (input == null) return input;
-        let sign = Math.sign(input) === -1 ? '-' : '';
-        return sign + new Array(padLength).concat([Math.abs(input)]).join('0').slice(-padLength);
-    };
-}
-ngModule.filter('zeroFill', zeroFill);
diff --git a/front/core/services/date.js b/front/core/services/date.js
new file mode 100644
index 000000000..120297951
--- /dev/null
+++ b/front/core/services/date.js
@@ -0,0 +1,2 @@
+import * as date from 'vn-loopback/server/boot/date';
+date.default();
diff --git a/front/core/services/index.js b/front/core/services/index.js
index ff1d438ed..867a13df0 100644
--- a/front/core/services/index.js
+++ b/front/core/services/index.js
@@ -10,3 +10,4 @@ import './week-days';
 import './report';
 import './email';
 import './file';
+import './date';
diff --git a/front/salix/components/instance-log/index.html b/front/salix/components/instance-log/index.html
index 354e81080..9794f75c2 100644
--- a/front/salix/components/instance-log/index.html
+++ b/front/salix/components/instance-log/index.html
@@ -1,8 +1,8 @@
-
 <vn-dialog
     vn-id="instanceLog">
     <tpl-body>
         <vn-log
+            class="vn-instance-log"
             url="{{$ctrl.url}}"
             origin-id="$ctrl.originId"
             changed-model="$ctrl.changedModel"
diff --git a/front/salix/components/instance-log/style.scss b/front/salix/components/instance-log/style.scss
index 70cbc52dd..f355e0ac8 100644
--- a/front/salix/components/instance-log/style.scss
+++ b/front/salix/components/instance-log/style.scss
@@ -1,13 +1,9 @@
-.vn-dialog {
-    & > .window:not(:has(.empty-rows)) {
-        width:60%;
-        vn-log {
-            vn-card {
-                visibility: hidden;
-                & > * {
-                    visibility: visible;
-                }
-            }
+vn-log.vn-instance-log {
+    vn-card {
+        width: 900px;
+        visibility: hidden;
+        & > * {
+            visibility: visible;
         }
     }
 }
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index bc943996d..68cd5a047 100644
--- 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;
             }
         }
     }
diff --git a/front/salix/components/recover-password/index.html b/front/salix/components/recover-password/index.html
index 73f5401d9..5121f81bd 100644
--- a/front/salix/components/recover-password/index.html
+++ b/front/salix/components/recover-password/index.html
@@ -1,7 +1,7 @@
 <h5 class="vn-mb-md vn-mt-lg" translate>Recover password</h5>
 <vn-textfield
-    label="Email"
-    ng-model="$ctrl.email"
+    label="User or recovery email"
+    ng-model="$ctrl.user"
     vn-focus>
 </vn-textfield>
 <div
diff --git a/front/salix/components/recover-password/index.js b/front/salix/components/recover-password/index.js
index 3de7f3266..a3f26ec64 100644
--- a/front/salix/components/recover-password/index.js
+++ b/front/salix/components/recover-password/index.js
@@ -20,7 +20,7 @@ export default class Controller {
 
     submit() {
         const params = {
-            email: this.email
+            user: this.user
         };
 
         this.$http.post('Accounts/recoverPassword', params)
diff --git a/front/salix/components/recover-password/locale/es.yml b/front/salix/components/recover-password/locale/es.yml
index b71c71415..69777fa65 100644
--- a/front/salix/components/recover-password/locale/es.yml
+++ b/front/salix/components/recover-password/locale/es.yml
@@ -1,3 +1,4 @@
 Recover password: Recuperar contraseña
 We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
 Notification sent!: ¡Notificación enviada!
+User or recovery email: Usuario o correo de recuperación
diff --git a/front/salix/components/reset-password/locale/es.yml b/front/salix/components/reset-password/locale/es.yml
index 0771d5dc3..30893a152 100644
--- a/front/salix/components/reset-password/locale/es.yml
+++ b/front/salix/components/reset-password/locale/es.yml
@@ -1,6 +1,6 @@
 Reset password: Restrablecer contraseña
 New password: Nueva contraseña
-Repeat password: Repetir contraseñaç
+Repeat password: Repetir contraseña
 Password changed!: ¡Contraseña cambiada!
 Password requirements: >
     La contraseña debe tener al menos {{ length }} caracteres de longitud,
diff --git a/front/salix/components/upload-photo/index.js b/front/salix/components/upload-photo/index.js
index c47018307..fb115992f 100644
--- a/front/salix/components/upload-photo/index.js
+++ b/front/salix/components/upload-photo/index.js
@@ -197,7 +197,7 @@ export default class UploadPhoto extends Component {
             timeout: this.canceler.promise,
             transformRequest: ([file]) => {
                 const formData = new FormData();
-                const now = new Date();
+                const now = Date.vnNew();
                 const timestamp = now.getTime();
                 const fileName = `${file.name}_${timestamp}`;
 
diff --git a/front/salix/index.js b/front/salix/index.js
index 5220f36f6..2488ef9b6 100644
--- a/front/salix/index.js
+++ b/front/salix/index.js
@@ -1,5 +1,5 @@
 import './module';
 import './routes';
 import './components';
-import './services';
 import './styles';
+import 'vn-loopback/server/boot/date';
diff --git a/front/salix/services/index.js b/front/salix/services/index.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/jest-front.js b/jest-front.js
index 6d7532260..eabda9110 100644
--- a/jest-front.js
+++ b/jest-front.js
@@ -14,6 +14,10 @@ import './modules/ticket/front/module.js';
 import './modules/travel/front/module.js';
 import './modules/worker/front/module.js';
 import './modules/shelving/front/module.js';
+import 'vn-loopback/server/boot/date';
+
+// Set NODE_ENV
+process.env.NODE_ENV = 'development';
 
 core.run(vnInterceptor => {
     vnInterceptor.setApiPath(null);
@@ -39,3 +43,4 @@ window.ngModule = function(moduleName, ...args) {
 
     return angular.mock.module(...fns);
 };
+
diff --git a/jest.front.config.js b/jest.front.config.js
index a03c61d11..3289df8bb 100644
--- a/jest.front.config.js
+++ b/jest.front.config.js
@@ -1,5 +1,6 @@
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
+/* eslint max-len: ["error", { "code": 150 }]*/
 
 module.exports = {
     name: 'front end',
diff --git a/loopback/common/methods/application/post.js b/loopback/common/methods/application/post.js
new file mode 100644
index 000000000..9ea9a7f71
--- /dev/null
+++ b/loopback/common/methods/application/post.js
@@ -0,0 +1,17 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('post', {
+        description: 'Returns the sent parameters',
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/post`,
+            verb: 'POST'
+        }
+    });
+
+    Self.post = async ctx => {
+        return ctx.req.body;
+    };
+};
diff --git a/loopback/common/models/application.js b/loopback/common/models/application.js
index ff7599fac..5e767fdc1 100644
--- a/loopback/common/models/application.js
+++ b/loopback/common/models/application.js
@@ -1,4 +1,5 @@
 
 module.exports = function(Self) {
     require('../methods/application/status')(Self);
+    require('../methods/application/post')(Self);
 };
diff --git a/loopback/common/models/application.json b/loopback/common/models/application.json
index 0bb489720..bc72df315 100644
--- a/loopback/common/models/application.json
+++ b/loopback/common/models/application.json
@@ -7,6 +7,12 @@
       "principalType": "ROLE",
       "principalId": "$everyone",
       "permission": "ALLOW"
-    }
+    },
+    {
+        "property": "post",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+      }
   ]
 }
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index a406b55a5..c810e5a69 100644
--- 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"
 }
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index f6f305dc3..ad6d53d64 100644
--- 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"
-}
\ No newline at end of file
+	"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"
+}
+
diff --git a/loopback/server/boot/date.js b/loopback/server/boot/date.js
new file mode 100644
index 000000000..810745562
--- /dev/null
+++ b/loopback/server/boot/date.js
@@ -0,0 +1,17 @@
+module.exports = () => {
+    Date.vnUTC = () => {
+        const env = process.env.NODE_ENV;
+        if (!env || env === 'development')
+            return new Date(Date.UTC(2001, 0, 1, 11));
+
+        return new Date();
+    };
+
+    Date.vnNew = () => {
+        return new Date(Date.vnUTC());
+    };
+
+    Date.vnNow = () => {
+        return new Date(Date.vnUTC()).getTime();
+    };
+};
diff --git a/loopback/util/not-found-error.js b/loopback/util/not-found-error.js
new file mode 100644
index 000000000..7a05254f9
--- /dev/null
+++ 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;
+    }
+};
diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
index 22a48f83e..f0686ffa6 100644
--- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
+++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
@@ -95,7 +95,7 @@ module.exports = Self => {
             }, myOptions);
 
             const claim = await models.Claim.findOne(filter, myOptions);
-            const today = new Date();
+            const today = Date.vnNew();
 
             const newRefundTicket = await models.Ticket.create({
                 clientFk: claim.ticket().clientFk,
@@ -172,7 +172,7 @@ module.exports = Self => {
 
     async function saveObservation(observation, options) {
         const query = `INSERT INTO vn.ticketObservation (ticketFk, observationTypeFk, description) VALUES(?, ?, ?)
-                        ON DUPLICATE KEY 
+                        ON DUPLICATE KEY
                             UPDATE description = CONCAT(vn.ticketObservation.description, VALUES(description),' ')`;
         await Self.rawSql(query, [
             observation.ticketFk,
diff --git a/modules/claim/back/methods/claim/createFromSales.js b/modules/claim/back/methods/claim/createFromSales.js
index ba7bda71d..2ce3bc44b 100644
--- a/modules/claim/back/methods/claim/createFromSales.js
+++ b/modules/claim/back/methods/claim/createFromSales.js
@@ -60,7 +60,7 @@ module.exports = Self => {
             const landedPlusWeek = new Date(ticket.landed);
             landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
             const hasClaimManagerRole = await models.Account.hasRole(userId, 'claimManager', myOptions);
-            const isClaimable = landedPlusWeek >= new Date();
+            const isClaimable = landedPlusWeek >= Date.vnNew();
 
             if (ticket.isDeleted)
                 throw new UserError(`You can't create a claim for a removed ticket`);
diff --git a/modules/claim/back/methods/claim/regularizeClaim.js b/modules/claim/back/methods/claim/regularizeClaim.js
index ab8ea58a4..672c94947 100644
--- a/modules/claim/back/methods/claim/regularizeClaim.js
+++ b/modules/claim/back/methods/claim/regularizeClaim.js
@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethodCtx('regularizeClaim', {
-        description: `Imports lines from claimBeginning to a new ticket 
+        description: `Imports lines from claimBeginning to a new ticket
             with specific shipped, landed dates, agency and company`,
         accessType: 'WRITE',
         accepts: [{
@@ -135,10 +135,10 @@ module.exports = Self => {
     }
 
     async function getTicketId(params, options) {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
 
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         let ticket = await Self.app.models.Ticket.findOne({
@@ -155,8 +155,8 @@ module.exports = Self => {
     }
 
     async function createTicket(ctx, options) {
-        ctx.args.shipped = new Date();
-        ctx.args.landed = new Date();
+        ctx.args.shipped = Date.vnNew();
+        ctx.args.landed = Date.vnNew();
         ctx.args.agencyModeId = null;
         ctx.args.routeId = null;
 
diff --git a/modules/claim/back/methods/claim/specs/createFromSales.spec.js b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
index 9151c361e..7cf663caf 100644
--- a/modules/claim/back/methods/claim/specs/createFromSales.spec.js
+++ b/modules/claim/back/methods/claim/specs/createFromSales.spec.js
@@ -54,7 +54,7 @@ describe('Claim createFromSales()', () => {
         try {
             const options = {transaction: tx};
 
-            const todayMinusEightDays = new Date();
+            const todayMinusEightDays = Date.vnNew();
             todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
 
             const ticket = await models.Ticket.findById(ticketId, null, options);
@@ -85,7 +85,7 @@ describe('Claim createFromSales()', () => {
         try {
             const options = {transaction: tx};
 
-            const todayMinusEightDays = new Date();
+            const todayMinusEightDays = Date.vnNew();
             todayMinusEightDays.setDate(todayMinusEightDays.getDate() - 8);
 
             const ticket = await models.Ticket.findById(ticketId, null, options);
diff --git a/modules/claim/back/methods/claim/specs/updateClaim.spec.js b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
index 8d888eb40..113df35c9 100644
--- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('Update Claim', () => {
-    const newDate = new Date();
+    const newDate = Date.vnNew();
     const originalData = {
         ticketFk: 3,
         clientFk: 1101,
diff --git a/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js b/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
index 4cd4ce528..12ab45fac 100644
--- a/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
+++ b/modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('Update Claim', () => {
-    const newDate = new Date();
+    const newDate = Date.vnNew();
     const original = {
         ticketFk: 3,
         clientFk: 1101,
diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html
index 35e788290..81b14d3a7 100644
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@@ -101,7 +101,7 @@
                             <vn-span
                                 ng-click="itemDescriptor.show($event, saleClaimed.itemFk)"
                                 class="link">
-                                {{::saleClaimed.itemFk | zeroFill:6}}
+                                {{::saleClaimed.itemFk}}
                             </vn-span>
                     </td>
                     <td number>
diff --git a/modules/claim/front/card/index.js b/modules/claim/front/card/index.js
index 8fb35db75..4a8677c90 100644
--- 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',
diff --git a/modules/claim/front/descriptor/index.html b/modules/claim/front/descriptor/index.html
index 90246824b..f346ecf17 100644
--- 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
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 6adbfd684..3115cb451 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -115,7 +115,7 @@
                                 <span
                                     ng-click="itemDescriptor.show($event, saleClaimed.sale.itemFk, saleClaimed.sale.id)"
                                     class="link">
-                                    {{::saleClaimed.sale.itemFk | zeroFill:6}}
+                                    {{::saleClaimed.sale.itemFk}}
                                 </span>
                             </vn-td>
                             <vn-td expand>{{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}}</vn-td>
@@ -241,7 +241,7 @@
                                 <span
                                     ng-click="itemDescriptor.show($event, action.sale.itemFk, action.sale.id)"
                                     class="link">
-                                    {{::action.sale.itemFk | zeroFill:6}}
+                                    {{::action.sale.itemFk}}
                                 </span>
                             </vn-td>
                             <vn-td number>
diff --git a/modules/client/back/methods/client/consumptionSendQueued.js b/modules/client/back/methods/client/consumptionSendQueued.js
index 77e0e34f2..31b54b21d 100644
--- a/modules/client/back/methods/client/consumptionSendQueued.js
+++ b/modules/client/back/methods/client/consumptionSendQueued.js
@@ -32,7 +32,7 @@ module.exports = Self => {
                             c.id AS clientFk,
                             c.email AS clientEmail,
                             eu.email salesPersonEmail
-                    FROM client c 
+                    FROM client c
                         JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
                         JOIN ticket t ON t.clientFk = c.id
                         JOIN sale s ON s.ticketFk = t.id
@@ -61,10 +61,10 @@ module.exports = Self => {
                         SET status = 'printed',
                             printed = ?
                         WHERE id = ?`,
-                [new Date(), queue.id]);
+                [Date.vnNew(), queue.id]);
             } catch (error) {
                 await Self.rawSql(`
-                    UPDATE clientConsumptionQueue 
+                    UPDATE clientConsumptionQueue
                         SET status = ?
                     WHERE id = ?`,
                 [error.message, queue.id]);
diff --git a/modules/client/back/methods/client/createReceipt.js b/modules/client/back/methods/client/createReceipt.js
index a75ee8844..cb032270a 100644
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/modules/client/back/methods/client/createReceipt.js
@@ -51,7 +51,7 @@ module.exports = function(Self) {
     Self.createReceipt = async(ctx, options) => {
         const models = Self.app.models;
         const args = ctx.args;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         let tx;
@@ -67,7 +67,7 @@ module.exports = function(Self) {
 
         try {
             delete args.ctx; // Remove unwanted properties
-            const newReceipt = await models.Receipt.create(args, myOptions);
+
             const originalClient = await models.Client.findById(args.clientFk, null, myOptions);
             const bank = await models.Bank.findById(args.bankFk, null, myOptions);
             const accountingType = await models.AccountingType.findById(bank.accountingTypeFk, null, myOptions);
@@ -76,23 +76,8 @@ module.exports = function(Self) {
                 if (!args.compensationAccount)
                     throw new UserError('Compensation account is empty');
 
-                const supplierCompensation = await models.Supplier.findOne({
-                    where: {
-                        account: args.compensationAccount
-                    }
-                }, myOptions);
-
-                let clientCompensation = {};
-
-                if (!supplierCompensation) {
-                    clientCompensation = await models.Client.findOne({
-                        where: {
-                            accountingAccount: args.compensationAccount
-                        }
-                    }, myOptions);
-                }
-                if (!supplierCompensation && !clientCompensation)
-                    throw new UserError('Invalid account');
+                // Check compensation account exists
+                await models.Client.getClientOrSupplierReference(args.compensationAccount, myOptions);
 
                 await Self.rawSql(
                     `CALL vn.ledger_doCompensation(?, ?, ?, ?, ?, ?, ?)`,
@@ -151,7 +136,7 @@ module.exports = function(Self) {
                     myOptions
                 );
             }
-
+            const newReceipt = await models.Receipt.create(args, myOptions);
             if (tx) await tx.commit();
 
             return newReceipt;
diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js
index 21b3140bd..afbe36e49 100644
--- a/modules/client/back/methods/client/getCard.js
+++ b/modules/client/back/methods/client/getCard.js
@@ -74,7 +74,7 @@ module.exports = function(Self) {
             ]
         }, myOptions);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
         const data = await Self.rawSql(query, [id, date], myOptions);
diff --git a/modules/client/back/methods/client/getClientOrSupplierReference.js b/modules/client/back/methods/client/getClientOrSupplierReference.js
new file mode 100644
index 000000000..4c7201ee3
--- /dev/null
+++ b/modules/client/back/methods/client/getClientOrSupplierReference.js
@@ -0,0 +1,57 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('getClientOrSupplierReference', {
+        description: 'Returns the reference of a compensation providing a bank account',
+        accessType: 'READ',
+        accepts: {
+            arg: 'bankAccount',
+            type: 'number',
+            required: true,
+            description: 'The bank account of a client or a supplier'
+        },
+        returns: {
+            type: 'string',
+            root: true
+        },
+        http: {
+            path: `/getClientOrSupplierReference`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getClientOrSupplierReference = async(bankAccount, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let reference = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const supplierCompensation = await models.Supplier.findOne({
+            where: {
+                account: bankAccount
+            }
+        }, myOptions);
+
+        reference.supplierId = supplierCompensation?.id;
+        reference.supplierName = supplierCompensation?.name;
+
+        let clientCompensation = {};
+
+        if (!supplierCompensation) {
+            clientCompensation = await models.Client.findOne({
+                where: {
+                    accountingAccount: bankAccount
+                }
+            }, myOptions);
+            reference.clientId = clientCompensation?.id;
+            reference.clientName = clientCompensation?.name;
+        }
+
+        if (!supplierCompensation && !clientCompensation)
+            throw new UserError('Invalid account');
+
+        return reference;
+    };
+};
diff --git a/modules/client/back/methods/client/getDebt.js b/modules/client/back/methods/client/getDebt.js
index aafdbfa48..5f8a8c569 100644
--- a/modules/client/back/methods/client/getDebt.js
+++ b/modules/client/back/methods/client/getDebt.js
@@ -25,7 +25,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `SELECT vn.clientGetDebt(?, ?) AS debt`;
         const [debt] = await Self.rawSql(query, [clientFk, date], myOptions);
diff --git a/modules/client/back/methods/client/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js
index 03616a0e3..d662f75aa 100644
--- a/modules/client/back/methods/client/lastActiveTickets.js
+++ b/modules/client/back/methods/client/lastActiveTickets.js
@@ -32,14 +32,14 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const ticket = await Self.app.models.Ticket.findById(ticketId, null, myOptions);
         const query = `
-            SELECT 
+            SELECT
                 t.id,
                 t.shipped,
-                a.name AS agencyName, 
+                a.name AS agencyName,
                 w.name AS warehouseName,
                 ad.nickname AS nickname,
                 ad.city AS city,
@@ -52,7 +52,7 @@ module.exports = Self => {
                 JOIN vn.warehouse w ON t.warehouseFk = w.id
                 JOIN vn.address ad ON t.addressFk = ad.id
                 JOIN vn.province pr ON ad.provinceFk = pr.id
-            WHERE t.shipped >= ? AND t.clientFk = ? AND ts.alertLevel = 0 
+            WHERE t.shipped >= ? AND t.clientFk = ? AND ts.alertLevel = 0
                 AND t.id <> ? AND t.warehouseFk = ?
             ORDER BY t.shipped
                 LIMIT 10`;
diff --git a/modules/client/back/methods/client/summary.js b/modules/client/back/methods/client/summary.js
index 48cb75f31..caa3d8033 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@@ -125,7 +125,7 @@ module.exports = Self => {
     async function getRecoveries(recoveryModel, clientId, options) {
         const filter = {
             where: {
-                and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.now()}}]}]
+                and: [{clientFk: clientId}, {or: [{finished: null}, {finished: {gt: Date.vnNow()}}]}]
             },
             limit: 1
         };
diff --git a/modules/client/back/methods/credit-classification/createWithInsurance.spec.js b/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
index 95ff5025f..a5837bb90 100644
--- a/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
+++ b/modules/client/back/methods/credit-classification/createWithInsurance.spec.js
@@ -23,7 +23,7 @@ describe('Client createWithInsurance', () => {
 
         try {
             const options = {transaction: tx};
-            const data = {clientFk: 1101, started: Date.now(), credit: 999, grade: 255};
+            const data = {clientFk: 1101, started: Date.vnNow(), credit: 999, grade: 255};
 
             const result = await models.CreditClassification.createWithInsurance(data, options);
 
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index ce1d89818..748581913 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -51,7 +51,7 @@ module.exports = Self => {
 
         const stmts = [];
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const stmt = new ParameterizedSQL(
             `SELECT *
@@ -65,14 +65,14 @@ module.exports = Self => {
                         co.created,
                         co.text observation,
                         uw.id workerFk,
-                        uw.name workerName, 
+                        uw.name workerName,
                         c.creditInsurance,
                         d.defaulterSinced
                     FROM vn.defaulter d
                         JOIN vn.client c ON c.id = d.clientFk
                         LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
                         LEFT JOIN account.user u ON u.id = c.salesPersonFk
-                        LEFT JOIN account.user uw ON uw.id = co.workerFk 
+                        LEFT JOIN account.user uw ON uw.id = co.workerFk
                     WHERE
                         d.created = ?
                         AND d.amount > 0
diff --git a/modules/client/back/methods/recovery/hasActiveRecovery.js b/modules/client/back/methods/recovery/hasActiveRecovery.js
index 6b69d99d7..344b6b6ab 100644
--- a/modules/client/back/methods/recovery/hasActiveRecovery.js
+++ b/modules/client/back/methods/recovery/hasActiveRecovery.js
@@ -27,7 +27,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `
             SELECT count(*) AS hasActiveRecovery
diff --git a/modules/client/back/methods/tpv-transaction/confirm.js b/modules/client/back/methods/tpv-transaction/confirm.js
new file mode 100644
index 000000000..a26e0bad6
--- /dev/null
+++ b/modules/client/back/methods/tpv-transaction/confirm.js
@@ -0,0 +1,76 @@
+const UserError = require('vn-loopback/util/user-error');
+const base64url = require('base64url');
+
+module.exports = Self => {
+    Self.remoteMethod('confirm', {
+        description: 'Confirms electronic payment transaction',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'Ds_SignatureVersion',
+                type: 'string',
+                required: false,
+            }, {
+                arg: 'Ds_MerchantParameters',
+                type: 'string',
+                required: true,
+            }, {
+                arg: 'Ds_Signature',
+                type: 'string',
+                required: true,
+            }
+        ],
+        returns: {
+            type: 'Boolean',
+            root: true
+        },
+        http: {
+            path: `/confirm`,
+            verb: 'POST'
+        }
+    });
+
+    Self.confirm = async(signatureVersion, merchantParameters, signature) => {
+        const $ = Self.app.models;
+
+        const decodedParams = JSON.parse(
+            base64url.decode(merchantParameters, 'utf8'));
+        const params = {};
+
+        for (const param in decodedParams)
+            params[param] = decodeURIComponent(decodedParams[param]);
+
+        const orderId = params['Ds_Order'];
+        const merchantId = parseInt(params['Ds_MerchantCode']);
+
+        if (!orderId)
+            throw new UserError('Order id not found');
+        if (!merchantId)
+            throw new UserError('Mechant id not found');
+
+        const merchant = await $.TpvMerchant.findById(merchantId, {
+            fields: ['id', 'secretKey']
+        });
+
+        const base64hmac = Self.createSignature(
+            orderId,
+            merchant.secretKey,
+            merchantParameters
+        );
+
+        if (base64hmac !== base64url.toBase64(signature))
+            throw new UserError('Invalid signature');
+
+        await Self.rawSql(
+            'CALL hedera.tpvTransaction_confirm(?, ?, ?, ?, ?, ?)', [
+                params['Ds_Amount'],
+                orderId,
+                merchantId,
+                params['Ds_Currency'],
+                params['Ds_Response'],
+                params['Ds_ErrorCode']
+            ]);
+
+        return true;
+    };
+};
diff --git a/modules/client/back/methods/tpv-transaction/end.js b/modules/client/back/methods/tpv-transaction/end.js
new file mode 100644
index 000000000..5a757aa48
--- /dev/null
+++ b/modules/client/back/methods/tpv-transaction/end.js
@@ -0,0 +1,39 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('end', {
+        description: 'Ends electronic payment transaction',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'orderId',
+                type: 'string',
+                required: true,
+            }, {
+                arg: 'status',
+                type: 'string',
+                required: true,
+            }
+        ],
+        http: {
+            path: `/end`,
+            verb: 'POST'
+        }
+    });
+
+    Self.end = async(ctx, orderId, status) => {
+        const userId = ctx.req.accessToken.userId;
+        const transaction = await Self.findById(orderId, {
+            fields: ['id', 'clientFk']
+        });
+
+        if (transaction?.clientFk != userId)
+            throw new UserError('Transaction not owned by user');
+
+        await Self.rawSql(
+            'CALL hedera.tpvTransaction_end(?, ?)', [
+                orderId,
+                status
+            ]);
+    };
+};
diff --git a/modules/client/back/methods/tpv-transaction/start.js b/modules/client/back/methods/tpv-transaction/start.js
new file mode 100644
index 000000000..ea6ed05eb
--- /dev/null
+++ b/modules/client/back/methods/tpv-transaction/start.js
@@ -0,0 +1,85 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('start', {
+        description: 'Starts electronic payment transaction',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'amount',
+                type: 'Number',
+                required: true,
+            }, {
+                arg: 'companyId',
+                type: 'Number',
+                required: false,
+            }, {
+                arg: 'urlOk',
+                type: 'String',
+                required: false,
+            }, {
+                arg: 'urlKo',
+                type: 'String',
+                required: false,
+            }
+        ],
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/start`,
+            verb: 'POST'
+        }
+    });
+
+    Self.start = async(ctx, amount, companyId, urlOk, urlKo) => {
+        const userId = ctx.req.accessToken.userId;
+        const [[row]] = await Self.rawSql(
+            'CALL hedera.tpvTransaction_start(?, ?, ?)', [
+                amount,
+                companyId,
+                userId
+            ]);
+
+        if (!row)
+            throw new UserError('Transaction error');
+
+        const orderId = row.transactionId.padStart(12, '0');
+        const merchantUrl = row.merchantUrl ? row.merchantUrl : '';
+        urlOk = urlOk ? urlOk.replace('_transactionId_', orderId) : '';
+        urlKo = urlKo ? urlKo.replace('_transactionId_', orderId) : '';
+
+        const params = {
+            'Ds_Merchant_Amount': amount,
+            'Ds_Merchant_Order': orderId,
+            'Ds_Merchant_MerchantCode': row.merchant,
+            'Ds_Merchant_Currency': row.currency,
+            'Ds_Merchant_TransactionType': row.transactionType,
+            'Ds_Merchant_Terminal': row.terminal,
+            'Ds_Merchant_MerchantURL': merchantUrl,
+            'Ds_Merchant_UrlOK': urlOk,
+            'Ds_Merchant_UrlKO': urlKo
+        };
+        for (const param in params)
+            params[param] = encodeURIComponent(params[param]);
+
+        const json = JSON.stringify(params);
+        const merchantParameters = Buffer.from(json).toString('base64');
+
+        const signature = Self.createSignature(
+            orderId,
+            row.secretKey,
+            merchantParameters
+        );
+
+        return {
+            url: row.url,
+            postValues: {
+                'Ds_SignatureVersion': 'HMAC_SHA256_V1',
+                'Ds_MerchantParameters': merchantParameters,
+                'Ds_Signature': signature
+            }
+        };
+    };
+};
diff --git a/modules/client/back/models/client-methods.js b/modules/client/back/models/client-methods.js
index 4b20a822c..9241d80cf 100644
--- a/modules/client/back/models/client-methods.js
+++ b/modules/client/back/models/client-methods.js
@@ -47,4 +47,5 @@ module.exports = Self => {
     require('../methods/client/incotermsAuthorizationEmail')(Self);
     require('../methods/client/consumptionSendQueued')(Self);
     require('../methods/client/filter')(Self);
+    require('../methods/client/getClientOrSupplierReference')(Self);
 };
diff --git a/modules/client/back/models/client-sample.js b/modules/client/back/models/client-sample.js
index 787cc2ad8..5e4393042 100644
--- a/modules/client/back/models/client-sample.js
+++ b/modules/client/back/models/client-sample.js
@@ -41,7 +41,7 @@ module.exports = Self => {
 
             // Disable old mandate
             if (oldMandate)
-                oldMandate.updateAttribute('finished', new Date());
+                oldMandate.updateAttribute('finished', Date.vnNew());
 
             // Create a new mandate
             await models.Mandate.create({
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index e07993f79..2d8e7bd27 100644
--- 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'}
     );
diff --git a/modules/client/back/models/tpv-transaction.js b/modules/client/back/models/tpv-transaction.js
new file mode 100644
index 000000000..eb9dd7d6c
--- /dev/null
+++ b/modules/client/back/models/tpv-transaction.js
@@ -0,0 +1,29 @@
+const crypto = require('crypto');
+
+module.exports = Self => {
+    require('../methods/tpv-transaction/confirm')(Self);
+    require('../methods/tpv-transaction/start')(Self);
+    require('../methods/tpv-transaction/end')(Self);
+
+    Self.createSignature = function(orderId, secretKey, merchantParameters) {
+        secretKey = Buffer.from(secretKey, 'base64');
+        const iv = Buffer.alloc(8, 0);
+
+        const cipher = crypto.createCipheriv('des-ede3-cbc', secretKey, iv);
+        cipher.setAutoPadding(false);
+        const orderKey = Buffer.concat([
+            cipher.update(zeroPad(orderId, 8)),
+            cipher.final()
+        ]);
+
+        return crypto.createHmac('sha256', orderKey)
+            .update(merchantParameters)
+            .digest('base64');
+    };
+
+    function zeroPad(buf, blocksize) {
+        const buffer = typeof buf === 'string' ? Buffer.from(buf, 'utf8') : buf;
+        const pad = Buffer.alloc((blocksize - (buffer.length % blocksize)) % blocksize, 0);
+        return Buffer.concat([buffer, pad]);
+    }
+};
diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html
index 56e505463..b76c09356 100644
--- a/modules/client/front/balance/create/index.html
+++ b/modules/client/front/balance/create/index.html
@@ -11,7 +11,7 @@
     </vn-crud-model>
     <vn-horizontal>
         <vn-date-picker
-            label="Date" 
+            label="Date"
             ng-model="$ctrl.receipt.payed"
             required="true">
         </vn-date-picker>
@@ -48,6 +48,14 @@
             max="$ctrl.maxAmount">
         </vn-input-number>
     </vn-horizontal>
+    <vn-vertical ng-show="$ctrl.bankSelection.accountingType.code == 'compensation'">
+        <h6 translate>Compensation</h6>
+        <vn-textfield
+            ng-model="$ctrl.receipt.compensationAccount"
+            label="Compensation Account"
+            on-change="$ctrl.accountShortToStandard(value)">
+        </vn-textfield>
+    </vn-vertical>
     <vn-horizontal>
         <vn-textfield
             label="Reference"
@@ -71,17 +79,9 @@
             </vn-input-number>
         </vn-horizontal>
     </vn-vertical>
-    <vn-vertical ng-show="$ctrl.bankSelection.accountingType.code == 'compensation'">
-        <h6 translate>Compensation</h6>
-        <vn-textfield
-            ng-model="$ctrl.receipt.compensationAccount"
-            label="Compensation Account"
-            on-change="$ctrl.accountShortToStandard(value)">
-        </vn-textfield>
-    </vn-vertical>
     <vn-horizontal ng-show="$ctrl.bankSelection.accountingType.code == 'cash'">
-        <vn-check 
-            label="View receipt" 
+        <vn-check
+            label="View receipt"
             ng-model="$ctrl.viewReceipt">
         </vn-check>
     </vn-horizontal>
@@ -89,4 +89,4 @@
 <tpl-buttons>
     <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
     <button response="accept" translate vn-focus>Accept</button>
-</tpl-buttons>
\ No newline at end of file
+</tpl-buttons>
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 35b2e0b38..ef22c968a 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -4,7 +4,6 @@ import Dialog from 'core/components/dialog';
 class Controller extends Dialog {
     constructor($element, $, $transclude, vnReport) {
         super($element, $, $transclude);
-        this.viewReceipt = true;
         this.vnReport = vnReport;
         this.receipt = {};
     }
@@ -59,16 +58,21 @@ class Controller extends Dialog {
 
         if (value) {
             const accountingType = value.accountingType;
-            if (this.originalDescription) {
-                this.receipt.description =
-                `${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`;
-            } else {
-                this.receipt.description =
-                `${accountingType && accountingType.receiptDescription}`;
+
+            this.receipt.description = [];
+            this.viewReceipt = accountingType.code == 'cash';
+            if (accountingType.code == 'compensation')
+                this.receipt.description = '';
+            else {
+                if (accountingType.receiptDescription != null && accountingType.receiptDescription != '')
+                    this.receipt.description.push(accountingType.receiptDescription);
+                if (this.originalDescription)
+                    this.receipt.description.push(this.originalDescription);
+                this.receipt.description.join(', ');
             }
             this.maxAmount = accountingType && accountingType.maxAmount;
 
-            this.receipt.payed = new Date();
+            this.receipt.payed = Date.vnNew();
             if (accountingType.daysInFuture)
                 this.receipt.payed.setDate(this.receipt.payed.getDate() + accountingType.daysInFuture);
         }
@@ -111,7 +115,25 @@ class Controller extends Dialog {
     }
 
     accountShortToStandard(value) {
-        this.receipt.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+        if (value) {
+            this.receipt.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+            const params = {bankAccount: this.receipt.compensationAccount};
+            this.$http.get(`Clients/getClientOrSupplierReference`, {params})
+                .then(res => {
+                    if (res.data.clientId) {
+                        this.receipt.description = this.$t('Client Compensation Reference', {
+                            clientId: res.data.clientId,
+                            clientName: res.data.clientName
+                        });
+                    } else {
+                        this.receipt.description = this.$t('Supplier Compensation Reference', {
+                            supplierId: res.data.supplierId,
+                            supplierName: res.data.supplierName
+                        });
+                    }
+                });
+        } else
+            this.receipt.description = '';
     }
 
     getAmountPaid() {
diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js
index 2c4ed1940..408e6b66a 100644
--- a/modules/client/front/balance/create/index.spec.js
+++ b/modules/client/front/balance/create/index.spec.js
@@ -38,7 +38,7 @@ describe('Client', () => {
                     }
                 };
 
-                expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2');
+                expect(controller.receipt.description.join(',')).toEqual('Cash,Albaran: 1, 2');
             });
         });
 
@@ -75,7 +75,6 @@ describe('Client', () => {
                 jest.spyOn(controller.vnReport, 'show');
 
                 controller.$params = {id: 1101};
-                controller.viewReceipt = false;
 
                 $httpBackend.expect('POST', `Clients/1101/createReceipt`).respond({id: 1});
                 controller.responseHandler('accept');
diff --git a/modules/client/front/balance/create/locale/es.yml b/modules/client/front/balance/create/locale/es.yml
index 056590966..8c407708a 100644
--- a/modules/client/front/balance/create/locale/es.yml
+++ b/modules/client/front/balance/create/locale/es.yml
@@ -1,2 +1,4 @@
 View receipt: Ver recibo
-Amount exceeded: Según ley contra el fraude no se puede recibir cobros por importe igual o superior a {{maxAmount}}
\ No newline at end of file
+Amount exceeded: Según ley contra el fraude no se puede recibir cobros por importe igual o superior a {{maxAmount}}
+Client Compensation Reference: "({{clientId}}) Ntro Cliente: {{clientName}}"
+Supplier Compensation Reference: "({{supplierId}}) Ntro Proveedor: {{supplierName}}"
diff --git a/modules/client/front/consumption/index.js b/modules/client/front/consumption/index.js
index d9b657318..eb3a10dd6 100644
--- a/modules/client/front/consumption/index.js
+++ b/modules/client/front/consumption/index.js
@@ -17,11 +17,11 @@ class Controller extends Section {
     }
 
     setDefaultFilter() {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
         minDate.setMonth(minDate.getMonth() - 2);
 
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         this.filterParams = {
diff --git a/modules/client/front/consumption/index.spec.js b/modules/client/front/consumption/index.spec.js
index 33cbce58f..f2acddbca 100644
--- a/modules/client/front/consumption/index.spec.js
+++ b/modules/client/front/consumption/index.spec.js
@@ -26,7 +26,7 @@ describe('Client', () => {
             it('should call the window.open function', () => {
                 jest.spyOn(window, 'open').mockReturnThis();
 
-                const now = new Date();
+                const now = Date.vnNew();
                 controller.$.model.userParams = {
                     from: now,
                     to: now
@@ -49,7 +49,7 @@ describe('Client', () => {
 
         describe('sendEmail()', () => {
             it('should make a GET query sending the report', () => {
-                const now = new Date();
+                const now = Date.vnNew();
                 controller.$.model.userParams = {
                     from: now,
                     to: now
diff --git a/modules/client/front/credit-insurance/create/index.js b/modules/client/front/credit-insurance/create/index.js
index 83dc18806..e3138e459 100644
--- a/modules/client/front/credit-insurance/create/index.js
+++ b/modules/client/front/credit-insurance/create/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.creditClassification = {
-            started: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm')
+            started: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm')
         };
     }
 
diff --git a/modules/client/front/credit-insurance/create/index.spec.js b/modules/client/front/credit-insurance/create/index.spec.js
index 36a91ceca..c50afd5cf 100644
--- a/modules/client/front/credit-insurance/create/index.spec.js
+++ b/modules/client/front/credit-insurance/create/index.spec.js
@@ -24,7 +24,7 @@ describe('Client', () => {
 
         describe('onSubmit()', () => {
             it('should perform a POST query', () => {
-                let started = new Date();
+                let started = Date.vnNew();
                 controller.creditClassification = {
                     started: started,
                     credit: 300,
diff --git a/modules/client/front/credit-insurance/index/index.js b/modules/client/front/credit-insurance/index/index.js
index 5f59c918a..b40025c65 100644
--- a/modules/client/front/credit-insurance/index/index.js
+++ b/modules/client/front/credit-insurance/index/index.js
@@ -52,7 +52,7 @@ class Controller extends Section {
     }
 
     returnDialog() {
-        let params = {finished: Date.now()};
+        let params = {finished: Date.vnNow()};
         this.$http.patch(`CreditClassifications/${this.classificationId}`, params).then(() => {
             this._getClassifications(this.client.id);
         });
diff --git a/modules/client/front/credit-insurance/index/index.spec.js b/modules/client/front/credit-insurance/index/index.spec.js
index 8629db684..af072691a 100644
--- a/modules/client/front/credit-insurance/index/index.spec.js
+++ b/modules/client/front/credit-insurance/index/index.spec.js
@@ -39,7 +39,7 @@ describe('Client', () => {
 
             it(`should return false if finds a classification without due date`, () => {
                 controller.classifications = [
-                    {finished: Date.now()},
+                    {finished: Date.vnNow()},
                     {finished: null}
                 ];
 
@@ -50,8 +50,8 @@ describe('Client', () => {
 
             it(`should return true if all classifications are defined with due date`, () => {
                 controller.classifications = [
-                    {finished: Date.now()},
-                    {finished: Date.now()}
+                    {finished: Date.vnNow()},
+                    {finished: Date.vnNow()}
                 ];
 
                 let result = controller.canCreateNew();
diff --git a/modules/client/front/credit-insurance/insurance/create/index.js b/modules/client/front/credit-insurance/insurance/create/index.js
index 94de53352..9eae5bfa9 100644
--- a/modules/client/front/credit-insurance/insurance/create/index.js
+++ b/modules/client/front/credit-insurance/insurance/create/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.insurance = {
-            created: this.$filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss')
+            created: this.$filter('date')(Date.vnNew(), 'yyyy-MM-dd HH:mm:ss')
         };
     }
 
diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js
index 4beadfda6..bfadc5c6a 100644
--- a/modules/client/front/defaulter/index.js
+++ b/modules/client/front/defaulter/index.js
@@ -82,7 +82,7 @@ export default class Controller extends Section {
 
     chipColor(date) {
         const day = 24 * 60 * 60 * 1000;
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         const observationShipped = new Date(date);
diff --git a/modules/client/front/defaulter/index.spec.js b/modules/client/front/defaulter/index.spec.js
index 0732c68a1..f92378d08 100644
--- a/modules/client/front/defaulter/index.spec.js
+++ b/modules/client/front/defaulter/index.spec.js
@@ -38,14 +38,14 @@ describe('client defaulter', () => {
 
         describe('chipColor()', () => {
             it('should return undefined when the date is the present', () => {
-                let today = new Date();
+                let today = Date.vnNew();
                 let result = controller.chipColor(today);
 
                 expect(result).toEqual(undefined);
             });
 
             it('should return warning when the date is 10 days in the past', () => {
-                let pastDate = new Date();
+                let pastDate = Date.vnNew();
                 pastDate = pastDate.setDate(pastDate.getDate() - 11);
                 let result = controller.chipColor(pastDate);
 
@@ -53,7 +53,7 @@ describe('client defaulter', () => {
             });
 
             it('should return alert when the date is 20 days in the past', () => {
-                let pastDate = new Date();
+                let pastDate = Date.vnNew();
                 pastDate = pastDate.setDate(pastDate.getDate() - 21);
                 let result = controller.chipColor(pastDate);
 
diff --git a/modules/client/front/greuge/create/index.js b/modules/client/front/greuge/create/index.js
index dcc0fa522..147ad9bcb 100644
--- a/modules/client/front/greuge/create/index.js
+++ b/modules/client/front/greuge/create/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor(...args) {
         super(...args);
         this.greuge = {
-            shipped: new Date(),
+            shipped: Date.vnNew(),
             clientFk: this.$params.id
         };
     }
diff --git a/modules/client/front/notification/index.spec.js b/modules/client/front/notification/index.spec.js
index 4e754f6ad..e1de104be 100644
--- a/modules/client/front/notification/index.spec.js
+++ b/modules/client/front/notification/index.spec.js
@@ -39,7 +39,7 @@ describe('Client notification', () => {
 
         describe('campaignSelection() setter', () => {
             it('should set the campaign from and to properties', () => {
-                const dated = new Date();
+                const dated = Date.vnNew();
                 controller.campaignSelection = {
                     dated: dated,
                     scopeDays: 14
@@ -61,8 +61,8 @@ describe('Client notification', () => {
 
                 controller.$.filters = {hide: () => {}};
                 controller.campaign = {
-                    from: new Date(),
-                    to: new Date()
+                    from: Date.vnNew(),
+                    to: Date.vnNew()
                 };
 
                 const data = controller.$.model.data;
diff --git a/modules/client/front/recovery/create/index.js b/modules/client/front/recovery/create/index.js
index 4fd05eaa0..1779d647e 100644
--- a/modules/client/front/recovery/create/index.js
+++ b/modules/client/front/recovery/create/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.recovery = {
-            started: new Date()
+            started: Date.vnNew()
         };
     }
 
diff --git a/modules/client/front/recovery/index/index.js b/modules/client/front/recovery/index/index.js
index d53ded805..e89b6832c 100644
--- a/modules/client/front/recovery/index/index.js
+++ b/modules/client/front/recovery/index/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
 class Controller extends Section {
     setFinished(recovery) {
         if (!recovery.finished) {
-            let params = {finished: Date.now()};
+            let params = {finished: Date.vnNow()};
             this.$http.patch(`Recoveries/${recovery.id}`, params).then(
                 () => this.$.model.refresh()
             );
diff --git a/modules/client/front/summary/index.js b/modules/client/front/summary/index.js
index 1f22612d2..877579e33 100644
--- a/modules/client/front/summary/index.js
+++ b/modules/client/front/summary/index.js
@@ -100,7 +100,7 @@ class Controller extends Summary {
     }
 
     chipColor(date) {
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         const ticketShipped = new Date(date);
diff --git a/modules/client/front/summary/index.spec.js b/modules/client/front/summary/index.spec.js
index 0261cef45..a05d48518 100644
--- a/modules/client/front/summary/index.spec.js
+++ b/modules/client/front/summary/index.spec.js
@@ -76,14 +76,14 @@ describe('Client', () => {
 
         describe('chipColor()', () => {
             it('should return warning when the date is the present', () => {
-                let today = new Date();
+                let today = Date.vnNew();
                 let result = controller.chipColor(today);
 
                 expect(result).toEqual('warning');
             });
 
             it('should return success when the date is in the future', () => {
-                let futureDate = new Date();
+                let futureDate = Date.vnNew();
                 futureDate = futureDate.setDate(futureDate.getDate() + 10);
                 let result = controller.chipColor(futureDate);
 
@@ -91,7 +91,7 @@ describe('Client', () => {
             });
 
             it('should return undefined when the date is in the past', () => {
-                let pastDate = new Date();
+                let pastDate = Date.vnNew();
                 pastDate = pastDate.setDate(pastDate.getDate() - 10);
                 let result = controller.chipColor(pastDate);
 
diff --git a/modules/client/front/unpaid/index.js b/modules/client/front/unpaid/index.js
index a8ff64386..fcf620b54 100644
--- a/modules/client/front/unpaid/index.js
+++ b/modules/client/front/unpaid/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
 export default class Controller extends Section {
     setDefaultDate(hasData) {
         if (hasData && !this.clientUnpaid.dated)
-            this.clientUnpaid.dated = new Date();
+            this.clientUnpaid.dated = Date.vnNew();
     }
 }
 
diff --git a/modules/client/front/unpaid/index.spec.js b/modules/client/front/unpaid/index.spec.js
index bfeb7df19..0f6460a03 100644
--- a/modules/client/front/unpaid/index.spec.js
+++ b/modules/client/front/unpaid/index.spec.js
@@ -14,7 +14,7 @@ describe('client unpaid', () => {
         describe('setDefaultDate()', () => {
             it(`should not set today date if has dated`, () => {
                 const hasData = true;
-                const yesterday = new Date();
+                const yesterday = Date.vnNew();
                 yesterday.setDate(yesterday.getDate() - 1);
 
                 controller.clientUnpaid = {
diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index b920f4b58..30d47a2a3 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -150,10 +150,10 @@ module.exports = Self => {
 
         const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         stmt = new ParameterizedSQL(`
-            SELECT 
+            SELECT
                 i.image,
                 i.id AS itemFk,
                 i.size,
@@ -209,7 +209,7 @@ module.exports = Self => {
                 LEFT JOIN itemType t ON t.id = i.typeFk
                 LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
                 LEFT JOIN origin ori ON ori.id = i.originFk
-                LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR) 
+                LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR)
                 LEFT JOIN supplier s ON s.id = e.supplierFk`
         , [userConfig.warehouseFk, date]);
 
diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
index 9b1e60532..0578fcdd4 100644
--- a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
+++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js
@@ -332,10 +332,10 @@ describe('Entry latests buys filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
-            const to = new Date();
+            const to = Date.vnNew();
             to.setHours(23, 59, 59, 999);
 
             const ctx = {
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 4854bc3d3..1980f964c 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -1,3 +1,4 @@
+const LoopBackContext = require('loopback-context');
 module.exports = Self => {
     require('../methods/entry/filter')(Self);
     require('../methods/entry/getEntry')(Self);
@@ -7,4 +8,41 @@ module.exports = Self => {
     require('../methods/entry/importBuysPreview')(Self);
     require('../methods/entry/lastItemBuys')(Self);
     require('../methods/entry/entryOrderPdf')(Self);
+
+    Self.observe('before save', async function(ctx, options) {
+        if (ctx.isNewInstance) return;
+
+        const changes = ctx.data || ctx.instance;
+        const orgData = ctx.currentInstance;
+
+        const observation = changes.observation || orgData.observation;
+        const hasChanges = orgData && changes;
+        const observationChanged = hasChanges
+         && orgData.observation != observation;
+
+        if (observationChanged) {
+            let tx;
+            const myOptions = {};
+
+            if (typeof options == 'object')
+                Object.assign(myOptions, options);
+
+            if (!myOptions.transaction) {
+                tx = await Self.beginTransaction({});
+                myOptions.transaction = tx;
+            }
+
+            try {
+                const loopbackContext = LoopBackContext.getCurrentContext();
+                const userId = loopbackContext.active.accessToken.userId;
+                const id = changes.id || orgData.id;
+                const entry = await Self.app.models.Entry.findById(id, null, myOptions);
+                await entry.updateAttribute('observationEditorFk', userId, myOptions);
+                if (tx) await tx.commit();
+            } catch (e) {
+                if (tx) await tx.rollback();
+                throw e;
+            }
+        }
+    });
 };
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index d9b7c52df..6c5e1b7d3 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -77,6 +77,9 @@
         "companyFk": {
             "type": "number",
             "required": true
+        },
+        "observationEditorFk": {
+            "type": "number"
         }
     },
     "relations": {
@@ -99,6 +102,11 @@
             "type": "belongsTo",
             "model": "Currency",
             "foreignKey": "currencyFk"
+        },
+        "observationEditor": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "observationEditorFk"
         }
     }
 }
diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html
index ae67e208b..de784198c 100644
--- a/modules/entry/front/buy/index/index.html
+++ b/modules/entry/front/buy/index/index.html
@@ -60,7 +60,7 @@
                                 ng-if="buy.id"
                                 ng-click="itemDescriptor.show($event, buy.item.id)"
                                 class="link">
-                                {{::buy.item.id | zeroFill:6}}
+                                {{::buy.item.id}}
                             </span>
                             <vn-autocomplete ng-if="!buy.id" class="dense"
                                 vn-focus
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
index 8cfab622a..075d6a8f7 100644
--- a/modules/entry/front/latest-buys-search-panel/index.html
+++ b/modules/entry/front/latest-buys-search-panel/index.html
@@ -1,198 +1,243 @@
-<mg-ajax path="Tags" options="mgIndex as tags"></mg-ajax>
-<div class="search-panel">
-    <form ng-submit="$ctrl.onSearch()">
-        <vn-horizontal>
-            <vn-textfield
-                label="General search"
-                ng-model="filter.search"
-                info="Search items by id, name or barcode"
-                vn-focus>
-            </vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-                vn-focus
-                url="ItemCategories"
-                label="Category"
-                show-field="name"
-                value-field="id"
-                ng-model="filter.categoryFk">
-            </vn-autocomplete>
-            <vn-autocomplete
-                url="ItemTypes"
-                label="Type"
-                where="{categoryFk: filter.categoryFk}"
-                show-field="name"
-                value-field="id"
-                ng-model="filter.typeFk"
-                fields="['categoryFk']"
-                include="'category'">
-                <tpl-item>
-                    <div>{{name}}</div>
-                    <div class="text-caption text-secondary">
-                        {{category.name}}
-                    </div>
-                </tpl-item>>
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete 
-                disabled="false"
-                ng-model="filter.salesPersonFk"
-                url="Workers/activeWithRole"
-                show-field="nickname"
-                search-function="{firstName: $search}"
-                value-field="id"
-                where="{role: {inq: ['logistic', 'buyer']}}"
-                label="Buyer">
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                label="Supplier"
-                ng-model="filter.supplierFk"
-                url="Suppliers"
-                fields="['name','nickname']"
-                search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
-                show-field="name"
-                value-field="id">
-                <tpl-item>{{name}}: {{nickname}}</tpl-item>
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-date-picker
-                vn-one
-                label="From"
-                ng-model="filter.from">
-            </vn-date-picker>
-            <vn-date-picker
-                vn-one
-                label="To"
-                ng-model="filter.to">
-            </vn-date-picker>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-check
-                label="Is active"
-                ng-model="filter.active"
-                triple-state="true">
-            </vn-check>
-            <vn-check
-                label="Is visible"
-                ng-model="filter.visible"
-                triple-state="true">
-            </vn-check>
-            <vn-check
-                label="Is floramondo"
-                ng-model="filter.floramondo"
-                triple-state="true">
-            </vn-check>
-        </vn-horizontal>
-        <vn-horizontal class="vn-pt-sm">
-            <vn-one class="text-subtitle1" translate>
-                Tags
-            </vn-one>
-            <vn-icon-button
-                vn-none
-                vn-bind="+"
-                vn-tooltip="Add tag"
-                icon="add_circle"
-                ng-click="filter.tags.push({})">
-            </vn-icon-button>
-        </vn-horizontal>
-        <vn-horizontal ng-repeat="itemTag in filter.tags">
-            <vn-autocomplete
-                vn-id="tag"
-                ng-model="itemTag.tagFk"
-                data="tags.model"
-                show-field="name"
-                label="Tag"
-                on-change="itemTag.value = null">
-            </vn-autocomplete>
-            <vn-textfield
-                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
-                vn-id="text"
-                label="Value"
-                ng-model="itemTag.value">
-            </vn-textfield>
-            <vn-autocomplete 
-                vn-one
-                ng-show="tag.selection.isFree === false"
-                url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
-                search-function="{value: $search}"
-                label="Value"
-                ng-model="itemTag.value"
-                show-field="value"
-                value-field="value"
-                rule>
-            </vn-autocomplete>
-            <vn-icon-button
-                vn-none
-                vn-tooltip="Remove tag"
-                icon="delete"
-                ng-click="filter.tags.splice($index, 1)"
-                tabindex="-1">
-            </vn-icon-button>
-        </vn-horizontal>
-        <vn-horizontal class="vn-pt-sm">
-            <vn-one class="text-subtitle1" translate>
-                More fields
-            </vn-one>
-            <vn-icon-button
-                vn-none
-                vn-bind="+"
-                vn-tooltip="Add field"
-                icon="add_circle"
-                ng-click="$ctrl.fieldFilters.push({})">
-            </vn-icon-button>
-        </vn-horizontal>
-        <vn-horizontal ng-repeat="fieldFilter in $ctrl.fieldFilters">
-            <vn-autocomplete
-                label="Field"
-                ng-model="fieldFilter.name"
-                data="$ctrl.moreFields"
-                value-field="name"
-                show-field="label"
-                show-filter="false"
-                translate-fields="['label']"
-                selection="info"
-                on-change="fieldFilter.value = null">
-            </vn-autocomplete>
-            <vn-one ng-switch="info.type">
-                <div ng-switch-when="Number">
-                    <vn-input-number
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-input-number>
-                </div>
-                <div ng-switch-when="Boolean">
-                    <vn-check
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-check>
-                </div>
-                <div ng-switch-when="Date">
-                    <vn-date-picker
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-date-picker>
-                </div>
-                <div ng-switch-default>
-                    <vn-textfield
-                        label="Value"
-                        ng-model="fieldFilter.value">
-                    </vn-textfield>
-                </div>
-            </vn-one>
-            <vn-icon-button
-                vn-none
-                vn-tooltip="Remove field"
-                icon="delete"
-                ng-click="$ctrl.removeField($index, fieldFilter.name)"
-                tabindex="-1">
-            </vn-icon-button>
-        </vn-horizontal>
-        <vn-horizontal class="vn-mt-lg">
-            <vn-submit label="Search"></vn-submit>
-        </vn-horizontal>
-    </form>
-</div>
+<vn-crud-model url="Tags" fields="['id','name', 'isFree']" data="$ctrl.tags" auto-load="true">
+<vn-crud-model url="ItemCategories" data="$ctrl.categories" auto-load="true"></vn-crud-model>
+<vn-side-menu side="right">
+    <vn-horizontal class="input">
+        <vn-textfield
+            label="General search"
+            ng-model="$ctrl.filter.search"
+            info="Search items by id, name or barcode"
+            vn-focus
+            ng-keydown="$ctrl.onKeyPress($event)">
+        </vn-textfield>
+    </vn-horizontal>
+    <vn-horizontal class="item-category">
+        <vn-autocomplete
+            vn-id="category"
+            data="$ctrl.categories"
+            ng-model="$ctrl.filter.categoryFk"
+            show-field="name"
+            value-field="id"
+            label="Category">
+        </vn-autocomplete>
+        <vn-one ng-repeat="category in $ctrl.categories">
+            <vn-icon
+                ng-class="{'active': $ctrl.filter.categoryFk == category.id}"
+                icon="{{::category.icon}}"
+                vn-tooltip="{{::category.name}}"
+                ng-click="$ctrl.changeCategory(category.id)">
+            </vn-icon>
+        </vn-one>
+    </vn-horizontal>
+    <vn-vertical class="input">
+        <vn-autocomplete
+            vn-id="type"
+            disabled="!$ctrl.filter.categoryFk"
+            url="ItemTypes"
+            label="Type"
+            where="{categoryFk: $ctrl.filter.categoryFk}"
+            show-field="name"
+            value-field="id"
+            ng-model="$ctrl.filter.typeFk"
+            fields="['categoryFk']"
+            include="'category'"
+            on-change="$ctrl.addFilters()">
+            <tpl-item>
+                <div>{{name}}</div>
+                <div class="text-caption text-secondary">
+                    {{category.name}}
+                </div> </tpl-item
+            >>
+        </vn-autocomplete>
+    </vn-vertical>
+    <vn-horizontal class="input horizontal">
+        <vn-autocomplete
+            vn-id="salesPerson"
+            disabled="false"
+            ng-model="$ctrl.filter.salesPersonFk"
+            url="Workers/activeWithRole"
+            show-field="nickname"
+            search-function="{firstName: $search}"
+            value-field="id"
+            where="{role: {inq: ['logistic', 'buyer']}}"
+            label="Buyer"
+            on-change="$ctrl.addFilters()">
+        </vn-autocomplete>
+        <vn-autocomplete
+            vn-id="supplier"
+            label="Supplier"
+            ng-model="$ctrl.filter.supplierFk"
+            url="Suppliers"
+            fields="['name','nickname']"
+            search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
+            show-field="name"
+            value-field="id"
+            on-change="$ctrl.addFilters()">
+            <tpl-item>{{name}}: {{nickname}}</tpl-item>
+        </vn-autocomplete>
+    </vn-horizontal>
+    <vn-vertical class="input">
+        <vn-date-picker
+            label="From"
+            ng-model="$ctrl.filter.from"
+            on-change="$ctrl.addFilters()">
+        </vn-date-picker>
+        <vn-date-picker
+            label="To"
+            ng-model="$ctrl.filter.to"
+            on-change="$ctrl.addFilters()">
+        </vn-date-picker>
+    </vn-vertical>
+    <vn-horizontal class="checks">
+        <vn-check
+            label="Is active"
+            ng-model="$ctrl.filter.active"
+            triple-state="true"
+            ng-click="$ctrl.addFilters()">
+        </vn-check>
+        <vn-check
+            label="Is visible"
+            ng-model="$ctrl.filter.visible"
+            triple-state="true"
+            ng-click="$ctrl.addFilters()">
+        </vn-check>
+        <vn-check
+            label="Is floramondo"
+            ng-model="$ctrl.filter.floramondo"
+            triple-state="true"
+            ng-click="$ctrl.addFilters()">
+        </vn-check>
+    </vn-horizontal>
+    <vn-horizontal class="tags">
+        <vn-one class="text-subtitle1" translate> Tags </vn-one>
+        <vn-icon-button
+            vn-none
+            vn-tooltip="Add tag"
+            icon="add_circle"
+            ng-click="$ctrl.filter.tags.push({})">
+        </vn-icon-button>
+    </vn-horizontal>
+    <vn-horizontal class="tags horizontal" ng-repeat="itemTag in $ctrl.filter.tags">
+        <vn-autocomplete
+            vn-id="tag"
+            data="$ctrl.tags"
+            ng-model="itemTag.tagFk"
+            show-field="name"
+            label="Tag"
+            on-change="itemTag.value = null">
+        </vn-autocomplete>
+        <vn-textfield
+            ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
+            label="Value"
+            ng-model="itemTag.value"
+            ng-keydown="$ctrl.onKeyPress($event)">
+        </vn-textfield>
+        <vn-autocomplete
+            ng-show="tag.selection.isFree === false"
+            url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
+            search-function="{value: $search}"
+            label="Value"
+            ng-model="itemTag.value"
+            show-field="value"
+            value-field="value"
+            on-change="$ctrl.addFilters()">
+        </vn-autocomplete>
+        <vn-icon-button
+            vn-none
+            vn-tooltip="Remove tag"
+            icon="delete"
+            ng-click="$ctrl.removeTag(itemTag)">
+        </vn-icon-button>
+    </vn-horizontal>
+    <div class="chips">
+        <vn-chip
+            ng-if="$ctrl.filter.search"
+            removable="true"
+            vn-tooltip="Item id/name"
+            on-remove="$ctrl.removeItemFilter('search')"
+            class="colored">
+            <span>Id/Name: {{$ctrl.filter.search}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="category.selection"
+            removable="true"
+            vn-tooltip="Category"
+            on-remove="$ctrl.removeItemFilter('categoryFk')"
+            class="colored">
+            <span>{{category.selection.name}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="type.selection"
+            removable="true"
+            vn-tooltip="Type"
+            on-remove="$ctrl.removeItemFilter('typeFk')"
+            class="colored">
+            <span>{{type.selection.name}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="salesPerson.selection"
+            removable="true"
+            vn-tooltip="Sales person"
+            on-remove="$ctrl.removeItemFilter('salesPersonFk')"
+            class="colored">
+            <span>Sales person: {{salesPerson.selection.nickname}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="supplier.selection"
+            removable="true"
+            vn-tooltip="Supplier"
+            on-remove="$ctrl.removeItemFilter('supplierFk')"
+            class="colored">
+            <span>Supplier: {{supplier.selection.name}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.from"
+            removable="true"
+            vn-tooltip="From date"
+            on-remove="$ctrl.removeItemFilter('from')"
+            class="colored">
+            <span>From: {{$ctrl.filter.from | date:'dd/MM/yyyy'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.to"
+            removable="true"
+            vn-tooltip="To date"
+            on-remove="$ctrl.removeItemFilter('to')"
+            class="colored">
+            <span>To: {{$ctrl.filter.to | date:'dd/MM/yyyy'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.active != null"
+            removable="true"
+            vn-tooltip="Active"
+            on-remove="$ctrl.removeItemFilter('active')"
+            class="colored">
+            <span>Active: {{$ctrl.filter.active ? '✓' : '✗'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.floramondo != null"
+            removable="true"
+            vn-tooltip="Floramondo"
+            on-remove="$ctrl.removeItemFilter('floramondo')"
+            class="colored">
+            <span>Floramondo: {{$ctrl.filter.floramondo ? '✓' : '✗'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-if="$ctrl.filter.visible != null"
+            removable="true"
+            vn-tooltip="Visible"
+            on-remove="$ctrl.removeItemFilter('visible')"
+            class="colored">
+            <span>Visible: {{$ctrl.filter.visible ? '✓' : '✗'}}</span>
+        </vn-chip>
+        <vn-chip
+            ng-repeat="chipTag in $ctrl.filter.tags"
+            removable="true"
+            vn-tooltip="Tag"
+            on-remove="$ctrl.removeTag(chipTag)"
+            class="colored"
+            ng-if="chipTag.value">
+            <span>{{$ctrl.showTagInfo(chipTag)}}</span>
+        </vn-chip>
+        </vn-chip>
+    </div>
+</vn-side-menu>
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js
index 83dc88724..4078580ea 100644
--- a/modules/entry/front/latest-buys-search-panel/index.js
+++ b/modules/entry/front/latest-buys-search-panel/index.js
@@ -1,67 +1,61 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
+import './style.scss';
 
 class Controller extends SearchPanel {
     constructor($element, $) {
         super($element, $);
-        let model = 'Item';
-        let moreFields = ['description', 'name'];
+    }
 
-        let properties;
-        let validations = window.validations;
+    $onInit() {
+        this.filter = {
+            isActive: true,
+            tags: []
+        };
+    }
 
-        if (validations && validations[model])
-            properties = validations[model].properties;
-        else
-            properties = {};
-
-        this.moreFields = [];
-        for (let field of moreFields) {
-            let prop = properties[field];
-            this.moreFields.push({
-                name: field,
-                label: prop ? prop.description : field,
-                type: prop ? prop.type : null
-            });
+    changeCategory(id) {
+        if (this.filter.categoryFk != id) {
+            this.filter.categoryFk = id;
+            this.addFilters();
         }
     }
 
-    get filter() {
-        let filter = this.$.filter;
-
-        for (let fieldFilter of this.fieldFilters)
-            filter[fieldFilter.name] = fieldFilter.value;
-
-        return filter;
+    removeItemFilter(param) {
+        this.filter[param] = null;
+        if (param == 'categoryFk') this.filter['typeFk'] = null;
+        this.addFilters();
     }
 
-    set filter(value) {
-        if (!value)
-            value = {};
-        if (!value.tags)
-            value.tags = [{}];
+    removeTag(tag) {
+        const index = this.filter.tags.indexOf(tag);
+        if (index > -1) this.filter.tags.splice(index, 1);
+        this.addFilters();
+    }
 
-        this.fieldFilters = [];
-        for (let field of this.moreFields) {
-            if (value[field.name] != undefined) {
-                this.fieldFilters.push({
-                    name: field.name,
-                    value: value[field.name],
-                    info: field
-                });
-            }
+    onKeyPress($event) {
+        if ($event.key === 'Enter')
+            this.addFilters();
+    }
+
+    addFilters() {
+        for (let i = 0; i < this.filter.tags.length; i++) {
+            if (!this.filter.tags[i].value)
+                this.filter.tags.splice(i, 1);
         }
-
-        this.$.filter = value;
+        return this.model.addFilter({}, this.filter);
     }
 
-    removeField(index, field) {
-        this.fieldFilters.splice(index, 1);
-        delete this.$.filter[field];
+    showTagInfo(itemTag) {
+        if (!itemTag.tagFk) return itemTag.value;
+        return `${this.tags.find(tag => tag.id == itemTag.tagFk).name}: ${itemTag.value}`;
     }
 }
 
 ngModule.component('vnLatestBuysSearchPanel', {
     template: require('./index.html'),
-    controller: Controller
+    controller: Controller,
+    bindings: {
+        model: '<'
+    }
 });
diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js
index 9e187a25a..c3c5acbfb 100644
--- a/modules/entry/front/latest-buys-search-panel/index.spec.js
+++ b/modules/entry/front/latest-buys-search-panel/index.spec.js
@@ -10,50 +10,46 @@ describe('Entry', () => {
         beforeEach(angular.mock.inject($componentController => {
             $element = angular.element(`<vn-latest-buys-search-panel></vn-latest-buys-search-panel>`);
             controller = $componentController('vnLatestBuysSearchPanel', {$element});
+            controller.model = {addFilter: () => {}};
         }));
 
-        describe('filter() setter', () => {
-            it(`should set the tags property to the scope filter with an empty array`, () => {
-                const expectedFilter = {
-                    tags: [{}]
-                };
-                controller.filter = null;
+        describe('removeItemFilter()', () => {
+            it(`should remove param from filter`, () => {
+                controller.filter = {tags: [], categoryFk: 1, typeFk: 1};
+                const expectFilter = {tags: [], categoryFk: null, typeFk: null};
 
-                expect(controller.filter).toEqual(expectedFilter);
-            });
+                controller.removeItemFilter('categoryFk');
 
-            it(`should set the tags property to the scope filter with an array of tags`, () => {
-                const expectedFilter = {
-                    description: 'My item',
-                    tags: [{}]
-                };
-                const expectedFieldFilter = [{
-                    info: {
-                        label: 'description',
-                        name: 'description',
-                        type: null
-                    },
-                    name: 'description',
-                    value: 'My item'
-                }];
-                controller.filter = {
-                    description: 'My item'
-                };
-
-                expect(controller.filter).toEqual(expectedFilter);
-                expect(controller.fieldFilters).toEqual(expectedFieldFilter);
+                expect(controller.filter).toEqual(expectFilter);
             });
         });
 
-        describe('removeField()', () => {
-            it(`should remove the description property from the fieldFilters and from the scope filter`, () => {
-                const expectedFilter = {tags: [{}]};
-                controller.filter = {description: 'My item'};
+        describe('removeTag()', () => {
+            it(`should remove tag from filter`, () => {
+                const tag = {tagFk: 1, value: 'Value'};
+                controller.filter = {tags: [tag]};
+                const expectFilter = {tags: []};
 
-                controller.removeField(0, 'description');
+                controller.removeTag(tag);
 
-                expect(controller.filter).toEqual(expectedFilter);
-                expect(controller.fieldFilters).toEqual([]);
+                expect(controller.filter).toEqual(expectFilter);
+            });
+        });
+
+        describe('showTagInfo()', () => {
+            it(`should show tag value`, () => {
+                const tag = {value: 'Value'};
+                const result = controller.showTagInfo(tag);
+
+                expect(result).toEqual('Value');
+            });
+
+            it(`should show tag name and value`, () => {
+                const tag = {tagFk: 1, value: 'Value'};
+                controller.tags = [{id: 1, name: 'tagName'}];
+                const result = controller.showTagInfo(tag);
+
+                expect(result).toEqual('tagName: Value');
             });
         });
     });
diff --git a/modules/entry/front/latest-buys-search-panel/style.scss b/modules/entry/front/latest-buys-search-panel/style.scss
new file mode 100644
index 000000000..ec189c7e4
--- /dev/null
+++ b/modules/entry/front/latest-buys-search-panel/style.scss
@@ -0,0 +1,70 @@
+@import "variables";
+
+vn-latest-buys-search-panel vn-side-menu div {
+    & > .input {
+        padding-left: $spacing-md;
+        padding-right: $spacing-md;
+        border-color: $color-spacer;
+        border-bottom: $border-thin;
+    }
+    & > .horizontal {
+        grid-auto-flow: column;
+        grid-column-gap: $spacing-sm;
+        align-items: center;
+    }
+    & > .checks {
+        padding: $spacing-md;
+        flex-wrap: wrap;
+        border-color: $color-spacer;
+        border-bottom: $border-thin;
+    }
+    & > .tags {
+        padding: $spacing-md;
+        padding-bottom: 0%;
+        padding-top: 0%;
+        align-items: center;
+    }
+    & > .chips {
+        display: flex;
+        flex-wrap: wrap;
+        padding: $spacing-md;
+        overflow: hidden;
+        max-width: 100%;
+        border-color: $color-spacer;
+        border-top: $border-thin;
+    }
+    & > .item-category {
+        padding: $spacing-sm;
+        justify-content: flex-start;
+        align-items: flex-start;
+        flex-wrap: wrap;
+
+        vn-autocomplete[vn-id="category"] {
+            display: none;
+        }
+
+        & > vn-one {
+            padding: $spacing-sm;
+            min-width: 33.33%;
+            text-align: center;
+            box-sizing: border-box;
+
+            & > vn-icon {
+                padding: $spacing-sm;
+                background-color: $color-font-secondary;
+                border-radius: 50%;
+                cursor: pointer;
+
+                &.active {
+                    background-color: $color-main;
+                    color: #fff;
+                }
+                & > i:before {
+                    font-size: 2.6rem;
+                    width: 16px;
+                    height: 16px;
+                }
+            }
+        }
+    }
+}
diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html
index fc44ddfc2..727b19220 100644
--- a/modules/entry/front/latest-buys/index.html
+++ b/modules/entry/front/latest-buys/index.html
@@ -7,17 +7,11 @@
     on-data-change="$ctrl.reCheck()"
     auto-load="true">
 </vn-crud-model>
-<vn-portal slot="topbar">
-    <vn-searchbar
-        vn-focus
-        panel="vn-latest-buys-search-panel"
-        placeholder="Search by item id or name"
-        info="You can search by item id or name"
-        suggested-filter="{isActive: true}"
-        model="model"
-        auto-state="false">
-    </vn-searchbar>
+ <vn-portal slot="topbar">
 </vn-portal>
+<vn-latest-buys-search-panel
+    model="model">
+</vn-latest-buys-search-panel>
 <vn-card>
     <smart-table
         model="model"
@@ -261,7 +255,7 @@
     </tpl-body>
     <tpl-buttons>
         <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
-        <button response="accept" translate>Create</button>
+        <button response="accept" translate>Save</button>
     </tpl-buttons>
 </vn-dialog>
 <vn-item-descriptor-popover
diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml
index 8d70844fa..795e3f5f4 100644
--- 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
\ No newline at end of file
+Package out: Embalaje envíos
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index 04844ab99..f03710dc4 100644
--- 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>
@@ -150,7 +148,7 @@
                             <span
                                 ng-click="itemDescriptor.show($event, line.item.id)"
                                 class="link">
-                                {{::line.item.id | zeroFill:6}}
+                                {{::line.item.id}}
                             </span>
                         </td>
                         <td number 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>
 
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
index 401b8dab0..adab3cbeb 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
@@ -146,8 +146,8 @@ describe('InvoiceIn filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const from = new Date();
-            const to = new Date();
+            const from = Date.vnNew();
+            const to = Date.vnNew();
             from.setHours(0, 0, 0, 0);
             to.setHours(23, 59, 59, 999);
             to.setDate(to.getDate() + 1);
diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json
index fa8a1d8f8..c6a736b06 100644
--- 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",
diff --git a/modules/invoiceIn/front/basic-data/index.spec.js b/modules/invoiceIn/front/basic-data/index.spec.js
index 09aa08293..98710ac35 100644
--- a/modules/invoiceIn/front/basic-data/index.spec.js
+++ b/modules/invoiceIn/front/basic-data/index.spec.js
@@ -78,7 +78,7 @@ describe('InvoiceIn', () => {
                     description: 'This is a description',
                     files: [{
                         lastModified: 1668673957761,
-                        lastModifiedDate: new Date(),
+                        lastModifiedDate: Date.vnNew(),
                         name: 'file-example.png',
                         size: 19653,
                         type: 'image/png',
diff --git a/modules/invoiceIn/front/card/index.js b/modules/invoiceIn/front/card/index.js
index c7ac08cc7..48217faa5 100644
--- 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},
+                                }
+                            }
                         }
                     }
                 },
diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html
index 223914c9c..c4330fbf0 100644
--- 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>
diff --git a/modules/invoiceIn/front/descriptor/index.js b/modules/invoiceIn/front/descriptor/index.js
index 4dc89a459..e005211a3 100644
--- a/modules/invoiceIn/front/descriptor/index.js
+++ b/modules/invoiceIn/front/descriptor/index.js
@@ -75,7 +75,7 @@ class Controller extends Descriptor {
                 filter: {
                     where: {
                         invoiceInFk: id,
-                        dueDated: {gte: new Date()}
+                        dueDated: {gte: Date.vnNew()}
                     }
                 }})
                 .then(res => {
diff --git a/modules/invoiceIn/front/dueDay/index.js b/modules/invoiceIn/front/dueDay/index.js
index 3cc1c81e8..ee9b13e5c 100644
--- a/modules/invoiceIn/front/dueDay/index.js
+++ b/modules/invoiceIn/front/dueDay/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
 class Controller extends Section {
     add() {
         this.$.model.insert({
-            dueDated: new Date(),
+            dueDated: Date.vnNew(),
             bankFk: this.vnConfig.local.bankFk
         });
     }
diff --git a/modules/invoiceIn/front/intrastat/index.html b/modules/invoiceIn/front/intrastat/index.html
index cb447132d..fc0139303 100644
--- a/modules/invoiceIn/front/intrastat/index.html
+++ b/modules/invoiceIn/front/intrastat/index.html
@@ -47,7 +47,7 @@
                 show-field="description"
                 rule
                 vn-focus>
-                <tpl-item>{{id | zeroFill:8}}: {{description}}</tpl-item>
+                <tpl-item>{{id}}: {{description}}</tpl-item>
             </vn-autocomplete>
             <vn-input-number 
                 label="Amount"
diff --git a/modules/invoiceIn/front/summary/index.html b/modules/invoiceIn/front/summary/index.html
index 3a826eeb7..f0baa33c8 100644
--- a/modules/invoiceIn/front/summary/index.html
+++ b/modules/invoiceIn/front/summary/index.html
@@ -141,7 +141,7 @@
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="intrastat in $ctrl.summary.invoiceInIntrastat">
-                        <vn-td>{{::intrastat.intrastatFk | zeroFill:8}}: {{::intrastat.intrastat.description}}</vn-td> 
+                        <vn-td>{{::intrastat.intrastatFk}}: {{::intrastat.intrastat.description}}</vn-td> 
                         <vn-td>{{::intrastat.amount | currency: 'EUR':2}}</vn-td>
                         <vn-td>{{::intrastat.net}}</vn-td>
                         <vn-td>{{::intrastat.stems}}</vn-td>
diff --git a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
index d42184ae5..f3c7a5093 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
@@ -60,9 +60,9 @@ module.exports = Self => {
         try {
             query = `
                 SELECT MAX(issued) issued
-                    FROM vn.invoiceOut io 
-                        JOIN vn.time t ON t.dated = io.issued 
-                    WHERE io.serial = 'A' 
+                    FROM vn.invoiceOut io
+                        JOIN vn.time t ON t.dated = io.issued
+                    WHERE io.serial = 'A'
                         AND t.year = YEAR(?)
                         AND io.companyFk = ?`;
             const [maxIssued] = await Self.rawSql(query, [
@@ -77,7 +77,7 @@ module.exports = Self => {
             if (args.invoiceDate < args.maxShipped)
                 args.maxShipped = args.invoiceDate;
 
-            const minShipped = new Date();
+            const minShipped = Date.vnNew();
             minShipped.setFullYear(minShipped.getFullYear() - 1);
             minShipped.setMonth(1);
             minShipped.setDate(1);
@@ -131,11 +131,11 @@ module.exports = Self => {
         const models = Self.app.models;
         const args = ctx.args;
         const query = `SELECT DISTINCT clientFk AS id
-                        FROM ticket t 
+                        FROM ticket t
                             JOIN ticketPackaging tp ON t.id = tp.ticketFk
                             JOIN client c ON c.id = t.clientFk
                         WHERE t.shipped BETWEEN  '2017-11-21' AND ?
-                            AND t.clientFk >= ? 
+                            AND t.clientFk >= ?
                             AND (t.clientFk <= ? OR ? IS NULL)
                             AND c.isActive`;
         return models.InvoiceOut.rawSql(query, [
@@ -149,16 +149,16 @@ module.exports = Self => {
     async function getInvoiceableClients(ctx, options) {
         const models = Self.app.models;
         const args = ctx.args;
-        const minShipped = new Date();
+        const minShipped = Date.vnNew();
         minShipped.setFullYear(minShipped.getFullYear() - 1);
 
         const query = `SELECT
                     c.id,
                     SUM(IFNULL
                         (
-                            s.quantity * 
+                            s.quantity *
                             s.price * (100-s.discount)/100,
-                        0) 
+                        0)
                             + IFNULL(ts.quantity * ts.price,0)
                     ) AS sumAmount,
                     c.hasToInvoiceByAddress,
@@ -170,7 +170,7 @@ module.exports = Self => {
                 LEFT JOIN ticketService ts ON ts.ticketFk = t.id
                 JOIN address a ON a.id = t.addressFk
                 JOIN client c ON c.id = t.clientFk
-            WHERE ISNULL(t.refFk) AND c.id >= ? 
+            WHERE ISNULL(t.refFk) AND c.id >= ?
                 AND (t.clientFk <= ? OR ? IS NULL)
                 AND t.shipped BETWEEN ? AND util.dayEnd(?)
                 AND t.companyFk = ? AND c.hasToInvoice
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
index 297afa8e8..a458aa18e 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
@@ -108,14 +108,14 @@ module.exports = Self => {
                 throw new UserError(`This client is not invoiceable`);
 
             // Can't invoice tickets into future
-            const tomorrow = new Date();
+            const tomorrow = Date.vnNew();
             tomorrow.setDate(tomorrow.getDate() + 1);
 
             if (maxShipped >= tomorrow)
                 throw new UserError(`Can't invoice to future`);
 
             const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
-            if (new Date() < maxInvoiceDate)
+            if (Date.vnNew() < maxInvoiceDate)
                 throw new UserError(`Can't invoice to past`);
 
             if (ticketId) {
@@ -155,7 +155,7 @@ module.exports = Self => {
     async function isInvoiceable(clientId, options) {
         const models = Self.app.models;
         const query = `SELECT (hasToInvoice AND isTaxDataChecked) AS invoiceable
-                            FROM client 
+                            FROM client
                             WHERE id = ?`;
         const [result] = await models.InvoiceOut.rawSql(query, [clientId], options);
 
@@ -172,12 +172,12 @@ module.exports = Self => {
 
     async function getMaxIssued(serial, companyId, options) {
         const models = Self.app.models;
-        const query = `SELECT MAX(issued) AS issued 
-                        FROM invoiceOut 
+        const query = `SELECT MAX(issued) AS issued
+                        FROM invoiceOut
                         WHERE serial = ? AND companyFk = ?`;
         const [maxIssued] = await models.InvoiceOut.rawSql(query,
             [serial, companyId], options);
-        const maxInvoiceDate = maxIssued && maxIssued.issued || new Date();
+        const maxInvoiceDate = maxIssued && maxIssued.issued || Date.vnNew();
 
         return maxInvoiceDate;
     }
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js
index e5cf5fda0..d3d789393 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js
@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('InvoiceOut filter()', () => {
-    let today = new Date();
+    let today = Date.vnNew();
     today.setHours(2, 0, 0, 0);
 
     it('should return the invoice out matching ref', async() => {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js
index 5f890de26..9a0574dba 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/invoiceClient.spec.js
@@ -5,7 +5,7 @@ describe('InvoiceOut invoiceClient()', () => {
     const clientId = 1101;
     const addressId = 121;
     const companyFk = 442;
-    const minShipped = new Date();
+    const minShipped = Date.vnNew();
     minShipped.setFullYear(minShipped.getFullYear() - 1);
     minShipped.setMonth(1);
     minShipped.setDate(1);
@@ -33,8 +33,8 @@ describe('InvoiceOut invoiceClient()', () => {
             ctx.args = {
                 clientId: clientId,
                 addressId: addressId,
-                invoiceDate: new Date(),
-                maxShipped: new Date(),
+                invoiceDate: Date.vnNew(),
+                maxShipped: Date.vnNew(),
                 companyFk: companyFk,
                 minShipped: minShipped
             };
diff --git a/modules/invoiceOut/front/index/global-invoicing/index.js b/modules/invoiceOut/front/index/global-invoicing/index.js
index f772a4936..0c5773adc 100644
--- a/modules/invoiceOut/front/index/global-invoicing/index.js
+++ b/modules/invoiceOut/front/index/global-invoicing/index.js
@@ -6,7 +6,7 @@ class Controller extends Dialog {
     constructor($element, $, $transclude) {
         super($element, $, $transclude);
         this.invoice = {
-            maxShipped: new Date()
+            maxShipped: Date.vnNew()
         };
         this.clientsNumber = 'allClients';
     }
diff --git a/modules/invoiceOut/front/index/global-invoicing/index.spec.js b/modules/invoiceOut/front/index/global-invoicing/index.spec.js
index e88b0b1d4..aa9674b0e 100644
--- a/modules/invoiceOut/front/index/global-invoicing/index.spec.js
+++ b/modules/invoiceOut/front/index/global-invoicing/index.spec.js
@@ -76,8 +76,8 @@ describe('InvoiceOut', () => {
                 jest.spyOn(controller.vnApp, 'showError');
 
                 controller.invoice = {
-                    invoiceDate: new Date(),
-                    maxShipped: new Date()
+                    invoiceDate: Date.vnNew(),
+                    maxShipped: Date.vnNew()
                 };
 
                 controller.responseHandler('accept');
@@ -88,14 +88,14 @@ describe('InvoiceOut', () => {
             it('should make an http POST query and then call to the showSuccess() method', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess');
 
-                const minShipped = new Date();
+                const minShipped = Date.vnNew();
                 minShipped.setFullYear(minShipped.getFullYear() - 1);
                 minShipped.setMonth(1);
                 minShipped.setDate(1);
                 minShipped.setHours(0, 0, 0, 0);
                 controller.invoice = {
-                    invoiceDate: new Date(),
-                    maxShipped: new Date(),
+                    invoiceDate: Date.vnNew(),
+                    maxShipped: Date.vnNew(),
                     fromClientId: 1101,
                     toClientId: 1101,
                     companyFk: 442,
diff --git a/modules/invoiceOut/front/index/manual/index.js b/modules/invoiceOut/front/index/manual/index.js
index ed50e37da..3abe4b825 100644
--- a/modules/invoiceOut/front/index/manual/index.js
+++ b/modules/invoiceOut/front/index/manual/index.js
@@ -8,7 +8,7 @@ class Controller extends Dialog {
 
         this.isInvoicing = false;
         this.invoice = {
-            maxShipped: new Date()
+            maxShipped: Date.vnNew()
         };
     }
 
diff --git a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
index 68eacfbad..5a47de6bf 100644
--- a/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
+++ b/modules/item/back/methods/fixed-price/specs/upsertFixedPrice.spec.js
@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('upsertFixedPrice()', () => {
-    const now = new Date();
+    const now = Date.vnNew();
     const fixedPriceId = 1;
     let originalFixedPrice;
 
@@ -72,4 +72,45 @@ describe('upsertFixedPrice()', () => {
             throw e;
         }
     });
+
+    it(`should recalculate rate2 if change rate3`, async() => {
+        const tx = await models.FixedPrice.beginTransaction({});
+
+        const tomorrow = new Date(now);
+        tomorrow.setDate(tomorrow.getDate() + 1);
+
+        const rate2 = 2;
+        const firstRate3 = 1;
+        const secondRate3 = 2;
+        try {
+            const options = {transaction: tx};
+            const ctx = {args: {
+                id: undefined,
+                itemFk: 1,
+                warehouseFk: 1,
+                started: tomorrow,
+                ended: tomorrow,
+                rate2: rate2,
+                rate3: firstRate3,
+                minPrice: 0,
+                hasMinPrice: false
+            }};
+
+            // create new fixed price
+            const newFixedPrice = await models.FixedPrice.upsertFixedPrice(ctx, options);
+
+            // change rate3 to same fixed price id
+            ctx.args.id = newFixedPrice.id;
+            ctx.args.rate3 = secondRate3;
+
+            const result = await models.FixedPrice.upsertFixedPrice(ctx, options);
+
+            expect(result.rate2).not.toEqual(rate2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });
diff --git a/modules/item/back/methods/fixed-price/upsertFixedPrice.js b/modules/item/back/methods/fixed-price/upsertFixedPrice.js
index ad35ec3a1..eb3eec1bd 100644
--- a/modules/item/back/methods/fixed-price/upsertFixedPrice.js
+++ b/modules/item/back/methods/fixed-price/upsertFixedPrice.js
@@ -72,6 +72,16 @@ module.exports = Self => {
 
         try {
             delete args.ctx; // removed unwanted data
+
+            if (args.id) {
+                const beforeFixedPrice = await models.FixedPrice.findById(args.id, {fields: ['rate3']}, myOptions);
+                const [result] = await Self.rawSql(`SELECT vn.priceFixed_getRate2(?, ?) as rate2`,
+                    [args.id, args.rate3], myOptions);
+
+                if (beforeFixedPrice.rate3 != args.rate3 && result && result.rate2)
+                    args.rate2 = result.rate2;
+            }
+
             const fixedPrice = await models.FixedPrice.upsert(args, myOptions);
             const targetItem = await models.Item.findById(args.itemFk, null, myOptions);
 
diff --git a/modules/item/back/methods/item-image-queue/downloadImages.js b/modules/item/back/methods/item-image-queue/downloadImages.js
index 05b223598..0f57856c7 100644
--- a/modules/item/back/methods/item-image-queue/downloadImages.js
+++ b/modules/item/back/methods/item-image-queue/downloadImages.js
@@ -27,7 +27,7 @@ module.exports = Self => {
         });
 
         for (let image of images) {
-            const currentStamp = new Date().getTime();
+            const currentStamp = Date.vnNew().getTime();
             const updatedStamp = image.updated.getTime();
             const graceTime = Math.abs(currentStamp - updatedStamp);
             const maxTTL = 3600 * 48 * 1000; // 48 hours in ms;
@@ -97,7 +97,7 @@ module.exports = Self => {
                     await row.updateAttributes({
                         error: error,
                         attempts: row.attempts + 1,
-                        updated: new Date()
+                        updated: Date.vnNew()
                     });
                 }
 
diff --git a/modules/item/back/methods/item/getSummary.js b/modules/item/back/methods/item/getSummary.js
index 738976e60..6cd9d9511 100644
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@@ -98,9 +98,8 @@ module.exports = Self => {
         summary.tags = res[1];
         [summary.botanical] = res[2];
 
-        const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
-
-        res = await models.Item.getVisibleAvailable(summary.item.id, userConfig.warehouseFk, null, myOptions);
+        const itemConfig = await models.ItemConfig.findOne(null, myOptions);
+        res = await models.Item.getVisibleAvailable(summary.item.id, itemConfig.warehouseFk, undefined, myOptions);
 
         summary.available = res.available;
         summary.visible = res.visible;
diff --git a/modules/item/back/methods/item/getVisibleAvailable.js b/modules/item/back/methods/item/getVisibleAvailable.js
index b291ad9b4..612f64022 100644
--- a/modules/item/back/methods/item/getVisibleAvailable.js
+++ b/modules/item/back/methods/item/getVisibleAvailable.js
@@ -29,7 +29,7 @@ module.exports = Self => {
         }
     });
 
-    Self.getVisibleAvailable = async(id, warehouseFk, dated = new Date(), options) => {
+    Self.getVisibleAvailable = async(id, warehouseFk, dated = Date.vnNew(), options) => {
         const myOptions = {};
 
         if (typeof options == 'object')
diff --git a/modules/item/back/methods/item/getWasteByItem.js b/modules/item/back/methods/item/getWasteByItem.js
index b93d534da..56b90b04a 100644
--- a/modules/item/back/methods/item/getWasteByItem.js
+++ b/modules/item/back/methods/item/getWasteByItem.js
@@ -32,7 +32,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const wastes = await Self.rawSql(`
             SELECT *, 100 * dwindle / total AS percentage
@@ -43,7 +43,7 @@ module.exports = Self => {
                         sum(ws.saleTotal) AS total,
                         sum(ws.saleWaste) AS dwindle
                     FROM bs.waste ws
-                    WHERE buyer = ? AND family = ? 
+                    WHERE buyer = ? AND family = ?
                         AND year = YEAR(TIMESTAMPADD(WEEK,-1, ?))
                         AND week = WEEK(TIMESTAMPADD(WEEK,-1, ?), 1)
                     GROUP BY buyer, itemFk
diff --git a/modules/item/back/methods/item/getWasteByWorker.js b/modules/item/back/methods/item/getWasteByWorker.js
index 4c3c64a91..8fa351eed 100644
--- a/modules/item/back/methods/item/getWasteByWorker.js
+++ b/modules/item/back/methods/item/getWasteByWorker.js
@@ -19,7 +19,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const wastes = await Self.rawSql(`
             SELECT *, 100 * dwindle / total AS percentage
diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js
index 0878e3242..dfbcaa69f 100644
--- a/modules/item/back/methods/item/regularize.js
+++ b/modules/item/back/methods/item/regularize.js
@@ -94,8 +94,8 @@ module.exports = Self => {
         }
 
         async function createTicket(ctx, options) {
-            ctx.args.shipped = new Date();
-            ctx.args.landed = new Date();
+            ctx.args.shipped = Date.vnNew();
+            ctx.args.landed = Date.vnNew();
             ctx.args.companyId = null;
             ctx.args.agencyModeId = null;
             ctx.args.routeId = null;
@@ -106,10 +106,10 @@ module.exports = Self => {
         }
 
         async function getTicketId(params, options) {
-            const minDate = new Date();
+            const minDate = Date.vnNew();
             minDate.setHours(0, 0, 0, 0);
 
-            const maxDate = new Date();
+            const maxDate = Date.vnNew();
             maxDate.setHours(23, 59, 59, 59);
 
             let ticket = await Self.app.models.Ticket.findOne({
diff --git a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
index 8e4864ee8..61bf6b3e7 100644
--- a/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
+++ b/modules/item/back/methods/item/specs/getVisibleAvailable.spec.js
@@ -8,11 +8,11 @@ describe('item getVisibleAvailable()', () => {
         try {
             const itemFk = 1;
             const warehouseFk = 1;
-            const dated = new Date();
+            const dated = Date.vnNew();
 
             const result = await models.Item.getVisibleAvailable(itemFk, warehouseFk, dated, options);
 
-            expect(result.available).toEqual(187);
+            expect(result.available).toEqual(185);
             expect(result.visible).toEqual(92);
 
             await tx.rollback();
@@ -29,7 +29,7 @@ describe('item getVisibleAvailable()', () => {
         try {
             const itemFk = 1;
             const warehouseFk = 1;
-            const dated = new Date();
+            const dated = Date.vnNew();
             dated.setDate(dated.getDate() - 1);
 
             const result = await models.Item.getVisibleAvailable(itemFk, warehouseFk, dated, options);
diff --git a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
index 25e661aee..00488e534 100644
--- a/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
+++ b/modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
@@ -1,9 +1,9 @@
 const {models} = require('vn-loopback/server/server');
 describe('item lastEntriesFilter()', () => {
     it('should return one entry for the given item', async() => {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         const tx = await models.Item.beginTransaction({});
@@ -23,11 +23,11 @@ describe('item lastEntriesFilter()', () => {
     });
 
     it('should return five entries for the given item', async() => {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
         minDate.setMonth(minDate.getMonth() - 2, 1);
 
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         const tx = await models.Item.beginTransaction({});
diff --git a/modules/item/back/methods/tag/onSubmit.js b/modules/item/back/methods/tag/onSubmit.js
new file mode 100644
index 000000000..7abbe60d4
--- /dev/null
+++ 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;
+        }
+    };
+};
diff --git a/modules/item/back/methods/tag/specs/onSubmit.spec.js b/modules/item/back/methods/tag/specs/onSubmit.spec.js
new file mode 100644
index 000000000..f24aad7e4
--- /dev/null
+++ 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;
+        }
+    });
+});
diff --git a/modules/item/back/models/item-config.json b/modules/item/back/models/item-config.json
index 36d25e0bb..c7a0b2644 100644
--- a/modules/item/back/models/item-config.json
+++ b/modules/item/back/models/item-config.json
@@ -25,6 +25,9 @@
         },
         "defaultTag": {
             "type": "int"
+        },
+        "warehouseFk": {
+            "type": "int"
         }
     },
     "relations": {
diff --git a/modules/item/back/models/tag.js b/modules/item/back/models/tag.js
index 43fbc0db3..92760e34f 100644
--- 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);
 };
diff --git a/modules/item/front/card/index.html b/modules/item/front/card/index.html
index e92e1696d..330d274c0 100644
--- a/modules/item/front/card/index.html
+++ b/modules/item/front/card/index.html
@@ -1,6 +1,6 @@
 <vn-portal slot="menu">
-    <vn-item-descriptor 
-        warehouse-fk="$ctrl.vnConfig.warehouseFk"
+    <vn-item-descriptor
+        warehouse-fk="$ctrl.warehouseFk"
         item="$ctrl.item"
         card-reload="$ctrl.reload()"></vn-item-descriptor>
     <vn-left-menu source="card"></vn-left-menu>
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 321545b38..8e85e043f 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -19,7 +19,7 @@
     <slot-before>
         <div class="photo" text-center>
             <img vn-id="photo"
-                ng-src="{{$root.imagePath('catalog', '200x200', $ctrl.item.id)}}" 
+                ng-src="{{$root.imagePath('catalog', '200x200', $ctrl.item.id)}}"
                 zoom-image="{{$root.imagePath('catalog', '1600x900', $ctrl.item.id)}}"
                 on-error-src/>
             <vn-float-button ng-click="uploadPhoto.show('catalog', $ctrl.item.id)"
@@ -36,13 +36,23 @@
                 <p translate>Available</p>
                 <p>{{$ctrl.available | dashIfEmpty}}</p>
             </vn-one>
+            <vn-one>
+                <p>
+                    <vn-icon
+                        ng-if="$ctrl.showIcon"
+                        icon="info_outline"
+                        vn-tooltip="{{$ctrl.warehouseText}}"
+                        pointer>
+                    </vn-icon>
+                </p>
+            </vn-one>
         </vn-horizontal>
     </slot-before>
     <slot-body>
         <div class="attributes">
             <vn-label-value
                 label="Buyer">
-                <span 
+                <span
                     ng-click="workerDescriptor.show($event, $ctrl.item.itemType.worker.userFk)"
                     class="link">
                     {{$ctrl.item.itemType.worker.user.name}}
@@ -50,22 +60,22 @@
             </vn-label-value>
             <vn-label-value
                 label="{{$ctrl.item.tag5}}"
-                ng-if="$ctrl.item.value5"  
+                ng-if="$ctrl.item.value5"
                 value="{{$ctrl.item.value5}}">
             </vn-label-value>
             <vn-label-value
-                label="{{$ctrl.item.tag6}}" 
-                ng-if="$ctrl.item.value6"  
+                label="{{$ctrl.item.tag6}}"
+                ng-if="$ctrl.item.value6"
                 value="{{$ctrl.item.value6}}">
             </vn-label-value>
             <vn-label-value
-                label="{{$ctrl.item.tag7}}" 
-                ng-if="$ctrl.item.value7"  
+                label="{{$ctrl.item.tag7}}"
+                ng-if="$ctrl.item.value7"
                 value="{{$ctrl.item.value7}}">
             </vn-label-value>
             <vn-label-value
-                label="{{$ctrl.item.tag8}}" 
-                ng-if="$ctrl.item.value8"  
+                label="{{$ctrl.item.tag8}}"
+                ng-if="$ctrl.item.value8"
                 value="{{$ctrl.item.value8}}">
             </vn-label-value>
         </div>
@@ -112,7 +122,7 @@
     question="Do you want to clone this item?"
     message="All it's properties will be copied">
 </vn-confirm>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
 <vn-popup vn-id="summary">
@@ -120,7 +130,7 @@
 </vn-popup>
 
 <!-- Upload photo dialog -->
-<vn-upload-photo 
-    vn-id="uploadPhoto" 
+<vn-upload-photo
+    vn-id="uploadPhoto"
     on-response="$ctrl.onUploadResponse()">
-</vn-upload-photo>
\ No newline at end of file
+</vn-upload-photo>
diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js
index 133b11b48..972c89ae0 100644
--- a/modules/item/front/descriptor/index.js
+++ b/modules/item/front/descriptor/index.js
@@ -30,7 +30,10 @@ class Controller extends Descriptor {
 
     set warehouseFk(value) {
         this._warehouseFk = value;
-        if (value) this.updateStock();
+        if (value) {
+            this.updateStock();
+            this.getWarehouseName(value);
+        }
     }
 
     loadData() {
@@ -80,7 +83,7 @@ class Controller extends Descriptor {
     }
 
     onUploadResponse() {
-        const timestamp = new Date().getTime();
+        const timestamp = Date.vnNew().getTime();
         const src = this.$rootScope.imagePath('catalog', '200x200', this.item.id);
         const zoomSrc = this.$rootScope.imagePath('catalog', '1600x900', this.item.id);
         const newSrc = `${src}&t=${timestamp}`;
@@ -89,6 +92,22 @@ class Controller extends Descriptor {
         this.$.photo.setAttribute('src', newSrc);
         this.$.photo.setAttribute('zoom-image', newZoomSrc);
     }
+
+    getWarehouseName(warehouseFk) {
+        this.showIcon = false;
+
+        const filter = {
+            where: {id: warehouseFk}
+        };
+        this.$http.get('Warehouses/findOne', {filter})
+            .then(res => {
+                this.warehouseText = this.$t('WarehouseFk', {
+                    warehouseName: res.data.name
+                });
+
+                this.showIcon = true;
+            });
+    }
 }
 
 Controller.$inject = ['$element', '$scope', '$rootScope'];
@@ -100,6 +119,6 @@ ngModule.vnComponent('vnItemDescriptor', {
         item: '<',
         dated: '<',
         cardReload: '&',
-        warehouseFk: '<?'
+        warehouseFk: '<'
     }
 });
diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index c997ea491..945e1fd31 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -7,7 +7,7 @@ class Controller extends Section {
         super($element, $scope);
         this.$anchorScroll = $anchorScroll;
         this.$location = $location;
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         this.today = today.toJSON();
     }
@@ -37,6 +37,7 @@ class Controller extends Section {
     set warehouseFk(value) {
         if (value && value != this._warehouseFk) {
             this._warehouseFk = value;
+            this.card.warehouseFk = value;
 
             this.$state.go(this.$state.current.name, {
                 warehouseFk: value
@@ -76,5 +77,8 @@ ngModule.vnComponent('vnItemDiary', {
     controller: Controller,
     bindings: {
         item: '<'
+    },
+    require: {
+        card: '?^vnItemCard'
     }
 });
diff --git a/modules/item/front/diary/index.spec.js b/modules/item/front/diary/index.spec.js
index a80fbfc69..a6302346d 100644
--- a/modules/item/front/diary/index.spec.js
+++ b/modules/item/front/diary/index.spec.js
@@ -14,6 +14,7 @@ describe('Item', () => {
             controller = $componentController('vnItemDiary', {$element, $scope});
             controller.$.model = crudModel;
             controller.$params = {id: 1};
+            controller.card = {};
         }));
 
         describe('set item()', () => {
diff --git a/modules/item/front/fixed-price/index.html b/modules/item/front/fixed-price/index.html
index f9d177562..ce7cefe7a 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -131,7 +131,7 @@
                                             class="dense"
                                             vn-focus
                                             ng-model="price.rate3"
-                                            on-change="$ctrl.upsertPrice(price); $ctrl.recalculateRate2(price)"
+                                            on-change="$ctrl.upsertPrice(price);"
                                             step="0.01"s>
                                         </vn-input-number>
                                     </field>
diff --git a/modules/item/front/fixed-price/index.js b/modules/item/front/fixed-price/index.js
index f03d73f08..df2989043 100644
--- a/modules/item/front/fixed-price/index.js
+++ b/modules/item/front/fixed-price/index.js
@@ -113,24 +113,6 @@ export default class Controller extends Section {
             return {[param]: value};
         }
     }
-
-    recalculateRate2(price) {
-        if (!price.id || !price.rate3) return;
-
-        const query = 'FixedPrices/getRate2';
-        const params = {
-            fixedPriceId: price.id,
-            rate3: price.rate3
-        };
-        this.$http.get(query, {params})
-            .then(res => {
-                const rate2 = res.data.rate2;
-                if (rate2) {
-                    price.rate2 = rate2;
-                    this.upsertPrice(price);
-                }
-            });
-    }
 }
 
 ngModule.vnComponent('vnFixedPrice', {
diff --git a/modules/item/front/fixed-price/index.spec.js b/modules/item/front/fixed-price/index.spec.js
index db9579444..42dd898b3 100644
--- a/modules/item/front/fixed-price/index.spec.js
+++ b/modules/item/front/fixed-price/index.spec.js
@@ -24,7 +24,7 @@ describe('fixed price', () => {
             });
 
             it('should perform an http request to update the price', () => {
-                const now = new Date();
+                const now = Date.vnNew();
                 jest.spyOn(controller.vnApp, 'showSuccess');
 
                 $httpBackend.expectPATCH('FixedPrices/upsertFixedPrice').respond();
@@ -85,25 +85,5 @@ describe('fixed price', () => {
                 expect(controller.$.model.remove).toHaveBeenCalled();
             });
         });
-
-        describe('recalculateRate2()', () => {
-            it(`should rate2 recalculate`, () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                const price = {
-                    id: 1,
-                    itemFk: 1,
-                    rate2: 2,
-                    rate3: 2
-                };
-                const response = {rate2: 1};
-                controller.recalculateRate2(price);
-
-                const query = `FixedPrices/getRate2?fixedPriceId=${price.id}&rate3=${price.rate3}`;
-                $httpBackend.expectGET(query).respond(response);
-                $httpBackend.flush();
-
-                expect(price.rate2).toEqual(response.rate2);
-            });
-        });
     });
 });
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 0348d4f66..f6cdf8343 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -9,15 +9,17 @@
 </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"
+            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">
         </vn-date-picker>
     </vn-horizontal>
@@ -35,8 +37,7 @@
                         <vn-th field="warehouseFk">Warehouse</vn-th>
                         <vn-th field="landed">Landed</vn-th>
                         <vn-th number>Entry</vn-th>
-                        <vn-th number vn-tooltip="Price Per Unit">P.P.U</vn-th>
-                        <vn-th number vn-tooltip="Price Per Package">P.P.P</vn-th>
+                        <vn-th vn-tooltip="Grouping / Packing" expand>PVP</vn-th>
                         <vn-th number class="expendable">Label</vn-th>
                         <vn-th number>Packing</vn-th>
                         <vn-th number>Grouping</vn-th>
@@ -51,7 +52,7 @@
                 <vn-tbody>
                     <vn-tr ng-repeat="entry in entries">
                         <vn-td center>
-                            <vn-check 
+                            <vn-check
                                 ng-model="entry.isIgnored"
                                 disabled="true">
                             </vn-check>
@@ -65,30 +66,31 @@
                                 {{::entry.entryFk | dashIfEmpty}}
                             </span>
                         </vn-td>
-                        <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
+                        <vn-td title="Grouping / Packing">
+                            {{::entry.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::entry.price3 | currency: 'EUR':2 | dashIfEmpty}}
+                        </vn-td>
                         <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
                         <vn-td number>
-                            <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}"> 
+                            <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}">
                                 <span>{{::entry.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <vn-td number>
-                            <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}"> 
+                            <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}">
                                 <span>{{::entry.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.quantity}}</vn-td>
-                        <vn-td number 
+                        <vn-td number
                             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>
@@ -113,24 +115,24 @@
             ng-click="contextmenu.filterBySelection()">
             Filter by selection
         </vn-item>
-        <vn-item translate 
-            ng-if="contextmenu.isFilterAllowed()" 
+        <vn-item translate
+            ng-if="contextmenu.isFilterAllowed()"
             ng-click="contextmenu.excludeSelection()">
             Exclude selection
         </vn-item>
-        <vn-item translate 
-            ng-if="contextmenu.isFilterAllowed()" 
+        <vn-item translate
+            ng-if="contextmenu.isFilterAllowed()"
             ng-click="contextmenu.removeFilter()">
             Remove filter
         </vn-item>
-        <vn-item translate 
+        <vn-item translate
             ng-click="contextmenu.removeAllFilters()">
             Remove all filters
         </vn-item>
-        <vn-item translate 
-            ng-if="contextmenu.isActionAllowed()" 
+        <vn-item translate
+            ng-if="contextmenu.isActionAllowed()"
             ng-click="contextmenu.copyValue()">
             Copy value
         </vn-item>
     </slot-menu>
-</vn-contextmenu>
\ No newline at end of file
+</vn-contextmenu>
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 014761da9..0c6804838 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -5,11 +5,11 @@ class Controller extends Section {
     constructor($element, $) {
         super($element, $);
 
-        const from = new Date();
+        const from = Date.vnNew();
         from.setDate(from.getDate() - 75);
         from.setHours(0, 0, 0, 0);
 
-        const to = new Date();
+        const to = Date.vnNew();
         to.setDate(to.getDate() + 10);
         to.setHours(23, 59, 59, 59);
 
diff --git a/modules/item/front/request-search-panel/index.spec.js b/modules/item/front/request-search-panel/index.spec.js
index 2fb339209..56c76eabf 100644
--- a/modules/item/front/request-search-panel/index.spec.js
+++ b/modules/item/front/request-search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe(' Component vnRequestSearchPanel', () => {
         it('should clear the scope days when setting the from property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.from = new Date();
+            controller.from = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.from).toBeDefined();
@@ -26,7 +26,7 @@ describe(' Component vnRequestSearchPanel', () => {
         it('should clear the scope days when setting the to property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.to = new Date();
+            controller.to = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.to).toBeDefined();
@@ -35,8 +35,8 @@ describe(' Component vnRequestSearchPanel', () => {
 
     describe('scopeDays() setter', () => {
         it('should clear the date range when setting the scopeDays property', () => {
-            controller.filter.from = new Date();
-            controller.filter.to = new Date();
+            controller.filter.from = Date.vnNew();
+            controller.filter.to = Date.vnNew();
 
             controller.scopeDays = 1;
 
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index 2fe08ada6..747cbeff2 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -7,10 +7,10 @@ export default class Controller extends Section {
         super($element, $);
 
         if (!this.$state.q) {
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(0, 0, 0, 0);
 
-            const nextWeek = new Date();
+            const nextWeek = Date.vnNew();
             nextWeek.setHours(23, 59, 59, 59);
             nextWeek.setDate(nextWeek.getDate() + 7);
 
@@ -27,7 +27,7 @@ export default class Controller extends Section {
             $params.scopeDays = 1;
 
         if (typeof $params.scopeDays === 'number') {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
             const to = new Date(from.getTime());
@@ -82,7 +82,7 @@ export default class Controller extends Section {
     }
 
     compareDate(date) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         let timeTicket = new Date(date);
         timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/item/front/request/index.spec.js b/modules/item/front/request/index.spec.js
index 0fc061023..aadeaddca 100644
--- a/modules/item/front/request/index.spec.js
+++ b/modules/item/front/request/index.spec.js
@@ -93,7 +93,7 @@ describe('Item', () => {
             });
 
             it(`should return "warning" if date is today`, () => {
-                let date = new Date();
+                let date = Date.vnNew();
                 let result = controller.compareDate(date);
 
                 expect(result).toEqual('warning');
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 8f958bd3b..57f127db0 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -11,7 +11,7 @@
     <vn-horizontal>
         <vn-one>
             <img style="width: 100%; display: block;"
-                ng-src="{{$root.imagePath('catalog', '200x200', $ctrl.item.id)}}" 
+                ng-src="{{$root.imagePath('catalog', '200x200', $ctrl.item.id)}}"
                 zoom-image="{{$root.imagePath('catalog', '1600x900', $ctrl.item.id)}}" on-error-src/>
             <vn-horizontal class="item-state">
                 <vn-one>
@@ -22,44 +22,54 @@
                     <p translate>Available</p>
                     <p>{{$ctrl.summary.available}}</p>
                 </vn-one>
+                <vn-one>
+                    <p>
+                        <vn-icon
+                            ng-if="$ctrl.warehouseText != null"
+                            icon="info_outline"
+                            vn-tooltip="{{$ctrl.warehouseText}}"
+                            pointer>
+                        </vn-icon>
+                    </p>
+                </vn-one>
             </vn-horizontal>
         </vn-one>
         <vn-one name="basicData">
             <h4 ng-show="$ctrl.isBuyer">
-                <a 
+                <a
                     ui-sref="item.card.basicData({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Basic data</span>
                 </a>
             </h4>
             <h4
-                translate 
+                translate
                 ng-show="!$ctrl.isBuyer">
                 Basic data
             </h4>
             <vn-label-value label="Name"
                 value="{{$ctrl.summary.item.name}}">
             </vn-label-value>
-            <vn-label-value label="Full name" 
+            <vn-label-value label="Full name"
                 value="{{$ctrl.summary.item.longName}}">
             </vn-label-value>
-            <vn-label-value label="Item family" 
+            <vn-label-value label="Item family"
                 value="{{$ctrl.summary.item.itemType.name}}">
             </vn-label-value>
-            <vn-label-value label="Size" 
+            <vn-label-value label="Size"
                 value="{{$ctrl.summary.item.size}}">
             </vn-label-value>
-            <vn-label-value label="Origin" 
+            <vn-label-value label="Origin"
                 value="{{$ctrl.summary.item.origin.name}}">
             </vn-label-value>
-            <vn-label-value label="stems" 
+            <vn-label-value label="stems"
                 value="{{$ctrl.summary.item.stems}}">
             </vn-label-value>
-            <vn-label-value label="Multiplier" 
+            <vn-label-value label="Multiplier"
                 value="{{$ctrl.summary.item.stemMultiplier}}">
             </vn-label-value>
             <vn-label-value label="Buyer">
-                <span 
+                <span
                     ng-click="workerDescriptor.show($event, $ctrl.summary.item.itemType.worker.userFk)"
                     class="link">
                     {{$ctrl.summary.item.itemType.worker.user.name}}
@@ -98,45 +108,45 @@
         </vn-one>
         <vn-one name="otherData">
             <h4 ng-show="$ctrl.isBuyer">
-                <a 
+                <a
                     ui-sref="item.card.basicData({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Other data</span>
                 </a>
             </h4>
             <h4
-                translate 
+                translate
                 ng-show="!$ctrl.isBuyer">
                 Other data
             </h4>
-            <vn-label-value label="Intrastat code" 
+            <vn-label-value label="Intrastat code"
                 value="{{$ctrl.summary.item.intrastat.id}}">
             </vn-label-value>
-            <vn-label-value label="Intrastat" 
+            <vn-label-value label="Intrastat"
                 value="{{$ctrl.summary.item.intrastat.description}}">
             </vn-label-value>
-            <vn-label-value label="Reference" 
+            <vn-label-value label="Reference"
                 value="{{$ctrl.summary.item.comment}}">
             </vn-label-value>
-            <vn-label-value label="Relevancy" 
+            <vn-label-value label="Relevancy"
                 value="{{$ctrl.summary.item.relevancy}}">
             </vn-label-value>
-            <vn-label-value label="Weight/Piece" 
+            <vn-label-value label="Weight/Piece"
                 value="{{$ctrl.summary.item.weightByPiece}}">
             </vn-label-value>
-            <vn-label-value label="Expense" 
+            <vn-label-value label="Expense"
                 value="{{$ctrl.summary.item.expense.name}}">
             </vn-label-value>
         </vn-one>
         <vn-one name="tags">
             <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
-                <a 
+                <a
                     ui-sref="item.card.tags({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Tags</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 translate
                 ng-show="!$ctrl.isBuyer && !$ctrl.isReplenisher">
                 Tags
@@ -149,14 +159,14 @@
         </vn-one>
         <vn-one name="description" ng-if="$ctrl.summary.item.description">
             <h4 ng-show="$ctrl.isBuyer">
-                <a 
+                <a
                     ui-sref="item.card.basicData({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Description</span>
                 </a>
             </h4>
             <h4
-                translate 
+                translate
                 ng-show="!$ctrl.isBuyer">
                 Description
             </h4>
@@ -166,13 +176,13 @@
         </vn-one>
         <vn-one name="tax">
             <h4 ng-show="$ctrl.isBuyer || $ctrl.isAdministrative">
-                <a 
+                <a
                     ui-sref="item.card.tax({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Tax</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 translate
                 ng-show="!$ctrl.isBuyer && !$ctrl.isAdministrative">
                 Tax
@@ -184,33 +194,33 @@
         </vn-one>
         <vn-one name="botanical">
             <h4 ng-show="$ctrl.isBuyer">
-                <a 
+                <a
                     ui-sref="item.card.botanical({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Botanical</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 translate
                 ng-show="!$ctrl.isBuyer">
                 Botanical
             </h4>
-            <vn-label-value label="Genus" 
+            <vn-label-value label="Genus"
                 value="{{$ctrl.summary.botanical.genus.name}}">
             </vn-label-value>
-            <vn-label-value label="Specie" 
+            <vn-label-value label="Specie"
                 value="{{$ctrl.summary.botanical.specie.name}}">
             </vn-label-value>
         </vn-one>
         <vn-one name="barcode">
             <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
-                <a 
+                <a
                     ui-sref="item.card.itemBarcode({id:$ctrl.item.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Barcode</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 translate
                 ng-show="!$ctrl.isBuyer && !$ctrl.isReplenisher">
                 Barcode
@@ -221,6 +231,6 @@
         </vn-one>
     </vn-horizontal>
 </vn-card>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="workerDescriptor">
-</vn-worker-descriptor-popover>
\ No newline at end of file
+</vn-worker-descriptor-popover>
diff --git a/modules/item/front/summary/index.js b/modules/item/front/summary/index.js
index 52753ff65..e17a6a8c4 100644
--- a/modules/item/front/summary/index.js
+++ b/modules/item/front/summary/index.js
@@ -7,6 +7,24 @@ class Controller extends Summary {
         this.$http.get(`Items/${this.item.id}/getSummary`).then(response => {
             this.summary = response.data;
         });
+
+        this.$http.get('ItemConfigs/findOne')
+            .then(res => {
+                if (this.card) this.card.warehouseFk = res.data.warehouseFk;
+                this.getWarehouseName(res.data.warehouseFk);
+            });
+    }
+
+    getWarehouseName(warehouseFk) {
+        const filter = {
+            where: {id: warehouseFk}
+        };
+        this.$http.get('Warehouses/findOne', {filter})
+            .then(res => {
+                this.warehouseText = this.$t('WarehouseFk', {
+                    warehouseName: res.data.name
+                });
+            });
     }
 
     $onChanges() {
@@ -37,4 +55,7 @@ ngModule.vnComponent('vnItemSummary', {
     bindings: {
         item: '<',
     },
+    require: {
+        card: '?^vnItemCard'
+    }
 });
diff --git a/modules/item/front/summary/index.spec.js b/modules/item/front/summary/index.spec.js
index 0b349194c..d7821bea0 100644
--- a/modules/item/front/summary/index.spec.js
+++ b/modules/item/front/summary/index.spec.js
@@ -14,12 +14,15 @@ describe('Item', () => {
             const $element = angular.element('<vn-item-summary></vn-item-summary>');
             controller = $componentController('vnItemSummary', {$element, $scope});
             controller.item = {id: 1};
+            controller.card = {};
         }));
 
         describe('getSummary()', () => {
             it('should perform a query to set summary', () => {
                 let data = {id: 1, name: 'Gem of mind'};
                 $httpBackend.expect('GET', `Items/1/getSummary`).respond(200, data);
+                $httpBackend.expect('GET', `ItemConfigs/findOne`).respond({});
+                $httpBackend.expect('GET', `Warehouses/findOne`).respond({});
                 controller.getSummary();
                 $httpBackend.flush();
 
diff --git a/modules/item/front/summary/locale/en.yml b/modules/item/front/summary/locale/en.yml
new file mode 100644
index 000000000..0ec208720
--- /dev/null
+++ b/modules/item/front/summary/locale/en.yml
@@ -0,0 +1 @@
+WarehouseFk: Calculated on the warehouse of {{ warehouseName }}
diff --git a/modules/item/front/summary/locale/es.yml b/modules/item/front/summary/locale/es.yml
index a87a04857..2e78841ae 100644
--- a/modules/item/front/summary/locale/es.yml
+++ b/modules/item/front/summary/locale/es.yml
@@ -1,3 +1,4 @@
 Barcode: Códigos de barras
 Other data: Otros datos
-Go to the item: Ir al artículo
\ No newline at end of file
+Go to the item: Ir al artículo
+WarehouseFk: Calculado sobre el almacén de {{ warehouseName }}
diff --git a/modules/item/front/summary/style.scss b/modules/item/front/summary/style.scss
index 7d5e3b609..d047f3e36 100644
--- a/modules/item/front/summary/style.scss
+++ b/modules/item/front/summary/style.scss
@@ -29,7 +29,11 @@ vn-item-summary {
         padding: 0;
 
         &:nth-child(1) {
-            border-right: 1px solid white; 
+            border-right: 1px solid white;
+        }
+
+        &:nth-child(2) {
+            border-right: 1px solid white;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html
index c040b9984..f9b5370fa 100644
--- 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>
\ No newline at end of file
+</form>
diff --git a/modules/item/front/tags/index.js b/modules/item/front/tags/index.js
index 3b3cd58ef..2c3b39d45 100644
--- a/modules/item/front/tags/index.js
+++ b/modules/item/front/tags/index.js
@@ -29,8 +29,15 @@ 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();
diff --git a/modules/mdb/back/methods/mdbApp/lock.js b/modules/mdb/back/methods/mdbApp/lock.js
index 98e61fb53..a12a93814 100644
--- a/modules/mdb/back/methods/mdbApp/lock.js
+++ b/modules/mdb/back/methods/mdbApp/lock.js
@@ -51,7 +51,7 @@ module.exports = Self => {
 
             const updatedMdbApp = await mdbApp.updateAttributes({
                 userFk: userId,
-                locked: new Date()
+                locked: Date.vnNew()
             }, myOptions);
 
             if (tx) await tx.commit();
diff --git a/modules/mdb/back/methods/mdbVersion/upload.js b/modules/mdb/back/methods/mdbVersion/upload.js
index 1df4365a9..864a73f52 100644
--- a/modules/mdb/back/methods/mdbVersion/upload.js
+++ b/modules/mdb/back/methods/mdbVersion/upload.js
@@ -26,6 +26,11 @@ module.exports = Self => {
                 type: 'string',
                 required: true,
                 description: `The old version number`
+            }, {
+                arg: 'description',
+                type: 'string',
+                required: false,
+                description: `The description of changes`
             }, {
                 arg: 'unlock',
                 type: 'boolean',
@@ -42,8 +47,7 @@ module.exports = Self => {
             verb: 'POST'
         }
     });
-
-    Self.upload = async(ctx, appName, toVersion, branch, fromVersion, unlock, options) => {
+    Self.upload = async(ctx, options) => {
         const models = Self.app.models;
         const myOptions = {};
         const $t = ctx.req.__; // $translate
@@ -51,6 +55,12 @@ module.exports = Self => {
         const AccessContainer = models.AccessContainer;
         const fileOptions = {};
         let tx;
+        const appName = ctx.args.appName;
+        const toVersion = ctx.args.toVersion;
+        const branch = ctx.args.branch;
+        const fromVersion = ctx.args.fromVersion;
+        let description = ctx.args.description;
+        const unlock = ctx.args.unlock;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -132,13 +142,46 @@ module.exports = Self => {
                     await fs.symlink(rootRelative, destinationRoot);
                 }
             }
+            if (description) {
+                let formatDesc;
+                const mainBranches = new Set(['master', 'test', 'dev']);
+                if (mainBranches.has(branch))
+                    formatDesc = `> :branch_${branch}: `;
+                else
+                    formatDesc = `> :branch: `;
 
+                formatDesc += `*${appName.toUpperCase()}* v.${toVersion} `;
+
+                const oldVersion = await models.MdbVersionTree.findOne({
+                    where: {version: fromVersion},
+                    fields: ['branchFk']
+                }, myOptions);
+
+                if (branch == oldVersion.branchFk)
+                    formatDesc += `[*${branch}*]: `;
+                else
+                    formatDesc += `[*${oldVersion.branchFk}* » *${branch}*]: `;
+
+                const params = await models.MdbConfig.findOne(myOptions);
+                const issueTrackerUrl = params.issueTrackerUrl;
+                const issueNumberRegex = params.issueNumberRegex;
+                const chatDestination = params.chatDestination;
+
+                const regex = new RegExp(issueNumberRegex, 'g');
+                formatDesc += description.replace(regex, (match, issueId) => {
+                    const newUrl = issueTrackerUrl.replace('{index}', issueId);
+                    return `[#${issueId}](${newUrl})`;
+                });
+
+                await models.Chat.send(ctx, chatDestination, formatDesc, myOptions);
+            }
             await models.MdbVersionTree.create({
                 app: appName,
                 version: toVersion,
                 branchFk: branch,
                 fromVersion,
-                userFk: userId
+                userFk: userId,
+                description,
             }, myOptions);
 
             await models.MdbVersion.upsert({
diff --git a/modules/mdb/back/model-config.json b/modules/mdb/back/model-config.json
index 8010afca2..b59a4fda0 100644
--- a/modules/mdb/back/model-config.json
+++ b/modules/mdb/back/model-config.json
@@ -11,6 +11,9 @@
     "MdbVersionTree": {
         "dataSource": "vn"
     },
+    "MdbConfig": {
+        "dataSource": "vn"
+    },
     "AccessContainer": {
         "dataSource": "accessStorage"
     }
diff --git a/modules/mdb/back/models/mdbBranch.json b/modules/mdb/back/models/mdbBranch.json
index 486dfaf25..b22d14ece 100644
--- a/modules/mdb/back/models/mdbBranch.json
+++ b/modules/mdb/back/models/mdbBranch.json
@@ -11,6 +11,11 @@
             "id": true,
             "type": "string",
             "description": "Identifier"
+        },
+        "dsName": {
+            "id": true,
+            "type": "string",
+            "description": "ODBC name"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/mdb/back/models/mdbConfig.json b/modules/mdb/back/models/mdbConfig.json
new file mode 100644
index 000000000..60634104a
--- /dev/null
+++ b/modules/mdb/back/models/mdbConfig.json
@@ -0,0 +1,24 @@
+{
+    "name": "MdbConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "mdbConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "string",
+            "id": true
+        },
+        "issueTrackerUrl": {
+            "type": "string"
+        },
+        "issueNumberRegex": {
+            "type": "string"
+        },
+        "chatDestination": {
+            "type": "string"
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/mdb/back/models/mdbVersionTree.json b/modules/mdb/back/models/mdbVersionTree.json
index 8c0260e54..106473b64 100644
--- a/modules/mdb/back/models/mdbVersionTree.json
+++ b/modules/mdb/back/models/mdbVersionTree.json
@@ -23,6 +23,9 @@
         },
         "userFk": {
             "type": "number"
+        },
+        "description": {
+            "type": "string"
         }
     },
     "relations": {
diff --git a/modules/monitor/back/methods/sales-monitor/clientsFilter.js b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
index 09ea24eb1..13e38f8e1 100644
--- a/modules/monitor/back/methods/sales-monitor/clientsFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/clientsFilter.js
@@ -34,7 +34,7 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const stmt = new ParameterizedSQL(`
             SELECT
@@ -51,7 +51,7 @@ module.exports = Self => {
                 JOIN account.user u ON c.salesPersonFk = u.id
                 LEFT JOIN sharingCart sc ON sc.workerFk = c.salesPersonFk
                     AND ? BETWEEN sc.started AND sc.ended
-                LEFT JOIN workerTeamCollegues wtc 
+                LEFT JOIN workerTeamCollegues wtc
                     ON wtc.collegueFk = IFNULL(sc.workerSubstitute, c.salesPersonFk)`,
         [date]);
 
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 7be130dda..881fc637a 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -104,7 +104,7 @@ module.exports = Self => {
         const userId = ctx.req.accessToken.userId;
         const conn = Self.dataSource.connector;
         const models = Self.app.models;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const args = ctx.args;
         const myOptions = {};
diff --git a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
index bcb37830c..febfc5357 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/clientsFilter.spec.js
@@ -8,8 +8,8 @@ describe('SalesMonitor clientsFilter()', () => {
             const options = {transaction: tx};
             const ctx = {req: {accessToken: {userId: 18}}, args: {}};
 
-            const from = new Date();
-            const to = new Date();
+            const from = Date.vnNew();
+            const to = Date.vnNew();
             from.setHours(0, 0, 0, 0);
             to.setHours(23, 59, 59, 59);
 
@@ -35,9 +35,9 @@ describe('SalesMonitor clientsFilter()', () => {
         try {
             const options = {transaction: tx};
             const ctx = {req: {accessToken: {userId: 18}}, args: {}};
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setDate(yesterday.getDate() - 1);
-            const today = new Date();
+            const today = Date.vnNew();
             yesterday.setHours(0, 0, 0, 0);
             today.setHours(23, 59, 59, 59);
 
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index d2e1a5bec..4e0fb85b7 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -26,9 +26,9 @@ describe('SalesMonitor salesFilter()', () => {
         try {
             const options = {transaction: tx};
 
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setHours(0, 0, 0, 0);
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(23, 59, 59, 59);
 
             const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -54,10 +54,10 @@ describe('SalesMonitor salesFilter()', () => {
         try {
             const options = {transaction: tx};
 
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setDate(yesterday.getDate() - 1);
             yesterday.setHours(0, 0, 0, 0);
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(23, 59, 59, 59);
 
             const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -205,10 +205,10 @@ describe('SalesMonitor salesFilter()', () => {
         try {
             const options = {transaction: tx};
 
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setDate(yesterday.getDate() - 1);
             yesterday.setHours(0, 0, 0, 0);
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(23, 59, 59, 59);
 
             const ctx = {req: {accessToken: {userId: 18}}, args: {}};
@@ -234,10 +234,10 @@ describe('SalesMonitor salesFilter()', () => {
         try {
             const options = {transaction: tx};
 
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setDate(yesterday.getDate() - 1);
             yesterday.setHours(0, 0, 0, 0);
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(23, 59, 59, 59);
 
             const ctx = {req: {accessToken: {userId: 18}}, args: {}};
diff --git a/modules/monitor/front/index/clients/index.js b/modules/monitor/front/index/clients/index.js
index 58613f09d..ac3ce9140 100644
--- a/modules/monitor/front/index/clients/index.js
+++ b/modules/monitor/front/index/clients/index.js
@@ -5,7 +5,7 @@ export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
 
-        const date = new Date();
+        const date = Date.vnNew();
         this.dateFrom = date;
         this.dateTo = date;
         this.filter = {
@@ -64,9 +64,9 @@ export default class Controller extends Section {
         let from = this.dateFrom;
         let to = this.dateTo;
         if (!from)
-            from = new Date();
+            from = Date.vnNew();
         if (!to)
-            to = new Date();
+            to = Date.vnNew();
         const minHour = new Date(from);
         minHour.setHours(0, 0, 0, 0);
         const maxHour = new Date(to);
diff --git a/modules/monitor/front/index/orders/index.js b/modules/monitor/front/index/orders/index.js
index e3a47f68b..40100b79f 100644
--- a/modules/monitor/front/index/orders/index.js
+++ b/modules/monitor/front/index/orders/index.js
@@ -26,7 +26,7 @@ export default class Controller extends Section {
     }
 
     chipColor(date) {
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         const orderLanded = new Date(date);
diff --git a/modules/monitor/front/index/search-panel/index.spec.js b/modules/monitor/front/index/search-panel/index.spec.js
index f862e8d77..18cf1abfc 100644
--- a/modules/monitor/front/index/search-panel/index.spec.js
+++ b/modules/monitor/front/index/search-panel/index.spec.js
@@ -38,7 +38,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
         it('should clear the scope days when setting the from property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.from = new Date();
+            controller.from = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.from).toBeDefined();
@@ -49,7 +49,7 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
         it('should clear the scope days when setting the to property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.to = new Date();
+            controller.to = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.to).toBeDefined();
@@ -58,8 +58,8 @@ describe('Monitor Component vnMonitorSalesSearchPanel', () => {
 
     describe('scopeDays() setter', () => {
         it('should clear the date range when setting the scopeDays property', () => {
-            controller.filter.from = new Date();
-            controller.filter.to = new Date();
+            controller.filter.from = Date.vnNew();
+            controller.filter.to = Date.vnNew();
 
             controller.scopeDays = 1;
 
diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js
index 91d9079d8..2f2dead05 100644
--- a/modules/monitor/front/index/tickets/index.js
+++ b/modules/monitor/front/index/tickets/index.js
@@ -91,7 +91,7 @@ export default class Controller extends Section {
             $params.scopeDays = 1;
 
         if (typeof $params.scopeDays === 'number') {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
             const to = new Date(from.getTime());
@@ -105,7 +105,7 @@ export default class Controller extends Section {
     }
 
     compareDate(date) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         let timeTicket = new Date(date);
         timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/monitor/front/index/tickets/index.spec.js b/modules/monitor/front/index/tickets/index.spec.js
index 5d42743c1..c12ea6844 100644
--- a/modules/monitor/front/index/tickets/index.spec.js
+++ b/modules/monitor/front/index/tickets/index.spec.js
@@ -32,7 +32,7 @@ describe('Component vnMonitorSalesTickets', () => {
             let params = controller.fetchParams({
                 scopeDays: 2
             });
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
             const to = new Date(from.getTime());
             to.setDate(to.getDate() + params.scopeDays);
@@ -66,14 +66,14 @@ describe('Component vnMonitorSalesTickets', () => {
 
     describe('compareDate()', () => {
         it('should return warning when the date is the present', () => {
-            let today = new Date();
+            let today = Date.vnNew();
             let result = controller.compareDate(today);
 
             expect(result).toEqual('warning');
         });
 
         it('should return sucess when the date is in the future', () => {
-            let futureDate = new Date();
+            let futureDate = Date.vnNew();
             futureDate = futureDate.setDate(futureDate.getDate() + 10);
             let result = controller.compareDate(futureDate);
 
@@ -81,7 +81,7 @@ describe('Component vnMonitorSalesTickets', () => {
         });
 
         it('should return undefined when the date is in the past', () => {
-            let pastDate = new Date();
+            let pastDate = Date.vnNew();
             pastDate = pastDate.setDate(pastDate.getDate() - 10);
             let result = controller.compareDate(pastDate);
 
@@ -99,7 +99,7 @@ describe('Component vnMonitorSalesTickets', () => {
 
     describe('dateRange()', () => {
         it('should return two dates with the hours at the start and end of the given date', () => {
-            const now = new Date();
+            const now = Date.vnNew();
 
             const today = now.getDate();
 
diff --git a/modules/order/back/methods/order/specs/new.spec.js b/modules/order/back/methods/order/specs/new.spec.js
index 5873189f8..f11367579 100644
--- a/modules/order/back/methods/order/specs/new.spec.js
+++ b/modules/order/back/methods/order/specs/new.spec.js
@@ -9,7 +9,7 @@ describe('order new()', () => {
         try {
             const options = {transaction: tx};
 
-            const landed = new Date();
+            const landed = Date.vnNew();
             const addressFk = 6;
             const agencyModeFk = 1;
 
@@ -30,7 +30,7 @@ describe('order new()', () => {
         try {
             const options = {transaction: tx};
 
-            const landed = new Date();
+            const landed = Date.vnNew();
             const addressFk = 121;
             const agencyModeFk = 1;
 
diff --git a/modules/order/front/basic-data/index.spec.js b/modules/order/front/basic-data/index.spec.js
index 01009d085..21dee0765 100644
--- a/modules/order/front/basic-data/index.spec.js
+++ b/modules/order/front/basic-data/index.spec.js
@@ -46,7 +46,7 @@ describe('Order', () => {
             it('should set agencyModeFk to null and get the available agencies if the order has landed and client', async() => {
                 controller.order.agencyModeFk = 999;
                 controller.order.addressFk = 999;
-                controller.order.landed = new Date();
+                controller.order.landed = Date.vnNew();
 
                 const expectedAgencies = [{id: 1}, {id: 2}];
 
diff --git a/modules/order/front/catalog/index.js b/modules/order/front/catalog/index.js
index 5fdd2e238..c0777ebc9 100644
--- a/modules/order/front/catalog/index.js
+++ b/modules/order/front/catalog/index.js
@@ -157,7 +157,7 @@ class Controller extends Section {
      * Apply order to model
      */
     applyOrder() {
-        if (this.typeId || this.tagGroups.length > 0)
+        if (this.typeId || this.tagGroups.length > 0 || this.itemName)
             this.$.model.addFilter(null, {orderBy: this.getOrderBy()});
     }
 
diff --git a/modules/order/front/index/index.js b/modules/order/front/index/index.js
index a8e6e977e..750f2e226 100644
--- a/modules/order/front/index/index.js
+++ b/modules/order/front/index/index.js
@@ -8,7 +8,7 @@ export default class Controller extends Section {
     }
 
     compareDate(date) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         date = new Date(date);
diff --git a/modules/order/front/index/index.spec.js b/modules/order/front/index/index.spec.js
index 5b85b3333..abe336478 100644
--- a/modules/order/front/index/index.spec.js
+++ b/modules/order/front/index/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnOrderIndex', () => {
 
     describe('compareDate()', () => {
         it('should return warning when the date is the present', () => {
-            let curDate = new Date();
+            let curDate = Date.vnNew();
             let result = controller.compareDate(curDate);
 
             expect(result).toEqual('warning');
         });
 
         it('should return sucess when the date is in the future', () => {
-            let futureDate = new Date();
+            let futureDate = Date.vnNew();
             futureDate = futureDate.setDate(futureDate.getDate() + 10);
             let result = controller.compareDate(futureDate);
 
@@ -41,7 +41,7 @@ describe('Component vnOrderIndex', () => {
         });
 
         it('should return undefined when the date is in the past', () => {
-            let pastDate = new Date();
+            let pastDate = Date.vnNew();
             pastDate = pastDate.setDate(pastDate.getDate() - 10);
             let result = controller.compareDate(pastDate);
 
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html
index f0a2f2bdf..7be5a00af 100644
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@@ -39,7 +39,7 @@
                     <vn-td number>
                         <span ng-click="itemDescriptor.show($event, row.itemFk)"
                             class="link">
-                            {{::row.itemFk | zeroFill:6}}
+                            {{::row.itemFk}}
                         </span>
                     </vn-td>
                     <vn-td vn-fetched-tags>
diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html
index 2813aeb9b..3622ae932 100644
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@@ -95,7 +95,7 @@
                             <span 
                                 ng-click="itemDescriptor.show($event, row.itemFk)"
                                 class="link">
-                                {{::row.itemFk | zeroFill:6}}
+                                {{::row.itemFk}}
                             </span>
                         </vn-td>
                         <vn-td vn-fetched-tags>
diff --git a/modules/route/back/methods/agency-term/filter.js b/modules/route/back/methods/agency-term/filter.js
index 0ecec7e88..9d1268958 100644
--- a/modules/route/back/methods/agency-term/filter.js
+++ b/modules/route/back/methods/agency-term/filter.js
@@ -74,35 +74,35 @@ module.exports = Self => {
 
         filter = mergeFilters(filter, {where});
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const stmts = [];
         const stmt = new ParameterizedSQL(
             `SELECT *
                 FROM (
-                    SELECT r.id routeFk, 
-                        r.created, 
-                        r.agencyModeFk, 
+                    SELECT r.id routeFk,
+                        r.created,
+                        r.agencyModeFk,
                         am.name agencyModeName,
-                        am.agencyFk, 
+                        am.agencyFk,
                         a.name agencyAgreement,
                         SUM(t.packages) packages,
                         r.m3,
-                        r.kmEnd - r.kmStart kmTotal, 
-                        CAST(IFNULL(sat.routePrice, 
-                            (sat.kmPrice * (GREATEST(r.kmEnd - r.kmStart , sat.minimumKm)) 
-                            + GREATEST(r.m3 , sat.minimumM3) * sat.m3Price) 
-                            + sat.packagePrice * SUM(t.packages) ) 
+                        r.kmEnd - r.kmStart kmTotal,
+                        CAST(IFNULL(sat.routePrice,
+                            (sat.kmPrice * (GREATEST(r.kmEnd - r.kmStart , sat.minimumKm))
+                            + GREATEST(r.m3 , sat.minimumM3) * sat.m3Price)
+                            + sat.packagePrice * SUM(t.packages) )
                             AS DECIMAL(10,2)) price,
                         r.invoiceInFk,
                         sat.supplierFk,
                         s.name supplierName
                     FROM vn.route r
-                        LEFT JOIN vn.agencyMode am ON r.agencyModeFk = am.id  
+                        LEFT JOIN vn.agencyMode am ON r.agencyModeFk = am.id
                         LEFT JOIN vn.agency a ON am.agencyFk = a.id
                         LEFT JOIN vn.ticket t ON t.routeFk = r.id
                         LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
-                        LEFT JOIN vn.supplier s ON s.id = sat.supplierFk 
+                        LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
                     WHERE r.created > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
                     GROUP BY r.id
                 ) a`
diff --git a/modules/route/back/methods/agency-term/specs/filter.spec.js b/modules/route/back/methods/agency-term/specs/filter.spec.js
index d6c00e585..41e696157 100644
--- a/modules/route/back/methods/agency-term/specs/filter.spec.js
+++ b/modules/route/back/methods/agency-term/specs/filter.spec.js
@@ -3,7 +3,7 @@ const models = require('vn-loopback/server/server').models;
 
 describe('AgencyTerm filter()', () => {
     const authUserId = 9;
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(2, 0, 0, 0);
 
     it('should return all results matching the filter', async() => {
@@ -57,10 +57,10 @@ describe('AgencyTerm filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
-            const to = new Date();
+            const to = Date.vnNew();
             to.setHours(23, 59, 59, 999);
 
             const ctx = {
diff --git a/modules/route/back/methods/route/downloadZip.js b/modules/route/back/methods/route/downloadZip.js
new file mode 100644
index 000000000..597f1d1f6
--- /dev/null
+++ 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;
+    }
+};
diff --git a/modules/route/back/methods/route/getTickets.js b/modules/route/back/methods/route/getTickets.js
index 708644c1a..1eb9e27f5 100644
--- 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);
 
diff --git a/modules/route/back/methods/route/specs/clone.spec.js b/modules/route/back/methods/route/specs/clone.spec.js
index d1fc6b297..9192854f8 100644
--- a/modules/route/back/methods/route/specs/clone.spec.js
+++ b/modules/route/back/methods/route/specs/clone.spec.js
@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('route clone()', () => {
-    const createdDate = new Date();
+    const createdDate = Date.vnNew();
     it('should throw an error if the amount of ids pased to the clone function do no match the database', async() => {
         const ids = [996, 997, 998, 999];
 
diff --git a/modules/route/back/methods/route/specs/filter.spec.js b/modules/route/back/methods/route/specs/filter.spec.js
index 9d481f21e..18c0ca04f 100644
--- a/modules/route/back/methods/route/specs/filter.spec.js
+++ b/modules/route/back/methods/route/specs/filter.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 const models = require('vn-loopback/server/server').models;
 
 describe('Route filter()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(2, 0, 0, 0);
 
     it('should return the routes matching "search"', async() => {
@@ -23,10 +23,10 @@ describe('Route filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
-            const to = new Date();
+            const to = Date.vnNew();
             to.setHours(23, 59, 59, 999);
             const ctx = {
                 args: {
diff --git a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
index bb38cb50e..0acc6c1a7 100644
--- a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
+++ b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js
@@ -23,7 +23,7 @@ describe('route getSuggestedTickets()', () => {
 
             await ticketInRoute.updateAttributes({
                 routeFk: null,
-                landed: new Date()
+                landed: Date.vnNew()
             }, options);
 
             const result = await models.Route.getSuggestedTickets(routeID, options);
diff --git a/modules/route/back/methods/route/specs/insertTicket.spec.js b/modules/route/back/methods/route/specs/insertTicket.spec.js
index 7c60e755f..19d02e1ef 100644
--- a/modules/route/back/methods/route/specs/insertTicket.spec.js
+++ b/modules/route/back/methods/route/specs/insertTicket.spec.js
@@ -23,7 +23,7 @@ describe('route insertTicket()', () => {
             const ticketInRoute = await app.models.Ticket.findById(ticketId, null, options);
             await ticketInRoute.updateAttributes({
                 routeFk: null,
-                landed: new Date()
+                landed: Date.vnNew()
             }, options);
 
             const result = await app.models.Route.insertTicket(routeId, ticketId, options);
diff --git a/modules/route/back/methods/route/updateWorkCenter.js b/modules/route/back/methods/route/updateWorkCenter.js
index 7796fba41..75169ce7e 100644
--- a/modules/route/back/methods/route/updateWorkCenter.js
+++ b/modules/route/back/methods/route/updateWorkCenter.js
@@ -33,12 +33,13 @@ module.exports = Self => {
         }
 
         try {
+            const date = Date.vnNew();
             const [result] = await Self.rawSql(`
                 SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter
                 FROM vn.routeConfig r
                     LEFT JOIN vn.workerLabour wl ON wl.workerFk = ?
-                        AND CURDATE() BETWEEN wl.started AND IFNULL(wl.ended, CURDATE());
-                    `, [userId], myOptions);
+                        AND ? BETWEEN wl.started AND IFNULL(wl.ended, ?);
+                    `, [userId, date, date], myOptions);
 
             const route = await models.Route.findById(id, null, myOptions);
             await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions);
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index 08cabd30e..883f4597e 100644
--- 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'
diff --git a/modules/route/front/index/index.js b/modules/route/front/index/index.js
index 9258c8fac..7c19a26cd 100644
--- a/modules/route/front/index/index.js
+++ b/modules/route/front/index/index.js
@@ -34,17 +34,27 @@ 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() {
         this.$.clonationDialog.show();
-        this.createdDate = new Date();
+        this.createdDate = Date.vnNew();
     }
 
     cloneSelectedRoutes() {
diff --git a/modules/route/front/index/index.spec.js b/modules/route/front/index/index.spec.js
index 05dd56433..399ece714 100644
--- a/modules/route/front/index/index.spec.js
+++ b/modules/route/front/index/index.spec.js
@@ -44,23 +44,21 @@ 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();
         });
     });
 
     describe('cloneSelectedRoutes()', () => {
         it('should perform an http request to Routes/clone', () => {
-            controller.createdDate = new Date();
+            controller.createdDate = Date.vnNew();
 
             $httpBackend.expect('POST', 'Routes/clone').respond();
             controller.cloneSelectedRoutes();
diff --git a/modules/route/front/main/index.js b/modules/route/front/main/index.js
index 938f81bcc..8c57bbad6 100644
--- a/modules/route/front/main/index.js
+++ b/modules/route/front/main/index.js
@@ -3,11 +3,11 @@ import ModuleMain from 'salix/components/module-main';
 
 export default class Route extends ModuleMain {
     $postLink() {
-        const to = new Date();
+        const to = Date.vnNew();
         to.setDate(to.getDate() + 1);
         to.setHours(0, 0, 0, 0);
 
-        const from = new Date();
+        const from = Date.vnNew();
         from.setDate(from.getDate());
         from.setHours(0, 0, 0, 0);
 
@@ -21,7 +21,7 @@ export default class Route extends ModuleMain {
             $params.scopeDays = 1;
 
         if (typeof $params.scopeDays === 'number') {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
             const to = new Date(from.getTime());
diff --git a/modules/route/front/main/index.spec.js b/modules/route/front/main/index.spec.js
index e5724b493..0c16a7b1f 100644
--- a/modules/route/front/main/index.spec.js
+++ b/modules/route/front/main/index.spec.js
@@ -15,7 +15,7 @@ describe('Route Component vnRoute', () => {
             let params = controller.fetchParams({
                 scopeDays: 2
             });
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
             const to = new Date(from.getTime());
             to.setDate(to.getDate() + params.scopeDays);
diff --git a/modules/route/front/search-panel/index.spec.js b/modules/route/front/search-panel/index.spec.js
index 16e1a5cfc..ae15e16e4 100644
--- a/modules/route/front/search-panel/index.spec.js
+++ b/modules/route/front/search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe('Route Component vnRouteSearchPanel', () => {
         it('should clear the scope days when setting the from property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.from = new Date();
+            controller.from = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.from).toBeDefined();
@@ -26,7 +26,7 @@ describe('Route Component vnRouteSearchPanel', () => {
         it('should clear the scope days when setting the to property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.to = new Date();
+            controller.to = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.to).toBeDefined();
@@ -35,8 +35,8 @@ describe('Route Component vnRouteSearchPanel', () => {
 
     describe('scopeDays() setter', () => {
         it('should clear the date range when setting the scopeDays property', () => {
-            controller.filter.from = new Date();
-            controller.filter.to = new Date();
+            controller.filter.from = Date.vnNew();
+            controller.filter.to = Date.vnNew();
 
             controller.scopeDays = 1;
 
diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html
index 86f558634..a64ad4ff7 100644
--- 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>
diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html
index dae894ac7..18d6fb160 100644
--- 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>
\ No newline at end of file
+</vn-route-sms>
diff --git a/modules/shelving/back/models/parking.json b/modules/shelving/back/models/parking.json
index 7efcf72d3..53fec6e69 100644
--- a/modules/shelving/back/models/parking.json
+++ b/modules/shelving/back/models/parking.json
@@ -29,5 +29,12 @@
         "pickingOrder": {
             "type": "number"
         }
+    },
+    "relations": {
+        "saleGroup": {
+            "type": "hasMany",
+            "model": "saleGroup",
+            "foreignKey": "parkingFk"
+        }
     }
 }
diff --git a/modules/shelving/front/routes.json b/modules/shelving/front/routes.json
index 09a8e389b..4059e5095 100644
--- 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"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 44549c65c..4e509aafc 100644
--- 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;
diff --git a/modules/supplier/front/agency-term/index/index.html b/modules/supplier/front/agency-term/index/index.html
index 9d53226c5..44c6deba9 100644
--- 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>
diff --git a/modules/supplier/front/consumption/index.js b/modules/supplier/front/consumption/index.js
index 8de6a1e71..9af0d1747 100644
--- a/modules/supplier/front/consumption/index.js
+++ b/modules/supplier/front/consumption/index.js
@@ -11,11 +11,11 @@ class Controller extends Section {
     }
 
     setDefaultFilter() {
-        const minDate = new Date();
+        const minDate = Date.vnNew();
         minDate.setHours(0, 0, 0, 0);
         minDate.setMonth(minDate.getMonth() - 2);
 
-        const maxDate = new Date();
+        const maxDate = Date.vnNew();
         maxDate.setHours(23, 59, 59, 59);
 
         this.filterParams = {
diff --git a/modules/supplier/front/consumption/index.spec.js b/modules/supplier/front/consumption/index.spec.js
index ebf19ccec..0ac531a68 100644
--- a/modules/supplier/front/consumption/index.spec.js
+++ b/modules/supplier/front/consumption/index.spec.js
@@ -28,7 +28,7 @@ describe('Supplier', () => {
             it('should call the window.open function', () => {
                 jest.spyOn(window, 'open').mockReturnThis();
 
-                const now = new Date();
+                const now = Date.vnNew();
                 controller.$.model.userParams = {
                     from: now,
                     to: now
@@ -86,7 +86,7 @@ describe('Supplier', () => {
                     {id: 1, email: 'batman@gothamcity.com'}
                 ]);
 
-                const now = new Date();
+                const now = Date.vnNew();
                 controller.$.model.userParams = {
                     from: now,
                     to: now
diff --git a/modules/supplier/front/descriptor/index.js b/modules/supplier/front/descriptor/index.js
index a26d9c510..9f23ce68c 100644
--- a/modules/supplier/front/descriptor/index.js
+++ b/modules/supplier/front/descriptor/index.js
@@ -13,7 +13,7 @@ class Controller extends Descriptor {
     get entryFilter() {
         if (!this.supplier) return null;
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         const from = new Date(date.getTime());
diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml
index 2c524a74f..15b5a39bf 100644
--- a/modules/ticket/back/locale/ticket/es.yml
+++ b/modules/ticket/back/locale/ticket/es.yml
@@ -21,3 +21,5 @@ companyFk: empresa
 agencyModeFk: agencia
 ticketFk: ticket
 mergedTicket: ticket fusionado
+withWarningAccept: aviso negativos
+isWithoutNegatives: sin negativos
diff --git a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
index 67919e76c..ac397d38e 100644
--- a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
@@ -14,7 +14,7 @@ describe('ticket moveExpeditions()', () => {
             const options = {transaction: tx};
             myCtx.args = {
                 clientId: 1101,
-                landed: new Date(),
+                landed: Date.vnNew(),
                 warehouseId: 1,
                 addressId: 121,
                 agencyModeId: 1,
diff --git a/modules/ticket/back/methods/sale-tracking/listSaleTracking.js b/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
index c0d63ef62..98743d8cc 100644
--- a/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
+++ b/modules/ticket/back/methods/sale-tracking/listSaleTracking.js
@@ -36,7 +36,7 @@ module.exports = Self => {
                 st.originalQuantity,
                 st.created,
                 st.workerFk,
-                u.nickname userNickname,
+                u.name,
                 ste.name AS state
             FROM saleTracking st
                 JOIN sale s ON s.id = st.saleFk
@@ -48,24 +48,6 @@ module.exports = Self => {
 
         const trackings = await Self.rawStmt(stmt, myOptions);
 
-        const salesFilter = {
-            include: [
-                {
-                    relation: 'item'
-                }
-            ],
-            where: {ticketFk: filter.where.ticketFk}
-        };
-
-        const sales = await Self.app.models.Sale.find(salesFilter, myOptions);
-
-        for (const tracking of trackings) {
-            for (const sale of sales) {
-                if (tracking.itemFk == sale.itemFk)
-                    tracking.item = sale.item();
-            }
-        }
-
         return trackings;
     };
 };
diff --git a/modules/ticket/back/methods/sale/canEdit.js b/modules/ticket/back/methods/sale/canEdit.js
index f44bd6743..3091ebca7 100644
--- 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;
     };
 };
diff --git a/modules/ticket/back/methods/sale/deleteSales.js b/modules/ticket/back/methods/sale/deleteSales.js
index c045b9197..5d1463a66 100644
--- 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: {
diff --git a/modules/ticket/back/methods/sale/getClaimableFromTicket.js b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
index ecbc52b94..c51781f59 100644
--- a/modules/ticket/back/methods/sale/getClaimableFromTicket.js
+++ b/modules/ticket/back/methods/sale/getClaimableFromTicket.js
@@ -24,24 +24,24 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const query = `
-            SELECT 
-                s.id AS saleFk, 
-                t.id AS ticketFk, 
+            SELECT
+                s.id AS saleFk,
+                t.id AS ticketFk,
                 t.landed,
-                s.concept, 
-                s.itemFk, 
-                s.quantity, 
-                s.price, 
-                s.discount, 
+                s.concept,
+                s.itemFk,
+                s.quantity,
+                s.price,
+                s.discount,
                 t.nickname
-            FROM vn.ticket t 
+            FROM vn.ticket t
                 INNER JOIN vn.sale s ON s.ticketFk = t.id
                 LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
 
-            WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?) 
+            WHERE (t.landed) >= TIMESTAMPADD(DAY, -7, ?)
                 AND t.id = ? AND cb.id IS NULL
             ORDER BY t.landed DESC, t.id DESC`;
 
diff --git a/modules/ticket/back/methods/sale/recalculatePrice.js b/modules/ticket/back/methods/sale/recalculatePrice.js
index 38c68d7f6..2c8e6768b 100644
--- 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;
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index c0c431636..febef9730 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -64,7 +64,7 @@ module.exports = Self => {
 
             const refundTickets = [];
 
-            const now = new Date();
+            const now = Date.vnNew();
             const mappedTickets = new Map();
 
             for (let ticketId of ticketsIds) {
diff --git a/modules/ticket/back/methods/sale/reserve.js b/modules/ticket/back/methods/sale/reserve.js
index 648e6de23..2dc368af6 100644
--- 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 = [];
diff --git a/modules/ticket/back/methods/sale/specs/canEdit.spec.js b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
index 2aa873df5..58d8f0635 100644
--- 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() => {
diff --git a/modules/ticket/back/methods/sale/updateConcept.js b/modules/ticket/back/methods/sale/updateConcept.js
index 0730f85e2..dcd25dcbb 100644
--- 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);
 
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index 8f27e1af5..505de5180 100644
--- 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;
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index 8cf0720ce..d2927c65c 100644
--- 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: {
diff --git a/modules/ticket/back/methods/state/editableStates.js b/modules/ticket/back/methods/state/editableStates.js
index 2c90ac43b..115876f26 100644
--- 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);
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
index 746e1b7fc..175bc4e4b 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
+++ b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js
@@ -9,7 +9,7 @@ describe('ticket changeState()', () => {
         accessToken: {userId: 9},
     };
     const ctx = {req: activeCtx};
-    const now = new Date();
+    const now = Date.vnNew();
     const sampleTicket = {
         shipped: now,
         landed: now,
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index a009d63cf..6b8f9e71a 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -43,7 +43,7 @@ module.exports = function(Self) {
             ticketBases => ticketBases.hasSomeNegativeBase
         );
 
-        const today = new Date();
+        const today = Date.vnNew();
 
         const invalidTickets = tickets.some(ticket => {
             const shipped = new Date(ticket.shipped);
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 327278c2b..3726d85b7 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -17,14 +17,14 @@ module.exports = Self => {
     });
 
     Self.closeAll = async() => {
-        const toDate = new Date();
+        const toDate = Date.vnNew();
         toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
 
-        const todayMinDate = new Date();
+        const todayMinDate = Date.vnNew();
         todayMinDate.setHours(0, 0, 0, 0);
 
-        const todayMaxDate = new Date();
+        const todayMaxDate = Date.vnNew();
         todayMaxDate.setHours(23, 59, 59, 59);
 
         // Prevent closure for current day
@@ -32,7 +32,7 @@ module.exports = Self => {
             throw new UserError('You cannot close tickets for today');
 
         const tickets = await Self.rawSql(`
-            SELECT 
+            SELECT
                 t.id,
                 t.clientFk,
                 t.companyFk,
@@ -53,7 +53,7 @@ module.exports = Self => {
                 JOIN country co ON co.id = p.countryFk
                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
             WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
-                AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) 
+                AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
                     AND util.dayEnd(?)
                 AND t.refFk IS NULL
             GROUP BY t.id
diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index f4a4bb98d..94b91e237 100644
--- a/modules/ticket/back/methods/ticket/componentUpdate.js
+++ b/modules/ticket/back/methods/ticket/componentUpdate.js
@@ -83,6 +83,11 @@ module.exports = Self => {
                 type: 'boolean',
                 description: 'Is whithout negatives',
                 required: true
+            },
+            {
+                arg: 'withWarningAccept',
+                type: 'boolean',
+                description: 'Has pressed in confirm message',
             }],
         returns: {
             type: ['object'],
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index a2add2e82..262b3fd74 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -137,7 +137,7 @@ module.exports = Self => {
     Self.filter = async(ctx, filter, options) => {
         const userId = ctx.req.accessToken.userId;
         const conn = Self.dataSource.connector;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const models = Self.app.models;
         const args = ctx.args;
@@ -295,10 +295,10 @@ module.exports = Self => {
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems');
 
         stmt = new ParameterizedSQL(`
-            CREATE TEMPORARY TABLE tmp.sale_getProblems 
+            CREATE TEMPORARY TABLE tmp.sale_getProblems
                 (INDEX (ticketFk))
                 ENGINE = MEMORY
-                SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped 
+                SELECT f.id ticketFk, f.clientFk, f.warehouseFk, f.shipped
                     FROM tmp.filter f
                         LEFT JOIN alertLevel al ON al.id = f.alertLevel
                     WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
@@ -350,7 +350,7 @@ module.exports = Self => {
         const ticketsIndex = stmts.push(stmt) - 1;
 
         stmts.push(
-            `DROP TEMPORARY TABLE 
+            `DROP TEMPORARY TABLE
                 tmp.filter,
                 tmp.ticket_problems`);
 
diff --git a/modules/ticket/back/methods/ticket/getTicketsAdvance.js b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
index 19571bb51..ec9314db2 100644
--- a/modules/ticket/back/methods/ticket/getTicketsAdvance.js
+++ b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
@@ -50,15 +50,9 @@ module.exports = Self => {
                 required: false
             },
             {
-                arg: 'state',
-                type: 'string',
-                description: 'Origin state',
-                required: false
-            },
-            {
-                arg: 'futureState',
-                type: 'string',
-                description: 'Destination state',
+                arg: 'isFullMovable',
+                type: 'boolean',
+                description: 'True when lines and stock of origin are equal',
                 required: false
             },
             {
@@ -92,13 +86,21 @@ module.exports = Self => {
             case 'futureId':
                 return {'f.futureId': value};
             case 'ipt':
-                return {'f.ipt': value};
+                return {or:
+                            [
+                                {'f.ipt': {like: `%${value}%`}},
+                                {'f.ipt': null}
+                            ]
+                };
             case 'futureIpt':
-                return {'f.futureIpt': value};
-            case 'state':
-                return {'f.stateCode': {like: `%${value}%`}};
-            case 'futureState':
-                return {'f.futureStateCode': {like: `%${value}%`}};
+                return {or:
+                                [
+                                    {'f.futureIpt': {like: `%${value}%`}},
+                                    {'f.futureIpt': null}
+                                ]
+                };
+            case 'isFullMovable':
+                return {'f.isFullMovable': value};
             }
         });
 
diff --git a/modules/ticket/back/methods/ticket/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index 4e9c22a24..9739f5985 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -26,7 +26,7 @@ module.exports = function(Self) {
     Self.makeInvoice = async(ctx, ticketsIds, options) => {
         const userId = ctx.req.accessToken.userId;
         const models = Self.app.models;
-        const date = new Date();
+        const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
 
         const myOptions = {};
diff --git a/modules/ticket/back/methods/ticket/restore.js b/modules/ticket/back/methods/ticket/restore.js
index c9bb126fd..722c3294e 100644
--- a/modules/ticket/back/methods/ticket/restore.js
+++ b/modules/ticket/back/methods/ticket/restore.js
@@ -38,7 +38,7 @@ module.exports = Self => {
             }]
         }, myOptions);
 
-        const now = new Date();
+        const now = Date.vnNew();
         const maxDate = new Date(ticket.updated);
         maxDate.setHours(maxDate.getHours() + 1);
 
@@ -56,7 +56,7 @@ module.exports = Self => {
             await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
         }
 
-        const fullYear = new Date().getFullYear();
+        const fullYear = Date.vnNew().getFullYear();
         const newShipped = ticket.shipped;
         const newLanded = ticket.landed;
         newShipped.setFullYear(fullYear);
diff --git a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
index 8b7e1685d..806f80227 100644
--- a/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/canBeInvoiced.spec.js
@@ -61,7 +61,7 @@ describe('ticket canBeInvoiced()', () => {
 
             const ticket = await models.Ticket.findById(ticketId, null, options);
 
-            const shipped = new Date();
+            const shipped = Date.vnNew();
             shipped.setDate(shipped.getDate() + 1);
 
             await ticket.updateAttribute('shipped', shipped, options);
diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index 3a9c2db50..d65c87654 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -4,8 +4,8 @@ const LoopBackContext = require('loopback-context');
 describe('ticket componentUpdate()', () => {
     const userID = 1101;
     const ticketID = 11;
-    const today = new Date();
-    const tomorrow = new Date();
+    const today = Date.vnNew();
+    const tomorrow = Date.vnNew();
 
     tomorrow.setDate(tomorrow.getDate() + 1);
 
@@ -19,11 +19,11 @@ describe('ticket componentUpdate()', () => {
     beforeAll(async() => {
         const deliveryComponenet = await models.Component.findOne({where: {code: 'delivery'}});
         deliveryComponentId = deliveryComponenet.id;
-        componentOfSaleSeven = `SELECT value 
-                                    FROM vn.saleComponent 
+        componentOfSaleSeven = `SELECT value
+                                    FROM vn.saleComponent
                                     WHERE saleFk = 7 AND componentFk = ${deliveryComponentId}`;
-        componentOfSaleEight = `SELECT value 
-                                    FROM vn.saleComponent 
+        componentOfSaleEight = `SELECT value
+                                    FROM vn.saleComponent
                                     WHERE saleFk = 8 AND componentFk = ${deliveryComponentId}`;
         [componentValue] = await models.SaleComponent.rawSql(componentOfSaleSeven);
         firstvalueBeforeChange = componentValue.value;
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 688b0de61..6cc1a3ad2 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -26,9 +26,9 @@ describe('ticket filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setHours(0, 0, 0, 0);
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(23, 59, 59, 59);
 
             const ctx = {req: {accessToken: {userId: 9}}, args: {
@@ -54,10 +54,10 @@ describe('ticket filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setDate(yesterday.getDate() - 1);
             yesterday.setHours(0, 0, 0, 0);
-            const today = new Date();
+            const today = Date.vnNew();
             today.setHours(23, 59, 59, 59);
 
             const ctx = {req: {accessToken: {userId: 9}}, args: {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
index aab053127..5a3209a6d 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
@@ -1,9 +1,9 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('TicketFuture getTicketsAdvance()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(0, 0, 0, 0);
-    let tomorrow = new Date();
+    let tomorrow = Date.vnNew();
     tomorrow.setDate(today.getDate() + 1);
 
     it('should return the tickets passing the required data', async() => {
@@ -29,7 +29,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
         }
     });
 
-    it('should return the tickets matching the origin grouped state', async() => {
+    it('should return the tickets matching the fullMovable true', async() => {
         const tx = await models.Ticket.beginTransaction({});
 
         try {
@@ -39,7 +39,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
                 dateFuture: tomorrow,
                 dateToAdvance: today,
                 warehouseFk: 1,
-                state: 'OK'
+                isFullMovable: true
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
@@ -54,7 +54,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
         }
     });
 
-    it('should return the tickets matching the destination grouped state', async() => {
+    it('should return the tickets matching the fullMovable false', async() => {
         const tx = await models.Ticket.beginTransaction({});
 
         try {
@@ -64,13 +64,13 @@ describe('TicketFuture getTicketsAdvance()', () => {
                 dateFuture: tomorrow,
                 dateToAdvance: today,
                 warehouseFk: 1,
-                futureState: 'FREE'
+                isFullMovable: false
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsAdvance(ctx, options);
 
-            expect(result.length).toBeGreaterThan(0);
+            expect(result.length).toEqual(0);
 
             await tx.rollback();
         } catch (e) {
@@ -89,13 +89,13 @@ describe('TicketFuture getTicketsAdvance()', () => {
                 dateFuture: tomorrow,
                 dateToAdvance: today,
                 warehouseFk: 1,
-                ipt: 'Vertical'
+                ipt: 'V'
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsAdvance(ctx, options);
 
-            expect(result.length).toBeLessThan(5);
+            expect(result.length).toBeGreaterThan(5);
 
             await tx.rollback();
         } catch (e) {
@@ -114,13 +114,13 @@ describe('TicketFuture getTicketsAdvance()', () => {
                 dateFuture: tomorrow,
                 dateToAdvance: today,
                 warehouseFk: 1,
-                tfIpt: 'Vertical'
+                tfIpt: 'V'
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsAdvance(ctx, options);
 
-            expect(result.length).toBeLessThan(5);
+            expect(result.length).toBeGreaterThan(5);
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
index 51639e304..44896493f 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('ticket getTicketsFuture()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(0, 0, 0, 0);
 
     it('should return the tickets passing the required data', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 275484f67..6b533e47c 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -5,8 +5,8 @@ describe('ticket merge()', () => {
     const tickets = [{
         originId: 13,
         destinationId: 12,
-        originShipped: new Date(),
-        destinationShipped: new Date(),
+        originShipped: Date.vnNew(),
+        destinationShipped: Date.vnNew(),
         workerFk: 1
     }];
 
diff --git a/modules/ticket/back/methods/ticket/specs/new.spec.js b/modules/ticket/back/methods/ticket/specs/new.spec.js
index fce7cdceb..0a2f93bc4 100644
--- a/modules/ticket/back/methods/ticket/specs/new.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/new.spec.js
@@ -2,7 +2,7 @@ const models = require('vn-loopback/server/server').models;
 let UserError = require('vn-loopback/util/user-error');
 
 describe('ticket new()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     const ctx = {req: {accessToken: {userId: 1}}};
 
     it('should throw an error if the client isnt frozen and isnt active', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index 5470382f9..cc54353ef 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -8,7 +8,7 @@ describe('sale priceDifference()', () => {
         try {
             const options = {transaction: tx};
 
-            const tomorrow = new Date();
+            const tomorrow = Date.vnNew();
             tomorrow.setDate(tomorrow.getDate() + 1);
 
             const ctx = {req: {accessToken: {userId: 1106}}};
@@ -45,8 +45,8 @@ describe('sale priceDifference()', () => {
             const ctx = {req: {accessToken: {userId: 1106}}};
             ctx.args = {
                 id: 1,
-                landed: new Date(),
-                shipped: new Date(),
+                landed: Date.vnNew(),
+                shipped: Date.vnNew(),
                 addressId: 121,
                 zoneId: 3,
                 warehouseId: 1
@@ -68,7 +68,7 @@ describe('sale priceDifference()', () => {
         try {
             const options = {transaction: tx};
 
-            const tomorrow = new Date();
+            const tomorrow = Date.vnNew();
             tomorrow.setDate(tomorrow.getDate() + 1);
 
             const ctx = {req: {accessToken: {userId: 1106}}};
@@ -86,7 +86,7 @@ describe('sale priceDifference()', () => {
             const firstItem = result.items[0];
             const secondtItem = result.items[1];
 
-            expect(firstItem.movable).toEqual(410);
+            expect(firstItem.movable).toEqual(380);
             expect(secondtItem.movable).toEqual(1790);
 
             await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket/specs/restore.spec.js b/modules/ticket/back/methods/ticket/specs/restore.spec.js
index bd976d124..3b35ae2b4 100644
--- a/modules/ticket/back/methods/ticket/specs/restore.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/restore.spec.js
@@ -24,8 +24,8 @@ describe('ticket restore()', () => {
         let error;
 
         const tx = await app.models.Ticket.beginTransaction({});
-        const now = new Date();
-        now.setHours(now.getHours() - 1);
+        const now = Date.vnNew();
+        now.setHours(now.getHours() - 1.1);
 
         try {
             const options = {transaction: tx};
@@ -46,7 +46,7 @@ describe('ticket restore()', () => {
 
     it('should restore the ticket making its state no longer deleted', async() => {
         const tx = await app.models.Ticket.beginTransaction({});
-        const now = new Date();
+        const now = Date.vnNew();
 
         try {
             const options = {transaction: tx};
diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js
index 848913fe1..a57968fc1 100644
--- a/modules/ticket/back/methods/ticket/summary.js
+++ b/modules/ticket/back/methods/ticket/summary.js
@@ -71,7 +71,7 @@ module.exports = Self => {
                 }, {
                     relation: 'address',
                     scope: {
-                        fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode'],
+                        fields: ['street', 'city', 'provinceFk', 'phone', 'mobile', 'postalCode', 'isEqualizated'],
                         include: {
                             relation: 'province',
                             scope: {
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 62e763c8f..bee01a875 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -41,6 +41,12 @@
     "SaleComponent": {
         "dataSource": "vn"
     },
+    "SaleGroup": {
+        "dataSource": "vn"
+    },
+    "SaleGroupDetail": {
+        "dataSource": "vn"
+    },
     "SaleTracking": {
         "dataSource": "vn"
     },
diff --git a/modules/ticket/back/models/sale.json b/modules/ticket/back/models/sale.json
index b30954ad1..669b05be6 100644
--- a/modules/ticket/back/models/sale.json
+++ b/modules/ticket/back/models/sale.json
@@ -75,6 +75,11 @@
             "type": "hasOne",
             "model": "ItemShelvingSale",
             "foreignKey": "saleFk"
+        },
+        "saleGroupDetail": {
+            "type": "hasOne",
+            "model": "SaleGroupDetail",
+            "foreignKey": "saleFk"
         }
     }
 }
diff --git a/modules/ticket/back/models/saleGroup.json b/modules/ticket/back/models/saleGroup.json
new file mode 100644
index 000000000..d5cf82cb5
--- /dev/null
+++ b/modules/ticket/back/models/saleGroup.json
@@ -0,0 +1,31 @@
+{
+    "name": "SaleGroup",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "saleGroup"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "description": "Identifier"
+        },
+        "parkingFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "saleGroupDetail": {
+            "type": "hasMany",
+            "model": "SaleGroupDetail",
+            "foreignKey": "saleGroupFk"
+        },
+        "parking": {
+            "type": "belongsTo",
+            "model": "Parking",
+            "foreignKey": "parkingFk"
+        }
+    }
+}
diff --git a/modules/ticket/back/models/saleGroupDetail.json b/modules/ticket/back/models/saleGroupDetail.json
new file mode 100644
index 000000000..2fbc71bbd
--- /dev/null
+++ b/modules/ticket/back/models/saleGroupDetail.json
@@ -0,0 +1,31 @@
+{
+    "name": "SaleGroupDetail",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "saleGroupDetail"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "description": "Identifier"
+        },
+        "saleFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "sale": {
+            "type": "belongsTo",
+            "model": "Sale",
+            "foreignKey": "saleFk"
+        },
+        "saleGroup": {
+            "type": "belongsTo",
+            "model": "SaleGroup",
+            "foreignKey": "saleGroupFk"
+        }
+    }
+}
diff --git a/modules/ticket/front/advance-search-panel/index.html b/modules/ticket/front/advance-search-panel/index.html
index e8d5dc60d..ee18c26f9 100644
--- a/modules/ticket/front/advance-search-panel/index.html
+++ b/modules/ticket/front/advance-search-panel/index.html
@@ -39,28 +39,12 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal class="vn-px-lg">
-            <vn-autocomplete vn-one
-                data="$ctrl.groupedStates"
-                label="Origin Grouped State"
-                value-field="code"
-                show-field="name"
-                ng-model="filter.futureState">
-                <tpl-item>
-                    {{name}}
-                </tpl-item>
-            </vn-autocomplete>
-            <vn-autocomplete vn-one
-                data="$ctrl.groupedStates"
-                label="Destination Grouped State"
-                value-field="code"
-                show-field="name"
-                ng-model="filter.state">
-                <tpl-item>
-                    {{name}}
-                </tpl-item>
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal class="vn-px-lg">
+            <vn-check
+                vn-one
+                label="100% movable"
+                ng-model="filter.isFullMovable"
+                triple-state="true">
+            </vn-check>
             <vn-autocomplete
                 vn-one
                 label="Warehouse"
diff --git a/modules/ticket/front/advance-search-panel/index.js b/modules/ticket/front/advance-search-panel/index.js
index 0ee16bc3c..8ddbe78d4 100644
--- 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 = {
diff --git a/modules/ticket/front/advance-search-panel/locale/es.yml b/modules/ticket/front/advance-search-panel/locale/es.yml
index 3dce7dae5..7be2efe96 100644
--- a/modules/ticket/front/advance-search-panel/locale/es.yml
+++ b/modules/ticket/front/advance-search-panel/locale/es.yml
@@ -1 +1,2 @@
 Advance tickets: Adelantar tickets
+100% movable: 100% movible
diff --git a/modules/ticket/front/advance/index.html b/modules/ticket/front/advance/index.html
index f63c0fbf7..007f80fe6 100644
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@@ -32,8 +32,8 @@
                 <thead>
                     <tr second-header>
                         <td></td>
-                        <th colspan="5" translate>Origin</th>
-                        <th colspan="8" translate>Destination</th>
+                        <th colspan="7" translate>Destination</th>
+                        <th colspan="9" translate>Origin</th>
                     </tr>
                     <tr>
                         <th shrink>
@@ -43,28 +43,15 @@
                                 check-field="checked">
                             </vn-multi-check>
                         </th>
-                        <th field="futureId">
-                            <span translate>ID</span>
+                        <th shrink>
                         </th>
-                        <th field="futureShipped">
-                            <span translate>Date</span>
-                        </th>
-                        <th field="futureIpt" title="Item Packing Type">
-                            <span>IPT</span>
-                        </th>
-                        <th field="futureState">
-                            <span translate>State</span>
-                        </th>
-                        <th field="totalWithVat">
-                            <span translate>Import</span>
-                        </th>
-                        <th separator field="id">
+                        <th field="id">
                             <span translate>ID</span>
                         </th>
                         <th field="shipped">
                             <span translate>Date</span>
                         </th>
-                        <th field="ipt" title="Item Packing Type">
+                        <th field="ipt" title="{{'Item Packing Type' | translate}}">
                             <span>IPT</span>
                         </th>
                         <th field="state">
@@ -73,12 +60,33 @@
                         <th field="liters">
                             <span translate>Liters</span>
                         </th>
-                        <th field="hasStock">
-                            <span>Stock</span>
-                        </th>
                         <th field="lines">
                             <span translate>Lines</span>
                         </th>
+                        <th field="totalWithVat">
+                            <span translate>Import</span>
+                        </th>
+                        <th separator field="futureId">
+                            <span translate>ID</span>
+                        </th>
+                        <th field="futureShipped">
+                            <span translate>Date</span>
+                        </th>
+                        <th field="futureIpt" title="{{'Item Packing Type' | translate}}">
+                            <span>IPT</span>
+                        </th>
+                        <th field="futureState">
+                            <span translate>State</span>
+                        </th>
+                        <th field="futureLiters">
+                            <span translate>Liters</span>
+                        </th>
+                        <th field="notMovableLines">
+                            <span translate>Not Movable</span>
+                        </th>
+                        <th field="futureLines">
+                            <span translate>Lines</span>
+                        </th>
                         <th field="futureTotalWithVat">
                             <span translate>Import</span>
                         </th>
@@ -93,28 +101,11 @@
                             </vn-check>
                         </td>
                         <td>
-                            <span
-                                ng-click="ticketDescriptor.show($event, ticket.futureId)"
-                                class="link">
-                                {{::ticket.futureId | dashIfEmpty}}
-                            </span>
-                        </td>
-                        <td shrink-date>
-                            <span class="chip {{$ctrl.compareDate(ticket.futureShipped)}}">
-                                {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
-                            </span>
-                        </td>
-                        <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
-                        <td>
-                            <span
-                                class="chip {{$ctrl.stateColor(ticket.futureState)}}">
-                                {{::ticket.futureState | dashIfEmpty}}
-                            </span>
-                        </td>
-                        <td>
-                            <span class="chip {{$ctrl.totalPriceColor(ticket.futureTotalWithVat)}}">
-                                {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
-                            </span>
+                            <vn-icon
+                                ng-show="ticket.futureAgency !== ticket.agency"
+                                icon="icon-agency-term"
+                                title="{{$ctrl.agencies(ticket.futureAgency, ticket.agency)}}">
+                            </vn-icon>
                         </td>
                         <td>
                             <span
@@ -136,13 +127,44 @@
                             </span>
                         </td>
                         <td>{{::ticket.liters | dashIfEmpty}}</td>
-                        <td>{{::ticket.hasStock | dashIfEmpty}}</td>
                         <td>{{::ticket.lines | dashIfEmpty}}</td>
                         <td>
-                            <span class="chip {{$ctrl.totalPriceColor(ticket.totalWithVat)}}">
+                            <span
+                                class="chip {{$ctrl.totalPriceColor(ticket.totalWithVat)}}"
+                                title="{{$ctrl.totalPriceTitle(ticket.totalWithVat) | translate}}">
                                 {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
                             </span>
                         </td>
+                        <td separator>
+                            <span
+                                ng-click="ticketDescriptor.show($event, ticket.futureId)"
+                                class="link">
+                                {{::ticket.futureId | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td shrink-date>
+                            <span class="chip {{$ctrl.compareDate(ticket.futureShipped)}}">
+                                {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
+                            </span>
+                        </td>
+                        <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
+                        <td>
+                            <span
+                                class="chip {{$ctrl.stateColor(ticket.futureState)}}">
+                                {{::ticket.futureState | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td>{{::ticket.futureLiters | dashIfEmpty}}</td>
+                        <td>{{::ticket.notMovableLines | dashIfEmpty}}</td>
+                        <td>{{::ticket.futureLines | dashIfEmpty}}</td>
+                        <td>
+                            <span
+                                class="chip {{$ctrl.totalPriceColor(ticket.futureTotalWithVat)}}"
+                                title="{{$ctrl.totalPriceTitle(ticket.futureTotalWithVat) | translate}}">
+                                {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
+                            </span>
+                        </td>
+
                     </tr>
                 </tbody>
             </table>
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index b770440f1..7b8008426 100644
--- 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, $) {
@@ -62,19 +63,22 @@ export default class Controller extends Section {
     }
 
     setDefaultFilter() {
-        let today = new Date();
+        let today = Date.vnNew();
         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) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         let timeTicket = new Date(date);
         timeTicket.setHours(0, 0, 0, 0);
@@ -115,9 +119,15 @@ export default class Controller extends Section {
     }
 
     totalPriceColor(totalWithVat) {
-        const total = parseInt(totalWithVat);
-        if (total > 0 && total < 50)
-            return 'warning';
+        return this.isLessThan50(totalWithVat) ? 'warning' : '';
+    }
+
+    totalPriceTitle(totalWithVat) {
+        return this.isLessThan50(totalWithVat) ? 'Less than 50€' : '';
+    }
+
+    isLessThan50(totalWithVat) {
+        return (parseInt(totalWithVat) > 0 && parseInt(totalWithVat) < 50);
     }
 
     get confirmationMessage() {
@@ -128,6 +138,11 @@ export default class Controller extends Section {
         });
     }
 
+    agencies(futureAgency, agency) {
+        return this.$t(`Origin agency`, {agency: futureAgency}) +
+            '\n' + this.$t(`Destination agency`, {agency: agency});
+    }
+
     moveTicketsAdvance() {
         let ticketsToMove = [];
         this.checked.forEach(ticket => {
@@ -157,16 +172,30 @@ 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 {'ipt': value};
+            return {or:
+                [
+                    {'ipt': {like: `%${value}%`}},
+                    {'ipt': null}
+                ]
+            };
         case 'futureIpt':
-            return {'futureIpt': value};
+            return {or:
+                [
+                    {'futureIpt': {like: `%${value}%`}},
+                    {'futureIpt': null}
+                ]
+            };
         case 'totalWithVat':
             return {'totalWithVat': value};
         case 'futureTotalWithVat':
             return {'futureTotalWithVat': value};
-        case 'hasStock':
-            return {'hasStock': value};
+        case 'notMovableLines':
+            return {'notMovableLines': value};
         }
     }
 }
diff --git a/modules/ticket/front/advance/index.spec.js b/modules/ticket/front/advance/index.spec.js
index c5a04daee..6874f914b 100644
--- a/modules/ticket/front/advance/index.spec.js
+++ b/modules/ticket/front/advance/index.spec.js
@@ -26,14 +26,14 @@ describe('Component vnTicketAdvance', () => {
 
     describe('compareDate()', () => {
         it('should return warning when the date is the present', () => {
-            let today = new Date();
+            let today = Date.vnNew();
             let result = controller.compareDate(today);
 
             expect(result).toEqual('warning');
         });
 
         it('should return sucess when the date is in the future', () => {
-            let futureDate = new Date();
+            let futureDate = Date.vnNew();
             futureDate = futureDate.setDate(futureDate.getDate() + 10);
             let result = controller.compareDate(futureDate);
 
@@ -41,7 +41,7 @@ describe('Component vnTicketAdvance', () => {
         });
 
         it('should return undefined when the date is in the past', () => {
-            let pastDate = new Date();
+            let pastDate = Date.vnNew();
             pastDate = pastDate.setDate(pastDate.getDate() - 10);
             let result = controller.compareDate(pastDate);
 
@@ -81,7 +81,7 @@ describe('Component vnTicketAdvance', () => {
 
     describe('dateRange()', () => {
         it('should return two dates with the hours at the start and end of the given date', () => {
-            const now = new Date();
+            const now = Date.vnNew();
 
             const today = now.getDate();
 
diff --git a/modules/ticket/front/advance/locale/es.yml b/modules/ticket/front/advance/locale/es.yml
index b444fbdd3..3111d9afd 100644
--- a/modules/ticket/front/advance/locale/es.yml
+++ b/modules/ticket/front/advance/locale/es.yml
@@ -4,3 +4,8 @@ Advance confirmation: ¿Desea adelantar {{checked}} tickets?
 Success: Tickets movidos correctamente
 Lines: Líneas
 Liters: Litros
+Item Packing Type: Encajado
+Origin agency: "Agencia origen: {{agency}}"
+Destination agency: "Agencia destino: {{agency}}"
+Less than 50€: Menor a 50€
+Not Movable: No movibles
diff --git a/modules/ticket/front/advance/style.scss b/modules/ticket/front/advance/style.scss
new file mode 100644
index 000000000..8fa9de438
--- /dev/null
+++ b/modules/ticket/front/advance/style.scss
@@ -0,0 +1,7 @@
+@import "variables";
+
+vn-ticket-advance{
+    vn-icon {
+        color: #f7931e
+    }
+}
diff --git a/modules/ticket/front/basic-data/step-one/index.js b/modules/ticket/front/basic-data/step-one/index.js
index f532265e2..99782de44 100644
--- 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,
diff --git a/modules/ticket/front/basic-data/step-one/index.spec.js b/modules/ticket/front/basic-data/step-one/index.spec.js
index 2b14c18cc..30946dab0 100644
--- a/modules/ticket/front/basic-data/step-one/index.spec.js
+++ b/modules/ticket/front/basic-data/step-one/index.spec.js
@@ -67,7 +67,7 @@ describe('Ticket', () => {
                 jest.spyOn(controller, 'getShipped');
                 controller.ticket.addressFk = 99;
                 controller.addressId = 100;
-                const landed = new Date();
+                const landed = Date.vnNew();
                 const expectedResult = {
                     landed: landed,
                     addressFk: 100,
@@ -101,7 +101,7 @@ describe('Ticket', () => {
 
         describe('shipped() getter', () => {
             it('should return the shipped property', () => {
-                const shipped = new Date();
+                const shipped = Date.vnNew();
                 controller.ticket.shipped = shipped;
 
                 expect(controller.shipped).toEqual(shipped);
@@ -111,7 +111,7 @@ describe('Ticket', () => {
         describe('shipped() setter', () => {
             it('should set shipped property and call getLanded() method ', () => {
                 jest.spyOn(controller, 'getLanded');
-                const shipped = new Date();
+                const shipped = Date.vnNew();
                 const expectedResult = {
                     shipped: shipped,
                     addressFk: 121,
@@ -126,7 +126,7 @@ describe('Ticket', () => {
 
         describe('landed() getter', () => {
             it('should return the landed property', () => {
-                const landed = new Date();
+                const landed = Date.vnNew();
                 controller.ticket.landed = landed;
 
                 expect(controller.landed).toEqual(landed);
@@ -136,7 +136,7 @@ describe('Ticket', () => {
         describe('landed() setter', () => {
             it('should set shipped property and call getShipped() method ', () => {
                 jest.spyOn(controller, 'getShipped');
-                const landed = new Date();
+                const landed = Date.vnNew();
                 const expectedResult = {
                     landed: landed,
                     addressFk: 121,
@@ -161,7 +161,7 @@ describe('Ticket', () => {
             it('should set agencyModeId property and call getLanded() method', () => {
                 jest.spyOn(controller, 'getLanded');
                 controller.$.agencyMode = {selection: {warehouseFk: 1}};
-                const shipped = new Date();
+                const shipped = Date.vnNew();
                 const agencyModeId = 8;
                 const expectedResult = {
                     shipped: shipped,
@@ -177,7 +177,7 @@ describe('Ticket', () => {
 
             it('should do nothing if attempting to set the same agencyMode id', () => {
                 jest.spyOn(controller, 'getShipped');
-                const landed = new Date();
+                const landed = Date.vnNew();
                 const agencyModeId = 7;
                 const expectedResult = {
                     landed: landed,
@@ -278,8 +278,8 @@ describe('Ticket', () => {
                     agencyModeFk: 1,
                     companyFk: 442,
                     warehouseFk: 1,
-                    shipped: new Date(),
-                    landed: new Date()
+                    shipped: Date.vnNew(),
+                    landed: Date.vnNew()
                 };
 
                 expect(controller.isFormInvalid()).toBeFalsy();
@@ -288,7 +288,7 @@ describe('Ticket', () => {
 
         describe('onStepChange()', () => {
             it('should call onStepChange method and return a NO_AGENCY_AVAILABLE signal error', async() => {
-                let landed = new Date();
+                let landed = Date.vnNew();
                 landed.setHours(0, 0, 0, 0);
 
                 controller._ticket = {
@@ -299,7 +299,7 @@ describe('Ticket', () => {
                     agencyModeFk: 1,
                     companyFk: 442,
                     warehouseFk: 1,
-                    shipped: new Date(),
+                    shipped: Date.vnNew(),
                     landed: landed
                 };
 
@@ -314,8 +314,8 @@ describe('Ticket', () => {
 
         describe('getLanded()', () => {
             it('should return an available landed date', async() => {
-                const shipped = new Date();
-                const expectedResult = {landed: new Date()};
+                const shipped = Date.vnNew();
+                const expectedResult = {landed: Date.vnNew()};
                 const params = {
                     shipped: shipped,
                     addressFk: 121,
@@ -336,8 +336,8 @@ describe('Ticket', () => {
 
         describe('getShipped()', () => {
             it('should return an available shipped date', async() => {
-                const landed = new Date();
-                const expectedResult = {shipped: new Date()};
+                const landed = Date.vnNew();
+                const expectedResult = {shipped: Date.vnNew()};
                 const params = {
                     landed: landed,
                     addressFk: 121,
@@ -358,7 +358,7 @@ describe('Ticket', () => {
 
         describe('zoneWhere() getter', () => {
             it('should return an object containing filter properties', async() => {
-                const shipped = new Date();
+                const shipped = Date.vnNew();
                 controller.ticket.shipped = shipped;
 
                 const expectedResult = {
diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html
index 6be455fc9..fc57a354a 100644
--- a/modules/ticket/front/basic-data/step-two/index.html
+++ b/modules/ticket/front/basic-data/step-two/index.html
@@ -23,7 +23,7 @@
                         title="{{::sale.item.name}}"
                         vn-click-stop="itemDescriptor.show($event, sale.itemFk, sale.id)"
                         class="link">
-                        {{::sale.itemFk | zeroFill:6}}
+                        {{::sale.itemFk}}
                     </span>
                 </vn-td>
                 <vn-td vn-fetched-tags>
@@ -40,7 +40,7 @@
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td ng-if="$ctrl.ticket.sale.haveDifferences" number>
-                    <span 
+                    <span
                         class="chip"
                         ng-class="{'alert': sale.quantity>sale.movable}">
                         {{::sale.movable}}
@@ -64,14 +64,14 @@
 <vn-side-menu side="right">
     <div class="vn-pa-md">
         <div class="totalBox align-left">
-            <h6 class="align-center" translate>Total</h6> 
+            <h6 class="align-center" translate>Total</h6>
             <div> <vn-label translate>Price</vn-label> {{$ctrl.totalPrice | currency: 'EUR': 2}}  </div>
             <div> <vn-label translate>New price</vn-label> {{$ctrl.totalNewPrice | currency: 'EUR': 2}}  </div>
             <div> <vn-label translate>Difference</vn-label> {{$ctrl.totalPriceDifference | currency: 'EUR': 2}}  </div>
         </div>
         <vn-card ng-show="::$ctrl.totalPriceDifference">
             <div class="totalBox align-left" >
-                <h6 class="align-center" translate>Charge difference to</h6> 
+                <h6 class="align-center" translate>Charge difference to</h6>
                 <div ng-repeat="action in ticketUpdateActions">
                     <vn-radio
                         ng-model="$ctrl.ticket.option"
@@ -82,7 +82,7 @@
             </div>
         </vn-card>
         <div class="totalBox align-left" ng-show="::$ctrl.haveNegatives">
-            <vn-check 
+            <vn-check
                 ng-model="$ctrl.ticket.withoutNegatives"
                 label="Create without negatives"
                 info="Clone this ticket with the changes and only sales availables">
@@ -95,4 +95,10 @@
     warehouse-fk="$ctrl.ticket.warehouseFk"
     ticket-fk="$ctrl.ticket.id">
 </vn-item-descriptor-popover>
+<vn-confirm
+    vn-id="negativesConfirm"
+    on-accept="$ctrl.onConfirmAccept()"
+    question="Negatives are going to be generated, are you sure you want to advance all the lines?"
+    message="Edit basic data">
+</vn-confirm>
 
diff --git a/modules/ticket/front/basic-data/step-two/index.js b/modules/ticket/front/basic-data/step-two/index.js
index 4ac9f292e..74e2df074 100644
--- a/modules/ticket/front/basic-data/step-two/index.js
+++ b/modules/ticket/front/basic-data/step-two/index.js
@@ -83,6 +83,17 @@ class Controller extends Component {
     }
 
     onSubmit() {
+        if (this.haveNegatives && !this.ticket.withoutNegatives)
+            this.$.negativesConfirm.show();
+        else this.applyChanges();
+    }
+
+    onConfirmAccept() {
+        this.ticket.withWarningAccept = true;
+        this.applyChanges();
+    }
+
+    applyChanges() {
         if (!this.ticket.option) {
             return this.vnApp.showError(
                 this.$t('Choose an option')
@@ -102,7 +113,8 @@ class Controller extends Component {
             landed: this.ticket.landed,
             isDeleted: this.ticket.isDeleted,
             option: parseInt(this.ticket.option),
-            isWithoutNegatives: this.ticket.withoutNegatives
+            isWithoutNegatives: this.ticket.withoutNegatives,
+            withWarningAccept: this.ticket.withWarningAccept
         };
 
         this.$http.post(query, params)
diff --git a/modules/ticket/front/basic-data/step-two/locale/es.yml b/modules/ticket/front/basic-data/step-two/locale/es.yml
index e1f1e0bfc..71f893e1e 100644
--- a/modules/ticket/front/basic-data/step-two/locale/es.yml
+++ b/modules/ticket/front/basic-data/step-two/locale/es.yml
@@ -8,4 +8,6 @@ New price: Nuevo precio
 Price difference: Diferencia de precio
 Create without negatives: Crear sin negativos
 Clone this ticket with the changes and only sales availables: Clona este ticket con los cambios y solo las ventas disponibles.
-Movable: Movible
\ No newline at end of file
+Movable: Movible
+Negatives are going to be generated, are you sure you want to advance all the lines?: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
+Edit basic data: Editar datos básicos
diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index 1236059ae..39b54b461 100644
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@@ -27,7 +27,7 @@
                             <span 
                                 ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)"
                                 class="link">
-                                {{sale.itemFk | zeroFill:6}}
+                                {{sale.itemFk}}
                             </span>
                         </td>
                         <td rowspan="{{::sale.components.length + 1}}" vn-fetched-tags>
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index f6001c6b8..ff029db78 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -177,7 +177,7 @@ class Controller extends Section {
 
     get canRestoreTicket() {
         const isDeleted = this.ticket.isDeleted;
-        const now = new Date();
+        const now = Date.vnNew();
         const maxDate = new Date(this.ticket.updated);
         maxDate.setHours(maxDate.getHours() + 1);
 
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 67dc0affa..babc22038 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -43,7 +43,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
     describe('canRestoreTicket() getter', () => {
         it('should return true for a ticket deleted within the last hour', () => {
             controller.ticket.isDeleted = true;
-            controller.ticket.updated = new Date();
+            controller.ticket.updated = Date.vnNew();
 
             const result = controller.canRestoreTicket;
 
@@ -51,7 +51,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
         });
 
         it('should return false for a ticket deleted more than one hour ago', () => {
-            const pastHour = new Date();
+            const pastHour = Date.vnNew();
             pastHour.setHours(pastHour.getHours() - 2);
 
             controller.ticket.isDeleted = true;
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index ec6dc7ee2..447411f3a 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -55,7 +55,7 @@
                             ng-model="expedition.checked">
                         </vn-check>
                     </vn-td>
-                    <vn-td number expand>{{expedition.id | zeroFill:6}}</vn-td>
+                    <vn-td number expand>{{expedition.id}}</vn-td>
                     <vn-td number>
                         <span
                             ng-class="{link: expedition.packagingItemFk}"
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 7ffe2fe5e..2d4432fe8 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -4,7 +4,7 @@ import Section from 'salix/components/section';
 class Controller extends Section {
     constructor($element, $scope) {
         super($element, $scope);
-        this.landed = new Date();
+        this.landed = Date.vnNew();
         this.newRoute = null;
     }
 
diff --git a/modules/ticket/front/expedition/index.spec.js b/modules/ticket/front/expedition/index.spec.js
index 5a538b1c8..71e32151c 100644
--- a/modules/ticket/front/expedition/index.spec.js
+++ b/modules/ticket/front/expedition/index.spec.js
@@ -76,7 +76,7 @@ describe('Ticket', () => {
             it('should make a query and then call to the $state go() method', () => {
                 jest.spyOn(controller.$state, 'go').mockReturnThis();
 
-                const landed = new Date();
+                const landed = Date.vnNew();
                 const ticket = {
                     clientFk: 1101,
                     landed: landed,
diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html
index c0e1decc2..8628bb34c 100644
--- a/modules/ticket/front/future/index.html
+++ b/modules/ticket/front/future/index.html
@@ -143,7 +143,7 @@
                         </td>
                         <td>{{::ticket.liters}}</td>
                         <td>{{::ticket.lines}}</td>
-                        <td>
+                        <td separator>
                             <span
                             ng-click="ticketDescriptor.show($event, ticket.futureId)"
                             class="link">
diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js
index 5fb2c8f82..8cb7f16aa 100644
--- a/modules/ticket/front/future/index.js
+++ b/modules/ticket/front/future/index.js
@@ -57,18 +57,21 @@ export default class Controller extends Section {
     }
 
     setDefaultFilter() {
-        const today = new Date();
+        const today = Date.vnNew();
 
-        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) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         let timeTicket = new Date(date);
         timeTicket.setHours(0, 0, 0, 0);
@@ -146,9 +149,19 @@ export default class Controller extends Section {
         case 'lines':
             return {'lines': value};
         case 'ipt':
-            return {'ipt': value};
+            return {or:
+                    [
+                        {'ipt': {like: `%${value}%`}},
+                        {'ipt': null}
+                    ]
+            };
         case 'futureIpt':
-            return {'futureIpt': value};
+            return {or:
+                    [
+                        {'futureIpt': {like: `%${value}%`}},
+                        {'futureIpt': null}
+                    ]
+            };
         }
     }
 }
diff --git a/modules/ticket/front/future/index.spec.js b/modules/ticket/front/future/index.spec.js
index c609a4891..188421298 100644
--- a/modules/ticket/front/future/index.spec.js
+++ b/modules/ticket/front/future/index.spec.js
@@ -2,7 +2,7 @@ import './index.js';
 import crudModel from 'core/mocks/crud-model';
 
 describe('Component vnTicketFuture', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     let controller;
     let $httpBackend;
 
@@ -32,7 +32,7 @@ describe('Component vnTicketFuture', () => {
         });
 
         it('should return sucess when the date is in the future', () => {
-            let futureDate = new Date();
+            let futureDate = Date.vnNew();
             futureDate = futureDate.setDate(futureDate.getDate() + 10);
             let result = controller.compareDate(futureDate);
 
@@ -40,7 +40,7 @@ describe('Component vnTicketFuture', () => {
         });
 
         it('should return undefined when the date is in the past', () => {
-            let pastDate = new Date();
+            let pastDate = Date.vnNew();
             pastDate = pastDate.setDate(pastDate.getDate() - 10);
             let result = controller.compareDate(pastDate);
 
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 3039a2a03..42332ccc8 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -90,7 +90,7 @@ export default class Controller extends Section {
     }
 
     compareDate(date) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         let timeTicket = new Date(date);
         timeTicket.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 03071654e..5046387b0 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -31,14 +31,14 @@ describe('Component vnTicketIndex', () => {
 
     describe('compareDate()', () => {
         it('should return warning when the date is the present', () => {
-            let today = new Date();
+            let today = Date.vnNew();
             let result = controller.compareDate(today);
 
             expect(result).toEqual('warning');
         });
 
         it('should return sucess when the date is in the future', () => {
-            let futureDate = new Date();
+            let futureDate = Date.vnNew();
             futureDate = futureDate.setDate(futureDate.getDate() + 10);
             let result = controller.compareDate(futureDate);
 
@@ -46,7 +46,7 @@ describe('Component vnTicketIndex', () => {
         });
 
         it('should return undefined when the date is in the past', () => {
-            let pastDate = new Date();
+            let pastDate = Date.vnNew();
             pastDate = pastDate.setDate(pastDate.getDate() - 10);
             let result = controller.compareDate(pastDate);
 
diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js
index 1b807216b..3f9482fc4 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -22,7 +22,7 @@ export default class Ticket extends ModuleMain {
             $params.scopeDays = 1;
 
         if (typeof $params.scopeDays === 'number') {
-            const from = new Date();
+            const from = Date.vnNew();
             from.setHours(0, 0, 0, 0);
 
             const to = new Date(from.getTime());
diff --git a/modules/ticket/front/package/index.js b/modules/ticket/front/package/index.js
index ed13f12d8..fd67ce583 100644
--- a/modules/ticket/front/package/index.js
+++ b/modules/ticket/front/package/index.js
@@ -6,7 +6,7 @@ class Controller extends Section {
         this.$.model.insert({
             packagingFk: null,
             quantity: null,
-            created: new Date(),
+            created: Date.vnNew(),
             ticketFk: this.$params.id
         });
     }
diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html
index 054f0c76a..510c09974 100644
--- a/modules/ticket/front/request/index/index.html
+++ b/modules/ticket/front/request/index/index.html
@@ -75,7 +75,7 @@
                         ng-show="::request.saleFk"
                         ng-click="itemDescriptor.show($event, request.sale.itemFk, request.sale.id)"
                         class="link">
-                        {{::request.saleFk | zeroFill:6}}
+                        {{::request.saleFk}}
                     </span>
                 </vn-td>
                 <vn-td number
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index 851817551..8d3f414c2 100644
--- a/modules/ticket/front/sale-tracking/index.html
+++ b/modules/ticket/front/sale-tracking/index.html
@@ -17,6 +17,7 @@
                 <vn-th field="itemFk" number>Item</vn-th>
                 <vn-th field="concept">Description</vn-th>
                 <vn-th field="quantity" number>Quantity</vn-th>
+                <vn-th field="parking" center>Parking</vn-th>
                 <vn-th></vn-th>
             </vn-tr>
         </vn-thead>
@@ -30,12 +31,12 @@
                     <span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
                 </vn-td>
                 <vn-td number>
-                    <span
-                        ng-click="$ctrl.showItemDescriptor($event, sale)"
+                        <span
+                        ng-click="itemDescriptor.show($event, sale.item.id)"
                         class="link">
-                        {{::sale.itemFk | zeroFill:6}}
+                        {{::sale.item.id}}
                     </span>
-                </vn-td>
+                    </vn-td>
                 <vn-td vn-fetched-tags>
                     <div>
                         <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
@@ -50,6 +51,7 @@
                     </vn-fetched-tags>
                 </vn-td>
                 <vn-td number>{{::sale.quantity}}</vn-td>
+                <vn-td center>{{::sale.saleGroupDetail.saleGroup.parking.code | dashIfEmpty}}</vn-td>
                 <vn-td actions>
                     <vn-icon-button
                         vn-click-stop="$ctrl.showSaleTracking(sale)"
@@ -96,27 +98,23 @@
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
-                <vn-tr ng-repeat="sale in saleTrackings">
-                    <vn-td number>{{::sale.quantity}}</vn-td>
-                    <vn-td number>{{::sale.originalQuantity}}</vn-td>
+                <vn-tr ng-repeat="saleTracking in saleTrackings">
+                    <vn-td number>{{::saleTracking.quantity}}</vn-td>
+                    <vn-td number>{{::saleTracking.originalQuantity}}</vn-td>
                     <vn-td expand>
                         <span
                             class="link"
-                            ng-click="workerDescriptor.show($event, sale.workerFk)">
-                            {{::sale.userNickname | dashIfEmpty}}
+                            ng-click="workerDescriptor.show($event, saleTracking.workerFk)">
+                            {{::saleTracking.name | dashIfEmpty}}
                         </span>
                     </vn-td>
-                    <vn-td shrink>{{::sale.state}}</vn-td>
-                    <vn-td expand>{{::sale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
+                    <vn-td shrink>{{::saleTracking.state}}</vn-td>
+                    <vn-td expand>{{::saleTracking.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
                 </vn-tr>
             </vn-tbody>
         </vn-table>
         </vn-card>
     </vn-data-viewer>
-    <vn-item-descriptor-popover
-        vn-id="item-descriptor"
-        warehouse-fk="$ctrl.ticket.warehouseFk">
-    </vn-item-descriptor-popover>
     <vn-worker-descriptor-popover
         vn-id="worker-descriptor">
     </vn-worker-descriptor-popover>
diff --git a/modules/ticket/front/sale-tracking/index.js b/modules/ticket/front/sale-tracking/index.js
index 60e42a461..1fc89ec4a 100644
--- a/modules/ticket/front/sale-tracking/index.js
+++ b/modules/ticket/front/sale-tracking/index.js
@@ -9,11 +9,30 @@ class Controller extends Section {
             include: [
                 {
                     relation: 'item'
-                }, {
+                },
+                {
                     relation: 'saleTracking',
                     scope: {
                         fields: ['isChecked']
                     }
+                },
+                {
+                    relation: 'saleGroupDetail',
+                    scope: {
+                        fields: ['saleGroupFk'],
+                        include: {
+                            relation: 'saleGroup',
+                            scope: {
+                                fields: ['parkingFk'],
+                                include: {
+                                    relation: 'parking',
+                                    scope: {
+                                        fields: ['code']
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             ]
         };
@@ -45,14 +64,14 @@ class Controller extends Section {
             btnThree: {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
-                    id: ${sale.itemFk},
+                    id: ${sale.item.id},
                     warehouseFk: ${this.ticket.warehouseFk},
                     lineFk: ${sale.id}
                 })`,
                 tooltip: 'Item diary'
             }
         };
-        this.$.itemDescriptor.show(event.target, sale.itemFk);
+        this.$.itemDescriptor.show(event.target, sale.item.id);
     }
 
     chipHasSaleGroupDetail(hasSaleGroupDetail) {
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 97f6a2a81..fd259e120 100644
--- 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>
@@ -130,7 +131,7 @@
                     </vn-td>
                     <vn-td>
                         <span class="link" ng-if="sale.id"
-                            ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)">
+                        ng-click="itemDescriptor.show($event, sale.itemFk, sale.id, $ctrl.ticket.shipped)">
                             {{sale.itemFk}}
                         </span>
                         <vn-autocomplete ng-if="!sale.id" class="dense"
@@ -364,7 +365,7 @@
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="sale in $ctrl.transfer.sales">
-                        <vn-td number shrink>{{::sale.itemFk | zeroFill:6}}</vn-td>
+                        <vn-td number shrink>{{::sale.itemFk}}</vn-td>
                         <vn-td>
                             <span title="{{::sale.concept}}">{{::sale.concept}}</span>
                         </vn-td>
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 618d4727d..f3fb89d04 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -51,7 +51,7 @@ class Controller extends Section {
 
             const hasClaimManagerRole = this.aclService.hasAny(['claimManager']);
 
-            return landedPlusWeek >= new Date() || hasClaimManagerRole;
+            return landedPlusWeek >= Date.vnNew() || hasClaimManagerRole;
         }
         return false;
     }
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index fbee966fd..8585503cc 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -15,9 +15,9 @@ describe('Ticket', () => {
             const ticket = {
                 id: 1,
                 clientFk: 1101,
-                shipped: new Date(),
-                landed: new Date(),
-                created: new Date(),
+                shipped: Date.vnNew(),
+                landed: Date.vnNew(),
+                created: Date.vnNew(),
                 client: {salesPersonFk: 1},
                 address: {mobile: 111111111}
             };
diff --git a/modules/ticket/front/search-panel/index.spec.js b/modules/ticket/front/search-panel/index.spec.js
index 41c32c047..df320b55b 100644
--- a/modules/ticket/front/search-panel/index.spec.js
+++ b/modules/ticket/front/search-panel/index.spec.js
@@ -38,7 +38,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
         it('should clear the scope days when setting the from property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.from = new Date();
+            controller.from = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.from).toBeDefined();
@@ -49,7 +49,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
         it('should clear the scope days when setting the to property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.to = new Date();
+            controller.to = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.to).toBeDefined();
@@ -58,8 +58,8 @@ describe('Ticket Component vnTicketSearchPanel', () => {
 
     describe('scopeDays() setter', () => {
         it('should clear the date range when setting the scopeDays property', () => {
-            controller.filter.from = new Date();
-            controller.filter.to = new Date();
+            controller.filter.from = Date.vnNew();
+            controller.filter.to = Date.vnNew();
 
             controller.scopeDays = 1;
 
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index fe49a301f..97055208b 100644
--- 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"
@@ -104,12 +105,15 @@
         </vn-one>
         <vn-one class="taxes">
             <p><vn-label translate>Subtotal</vn-label> {{$ctrl.summary.totalWithoutVat | currency: 'EUR':2}}</p>
-            <p><vn-label translate>VAT</vn-label> {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}</p>
+            <p><vn-label translate ng-if="$ctrl.summary.address.isEqualizated">VAT + RE</vn-label>
+                <vn-label translate ng-if="!$ctrl.summary.address.isEqualizated">VAT</vn-label>
+                 {{$ctrl.summary.totalWithVat - $ctrl.summary.totalWithoutVat | currency: 'EUR':2}}
+            </p>
             <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.totalWithVat | currency: 'EUR':2}}</strong></p>
         </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 +150,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 +174,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}}
+                                {{sale.itemFk}}
                             </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 +220,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 +245,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 +280,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,11 +308,11 @@
                         <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">
-                                {{request.sale.itemFk | zeroFill:6}}
+                                {{request.sale.itemFk}}
                             </span>
                         </vn-td>
                         <vn-td number>
@@ -336,9 +340,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>
\ No newline at end of file
+</vn-zone-descriptor-popover>
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index 8f17a9475..f5dd18033 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -35,7 +35,7 @@
                             <span
                                 ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)"
                                 class="link">
-                                {{sale.itemFk | zeroFill:6}}
+                                {{sale.itemFk}}
                             </span>
                         </vn-td>
                         <vn-td vn-fetched-tags>
diff --git a/modules/ticket/front/weekly/index.html b/modules/ticket/front/weekly/index.html
index 3c739d5f9..ca3b6e662 100644
--- a/modules/ticket/front/weekly/index.html
+++ b/modules/ticket/front/weekly/index.html
@@ -17,87 +17,110 @@
         model="model">
     </vn-searchbar>
 </vn-portal>
-<vn-data-viewer
-    model="model"
-    class="vn-w-xl">
-    <vn-card>
-    <vn-table model="model">
-        <vn-thead>
-            <vn-tr>
-                <vn-th field="ticketFk" number>Ticket ID</vn-th>
-                <vn-th field="clientName">Client</vn-th>
-                <vn-th>Shipment</vn-th>
-                <vn-th>Agency</vn-th>
-                <vn-th>Warehouse</vn-th>
-                <vn-th>Salesperson</vn-th>
-                <vn-th shrink></vn-th>
-            </vn-tr>
-        </vn-thead>
-        <vn-tbody>
-            <vn-tr
-                ng-repeat="weekly in weeklies"
-                ui-sref="ticket.card.summary({id: {{::weekly.ticketFk}}})"
-                class="clickable">
-                <vn-td number>
-                    <span
-                        vn-click-stop="ticketDescriptor.show($event, weekly.ticketFk)"
-                        class="link">
-                        {{weekly.ticketFk}}
-                    </span>
-                </vn-td>
-                <vn-td>
-                    <span
-                        vn-click-stop="clientDescriptor.show($event, weekly.clientFk)"
-                        title ="{{::weekly.clientName}}"
-                        class="link">
-                        {{::weekly.clientName}}
-                    </span>
-                </vn-td>
-                <vn-td vn-click-stop>
-                    <vn-autocomplete 
-                        vn-id="weekday"
-                        ng-model="weekly.weekDay"
-                        data="$ctrl.weekdays"
-                        show-field="name"
-                        translate-fields="['name']"
-                        value-field="id"
-                        on-change="$ctrl.onUpdate(weekly.ticketFk, 'weekDay', value)"
-                        order="id"
-                        class="dense">
-                    </vn-autocomplete>
-                </vn-td>
-                <vn-td vn-click-stop>
-                    <vn-autocomplete
-                        vn-id="agencyMode"
-                        ng-model="weekly.agencyModeFk"
-                        url="AgencyModes/isActive"
-                        show-field="name"
-                        value-field="id"
-                        on-change="$ctrl.onUpdate(weekly.ticketFk, 'agencyModeFk', value)"
-                        order="name"
-                        class="dense">
-                    </vn-autocomplete>
-                </vn-td>
-                <vn-td>{{::weekly.warehouseName}}</vn-td>
-                <vn-td>
-                    <span
-                        vn-click-stop="workerDescriptor.show($event, weekly.workerFk)"
-                        class="link" >
-                        {{::weekly.userName}}
-                    </span>
-                </vn-td>
-                <vn-td shrink>
-                    <vn-icon-button
-                        icon="delete"
-                        vn-click-stop="deleteWeekly.show(weekly.ticketFk)"
-                        vn-tooltip="Delete">
-                    </vn-icon-button>
-                </vn-td>
-            </vn-tr>
-        </vn-tbody>
-    </vn-table>
-    </vn-card>
-</vn-data-viewer>
+<vn-card>
+    <smart-table
+        model="model"
+        options="$ctrl.smartTableOptions"
+        view-config-id="ticketsMonitor" 
+        expr-builder="$ctrl.exprBuilder(param, value)"
+    >
+        <slot-actions>
+            <vn-check
+                label="Auto-refresh"
+                vn-tooltip="Toggle auto-refresh every 2 minutes"
+                on-change="$ctrl.autoRefresh(value)">
+            </vn-check>
+        </slot-actions>
+        <slot-table>
+            <table>
+                <thead>
+                    <tr>
+                        <th field="ticketFk">
+                            <span translate>Ticket ID</span>
+                        </th>
+                        <th field="clientName">
+                            <span translate>Client</span>
+                        </th>
+                        <th field="weekDay">
+                            <span translate>Shipment</span>
+                        </th>
+                        <th field="agencyModeFk">
+                            <span translate>Agency</span>
+                        </th>
+                        <th field="warehouseFk">
+                            <span translate>Warehouse</span>
+                        </th>
+                        <th field="nickName">
+                            <span translate>Salesperson</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                   <tr
+                        ng-repeat="weekly in weeklies"
+                        ui-sref="ticket.card.summary({id: {{::weekly.ticketFk}}})"
+                        class="clickable">
+                        <td number>
+                            <span
+                                vn-click-stop="ticketDescriptor.show($event, weekly.ticketFk)"
+                                class="link">
+                                {{weekly.ticketFk}}
+                            </span>
+                        </td>
+                        <td>
+                            <span
+                                vn-click-stop="clientDescriptor.show($event, weekly.clientFk)"
+                                title ="{{::weekly.clientName}}"
+                                class="link">
+                                {{::weekly.clientName}}
+                            </span>
+                        </td>
+                        <td vn-click-stop>
+                            <vn-autocomplete 
+                                vn-id="weekday"
+                                ng-model="weekly.weekDay"
+                                data="$ctrl.weekdays"
+                                show-field="name"
+                                translate-fields="['name']"
+                                value-field="id"
+                                on-change="$ctrl.onUpdate(weekly.ticketFk, 'weekDay', value)"
+                                order="id"
+                                class="dense">
+                            </vn-autocomplete>
+                        </td>
+                        <td vn-click-stop>
+                            <vn-autocomplete
+                                vn-id="agencyMode"
+                                ng-model="weekly.agencyModeFk"
+                                url="AgencyModes/isActive"
+                                show-field="name"
+                                value-field="id"
+                                on-change="$ctrl.onUpdate(weekly.ticketFk, 'agencyModeFk', value)"
+                                order="name"
+                                class="dense">
+                            </vn-autocomplete>
+                        </td>
+                        <td vn-click-stop>{{weekly.warehouseName}}</td>
+                        <td>
+                            <span
+                                vn-click-stop="workerDescriptor.show($event, weekly.workerFk)"
+                                class="link" >
+                                {{::weekly.userName}}
+                            </span>
+                        </td>
+                        <td shrink>
+                            <vn-icon-button
+                                icon="delete"
+                                vn-click-stop="deleteWeekly.show(weekly.ticketFk)"
+                                vn-tooltip="Delete">
+                            </vn-icon-button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
+</vn-card>
 <vn-client-descriptor-popover
     vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
@@ -112,4 +135,4 @@
     on-accept="$ctrl.onDeleteWeeklyAccept($data)"
     question="This ticket will be removed from weekly tickets! Continue anyway?"
     message="You are going to delete this weekly ticket">
-</vn-confirm>
+</vn-confirm>
\ No newline at end of file
diff --git a/modules/ticket/front/weekly/index.js b/modules/ticket/front/weekly/index.js
index 71365c4b3..a10ff7184 100644
--- a/modules/ticket/front/weekly/index.js
+++ b/modules/ticket/front/weekly/index.js
@@ -1,3 +1,4 @@
+
 import ngModule from '../module';
 import Section from 'salix/components/section';
 
@@ -15,6 +16,44 @@ export default class Controller extends Section {
             {id: 5, name: 'Saturday'},
             {id: 6, name: 'Sunday'}
         ];
+
+        this.smartTableOptions = {
+            activeButtons: {
+                search: true,
+                shownColumns: true,
+            },
+            columns: [
+                {
+                    field: 'ticketFk',
+                    searchable: false
+                },
+                {
+                    field: 'clientName',
+                },
+                {
+                    field: 'weekDay',
+                    searchable: false,
+                },
+                {
+                    field: 'agencyModeFk',
+                    searchable: false,
+                },
+                {
+                    field: 'warehouseFk',
+                    searchable: false,
+                },
+                {
+                    field: 'nickname',
+                },
+            ]
+        };
+    }
+
+    exprBuilder(param, value) {
+        switch (param) {
+        case 'clientName': return {'c.name': value};
+        case 'nickName': return {'u.name': value};
+        }
     }
 
     onUpdate(ticketFk, field, value) {
diff --git a/modules/travel/back/methods/thermograph/createThermograph.js b/modules/travel/back/methods/thermograph/createThermograph.js
index 23d9d6037..75d967628 100644
--- a/modules/travel/back/methods/thermograph/createThermograph.js
+++ b/modules/travel/back/methods/thermograph/createThermograph.js
@@ -40,7 +40,7 @@ module.exports = Self => {
         const models = Self.app.models;
         let tx;
         const myOptions = {};
-        const date = new Date();
+        const date = Date.vnNew();
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
diff --git a/modules/travel/back/methods/travel/cloneWithEntries.js b/modules/travel/back/methods/travel/cloneWithEntries.js
index 611f4e429..e5b6b1580 100644
--- a/modules/travel/back/methods/travel/cloneWithEntries.js
+++ b/modules/travel/back/methods/travel/cloneWithEntries.js
@@ -39,8 +39,8 @@ module.exports = Self => {
                 'ref'
             ]
         });
-        const started = new Date();
-        const ended = new Date();
+        const started = Date.vnNew();
+        const ended = Date.vnNew();
 
         if (!travel)
             throw new UserError('Travel not found');
diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
index 2e79ff193..0e434e048 100644
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@@ -49,7 +49,7 @@ describe('Travel cloneWithEntries()', () => {
         pending('#2687 - Cannot make a data rollback because of the triggers');
         const warehouseThree = 3;
         const agencyModeOne = 1;
-        const yesterday = new Date();
+        const yesterday = Date.vnNew();
         yesterday.setDate(yesterday.getDate() - 1);
 
         travelBefore = await models.Travel.findById(travelId);
diff --git a/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js b/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
index 3693aae82..599851b55 100644
--- a/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
+++ b/modules/travel/back/methods/travel/specs/extraCommunityFilter.spec.js
@@ -95,10 +95,10 @@ describe('Travel extraCommunityFilter()', () => {
     });
 
     it('should return the routes matching "shipped from" and "landed to"', async() => {
-        const from = new Date();
+        const from = Date.vnNew();
         from.setDate(from.getDate() - 2);
         from.setHours(0, 0, 0, 0);
-        const to = new Date();
+        const to = Date.vnNew();
         to.setHours(23, 59, 59, 999);
         to.setDate(to.getDate() + 7);
         const ctx = {
diff --git a/modules/travel/back/methods/travel/specs/filter.spec.js b/modules/travel/back/methods/travel/specs/filter.spec.js
index c739866a0..1a6ee895c 100644
--- a/modules/travel/back/methods/travel/specs/filter.spec.js
+++ b/modules/travel/back/methods/travel/specs/filter.spec.js
@@ -54,8 +54,8 @@ describe('Travel filter()', () => {
     });
 
     it('should return the routes matching "shipped from" and "shipped to"', async() => {
-        const from = new Date();
-        const to = new Date();
+        const from = Date.vnNew();
+        const to = Date.vnNew();
         from.setHours(0, 0, 0, 0);
         to.setHours(23, 59, 59, 999);
         to.setDate(to.getDate() + 1);
diff --git a/modules/travel/front/create/index.spec.js b/modules/travel/front/create/index.spec.js
index e3f85d9ae..cdff8cfb9 100644
--- a/modules/travel/front/create/index.spec.js
+++ b/modules/travel/front/create/index.spec.js
@@ -53,7 +53,7 @@ describe('Travel Component vnTravelCreate', () => {
 
         it(`should do nothing if there's no response data.`, () => {
             controller.travel = {agencyModeFk: 4};
-            const tomorrow = new Date();
+            const tomorrow = Date.vnNew();
 
             const query = `travels/getAverageDays?agencyModeFk=${controller.travel.agencyModeFk}`;
             $httpBackend.expectGET(query).respond(undefined);
@@ -67,7 +67,7 @@ describe('Travel Component vnTravelCreate', () => {
 
         it(`should fill the fields when it's selected a date and agency.`, () => {
             controller.travel = {agencyModeFk: 1};
-            const tomorrow = new Date();
+            const tomorrow = Date.vnNew();
             tomorrow.setDate(tomorrow.getDate() + 9);
             const expectedResponse = {
                 id: 8,
diff --git a/modules/travel/front/extra-community/index.js b/modules/travel/front/extra-community/index.js
index 2389570b9..920339469 100644
--- a/modules/travel/front/extra-community/index.js
+++ b/modules/travel/front/extra-community/index.js
@@ -25,12 +25,12 @@ class Controller extends Section {
         this.droppableElement = 'tbody[vn-droppable]';
 
         const twoDays = 2;
-        const shippedFrom = new Date();
+        const shippedFrom = Date.vnNew();
         shippedFrom.setDate(shippedFrom.getDate() - twoDays);
         shippedFrom.setHours(0, 0, 0, 0);
 
         const sevenDays = 7;
-        const landedTo = new Date();
+        const landedTo = Date.vnNew();
         landedTo.setDate(landedTo.getDate() + sevenDays);
         landedTo.setHours(23, 59, 59, 59);
 
diff --git a/modules/travel/front/index/index.js b/modules/travel/front/index/index.js
index 50036831f..7701289b7 100644
--- a/modules/travel/front/index/index.js
+++ b/modules/travel/front/index/index.js
@@ -20,7 +20,7 @@ export default class Controller extends Section {
     }
 
     compareDate(date) {
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         date = new Date(date);
diff --git a/modules/travel/front/index/index.spec.js b/modules/travel/front/index/index.spec.js
index 9abe46a64..9083c4519 100644
--- a/modules/travel/front/index/index.spec.js
+++ b/modules/travel/front/index/index.spec.js
@@ -50,7 +50,7 @@ describe('Travel Component vnTravelIndex', () => {
 
     describe('compareDate()', () => {
         it('should return warning if the date passed to compareDate() is todays', () => {
-            const today = new Date();
+            const today = Date.vnNew();
 
             const result = controller.compareDate(today);
 
@@ -58,7 +58,7 @@ describe('Travel Component vnTravelIndex', () => {
         });
 
         it('should return success if the date passed to compareDate() is in the future', () => {
-            const tomorrow = new Date();
+            const tomorrow = Date.vnNew();
             tomorrow.setDate(tomorrow.getDate() + 1);
 
             const result = controller.compareDate(tomorrow);
@@ -67,7 +67,7 @@ describe('Travel Component vnTravelIndex', () => {
         });
 
         it('should return undefined if the date passed to compareDate() is in the past', () => {
-            const yesterday = new Date();
+            const yesterday = Date.vnNew();
             yesterday.setDate(yesterday.getDate() - 1);
 
             const result = controller.compareDate(yesterday);
diff --git a/modules/travel/front/main/index.js b/modules/travel/front/main/index.js
index d6f103033..fbaf78c16 100644
--- a/modules/travel/front/main/index.js
+++ b/modules/travel/front/main/index.js
@@ -15,7 +15,7 @@ export default class Travel extends ModuleMain {
             $params.scopeDays = 1;
 
         if (typeof $params.scopeDays === 'number') {
-            const shippedFrom = new Date();
+            const shippedFrom = Date.vnNew();
             shippedFrom.setHours(0, 0, 0, 0);
 
             const shippedTo = new Date(shippedFrom.getTime());
diff --git a/modules/travel/front/main/index.spec.js b/modules/travel/front/main/index.spec.js
index 6d9db4dc8..bf5a27b41 100644
--- a/modules/travel/front/main/index.spec.js
+++ b/modules/travel/front/main/index.spec.js
@@ -15,7 +15,7 @@ describe('Travel Component vnTravel', () => {
             let params = controller.fetchParams({
                 scopeDays: 2
             });
-            const shippedFrom = new Date();
+            const shippedFrom = Date.vnNew();
             shippedFrom.setHours(0, 0, 0, 0);
             const shippedTo = new Date(shippedFrom.getTime());
             shippedTo.setDate(shippedTo.getDate() + params.scopeDays);
diff --git a/modules/travel/front/search-panel/index.spec.js b/modules/travel/front/search-panel/index.spec.js
index a1f3c36b3..884f4fb17 100644
--- a/modules/travel/front/search-panel/index.spec.js
+++ b/modules/travel/front/search-panel/index.spec.js
@@ -15,7 +15,7 @@ describe('Travel Component vnTravelSearchPanel', () => {
         it('should clear the scope days when setting the from property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.shippedFrom = new Date();
+            controller.shippedFrom = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.shippedFrom).toBeDefined();
@@ -26,7 +26,7 @@ describe('Travel Component vnTravelSearchPanel', () => {
         it('should clear the scope days when setting the to property', () => {
             controller.filter.scopeDays = 1;
 
-            controller.shippedTo = new Date();
+            controller.shippedTo = Date.vnNew();
 
             expect(controller.filter.scopeDays).toBeNull();
             expect(controller.shippedTo).toBeDefined();
@@ -35,8 +35,8 @@ describe('Travel Component vnTravelSearchPanel', () => {
 
     describe('scopeDays() setter', () => {
         it('should clear the date range when setting the scopeDays property', () => {
-            controller.filter.shippedFrom = new Date();
-            controller.filter.shippedTo = new Date();
+            controller.filter.shippedFrom = Date.vnNew();
+            controller.filter.shippedTo = Date.vnNew();
 
             controller.scopeDays = 1;
 
diff --git a/modules/worker/back/methods/calendar/absences.js b/modules/worker/back/methods/calendar/absences.js
index ddf38a604..8420ed770 100644
--- a/modules/worker/back/methods/calendar/absences.js
+++ b/modules/worker/back/methods/calendar/absences.js
@@ -35,12 +35,12 @@ module.exports = Self => {
     Self.absences = async(ctx, workerFk, businessFk, year, options) => {
         const models = Self.app.models;
 
-        const started = new Date();
+        const started = Date.vnNew();
         started.setFullYear(year);
         started.setMonth(0);
         started.setDate(1);
 
-        const ended = new Date();
+        const ended = Date.vnNew();
         ended.setFullYear(year);
         ended.setMonth(12);
         ended.setDate(0);
diff --git a/modules/worker/back/methods/calendar/specs/absences.spec.js b/modules/worker/back/methods/calendar/specs/absences.spec.js
index 2180a5312..365773182 100644
--- a/modules/worker/back/methods/calendar/specs/absences.spec.js
+++ b/modules/worker/back/methods/calendar/specs/absences.spec.js
@@ -6,7 +6,7 @@ describe('Worker absences()', () => {
         const workerId = 1106;
         const businessId = 1106;
 
-        const now = new Date();
+        const now = Date.vnNew();
         const year = now.getFullYear();
 
         const [absences] = await app.models.Calendar.absences(ctx, workerId, businessId, year);
@@ -22,7 +22,7 @@ describe('Worker absences()', () => {
         const businessId = 1106;
         const ctx = {req: {accessToken: {userId: 9}}};
 
-        const now = new Date();
+        const now = Date.vnNew();
         const year = now.getFullYear();
 
         const tx = await app.models.Calendar.beginTransaction({});
@@ -55,15 +55,15 @@ describe('Worker absences()', () => {
         const workerId = 1106;
 
         const userId = 1106;
-        const today = new Date();
+        const today = Date.vnNew();
 
         // getting how many days in a year
-        const yearStart = new Date();
+        const yearStart = Date.vnNew();
         yearStart.setHours(0, 0, 0, 0);
         yearStart.setMonth(0);
         yearStart.setDate(1);
 
-        const yearEnd = new Date();
+        const yearEnd = Date.vnNew();
         const currentYear = yearEnd.getFullYear();
         yearEnd.setFullYear(currentYear + 1);
         yearEnd.setHours(0, 0, 0, 0);
@@ -92,7 +92,7 @@ describe('Worker absences()', () => {
             // normal test begins
             const contract = await app.models.WorkerLabour.findById(businessId, null, options);
 
-            const startingContract = new Date();
+            const startingContract = Date.vnNew();
             startingContract.setHours(0, 0, 0, 0);
             startingContract.setMonth(today.getMonth());
             startingContract.setDate(1);
diff --git a/modules/worker/back/methods/holiday/getByWarehouse.js b/modules/worker/back/methods/holiday/getByWarehouse.js
index 093885d13..50029e62b 100644
--- a/modules/worker/back/methods/holiday/getByWarehouse.js
+++ b/modules/worker/back/methods/holiday/getByWarehouse.js
@@ -17,7 +17,7 @@ module.exports = Self => {
     });
 
     Self.getByWarehouse = async warehouseFk => {
-        let beginningYear = new Date();
+        let beginningYear = Date.vnNew();
         beginningYear.setMonth(0);
         beginningYear.setDate(1);
         beginningYear.setHours(0, 0, 0, 0);
diff --git a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
index 7825f38b8..4d9f98cc3 100644
--- a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
+++ b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
@@ -93,7 +93,7 @@ module.exports = Self => {
     };
 
     async function emailConfirm(buffer) {
-        const now = new Date();
+        const now = Date.vnNew();
         const from = JSON.stringify(Imap.parseHeader(buffer).from);
         const subject = JSON.stringify(Imap.parseHeader(buffer).subject);
 
@@ -121,7 +121,7 @@ module.exports = Self => {
     }
 
     async function emailReply(buffer, emailBody) {
-        const now = new Date();
+        const now = Date.vnNew();
         const from = JSON.stringify(Imap.parseHeader(buffer).from);
         const subject = JSON.stringify(Imap.parseHeader(buffer).subject);
 
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 78c212e9b..579a83112 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -42,8 +42,8 @@ module.exports = Self => {
         let stmt;
 
         if (!args.week || !args.year) {
-            const from = new Date();
-            const to = new Date();
+            const from = Date.vnNew();
+            const to = Date.vnNew();
 
             const time = await models.Time.findOne({
                 where: {
@@ -79,7 +79,7 @@ module.exports = Self => {
                 week: args.week
             };
             await models.WorkerTimeControlMail.updateAll(where, {
-                updated: new Date(), state: 'SENDED'
+                updated: Date.vnNew(), state: 'SENDED'
             }, myOptions);
 
             stmt = new ParameterizedSQL(
@@ -102,7 +102,7 @@ module.exports = Self => {
                 week: args.week
             };
             await models.WorkerTimeControlMail.updateAll(where, {
-                updated: new Date(), state: 'SENDED'
+                updated: Date.vnNew(), state: 'SENDED'
             }, myOptions);
 
             stmt = new ParameterizedSQL(`CALL vn.timeControl_calculateAll(?, ?)`, [started, ended]);
@@ -223,11 +223,11 @@ module.exports = Self => {
 
                         let timeTableDecimalInSeconds = 0;
                         for (let journey of journeys) {
-                            const start = new Date();
+                            const start = Date.vnNew();
                             const [startHours, startMinutes, startSeconds] = getTime(journey.start);
                             start.setHours(startHours, startMinutes, startSeconds, 0);
 
-                            const end = new Date();
+                            const end = Date.vnNew();
                             const [endHours, endMinutes, endSeconds] = getTime(journey.end);
                             end.setHours(endHours, endMinutes, endSeconds, 0);
 
diff --git a/modules/worker/back/methods/worker-time-control/specs/filter.spec.js b/modules/worker/back/methods/worker-time-control/specs/filter.spec.js
index 927d83df3..0c4d229f2 100644
--- a/modules/worker/back/methods/worker-time-control/specs/filter.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/filter.spec.js
@@ -3,9 +3,9 @@ const models = require('vn-loopback/server/server').models;
 describe('workerTimeControl filter()', () => {
     it('should return 1 result filtering by id', async() => {
         const ctx = {req: {accessToken: {userId: 1106}}, args: {workerFk: 1106}};
-        const firstHour = new Date();
+        const firstHour = Date.vnNew();
         firstHour.setHours(7, 0, 0, 0);
-        const lastHour = new Date();
+        const lastHour = Date.vnNew();
         lastHour.setDate(lastHour.getDate() + 1);
         lastHour.setHours(15, 0, 0, 0);
 
@@ -21,9 +21,9 @@ describe('workerTimeControl filter()', () => {
 
     it('should return a privilege error for a non subordinate worker', async() => {
         const ctx = {req: {accessToken: {userId: 1107}}, args: {workerFk: 1106}};
-        const firstHour = new Date();
+        const firstHour = Date.vnNew();
         firstHour.setHours(7, 0, 0, 0);
-        const lastHour = new Date();
+        const lastHour = Date.vnNew();
         lastHour.setDate(lastHour.getDate() + 1);
         lastHour.setHours(15, 0, 0, 0);
 
diff --git a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
index e9924c67b..e90c849b7 100644
--- a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js
@@ -35,7 +35,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             let error;
 
             try {
-                ctx.args = {timed: new Date(), direction: 'in'};
+                ctx.args = {timed: Date.vnNew(), direction: 'in'};
                 await models.WorkerTimeControl.addTimeEntry(ctx, workerId);
             } catch (e) {
                 error = e;
@@ -52,7 +52,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             let error;
 
             try {
-                ctx.args = {timed: new Date(), direction: 'in'};
+                ctx.args = {timed: Date.vnNew(), direction: 'in'};
                 await models.WorkerTimeControl.addTimeEntry(ctx, workerId);
             } catch (e) {
                 error = e;
@@ -71,7 +71,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             try {
                 const options = {transaction: tx};
 
-                const todayAtOne = new Date();
+                const todayAtOne = Date.vnNew();
                 todayAtOne.setHours(1, 0, 0, 0);
 
                 ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -95,7 +95,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             try {
                 const options = {transaction: tx};
 
-                const todayAtOne = new Date();
+                const todayAtOne = Date.vnNew();
                 todayAtOne.setHours(1, 0, 0, 0);
 
                 ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -123,7 +123,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             try {
                 const options = {transaction: tx};
 
-                const todayAtOne = new Date();
+                const todayAtOne = Date.vnNew();
                 todayAtOne.setHours(1, 0, 0, 0);
 
                 ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -151,7 +151,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             try {
                 const options = {transaction: tx};
 
-                const todayAtOne = new Date();
+                const todayAtOne = Date.vnNew();
                 todayAtOne.setHours(1, 0, 0, 0);
 
                 ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -179,7 +179,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             try {
                 const options = {transaction: tx};
 
-                const todayAtOne = new Date();
+                const todayAtOne = Date.vnNew();
                 todayAtOne.setHours(1, 0, 0, 0);
 
                 ctx.args = {timed: todayAtOne, direction: 'in'};
@@ -204,7 +204,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
             pending('https://redmine.verdnatura.es/issues/4707');
             activeCtx.accessToken.userId = salesBossId;
             const workerId = hankPymId;
-            const date = new Date();
+            const date = Date.vnNew();
             date.setDate(date.getDate() - 16);
             date.setHours(8, 0, 0);
             let error;
@@ -227,7 +227,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
         it('should fail to add a time entry for a worker without an existing contract', async() => {
             activeCtx.accessToken.userId = salesBossId;
             const workerId = hankPymId;
-            const date = new Date();
+            const date = Date.vnNew();
             date.setFullYear(date.getFullYear() - 2);
             let error;
 
@@ -252,7 +252,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -282,7 +282,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -316,7 +316,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -350,7 +350,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -384,7 +384,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -421,7 +421,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -456,7 +456,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -493,7 +493,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = jessicaJonesId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -528,7 +528,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = jessicaJonesId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setDate(date.getDate() - 21);
                 date = weekDay(date, monday);
                 let error;
@@ -565,7 +565,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setMonth(date.getMonth() - 2);
                 date.setDate(1);
                 let error;
@@ -600,7 +600,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setMonth(date.getMonth() - 2);
                 date.setDate(1);
                 let error;
@@ -634,7 +634,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
                 activeCtx.accessToken.userId = salesBossId;
                 const workerId = hankPymId;
 
-                let date = new Date();
+                let date = Date.vnNew();
                 date.setMonth(date.getMonth() - 2);
                 date.setDate(1);
                 let error;
diff --git a/modules/worker/back/methods/worker/activeContract.js b/modules/worker/back/methods/worker/activeContract.js
index 05dcee6b5..d3d439cd0 100644
--- a/modules/worker/back/methods/worker/activeContract.js
+++ b/modules/worker/back/methods/worker/activeContract.js
@@ -27,7 +27,7 @@ module.exports = Self => {
         if (!isSubordinate)
             throw new UserError(`You don't have enough privileges`);
 
-        const now = new Date();
+        const now = Date.vnNew();
 
         return models.WorkerLabour.findOne({
             where: {
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index 1467d6d6b..43a9f4d23 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -80,8 +80,8 @@ module.exports = Self => {
             if (hasHoursRecorded && isNotHalfAbsence)
                 throw new UserError(`The worker has hours recorded that day`);
 
-            const date = new Date();
-            const now = new Date();
+            const date = Date.vnNew();
+            const now = Date.vnNew();
             date.setHours(0, 0, 0, 0);
             const [result] = await Self.rawSql(
                 `SELECT COUNT(*) halfHolidayCounter
diff --git a/modules/worker/back/methods/worker/holidays.js b/modules/worker/back/methods/worker/holidays.js
index 7f093a330..9c214e0f7 100644
--- a/modules/worker/back/methods/worker/holidays.js
+++ b/modules/worker/back/methods/worker/holidays.js
@@ -45,13 +45,13 @@ module.exports = Self => {
         if (!isSubordinate)
             throw new UserError(`You don't have enough privileges`);
 
-        const started = new Date();
+        const started = Date.vnNew();
         started.setFullYear(args.year);
         started.setMonth(0);
         started.setDate(1);
         started.setHours(0, 0, 0, 0);
 
-        const ended = new Date();
+        const ended = Date.vnNew();
         ended.setFullYear(args.year);
         ended.setMonth(12);
         ended.setDate(0);
diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js
new file mode 100644
index 000000000..a7bb883cd
--- /dev/null
+++ 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};
+    };
+};
diff --git a/modules/worker/back/methods/worker/specs/createAbsence.spec.js b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
index 7214e815e..346e43c51 100644
--- a/modules/worker/back/methods/worker/specs/createAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
@@ -10,7 +10,7 @@ describe('Worker createAbsence()', () => {
             args: {
                 businessFk: 18,
                 absenceTypeId: 1,
-                dated: new Date()
+                dated: Date.vnNew()
             }
         };
 
@@ -45,7 +45,7 @@ describe('Worker createAbsence()', () => {
             args: {
                 businessFk: 18,
                 absenceTypeId: 1,
-                dated: new Date()
+                dated: Date.vnNew()
             }
         };
         ctx.req.__ = value => {
@@ -82,7 +82,7 @@ describe('Worker createAbsence()', () => {
                 id: 1,
                 businessFk: 1,
                 absenceTypeId: 6,
-                dated: new Date()
+                dated: Date.vnNew()
             }
         };
         const workerId = 1;
@@ -111,7 +111,7 @@ describe('Worker createAbsence()', () => {
                 id: 1106,
                 businessFk: 1106,
                 absenceTypeId: 1,
-                dated: new Date()
+                dated: Date.vnNew()
             }
         };
         const workerId = 1106;
diff --git a/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js b/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js
index a105669cf..0f3f913dc 100644
--- a/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/deleteAbsence.spec.js
@@ -28,7 +28,7 @@ describe('Worker deleteAbsence()', () => {
             const createdAbsence = await app.models.Calendar.create({
                 businessFk: businessId,
                 dayOffTypeFk: 1,
-                dated: new Date()
+                dated: Date.vnNew()
             }, options);
 
             ctx.args = {absenceId: createdAbsence.id};
@@ -59,7 +59,7 @@ describe('Worker deleteAbsence()', () => {
             const createdAbsence = await app.models.Calendar.create({
                 businessFk: businessId,
                 dayOffTypeFk: 1,
-                dated: new Date()
+                dated: Date.vnNew()
             }, options);
 
             ctx.args = {absenceId: createdAbsence.id};
diff --git a/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js b/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
index 054a829e5..f5b06cc9e 100644
--- a/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
+++ b/modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
@@ -3,10 +3,10 @@ const models = require('vn-loopback/server/server').models;
 describe('Worker getWorkedHours()', () => {
     it(`should return the expected hours and the worked hours of a given date`, async() => {
         const workerID = 1106;
-        const started = new Date();
+        const started = Date.vnNew();
         started.setHours(0, 0, 0, 0);
 
-        const ended = new Date();
+        const ended = Date.vnNew();
         ended.setHours(23, 59, 59, 999);
 
         const [result] = await models.Worker.getWorkedHours(workerID, started, ended);
diff --git a/modules/worker/back/methods/worker/specs/holidays.spec.js b/modules/worker/back/methods/worker/specs/holidays.spec.js
index d8310b738..f23b247ca 100644
--- a/modules/worker/back/methods/worker/specs/holidays.spec.js
+++ b/modules/worker/back/methods/worker/specs/holidays.spec.js
@@ -17,7 +17,7 @@ describe('Worker holidays()', () => {
     });
 
     it('should now get the absence calendar for a full year contract', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         const year = now.getFullYear();
 
         ctx.args = {businessFk: businessId, year: year};
@@ -29,7 +29,7 @@ describe('Worker holidays()', () => {
     });
 
     it('should now get the payed holidays calendar for a worker', async() => {
-        const now = new Date();
+        const now = Date.vnNew();
         const year = now.getFullYear();
 
         ctx.args = {businessFk: businessId, year: year};
diff --git a/modules/worker/back/methods/worker/specs/new.spec.js b/modules/worker/back/methods/worker/specs/new.spec.js
new file mode 100644
index 000000000..f695ab80e
--- /dev/null
+++ 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);
+    });
+});
diff --git a/modules/worker/back/methods/worker/specs/updateAbsence.spec.js b/modules/worker/back/methods/worker/specs/updateAbsence.spec.js
index 6339b3163..a624fc1d3 100644
--- a/modules/worker/back/methods/worker/specs/updateAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/updateAbsence.spec.js
@@ -21,7 +21,7 @@ describe('Worker updateAbsence()', () => {
         createdAbsence = await app.models.Calendar.create({
             businessFk: businessId,
             dayOffTypeFk: 1,
-            dated: new Date()
+            dated: Date.vnNew()
         });
     });
 
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index 3f3416504..7e03c8a23 100644
--- 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"
     }
 }
 
diff --git a/modules/worker/back/models/profile-type.json b/modules/worker/back/models/profile-type.json
new file mode 100644
index 000000000..d1d750de8
--- /dev/null
+++ 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"
+        }
+    }
+}
diff --git a/modules/worker/back/models/worker-config.json b/modules/worker/back/models/worker-config.json
new file mode 100644
index 000000000..05cdfef42
--- /dev/null
+++ 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"
+        }
+    ]
+}
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index ec6c4af28..e66259cd0 100644
--- 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);
 };
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 3d41707ce..e3a941dd3 100644
--- 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"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js
index 95e1fc134..4ca0fc929 100644
--- a/modules/worker/front/calendar/index.js
+++ b/modules/worker/front/calendar/index.js
@@ -5,7 +5,7 @@ import './style.scss';
 class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.date = new Date();
+        this.date = Date.vnNew();
         this.events = {};
         this.buildYearFilter();
     }
@@ -15,7 +15,7 @@ class Controller extends Section {
     }
 
     set year(value) {
-        const newYear = new Date();
+        const newYear = Date.vnNew();
         newYear.setFullYear(value);
 
         this.date = newYear;
@@ -76,7 +76,7 @@ class Controller extends Section {
     }
 
     buildYearFilter() {
-        const now = new Date();
+        const now = Date.vnNew();
         now.setFullYear(now.getFullYear() + 1);
 
         const maxYear = now.getFullYear();
diff --git a/modules/worker/front/calendar/index.spec.js b/modules/worker/front/calendar/index.spec.js
index 1da4066d9..586a7223d 100644
--- a/modules/worker/front/calendar/index.spec.js
+++ b/modules/worker/front/calendar/index.spec.js
@@ -6,7 +6,7 @@ describe('Worker', () => {
         let $httpParamSerializer;
         let $scope;
         let controller;
-        let year = new Date().getFullYear();
+        let year = Date.vnNew().getFullYear();
 
         beforeEach(ngModule('worker'));
 
@@ -67,7 +67,7 @@ describe('Worker', () => {
                 controller.getIsSubordinate = jest.fn();
                 controller.getActiveContract = jest.fn();
 
-                let today = new Date();
+                let today = Date.vnNew();
                 let tomorrow = new Date(today.getTime());
                 tomorrow.setDate(tomorrow.getDate() + 1);
 
@@ -105,7 +105,7 @@ describe('Worker', () => {
 
         describe('getContractHolidays()', () => {
             it(`should return the worker holidays amount and then set the contractHolidays property`, () => {
-                const today = new Date();
+                const today = Date.vnNew();
                 const year = today.getFullYear();
 
                 const serializedParams = $httpParamSerializer({year});
@@ -119,7 +119,7 @@ describe('Worker', () => {
 
         describe('formatDay()', () => {
             it(`should set the day element style`, () => {
-                const today = new Date();
+                const today = Date.vnNew();
 
                 controller.events[today.getTime()] = {
                     name: 'Holiday',
@@ -170,7 +170,7 @@ describe('Worker', () => {
             it(`should call to the create() method`, () => {
                 jest.spyOn(controller, 'create').mockReturnThis();
 
-                const selectedDay = new Date();
+                const selectedDay = Date.vnNew();
                 const $event = {
                     target: {
                         closest: () => {
@@ -188,7 +188,7 @@ describe('Worker', () => {
             it(`should call to the delete() method`, () => {
                 jest.spyOn(controller, 'delete').mockReturnThis();
 
-                const selectedDay = new Date();
+                const selectedDay = Date.vnNew();
                 const expectedEvent = {
                     dated: selectedDay,
                     type: 'holiday',
@@ -212,7 +212,7 @@ describe('Worker', () => {
             it(`should call to the edit() method`, () => {
                 jest.spyOn(controller, 'edit').mockReturnThis();
 
-                const selectedDay = new Date();
+                const selectedDay = Date.vnNew();
                 const expectedEvent = {
                     dated: selectedDay,
                     type: 'leaveOfAbsence',
@@ -238,7 +238,7 @@ describe('Worker', () => {
             it(`should make a HTTP POST query and then call to the repaintCanceller() method`, () => {
                 jest.spyOn(controller, 'repaintCanceller').mockReturnThis();
 
-                const dated = new Date();
+                const dated = Date.vnNew();
                 const calendarElement = {};
                 const expectedResponse = {id: 10};
 
@@ -287,7 +287,7 @@ describe('Worker', () => {
 
                 const expectedParams = {absenceId: 10};
                 const calendarElement = {};
-                const selectedDay = new Date();
+                const selectedDay = Date.vnNew();
                 const expectedEvent = {
                     dated: selectedDay,
                     type: 'leaveOfAbsence',
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
new file mode 100644
index 000000000..5f5ab9d07
--- /dev/null
+++ 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>
diff --git a/modules/worker/front/create/index.js b/modules/worker/front/create/index.js
new file mode 100644
index 000000000..7e837fe02
--- /dev/null
+++ 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
+});
diff --git a/modules/worker/front/create/index.spec.js b/modules/worker/front/create/index.spec.js
new file mode 100644
index 000000000..c2e9acce0
--- /dev/null
+++ 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);
+            });
+        });
+    });
+});
diff --git a/modules/worker/front/create/locale/es.yml b/modules/worker/front/create/locale/es.yml
new file mode 100644
index 000000000..8c79d770c
--- /dev/null
+++ 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
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index 2ff032def..ef2f64e85 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -82,7 +82,7 @@ class Controller extends Descriptor {
     }
 
     onUploadResponse() {
-        const timestamp = new Date().getTime();
+        const timestamp = Date.vnNew().getTime();
         const src = this.$rootScope.imagePath('user', '520x520', this.worker.id);
         const zoomSrc = this.$rootScope.imagePath('user', '1600x1600', this.worker.id);
         const newSrc = `${src}&t=${timestamp}`;
diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js
index f703e7c21..97126407c 100644
--- 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';
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html
index 98df416b4..7044ca551 100644
--- 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>
\ No newline at end of file
+</vn-popup>
diff --git a/modules/worker/front/index/locale/es.yml b/modules/worker/front/index/locale/es.yml
new file mode 100644
index 000000000..df6383273
--- /dev/null
+++ b/modules/worker/front/index/locale/es.yml
@@ -0,0 +1 @@
+New worker: Nuevo trabajador
diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json
index ca33eaa76..dad55512b 100644
--- 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"]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index c3d3e5eab..f7379fea0 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -16,7 +16,7 @@ class Controller extends Section {
 
     $postLink() {
         const timestamp = this.$params.timestamp;
-        let initialDate = new Date();
+        let initialDate = Date.vnNew();
 
         if (timestamp) {
             initialDate = new Date(timestamp * 1000);
@@ -199,7 +199,7 @@ class Controller extends Section {
     getFinishTime() {
         if (!this.weekDays) return;
 
-        let today = new Date();
+        let today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         let todayInWeek = this.weekDays.find(day => day.dated.getTime() === today.getTime());
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 4f317a5e6..b68162d39 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -18,7 +18,7 @@ describe('Component vnWorkerTimeControl', () => {
 
     describe('date() setter', () => {
         it(`should set the weekDays, the date in the controller and call fetchHours`, () => {
-            let today = new Date();
+            let today = Date.vnNew();
             jest.spyOn(controller, 'fetchHours').mockReturnThis();
 
             controller.date = today;
@@ -33,7 +33,7 @@ describe('Component vnWorkerTimeControl', () => {
 
     describe('hours() setter', () => {
         it(`should set hours data at it's corresponding week day`, () => {
-            let today = new Date();
+            let today = Date.vnNew();
             jest.spyOn(controller, 'fetchHours').mockReturnThis();
 
             controller.date = today;
@@ -64,7 +64,7 @@ describe('Component vnWorkerTimeControl', () => {
 
     describe('getWorkedHours() ', () => {
         it('should set the weekdays expected and worked hours plus the total worked hours', () => {
-            let today = new Date();
+            let today = Date.vnNew();
             jest.spyOn(controller, 'fetchHours').mockReturnThis();
 
             controller.date = today;
@@ -117,7 +117,7 @@ describe('Component vnWorkerTimeControl', () => {
         describe('save() ', () => {
             it(`should make a query an then call to the fetchHours() method`, () => {
                 controller.fetchHours = jest.fn();
-                controller.selectedRow = {id: 1, timed: new Date(), direction: 'in'};
+                controller.selectedRow = {id: 1, timed: Date.vnNew(), direction: 'in'};
                 controller.$.editEntry = {
                     hide: () => {}
                 };
diff --git a/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js b/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
index bc7aa1ed9..4f79b2315 100644
--- a/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
+++ b/modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('Agency getAgenciesWithWarehouse()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it('should return the agencies that can handle the given delivery request', async() => {
         const tx = await app.models.Zone.beginTransaction({});
 
diff --git a/modules/zone/back/methods/agency/specs/getLanded.spec.js b/modules/zone/back/methods/agency/specs/getLanded.spec.js
index c199b2ba6..e2e6b3eb3 100644
--- a/modules/zone/back/methods/agency/specs/getLanded.spec.js
+++ b/modules/zone/back/methods/agency/specs/getLanded.spec.js
@@ -3,7 +3,7 @@ const models = require('vn-loopback/server/server').models;
 describe('agency getLanded()', () => {
     it('should return a landing date', async() => {
         const ctx = {req: {accessToken: {userId: 1}}};
-        const shipped = new Date();
+        const shipped = Date.vnNew();
         shipped.setDate(shipped.getDate() + 1);
         const addressFk = 121;
         const agencyModeFk = 7;
diff --git a/modules/zone/back/methods/agency/specs/getShipped.spec.js b/modules/zone/back/methods/agency/specs/getShipped.spec.js
index f2b36fc94..43e2c1208 100644
--- a/modules/zone/back/methods/agency/specs/getShipped.spec.js
+++ b/modules/zone/back/methods/agency/specs/getShipped.spec.js
@@ -2,7 +2,7 @@ const app = require('vn-loopback/server/server');
 
 describe('agency getShipped()', () => {
     it('should return a shipment date', async() => {
-        const landed = new Date();
+        const landed = Date.vnNew();
         landed.setDate(landed.getDate() + 1);
         const addressFk = 121;
         const agencyModeFk = 7;
@@ -25,7 +25,7 @@ describe('agency getShipped()', () => {
     });
 
     it('should not return a shipment date', async() => {
-        const newDate = new Date();
+        const newDate = Date.vnNew();
         newDate.setMonth(newDate.getMonth() - 1);
         const landed = newDate;
         const addressFk = 121;
diff --git a/modules/zone/back/methods/agency/specs/landsThatDay.spec.js b/modules/zone/back/methods/agency/specs/landsThatDay.spec.js
index 7d207b383..ea10e708f 100644
--- a/modules/zone/back/methods/agency/specs/landsThatDay.spec.js
+++ b/modules/zone/back/methods/agency/specs/landsThatDay.spec.js
@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('Agency landsThatDay()', () => {
-    const today = new Date();
+    const today = Date.vnNew();
     it('should return a list of agencies that can land a shipment on a day for an address', async() => {
         const tx = await app.models.Agency.beginTransaction({});
 
diff --git a/modules/zone/back/methods/zone/deleteZone.js b/modules/zone/back/methods/zone/deleteZone.js
index fb228bcf4..e3846132b 100644
--- a/modules/zone/back/methods/zone/deleteZone.js
+++ b/modules/zone/back/methods/zone/deleteZone.js
@@ -22,7 +22,7 @@ module.exports = Self => {
         const models = Self.app.models;
         const token = ctx.req.accessToken;
         const userId = token.userId;
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
 
         let tx;
diff --git a/modules/zone/back/methods/zone/getZoneClosing.js b/modules/zone/back/methods/zone/getZoneClosing.js
index 2a0088203..76706b55c 100644
--- a/modules/zone/back/methods/zone/getZoneClosing.js
+++ b/modules/zone/back/methods/zone/getZoneClosing.js
@@ -31,7 +31,7 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         query = `
-            SELECT * 
+            SELECT *
                 FROM (
                     SELECT
                         DISTINCT z.id,
@@ -40,18 +40,21 @@ module.exports = Self => {
                         IFNULL(ze.hour, z.hour) as hour,
                         IFNULL(ze.price, z.price) as price
                     FROM vn.zone z
-                        JOIN agencyMode am ON am.id = z.agencyModeFk
-                        LEFT JOIN zoneEvent ze ON ze.zoneFk = z.id
-                    WHERE 
-                        (
-                            dated = ? 
-                            OR ? BETWEEN started AND ended 
-                            OR INSTR(weekDays, SUBSTRING(DAYNAME(?), 1, 3) ) > 0
-                        )
+                        JOIN vn.agencyMode am ON am.id = z.agencyModeFk
+                        LEFT JOIN vn.zoneEvent ze ON ze.zoneFk = z.id
+                    WHERE ((
+                        ze.type = 'day'
+                        AND ze.dated = ?
+                    ) OR (
+                        ze.type != 'day'
+                        AND ze.weekDays & (1 << WEEKDAY(?))
+                        AND (ze.started IS NULL OR ? >= ze.started)
+                        AND (ze.ended IS NULL OR ? <= ze.ended)
+                    ))
                         AND z.id IN (?)
                     ORDER BY type='day' DESC, type='range' DESC, type='indefinitely' DESC) z
                 GROUP BY z.id`;
 
-        return Self.rawSql(query, [date, date, date, zoneIds], myOptions);
+        return Self.rawSql(query, [date, date, date, date, zoneIds], myOptions);
     };
 };
diff --git a/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js b/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
index 3a345f2ce..a34132be4 100644
--- a/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
+++ b/modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
@@ -2,7 +2,7 @@ const models = require('vn-loopback/server/server').models;
 
 describe('zone exclusionGeo()', () => {
     const zoneId = 1;
-    const today = new Date();
+    const today = Date.vnNew();
 
     it(`should show an error when location isn't selected`, async() => {
         const tx = await models.Zone.beginTransaction({});
diff --git a/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js b/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
index 8160ee05e..6fd6bb994 100644
--- a/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
+++ b/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
@@ -6,7 +6,7 @@ describe('zone getEventsFiltered()', () => {
 
         try {
             const options = {transaction: tx};
-            const today = new Date();
+            const today = Date.vnNew();
 
             const result = await models.Zone.getEventsFiltered(10, today, today, options);
 
@@ -26,7 +26,7 @@ describe('zone getEventsFiltered()', () => {
 
             try {
                 const options = {transaction: tx};
-                const today = new Date();
+                const today = Date.vnNew();
 
                 const result = await models.Zone.getEventsFiltered(9, today, today, options);
 
@@ -45,7 +45,7 @@ describe('zone getEventsFiltered()', () => {
 
             try {
                 const options = {transaction: tx};
-                const date = new Date();
+                const date = Date.vnNew();
                 date.setFullYear(date.getFullYear() - 2);
                 const dateTomorrow = new Date(date.setDate(date.getDate() + 1));
 
diff --git a/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js b/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js
index 4fb4b4e5c..cdd6fe584 100644
--- a/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js
+++ b/modules/zone/back/methods/zone/specs/getZoneClosing.spec.js
@@ -6,7 +6,7 @@ describe('zone getZoneClosing()', () => {
 
         try {
             const options = {transaction: tx};
-            const date = new Date();
+            const date = Date.vnNew();
             const today = date.toISOString().split('T')[0];
             const result = await models.Zone.getZoneClosing([1, 2, 3], today, options);
 
diff --git a/modules/zone/back/methods/zone/specs/includingExpired.spec.js b/modules/zone/back/methods/zone/specs/includingExpired.spec.js
index 98fdc272d..121a84887 100644
--- a/modules/zone/back/methods/zone/specs/includingExpired.spec.js
+++ b/modules/zone/back/methods/zone/specs/includingExpired.spec.js
@@ -50,7 +50,7 @@ describe('zone includingExpired()', () => {
     it('should return an array containing available zones', async() => {
         const ctx = {req: {accessToken: {userId: 1}}};
         const where = {
-            shipped: new Date(),
+            shipped: Date.vnNew(),
             addressFk: addressId,
             agencyModeFk: inhousePickupId,
             warehouseFk: warehouseId
diff --git a/modules/zone/front/calendar/index.js b/modules/zone/front/calendar/index.js
index 3bc7158ef..288a8f328 100644
--- a/modules/zone/front/calendar/index.js
+++ b/modules/zone/front/calendar/index.js
@@ -8,7 +8,7 @@ class Controller extends Component {
         this.vnWeekDays = vnWeekDays;
         this.nMonths = 4;
 
-        let date = new Date();
+        let date = Date.vnNew();
         date.setDate(1);
         date.setHours(0, 0, 0, 0);
         this.date = date;
diff --git a/modules/zone/front/calendar/index.spec.js b/modules/zone/front/calendar/index.spec.js
index 338f47917..43280a9e8 100644
--- a/modules/zone/front/calendar/index.spec.js
+++ b/modules/zone/front/calendar/index.spec.js
@@ -22,7 +22,7 @@ describe('component vnZoneCalendar', () => {
         it('should set the month property and then call the refreshEvents() method', () => {
             jest.spyOn(controller, 'refreshEvents').mockReturnThis();
 
-            controller.date = new Date();
+            controller.date = Date.vnNew();
 
             expect(controller.refreshEvents).toHaveBeenCalledWith();
             expect(controller.months.length).toEqual(4);
@@ -31,7 +31,7 @@ describe('component vnZoneCalendar', () => {
 
     describe('step()', () => {
         it('should set the date month to 4 months backwards', () => {
-            const now = new Date();
+            const now = Date.vnNew();
             now.setDate(15);
             now.setMonth(now.getMonth() - 4);
 
@@ -44,7 +44,7 @@ describe('component vnZoneCalendar', () => {
         });
 
         it('should set the date month to 4 months forwards', () => {
-            const now = new Date();
+            const now = Date.vnNew();
             now.setDate(15);
             now.setMonth(now.getMonth() + 4);
 
@@ -63,13 +63,13 @@ describe('component vnZoneCalendar', () => {
 
             controller.data = {
                 exclusions: [{
-                    dated: new Date()
+                    dated: Date.vnNew()
                 }],
                 events: [{
-                    dated: new Date()
+                    dated: Date.vnNew()
                 }],
                 geoExclusions: [{
-                    dated: new Date()
+                    dated: Date.vnNew()
                 }],
             };
 
@@ -85,9 +85,9 @@ describe('component vnZoneCalendar', () => {
     describe('refreshEvents()', () => {
         it('should fill the days property with the events.', () => {
             controller.data = [];
-            controller.firstDay = new Date();
+            controller.firstDay = Date.vnNew();
 
-            const lastDay = new Date();
+            const lastDay = Date.vnNew();
             lastDay.setDate(lastDay.getDate() + 10);
             controller.lastDay = lastDay;
 
@@ -114,7 +114,7 @@ describe('component vnZoneCalendar', () => {
             jest.spyOn(controller, 'emit');
 
             const $event = {};
-            const $days = [new Date()];
+            const $days = [Date.vnNew()];
             const $type = 'day';
             const $weekday = 1;
 
@@ -136,7 +136,7 @@ describe('component vnZoneCalendar', () => {
 
     describe('hasEvents()', () => {
         it('should return true for an existing event on a date', () => {
-            const dated = new Date();
+            const dated = Date.vnNew();
 
             controller.days[dated.getTime()] = true;
 
@@ -148,7 +148,7 @@ describe('component vnZoneCalendar', () => {
 
     describe('getClass()', () => {
         it('should return the className "excluded" for an excluded date', () => {
-            const dated = new Date();
+            const dated = Date.vnNew();
 
             controller.exclusions = [];
             controller.exclusions[dated.getTime()] = true;
@@ -159,7 +159,7 @@ describe('component vnZoneCalendar', () => {
         });
 
         it('should return the className "geoExcluded" for a date with geo excluded', () => {
-            const dated = new Date();
+            const dated = Date.vnNew();
 
             controller.geoExclusions = [];
             controller.geoExclusions[dated.getTime()] = true;
diff --git a/modules/zone/front/create/index.js b/modules/zone/front/create/index.js
index 859204d8d..db337a9a3 100644
--- a/modules/zone/front/create/index.js
+++ b/modules/zone/front/create/index.js
@@ -7,7 +7,7 @@ export default class Controller extends Section {
             travelingDays: 0,
             price: 0.20,
             bonus: 0.20,
-            hour: new Date()
+            hour: Date.vnNew()
         };
     }
 
diff --git a/modules/zone/front/delivery-days/index.spec.js b/modules/zone/front/delivery-days/index.spec.js
index 63c87fbea..28705880c 100644
--- a/modules/zone/front/delivery-days/index.spec.js
+++ b/modules/zone/front/delivery-days/index.spec.js
@@ -103,7 +103,7 @@ describe('Zone Component vnZoneDeliveryDays', () => {
             const target = document.createElement('div');
             target.dispatchEvent(event);
 
-            const day = new Date();
+            const day = Date.vnNew();
             const events = [
                 {zoneFk: 1},
                 {zoneFk: 2},
diff --git a/modules/zone/front/descriptor/index.js b/modules/zone/front/descriptor/index.js
index 08ada0606..3f4863a60 100644
--- a/modules/zone/front/descriptor/index.js
+++ b/modules/zone/front/descriptor/index.js
@@ -28,7 +28,7 @@ class Controller extends Descriptor {
 
     onDelete() {
         const $t = this.$translate.instant;
-        const today = new Date();
+        const today = Date.vnNew();
         today.setHours(0, 0, 0, 0);
         const filter = {where: {zoneFk: this.id, shipped: {gte: today}}};
         this.$http.get(`Tickets`, {filter}).then(res => {
diff --git a/modules/zone/front/events/index.spec.js b/modules/zone/front/events/index.spec.js
index b4ff800d6..558d97b6f 100644
--- a/modules/zone/front/events/index.spec.js
+++ b/modules/zone/front/events/index.spec.js
@@ -68,7 +68,7 @@ describe('component vnZoneEvents', () => {
         it('should call the createInclusion() method', () => {
             jest.spyOn(controller, 'createInclusion').mockReturnThis();
 
-            const weekday = {dated: new Date()};
+            const weekday = {dated: Date.vnNew()};
             const days = [weekday];
             const type = 'EventType';
             const events = [];
@@ -114,7 +114,7 @@ describe('component vnZoneEvents', () => {
             jest.spyOn(controller, 'createExclusion').mockReturnThis();
 
             const weekday = {};
-            const days = [{dated: new Date()}];
+            const days = [{dated: Date.vnNew()}];
             const type = 'EventType';
             const events = [];
             const exclusions = [];
@@ -156,7 +156,7 @@ describe('component vnZoneEvents', () => {
         it('shoud set the excludeSelected property and then call the excludeDialog show() method', () => {
             controller.$.excludeDialog = {show: jest.fn()};
 
-            const days = [new Date()];
+            const days = [Date.vnNew()];
             controller.createExclusion(days);
 
             expect(controller.excludeSelected).toBeDefined();
@@ -170,7 +170,7 @@ describe('component vnZoneEvents', () => {
             controller.$.includeDialog = {show: jest.fn()};
 
             const type = 'weekday';
-            const days = [new Date()];
+            const days = [Date.vnNew()];
             const weekday = 1;
             controller.createInclusion(type, days, weekday);
 
@@ -187,7 +187,7 @@ describe('component vnZoneEvents', () => {
             controller.$.includeDialog = {show: jest.fn()};
 
             const type = 'nonListedType';
-            const days = [new Date()];
+            const days = [Date.vnNew()];
             const weekday = 1;
             controller.createInclusion(type, days, weekday);
 
diff --git a/package-lock.json b/package-lock.json
index 31820196f..61180fa3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,16 @@
 {
     "name": "salix-back",
-    "version": "9.0.0",
+    "version": "23.02.03",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "9.0.0",
+            "version": "23.02.03",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",
+                "base64url": "^3.0.1",
                 "bcrypt": "^5.0.1",
                 "bmp-js": "^0.1.0",
                 "compression": "^1.7.3",
@@ -4200,6 +4201,14 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/base64url": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+            "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
         "node_modules/batch": {
             "version": "0.6.1",
             "dev": true,
@@ -29057,6 +29066,11 @@
         "base64-js": {
             "version": "1.0.2"
         },
+        "base64url": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+            "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
+        },
         "batch": {
             "version": "0.6.1",
             "dev": true
diff --git a/package.json b/package.json
index 2e0fb9ae8..4cf53911c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "230401",
+    "version": "23.08.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",
@@ -13,6 +13,7 @@
     },
     "dependencies": {
         "axios": "^1.2.2",
+        "base64url": "^3.0.1",
         "bcrypt": "^5.0.1",
         "bmp-js": "^0.1.0",
         "compression": "^1.7.3",
diff --git a/print/core/filters/index.js b/print/core/filters/index.js
index efc398508..bfd99c504 100644
--- a/print/core/filters/index.js
+++ b/print/core/filters/index.js
@@ -4,5 +4,4 @@ require('./uppercase');
 require('./currency');
 require('./percentage');
 require('./number');
-require('./zerofill');
 
diff --git a/print/core/filters/specs/zerofill.spec.js b/print/core/filters/specs/zerofill.spec.js
deleted file mode 100644
index 1c00ff4a7..000000000
--- a/print/core/filters/specs/zerofill.spec.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import zerofill from '../zerofill.js';
-
-describe('zerofill filter', () => {
-    const superDuperNumber = 1984;
-
-    it('should filter the number filling it with zeros up to 6 characters length', () => {
-        expect(zerofill(superDuperNumber, '000000')).toEqual('001984');
-    });
-});
diff --git a/print/core/filters/zerofill.js b/print/core/filters/zerofill.js
deleted file mode 100644
index c3d18079b..000000000
--- a/print/core/filters/zerofill.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const Vue = require('vue');
-
-const zerofill = function(value, pad) {
-    const valueStr = String(value);
-    return pad.substring(0, pad.length - valueStr.length) + valueStr;
-};
-
-Vue.filter('zerofill', zerofill);
-
-module.exports = zerofill;
diff --git a/print/core/mixins/vn-report.js b/print/core/mixins/vn-report.js
new file mode 100644
index 000000000..4831d8cd9
--- /dev/null
+++ 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);
+        }
+    },
+};
diff --git a/print/templates/email/buyer-week-waste/buyer-week-waste.js b/print/templates/email/buyer-week-waste/buyer-week-waste.js
index 9d4fe1ce1..1ae40cd98 100755
--- a/print/templates/email/buyer-week-waste/buyer-week-waste.js
+++ b/print/templates/email/buyer-week-waste/buyer-week-waste.js
@@ -13,7 +13,7 @@ module.exports = {
         dated: function() {
             const filters = this.$options.filters;
 
-            return filters.date(new Date(), '%d-%m-%Y');
+            return filters.date(Date.vnNew(), '%d-%m-%Y');
         }
     },
     methods: {
diff --git a/print/templates/email/email-verify/email-verify.js b/print/templates/email/email-verify/email-verify.js
index 7f0b80a13..4f2b29266 100755
--- 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
         }
     }
diff --git a/print/templates/email/osticket-report/osticket-report.js b/print/templates/email/osticket-report/osticket-report.js
index eb9c76a89..0d39947d5 100755
--- a/print/templates/email/osticket-report/osticket-report.js
+++ b/print/templates/email/osticket-report/osticket-report.js
@@ -37,7 +37,7 @@ module.exports = {
         dated: function() {
             const filters = this.$options.filters;
 
-            return filters.date(new Date(), '%d-%m-%Y');
+            return filters.date(Date.vnNew(), '%d-%m-%Y');
         },
         startedTime: function() {
             return new Date(this.started).getTime();
diff --git a/print/templates/email/printer-setup/locale/es.yml b/print/templates/email/printer-setup/locale/es.yml
index 77a3a7299..7361e5ed3 100644
--- 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:
diff --git a/print/templates/email/recover-password/recover-password.js b/print/templates/email/recover-password/recover-password.js
index b589411a9..d8448f370 100755
--- 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
         }
     }
diff --git a/print/templates/email/worker-welcome/assets/css/import.js b/print/templates/email/worker-welcome/assets/css/import.js
new file mode 100644
index 000000000..4b4bb7086
--- /dev/null
+++ 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();
diff --git a/print/templates/email/worker-welcome/locale/es.yml b/print/templates/email/worker-welcome/locale/es.yml
new file mode 100644
index 000000000..d53a4e1f0
--- /dev/null
+++ 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>.'
diff --git a/print/templates/email/worker-welcome/sql/worker.sql b/print/templates/email/worker-welcome/sql/worker.sql
new file mode 100644
index 000000000..f75d135d9
--- /dev/null
+++ 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 = ?;
diff --git a/print/templates/email/worker-welcome/worker-welcome.html b/print/templates/email/worker-welcome/worker-welcome.html
new file mode 100644
index 000000000..fbb05d149
--- /dev/null
+++ 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>
diff --git a/print/templates/email/worker-welcome/worker-welcome.js b/print/templates/email/worker-welcome/worker-welcome.js
new file mode 100755
index 000000000..043a172a1
--- /dev/null
+++ 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
+        }
+    }
+};
diff --git a/print/templates/reports/balance-compensation/balance-compensation.html b/print/templates/reports/balance-compensation/balance-compensation.html
index 59af1bd11..d1a2788ed 100644
--- 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">
@@ -18,7 +18,7 @@
                     <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('From client')}} {{client.name}} {{$t('Toclient')}} {{company.name}}.
+                        {{$t('From client')}} {{client.name}} {{$t('Against the balance of')}}: {{client.invoiceFk}}.
                     </p>
                     <p style="margin-top: 8%">
                         {{$t('Reception')}} <span style="color: blue">administracion@verdnatura.es</span>
diff --git a/print/templates/reports/balance-compensation/balance-compensation.js b/print/templates/reports/balance-compensation/balance-compensation.js
index 98a9cf577..bae7c5c3c 100644
--- 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: {
diff --git a/print/templates/reports/balance-compensation/locale/es.yml b/print/templates/reports/balance-compensation/locale/es.yml
index 546e55f06..1c76274ae 100644
--- a/print/templates/reports/balance-compensation/locale/es.yml
+++ b/print/templates/reports/balance-compensation/locale/es.yml
@@ -4,13 +4,13 @@ Compensation: Compensación de saldos deudores y acreedores
 In one hand: De una parte
 CIF: con CIF
 NIF: con NIF
-Home: y domicilio sito en 
+Home: y domicilio sito en
 In other hand: De la otra
 Sr: Don/Doña
 Agree: Acuerdan
 Date: En fecha de
-Compensate: se ha compensado el saldo de 
+Compensate: se ha compensado el saldo de
 From client: del cliente/proveedor
-To client: con el cliente/proveedor
+Against the balance of: contra el saldo de
 Reception: Por favor, rogamos confirmen la recepción de esta compensación al email
-Greetings: Saludos cordiales,
\ No newline at end of file
+Greetings: Saludos cordiales,
diff --git a/print/templates/reports/balance-compensation/sql/client.sql b/print/templates/reports/balance-compensation/sql/client.sql
index 92e6f6cab..c3679b68a 100644
--- a/print/templates/reports/balance-compensation/sql/client.sql
+++ b/print/templates/reports/balance-compensation/sql/client.sql
@@ -4,9 +4,9 @@ SELECT
         c.street,
         c.fi,
         c.city,
+        r.invoiceFk,
         r.amountPaid,
         r.payed
     FROM client c
         JOIN receipt r ON r.clientFk = c.id
-        JOIN supplier s ON c.fi = s.nif
-    WHERE r.id = ?
\ No newline at end of file
+    WHERE r.id = ?
diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.html b/print/templates/reports/campaign-metrics/campaign-metrics.html
index e86d4cd3b..ad60c511c 100644
--- 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>
@@ -45,7 +45,7 @@
                 </thead>
                 <tbody v-for="sale in sales">
                     <tr>
-                        <td>{{sale.itemFk | zerofill('000000')}}</td>
+                        <td>{{sale.itemFk}}</td>
                         <td class="number">{{Math.trunc(sale.subtotal)}}</td>
                         <td width="50%">{{sale.concept}}</td>
                     </tr>
diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.js b/print/templates/reports/campaign-metrics/campaign-metrics.js
index 14a4b6a9b..45bca88dc 100755
--- 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: {
diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.html b/print/templates/reports/claim-pickup-order/claim-pickup-order.html
index b14f5410c..000568ef2 100644
--- 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>
diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.js b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
index 5c7002e47..cc5cec1ea 100755
--- a/print/templates/reports/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
@@ -1,34 +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: 'claim-pickup-order',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id) {
-            return this.rawSqlFromDef('sales', [id]);
-        }
-    },
-    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]);
     },
     props: {
         id: {
@@ -36,5 +14,5 @@ module.exports = {
             required: true,
             description: 'The claim id'
         }
-    }
+    },
 };
diff --git a/print/templates/reports/client-debt-statement/client-debt-statement.html b/print/templates/reports/client-debt-statement/client-debt-statement.html
index 962af021d..30fbbe003 100644
--- a/print/templates/reports/client-debt-statement/client-debt-statement.html
+++ b/print/templates/reports/client-debt-statement/client-debt-statement.html
@@ -13,7 +13,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>
@@ -44,7 +44,7 @@
                 </thead>
                 <tbody v-for="sale in sales" :key="sale.id">
                     <tr>
-                        <td>{{sale.issued | date('%d-%m-%Y')}}</td>
+                        <td>{{formatDate(sale.issued, '%d-%m-%Y')}}</td>
                         <td>{{sale.ref}}</td>
                         <td class="number">{{sale.debtOut}}</td>
                         <td class="number">{{sale.debtIn}}</td>
diff --git a/print/templates/reports/client-debt-statement/client-debt-statement.js b/print/templates/reports/client-debt-statement/client-debt-statement.js
index 45b97518f..a74595200 100755
--- a/print/templates/reports/client-debt-statement/client-debt-statement.js
+++ b/print/templates/reports/client-debt-statement/client-debt-statement.js
@@ -1,44 +1,18 @@
-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: 'client-debt-statement',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id, this.from);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.rawSqlFromDef('sales',
+            [this.from, this.id, this.from, this.id, this.from, this.id, this.from, this.id, this.from, this.id]);
     },
     data() {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id, from) {
-            return this.rawSqlFromDef('sales', [
-                from,
-                id,
-                from,
-                id,
-                from,
-                id,
-                from,
-                id,
-                from,
-                id
-            ]);
-        },
         getBalance(sale) {
             if (sale.debtOut)
                 this.totalBalance += parseFloat(sale.debtOut);
@@ -63,10 +37,6 @@ module.exports = {
             return debtIn.toFixed(2);
         },
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,
diff --git a/print/templates/reports/collection-label/collection-label.html b/print/templates/reports/collection-label/collection-label.html
index 2fd77079f..a699d4ac5 100644
--- a/print/templates/reports/collection-label/collection-label.html
+++ b/print/templates/reports/collection-label/collection-label.html
@@ -21,7 +21,7 @@
                     <td id="outline" class="ellipsize">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td>
                 </tr>
                 <tr>
-                    <td><div id="agencyDescripton" class="ellipsize">{{labelData.agencyDescription ? labelData.agencyDescription.toUpperCase() : '---'}}</div></td>
+                    <td><div id="agencyDescripton" class="ellipsize">{{getAgencyDescripton(labelData)}}</div></td>
                     <td id="bold">{{labelData.lineCount || 0}}</td>
                 </tr>
                 <tr>
diff --git a/print/templates/reports/collection-label/collection-label.js b/print/templates/reports/collection-label/collection-label.js
index e73afaeea..656dde082 100644
--- a/print/templates/reports/collection-label/collection-label.js
+++ b/print/templates/reports/collection-label/collection-label.js
@@ -1,11 +1,10 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
 const jsBarcode = require('jsbarcode');
 const {DOMImplementation, XMLSerializer} = require('xmldom');
-const UserError = require('vn-loopback/util/user-error');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'collection-label',
+    mixins: [vnReport],
     props: {
         id: {
             type: Number,
@@ -30,8 +29,7 @@ module.exports = {
             ticketIds = [this.id];
 
         this.labelsData = await this.rawSqlFromDef('labelsData', [ticketIds]);
-        if (!this.labelsData.length)
-            throw new UserError('Empty data source');
+        this.checkMainEntity(this.labelsData);
     },
     methods: {
         getBarcode(id) {
@@ -61,8 +59,17 @@ module.exports = {
 
             return value;
         },
-    },
-    components: {
-        'report-body': reportBody.build()
+        getAgencyDescripton(labelData) {
+            let value;
+            if (labelData.agencyDescription)
+                value = labelData.agencyDescription.toUpperCase().substring(0, 11);
+            else
+                value = '---';
+
+            if (labelData.routeFk)
+                value = `${value} [${labelData.routeFk.toString().substring(0, 3)}]`;
+
+            return value;
+        },
     },
 };
diff --git a/print/templates/reports/collection-label/sql/labelsData.sql b/print/templates/reports/collection-label/sql/labelsData.sql
index 1846c6893..fef692272 100644
--- a/print/templates/reports/collection-label/sql/labelsData.sql
+++ b/print/templates/reports/collection-label/sql/labelsData.sql
@@ -1,37 +1,38 @@
 SELECT c.itemPackingTypeFk code,
-		tc.collectionFk,
-		SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
-		tc.`level`,
-		t.id ticketFk,
-		COALESCE(et.description, zo.name, am.name) agencyDescription,
-		cc.code color,
-		t.clientFk,
-		CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
-		MAX(i.`size`) `size`,
-		w.code workerCode,
-		TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
-		TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
-		DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
-		tt.labelCount,
-		t.nickName,
-		COUNT(*) lineCount
-	FROM vn.ticket t
-		JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
-		JOIN vn.collection c ON c.id = tc.collectionFk
-		LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
-			AND cc.wagon = tc.wagon
-			AND cc.trainFk = c.trainFk
-		JOIN vn.sale s ON s.ticketFk = t.id
-		LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id	
-		JOIN vn.item i ON i.id = s.itemFk
-		JOIN vn.itemType it ON it.id = i.typeFk
-		JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-		JOIN vn.worker w ON w.id = c.workerFk
-		JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-		LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
-		LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
-		LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-		LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk	
-	WHERE t.id IN (?)
-	GROUP BY t.id
-	ORDER BY cc.`code`;
\ No newline at end of file
+        tc.collectionFk,
+        SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
+        tc.`level`,
+        t.id ticketFk,
+        COALESCE(et.description, zo.name, am.name) agencyDescription,
+        cc.code color,
+        t.clientFk,
+        CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
+        MAX(i.`size`) `size`,
+        w.code workerCode,
+        TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
+        TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
+        DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
+        tt.labelCount,
+        t.nickName,
+        COUNT(*) lineCount,
+        rm.routeFk
+    FROM vn.ticket t
+        JOIN vn.ticketCollection tc ON tc.ticketFk = t.id
+        JOIN vn.collection c ON c.id = tc.collectionFk
+        LEFT JOIN vn.collectionColors cc ON cc.shelve = tc.`level`
+            AND cc.wagon = tc.wagon
+            AND cc.trainFk = c.trainFk
+        JOIN vn.sale s ON s.ticketFk = t.id
+        LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id    
+        JOIN vn.item i ON i.id = s.itemFk
+        JOIN vn.itemType it ON it.id = i.typeFk
+        JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+        JOIN vn.worker w ON w.id = c.workerFk
+        JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+        LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
+        LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
+        LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+        LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk    
+    WHERE t.id IN (?)
+    GROUP BY t.id
+    ORDER BY cc.`code`;
\ No newline at end of file
diff --git a/print/templates/reports/credit-request/credit-request.html b/print/templates/reports/credit-request/credit-request.html
index d5e336809..c8e3f8c34 100644
--- a/print/templates/reports/credit-request/credit-request.html
+++ b/print/templates/reports/credit-request/credit-request.html
@@ -159,6 +159,6 @@
         </div>
     </div>
     <template v-slot:footer>
-        <report-footer id="pageFooter" v-bind:left-text="dated" v-bind="$props"> </report-footer>
+        <report-footer id="pageFooter" v-bind:left-text="formatDate(new Date(), '%d-%m-%Y')" v-bind="$props"> </report-footer>
     </template>
 </report-body>
diff --git a/print/templates/reports/credit-request/credit-request.js b/print/templates/reports/credit-request/credit-request.js
index c1aa74e1b..75e0b2263 100755
--- a/print/templates/reports/credit-request/credit-request.js
+++ b/print/templates/reports/credit-request/credit-request.js
@@ -1,20 +1,7 @@
-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');
 
-const rptCreditRequest = {
+module.exports = {
     name: 'credit-request',
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    }
+    mixins: [vnReport],
 };
 
-module.exports = rptCreditRequest;
diff --git a/print/templates/reports/delivery-note/delivery-note.html b/print/templates/reports/delivery-note/delivery-note.html
index 06653c949..eb133c0cd 100644
--- a/print/templates/reports/delivery-note/delivery-note.html
+++ b/print/templates/reports/delivery-note/delivery-note.html
@@ -20,7 +20,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{ticket.shipped | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('packages')}}</td>
@@ -66,7 +66,7 @@
                 </thead>
                 <tbody v-for="sale in sales" class="no-page-break">
                     <tr>
-                        <td width="5%">{{sale.itemFk | zerofill('000000')}}</td>
+                        <td width="5%">{{sale.itemFk}}</td>
                         <td class="number">{{sale.quantity}}</td>
                         <td width="50%">{{sale.concept}}</td>
                         <td class="number" v-if="showPrices">{{sale.price | currency('EUR', $i18n.locale)}}</td>
@@ -145,7 +145,7 @@
                         </thead>
                         <tbody>
                             <tr v-for="packaging in packagings">
-                                <td>{{packaging.itemFk | zerofill('000000')}}</td>
+                                <td>{{packaging.itemFk}}</td>
                                 <td class="number">{{packaging.quantity}}</td>
                                 <td width="85%">{{packaging.name}}</td>
                             </tr>
@@ -231,7 +231,7 @@
                         <div class="header">{{$t('digitalSignature')}}</div>
                         <div class="body centered">
                             <img v-bind:src="dmsPath" />
-                            <div>{{signature.created | date('%d-%m-%Y')}}</div>
+                            <div>{{formatDate(signature.created, '%d-%m-%Y')}}</div>
                         </div>
                     </div>
                 </div>
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js
index 1a1a57c59..50d5720ad 100755
--- a/print/templates/reports/delivery-note/delivery-note.js
+++ b/print/templates/reports/delivery-note/delivery-note.js
@@ -1,25 +1,21 @@
 const config = require(`vn-print/core/config`);
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const md5 = require('md5');
 const fs = require('fs-extra');
 
 module.exports = {
     name: 'delivery-note',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.ticket = await this.fetchTicket(this.id);
-        this.sales = await this.fetchSales(this.id);
-        this.address = await this.fetchAddress(this.id);
-        this.services = await this.fetchServices(this.id);
-        this.taxes = await this.fetchTaxes(this.id);
-        this.packagings = await this.fetchPackagings(this.id);
-        this.signature = await this.fetchSignature(this.id);
-
-        if (!this.ticket)
-            throw new Error('Something went wrong');
+        this.ticket = await this.findOneFromDef('ticket', [this.id]);
+        this.checkMainEntity(this.ticket);
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.sales = await this.rawSqlFromDef('sales', [this.id]);
+        this.address = await this.findOneFromDef(`address`, [this.id]);
+        this.services = await this.rawSqlFromDef('services', [this.id]);
+        this.taxes = await this.findOneFromDef('taxes', [this.id]);
+        this.packagings = await this.rawSqlFromDef('packagings', [this.id]);
+        this.signature = await this.findOneFromDef('signature', [this.id]);
     },
     data() {
         return {totalBalance: 0.00};
@@ -61,31 +57,6 @@ module.exports = {
         }
     },
     methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchTicket(id) {
-            return this.findOneFromDef('ticket', [id]);
-        },
-        fetchAddress(id) {
-            return this.findOneFromDef(`address`, [id]);
-        },
-        fetchSignature(id) {
-            return this.findOneFromDef('signature', [id]);
-        },
-        fetchTaxes(id) {
-            return this.findOneFromDef(`taxes`, [id]);
-        },
-        fetchSales(id) {
-            return this.rawSqlFromDef('sales', [id]);
-        },
-        fetchPackagings(id) {
-            return this.rawSqlFromDef('packagings', [id]);
-        },
-        fetchServices(id) {
-            return this.rawSqlFromDef('services', [id]);
-        },
-
         getSubTotal() {
             let subTotal = 0.00;
             this.sales.forEach(sale => {
@@ -125,11 +96,6 @@ module.exports = {
             ).join(', ');
         }
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,
diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html
index 48489de6f..1475b8e77 100644
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@@ -16,13 +16,13 @@
                                 </tr>
                                 <tr>
                                     <th class="font gray align-right">{{$t('date')}}</th>
-                                    <td>{{route.created | date('%d-%m-%Y')}}</td>
+                                    <td>{{formatDate(route.created, '%d-%m-%Y')}}</td>
                                     <th class="font gray align-right">{{$t('vehicle')}}</th>
                                     <td>{{route.vehicleTradeMark}} {{route.vehicleModel}}</td>
                                 </tr>
                                 <tr>
                                     <th class="font gray align-right">{{$t('time')}}</th>
-                                    <td>{{route.time | date('%H:%M')}}</td>
+                                    <td>{{formatDate(route.time, '%H:%M')}}</td>
                                     <td></td>
                                     <td>{{route.plateNumber}}</td>
                                 </tr>
diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js
index 1b2e8871a..c166e3809 100755
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@@ -1,9 +1,8 @@
-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: 'driver-route',
+    mixins: [vnReport],
     async serverPrefetch() {
         let ids = this.id;
 
@@ -11,8 +10,8 @@ module.exports = {
         if (hasMultipleRoutes)
             ids = this.id.split(',');
 
-        const routes = await this.fetchRoutes(ids);
-        const tickets = await this.fetchTickets(ids);
+        const routes = await this.rawSqlFromDef('routes', [ids]);
+        const tickets = await this.rawSqlFromDef('tickets', [ids, ids]);
 
         const map = new Map();
 
@@ -27,20 +26,7 @@ module.exports = {
 
         this.routes = routes;
 
-        if (!this.routes)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchRoutes(ids) {
-            return this.rawSqlFromDef('routes', [ids]);
-        },
-        fetchTickets(ids) {
-            return this.rawSqlFromDef('tickets', [ids, ids]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.checkMainEntity(this.routes);
     },
     props: {
         id: {
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index 26294787b..5d362dea9 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -16,7 +16,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{entry.landed | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(entry.landed,'%d-%m-%Y')}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('ref')}}</td>
diff --git a/print/templates/reports/entry-order/entry-order.js b/print/templates/reports/entry-order/entry-order.js
index 22c5b55fe..d31ad1a36 100755
--- a/print/templates/reports/entry-order/entry-order.js
+++ b/print/templates/reports/entry-order/entry-order.js
@@ -1,31 +1,18 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'entry-order',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.supplier = await this.fetchSupplier(this.id);
-        this.entry = await this.fetchEntry(this.id);
-        this.buys = await this.fetchBuys(this.id);
-
-        if (!this.entry)
-            throw new Error('Something went wrong');
+        this.entry = await this.findOneFromDef('entry', [this.id]);
+        this.checkMainEntity(this.entry);
+        this.supplier = await this.findOneFromDef('supplier', [this.id]);
+        this.buys = await this.rawSqlFromDef('buys', [this.id]);
     },
     data() {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchSupplier(id) {
-            return this.findOneFromDef('supplier', [id]);
-        },
-        fetchEntry(id) {
-            return this.findOneFromDef('entry', [id]);
-        },
-        fetchBuys(id) {
-            return this.rawSqlFromDef('buys', [id]);
-        },
         getTotal() {
             let total = 0.00;
             this.buys.forEach(buy => {
@@ -35,11 +22,6 @@ module.exports = {
             return total;
         }
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,
diff --git a/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js b/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
index 0e8c297e8..88645309d 100644
--- a/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
+++ b/print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
@@ -1,12 +1,11 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const jsBarcode = require('jsbarcode');
 const {DOMImplementation, XMLSerializer} = require('xmldom');
-const UserError = require('vn-loopback/util/user-error');
 const qrcode = require('qrcode');
 
 module.exports = {
     name: 'expedition-pallet-label',
+    mixins: [vnReport],
     props: {
         id: {
             type: Number,
@@ -27,14 +26,13 @@ module.exports = {
         let QRdata = JSON.stringify({
             company: 'vnl',
             user: this.userFk,
-            created: new Date(),
+            created: Date.vnNew(),
             table: 'expeditionPallet',
             id: this.id
         });
 
         this.QR = await this.getQR(QRdata);
-        if (!this.labelsData.length)
-            throw new UserError('Empty data source');
+        this.checkMainEntity(this.labelsData);
     },
     methods: {
         getQR(id) {
@@ -56,7 +54,4 @@ module.exports = {
             return xmlSerializer.serializeToString(svgNode);
         },
     },
-    components: {
-        'report-body': reportBody.build()
-    },
 };
diff --git a/print/templates/reports/exportation/exportation.html b/print/templates/reports/exportation/exportation.html
index 920e32a48..0800c024d 100644
--- a/print/templates/reports/exportation/exportation.html
+++ b/print/templates/reports/exportation/exportation.html
@@ -3,7 +3,7 @@
         <div class="grid-block">
             <h1 class="title centered uppercase">{{$t('title')}}</h1>
             <p>{{$t('toAttention')}}</p>
-            <p v-html="$t('declaration', [invoice.ref, issued])"></p>
+            <p v-html="$t('declaration', [invoice.ref, formatDate(invoice.issued, '%d-%m-%Y')])"></p>
             <p>
             <ul>
                 <li v-for="responsibility in $t('responsibilities')">
@@ -32,4 +32,4 @@
     <template v-slot:footer>
         <report-footer id="pageFooter" v-bind:left-text="$t('invoice', [invoice.ref])" v-bind="$props"></report-footer>
     </template>
-</report-body>
\ No newline at end of file
+</report-body>
diff --git a/print/templates/reports/exportation/exportation.js b/print/templates/reports/exportation/exportation.js
index 9f39aa1a1..123b350ee 100755
--- a/print/templates/reports/exportation/exportation.js
+++ b/print/templates/reports/exportation/exportation.js
@@ -1,33 +1,13 @@
-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: 'exportation',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.reference);
-
-        if (!this.invoice)
-            throw new Error('Something went wrong');
-
+        this.invoice = await this.findOneFromDef('invoice', [this.reference]);
+        this.checkMainEntity(this.invoice);
         this.company = await this.findOneFromDef('company', [this.invoice.companyFk]);
     },
-    methods: {
-        fetchInvoice(reference) {
-            return this.findOneFromDef('invoice', [reference]);
-        }
-    },
-    computed: {
-        issued: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(this.invoice.issued, '%d-%m-%Y');
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         reference: {
             type: Number,
diff --git a/print/templates/reports/extra-community/extra-community.html b/print/templates/reports/extra-community/extra-community.html
index 6a46cc689..cd61a4f4d 100644
--- a/print/templates/reports/extra-community/extra-community.html
+++ b/print/templates/reports/extra-community/extra-community.html
@@ -26,7 +26,7 @@
                                 </tr>
                                 <tr>
                                     <th class="font gray align-right">{{$t('shipped')}}</th>
-                                    <td>{{travel.shipped | date('%d-%m-%Y')}}</td>
+                                    <td>{{formatDate(travel.shipped, '%d-%m-%Y')}}</td>
                                     <th class="font gray align-right">{{$t('physicalKg')}}</th>
                                     <td>{{travel.loadedKg | number($i18n.locale)}}</td>
                                 </tr>
@@ -62,6 +62,6 @@
         </div>
     </div>
     <template v-slot:footer>
-        <report-footer id="pageFooter" v-bind:left-text="dated" v-bind="$props"></report-footer>
+        <report-footer id="pageFooter" v-bind:left-text="formatDate(new Date(), '%d-%m-%Y')" v-bind="$props"></report-footer>
     </template>
 </report-body>
diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js
index 4dfe6e278..9941faa35 100755
--- a/print/templates/reports/extra-community/extra-community.js
+++ b/print/templates/reports/extra-community/extra-community.js
@@ -1,12 +1,10 @@
-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');
 const db = require(`vn-print/core/database`);
 
 module.exports = {
     name: 'extra-community',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.filters = this.$options.filters;
         const args = {
             landedTo: this.landedEnd,
             shippedFrom: this.shippedStart,
@@ -21,8 +19,9 @@ module.exports = {
         };
 
         const travels = await this.fetchTravels(args);
+        this.checkMainEntity(travels);
         const travelIds = travels.map(travel => travel.id);
-        const entries = await this.fetchEntries(travelIds);
+        const entries = await this.rawSqlFromDef('entries', [travelIds]);
 
         const map = new Map();
         for (let travel of travels)
@@ -35,23 +34,15 @@ module.exports = {
         }
 
         this.travels = travels;
-
-        if (!this.travels)
-            throw new Error('Something went wrong');
     },
     computed: {
-        dated: function() {
-            return this.filters.date(new Date(), '%d-%m-%Y');
-        },
         landedEnd: function() {
             if (!this.landedTo) return;
-
-            return this.filters.date(this.landedTo, '%Y-%m-%d');
+            return formatDate(this.landedTo, '%Y-%m-%d');
         },
         shippedStart: function() {
             if (!this.shippedFrom) return;
-
-            return this.filters.date(this.shippedFrom, '%Y-%m-%d');
+            return formatDate(this.shippedFrom, '%Y-%m-%d');
         }
     },
     methods: {
@@ -83,25 +74,17 @@ module.exports = {
             query = db.merge(query, where);
             query = db.merge(query, 'GROUP BY t.id');
             query = db.merge(query, `
-                ORDER BY 
-                    shipped ASC, 
-                    landed ASC, 
-                    travelFk, 
-                    loadPriority, 
-                    agencyModeFk, 
+                ORDER BY
+                    shipped ASC,
+                    landed ASC,
+                    travelFk,
+                    loadPriority,
+                    agencyModeFk,
                     evaNotes
             `);
 
             return this.rawSql(query);
         },
-
-        fetchEntries(travelIds) {
-            return this.rawSqlFromDef('entries', [travelIds]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
     },
     props: [
         'landedTo',
diff --git a/print/templates/reports/incoterms-authorization/incoterms-authorization.js b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
index bfe675985..53425487e 100755
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
@@ -1,23 +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: 'incoterms-authorization',
+    mixins: [vnReport],
     async serverPrefetch() {
         this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
         this.company = await this.findOneFromDef('company', [this.companyId]);
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        issued: function() {
-            return new Date();
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
     },
     props: {
         id: {
diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.html b/print/templates/reports/invoice-incoterms/invoice-incoterms.html
index 20c9ad440..1915828ba 100644
--- a/print/templates/reports/invoice-incoterms/invoice-incoterms.html
+++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.html
@@ -20,7 +20,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{invoice.issued | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(invoice.issued, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.js b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
index 3afc50376..fcaffe5de 100755
--- a/print/templates/reports/invoice-incoterms/invoice-incoterms.js
+++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
@@ -1,34 +1,13 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'invoice-incoterms',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.reference);
-        this.client = await this.fetchClient(this.reference);
-        this.incoterms = await this.fetchIncoterms(this.reference);
-
-        if (!this.invoice)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-
-    },
-    methods: {
-        fetchInvoice(reference) {
-            return this.findOneFromDef('invoice', [reference]);
-        },
-        fetchClient(reference) {
-            return this.findOneFromDef('client', [reference]);
-        },
-        fetchIncoterms(reference) {
-            return this.findOneFromDef('incoterms', [reference, reference, reference]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build()
+        this.invoice = await this.findOneFromDef('invoice', [this.reference]);
+        this.checkMainEntity(this.invoice);
+        this.client = await this.findOneFromDef('client', [this.reference]);
+        this.incoterms = await this.findOneFromDef('incoterms', [this.reference, this.reference, this.reference]);
     },
     props: {
         reference: {
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index d23bba1e9..2d180878a 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -21,7 +21,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{invoice.issued | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(invoice.issued, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -53,7 +53,7 @@
                     <tbody>
                         <tr v-for="row in rectified">
                             <td>{{row.ref}}</td>
-                            <td>{{row.issued | date}}</td>
+                            <td>{{formatDate(row.issued, '%d-%m-%Y')}}</td>
                             <td class="number">{{row.amount | currency('EUR', $i18n.locale)}}</td>
                             <td width="50%">{{row.description}}</td>
                         </tr>
@@ -75,7 +75,7 @@
                     </div>
                     <div class="pull-left">
                         <div class="field rectangle">
-                            <span>{{ticket.shipped | date}}</span>
+                            <span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span>
                         </div>
                     </div>
                     <span id="nickname" class="pull-right">
@@ -96,7 +96,7 @@
                     </thead>
                     <tbody v-for="sale in ticket.sales" class="no-page-break">
                         <tr>
-                            <td width="5%">{{sale.itemFk | zerofill('000000')}}</td>
+                            <td width="5%">{{sale.itemFk}}</td>
                             <td class="number">{{sale.quantity}}</td>
                             <td width="50%">{{sale.concept}}</td>
                             <td class="number">{{sale.price | currency('EUR', $i18n.locale)}}</td>
@@ -203,7 +203,7 @@
                     </div>
                 </div>
             </div>
-            <div class="size100 no-page-break" v-if="intrastat.length > 0">
+            <div class="size100 no-page-break" v-if="hasIntrastat">
                 <h2>{{$t('intrastat')}}</h2>
                 <table class="column-oriented">
                     <thead>
diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index f7011ad81..eaf17527d 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -1,22 +1,22 @@
-const Component = require(`vn-print/core/component`);
 const Report = require(`vn-print/core/report`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const invoiceIncoterms = new Report('invoice-incoterms');
 
 module.exports = {
     name: 'invoice',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.reference);
-        this.client = await this.fetchClient(this.reference);
-        this.taxes = await this.fetchTaxes(this.reference);
-        this.intrastat = await this.fetchIntrastat(this.reference);
-        this.rectified = await this.fetchRectified(this.reference);
-        this.hasIncoterms = await this.fetchHasIncoterms(this.reference);
+        this.invoice = await this.findOneFromDef('invoice', [this.reference]);
+        this.checkMainEntity(this.invoice);
+        this.client = await this.findOneFromDef('client', [this.reference]);
+        this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]);
+        this.hasIntrastat = await this.findValueFromDef(`hasIntrastat`, [this.reference]);
+        this.intrastat = await this.rawSqlFromDef(`intrastat`, [this.reference, this.reference, this.reference, this.reference]);
+        this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]);
+        this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]);
 
-        const tickets = await this.fetchTickets(this.reference);
-        const sales = await this.fetchSales(this.reference);
+        const tickets = await this.rawSqlFromDef('tickets', [this.reference]);
+        const sales = await this.rawSqlFromDef('sales', [this.reference, this.reference]);
 
         const map = new Map();
 
@@ -33,9 +33,6 @@ module.exports = {
         }
 
         this.tickets = tickets;
-
-        if (!this.invoice)
-            throw new Error('Something went wrong');
     },
     data() {
         return {totalBalance: 0.00};
@@ -66,30 +63,6 @@ module.exports = {
         }
     },
     methods: {
-        fetchInvoice(reference) {
-            return this.findOneFromDef('invoice', [reference]);
-        },
-        fetchClient(reference) {
-            return this.findOneFromDef('client', [reference]);
-        },
-        fetchTickets(reference) {
-            return this.rawSqlFromDef('tickets', [reference]);
-        },
-        fetchSales(reference) {
-            return this.rawSqlFromDef('sales', [reference, reference]);
-        },
-        fetchTaxes(reference) {
-            return this.rawSqlFromDef(`taxes`, [reference]);
-        },
-        fetchIntrastat(reference) {
-            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference]);
-        },
-        fetchRectified(reference) {
-            return this.rawSqlFromDef(`rectified`, [reference]);
-        },
-        fetchHasIncoterms(reference) {
-            return this.findValueFromDef(`hasIncoterms`, [reference]);
-        },
         saleImport(sale) {
             const price = sale.quantity * sale.price;
 
@@ -111,9 +84,6 @@ module.exports = {
         }
     },
     components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build(),
         'invoice-incoterms': invoiceIncoterms.build()
     },
     props: {
diff --git a/print/templates/reports/invoice/sql/hasIntrastat.sql b/print/templates/reports/invoice/sql/hasIntrastat.sql
new file mode 100644
index 000000000..09eda94c2
--- /dev/null
+++ b/print/templates/reports/invoice/sql/hasIntrastat.sql
@@ -0,0 +1,4 @@
+SELECT taxAreaFk != 'NATIONAL'
+    FROM vn.invoiceOutSerial ios
+        JOIN vn.invoiceOut io ON io.serial = ios.code
+    WHERE io.ref = ?;
diff --git a/print/templates/reports/invoice/sql/intrastat.sql b/print/templates/reports/invoice/sql/intrastat.sql
index f986a9564..211ebfe71 100644
--- a/print/templates/reports/invoice/sql/intrastat.sql
+++ b/print/templates/reports/invoice/sql/intrastat.sql
@@ -1,26 +1,36 @@
 SELECT *
-	FROM invoiceOut io
-		JOIN invoiceOutSerial ios ON io.serial = ios.code
-		JOIN(
-            SELECT  ir.id code,
-                    ir.description,
-                    iii.stems,
-                    iii.net netKg,
-                    iii.amount subtotal
-                FROM vn.invoiceInIntrastat iii
-                    LEFT JOIN vn.invoiceIn ii ON ii.id = iii.invoiceInFk
-                    LEFT JOIN vn.invoiceOut io ON io.ref = ii.supplierRef
-                    LEFT JOIN vn.intrastat ir ON ir.id = iii.intrastatFk
-                WHERE io.`ref` = ?
-            UNION ALL
-            SELECT  NULL code,
-                    'Servicios' description,
-                    0 stems,
-                    0 netKg,
-                    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) subtotal
-                FROM vn.ticketService ts
-                    JOIN vn.ticket t ON ts.ticketFk = t.id
-                WHERE t.refFk =  ?
-        ) sub
-    WHERE io.ref = ? AND ios.isCEE
-    ORDER BY sub.code;
+	FROM (
+        SELECT  i.intrastatFk code,
+                it.description,
+                CAST(SUM(ROUND((s.quantity * s.price * (100 - s.discount) / 100 ) , 2))AS DECIMAL(10, 2)) subtotal,
+                SUM(IFNULL(i.stems, 1) * s.quantity) stems,
+                CAST(SUM(IFNULL(i.stems, 1)
+                        * s.quantity
+                        * IF(ic.grams, ic.grams, IFNULL(i.weightByPiece, 0)) / 1000)
+                        * IF(sub.totalWeight, sub.totalWeight / vn.invoiceOut_getWeight(?), 1)
+                AS DECIMAL(10,2)) netKg
+            FROM sale s
+                JOIN ticket t ON s.ticketFk = t.id
+                JOIN supplier su ON su.id = t.companyFk
+                JOIN item i ON i.id = s.itemFk
+                JOIN intrastat it ON it.id = i.intrastatFk
+                LEFT JOIN itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
+                LEFT JOIN (
+                    SELECT SUM(weight)totalWeight
+                        FROM vn.ticket
+                        WHERE refFk = ?
+                            AND weight
+                ) sub ON TRUE
+            WHERE t.refFk =?
+            GROUP BY i.intrastatFk
+        UNION ALL
+        SELECT NULL ,
+                IF((SUM((ts.quantity * ts.price))), 'Servicios', NULL),
+                IFNULL(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0),
+                0 ,
+                0
+            FROM vn.ticketService ts
+                JOIN vn.ticket t ON ts.ticketFk = t.id
+            WHERE t.refFk = ?
+    ) sub2
+	WHERE `description` IS NOT NULL;
diff --git a/print/templates/reports/invoiceIn/invoiceIn.html b/print/templates/reports/invoiceIn/invoiceIn.html
index f101f7408..22988b654 100644
--- a/print/templates/reports/invoiceIn/invoiceIn.html
+++ b/print/templates/reports/invoiceIn/invoiceIn.html
@@ -19,7 +19,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{invoice.created | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(invoice.created, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -54,7 +54,7 @@
                     </div>
                     <div class="pull-left">
                         <div class="field rectangle">
-                            <span>{{entry.landed | date}}</span>
+                            <span>{{formatDate(entry.landed, '%d-%m-%Y')}}</span>
                         </div>
                     </div>
                     <span id="nickname" class="pull-right">
diff --git a/print/templates/reports/invoiceIn/invoiceIn.js b/print/templates/reports/invoiceIn/invoiceIn.js
index 03549c276..c59f4da7d 100755
--- a/print/templates/reports/invoiceIn/invoiceIn.js
+++ b/print/templates/reports/invoiceIn/invoiceIn.js
@@ -1,15 +1,14 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'invoiceIn',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.id);
+        this.invoice = await this.findOneFromDef('invoice', [this.id]);
+        this.checkMainEntity(this.invoice);
         this.taxes = await this.fetchTaxes(this.id);
 
-        let defaultTax = await this.fetchDefaultTax();
+        let defaultTax = await this.findOneFromDef('defaultTax');
 
         if (defaultTax) {
             defaultTax = Object.assign(defaultTax, {
@@ -19,11 +18,8 @@ module.exports = {
             this.taxes.push(defaultTax);
         }
 
-        if (!this.invoice)
-            throw new Error('Something went wrong');
-
-        const entries = await this.fetchEntry(this.id);
-        const buys = await this.fetchBuy(this.id);
+        const entries = await this.rawSqlFromDef('entry', [this.id]);
+        const buys = await this.rawSqlFromDef('buy', [this.id]);
 
         const map = new Map();
 
@@ -41,21 +37,7 @@ module.exports = {
 
         this.entries = entries;
     },
-    computed: {
-    },
     methods: {
-        fetchInvoice(id) {
-            return this.findOneFromDef('invoice', [id]);
-        },
-        fetchEntry(id) {
-            return this.rawSqlFromDef('entry', [id]);
-        },
-        fetchBuy(id) {
-            return this.rawSqlFromDef('buy', [id]);
-        },
-        fetchDefaultTax() {
-            return this.findOneFromDef('defaultTax');
-        },
         async fetchTaxes(id) {
             const taxes = await this.rawSqlFromDef(`taxes`, [id]);
             return this.taxVat(taxes);
@@ -95,11 +77,6 @@ module.exports = {
             return base + vat;
         }
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build(),
-    },
     props: {
         id: {
             type: Number,
diff --git a/print/templates/reports/item-label/item-label.html b/print/templates/reports/item-label/item-label.html
index 49593f7dd..66509ab38 100644
--- a/print/templates/reports/item-label/item-label.html
+++ b/print/templates/reports/item-label/item-label.html
@@ -16,7 +16,7 @@
             <div class="details">
                 <div class="package">
                     <div class="packing">{{packing()}}</div>
-                    <div class="dated">{{dated}}</div>
+                    <div class="dated">{{formatDate(new Date(), '%W/%d')}}</div>
                     <div class="labelNumber">{{labelPage}}</div>
                 </div>
                 <div class="size">{{item.size}}</div>
diff --git a/print/templates/reports/item-label/item-label.js b/print/templates/reports/item-label/item-label.js
index 6341bd11a..c5b9cdfd7 100755
--- a/print/templates/reports/item-label/item-label.js
+++ b/print/templates/reports/item-label/item-label.js
@@ -1,24 +1,17 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const qrcode = require('qrcode');
 
 module.exports = {
     name: 'item-label',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.item = await this.fetchItem(this.id, this.warehouseId);
+        this.item = await this.findOneFromDef('item', [this.id, this.warehouseId]);
+        this.checkMainEntity(this.item);
         this.tags = await this.fetchItemTags(this.id);
         this.barcode = await this.getBarcodeBase64(this.id);
-
-        if (!this.item)
-            throw new Error('Something went wrong');
     },
 
     computed: {
-        dated() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%W/%d');
-        },
         labelPage() {
             const labelNumber = this.labelNumber ? this.labelNumber : 1;
             const totalLabels = this.totalLabels ? this.totalLabels : 1;
@@ -27,9 +20,6 @@ module.exports = {
         }
     },
     methods: {
-        fetchItem(id, warehouseId) {
-            return this.findOneFromDef('item', [id, warehouseId]);
-        },
         fetchItemTags(id) {
             return this.rawSqlFromDef('itemTags', [id]).then(rows => {
                 const tags = {};
@@ -48,9 +38,6 @@ module.exports = {
             return `${this.item.packing}x${stems}`;
         }
     },
-    components: {
-        'report-body': reportBody.build()
-    },
     props: {
         id: {
             type: Number,
diff --git a/print/templates/reports/letter-debtor/letter-debtor.html b/print/templates/reports/letter-debtor/letter-debtor.html
index 962af021d..30fbbe003 100644
--- a/print/templates/reports/letter-debtor/letter-debtor.html
+++ b/print/templates/reports/letter-debtor/letter-debtor.html
@@ -13,7 +13,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>
@@ -44,7 +44,7 @@
                 </thead>
                 <tbody v-for="sale in sales" :key="sale.id">
                     <tr>
-                        <td>{{sale.issued | date('%d-%m-%Y')}}</td>
+                        <td>{{formatDate(sale.issued, '%d-%m-%Y')}}</td>
                         <td>{{sale.ref}}</td>
                         <td class="number">{{sale.debtOut}}</td>
                         <td class="number">{{sale.debtIn}}</td>
diff --git a/print/templates/reports/letter-debtor/letter-debtor.js b/print/templates/reports/letter-debtor/letter-debtor.js
index 749fde4ed..4446b13ae 100755
--- a/print/templates/reports/letter-debtor/letter-debtor.js
+++ b/print/templates/reports/letter-debtor/letter-debtor.js
@@ -1,36 +1,17 @@
-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: 'letter-debtor',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id, this.companyId);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.findOneFromDef('sales', [this.id, this.companyId]);
     },
     data() {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id, companyId) {
-            return this.findOneFromDef('sales', [
-                id,
-                companyId
-            ]);
-        },
         getBalance(sale) {
             if (sale.debtOut)
                 this.totalBalance += parseFloat(sale.debtOut);
@@ -57,10 +38,6 @@ module.exports = {
             return debtIn.toFixed(2);
         },
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,
diff --git a/print/templates/reports/previa-label/previa-label.js b/print/templates/reports/previa-label/previa-label.js
index 7ad5ea961..833a15499 100755
--- a/print/templates/reports/previa-label/previa-label.js
+++ b/print/templates/reports/previa-label/previa-label.js
@@ -1,36 +1,24 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const qrcode = require('qrcode');
-const UserError = require('vn-loopback/util/user-error');
 
 module.exports = {
     name: 'previa-label',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.previa = await this.fetchPrevia(this.id);
-        this.sector = await this.fetchSector(this.id);
+        this.sector = await this.findOneFromDef('sector', [this.id]);
+        this.checkMainEntity(this.sector);
+        this.previa = await this.findOneFromDef('previa', [this.id]);
         this.barcode = await this.getBarcodeBase64(this.id);
 
         if (this.previa)
             this.previa = this.previa[0];
-
-        if (!this.sector)
-            throw new UserError('Something went wrong - no sector found');
     },
     methods: {
-        fetchPrevia(id) {
-            return this.findOneFromDef('previa', [id]);
-        },
         getBarcodeBase64(id) {
             const data = String(id);
 
             return qrcode.toDataURL(data, {margin: 0});
         },
-        fetchSector(id) {
-            return this.findOneFromDef('sector', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build()
     },
     props: {
         id: {
diff --git a/print/templates/reports/receipt/receipt.html b/print/templates/reports/receipt/receipt.html
index e0bab5ecf..be0bfc375 100644
--- a/print/templates/reports/receipt/receipt.html
+++ b/print/templates/reports/receipt/receipt.html
@@ -4,9 +4,9 @@
             <div class="content">
                 <h1 class="title centered uppercase">{{$t('title')}}</h1>
                 <p class="centered">
-                    Recibo de <strong class="uppercase">{{client.socialName}}</strong>, la cantidad de
-                    <strong>{{receipt.amountPaid}} €</strong> en concepto de 'entrega a cuenta', quedando pendiente en
-                    la cuenta del cliente un saldo de <strong>{{receipt.amountUnpaid}} €</strong>.
+                    Recibo #{{receipt.id}} de <strong class="uppercase">{{client.socialName}}</strong>,
+                    la cantidad de <strong>{{receipt.amountPaid}} €</strong>
+                    en concepto de 'entrega a cuenta'.
                 </p>
                 <div class="signature">
                     <img v-bind:src="getReportSrc('signature.png')" />
diff --git a/print/templates/reports/receipt/receipt.js b/print/templates/reports/receipt/receipt.js
index 9a9ccd452..89a431adf 100755
--- a/print/templates/reports/receipt/receipt.js
+++ b/print/templates/reports/receipt/receipt.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: 'receipt',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.receipt = await this.fetchReceipt(this.id);
-
-        if (!this.receipt)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchReceipt(id) {
-            return this.findOneFromDef('receipt', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.receipt = await this.findOneFromDef('receipt', [this.id]);
+        this.checkMainEntity(this.receipt);
+        this.client = await this.findOneFromDef('client', [this.id]);
     },
     props: {
         id: {
diff --git a/print/templates/reports/receipt/sql/receipt.sql b/print/templates/reports/receipt/sql/receipt.sql
index b8f5a4112..4094d25b3 100644
--- a/print/templates/reports/receipt/sql/receipt.sql
+++ b/print/templates/reports/receipt/sql/receipt.sql
@@ -1,11 +1,10 @@
-SELECT 
-    r.id, 
-    r.amountPaid, 
-    cr.amount AS amountUnpaid, 
-    r.payed, 
+SELECT
+    r.id,
+    r.amountPaid,
+    r.payed,
     r.companyFk
 FROM receipt r
     JOIN client c ON c.id = r.clientFk
     JOIN vn.clientRisk cr ON cr.clientFk = c.id
         AND cr.companyFk = r.companyFk
-WHERE r.id = ?
\ No newline at end of file
+WHERE r.id = ?
diff --git a/print/templates/reports/sepa-core/sepa-core.html b/print/templates/reports/sepa-core/sepa-core.html
index f2326e43c..a8c270ad5 100644
--- a/print/templates/reports/sepa-core/sepa-core.html
+++ b/print/templates/reports/sepa-core/sepa-core.html
@@ -147,7 +147,7 @@
                             </tr>
                             <tr>
                                 <td>{{$t('client.signLocation')}}</td>
-                                <th>{{dated}}, {{client.province}}</th>
+                                <th>{{formatDate(new Date(), '%d-%m-%Y')}}, {{client.province}}</th>
                             </tr>
                             <tr>
                                 <td>{{$t('client.sign')}}</td>
diff --git a/print/templates/reports/sepa-core/sepa-core.js b/print/templates/reports/sepa-core/sepa-core.js
index ee8a64842..0e19d2a6a 100755
--- a/print/templates/reports/sepa-core/sepa-core.js
+++ b/print/templates/reports/sepa-core/sepa-core.js
@@ -1,44 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
-const rptSepaCore = {
+module.exports = {
     name: 'sepa-core',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id, this.companyId);
-        this.supplier = await this.fetchSupplier(this.id, this.companyId);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
-    },
-    methods: {
-        fetchClient(id, companyId) {
-            return this.findOneFromDef('client', [
-                companyId,
-                companyId,
-                id
-            ]);
-        },
-        fetchSupplier(id, companyId) {
-            return this.findOneFromDef('supplier', [
-                companyId,
-                companyId,
-                id
-            ]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build()
+        this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]);
+        this.checkMainEntity(this.client);
+        this.supplier = await this.findOneFromDef('supplier', [this.companyId, this.companyId, this.id]);
     },
     props: {
         id: {
@@ -52,5 +20,3 @@ const rptSepaCore = {
         }
     }
 };
-
-module.exports = rptSepaCore;
diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html
index baff51bfe..08b27d0bd 100644
--- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html
+++ b/print/templates/reports/supplier-campaign-metrics/supplier-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>
@@ -38,7 +38,7 @@
             <div v-for="entry in entries" v-if="entry.buys">
                 <h2>
                     <span>{{$t('entry')}} {{entry.id}}</span>
-                    <span>{{$t('dated')}} {{entry.shipped | date('%d-%m-%Y')}}</span>
+                    <span>{{$t('dated')}} {{formatDate(entry.shipped, '%d-%m-%Y')}}</span>
                     <span class="pull-right">{{$t('reference')}} {{entry.reference}}</span>
                 </h2>
                 <table class="column-oriented repeatable">
diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
index f6fb4bd4e..32a7e9b0a 100755
--- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
+++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
@@ -1,19 +1,19 @@
-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: 'supplier-campaign-metrics',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.supplier = await this.fetchSupplier(this.id);
-        let entries = await this.fetchEntries(this.id, this.from, this.to);
+        this.supplier = await this.findOneFromDef('supplier', [this.id]);
+        this.checkMainEntity(this.supplier);
+        let entries = await this.rawSqlFromDef('entries', [this.id, this.from, this.to]);
 
         const entriesId = [];
 
         for (let entry of entries)
             entriesId.push(entry.id);
 
-        const buys = await this.fetchBuys(entriesId);
+        const buys = await this.rawSqlFromDef('buys', [entriesId]);
 
         const entriesMap = new Map();
         for (let entry of entries)
@@ -29,23 +29,6 @@ module.exports = {
         }
 
         this.entries = entries;
-        if (!this.supplier)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchSupplier(supplierId) {
-            return this.findOneFromDef('supplier', [supplierId]);
-        },
-        fetchEntries(supplierId, from, to) {
-            return this.rawSqlFromDef('entries', [supplierId, from, to]);
-        },
-        fetchBuys(entriesId) {
-            return this.rawSqlFromDef('buys', [entriesId]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
     },
     props: {
         id: {
diff --git a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html
index 65776851d..7435f272d 100644
--- a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html
+++ b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.html
@@ -16,7 +16,7 @@
                     <tr>
                         <td>{{vehicleEvent.numberPlate}}</td>
                         <td>{{vehicleEvent.description}}</td>
-                        <td>{{vehicleEvent.finished | date('%d-%m-%Y')}}</td>
+                        <td>{{formatDate(vehicleEvent.finished, '%d-%m-%Y')}}</td>
                     </tr>
                 </tbody>
             </table>
diff --git a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js
index ab6cffc00..b49e770a5 100755
--- a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js
+++ b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js
@@ -1,21 +1,10 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-
+const vnReport = require('../../../core/mixins/vn-report.js');
 module.exports = {
     name: 'vehicle-event-expired',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.vehicleEvents = await this.fetchVehicleEvent(this.eventIds);
-
-        if (!this.vehicleEvents)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchVehicleEvent(vehicleEventIds) {
-            return this.rawSqlFromDef('vehicleEvents', [vehicleEventIds]);
-        },
-    },
-    components: {
-        'report-body': reportBody.build()
+        this.vehicleEvents = await this.rawSqlFromDef('vehicleEvents', [this.eventIds]);
+        this.checkMainEntity(this.vehicleEvents);
     },
     props: {
         eventIds: {
diff --git a/print/templates/reports/zone/zone.html b/print/templates/reports/zone/zone.html
index 54c55e168..fe42fb2ad 100644
--- a/print/templates/reports/zone/zone.html
+++ b/print/templates/reports/zone/zone.html
@@ -1,5 +1,5 @@
 <report-body v-bind="$props">
     <div class="text">{{zone.agencyName}}</div>
     <div class="text">{{zone.id}}</div>
-    <div class="text">{{zone.plateNumber}} {{zone.time | date('%H:%M')}}</div>
+    <div class="text">{{zone.plateNumber}} {{formatDate(zone.time, '%H:%M')}}</div>
 </report-body>
diff --git a/print/templates/reports/zone/zone.js b/print/templates/reports/zone/zone.js
index 720542cd6..5baa41b8e 100755
--- a/print/templates/reports/zone/zone.js
+++ b/print/templates/reports/zone/zone.js
@@ -1,21 +1,11 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'zone',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.zone = await this.fetchZone(this.id);
-
-        if (!this.zone)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchZone(id) {
-            return this.findOneFromDef('zone', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build()
+        this.zone = await this.findOneFromDef('zone', [this.id]);
+        this.checkMainEntity(this.zone);
     },
     props: {
         id: {