diff --git a/CHANGELOG.md b/CHANGELOG.md
index 708ebbc4b..8967a1633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 -
 
-## [2324.01] - 2023-06-08
+## [2324.01] - 2023-06-15
 
 ### Added
 - (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
diff --git a/README.md b/README.md
index f73a8551b..59f5dbcf7 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :)
 
 Required applications.
 
-* Node.js = 14.x LTS
+* Node.js >= 16.x LTS
 * Docker
 * Git
 
@@ -71,7 +71,7 @@ $ npm run test:e2e
 
 Open Visual Studio Code, press Ctrl+P and paste the following commands.
 
-In Visual Studio Code we use the ESLint extension. 
+In Visual Studio Code we use the ESLint extension.
 ```
 ext install dbaeumer.vscode-eslint
 ```
diff --git a/back/methods/docuware/specs/upload.spec.js b/back/methods/docuware/specs/upload.spec.js
index 7ac873e95..3b8c55a50 100644
--- a/back/methods/docuware/specs/upload.spec.js
+++ b/back/methods/docuware/specs/upload.spec.js
@@ -2,8 +2,9 @@ const models = require('vn-loopback/server/server').models;
 
 describe('docuware upload()', () => {
     const userId = 9;
-    const ticketId = 10;
+    const ticketIds = [10];
     const ctx = {
+        args: {ticketIds},
         req: {
             getLocale: () => {
                 return 'en';
@@ -27,7 +28,7 @@ describe('docuware upload()', () => {
 
         let error;
         try {
-            await models.Docuware.upload(ctx, ticketId, fileCabinetName);
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName);
         } catch (e) {
             error = e.message;
         }
diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js
index ea9ee3622..096301e56 100644
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@@ -3,34 +3,34 @@ const axios = require('axios');
 
 module.exports = Self => {
     Self.remoteMethodCtx('upload', {
-        description: 'Upload an docuware PDF',
+        description: 'Upload docuware PDFs',
         accessType: 'WRITE',
         accepts: [
             {
-                arg: 'id',
-                type: 'number',
-                description: 'The ticket id',
-                http: {source: 'path'}
+                arg: 'ticketIds',
+                type: ['number'],
+                description: 'The ticket ids',
+                required: true
             },
             {
                 arg: 'fileCabinet',
                 type: 'string',
-                description: 'The file cabinet'
-            },
-            {
-                arg: 'dialog',
-                type: 'string',
-                description: 'The dialog'
+                description: 'The file cabinet',
+                required: true
             }
         ],
-        returns: [],
+        returns: {
+            type: 'object',
+            root: true
+        },
         http: {
-            path: `/:id/upload`,
+            path: `/upload`,
             verb: 'POST'
         }
     });
 
-    Self.upload = async function(ctx, id, fileCabinet) {
+    Self.upload = async function(ctx, ticketIds, fileCabinet) {
+        delete ctx.args.ticketIds;
         const models = Self.app.models;
         const action = 'store';
 
@@ -38,104 +38,114 @@ module.exports = Self => {
         const fileCabinetId = await Self.getFileCabinet(fileCabinet);
         const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
 
-        // get delivery note
-        const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
-            id,
-            type: 'deliveryNote'
-        });
-
-        // get ticket data
-        const ticket = await models.Ticket.findById(id, {
-            include: [{
-                relation: 'client',
-                scope: {
-                    fields: ['id', 'socialName', 'fi']
-                }
-            }]
-        });
-
-        // upload file
-        const templateJson = {
-            'Fields': [
-                {
-                    'FieldName': 'N__ALBAR_N',
-                    'ItemElementName': 'string',
-                    'Item': id,
-                },
-                {
-                    'FieldName': 'CIF_PROVEEDOR',
-                    'ItemElementName': 'string',
-                    'Item': ticket.client().fi,
-                },
-                {
-                    'FieldName': 'CODIGO_PROVEEDOR',
-                    'ItemElementName': 'string',
-                    'Item': ticket.client().id,
-                },
-                {
-                    'FieldName': 'NOMBRE_PROVEEDOR',
-                    'ItemElementName': 'string',
-                    'Item': ticket.client().socialName,
-                },
-                {
-                    'FieldName': 'FECHA_FACTURA',
-                    'ItemElementName': 'date',
-                    'Item': ticket.shipped,
-                },
-                {
-                    'FieldName': 'TOTAL_FACTURA',
-                    'ItemElementName': 'Decimal',
-                    'Item': ticket.totalWithVat,
-                },
-                {
-                    'FieldName': 'ESTADO',
-                    'ItemElementName': 'string',
-                    'Item': 'Pendiente procesar',
-                },
-                {
-                    'FieldName': 'FIRMA_',
-                    'ItemElementName': 'string',
-                    'Item': 'Si',
-                },
-                {
-                    'FieldName': 'FILTRO_TABLET',
-                    'ItemElementName': 'string',
-                    'Item': 'Tablet1',
-                }
-            ]
-        };
-
-        if (process.env.NODE_ENV != 'production')
-            throw new UserError('Action not allowed on the test environment');
-
-        // delete old
-        const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false);
-        if (docuwareFile) {
-            const deleteJson = {
-                'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
-            };
-            const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
-            await axios.put(deleteUri, deleteJson, options.headers);
-        }
-
-        const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
-        const FormData = require('form-data');
-        const data = new FormData();
-
-        data.append('document', JSON.stringify(templateJson), 'schema.json');
-        data.append('file[]', deliveryNote[0], 'file.pdf');
-        const uploadOptions = {
-            headers: {
-                'Content-Type': 'multipart/form-data',
-                'X-File-ModifiedDate': Date.vnNew(),
-                'Cookie': options.headers.headers.Cookie,
-                ...data.getHeaders()
-            },
-        };
-
-        return await axios.post(uploadUri, data, uploadOptions)
-            .catch(() => {
-                throw new UserError('Failed to upload file');
+        const uploaded = [];
+        for (id of ticketIds) {
+            // get delivery note
+            ctx.args.id = id;
+            const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
+                id,
+                type: 'deliveryNote'
             });
+            // get ticket data
+            const ticket = await models.Ticket.findById(id, {
+                include: [{
+                    relation: 'client',
+                    scope: {
+                        fields: ['id', 'name', 'fi']
+                    }
+                }]
+            });
+
+            // upload file
+            const templateJson = {
+                'Fields': [
+                    {
+                        'FieldName': 'N__ALBAR_N',
+                        'ItemElementName': 'string',
+                        'Item': id,
+                    },
+                    {
+                        'FieldName': 'CIF_PROVEEDOR',
+                        'ItemElementName': 'string',
+                        'Item': ticket.client().fi,
+                    },
+                    {
+                        'FieldName': 'CODIGO_PROVEEDOR',
+                        'ItemElementName': 'string',
+                        'Item': ticket.client().id,
+                    },
+                    {
+                        'FieldName': 'NOMBRE_PROVEEDOR',
+                        'ItemElementName': 'string',
+                        'Item': ticket.client().name + ' - ' + id,
+                    },
+                    {
+                        'FieldName': 'FECHA_FACTURA',
+                        'ItemElementName': 'date',
+                        'Item': ticket.shipped,
+                    },
+                    {
+                        'FieldName': 'TOTAL_FACTURA',
+                        'ItemElementName': 'Decimal',
+                        'Item': ticket.totalWithVat,
+                    },
+                    {
+                        'FieldName': 'ESTADO',
+                        'ItemElementName': 'string',
+                        'Item': 'Pendiente procesar',
+                    },
+                    {
+                        'FieldName': 'FIRMA_',
+                        'ItemElementName': 'string',
+                        'Item': 'Si',
+                    },
+                    {
+                        'FieldName': 'FILTRO_TABLET',
+                        'ItemElementName': 'string',
+                        'Item': 'Tablet1',
+                    }
+                ]
+            };
+
+            if (process.env.NODE_ENV != 'production')
+                throw new UserError('Action not allowed on the test environment');
+
+            // delete old
+            const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false);
+            if (docuwareFile) {
+                const deleteJson = {
+                    'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
+                };
+                const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
+                await axios.put(deleteUri, deleteJson, options.headers);
+            }
+
+            const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
+            const FormData = require('form-data');
+            const data = new FormData();
+
+            data.append('document', JSON.stringify(templateJson), 'schema.json');
+            data.append('file[]', deliveryNote[0], 'file.pdf');
+            const uploadOptions = {
+                headers: {
+                    'Content-Type': 'multipart/form-data',
+                    'X-File-ModifiedDate': Date.vnNew(),
+                    'Cookie': options.headers.headers.Cookie,
+                    ...data.getHeaders()
+                },
+            };
+
+            try {
+                await axios.post(uploadUri, data, uploadOptions);
+            } catch (err) {
+                const $t = ctx.req.__;
+                const message = $t('Failed to upload delivery note', {id});
+                if (uploaded.length)
+                    await models.TicketTracking.setDelivered(ctx, uploaded);
+                throw new UserError(message);
+            }
+            uploaded.push(id);
+        }
+        return models.TicketTracking.setDelivered(ctx, ticketIds);
     };
 };
diff --git a/back/methods/vn-user/signIn.js b/back/methods/vn-user/signIn.js
index 690ba7650..c98f1da54 100644
--- a/back/methods/vn-user/signIn.js
+++ b/back/methods/vn-user/signIn.js
@@ -62,10 +62,9 @@ module.exports = Self => {
                     scopes: ['change-password'],
                     userId: vnUser.id
                 });
-                throw new UserError('Pass expired', 'passExpired', {
-                    id: vnUser.id,
-                    token: changePasswordToken.id
-                });
+                const err = new UserError('Pass expired', 'passExpired');
+                err.details = {token: changePasswordToken};
+                throw err;
             }
 
             try {
diff --git a/back/process.yml b/back/process.yml
index 38d2b9eaf..a29323240 100644
--- a/back/process.yml
+++ b/back/process.yml
@@ -4,4 +4,4 @@ apps:
     instances: 1
     max_restarts: 3
     restart_delay: 15000
-    node_args: --tls-min-v1.0
+    node_args: --tls-min-v1.0 --openssl-legacy-provider
diff --git a/db/changes/232601/.gitkeep b/db/changes/232601/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/db/changes/232601/00-packingSiteAdvanced.sql b/db/changes/232601/00-packingSiteAdvanced.sql
new file mode 100644
index 000000000..0e33744cd
--- /dev/null
+++ b/db/changes/232601/00-packingSiteAdvanced.sql
@@ -0,0 +1,71 @@
+CREATE TABLE `vn`.`packingSiteAdvanced` (
+  `ticketFk` int(11),
+  `workerFk` int(10) unsigned,
+  PRIMARY KEY (`ticketFk`),
+  KEY `packingSiteAdvanced_FK_1` (`workerFk`),
+  CONSTRAINT `packingSiteAdvanced_FK` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `packingSiteAdvanced_FK_1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('PackingSiteAdvanced', '*', '*', 'ALLOW', 'ROLE', 'production');
+
+ DROP PROCEDURE IF EXISTS `vn`.`packingSite_startCollection`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`packingSite_startCollection`(vSelf INT, vTicketFk INT)
+proc: BEGIN
+/**
+ * @param vSelf packingSite id
+ * @param vTicketFk A ticket id from the collection to start
+ */
+	DECLARE vExists BOOL;
+    DECLARE vIsAdvanced BOOL;
+    DECLARE vNewCollectionFk INT;
+    DECLARE vOldCollectionFk INT;
+    DECLARE vIsPackingByOther BOOL;
+
+    SELECT id, collectionFk
+        INTO vExists, vOldCollectionFk
+        FROM packingSite
+        WHERE id = vSelf;
+
+    IF NOT vExists THEN
+        CALL util.throw('packingSiteNotExists');
+    END IF;
+
+    SELECT COUNT(*) > 0
+        INTO vIsAdvanced
+        FROM packingSiteAdvanced
+        WHERE ticketFk = vTicketFk;
+
+    IF vIsAdvanced THEN
+        LEAVE proc;
+    END IF;
+
+    SELECT collectionFk INTO vNewCollectionFk
+        FROM ticketCollection WHERE ticketFk = vTicketFk;
+
+    IF vOldCollectionFk IS NOT NULL
+    AND vOldCollectionFk <> vNewCollectionFk THEN
+        SELECT COUNT(*) > 0
+            INTO vIsPackingByOther
+            FROM packingSite
+            WHERE id <> vSelf
+                AND collectionFk = vOldCollectionFk;
+
+        IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) THEN
+            CALL util.throw('cannotChangeCollection');
+        END IF;
+    END IF;
+
+    UPDATE packingSite SET collectionFk = vNewCollectionFk
+        WHERE id = vSelf;
+END$$
+DELIMITER ;
+
+
+
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 1a0590157..9c930222f 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2736,7 +2736,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (1, 'print-email', 'notification fixture one'),
         (2, 'invoice-electronic', 'A electronic invoice has been generated'),
         (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'),
-        (4, 'supplier-pay-method-update', 'A supplier pay method has been updated');
+        (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
+        (5, 'modified-entry', 'An entry has been modified');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
     VALUES
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 039f6ee8f..b8eaa99a1 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -311,9 +311,9 @@ export default {
     },
     clientDefaulter: {
         anyClient: 'vn-client-defaulter tbody > tr',
-        firstClientName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(2) > span',
-        firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(3) > span',
-        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]',
+        firstClientName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(2) > span',
+        firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(3) > span',
+        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]',
         allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check',
         addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]',
         observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]',
@@ -334,15 +334,15 @@ export default {
     },
     itemsIndex: {
         createItemButton: `vn-float-button`,
-        firstSearchResult: 'vn-item-index tbody tr:nth-child(1)',
+        firstSearchResult: 'vn-item-index tbody tr:nth-child(2)',
         searchResult: 'vn-item-index tbody tr:not(.empty-rows)',
-        firstResultPreviewButton: 'vn-item-index tbody > :nth-child(1) .buttons > [icon="preview"]',
+        firstResultPreviewButton: 'vn-item-index tbody > :nth-child(2) .buttons > [icon="preview"]',
         searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]',
         acceptClonationAlertButton: '.vn-confirm.shown [response="accept"]',
         closeItemSummaryPreview: '.vn-popup.shown',
         shownColumns: 'vn-item-index vn-button[id="shownColumns"]',
         shownColumnsList: '.vn-popover.shown .content',
-        firstItemImage: 'vn-item-index tbody > tr:nth-child(1) > td:nth-child(1) > img',
+        firstItemImage: 'vn-item-index tbody > tr:nth-child(2) > td:nth-child(1) > img',
         firstItemImageTd: 'vn-item-index smart-table tr:nth-child(1) td:nth-child(1)',
         firstItemId: 'vn-item-index tbody > tr:nth-child(1) > td:nth-child(2)',
         idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Identifier"]',
@@ -523,11 +523,11 @@ 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(4)',
-        fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)',
+        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)',
         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"]',
+        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"]',
         acceptDeleteTurn: '.vn-confirm.shown button[response="accept"]'
     },
     createTicketView: {
@@ -572,8 +572,8 @@ export default {
         submitNotesButton: 'button[type=submit]'
     },
     ticketExpedition: {
-        firstSaleCheckbox: 'vn-ticket-expedition tr:nth-child(1) vn-check[ng-model="expedition.checked"]',
-        thirdSaleCheckbox: 'vn-ticket-expedition tr:nth-child(3) vn-check[ng-model="expedition.checked"]',
+        firstSaleCheckbox: 'vn-ticket-expedition tr:nth-child(2) vn-check[ng-model="expedition.checked"]',
+        thirdSaleCheckbox: 'vn-ticket-expedition tr:nth-child(4) vn-check[ng-model="expedition.checked"]',
         deleteExpeditionButton: 'vn-ticket-expedition slot-actions > vn-button[icon="delete"]',
         moveExpeditionButton: 'vn-ticket-expedition slot-actions > vn-button[icon="keyboard_arrow_down"]',
         moreMenuWithoutRoute: 'vn-item[name="withoutRoute"]',
@@ -712,7 +712,7 @@ export default {
         problems: 'vn-check[label="With problems"]',
         tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
         moveButton: 'vn-button[vn-tooltip="Future tickets"]',
-        firstCheck: 'tbody > tr:nth-child(1) > td > vn-check',
+        firstCheck: 'tbody > tr:nth-child(2) > td > vn-check',
         multiCheck: 'vn-multi-check',
         tableId: 'vn-textfield[name="id"]',
         tableFutureId: 'vn-textfield[name="futureId"]',
@@ -736,7 +736,7 @@ export default {
         tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
         moveButton: 'vn-button[vn-tooltip="Advance tickets"]',
         acceptButton: '.vn-confirm.shown button[response="accept"]',
-        firstCheck: 'tbody > tr:nth-child(1) > td > vn-check',
+        firstCheck: 'tbody > tr:nth-child(2) > td > vn-check',
         tableId: 'vn-textfield[name="id"]',
         tableFutureId: 'vn-textfield[name="futureId"]',
         tableLiters: 'vn-textfield[name="liters"]',
@@ -810,7 +810,7 @@ export default {
     claimAction: {
         importClaimButton: 'vn-claim-action vn-button[label="Import claim"]',
         anyLine: 'vn-claim-action vn-tbody > vn-tr',
-        firstDeleteLine: 'vn-claim-action tr:nth-child(1) vn-icon-button[icon="delete"]',
+        firstDeleteLine: 'vn-claim-action tr:nth-child(2) vn-icon-button[icon="delete"]',
         isPaidWithManaCheckbox: 'vn-claim-action vn-check[ng-model="$ctrl.claim.isChargedToMana"]'
     },
     ordersIndex: {
@@ -1216,7 +1216,7 @@ export default {
         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)',
+        firstBuy: 'vn-entry-latest-buys tbody > tr:nth-child(2)',
         allBuysCheckBox: 'vn-entry-latest-buys thead vn-check',
         secondBuyCheckBox: 'vn-entry-latest-buys tbody tr:nth-child(2) vn-check[ng-model="buy.checked"]',
         editBuysButton: 'vn-entry-latest-buys vn-button[icon="edit"]',
diff --git a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
index 526afa140..9c37ce9ba 100644
--- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
+++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
@@ -19,15 +19,14 @@ describe('SmartTable SearchBar integration', () => {
         await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
         await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
         await page.waitToClick(selectors.itemsIndex.advancedSearchButton);
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4);
 
         await page.reload({
             waitUntil: 'networkidle2'
         });
 
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3);
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4);
 
-        await page.waitToClick(selectors.itemsIndex.advancedSmartTableButton);
         await page.write(selectors.itemsIndex.advancedSmartTableGrouping, '1');
         await page.keyboard.press('Enter');
         await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
@@ -36,7 +35,7 @@ describe('SmartTable SearchBar integration', () => {
             waitUntil: 'networkidle2'
         });
 
-        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2);
+        await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1);
     });
 
     it('should filter in section without smart-table and search in searchBar go to zone section', async() => {
diff --git a/e2e/paths/02-client/21_defaulter.spec.js b/e2e/paths/02-client/21_defaulter.spec.js
index 97e62abef..2bb3d6254 100644
--- a/e2e/paths/02-client/21_defaulter.spec.js
+++ b/e2e/paths/02-client/21_defaulter.spec.js
@@ -19,7 +19,7 @@ describe('Client defaulter path', () => {
     it('should count the amount of clients in the turns section', async() => {
         const result = await page.countElement(selectors.clientDefaulter.anyClient);
 
-        expect(result).toEqual(5);
+        expect(result).toEqual(6);
     });
 
     it('should check contain expected client', async() => {
diff --git a/e2e/paths/04-item/01_summary.spec.js b/e2e/paths/04-item/01_summary.spec.js
index e24fa6a9f..e09ecb778 100644
--- a/e2e/paths/04-item/01_summary.spec.js
+++ b/e2e/paths/04-item/01_summary.spec.js
@@ -18,11 +18,11 @@ describe('Item summary path', () => {
         await page.doSearch('Ranged weapon');
         const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
 
-        await page.waitForTextInElement(selectors.itemsIndex.searchResult, 'Ranged weapon');
+        await page.waitForTextInElement(selectors.itemsIndex.firstSearchResult, 'Ranged weapon');
         await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
         const isVisible = await page.isVisible(selectors.itemSummary.basicData);
 
-        expect(resultsCount).toBe(3);
+        expect(resultsCount).toBe(4);
         expect(isVisible).toBeTruthy();
     });
 
@@ -66,7 +66,7 @@ describe('Item summary path', () => {
         await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
         await page.waitForSelector(selectors.itemSummary.basicData, {visible: true});
 
-        expect(resultsCount).toBe(2);
+        expect(resultsCount).toBe(3);
     });
 
     it(`should now check the item summary preview shows fields from basic data`, async() => {
diff --git a/e2e/paths/04-item/10_item_log.spec.js b/e2e/paths/04-item/10_item_log.spec.js
index dc467044d..c88fbd337 100644
--- a/e2e/paths/04-item/10_item_log.spec.js
+++ b/e2e/paths/04-item/10_item_log.spec.js
@@ -18,7 +18,7 @@ describe('Item log path', () => {
         await page.doSearch('Knowledge artifact');
         const nResults = await page.countElement(selectors.itemsIndex.searchResult);
 
-        expect(nResults).toEqual(0);
+        expect(nResults).toEqual(1);
     });
 
     it('should access to the create item view by clicking the create floating button', async() => {
diff --git a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
index edccd5561..b97576940 100644
--- a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
+++ b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
@@ -27,6 +27,6 @@ describe('Ticket expeditions and log path', () => {
         const result = await page
             .countElement(selectors.ticketExpedition.expeditionRow);
 
-        expect(result).toEqual(3);
+        expect(result).toEqual(4);
     });
 });
diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
index 0ba57aa9d..a9cce2ead 100644
--- 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(6);
+        expect(result).toEqual(7);
     });
 
     it('should go back to the ticket index then search and access a ticket summary', async() => {
@@ -89,7 +89,7 @@ describe('Ticket descriptor path', () => {
         await page.doSearch('11');
         const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
 
-        expect(nResults).toEqual(1);
+        expect(nResults).toEqual(2);
     });
 
     it('should delete the weekly ticket 11', async() => {
@@ -104,7 +104,7 @@ describe('Ticket descriptor path', () => {
         await page.doSearch();
         const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
 
-        expect(nResults).toEqual(6);
+        expect(nResults).toEqual(7);
     });
 
     it('should update the agency then remove it afterwards', async() => {
diff --git a/e2e/paths/05-ticket/20_moveExpedition.spec.js b/e2e/paths/05-ticket/20_moveExpedition.spec.js
index cf1c5ded3..ae23c9c99 100644
--- a/e2e/paths/05-ticket/20_moveExpedition.spec.js
+++ b/e2e/paths/05-ticket/20_moveExpedition.spec.js
@@ -29,7 +29,7 @@ describe('Ticket expeditions', () => {
         const result = await page
             .countElement(selectors.ticketExpedition.expeditionRow);
 
-        expect(result).toEqual(1);
+        expect(result).toEqual(2);
     });
 
     it(`should move one expedition to new ticket with route`, async() => {
@@ -45,6 +45,6 @@ describe('Ticket expeditions', () => {
         const result = await page
             .countElement(selectors.ticketExpedition.expeditionRow);
 
-        expect(result).toEqual(1);
+        expect(result).toEqual(2);
     });
 });
diff --git a/e2e/paths/05-ticket/21_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js
index c854dcbaf..7b7d478f7 100644
--- a/e2e/paths/05-ticket/21_future.spec.js
+++ b/e2e/paths/05-ticket/21_future.spec.js
@@ -87,7 +87,7 @@ describe('Ticket Future path', () => {
         await page.clearInput(selectors.ticketFuture.futureState);
         await page.waitToClick(selectors.ticketFuture.submit);
 
-        await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4);
+        await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 5);
         await page.waitToClick(selectors.ticketFuture.multiCheck);
         await page.waitToClick(selectors.ticketFuture.firstCheck);
         await page.waitToClick(selectors.ticketFuture.moveButton);
diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js
index b2380a62f..c3b927c62 100644
--- a/front/core/components/smart-table/index.js
+++ b/front/core/components/smart-table/index.js
@@ -40,6 +40,8 @@ export default class SmartTable extends Component {
         this._options = options;
         if (!options) return;
 
+        options.defaultSearch = true;
+
         if (options.defaultSearch)
             this.displaySearch();
 
diff --git a/front/salix/components/change-password/index.js b/front/salix/components/change-password/index.js
index 3d660e894..baa9d96e5 100644
--- a/front/salix/components/change-password/index.js
+++ b/front/salix/components/change-password/index.js
@@ -15,7 +15,7 @@ export default class Controller {
     }
 
     $onInit() {
-        if (!this.$state.params || !this.$state.params.id || !this.$state.params.token)
+        if (!this.$state.params.id)
             this.$state.go('login');
 
         this.$http.get('UserPasswords/findOne')
@@ -25,7 +25,7 @@ export default class Controller {
     }
 
     submit() {
-        const id = this.$state.params.id;
+        const userId = this.$state.params.userId;
         const newPassword = this.newPassword;
         const oldPassword = this.oldPassword;
 
@@ -35,12 +35,12 @@ export default class Controller {
             throw new UserError(`Passwords don't match`);
 
         const headers = {
-            Authorization: this.$state.params.token
+            Authorization: this.$state.params.id
         };
 
         this.$http.post('VnUsers/change-password',
             {
-                id,
+                id: userId,
                 oldPassword,
                 newPassword
             },
diff --git a/front/salix/components/login/index.js b/front/salix/components/login/index.js
index 0412f3b74..8e8f08244 100644
--- a/front/salix/components/login/index.js
+++ b/front/salix/components/login/index.js
@@ -27,10 +27,9 @@ export default class Controller {
                 this.loading = false;
                 this.password = '';
                 this.focusUser();
-                if (req?.data?.error?.code == 'passExpired') {
-                    const [args] = req.data.error.translateArgs;
-                    this.$state.go('change-password', args);
-                }
+                const err = req.data?.error;
+                if (err?.code == 'passExpired')
+                    this.$state.go('change-password', err.details.token);
 
                 throw req;
             });
diff --git a/front/salix/routes.js b/front/salix/routes.js
index d6dea244a..675da719a 100644
--- a/front/salix/routes.js
+++ b/front/salix/routes.js
@@ -38,7 +38,7 @@ function config($stateProvider, $urlRouterProvider) {
         })
         .state('change-password', {
             parent: 'outLayout',
-            url: '/change-password?id&token',
+            url: '/change-password?id&userId',
             description: 'Change password',
             template: '<vn-change-password></vn-change-password>'
         })
diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js
index f92e1ea09..22b535f62 100644
--- a/loopback/common/models/vn-model.js
+++ b/loopback/common/models/vn-model.js
@@ -200,22 +200,20 @@ module.exports = function(Self) {
             const connector = this.dataSource.connector;
             let conn;
             let res;
-            const opts = Object.assign({}, options);
 
             try {
                 if (userId) {
-                    conn = await new Promise((resolve, reject) => {
-                        connector.client.getConnection(function(err, conn) {
-                            if (err)
-                                reject(err);
-                            else
-                                resolve(conn);
+                    if (!options.transaction) {
+                        options = Object.assign({}, options);
+                        conn = await new Promise((resolve, reject) => {
+                            connector.client.getConnection(function(err, conn) {
+                                if (err)
+                                    reject(err);
+                                else
+                                    resolve(conn);
+                            });
                         });
-                    });
-
-                    const opts = Object.assign({}, options);
-                    if (!opts.transaction) {
-                        opts.transaction = {
+                        options.transaction = {
                             connection: conn,
                             connector
                         };
@@ -223,15 +221,14 @@ module.exports = function(Self) {
 
                     await connector.executeP(
                         'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))',
-                        [userId], opts
+                        [userId], options
                     );
                 }
 
-                res = await connector.executeP(query, params, opts);
+                res = await connector.executeP(query, params, options);
 
-                if (userId) {
-                    await connector.executeP('CALL account.myUser_logout()', null, opts);
-                }
+                if (userId)
+                    await connector.executeP('CALL account.myUser_logout()', null, options);
             } finally {
                 if (conn) conn.release();
             }
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 8bc9d4056..43ff4b86a 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -174,5 +174,6 @@
 	"A claim with that sale already exists": "A claim with that sale already exists",
 	"Pass expired": "The password has expired, change it from Salix",
 	"Can't transfer claimed sales": "Can't transfer claimed sales",
-	"Invalid quantity": "Invalid quantity"
+	"Invalid quantity": "Invalid quantity",
+    "Failed to upload delivery note": "Error to upload delivery note {{id}}"
 }
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index cfb9c1438..895d087dc 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -258,7 +258,7 @@
 	"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",
+	"Failed to upload delivery note": "Error al subir albarán {{id}}",
 	"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",
diff --git a/modules/account/back/locale/account/en.yml b/modules/account/back/locale/account/en.yml
new file mode 100644
index 000000000..221afef5f
--- /dev/null
+++ b/modules/account/back/locale/account/en.yml
@@ -0,0 +1,3 @@
+name: account
+columns:
+    id: id
diff --git a/modules/account/back/locale/account/es.yml b/modules/account/back/locale/account/es.yml
new file mode 100644
index 000000000..a79b1f40c
--- /dev/null
+++ b/modules/account/back/locale/account/es.yml
@@ -0,0 +1,3 @@
+name: cuenta
+columns:
+    id: id
diff --git a/modules/account/back/locale/mail-alias-account/en.yml b/modules/account/back/locale/mail-alias-account/en.yml
new file mode 100644
index 000000000..bf805d66f
--- /dev/null
+++ b/modules/account/back/locale/mail-alias-account/en.yml
@@ -0,0 +1,5 @@
+name: mail alias
+columns:
+    id: id
+    mailAlias: alias
+    account: account
diff --git a/modules/account/back/locale/mail-alias-account/es.yml b/modules/account/back/locale/mail-alias-account/es.yml
new file mode 100644
index 000000000..b53ade996
--- /dev/null
+++ b/modules/account/back/locale/mail-alias-account/es.yml
@@ -0,0 +1,5 @@
+name: alias de correo
+columns:
+    id: id
+    mailAlias: alias
+    account: cuenta
diff --git a/modules/account/front/accounts/index.js b/modules/account/front/accounts/index.js
index 7a341b0b0..0e78ab8d6 100644
--- a/modules/account/front/accounts/index.js
+++ b/modules/account/front/accounts/index.js
@@ -5,8 +5,7 @@ import UserError from 'core/lib/user-error';
 export default class Controller extends Section {
     onSynchronizeAll() {
         this.vnApp.showSuccess(this.$t('Synchronizing in the background'));
-        this.$http.patch(`Accounts/syncAll`)
-            .then(() => this.vnApp.showSuccess(this.$t('Users synchronized!')));
+        this.$http.patch(`Accounts/syncAll`);
     }
 
     onUserSync() {
diff --git a/modules/client/back/methods/tpv-transaction/confirm.js b/modules/client/back/methods/tpv-transaction/confirm.js
index 4faa21bb5..41229a1fd 100644
--- a/modules/client/back/methods/tpv-transaction/confirm.js
+++ b/modules/client/back/methods/tpv-transaction/confirm.js
@@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
 const base64url = require('base64url');
 
 module.exports = Self => {
-    Self.remoteMethodCtx('confirm', {
+    Self.remoteMethod('confirm', {
         description: 'Confirms electronic payment transaction',
         accessType: 'WRITE',
         accepts: [
@@ -30,7 +30,7 @@ module.exports = Self => {
         }
     });
 
-    Self.confirm = async(ctx, signatureVersion, merchantParameters, signature) => {
+    Self.confirm = async(signatureVersion, merchantParameters, signature) => {
         const $ = Self.app.models;
         let transaction;
 
@@ -83,7 +83,7 @@ module.exports = Self => {
                     params['Ds_Currency'],
                     params['Ds_Response'],
                     params['Ds_ErrorCode']
-                ], {userId: ctx.req.accessToken.userId});
+                ]);
 
             return true;
         } catch (err) {
diff --git a/modules/entry/back/methods/entry/addFromBuy.js b/modules/entry/back/methods/entry/addFromBuy.js
index f7e1b637e..bfbd1b416 100644
--- a/modules/entry/back/methods/entry/addFromBuy.js
+++ b/modules/entry/back/methods/entry/addFromBuy.js
@@ -46,7 +46,7 @@ module.exports = Self => {
         }
 
         try {
-            let buy = await models.Buy.findOne({where: {entryFk: args.id}}, myOptions);
+            let buy = await models.Buy.findOne({where: {entryFk: args.id, itemFk: args.item}}, myOptions);
             if (buy)
                 await buy.updateAttribute('printedStickers', args.printedStickers, myOptions);
             else {
diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index 6d5b16329..3f0a10650 100644
--- a/modules/invoiceOut/front/global-invoicing/index.html
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -118,7 +118,8 @@
                 label="Company"
                 show-field="code"
                 value-field="id"
-                ng-model="$ctrl.companyFk">
+                ng-model="$ctrl.companyFk"
+                on-change="$ctrl.getInvoiceDate(value)">
             </vn-autocomplete>
             <vn-autocomplete
                 url="Printers"
diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
index 0aa6a4a24..5a078dfbb 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -7,23 +7,29 @@ class Controller extends Section {
     $onInit() {
         const date = Date.vnNew();
         Object.assign(this, {
-            maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
-            clientsToInvoice: 'all',
+          maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
+          clientsToInvoice: 'all',
         });
 
         this.$http.get('UserConfigs/getUserConfig')
-            .then(res => {
-                this.companyFk = res.data.companyFk;
-                const params = {
-                    companyFk: this.companyFk
-                };
-                return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
-            })
-            .then(res => {
-                this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
-                this.invoiceDate = this.minInvoicingDate;
-            });
-    }
+          .then(res => {
+            this.companyFk = res.data.companyFk;
+            this.getInvoiceDate(this.companyFk);
+          });
+      }
+
+      getInvoiceDate(companyFk) {
+        const params = { companyFk: companyFk };
+        this.fetchInvoiceDate(params);
+      }
+
+      fetchInvoiceDate(params) {
+        this.$http.get('InvoiceOuts/getInvoiceDate', { params })
+          .then(res => {
+            this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
+            this.invoiceDate = this.minInvoicingDate;
+          });
+      }
 
     stopInvoicing() {
         this.status = 'stopping';
@@ -42,7 +48,7 @@ class Controller extends Section {
                 throw new UserError('Invoice date and the max date should be filled');
             if (this.invoiceDate < this.maxShipped)
                 throw new UserError('Invoice date can\'t be less than max date');
-            if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
+            if (this.minInvoicingDate && this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
                 throw new UserError('Exists an invoice with a previous date');
             if (!this.companyFk)
                 throw new UserError('Choose a valid company');
diff --git a/modules/invoiceOut/front/negative-bases/index.js b/modules/invoiceOut/front/negative-bases/index.js
index 1a838507c..f60668b20 100644
--- a/modules/invoiceOut/front/negative-bases/index.js
+++ b/modules/invoiceOut/front/negative-bases/index.js
@@ -19,7 +19,8 @@ export default class Controller extends Section {
         this.smartTableOptions = {
             activeButtons: {
                 search: true,
-            }, columns: [
+            },
+            columns: [
                 {
                     field: 'isActive',
                     searchable: false
diff --git a/modules/item/front/fixed-price/index.js b/modules/item/front/fixed-price/index.js
index a39cd6602..fe6788e9c 100644
--- a/modules/item/front/fixed-price/index.js
+++ b/modules/item/front/fixed-price/index.js
@@ -13,7 +13,6 @@ export default class Controller extends Section {
             activeButtons: {
                 search: true
             },
-            defaultSearch: true,
             columns: [
                 {
                     field: 'warehouseFk',
diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html
index bdd4e76ff..94a950baf 100644
--- a/modules/monitor/front/index/tickets/index.html
+++ b/modules/monitor/front/index/tickets/index.html
@@ -50,13 +50,13 @@
                         <th field="salesPersonFk">
                             <span translate>Salesperson</span>
                         </th>
-                        <th field="shippedDate" shrink-date>
+                        <th field="shippedDate" shrink-date filter-enabled="false">
                             <span translate>Date</span>
                         </th>
-                        <th field="theoreticalHour">
+                        <th field="theoreticalHour" filter-enabled="false">
                             <span translate>Theoretical</span>
                         </th>
-                        <th field="practicalHour">
+                        <th field="practicalHour" filter-enabled="false">
                             <span translate>Practical</span>
                         </th>
                         <th field="preparationHour" filter-enabled="false">
diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js
index 5fdab29b3..1fcb3a760 100644
--- a/modules/order/back/methods/order/confirm.js
+++ b/modules/order/back/methods/order/confirm.js
@@ -21,7 +21,6 @@ module.exports = Self => {
 
     Self.confirm = async(ctx, orderFk) => {
         const userId = ctx.req.accessToken.userId;
-
         const query = `CALL hedera.order_confirmWithUser(?, ?)`;
         const response = await Self.rawSql(query, [orderFk, userId], {userId});
 
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index 7a64a9aff..9384af6be 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -1,11 +1,26 @@
 <vn-auto-search
     model="model">
 </vn-auto-search>
+<vn-crud-model
+    auto-load="true"
+    url="AgencyModes"
+    data="agencyModes">
+</vn-crud-model>
+<vn-crud-model
+    auto-load="true"
+    url="Vehicles"
+    data="vehicles">
+</vn-crud-model>
+<vn-crud-model
+    auto-load="true"
+    url="Workers/activeWithInheritedRole"
+    data="activeWithInheritedRole">
+</vn-crud-model>
 <div class="vn-w-xl">
     <vn-card>
-        <smart-table 
+        <smart-table
             model="model"
-            options="$ctrl.smartTableOptions" 
+            options="$ctrl.smartTableOptions"
             expr-builder="$ctrl.exprBuilder(param, value)">
             <slot-actions>
                 <section class="header">
@@ -35,7 +50,7 @@
                     <thead>
                         <tr>
                             <th shrink>
-                                <vn-multi-check 
+                                <vn-multi-check
                                     model="model">
                                 </vn-multi-check>
                             </th>
@@ -52,19 +67,19 @@
                                 <span translate>Vehicle</span>
                             </th>
                             <th field="created" shrink-date>
-                                <span translate>Date</span>                                
+                                <span translate>Date</span>
                             </th>
                             <th field="m3" number>
-                                <span translate>m³</span>                                
+                                <span translate>m³</span>
                             </th>
                             <th field="description">
-                                <span translate>Description</span>                                
+                                <span translate>Description</span>
                             </th>
                             <th field="started">
-                                <span translate>Hour started</span>                                
+                                <span translate>Hour started</span>
                             </th>
                             <th field="finished">
-                                <span translate>Hour finished</span>                                
+                                <span translate>Hour finished</span>
                             </th>
                             <th shrink></th>
                         </tr>
@@ -74,7 +89,7 @@
                             class="clickable vn-tr search-result"
                             ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)">
                             <td shrink>
-                                <vn-check 
+                                <vn-check
                                     ng-model="route.checked"
                                     vn-click-stop>
                                 </vn-check>
@@ -83,7 +98,7 @@
                             <td>
                                 <vn-autocomplete
                                     ng-model="route.workerFk"
-                                    url="Workers/activeWithInheritedRole"
+                                    data="activeWithInheritedRole"
                                     show-field="nickname"
                                     search-function="{firstName: $search}"
                                     value-field="id"
@@ -98,25 +113,25 @@
                             <td expand>
                                 <vn-autocomplete
                                     ng-model="route.agencyModeFk"
-                                    url="AgencyModes"
+                                    data="agencyModes"
                                     show-field="name"
                                     value-field="id"
                                     on-change="$ctrl.updateAttributes(route)"
                                     vn-click-stop>
                                 </vn-autocomplete>
-                            </td>                        
+                            </td>
                             <td expand>
-                                <vn-autocomplete 
+                                <vn-autocomplete
                                     ng-model="route.vehicleFk"
-                                    url="Vehicles"
+                                    data="vehicles"
                                     show-field="numberPlate"
                                     value-field="id"
                                     on-change="$ctrl.updateAttributes(route)"
                                     vn-click-stop>
                                 </vn-autocomplete>
                             </td >
-                            <td> 
-                                <vn-date-picker 
+                            <td>
+                                <vn-date-picker
                                     ng-model="route.created"
                                     on-change="$ctrl.updateAttributes(route)">
                             </vn-horizontal>
@@ -156,7 +171,7 @@
                     </tbody>
                 </table>
             </slot-table>
-        </smart-table>  
+        </smart-table>
     </vn-card>
 </div>
 
@@ -171,7 +186,7 @@
     route="$ctrl.routeSelected">
 </vn-route-ticket-popup>
 
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
 <vn-ticket-descriptor-popover
@@ -194,7 +209,7 @@
 </div>
 
 <!-- Clonation dialog -->
-<vn-dialog class="edit" 
+<vn-dialog class="edit"
     vn-id="clonationDialog"
     on-accept="$ctrl.cloneSelectedRoutes()"
     message="Select the starting date">
@@ -210,4 +225,4 @@
         <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
         <button response="accept" translate>Clone</button>
     </tpl-buttons>
-</vn-dialog>
\ No newline at end of file
+</vn-dialog>
diff --git a/modules/supplier/back/locale/supplier-account/en.yml b/modules/supplier/back/locale/supplier-account/en.yml
index 2bce50cfa..43c4ba40d 100644
--- a/modules/supplier/back/locale/supplier-account/en.yml
+++ b/modules/supplier/back/locale/supplier-account/en.yml
@@ -5,3 +5,4 @@ columns:
     beneficiary: beneficiary
     supplierFk: supplier
     bankEntityFk: bank entity
+    accountingFk: ledger account
diff --git a/modules/supplier/back/locale/supplier-account/es.yml b/modules/supplier/back/locale/supplier-account/es.yml
index 120293c8a..9db5708a3 100644
--- a/modules/supplier/back/locale/supplier-account/es.yml
+++ b/modules/supplier/back/locale/supplier-account/es.yml
@@ -5,3 +5,4 @@ columns:
     beneficiary: beneficiario
     supplierFk: proveedor
     bankEntityFk: entidad bancaria
+    accountingFk: cuenta contable
diff --git a/modules/supplier/back/methods/supplier/getItemsPackaging.js b/modules/supplier/back/methods/supplier/getItemsPackaging.js
index 8ef80529b..c06195a55 100644
--- a/modules/supplier/back/methods/supplier/getItemsPackaging.js
+++ b/modules/supplier/back/methods/supplier/getItemsPackaging.js
@@ -26,14 +26,14 @@ module.exports = Self => {
     Self.getItemsPackaging = async(id, entry) => {
         return Self.rawSql(`
             WITH entryTmp AS (
-                SELECT i.id, SUM(b.quantity) quantity
+                SELECT i.id, SUM(b.quantity) quantity, SUM(b.printedStickers) printedStickers
                     FROM vn.entry e
                         JOIN vn.buy b ON b.entryFk = e.id
                         JOIN vn.supplier s ON s.id = e.supplierFk
                         JOIN vn.item i ON i.id = b.itemFk
                     WHERE e.id = ?  AND e.supplierFk = ?
                     GROUP BY i.id
-            ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal
+            ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers
                 FROM vn.buy b
                     JOIN vn.item i ON i.id = b.itemFk
                     JOIN vn.entry e ON e.id = b.entryFk
diff --git a/modules/ticket/back/locale/ticket-request/en.yml b/modules/ticket/back/locale/ticket-request/en.yml
index f381e0c9d..fc9210501 100644
--- a/modules/ticket/back/locale/ticket-request/en.yml
+++ b/modules/ticket/back/locale/ticket-request/en.yml
@@ -2,14 +2,17 @@ name: request
 columns:
     id: id
     description: description
-    created: created
+    buyerCode: buyer
     quantity: quantity
     price: price
-    isOk: ok
-    response: response
-    saleFk: sale
-    ticketFk: ticket
-    attenderFk: attender
-    requesterFk: requester
     itemFk: item
-
+    clientFk: client
+    response: response
+    total: total
+    buyed: buyed
+    saleFk: sale
+    created: created
+    isOk: ok
+    requesterFk: requester
+    attenderFk: attender
+    ticketFk: ticket
diff --git a/modules/ticket/back/locale/ticket-request/es.yml b/modules/ticket/back/locale/ticket-request/es.yml
index 5504448bf..fd89ddf60 100644
--- a/modules/ticket/back/locale/ticket-request/es.yml
+++ b/modules/ticket/back/locale/ticket-request/es.yml
@@ -1,15 +1,18 @@
-name: peticion
+name: petición
 columns:
     id: id
     description: descripción
-    created: creado
+    buyerCode: comprador
     quantity: cantidad
     price: precio
-    isOk: ok
-    response: respuesta
-    saleFk: línea
-    ticketFk: ticket
-    attenderFk: asistente
-    requesterFk: solicitante
     itemFk: artículo
-
+    clientFk: cliente
+    response: respuesta
+    total: total
+    buyed: comprado
+    saleFk: línea
+    created: creado
+    isOk: ok
+    requesterFk: solicitante
+    attenderFk: asistente
+    ticketFk: ticket
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index bee01a875..3c7e12eea 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -100,5 +100,8 @@
     },
     "TicketConfig": {
         "dataSource": "vn"
+    },
+    "PackingSiteAdvanced": {
+        "dataSource": "vn"
     }
 }
diff --git a/modules/ticket/back/models/packing-site-advanced.json b/modules/ticket/back/models/packing-site-advanced.json
new file mode 100644
index 000000000..f48cbf412
--- /dev/null
+++ b/modules/ticket/back/models/packing-site-advanced.json
@@ -0,0 +1,18 @@
+{
+    "name": "PackingSiteAdvanced",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "packingSiteAdvanced"
+        }
+    },
+    "properties": {
+        "ticketFk": {
+            "id": true,
+            "type": "number"
+        },
+        "workerFk": {
+            "type": "number"
+        }
+    }
+}
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index 835f395a8..17a34ad59 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -326,14 +326,8 @@ class Controller extends Section {
         if (!force)
             return this.$.pdfToTablet.show();
 
-        return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'})
+        return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds: [this.id]})
             .then(() => {
-                this.$.balanceCreate.amountPaid = this.ticket.totalWithVat;
-                this.$.balanceCreate.clientFk = this.ticket.clientFk;
-                this.$.balanceCreate.description = 'Albaran: ';
-                this.$.balanceCreate.description += this.ticket.id;
-
-                this.$.balanceCreate.show();
                 this.vnApp.showSuccess(this.$t('PDF sent!'));
             });
     }
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 5d27acff1..0aef956db 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -304,17 +304,15 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
             expect(controller.$.pdfToTablet.show).toHaveBeenCalled();
         });
 
-        it('should make a query and show balance create', () => {
+        it('should make a query', () => {
             controller.$.balanceCreate = {show: () => {}};
-            jest.spyOn(controller.$.balanceCreate, 'show');
             jest.spyOn(controller.vnApp, 'showSuccess');
 
-            $httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true);
+            $httpBackend.whenPOST(`Docuwares/upload`).respond(true);
             controller.uploadDocuware(true);
             $httpBackend.flush();
 
             expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-            expect(controller.$.balanceCreate.show).toHaveBeenCalled();
         });
     });
 
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 1e18ce284..d6e230ebe 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -9,7 +9,7 @@
             <vn-thead>
                 <vn-tr>
                     <vn-th shrink>
-                        <vn-multi-check 
+                        <vn-multi-check
                             model="model">
                         </vn-multi-check>
                     </vn-th>
@@ -33,7 +33,7 @@
                     class="clickable vn-tr search-result"
                     ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
                     <vn-td>
-                        <vn-check 
+                        <vn-check
                             ng-model="ticket.checked"
                             vn-click-stop>
                         </vn-check>
@@ -109,7 +109,7 @@
                             class="link">
                             {{::ticket.refFk}}
                         </span>
-                        <span 
+                        <span
                             ng-show="!ticket.refFk"
                             class="chip {{$ctrl.stateColor(ticket)}}">
                             {{ticket.state}}
@@ -132,8 +132,8 @@
                     <vn-td actions>
                         <vn-icon-button
                             vn-anchor="::{
-                                state: 'ticket.card.sale', 
-                                params: {id: ticket.id}, 
+                                state: 'ticket.card.sale',
+                                params: {id: ticket.id},
                                 target: '_blank'
                             }"
                             vn-tooltip="Go to lines"
@@ -152,21 +152,21 @@
 </vn-data-viewer>
 <div fixed-bottom-right>
     <vn-vertical style="align-items: center;">
-        <vn-button class="round sm vn-mb-sm"
-            icon="print"
+        <vn-button class="round vn-mb-sm"
+            icon="install_mobile"
             ng-show="$ctrl.totalChecked > 0"
-            ng-click="$ctrl.setDelivered()"
+            ng-click="$ctrl.sendDocuware()"
             vn-tooltip="Set as delivered and open delivery note(s)"
             tooltip-position="left">
         </vn-button>
-        <vn-button class="round sm vn-mb-sm"
+        <vn-button class="round vn-mb-sm"
             icon="icon-recovery"
             ng-show="$ctrl.totalChecked > 0"
             ng-click="$ctrl.openBalanceDialog()"
             vn-tooltip="Payment on account..."
             tooltip-position="left">
         </vn-button>
-        <vn-button class="round sm vn-mb-sm"
+        <vn-button class="round vn-mb-sm"
             icon="icon-invoice"
             ng-click="makeInvoiceConfirmation.show()"
             ng-show="$ctrl.totalChecked > 0"
@@ -193,16 +193,16 @@
 <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>
-<vn-zone-descriptor-popover 
+<vn-zone-descriptor-popover
     vn-id="zoneDescriptor">
 </vn-zone-descriptor-popover>
 <vn-client-balance-create
     vn-id="balanceCreateDialog">
 </vn-client-balance-create>
-<vn-invoice-out-descriptor-popover 
+<vn-invoice-out-descriptor-popover
     vn-id="invoiceOutDescriptor">
 </vn-invoice-out-descriptor-popover>
 <vn-contextmenu vn-id="contextmenu" targets="['vn-data-viewer']" model="model"
@@ -213,22 +213,22 @@
             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>
@@ -241,4 +241,4 @@
     on-accept="$ctrl.makeInvoice()"
     question="{{$ctrl.confirmationMessage}}"
     message="Invoice selected tickets">
-</vn-confirm>
\ No newline at end of file
+</vn-confirm>
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 42332ccc8..55229eabb 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -9,28 +9,23 @@ export default class Controller extends Section {
         this.vnReport = vnReport;
     }
 
-    setDelivered() {
+    sendDocuware() {
         const checkedTickets = this.checked;
-        let ids = [];
+        let ticketIds = [];
 
         for (let ticket of checkedTickets)
-            ids.push(ticket.id);
+            ticketIds.push(ticket.id);
 
-        this.$http.post('TicketTrackings/setDelivered', ids).then(res => {
-            let state = res.data;
-            for (let ticket of checkedTickets) {
-                ticket.stateFk = state.id;
-                ticket.state = state.name;
-                ticket.alertLevel = state.alertLevel;
-                ticket.alertLevelCode = state.code;
-            }
-            this.openDeliveryNotes(ids);
-        });
-    }
-
-    openDeliveryNotes(ids) {
-        for (let id of ids)
-            this.vnReport.show(`Tickets/${id}/delivery-note-pdf`);
+        return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds})
+            .then(res => {
+                let state = res.data;
+                for (let ticket of checkedTickets) {
+                    ticket.stateFk = state.id;
+                    ticket.state = state.name;
+                    ticket.alertLevel = state.alertLevel;
+                    ticket.alertLevelCode = state.code;
+                }
+            });
     }
 
     openBalanceDialog() {
diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js
index 5046387b0..951c6aa09 100644
--- a/modules/ticket/front/index/index.spec.js
+++ b/modules/ticket/front/index/index.spec.js
@@ -12,12 +12,14 @@ describe('Component vnTicketIndex', () => {
         id: 2,
         clientFk: 1,
         checked: true,
-        totalWithVat: 20.5
+        totalWithVat: 20.5,
+        stateFk: 1
     }, {
         id: 3,
         clientFk: 1,
         checked: true,
-        totalWithVat: 30
+        totalWithVat: 30,
+        stateFk: 1
     }];
 
     beforeEach(ngModule('ticket'));
@@ -86,18 +88,16 @@ describe('Component vnTicketIndex', () => {
         });
     });
 
-    describe('setDelivered()/openDeliveryNotes()', () => {
-        it('should perform a post to setDelivered and open tabs with the delivery notes', () => {
+    describe('sendDocuware()', () => {
+        it('should perform a post to sendDocuware and change tickets state', () => {
             controller.$.model = {data: tickets, refresh: () => {}};
+            const newState = {id: 2};
 
-            $window.open = jest.fn();
-
-            $httpBackend.expect('POST', 'TicketTrackings/setDelivered').respond('ok');
-            controller.setDelivered();
+            $httpBackend.expect('POST', 'Docuwares/upload').respond({id: newState.id});
+            controller.sendDocuware();
             $httpBackend.flush();
 
-            expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[1].id}/delivery-note-pdf`);
-            expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[2].id}/delivery-note-pdf`);
+            expect(controller.$.model.data[1].stateFk).toEqual(newState.id);
         });
     });
 
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index f50ef10a5..be9e81964 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -69,7 +69,7 @@
                     <vn-th ng-click="$ctrl.sortBy('price')" field="price" number>Price</vn-th>
                     <vn-th ng-click="$ctrl.sortBy('discount')" field="discount" number>Disc</vn-th>
                     <vn-th ng-click="$ctrl.sortBy('amount')" field="amount" number>Amount</vn-th>
-                    <vn-th ng-click="$ctrl.sortBy('itemPackingTypeFk')" field="itemPackingTypeFk" shrink>Packaging</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('item.itemPackingTypeFk')" field="itemPackingTypeFk" shrink>Packaging</vn-th>
                     <vn-th shrink></vn-th>
                 </vn-tr>
             </vn-thead>
@@ -202,7 +202,7 @@
                         </span>
                     </vn-td>
                     <vn-td number>
-                        {{$ctrl.getSaleTotal(sale) | currency: 'EUR':2}}
+                        {{sale.amount | currency: 'EUR':2}}
                     </vn-td>
                     <vn-td shrink>
                         {{::sale.item.itemPackingTypeFk | dashIfEmpty}}
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 88a59e605..b68db6dc0 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -34,6 +34,11 @@ class Controller extends Section {
     }
 
     get sales() {
+        if (this._sales) {
+            for (let sale of this._sales)
+                sale.amount = this.getSaleTotal(sale);
+        }
+
         return this._sales;
     }
 
@@ -49,6 +54,7 @@ class Controller extends Section {
 
         return ticketState && ticketState.state.code;
     }
+
     getConfig() {
         let filter = {
             fields: ['daysForWarningClaim'],
diff --git a/modules/worker/back/methods/department/getLeaves.js b/modules/worker/back/methods/department/getLeaves.js
index 48fe78e08..b1ce2fbe8 100644
--- a/modules/worker/back/methods/department/getLeaves.js
+++ b/modules/worker/back/methods/department/getLeaves.js
@@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethodCtx, ('getLeaves', {
+    Self.remoteMethodCtx('getLeaves', {
         description: 'Returns the nodes for a department',
         accepts: [{
             arg: 'parentId',
diff --git a/modules/zone/back/locale/zone-event/en.yml b/modules/zone/back/locale/zone-event/en.yml
index 2d6ef39ab..1988c1239 100644
--- a/modules/zone/back/locale/zone-event/en.yml
+++ b/modules/zone/back/locale/zone-event/en.yml
@@ -1,14 +1,14 @@
-name: zone event
+name: event
 columns:
     id: id
     zoneFk: zone
     type: type
     dated: dated
-    started: started
-    ended: ended
+    started: starts
+    ended: ends
     weekDays: week days
     hour: hour
     travelingDays: traveling days
     price: price
     bonus: bonus
-    m3Max: max m3
+    m3Max: max. m3
diff --git a/modules/zone/back/locale/zone-event/es.yml b/modules/zone/back/locale/zone-event/es.yml
index 9bc8db9fe..5092cc933 100644
--- a/modules/zone/back/locale/zone-event/es.yml
+++ b/modules/zone/back/locale/zone-event/es.yml
@@ -1,11 +1,11 @@
-name: evento zona
+name: evento
 columns:
     id: id
     zoneFk: zona
     type: tipo
     dated: fecha
-    started: comenzado
-    ended: terminado
+    started: empieza
+    ended: termina
     weekDays: días semana
     hour: hora
     travelingDays: días de viaje
diff --git a/modules/zone/back/locale/zone-exclusion/en.yml b/modules/zone/back/locale/zone-exclusion/en.yml
index 4389d8b93..6a2383b87 100644
--- a/modules/zone/back/locale/zone-exclusion/en.yml
+++ b/modules/zone/back/locale/zone-exclusion/en.yml
@@ -1,5 +1,5 @@
-name: zone exclusion
+name: exclusion
 columns:
     id: id
-    dated: dated
+    dated: date
     zoneFk: zone
diff --git a/modules/zone/back/locale/zone-exclusion/es.yml b/modules/zone/back/locale/zone-exclusion/es.yml
index 4e59cba46..35102a670 100644
--- a/modules/zone/back/locale/zone-exclusion/es.yml
+++ b/modules/zone/back/locale/zone-exclusion/es.yml
@@ -1,4 +1,4 @@
-name: zone exclusion
+name: exclusión
 columns:
     id: id
     dated: fecha
diff --git a/modules/zone/back/locale/zone-included/en.yml b/modules/zone/back/locale/zone-included/en.yml
index 0e44989e9..65e4faac6 100644
--- a/modules/zone/back/locale/zone-included/en.yml
+++ b/modules/zone/back/locale/zone-included/en.yml
@@ -1,5 +1,7 @@
-name: zone included
+name: inclusion
 columns:
     id: id
     dated: dated
     zoneFk: zone
+    isIncluded: incluida
+    geoFk: localización
diff --git a/modules/zone/back/locale/zone-included/es.yml b/modules/zone/back/locale/zone-included/es.yml
index 30a89373a..bd48cdbe5 100644
--- a/modules/zone/back/locale/zone-included/es.yml
+++ b/modules/zone/back/locale/zone-included/es.yml
@@ -1,5 +1,7 @@
-name: zona incluida
+name: inclusión
 columns:
     id: id
     dated: fecha
     zoneFk: zona
+    isIncluded: incluida
+    geoFk: localización
diff --git a/modules/zone/back/locale/zone-warehouse/en.yml b/modules/zone/back/locale/zone-warehouse/en.yml
index b9c4f7609..6caa3de1b 100644
--- a/modules/zone/back/locale/zone-warehouse/en.yml
+++ b/modules/zone/back/locale/zone-warehouse/en.yml
@@ -1,4 +1,4 @@
-name: zone warehouse
+name: warehouse
 columns:
     id: id
     warehouseFk: warehouse
diff --git a/modules/zone/back/locale/zone-warehouse/es.yml b/modules/zone/back/locale/zone-warehouse/es.yml
index ec8dec2dd..caf0d8f1a 100644
--- a/modules/zone/back/locale/zone-warehouse/es.yml
+++ b/modules/zone/back/locale/zone-warehouse/es.yml
@@ -1,4 +1,4 @@
-name: almacén zona
+name: almacén
 columns:
     id: id
     warehouseFk: almacén
diff --git a/package-lock.json b/package-lock.json
index 4ed50e256..c190065b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.24.01",
+    "version": "23.26.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
diff --git a/print/templates/email/modified-entry/assets/css/import.js b/print/templates/email/modified-entry/assets/css/import.js
new file mode 100644
index 000000000..4b4bb7086
--- /dev/null
+++ b/print/templates/email/modified-entry/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/modified-entry/locale/en.yml b/print/templates/email/modified-entry/locale/en.yml
new file mode 100644
index 000000000..7bdfa15ff
--- /dev/null
+++ b/print/templates/email/modified-entry/locale/en.yml
@@ -0,0 +1,3 @@
+subject: Modified entry
+title: Modified entry
+description: From Warehouse the following packaging entry has been created/modified
diff --git a/print/templates/email/modified-entry/locale/es.yml b/print/templates/email/modified-entry/locale/es.yml
new file mode 100644
index 000000000..5a00307f9
--- /dev/null
+++ b/print/templates/email/modified-entry/locale/es.yml
@@ -0,0 +1,3 @@
+subject: Entrada modificada
+title: Entrada modificada
+description: Desde Almacén se ha creado/modificado la siguiente entrada de embalajes
diff --git a/print/templates/email/modified-entry/modified-entry.html b/print/templates/email/modified-entry/modified-entry.html
new file mode 100644
index 000000000..869d019a4
--- /dev/null
+++ b/print/templates/email/modified-entry/modified-entry.html
@@ -0,0 +1,11 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title') }}</h1>
+            <p>
+                {{ $t('description') }}:
+                <a :href="url">{{ url }}</a>
+            </p>
+        </div>
+    </div>
+</email-body>
diff --git a/print/templates/email/modified-entry/modified-entry.js b/print/templates/email/modified-entry/modified-entry.js
new file mode 100755
index 000000000..35474a12f
--- /dev/null
+++ b/print/templates/email/modified-entry/modified-entry.js
@@ -0,0 +1,16 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'modified-entry',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        url: {
+            type: String,
+            required: true
+        }
+    }
+};
+
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 727621b2c..d74325dfd 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -242,7 +242,7 @@
                     </tfoot>
                 </table>
             </div>
-            <div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' && invoice.iban">
+            <div class="columns vn-mt-lg" v-if="(invoice.payMethodCode == 'wireTransfer' && invoice.iban) || ticketObservations">
                 <div class="size50 pull-left no-page-break">
                     <div class="panel">
                         <div class="header">{{$t('observations')}}</div>
@@ -267,9 +267,7 @@
             v-bind:left-text="$t('invoiceRef', [invoice.ref])"
             v-bind:center-text="client.socialName"
             v-bind:recipient-id="client.id"
-            v-bind="$props"
-            
-        >
+            v-bind="$props">
         </report-footer>
     </template>
 </report-body>