Merge branch 'dev' into 6278-ticketRequestFixFilter

2023-10-18 10:35:53 +00:00 · 2023-10-18 10:35:53 +00:00 · 44bc30adf7
parent 2bb4300e1b bd6c82d2fd
commit 44bc30adf7
73 changed files with 799 additions and 207 deletions
--- a/back/methods/collection/getTickets.js
+++ b/back/methods/collection/getTickets.js
@ -0,0 +1,146 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('getTickets', {
+        description: 'Make a new collection of tickets',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            description: 'The collection id',
+            required: true,
+            http: {source: 'path'}
+        }, {
+            arg: 'print',
+            type: 'boolean',
+            description: 'True if you want to print'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:id/getTickets`,
+            verb: 'POST'
+        }
+    });
+
+    Self.getTickets = async(ctx, id, print, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const origin = ctx.req.headers.origin;
+        const $t = ctx.req.__;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        myOptions.userId = userId;
+
+        const promises = [];
+    
+        const [tickets] = await Self.rawSql(`CALL vn.collection_getTickets(?)`, [id], myOptions);
+        const sales = await Self.rawSql(`
+            SELECT s.ticketFk,
+                    sgd.saleGroupFk,
+                    s.id saleFk,
+                    s.itemFk,
+                    i.longName,
+                    i.size,
+                    ic.color,
+                    o.code origin,
+                    ish.packing,
+                    ish.grouping,
+                    s.isAdded,
+                    s.originalQuantity, 
+                    s.quantity saleQuantity,
+                    iss.quantity reservedQuantity,
+                    SUM(iss.quantity) OVER (PARTITION BY s.id ORDER BY ish.id) accumulatedQuantity,
+                    ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
+                    COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
+                    sh.code,
+                    IFNULL(p2.code, p.code) parkingCode,
+                    IFNULL(p2.pickingOrder, p.pickingOrder) pickingOrder,
+                    iss.id itemShelvingSaleFk,
+                    iss.isPicked
+                FROM ticketCollection tc
+                    LEFT JOIN collection c ON c.id = tc.collectionFk
+                    JOIN ticket t ON t.id = tc.ticketFk
+                    JOIN sale s ON s.ticketFk = t.id
+                    LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+                    LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
+                    LEFT JOIN parking p2 ON p2.id = sg.parkingFk
+                    JOIN item i ON i.id = s.itemFk
+                    LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
+                    LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+                    LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+                    LEFT JOIN parking p ON p.id = sh.parkingFk
+                    LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
+                    LEFT JOIN origin o ON o.id = i.originFk
+                WHERE tc.collectionFk = ?
+                GROUP BY ish.id, p.code, p2.code
+                ORDER BY pickingOrder;`, [id], myOptions);
+
+        if (print)
+            await Self.rawSql(`CALL vn.collection_printSticker(?, ?)`, [id, null], myOptions);
+
+        const collection = {collectionFk: id, tickets: []};
+        if (tickets && tickets.length) {
+            for (const ticket of tickets) {
+                const ticketId = ticket.ticketFk;
+
+                // SEND ROCKET
+                if (ticket.observaciones != '') {
+                    for (observation of ticket.observaciones.split(' ')) {
+                        if (['#', '@'].includes(observation.charAt(0))) {
+                            promises.push(Self.app.models.Chat.send(ctx, observation,
+                                $t('The ticket is in preparation', {
+                                    ticketId: ticketId,
+                                    ticketUrl: `${origin}/#!/ticket/${ticketId}/summary`,
+                                    salesPersonId: ticket.salesPersonFk
+                                })));
+                        }
+                    }
+                }
+
+                // SET COLLECTION
+                if (sales && sales.length) {
+                    // GET BARCODES
+                    const barcodes = await Self.rawSql(`
+                        SELECT s.id saleFk, b.code, c.id
+                            FROM vn.sale s
+                                LEFT JOIN vn.itemBarcode b ON b.itemFk = s.itemFk
+                                LEFT JOIN vn.buy c ON c.itemFk = s.itemFk
+                                LEFT JOIN vn.entry e ON e.id = c.entryFk
+                                LEFT JOIN vn.travel tr ON tr.id = e.travelFk
+                            WHERE s.ticketFk = ? 
+                                AND tr.landed >= util.VN_CURDATE() - INTERVAL 1 YEAR`,
+                    [ticketId], myOptions);
+
+                    // BINDINGS
+                    ticket.sales = [];
+                    for (const sale of sales) {
+                        if (sale.ticketFk === ticketId) {
+                            sale.Barcodes = [];
+
+                            if (barcodes && barcodes.length) {
+                                for (const barcode of barcodes) {
+                                    if (barcode.saleFk === sale.saleFk) {
+                                        for (const prop in barcode) {
+                                            if (['id', 'code'].includes(prop) && barcode[prop])
+                                                sale.Barcodes.push(barcode[prop].toString(), '0' + barcode[prop]);
+                                        }
+                                    }
+                                }
+                            }
+
+                            ticket.sales.push(sale);
+                        }
+                    }
+                }
+                collection.tickets.push(ticket);
+            }
+        }
+        await Promise.all(promises);
+
+        return collection;
+    };
+};
--- a/back/methods/collection/spec/getTickets.spec.js
+++ b/back/methods/collection/spec/getTickets.spec.js
@ -0,0 +1,39 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('collection getTickets()', () => {
+    let ctx;
+    beforeAll(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            }
+        };
+    });
+
+    it('should get tickets, sales and barcodes from collection', async() => {
+        const tx = await models.Collection.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const collectionId = 1;
+
+            const collectionTickets = await models.Collection.getTickets(ctx, collectionId, null, options);
+
+            expect(collectionTickets.collectionFk).toEqual(collectionId);
+            expect(collectionTickets.tickets.length).toEqual(3);
+            expect(collectionTickets.tickets[0].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[1].ticketFk).toEqual(2);
+            expect(collectionTickets.tickets[2].ticketFk).toEqual(23);
+            expect(collectionTickets.tickets[0].sales[0].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[0].sales[1].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[0].sales[2].ticketFk).toEqual(1);
+            expect(collectionTickets.tickets[0].sales[0].Barcodes.length).toBeTruthy();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
--- a/back/models/collection.js
+++ b/back/models/collection.js
@ -4,4 +4,5 @@ module.exports = Self => {
    require('../methods/collection/getSectors')(Self);
    require('../methods/collection/setSaleQuantity')(Self);
    require('../methods/collection/previousLabel')(Self);
+    require('../methods/collection/getTickets')(Self);
 };
--- a/db/changes/233802/.gitkeep
+++ b/db/changes/233802/.gitkeep
--- a/db/changes/233802/00-collectionGetTicketsACL.sql
+++ b/db/changes/233802/00-collectionGetTicketsACL.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL`(model, property, accessType, permission, principalType, principalId)
+	VALUES
+        ('Collection', 'getTickets', 'WRITE', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/234201/00-ACL_workerDepartment.sql
+++ b/db/changes/234201/00-ACL_workerDepartment.sql
@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('WorkerDepartment', '*', '*', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/234201/00-aclClient.sql
+++ b/db/changes/234201/00-aclClient.sql
@ -0,0 +1,3 @@
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+	VALUES('TicketCollection', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');
--- a/db/changes/234201/00-supplierAccountCheckLength.sql
+++ b/db/changes/234201/00-supplierAccountCheckLength.sql
@ -0,0 +1,6 @@
+UPDATE `vn`.`supplier`
+    SET account = LPAD(id,10,'0')
+    WHERE account IS NULL;
+
+ALTER TABLE `vn`.`supplier` ADD CONSTRAINT supplierAccountTooShort CHECK (LENGTH(account) = 10);
+ALTER TABLE `vn`.`supplier` MODIFY COLUMN account varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 4100000000 NOT NULL COMMENT 'Default accounting code for suppliers.';
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -1409,10 +1409,8 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_

 INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
    VALUES
-        (1, 0),
        (2, 1),
        (3, 2),
-        (4, 4),
        (5, 6),
        (15, 6);

@ -2834,24 +2832,24 @@ UPDATE `account`.`user`

 INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
    VALUES
-        (7,   18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
-        (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
-        (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
+        (7,   18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 22, NULL),
+        (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 22, NULL),
+        (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 22, NULL),
        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 100cm de '5' a '10'"),
-        (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 5689, 'Shield');
+        (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 12, 'Shield');


 INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description)
    VALUES
        (1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket',    45, 'Spider Man' , NULL, NULL, NULL),
        (1,   18, 'select', '2001-06-09 11:00:03', 'Ticket',    45, 'Spider Man' , NULL, NULL, NULL),
-        (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale',   69854, 'Armor'      , '{"isPicked": false}','{"isPicked": true}', NULL),
-        (1,   18, 'update', '2001-01-01 10:05:01', 'Sale',   69854, 'Armor'      , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
-        (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale',    5689, 'Shield'     , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
-        (1,   18, 'insert', '2000-12-31 15:00:05', 'Sale',   69854, 'Armor'      , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
+        (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale',      5,  'Armor'      , '{"isPicked": false}','{"isPicked": true}', NULL),
+        (1,   18, 'update', '2001-01-01 10:05:01', 'Sale',      5,  'Armor'      , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''),
+        (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale',      4,  'Shield'     , '{"quantity":10,"concept":"Shield"}', NULL, NULL),
+        (1,   18, 'insert', '2000-12-31 15:00:05', 'Sale',      1,  'Armor'      , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL),
        (1,   18, 'update', '2000-12-28 08:40:45', 'Ticket',    45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL),
        (1,   18, 'select', '2000-12-27 03:40:30', 'Ticket',    45, NULL         , NULL, NULL, NULL),
-        (1,   18, 'insert', '2000-04-10 09:40:15', 'Sale',    5689, 'Shield'     , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
+        (1,   18, 'insert', '2000-04-10 09:40:15', 'Sale',      4,  'Shield'     , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
        (1,   18, 'insert', '1999-05-09 10:00:00', 'Ticket',    45, 'Super Man'  , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
    VALUES
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -520,8 +520,7 @@ export default {
        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-card smart-table slot-table tr:nth-child(5)',
-        fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(6)',
+        thirdWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(4)',
        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(2) vn-icon-button[icon="delete"]',
        firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) [ng-model="weekly.agencyModeFk"]',
--- a/e2e/paths/05-ticket/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@ -19,7 +19,7 @@ describe('Ticket descriptor path', () => {
    it('should count the amount of tickets in the turns section', async() => {
        const result = await page.countElement(selectors.ticketsIndex.weeklyTicket);

-        expect(result).toEqual(7);
+        expect(result).toEqual(5);
    });

    it('should go back to the ticket index then search and access a ticket summary', async() => {
@ -45,7 +45,7 @@ describe('Ticket descriptor path', () => {

    it('should confirm the ticket 11 was added to thursday', async() => {
        await page.accessToSection('ticket.weekly.index');
-        const result = await page.waitToGetProperty(selectors.ticketsIndex.fourthWeeklyTicket, 'value');
+        const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');

        expect(result).toEqual('Thursday');
    });
@ -80,7 +80,9 @@ describe('Ticket descriptor path', () => {

    it('should confirm the ticket 11 was added on saturday', async() => {
        await page.accessToSection('ticket.weekly.index');
-        const result = await page.waitToGetProperty(selectors.ticketsIndex.fiveWeeklyTicket, 'value');
+        await page.waitForTimeout(5000);
+
+        const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');

        expect(result).toEqual('Saturday');
    });
@ -104,7 +106,7 @@ describe('Ticket descriptor path', () => {
        await page.doSearch();
        const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);

-        expect(nResults).toEqual(7);
+        expect(nResults).toEqual(5);
    });

    it('should update the agency then remove it afterwards', async() => {
--- a/front/core/components/index.js
+++ b/front/core/components/index.js
@ -39,6 +39,7 @@ import './range';
 import './input-time';
 import './input-file';
 import './label';
+import './link-phone';
 import './list';
 import './popover';
 import './popup';
--- a/front/core/components/link-phone/index.html
+++ b/front/core/components/link-phone/index.html
@ -0,0 +1,14 @@
+<span ng-if="$ctrl.phoneNumber">
+    {{$ctrl.phoneNumber}}
+    <a href="tel:{{$ctrl.phoneNumber}}">
+        <vn-icon
+            flat
+            round
+            icon="phone"
+            title="MicroSIP"
+            ng-click="$event.stopPropagation();"
+        >
+        </vn-icon>
+    </a>
+</span>
+<span ng-if="!$ctrl.phoneNumber">-</span>
--- a/front/core/components/link-phone/index.js
+++ b/front/core/components/link-phone/index.js
@ -0,0 +1,15 @@
+import ngModule from '../../module';
+import './style.scss';
+class Controller {
+    constructor() {
+        this.phoneNumber = null;
+    }
+}
+
+ngModule.vnComponent('vnLinkPhone', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        phoneNumber: '<',
+    }
+});
--- a/front/core/components/link-phone/style.scss
+++ b/front/core/components/link-phone/style.scss
@ -0,0 +1,7 @@
+vn-link-phone {
+    vn-icon {
+    font-size: 1.1em;
+    vertical-align: bottom;
+}
+}
+
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@ -22,5 +22,4 @@ import './user-photo';
 import './upload-photo';
 import './bank-entity';
 import './log';
-import './instance-log';
 import './sendSms';
--- a/front/salix/components/instance-log/index.html
+++ b/front/salix/components/instance-log/index.html
@ -1,12 +0,0 @@
-<vn-dialog
-    vn-id="instanceLog">
-    <tpl-body>
-        <vn-log
-            class="vn-instance-log"
-            url="{{$ctrl.url}}"
-            origin-id="$ctrl.originId"
-            changed-model="$ctrl.changedModel"
-            changed-model-id="$ctrl.changedModelId">
-        </vn-log>
-    </tpl-body>
-</vn-dialog>
--- a/front/salix/components/instance-log/index.js
+++ b/front/salix/components/instance-log/index.js
@ -1,21 +0,0 @@
-import ngModule from '../../module';
-import Section from '../section';
-import './style.scss';
-
-export default class Controller extends Section {
-    open() {
-        this.$.instanceLog.show();
-    }
-}
-
-ngModule.vnComponent('vnInstanceLog', {
-    controller: Controller,
-    template: require('./index.html'),
-    bindings: {
-        model: '<',
-        originId: '<',
-        changedModelId: '<',
-        changedModel: '@',
-        url: '@'
-    }
-});
--- a/front/salix/components/instance-log/style.scss
+++ b/front/salix/components/instance-log/style.scss
@ -1,9 +0,0 @@
-vn-log.vn-instance-log {
-    vn-card {
-        width: 900px;
-        visibility: hidden;
-        & > * {
-            visibility: visible;
-        }
-    }
-}
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@ -72,6 +72,7 @@ export default class Controller extends Section {

    $postLink() {
        this.resetFilter();
+        this.defaultFilter();
        this.$.$watch(
            () => this.$.filter,
            () => this.applyFilter(),
@ -79,6 +80,14 @@ export default class Controller extends Section {
        );
    }

+    defaultFilter() {
+        const defaultFilters = ['changedModel', 'changedModelId'];
+        for (const defaultFilter of defaultFilters) {
+            if (this[defaultFilter])
+                this.$.filter[defaultFilter] = this[defaultFilter];
+        }
+    }
+
    get logs() {
        return this._logs;
    }
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -188,5 +188,6 @@
 	"The ticket doesn't exist.": "The ticket doesn't exist.",
 	"The sales do not exists": "The sales do not exists",
 	"Ticket without Route": "Ticket without route",
-	"Booking completed": "Booking completed"
+	"Booking completed": "Booking complete",
+    "The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -216,6 +216,7 @@
 	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
 	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
 	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
+	"The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
 	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
 	"You don't have privileges to create refund": "No tienes permisos para crear un abono",
 	"The item is required": "El artículo es requerido",
@ -318,5 +319,6 @@
 	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
 	"The response is not a PDF": "La respuesta no es un PDF",
 	"Ticket without Route": "Ticket sin ruta",
-	"Booking completed": "Reserva completada"
+	"Booking completed": "Reserva completada",
+	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación"
 }
--- a/modules/client/back/methods/client/creditRequestEmail.js
+++ b/modules/client/back/methods/client/creditRequestEmail.js
@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethodCtx('clientCreditEmail', {
+    Self.remoteMethodCtx('creditRequestEmail', {
        description: 'Sends the credit request email with an attached PDF',
        accessType: 'WRITE',
        accepts: [
@ -40,5 +40,5 @@ module.exports = Self => {
        },
    });

-    Self.clientCreditEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
+    Self.creditRequestEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
 };
--- a/modules/client/back/methods/client/incotermsAuthorizationEmail.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationEmail.js
@ -33,6 +33,12 @@ module.exports = Self => {
                type: 'number',
                description: 'The company id',
                required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
            }
        ],
        returns: {
--- a/modules/client/back/methods/client/incotermsAuthorizationHtml.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationHtml.js
@ -21,6 +21,12 @@ module.exports = Self => {
                type: 'number',
                description: 'The company id',
                required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
            }
        ],
        returns: [
--- a/modules/client/back/methods/client/incotermsAuthorizationPdf.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
@ -21,6 +21,12 @@ module.exports = Self => {
                type: 'number',
                description: 'The company id',
                required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
            }
        ],
        returns: [
--- a/modules/client/front/sample/create/index.html
+++ b/modules/client/front/sample/create/index.html
@ -13,6 +13,7 @@
        'description',
        'model',
        'hasCompany',
+        'hasAddress',
        'hasPreview',
        'datepickerEnabled'
    ]"
@ -69,6 +70,32 @@
                ng-if="sampleType.selection.hasCompany"
                required="true">
            </vn-autocomplete>
+            <vn-autocomplete
+                ng-if="sampleType.selection.id == 20"
+                vn-one
+                required="true"
+                data="$ctrl.addresses"
+                label="Address"
+                show-field="nickname"
+                value-field="id"
+                ng-model="$ctrl.addressId"
+                model="ClientSample.addressFk"
+                order="isActive DESC">
+                <tpl-item class="address" ng-class="::{inactive: !isActive}">
+                    <span class="inactive" translate>{{::!isActive ? '(Inactive)' : ''}}</span>
+                    {{::nickname}}
+                    <span ng-show="city || province || street">
+                        , {{::street}}, {{::city}}, {{::province.name}} - {{::agencyMode.name}}
+                    </span>
+                </tpl-item>
+                <append>
+                    <vn-icon-button
+                        ui-sref="client.card.address.edit({id: $ctrl.clientId, addressId: $ctrl.addressId})"
+                        icon="edit"
+                        vn-tooltip="Edit address">
+                    </vn-icon-button>
+                </append>
+            </vn-autocomplete>
            <vn-date-picker
                vn-one
                label="From"
--- a/modules/client/front/sample/create/index.js
+++ b/modules/client/front/sample/create/index.js
@ -15,8 +15,10 @@ class Controller extends Section {
    set client(value) {
        this._client = value;

-        if (value)
+        if (value) {
            this.setClientSample(value);
+            this.clientAddressesList(value.id);
+        }
    }

    get companyId() {
@ -29,6 +31,16 @@ class Controller extends Section {
        this.clientSample.companyFk = value;
    }

+    get addressId() {
+        if (!this.clientSample.addressId)
+            this.clientSample.addressId = this.client.defaultAddressFk;
+        return this.clientSample.addressId;
+    }
+
+    set addressId(value) {
+        this.clientSample.addressId = value;
+    }
+
    onSubmit() {
        this.$.watcher.check();

@ -65,6 +77,9 @@ class Controller extends Section {

        if (sampleType.datepickerEnabled)
            params.from = this.clientSample.from;
+
+        if (this.clientSample.addressId)
+            params.addressId = this.clientSample.addressId;
    }

    preview() {
@ -126,6 +141,40 @@ class Controller extends Section {
            };
        });
    }
+
+    clientAddressesList(value) {
+        let filter = {
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['name']
+                    }
+                },
+                {
+                    relation: 'agencyMode',
+                    scope: {
+                        fields: ['name']
+                    }
+                }
+            ]
+        };
+        filter = encodeURIComponent(JSON.stringify(filter));
+
+        let query = `Clients/${value}/addresses?filter=${filter}`;
+        this.$http.get(query).then(res => {
+            if (res.data)
+                this.addresses = res.data;
+        });
+    }
+
+    getClientDefaultAddress(value) {
+        let query = `Clients/${value}`;
+        this.$http.get(query).then(res => {
+            if (res.data)
+                this.addressId = res.data.defaultAddressFk;
+        });
+    }
 }

 Controller.$inject = ['$element', '$scope', 'vnEmail'];
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@ -45,11 +45,18 @@
            <vn-label-value label="Contact"
                value="{{$ctrl.summary.contact}}">
            </vn-label-value>
-            <vn-label-value label="Phone"
-                value="{{$ctrl.summary.phone}}">
+            <vn-label-value label="Phone">
+                
+                <vn-link-phone
+                phone-number="$ctrl.summary.phone"
+                ></vn-link-phone>
+                
            </vn-label-value>
-            <vn-label-value label="Mobile"
-                value="{{$ctrl.summary.mobile}}">
+            <vn-label-value label="Mobile">
+                
+                <vn-link-phone
+                phone-number="$ctrl.summary.mobile"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Email" no-ellipsize
                value="{{$ctrl.listEmails($ctrl.summary.email)}}">
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@ -47,6 +47,11 @@
 			"type": "belongsTo",
 			"model": "VnUser",
 			"foreignKey": "userFk"
+		},
+		"shelving": {
+			"type": "belongsTo",
+			"model": "Shelving",
+			"foreignKey": "shelvingFk"
 		}
 	}
 }
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@ -48,8 +48,10 @@
            <vn-label-value label="Landed" 
                value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy HH:mm'}}">
            </vn-label-value>
-            <vn-label-value label="Phone" 
-            value="{{$ctrl.summary.address.phone}}">
+            <vn-label-value label="Phone">
+                <vn-link-phone
+                    phone-number="$ctrl.summary.address.phone"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Created from" 
                value="{{$ctrl.summary.sourceApp}}">
--- a/modules/route/front/roadmap/summary/index.html
+++ b/modules/route/front/roadmap/summary/index.html
@ -25,7 +25,10 @@
        <vn-one>
            <vn-label-value
                label="Phone"
-                value="{{summary.phone}}">
+            >
+                <vn-link-phone
+                phone-number="summary.phone"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value
                label="Worker"
--- a/modules/route/front/roadmap/summary/style.scss
+++ b/modules/route/front/roadmap/summary/style.scss
@ -1,10 +1,9 @@
@import "variables";

 vn-roadmap-summary .summary {
-    a {
+    a:not(vn-link-phone a) {
        display: flex;
        align-items: center;
        height: 18.328px;
    }
-
 }
--- a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
@ -32,6 +32,7 @@ describe('Supplier newSupplier()', () => {
            const result = await models.Supplier.newSupplier(ctx, options);

            expect(result.name).toEqual('newSupplier');
+            await tx.rollback();
        } catch (e) {
            await tx.rollback();
            throw e;
--- a/modules/supplier/back/models/specs/supplier.spec.js
+++ b/modules/supplier/back/models/specs/supplier.spec.js
@ -123,5 +123,21 @@ describe('loopback model Supplier', () => {
                throw e;
            }
        });
+
+        it('should update the account attribute when a new supplier is created', async() => {
+            const tx = await models.Supplier.beginTransaction({});
+            const options = {transaction: tx};
+
+            try {
+                const newSupplier = await models.Supplier.create({name: 'Alfred Pennyworth'}, options);
+                const fetchedSupplier = await models.Supplier.findById(newSupplier.id, null, options);
+
+                expect(Number(fetchedSupplier.account)).toEqual(4100000000 + newSupplier.id);
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                throw e;
+            }
+        });
    });
 });
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@ -117,6 +117,16 @@ module.exports = Self => {
            throw new UserError('You can not modify is pay method checked');
    });

+    Self.observe('after save', async function(ctx) {
+        if (ctx.instance && ctx.isNewInstance) {
+            const {id} = ctx.instance;
+            const {Supplier} = Self.app.models;
+
+            const supplier = await Supplier.findById(id, null, ctx.options);
+            await supplier?.updateAttribute('account', Number(supplier.account) + id, ctx.options);
+        }
+    });
+
    Self.validateAsync('name', 'countryFk', hasSupplierSameName, {
        message: 'A supplier with the same name already exists. Change the country.'
    });
--- a/modules/supplier/front/create/index.html
+++ b/modules/supplier/front/create/index.html
@ -18,7 +18,6 @@
    </vn-card>
    <vn-button-bar>
        <vn-submit
-            disabled="!watcher.dataChanged()"
            label="Create">
        </vn-submit>
        <vn-button
--- a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js
@ -14,7 +14,7 @@ describe('ticket-request filter()', () => {

            const result = await models.TicketRequest.filter(ctx, options);

-            expect(result.length).toEqual(3);
+            expect(result.length).toEqual(5);

            await tx.rollback();
        } catch (e) {
@ -93,7 +93,7 @@ describe('ticket-request filter()', () => {
            const result = await models.TicketRequest.filter(ctx, options);
            const requestId = result[0].id;

-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);

            await tx.rollback();
        } catch (e) {
@ -113,7 +113,7 @@ describe('ticket-request filter()', () => {
            const result = await models.TicketRequest.filter(ctx, options);
            const requestId = result[0].id;

-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);

            await tx.rollback();
        } catch (e) {
@ -153,7 +153,7 @@ describe('ticket-request filter()', () => {
            const result = await models.TicketRequest.filter(ctx, {order: 'id'}, options);
            const requestId = result[0].id;

-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);

            await tx.rollback();
        } catch (e) {
@ -173,7 +173,7 @@ describe('ticket-request filter()', () => {
            const result = await models.TicketRequest.filter(ctx, options);
            const requestId = result[0].id;

-            expect(requestId).toEqual(3);
+            expect(requestId).toEqual(1);

            await tx.rollback();
        } catch (e) {
--- a/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
@ -16,8 +16,8 @@ describe('ticket-weekly filter()', () => {

            const firstRow = result[0];

-            expect(firstRow.ticketFk).toEqual(1);
-            expect(result.length).toEqual(6);
+            expect(firstRow.ticketFk).toEqual(2);
+            expect(result.length).toEqual(4);

            await tx.rollback();
        } catch (e) {
@ -52,12 +52,12 @@ describe('ticket-weekly filter()', () => {
        try {
            const options = {transaction: tx};

-            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'bruce'}};
+            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'max'}};

            const result = await models.TicketWeekly.filter(ctx, null, options);
            const firstRow = result[0];

-            expect(firstRow.clientName).toEqual('Bruce Wayne');
+            expect(firstRow.clientName).toEqual('Max Eisenhardt');

            await tx.rollback();
        } catch (e) {
@ -72,13 +72,13 @@ describe('ticket-weekly filter()', () => {
        try {
            const options = {transaction: tx};

-            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
+            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1105}};

            const result = await models.TicketWeekly.filter(ctx, null, options);
            const firstRow = result[0];

-            expect(firstRow.clientFk).toEqual(1101);
-            expect(firstRow.clientName).toEqual('Bruce Wayne');
+            expect(firstRow.clientFk).toEqual(1105);
+            expect(firstRow.clientName).toEqual('Max Eisenhardt');

            await tx.rollback();
        } catch (e) {
--- a/modules/ticket/back/methods/ticket/isEditableOrThrow.js
+++ b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
@ -40,7 +40,7 @@ module.exports = Self => {
        if (!isEditable && !isRoleAdvanced)
            throw new ForbiddenError(`This ticket is not editable.`);

-        if (isLocked)
+        if (isLocked && !isWeekly)
            throw new ForbiddenError(`This ticket is locked.`);

        if (isWeekly && !canEditWeeklyTicket)
--- a/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
@ -8,7 +8,7 @@ describe('isEditable()', () => {
        try {
            const options = {transaction: tx};
            const ctx = {req: {accessToken: {userId: 35}}};
-            result = await models.Ticket.isEditable(ctx, 5, options);
+            result = await models.Ticket.isEditable(ctx, 19, options);
            await tx.rollback();
        } catch (error) {
            await tx.rollback();
--- a/modules/ticket/back/models/ticket-collection.json
+++ b/modules/ticket/back/models/ticket-collection.json
@ -10,6 +10,9 @@
        "id": {
            "id": true,
            "type": "number"
+        },
+        "usedShelves": {
+            "type": "number"
        }
    },
    "relations": {
--- a/modules/ticket/front/descriptor/locale/es.yml
+++ b/modules/ticket/front/descriptor/locale/es.yml
@ -3,7 +3,7 @@ Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
 Show pallet report: Ver hoja de pallet
 Change shipped hour: Cambiar hora de envío
 Shipped hour: Hora de envío
-Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias."
+Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectúe el pago con tarjeta.\rMuchas gracias."
 Minimum is needed: "Verdnatura le recuerda:\rEs necesario un importe mínimo de 50€ (Sin IVA) en su pedido {{ticketId}} del día {{created | date: 'dd/MM/yyyy'}} para recibirlo sin portes adicionales."
 Ticket invoiced: Ticket facturado
 Make invoice: Crear factura
--- a/modules/ticket/front/log/index.html
+++ b/modules/ticket/front/log/index.html
@ -1 +1,6 @@
-<vn-log url="TicketLogs" origin-id="$ctrl.$params.id"></vn-log>
+<vn-log
+    url="TicketLogs"
+    origin-id="$ctrl.$params.id"
+    changed-model="$ctrl.$params.changedModel"
+    changed-model-id="$ctrl.$params.changedModelId">
+</vn-log>
--- a/modules/ticket/front/routes.json
+++ b/modules/ticket/front/routes.json
@ -187,7 +187,7 @@
            }
        },
        {
-            "url" : "/log",
+            "url" : "/log?changedModel&changedModelId",
            "state": "ticket.card.log",
            "component": "vn-ticket-log",
            "description": "Log"
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@ -212,16 +212,9 @@
                            vn-none
                            vn-tooltip="History"
                            icon="history"
-                            ng-click="log.open()"
+                            ng-click="$ctrl.goToLog(sale.id)"
                            ng-show="sale.$hasLogs">
                        </vn-icon-button>
-                        <vn-instance-log
-                            vn-id="log"
-                            url="TicketLogs"
-                            origin-id="$ctrl.$params.id"
-                            changed-model="Sale"
-                            changed-model-id="sale.id">
-                        </vn-instance-log>
                    </vn-td>

                </vn-tr>
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@ -558,6 +558,14 @@ class Controller extends Section {
    cancel() {
        this.$.editDiscount.hide();
    }
+
+    goToLog(saleId) {
+        this.$state.go('ticket.card.log', {
+            originId: this.$params.id,
+            changedModel: 'Sale',
+            changedModelId: saleId
+        });
+    }
 }

 ngModule.vnComponent('vnTicketSale', {
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@ -83,19 +83,29 @@
            </vn-label-value>
            <vn-label-value label="Address phone"
                ng-if="$ctrl.summary.address.phone != null"
-                value="{{$ctrl.summary.address.phone}}">
+               >
+               <vn-link-phone
+                    phone-number="$ctrl.summary.address.phone"
+               ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Address mobile"
                ng-if="$ctrl.summary.address.mobile != null"
-                value="{{$ctrl.summary.address.mobile}}">
+            >
+                <vn-link-phone
+                    phone-number="$ctrl.summary.address.mobile"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Client phone"
-                ng-if="$ctrl.summary.client.phone != null"
-                value="{{$ctrl.summary.client.phone}}">
+                ng-if="$ctrl.summary.client.phone != null">
+                <vn-link-phone
+                    phone-number="$ctrl.summary.client.phone"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Client mobile"
-                ng-if="$ctrl.summary.client.mobile != null"
-                value="{{$ctrl.summary.client.mobile}}">
+                ng-if="$ctrl.summary.client.mobile != null">
+                <vn-link-phone
+                    phone-number="$ctrl.summary.client.mobile"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Address" no-ellipsize
                value="{{$ctrl.formattedAddress}}">
--- a/modules/ticket/front/summary/style.scss
+++ b/modules/ticket/front/summary/style.scss
@ -47,4 +47,9 @@ vn-ticket-summary .summary {
            }
        }
    }
+    
+    vn-icon.tel {
+        font-size: 1.1em;
+        vertical-align: bottom;
+    }
 }
--- a/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js
@ -0,0 +1,103 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('updateWorkerTimeControlMail()', () => {
+    it('should update WorkerTimeControlMail if exist record', async() => {
+        const tx = await models.WorkerTimeControlMail.beginTransaction({});
+        const args = {
+            workerId: 9,
+            week: 50,
+            year: 2000,
+            state: 'CONFIRMED'
+        };
+        const ctx = {args};
+
+        try {
+            const options = {transaction: tx};
+            const beforeMail = await models.WorkerTimeControlMail.findOne({
+                where: {
+                    workerFk: args.workerId,
+                    year: args.year,
+                    week: args.week,
+                }
+            }, options);
+            await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+            const afterMail = await models.WorkerTimeControlMail.findOne({
+                where: {
+                    workerFk: args.workerId,
+                    year: args.year,
+                    week: args.week,
+                }
+            }, options);
+
+            expect(beforeMail.state).toEqual('SENDED');
+            expect(afterMail.state).toEqual(args.state);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should insert WorkerTimeControlMail if exist record', async() => {
+        const tx = await models.WorkerTimeControlMail.beginTransaction({});
+        const args = {
+            workerId: 1,
+            week: 51,
+            year: 2000,
+            state: 'SENDED'
+        };
+        const ctx = {args};
+
+        try {
+            const options = {transaction: tx};
+            const beforeMail = await models.WorkerTimeControlMail.find({
+                where: {
+                    workerFk: args.workerId,
+                    year: args.year,
+                    week: args.week,
+                }
+            }, options);
+            await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+            const afterMail = await models.WorkerTimeControlMail.find({
+                where: {
+                    workerFk: args.workerId,
+                    year: args.year,
+                    week: args.week,
+                }
+            }, options);
+
+            expect(beforeMail).toEqual([]);
+            expect(afterMail.length).toEqual(1);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should throw error if not exist any record in this week', async() => {
+        const tx = await models.WorkerTimeControlMail.beginTransaction({});
+        const ctx = {args: {
+            workerId: 1,
+            week: 1,
+            year: 0,
+            state: 'SENDED'
+        }};
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error.message).toEqual(`There aren't records for this week`);
+    });
+});
+
--- a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
+++ b/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
@ -40,30 +40,39 @@ module.exports = Self => {
    Self.updateWorkerTimeControlMail = async(ctx, options) => {
        const models = Self.app.models;
        const args = ctx.args;
-
        const myOptions = {};

        if (typeof options == 'object')
            Object.assign(myOptions, options);

-        const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
+        const [sent] = await models.WorkerTimeControlMail.find({
            where: {
-                workerFk: args.workerId,
                year: args.year,
-                week: args.week
-            }
+                week: args.week,
+            },
+            limit: 1
        }, myOptions);

-        if (!workerTimeControlMail) throw new UserError(`There aren't records for this week`);
+        if (!sent) throw new UserError(`There aren't records for this week`);

-        await workerTimeControlMail.updateAttributes({
+        const workerTimeControlMail = await models.WorkerTimeControlMail.upsertWithWhere(
+            {
+                year: args.year,
+                week: args.week,
+                workerFk: args.workerId
+            },
+            {
                state: args.state,
-            reason: args.reason || null
-        }, myOptions);
+                reason: args.workerId,
+                year: args.year,
+                week: args.week,
+                workerFk: args.workerId
+            },
+            myOptions);

        if (args.state == 'SENDED') {
            await workerTimeControlMail.updateAttributes({
-                sendedCounter: workerTimeControlMail.sendedCounter + 1
+                sendedCounter: workerTimeControlMail.sendedCounter ? workerTimeControlMail.sendedCounter + 1 : 1
            }, myOptions);
        }
    };
--- a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
+++ b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
@ -61,9 +61,8 @@ module.exports = Self => {
        const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`;
        ctx.args.url = url;

-        await Self.sendTemplate(ctx, 'weekly-hour-record');
-
-        return models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions);
+        await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions);
+        return Self.sendTemplate(ctx, 'weekly-hour-record');
    };

    function getMondayDateFromYearWeek(yearNumber, weekNumber) {
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@ -47,6 +47,9 @@
        },
        "locker": {
            "type" : "number"
+        },
+        "isF11Allowed": {
+            "type" : "boolean"
        }
    },
    "relations": {
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@ -28,11 +28,17 @@
            </vn-label-value>
            <vn-label-value
                label="Phone"
-                value="{{$ctrl.worker.phone}}">
+            >
+                <vn-link-phone
+                    phone-number="$ctrl.worker.phone"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value
                label="Extension"
-                value="{{$ctrl.worker.sip.extension}}">
+            > 
+                <vn-link-phone
+                    phone-number="$ctrl.worker.sip.extension"
+                ></vn-link-phone>
            </vn-label-value>
        </div>
        <div class="icons">
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@ -1,6 +1,5 @@
 import ngModule from '../module';
 import Descriptor from 'salix/components/descriptor';
-
 class Controller extends Descriptor {
    constructor($element, $, $rootScope) {
        super($element, $);
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@ -42,14 +42,21 @@
                    {{::worker.boss.name}}
                </span>
            </vn-label-value>
-            <vn-label-value label="Mobile extension"
-                value="{{worker.mobileExtension}}">
+            <vn-label-value label="Mobile extension">
+                <vn-link-phone
+                    phone-number="worker.mobileExtension"
+                ></vn-link-phone>
            </vn-label-value>
-            <vn-label-value label="Business phone"
-                value="{{worker.phone}}">
+            <vn-label-value label="Business phone">
+                <vn-link-phone
+                    phone-number="worker.phone"
+                ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Personal phone"
-            value="{{worker.client.phone}}">
+            >
+            <vn-link-phone
+                phone-number="worker.client.phone"
+            ></vn-link-phone>
            </vn-label-value>
            <vn-label-value label="Locker"
            value="{{worker.locker}}">
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@ -1,6 +1,5 @@
 import ngModule from '../module';
 import Summary from 'salix/components/summary';
-
 class Controller extends Summary {
    get worker() {
        return this._worker;
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@ -79,30 +79,32 @@
        </vn-table>
    </vn-card>

-    <vn-button-bar ng-show="$ctrl.state" class="vn-w-lg">
+    <vn-button-bar class="vn-w-lg">
+        <div ng-show="$ctrl.state">
            <vn-button
                label="Satisfied"
                disabled="$ctrl.state == 'CONFIRMED'"
-            ng-if="$ctrl.isHimSelf"
+                ng-show="$ctrl.isHimSelf"
                ng-click="$ctrl.isSatisfied()">
            </vn-button>
            <vn-button
                label="Not satisfied"
                disabled="$ctrl.state == 'REVISE'"
-            ng-if="$ctrl.isHimSelf"
+                ng-show="$ctrl.isHimSelf"
                ng-click="reason.show()">
            </vn-button>
            <vn-button
                label="Reason"
-            ng-if="$ctrl.reason && ($ctrl.isHimSelf || $ctrl.isHr)"
+                ng-show="$ctrl.reason && ($ctrl.isHimSelf || $ctrl.isHr)"
                ng-click="reason.show()">
            </vn-button>
+        </div>
        <vn-button
-            label="Resend"
+            label="{{$ctrl.state ? 'Resend' : 'Send'}}"
            ng-click="sendEmailConfirmation.show()"
            class="right"
-            vn-tooltip="Resend email of this week to the user"
-            ng-show="::$ctrl.isHr">
+            vn-tooltip="{{$ctrl.state ? 'Resend' : 'Send'}} email of this week to the user"
+            ng-if="$ctrl.isHr && $ctrl.state != 'CONFIRMED' && $ctrl.canResend">
        </vn-button>
    </vn-button-bar>
 </div>
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@ -53,6 +53,8 @@ class Controller extends Section {
    set worker(value) {
        this._worker = value;
        this.fetchHours();
+        if (this.date)
+            this.getWeekData();
    }

    /**
@ -110,6 +112,7 @@ class Controller extends Section {
        }

        if (!this.weekTotalHours) this.fetchHours();
+        if (this.worker)
            this.getWeekData();
    }

@ -127,17 +130,34 @@ class Controller extends Section {
                workerFk: this.$params.id,
                year: this._date.getFullYear(),
                week: this.getWeekNumber(this._date)
-            }
+            },
        };
        this.$http.get('WorkerTimeControlMails', {filter})
            .then(res => {
-                const mail = res.data;
-                if (!mail.length) {
+                if (!res.data.length) {
                    this.state = null;
                    return;
                }
-                this.state = mail[0].state;
-                this.reason = mail[0].reason;
+                const [mail] = res.data;
+                this.state = mail.state;
+                this.reason = mail.reason;
+            });
+        this.canBeResend();
+    }
+
+    canBeResend() {
+        this.canResend = false;
+        const filter = {
+            where: {
+                year: this._date.getFullYear(),
+                week: this.getWeekNumber(this._date)
+            },
+            limit: 1
+        };
+        this.$http.get('WorkerTimeControlMails', {filter})
+            .then(res => {
+                if (res.data.length)
+                    this.canResend = true;
            });
    }

@ -356,30 +376,25 @@ class Controller extends Section {
    }

    isSatisfied() {
-        const params = {
-            workerId: this.worker.id,
-            year: this.date.getFullYear(),
-            week: this.weekNumber,
-            state: 'CONFIRMED'
-        };
-        const query = `WorkerTimeControls/updateWorkerTimeControlMail`;
-        this.$http.post(query, params).then(() => {
-            this.getMailStates(this.date);
-            this.getWeekData();
-            this.vnApp.showSuccess(this.$t('Data saved!'));
-        });
+        this.updateWorkerTimeControlMail('CONFIRMED');
    }

    isUnsatisfied() {
        if (!this.reason) throw new UserError(`You must indicate a reason`);
+        this.updateWorkerTimeControlMail('REVISE', this.reason);
+    }

+    updateWorkerTimeControlMail(state, reason) {
        const params = {
            workerId: this.worker.id,
            year: this.date.getFullYear(),
            week: this.weekNumber,
-            state: 'REVISE',
-            reason: this.reason
+            state
        };
+
+        if (reason)
+            params.reason = reason;
+
        const query = `WorkerTimeControls/updateWorkerTimeControlMail`;
        this.$http.post(query, params).then(() => {
            this.getMailStates(this.date);
--- a/print/templates/email/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/email/incoterms-authorization/incoterms-authorization.js
@ -28,6 +28,10 @@ module.exports = {
        companyId: {
            type: Number,
            required: true
+        },
+        addressId: {
+            type: Number,
+            required: true
        }
    }
 };
--- a/print/templates/email/modified-collection-volumetry/assets/css/import.js
+++ b/print/templates/email/modified-collection-volumetry/assets/css/import.js
@ -0,0 +1,12 @@
+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`,
+    `${__dirname}/style.css`])
+    .mergeStyles();
--- a/print/templates/email/modified-collection-volumetry/assets/css/style.css
+++ b/print/templates/email/modified-collection-volumetry/assets/css/style.css
@ -0,0 +1,8 @@
+.jsonSection {
+    text-align: left;
+    background-color: #e4e4e4;
+    padding: 25px;
+    margin-left: 60px;
+    margin-right: 60px;
+    border-radius: 25px;
+}
--- a/print/templates/email/modified-collection-volumetry/locale/en.yml
+++ b/print/templates/email/modified-collection-volumetry/locale/en.yml
@ -0,0 +1,3 @@
+subject: Modified collection volumetry
+title: Modified collection volumetry
+description: Action performed
--- a/print/templates/email/modified-collection-volumetry/locale/es.yml
+++ b/print/templates/email/modified-collection-volumetry/locale/es.yml
@ -0,0 +1,3 @@
+subject: Volumetría de colección modificada
+title: Volumetría de colección modificada
+description: Acción realizada
--- a/print/templates/email/modified-collection-volumetry/modified-collection-volumetry.html
+++ b/print/templates/email/modified-collection-volumetry/modified-collection-volumetry.html
@ -0,0 +1,15 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <div class="centered">
+                <h1>{{ $t('title') }}</h1>
+                <h3>{{ $t('description') }}:  <u>{{ data.action }}</u> <i> {{ `(${this.username})` }} </i></h3>
+                <div class="jsonSection">
+                    <span v-for="(value, key) in data" v-if="key !== 'action' && key !== 'userFk'">
+                        <b> {{ `${key}:` }} </b> {{ value }} <br>
+                    </span>
+                </div>
+            </div>
+        </div>
+    </div>
+</email-body>
--- a/print/templates/email/modified-collection-volumetry/modified-collection-volumetry.js
+++ b/print/templates/email/modified-collection-volumetry/modified-collection-volumetry.js
@ -0,0 +1,25 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+const models = require('vn-loopback/server/server').models;
+
+module.exports = {
+    name: 'modified-collection-volumetry',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    async serverPrefetch() {
+        this.username = (this.data.userFk) ? await this.getUsername(this.data.userFk) : 'system';
+    },
+    methods: {
+        async getUsername(id) {
+            const account = await models.VnUser.findById(id);
+            return account.name;
+        }
+    },
+    props: {
+        data: {
+            type: Object,
+            required: true
+        }
+    }
+};
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.html
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.html
@ -3,16 +3,16 @@
        <div class="grid-block">
            <p
                v-html="$t('description', {
-                socialName: client.socialName,
+                socialName: address.nickname,
                name: client.name,
-                address: client.street,
+                address: address.street,
                country: client.country,
                fiscalID: client.fi
            })"
            ></p>
            <p
                v-html="$t('declaration', {
-                socialName: client.socialName
+                socialName: address.nickname
            })"
            ></p>
            <p
@ -20,7 +20,7 @@
                v-html="$t('declarations[' + $index + ']', {
                    companyName: company.name,
                    companyCity: company.city,
-                    socialName: client.socialName,
+                    socialName: address.nickname,
                    destinationCountry: client.country
                })"
            ></p>
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
@ -7,6 +7,7 @@ module.exports = {
        this.client = await this.findOneFromDef('client', [this.id]);
        this.checkMainEntity(this.client);
        this.company = await this.findOneFromDef('company', [this.companyId]);
+        this.address = await this.findOneFromDef('address', [this.addressId]);
    },
    props: {
        id: {
@ -17,6 +18,10 @@ module.exports = {
        companyId: {
            type: Number,
            required: true
+        },
+        addressId: {
+            type: Number,
+            required: true
        }
    }
 };
--- a/print/templates/reports/incoterms-authorization/locale/es.yml
+++ b/print/templates/reports/incoterms-authorization/locale/es.yml
@ -1,15 +1,12 @@
 reportName: autorizacion-incoterms
 description: '<em>{socialName}</em> una sociedad debidamente constituida con responsabilidad <em>limitada</em>
-y registrada conforme al derecho de sociedades de {country} y aquí representada por 
-<span>___________________</span>. {socialName}, con domicilio en {address}, 
+y registrada conforme al derecho de sociedades de {country} y aquí representada por {socialName}, con domicilio en {address},
 CIF <em>{fiscalID}</em>. En adelante denominada {name}.'
 issued: 'En {0}, a {1} de {2} de {3}'
 client: 'Cliente {0}'
 declaration: '<em>{socialName}</em> declara por la presente que:'
 declarations:
-  - 'Todas las compras realizadas por {socialName} con {companyName} se 
-entregan, Ex Works (Incoterms), en el almacén de {companyName} situado en 
-{companyCity}.'
+  - 'Todas las compras realizadas por {socialName} con {companyName} se entregan según las condiciones definidas en el incoterm.'
  - '{socialName} reconoce que es importante para {companyName} tener
 comprobante de la entrega intracomunitaria de la mercancía a {destinationCountry} para
 poder facturar con 0% de IVA.'
--- a/print/templates/reports/incoterms-authorization/locale/pt.yml
+++ b/print/templates/reports/incoterms-authorization/locale/pt.yml
@ -1,7 +1,6 @@
 reportName: autorizacion-incoterms
 description: '<em>{socialName}</em> uma sociedade devidamente constituída com responsabilidade <em>limitada e registada</em>
-conforme ao direito de sociedades da {country} e aqui representada por
-<span>___________________</span>. {socialName}, com domicílio em {address},
+conforme ao direito de sociedades da {country} e aqui representada por {socialName}, com domicílio em {address},
 CIF <em>{fiscalID}</em>. Em adiante denominada {name}.'
 issued: 'Em {0}, em {1} de {2} de {3}'
 client: 'Cliente {0}'
@ -11,14 +10,14 @@ declarations:
  Ex Works (Incoterms), no armazém da {companyName} situado em
 {companyCity}.'
  - '{socialName} reconhece ser importante para {companyName}
-  ter o comprovante da entrega intracomunitária da mercadoria a {destinationCountry} 
+  ter o comprovante da entrega intracomunitária da mercadoria em {destinationCountry}
  para poder faturar com 0% de IVA.'
  - 'Portanto, ao assinar este acordo, {socialName} declara que todos os bens
  que se comprem na {companyName} serão entregues na {destinationCountry}.'
  - 'Além disto, {socialName} deverá, na primeira solicitude da {companyName},
-  proporcionar uma prova de que todos os produtos comprados na {companyName} 
-  foram entregues na {destinationCountry}.'
-  - 'Além do anterio, {companyName} proporcionará a {socialName}
+  proporcionar uma prova de que todos os produtos comprados em {companyName}
+  foram entregues em {destinationCountry}.'
+  - 'Além do anterior, {companyName} proporcionará a {socialName}
 um resumo mensal onde se incluem todas as faturas (e as entregas correspondentes).
 {socialName} assinará e devolverá o resumo mensal à {companyName},
 dentro dos 5 dias posteriores à receção do resumo.'
--- a/print/templates/reports/incoterms-authorization/sql/address.sql
+++ b/print/templates/reports/incoterms-authorization/sql/address.sql
@ -0,0 +1,9 @@
+SELECT
+    a.nickname,
+    a.street,
+    a.postalCode,
+    a.city,
+    p.name province
+FROM address a
+    LEFT JOIN province p ON p.id = a.provinceFk
+WHERE a.id = ?
--- a/print/templates/reports/invoice/assets/css/style.css
+++ b/print/templates/reports/invoice/assets/css/style.css
@ -44,3 +44,7 @@ h2 {
 .phytosanitary-info {
    margin-top: 10px
 }
+
+.panel {
+    margin-bottom: 0px;
+}