chore: refs #6452 drop script

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6452-useIdAsSip
2024-11-06 10:54:12 +01:00 · 2024-11-06 09:27:13 +01:00 · 2024-10-15 16:48:34 +02:00 · 2024-10-15 16:47:58 +02:00
239 changed files with 2586 additions and 5013 deletions
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@ -36,7 +36,3 @@ rules:
    jasmine/no-focused-tests: 0
    jasmine/prefer-toHaveBeenCalledWith: 0
    arrow-spacing: ["error", { "before": true, "after": true }]
-    no-restricted-syntax:
-    - "error"
-    - selector: "NewExpression[callee.name='Date']"
-      message: "Use Date.vnNew() instead of new Date()."
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,117 +1,3 @@
-# Version 24.48 - 2024-11-25
-
-### Added 🆕
-
- feat: refs #4948 Added ticket_selfConsumptionPackaging  by:guillermo
- feat: refs #6818 add config table  by:jorgep
- feat: refs #6818 add records  by:jorgep
- feat: refs #6818 saysimple integration  by:jorgep
- feat: refs #6845 userInterface  by:sergiodt
- feat: refs #6869 add back  by:jorgep
- feat: refs #6869 define model  by:jorgep
- feat: refs #6869 refs#6869 itemShelving_get  (origin/6869-createGetDetails) by:sergiodt
- feat: refs #7006 itemTypeLog  by:guillermo
- feat: refs #7006 itemTypeLog created  by:guillermo
- feat: refs #7006 Requested changes  by:guillermo
- feat: refs #7193 added scope in parking model  by:Jon
- feat: refs #7244 Requested changes  by:guillermo
- feat: refs #7266 Added details and improvements in item label reports  by:guillermo
- feat: refs #7266 buyFkForPrint  by:sergiodt
- feat: refs #7266 First commit  by:guillermo
- feat: refs #7266 Item label barcode  by:guillermo
- feat: refs #7266 Item label QR  by:guillermo
- feat: refs #7266 Item label QR finished  by:guillermo
- feat: refs #7266 Minor change  by:guillermo
- feat: refs #7266 Print corrections  by:guillermo
- feat: refs #7266 Requested changes and improvements  by:guillermo
- feat: refs #7266 Requested changes and query optimization  by:guillermo
- feat: refs #7266 Version  by:guillermo
- feat: refs #7289 #7289 apply option 1  by:Javier Segarra
- feat: refs #7289 #7289 remove bad translation  by:Javier Segarra
- feat: refs #7524 restrict fields  by:jorgep
- feat: refs #7641 fine tunning  by:jorgep
- feat: refs #7641 improve style  by:jorgep
- feat: refs #7743 add simple spec for sendMail  by:pablone
- feat: refs #7743 add try catch stmt to the test  by:pablone
- feat: refs #7874 add default type  by:jorgep
- feat: refs #7874 use name  by:jorgep
- feat: refs #7920 Added ItemShelving in shelvingLog  by:guillermo
- feat: refs #7921 refs#7921 sendLostExpedition  by:sergiodt
- feat: refs #7922 refs #792 scanOrder  by:sergiodt
- feat: refs #7943 quitar lectura en metodos comunes  by:jgallego
- feat: refs #7943 return just the required content  by:jorgep
- feat: refs #7943 usa back con permisos  by:jgallego
- feat: refs #8020 machineWorkerDeprecated  by:sergiodt
- feat: refs #8057 Added data updates  by:guillermo
- feat: refs #8057 Added data updates  (origin/8057-geoFk) by:guillermo
- feat: refs #8057 Added geoFk columns  by:guillermo
- feat: refs #8057 Fix version  by:guillermo
- feat: refs #8057 More precision in getGeo  by:guillermo
- feat: refs #8057 Requested changes  by:guillermo
- feat: refs #8071 quitar esquema  by:robert
- feat: refs #8071 travel_weeklyClone  by:robert
- feat: refs #8080 Added column comment  by:guillermo
- feat: refs #8083 add prop  by:jorgep
- feat: refs #8087 Traspasar redadas a travels  by:Carlos Andrés
- feat: refs #8099 refs#8099 addComplmentSalary  by:sergiodt
- feat: refs #8124 Enrutadores nuevos requerimientos  by:Carlos Andrés
- feat: refs #8124 Enrutadores nuevos requerimientos  (origin/8124-enrutadoresNuevosRequerimientos) by:Carlos Andrés
- feat: refs #8127 entry_getCommission  by:robert
- feat: refs #8127 quitar esquemas  by:robert
- feat: refs #8135 refs#8135 updateTicketACL  (origin/8135-ticketACL) by:sergiodt
- feat: refs #8143 deprecate recoverPass and sync from account.user  by:ivanm
- feat: refs #8150 movExpeditions  by:sergiodt
- feat: refs #8151 Added test  by:guillermo
- feat: refs #8151 moveExpeditions  by:guillermo
- feat: refs #8151 Requested changes  by:guillermo
- feat(Supplier): refs #6828 add companySize  by:alexm
- refactor: refs #7641 entry report style  by:jorgep
-
-### Changed 📦
-
- refactor: refs #6920 add correct role  by:alexm
- refactor: refs #7242 Deleted select column  by:guillermo
- refactor: refs #7457 Added from param if not exists  by:guillermo
- refactor: refs #7641 entry report style  by:jorgep
- refactor: refs #7715 Deleted hasNewLabelMrwMethod column  by:guillermo
- refactor: refs #7920 Fix tests  by:guillermo
- refactor: refs #7920 Fix version  by:guillermo
- refactor: refs #7920 itemShelvingLog  by:guillermo
- refactor: refs #7920 Main change  by:guillermo
- refactor: refs #7920 Major changes  by:guillermo
- refactor: refs #7920 No changes in itemShelvingLog table  by:guillermo
- refactor: refs #7920 Requested changes  by:guillermo
- refactor: refs #7950 Created cmr model  (7950-cmrModelUnify) by:guillermo
- refactor: refs #7950 Requested changes  by:guillermo
- refactor: refs #8153 Optimized order_getTax  by:guillermo
-
-### Fixed 🛠️
-
- fix: clean deletes also zoneEvent range records  by:jgallego
- fix: more data for fixture.before  by:Pako
- fix: refs #4948 Tests  by:guillermo
- fix: refs #6644 email and translations  by:carlossa
- fix: refs #6818 add config  by:jorgep
- fix: refs #6818 add defaultChannel  by:jorgep
- fix: refs #6818 use right col type  by:jorgep
- fix: refs #6869 use id as primaryKey  by:jorgep
- fix: refs #7244 Added collection ACL  by:guillermo
- fix: refs #7283 item filters  by:carlossa
- fix: refs #7283 remove  by:carlossa
- fix: refs #7283 remove tests  by:carlossa
- fix: refs #7283 tback  by:carlossa
- fix: refs #7323 add remaining fields  (origin/7323-warfix-addRemainingFields) by:jorgep
- fix: refs #7457 add with on select to reduce  by:pablone
- fix: refs #7457 empty commit for gitea  by:pablone
- fix: refs #7457 error on empty from param and add translate  by:pablone
- fix: refs #7457 remove group by calc time reduce bellow 1s  by:pablone
- fix: refs #7457 remove translate and use param definition for restriction  by:pablone
- fix: refs #7641 align columns  by:jorgep
- fix: refs #7641 drop boilerplate code  by:jorgep
- fix: refs #7920 refs#7920 itemShelvingLog  by:sergiodt
- fix: refs #8153 Version  by:guillermo
- revert cd7ed6987a88e00275b562d3248f368b6333620c  by:Javier Segarra
-
 # Version 24.38 - 2024-09-17

 ### Added 🆕
--- a/back/methods/collection/getSales.js
+++ b/back/methods/collection/getSales.js
@ -29,8 +29,10 @@ module.exports = Self => {
    });

    Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const models = Self.app.models;
        const userId = ctx.req.accessToken.userId;
        const myOptions = {userId};
+        const $t = ctx.req.__;

        if (typeof options == 'object')
            Object.assign(myOptions, options);
@ -57,6 +59,22 @@ module.exports = Self => {

        if (print) await Self.rawSql('CALL vn.collection_printSticker(?,NULL)', [id], myOptions);

+        for (let ticket of tickets) {
+            if (ticket.observaciones) {
+                let observations = ticket.observaciones.split(' ');
+
+                for (let observation of observations) {
+                    const salesPerson = ticket.salesPersonFk;
+                    if (observation.startsWith('#') || observation.startsWith('@')) {
+                        await models.Chat.send(ctx,
+                            observation,
+                            $t('ticketCommercial', {ticket: ticket.ticketFk, salesPerson})
+                        );
+                    }
+                }
+            }
+        }
+
        return getCollection(id, tickets, sales, placements, myOptions);
    };

--- a/back/methods/collection/getTickets.js
+++ b/back/methods/collection/getTickets.js
@ -57,14 +57,13 @@ module.exports = Self => {
                    ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
                    COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
                    sh.code,
-                    p2.code parkingCodePrevia,
-                    p2.pickingOrder pickingOrderPrevia,
-                    p.code parkingCode,
-                    p.pickingOrder pickingOrder,
+                    p2.code parkingCode,
+                    p2.pickingOrder pickingOrder,
+                    p.code parkingCodePrevia,
+                    p.pickingOrder pickingOrderPrevia,
                    iss.id itemShelvingSaleFk,
                    iss.isPicked,
-                    iss.itemShelvingFk,
-                    st.code stateCode
+                    iss.itemShelvingFk
                FROM ticketCollection tc
                    LEFT JOIN collection c ON c.id = tc.collectionFk
                    JOIN sale s ON s.ticketFk = tc.ticketFk
@ -74,11 +73,10 @@ module.exports = Self => {
                    JOIN item i ON i.id = s.itemFk
                    JOIN itemShelvingSale iss ON iss.saleFk = s.id
                    LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-                    LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
+                    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
-                    LEFT JOIN state st ON st.id = sg.stateFk
                WHERE tc.collectionFk = ?
                GROUP BY s.id, ish.id, p.code, p2.code
            UNION ALL
@ -106,8 +104,7 @@ module.exports = Self => {
                p.pickingOrder,
                iss.id itemShelvingSaleFk,
                iss.isPicked,
-                iss.itemShelvingFk,
-                st.code stateCode
+                iss.itemShelvingFk
            FROM sectorCollection sc
                JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
                JOIN saleGroup sg ON sg.id = ss.saleGroupFk
@ -117,11 +114,10 @@ module.exports = Self => {
                JOIN item i ON i.id = s.itemFk
                JOIN itemShelvingSale iss ON iss.saleFk = s.id
                LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-                LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
+                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
-                LEFT JOIN state st ON st.id = sg.stateFk
            WHERE sc.id = ? 
                AND sgd.saleGroupFk
            GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);
--- a/back/methods/collection/spec/assign.spec.js
+++ b/back/methods/collection/spec/assign.spec.js
@ -28,10 +28,9 @@ describe('ticket assign()', () => {
        await tx.rollback();
    });

-    it('should throw an error when there are no picking tickets', async() => {
+    it('should throw an error when  there is not picking tickets', async() => {
        try {
            await models.Collection.assign(ctx, options);
-            fail('Expected an error to be thrown, but none was thrown.');
        } catch (e) {
            expect(e.message).toEqual('There are not picking tickets');
        }
--- a/back/methods/mrw-config/cancelShipment.js
+++ b/back/methods/mrw-config/cancelShipment.js
@ -39,9 +39,6 @@ module.exports = Self => {
        const xmlString = response.data;
        const parser = new DOMParser();
        const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
-
-        await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', xmlDoc]);
-
        const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
        return result.toLowerCase().includes('se ha cancelado correctamente');
    };
--- a/back/methods/url/getUrl.js
+++ b/back/methods/url/getUrl.js
@ -22,7 +22,7 @@ module.exports = Self => {
        const url = await Self.app.models.Url.findOne({
            where: {
                appName,
-                environment: process.env.NODE_ENV || 'development'
+                environment: process.env.NODE_ENV || 'dev'
            }
        });
        return url?.url;
--- a/back/methods/workerActivity/add.js
+++ b/back/methods/workerActivity/add.js
@ -31,7 +31,7 @@ module.exports = Self => {
        return await Self.rawSql(`
            INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model)
                SELECT ?, ?, ?
-                    FROM workerTimeControlConfig wtcc
+                    FROM workerTimeControlParams wtcp
                        LEFT JOIN (
                            SELECT wa.workerFk,
                                wa.created,
@ -44,7 +44,7 @@ module.exports = Self => {
                        ) sub ON TRUE
                    WHERE sub.workerFk IS NULL
                        OR sub.code <> ? 
-                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
+                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcp.dayBreak;`
        , [userId, code, model, userId, code], myOptions);
    };
 };
--- a/back/model-config.json
+++ b/back/model-config.json
@ -79,9 +79,6 @@
    "ImageCollectionSize": {
        "dataSource": "vn"
    },
-    "ImageConfig": {
-        "dataSource": "vn"
-    },
    "ImageContainer": {
        "dataSource": "imageStorage"
    },
@ -142,12 +139,6 @@
    "StarredModule": {
        "dataSource": "vn"
    },
-    "SaySimpleCountry": {
-        "dataSource": "vn"
-    },
-    "SaySimpleConfig": {
-        "dataSource": "vn"
-    },
    "TempContainer": {
        "dataSource": "tempStorage"
    },
--- a/back/models/country.json
+++ b/back/models/country.json
@ -44,11 +44,6 @@
            "type": "belongsTo",
            "model": "Continent",
            "foreignKey": "continentFk"
-        },
-        "saySimpleCountry": {
-            "type": "hasOne",
-            "model": "SaySimpleCountry",
-            "foreignKey": "countryFk"
        }
    },
    "acls": [
--- a/back/models/expedition_PrintOut.json
+++ b/back/models/expedition_PrintOut.json
@ -14,6 +14,9 @@
        },
        "itemFk": {
            "type": "number"
+        },
+        "isChecked": {
+            "type": "boolean"
        }
    }
 }
--- a/back/models/image-config.json
+++ b/back/models/image-config.json
@ -1,22 +0,0 @@
-{
-    "name": "ImageConfig",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "hedera.imageConfig"
-        }
-    },
-    "properties": {
-        "url": {
-            "type": "string"
-        }
-    },
-    "acls": [
-        {
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "$authenticated",
-            "permission": "ALLOW"
-        }
-    ]
-}
--- a/back/models/say-simple-config.json
+++ b/back/models/say-simple-config.json
@ -1,29 +0,0 @@
-{
-    "name": "SaySimpleConfig",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "saySimpleConfig"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "url": {
-            "type": "string"
-        },
-        "defaultChannel": {
-            "type": "number"
-        }
-    },
-    "acls": [
-        {
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "$authenticated",
-            "permission": "ALLOW"
-        }
-    ]
-}
--- a/back/models/say-simple-country.json
+++ b/back/models/say-simple-country.json
@ -1,26 +0,0 @@
-{
-    "name": "SaySimpleCountry",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "saySimpleCountry"
-        }
-    },
-    "properties": {
-        "countryFk": {
-            "type": "number",
-            "id": true
-        },
-        "channel": {
-            "type": "number"
-        }
-    },
-    "acls": [
-        {
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "$authenticated",
-            "permission": "ALLOW"
-        }
-    ]
-}
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@ -4,7 +4,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

-INSERT INTO `version` VALUES ('vn-database','11358','45f7b60f1b43b24505a3e9abc6738dc484ad4fd5','2024-11-26 12:27:58','11365');
+INSERT INTO `version` VALUES ('vn-database','11278','fe10f03459a153fc213bf64e352804c043f94590','2024-10-03 07:47:47','11281');

 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@ -988,7 +988,6 @@ INSERT INTO `versionLog` VALUES ('vn-database','11194','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11195','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11196','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-18 07:28:14',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11197','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11198','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:42:49',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11201','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-08-27 13:04:26',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11204','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-03 08:58:01',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11205','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-04 13:54:55',NULL,NULL);
@ -1014,7 +1013,6 @@ INSERT INTO `versionLog` VALUES ('vn-database','11225','01-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11225','02-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11227','00-addWorkerTimeControlMailAcl.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:41',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11229','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-16 08:24:17',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11230','00-addClientObservationType.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:42:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11234','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:42',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11235','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11236','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
@ -1023,92 +1021,18 @@ INSERT INTO `versionLog` VALUES ('vn-database','11237','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11239','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-17 12:57:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11240','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11241','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-20 09:08:25',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11242','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:42:52',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11246','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-18 12:39:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11247','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-19 12:10:08',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11248','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-23 11:12:17',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11249','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11251','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:43:38',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11251','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 07:57:30',NULL,'Connection lost: The server closed the connection.');
 INSERT INTO `versionLog` VALUES ('vn-database','11253','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-20 14:41:27',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11254','00-thermographTemperature.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:13',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11254','01-thermographFk.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11255','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11256','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-09-23 12:18:24',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11258','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11260','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11261','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11262','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11263','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-09-27 12:05:32',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11264','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11271','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11272','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:15',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11273','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 10:50:51',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11274','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:16',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11274','00-firstScript2.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:29',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11274','00-firstScript3.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11274','00-firstScript5.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:35',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11274','00-firstScript6.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:35',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11274','00-firstScript7.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:36',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11277','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:36',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11278','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-03 07:47:43',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11279','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-10-02 08:05:24',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11280','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-02 08:46:50',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11281','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:36',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11283','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:36',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11284','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:36',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11285','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11287','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11288','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-10 08:26:34',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11289','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-15 07:01:33',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11290','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11291','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-17 09:10:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11294','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11295','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-10 08:45:13',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11297','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:29',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11297','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11298','00-closure.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:37',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11300','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-18 08:27:05',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11302','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11308','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-10-23 12:41:55',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11311','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 08:00:57',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11314','00-restrictedAsterisk.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11315','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11316','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11317','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11319','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11321','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11324','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 10:49:47',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11325','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11326','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11330','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11331','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11336','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11337','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11338','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-12 09:14:12',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11339','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','00-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:06:34',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','01-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:06:35',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','02-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:06:37',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','03-itemShelving.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','04-itemShelvingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','05-itemShelvingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11342','06-itemShelvingLog.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11343','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:07',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11344','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 17:36:45',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11344','01-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 17:46:26',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11345','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:11:08',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11346','00-address.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:15:02',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11346','01-client.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:16:29',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11346','02-supplier.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:27:57',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11347','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:27:57',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11348','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11349','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11350','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11353','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11355','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:14',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11357','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:16',NULL,NULL);
-INSERT INTO `versionLog` VALUES ('vn-database','11358','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:28:21',NULL,NULL);

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@ -1483,8 +1407,6 @@ INSERT INTO `roleInherit` VALUES (376,124,21,19336);
 INSERT INTO `roleInherit` VALUES (377,47,49,19295);
 INSERT INTO `roleInherit` VALUES (378,101,15,19294);
 INSERT INTO `roleInherit` VALUES (379,103,121,19294);
-INSERT INTO `roleInherit` VALUES (381,119,123,19295);
-INSERT INTO `roleInherit` VALUES (382,48,72,783);

 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);

@ -2012,11 +1934,13 @@ INSERT INTO `ACL` VALUES (605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employe
 INSERT INTO `ACL` VALUES (606,'Ticket','isLocked','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (607,'Ticket','freightCost','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','deliveryAssistant',10578);
+INSERT INTO `ACL` VALUES (609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery',NULL);
 INSERT INTO `ACL` VALUES (610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (611,'State','find','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (612,'State','findById','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (613,'State','findOne','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (614,'Worker','find','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (616,'Worker','findOne','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (617,'Worker','filter','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (619,'Worker','active','READ','ALLOW','ROLE','employee',NULL);
@ -2082,6 +2006,7 @@ INSERT INTO `ACL` VALUES (716,'ExpeditionMistake','*','WRITE','ALLOW','ROLE','em
 INSERT INTO `ACL` VALUES (717,'WorkerMistake','*','WRITE','ALLOW','ROLE','coolerAssist',NULL);
 INSERT INTO `ACL` VALUES (718,'MistakesTypes','*','WRITE','ALLOW','ROLE','coolerAssist',NULL);
 INSERT INTO `ACL` VALUES (719,'MistakeType','*','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (720,'MachineWorker','*','READ','ALLOW','ROLE','coolerAssist',NULL);
 INSERT INTO `ACL` VALUES (721,'Printer','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (722,'SaleMistake','*','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (723,'Item','setVisibleDiscard','WRITE','ALLOW','ROLE','employee',NULL);
@ -2119,10 +2044,13 @@ INSERT INTO `ACL` VALUES (755,'Route','findById','READ','ALLOW','ROLE','employee
 INSERT INTO `ACL` VALUES (756,'Route','findOne','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (757,'Route','getRoutesByWorker','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (758,'Route','canViewAllRoute','READ','ALLOW','ROLE','deliveryAssistant',NULL);
+INSERT INTO `ACL` VALUES (759,'Route','cmr','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (760,'Route','downloadCmrsZip','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (761,'Route','downloadZip','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (762,'Route','filter','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (763,'Route','getByWorker','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (764,'Route','getDeliveryPoint','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (765,'Route','cmrs','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (766,'Route','getSuggestedTickets','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (767,'Route','getTickets','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (768,'Route','guessPriority','WRITE','ALLOW','ROLE','employee',NULL);
@ -2163,6 +2091,7 @@ INSERT INTO `ACL` VALUES (802,'MailAliasAccount','deleteById','WRITE','ALLOW','R
 INSERT INTO `ACL` VALUES (804,'DeviceProduction','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (805,'Collection','assign','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (806,'ExpeditionPallet','getPallet','READ','ALLOW','ROLE','production',NULL);
+INSERT INTO `ACL` VALUES (807,'MachineWorker','updateInTime','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (808,'MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (809,'SaleTracking','delete','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (810,'SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production',NULL);
@ -2245,10 +2174,11 @@ INSERT INTO `ACL` VALUES (892,'WorkerIncome','*','*','ALLOW','ROLE','hr',NULL);
 INSERT INTO `ACL` VALUES (893,'PayrollComponent','*','*','ALLOW','ROLE','hr',NULL);
 INSERT INTO `ACL` VALUES (894,'Worker','__get__incomes','*','ALLOW','ROLE','hr',NULL);
 INSERT INTO `ACL` VALUES (895,'ItemShelvingLog','*','READ','ALLOW','ROLE','production',NULL);
+INSERT INTO `ACL` VALUES (897,'WorkerLog','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (901,'WorkerTimeControl','sendMail','WRITE','ALLOW','ROLE','system',NULL);
 INSERT INTO `ACL` VALUES (902,'Entry','filter','READ','ALLOW','ROLE','supplier',NULL);
 INSERT INTO `ACL` VALUES (903,'Entry','getBuys','READ','ALLOW','ROLE','supplier',NULL);
-INSERT INTO `ACL` VALUES (904,'Entry','buyLabelSupplier','READ','ALLOW','ROLE','supplier',10578);
+INSERT INTO `ACL` VALUES (904,'Entry','buyLabel','READ','ALLOW','ROLE','supplier',NULL);
 INSERT INTO `ACL` VALUES (905,'AddressWaste','*','READ','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (906,'Entry','print','READ','ALLOW','ROLE','supplier',NULL);
 INSERT INTO `ACL` VALUES (907,'Expedition_PrintOut','*','*','ALLOW','ROLE','production',NULL);
@ -2260,8 +2190,10 @@ INSERT INTO `ACL` VALUES (912,'Worker','__get__medicalReview','*','ALLOW','ROLE'
 INSERT INTO `ACL` VALUES (913,'VnToken','*','READ','ALLOW','ROLE','developer',10578);
 INSERT INTO `ACL` VALUES (914,'VnToken','killSession','*','ALLOW','ROLE','developer',10578);
 INSERT INTO `ACL` VALUES (915,'ACL','*','WRITE','ALLOW','ROLE','developerBoss',10578);
+INSERT INTO `ACL` VALUES (916,'Entry','getBuysCsv','READ','ALLOW','ROLE','supplier',10578);
 INSERT INTO `ACL` VALUES (917,'InvoiceOut','refundAndInvoice','WRITE','ALLOW','ROLE','administrative',10578);
 INSERT INTO `ACL` VALUES (918,'Worker','__get__descriptor','READ','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (919,'Worker','findById','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (920,'QuadmindsApiConfig','*','*','ALLOW','ROLE','delivery',19295);
 INSERT INTO `ACL` VALUES (922,'SaleGroup','*','WRITE','ALLOW','ROLE','production',19294);
 INSERT INTO `ACL` VALUES (923,'Worker','__get__advancedSummary','READ','ALLOW','ROLE','hr',10578);
@ -2280,24 +2212,6 @@ INSERT INTO `ACL` VALUES (935,'BankEntity','*','WRITE','ALLOW','ROLE','financial
 INSERT INTO `ACL` VALUES (936,'Device','handleUser','*','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (937,'WorkerTimeControlMail','count','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (938,'Worker','__get__mail','READ','ALLOW','ROLE','hr',10578);
-INSERT INTO `ACL` VALUES (939,'Machine','*','*','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (940,'ItemTypeLog','find','READ','ALLOW','ROLE','employee',10578);
-INSERT INTO `ACL` VALUES (941,'Entry','buyLabel','READ','ALLOW','ROLE','employee',10578);
-INSERT INTO `ACL` VALUES (942,'Cmr','filter','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (943,'Cmr','downloadZip','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (944,'Cmr','print','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (945,'Collection','create','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (946,'Collection','upsert','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (947,'Collection','replaceById','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (948,'Collection','updateAll','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (949,'Collection','updateAttributes','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (950,'Collection','deleteById','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (951,'Collection','destroyAll','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (952,'Collection','destroyById','WRITE','ALLOW','ROLE','productionBoss',10578);
-INSERT INTO `ACL` VALUES (953,'RouteAction','find','READ','ALLOW','ROLE','delivery',10578);
-INSERT INTO `ACL` VALUES (954,'RouteComplement','find','READ','ALLOW','ROLE','delivery',10578);
-INSERT INTO `ACL` VALUES (955,'RouteComplement','create','WRITE','ALLOW','ROLE','delivery',10578);
-INSERT INTO `ACL` VALUES (956,'RouteComplement','deleteById','WRITE','ALLOW','ROLE','delivery',10578);

 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@ -2493,8 +2407,6 @@ INSERT INTO `claimResponsible` VALUES (22,'Paletizadores',0,'pal');
 INSERT INTO `claimResponsible` VALUES (23,'Preparación Previa',0,'pre');
 INSERT INTO `claimResponsible` VALUES (24,'Almacén PCA',0,'war');
 INSERT INTO `claimResponsible` VALUES (25,'Huelga',0,'str');
-INSERT INTO `claimResponsible` VALUES (27,'Prep. por caja',0,'');
-INSERT INTO `claimResponsible` VALUES (45,'Negativo',0,'neg');

 INSERT INTO `claimReason` VALUES (1,'Prisas',0);
 INSERT INTO `claimReason` VALUES (2,'Novato',0);
@ -2537,9 +2449,6 @@ INSERT INTO `claimReason` VALUES (52,'Mala gestión comercial',0);
 INSERT INTO `claimReason` VALUES (53,'Mala gestión comprador',0);
 INSERT INTO `claimReason` VALUES (54,'A2',0);
 INSERT INTO `claimReason` VALUES (55,'Entrega 48h o más',0);
-INSERT INTO `claimReason` VALUES (56,'Error cliente',0);
-INSERT INTO `claimReason` VALUES (57,'A2/B1',0);
-INSERT INTO `claimReason` VALUES (58,'Seguro',0);

 INSERT INTO `claimRedelivery` VALUES (1,'Cliente');
 INSERT INTO `claimRedelivery` VALUES (2,'No dev./No especif.');
@ -2547,7 +2456,6 @@ INSERT INTO `claimRedelivery` VALUES (3,'Reparto');
 INSERT INTO `claimRedelivery` VALUES (4,'Agencia');
 INSERT INTO `claimRedelivery` VALUES (5,'Tour');
 INSERT INTO `claimRedelivery` VALUES (6,'Fuera Peninsula');
-INSERT INTO `claimRedelivery` VALUES (7,'Francia');

 INSERT INTO `claimResult` VALUES (1,'Otros daños');
 INSERT INTO `claimResult` VALUES (2,'Roces');
@ -2625,39 +2533,39 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');

-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,116,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,114,763,0,0,0,0,26,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,5,NULL,72,0,0,1,1,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (23,'CMA','CAMARA',15,16,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,'PREVIOUS');
-INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (31,'it','INFORMATICA',6,7,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (35,'finance','FINANZAS',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (35,'finance','FINANZAS',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (36,'labor','LABORAL',12,13,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',14,37,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,1,NULL,NULL,NULL,'ON_PREPARATION');
+INSERT INTO `department` VALUES (38,'picking','SACADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_PREPARATION');
 INSERT INTO `department` VALUES (39,'packing','ENCAJADO',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PACKING');
 INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',38,39,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',40,75,NULL,0,0,0,1,17,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',82,83,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',40,73,NULL,0,0,0,1,16,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'DELIVERY');
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',80,81,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'STORAGE');
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',84,85,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',41,42,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',21,22,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',23,24,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',90,93,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,'CLAIM');
-INSERT INTO `department` VALUES (61,NULL,'VNH',96,99,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',100,101,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',88,91,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'FIELD');
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',92,93,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',43,44,NULL,72,0,0,2,0,43,'/1/43/',NULL,0,NULL,1,1,0,0,NULL,NULL,NULL,'CLAIM');
+INSERT INTO `department` VALUES (61,NULL,'VNH',94,97,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',25,26,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',102,103,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',100,101,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (80,'spainTeam5','EQUIPO ESPAÑA 5',45,46,4250,0,0,0,2,0,43,'/1/43/','es5_equipo',1,'es5@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',104,105,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (89,NULL,'COORDINACION',106,107,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (90,NULL,'TRAILER',97,98,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',104,105,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',95,96,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',27,28,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',47,48,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (94,'spainTeam2','EQUIPO ESPAÑA 2',49,50,3797,0,0,0,2,0,43,'/1/43/','es2_equipo',1,'es2@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
@ -2665,24 +2573,23 @@ INSERT INTO `department` VALUES (95,'spainTeam1','EQUIPO ESPAÑA 1',51,52,24065,
 INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',53,54,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',55,56,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',57,58,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',108,109,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',106,107,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',59,60,1118,0,0,0,2,0,43,'/1/43/','es3_equipo',1,'es3@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
 INSERT INTO `department` VALUES (130,NULL,'REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',91,92,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',89,90,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',61,62,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',63,64,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
 INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',65,66,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500',NULL);
-INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',110,111,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',112,113,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
-INSERT INTO `department` VALUES (137,'sorter','SORTER',114,115,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',110,111,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (137,'sorter','SORTER',112,113,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (139,'spainTeam4','EQUIPO ESPAÑA 4',67,68,3803,0,0,0,2,0,43,'/1/43/','es4_equipo',1,'es4@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
-INSERT INTO `department` VALUES (140,'internationalTeam','EQUIPO INTERNACIONAL',69,70,24065,0,0,0,2,0,43,'/1/43/','int_equipo',1,'international@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',69,70,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (141,NULL,'PREVIA',35,36,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'PREVIOUS');
 INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,22,'/1/22/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',71,72,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',0,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
-INSERT INTO `department` VALUES (148,NULL,'CAPTATION FRANCIA',73,74,NULL,0,0,0,2,0,43,'/1/43/',NULL,0,NULL,0,0,0,0,NULL,NULL,'6000',NULL);

 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
--- a/db/dump/.dump/privileges.sql
+++ b/db/dump/.dump/privileges.sql
@ -49,7 +49,6 @@ INSERT IGNORE INTO `db` VALUES ('','geo','developerBoss','Y','Y','Y','Y','N','N'
 INSERT IGNORE INTO `db` VALUES ('','floranet','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT IGNORE INTO `db` VALUES ('','tmp','guest','Y','Y','Y','Y','N','Y','N','N','N','N','Y','N','N','N','N','N','N','N','N','N');
 INSERT IGNORE INTO `db` VALUES ('','util','salix','Y','Y','Y','Y','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','N','N');
-INSERT IGNORE INTO `db` VALUES ('','srt','maintenanceBoss','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 INSERT IGNORE INTO `db` VALUES ('','dipole','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT IGNORE INTO `db` VALUES ('','bi','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT IGNORE INTO `db` VALUES ('','sage','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
@ -503,7 +502,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','receipt','alexm@%','0000-
 INSERT IGNORE INTO `tables_priv` VALUES ('','hedera','grafana','visitUser','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','referenceRate','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','report','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerAssistant','producer','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','cache','productionBoss','available','guillermo@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','time','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','role','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','config__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@ -606,6 +605,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','project','jua
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','productionConfig','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','manager','productionConfig','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','creditInsurance','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','cache','productionBoss','visible','guillermo@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','errorProduction__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','invoiceOut','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','coolerAssist','Tickets','alexm@%','0000-00-00 00:00:00','Update','');
@ -792,6 +792,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Movimientos','alexm@%
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','buy','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemMinimumQuantity','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','receipt','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','producer','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','link','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','link','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','delivery','vehicle','alexm@%','0000-00-00 00:00:00','Select','');
@ -942,6 +943,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','volumeConfig','alex
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','ticketTrackingState','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','warehouse','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','role','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workCenter','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientCredit','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','worker','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','workerAppTester','alexm@%','0000-00-00 00:00:00','Select','');
@ -969,7 +971,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','officeBoss','ticketPackagingSt
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerRelatives','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','supplierPackaging','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','supplierContact','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerDocument','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceCorrection','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ink','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','zone','alexm@%','0000-00-00 00:00:00','Select','');
@ -1246,6 +1248,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','bs','deliveryAssistant','m3','alexm
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','ticketDms','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','time','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','v_Articles_botanical','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','workCenter','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','workerDepartment','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','zoneEvent','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bi','deliveryAssistant','rotacion','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@ -1387,7 +1390,7 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','entry','jenki
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos_Retorno','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimDestination','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','entryConfig','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farmingDeliveryNote','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','sage','grafana','TiposIva','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','bs','buyer','waste','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientObservation','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@ -1418,9 +1421,13 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','accountDetail'
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','accountDetail','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBoss','machineDetail','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyerSalesAssistant','route','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','workCenter','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerSalesAssistant','Rutas','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','antenna','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','bufferPool','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','enteringLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','expeditionLoading','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','failureLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','movingLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','sorterLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','genericAllocation','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','businessReasonEnd','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
@ -1458,38 +1465,15 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleDms','gu
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleInvoiceIn','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleNotes','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','production','saleGroup','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','shelvingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBoss','bufferLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','supplierAccount','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','tillSerial','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','stockBuyed','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','alertLevel','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerActivityType','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','priceDelta','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','priceDelta','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','parkingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','travelLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','supplierContact','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerDms','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemLog','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','account','developer','user','juan@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','claimReason','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','claimResponsible','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','claimResult','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','claimRedelivery','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','producer','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemStateTag','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','material','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','saleUnit','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','origin','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemType','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','delivery','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemFarmingTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemWrappingTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemLanguageTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemStemTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBaseTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemBreederTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingLog','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT IGNORE INTO `tables_priv` VALUES ('','vn','logisticAssist','itemTextureTag','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;

 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@ -1869,7 +1853,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','buy_getVolumeByE
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getVolumeByEntry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_moveNotPrinted','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getVolume','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockBuyedByWorker','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockbuyedbyworker','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','buy_getsplit','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','subordinategetlist','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_afterUpsert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@ -1922,7 +1906,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FU
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','util','employee','log_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','srt','employee','moving_between','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','bi','financial','defaultersfromdate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','bi','financial','defaultersfromdate','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','getuser','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','hasanynegativebase','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
@ -2017,7 +2001,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','hr','logshow','PROCEDURE','alex
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyerBoss','supplierpackaging_reportsource','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','financialBoss','supplierexpenses','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','grafana','firstdayofweek','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockBuyed_add','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','stockbuyed_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','mail_insert','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','administrative','duaParcialMake','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','palletizerBoss','packingsite_startcollection','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2097,6 +2081,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','collection_printst
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','deviceproductionuser_getworker','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_printlabelprevious','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_isoutclosurezone','FUNCTION','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','workermachinery_isregistered','FUNCTION','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','ticketstatetoday_setstate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','device_checklogin','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','worker_getfromhasmistake','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2104,7 +2089,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollection_n
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollection_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','setparking','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','shelvingparking_get','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','employee','report_print','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','machine_getworkerplate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_addprevok','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','sectorcollectionsalegroup_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_updateischecked','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2113,7 +2098,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','travel_updatepacki
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','freelance_getinfo','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','company_getfiscaldata','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expedition_getfromroute','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_getUltimate','FUNCTION','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','machineworker_gethistorical','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemplacementsupplyaiming','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','expeditionstate_addbypallet','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','srt','production','expeditionloading_add','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2147,6 +2132,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','collection_printstic
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','deviceproductionuser_getworker','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_printlabelprevious','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticket_isoutclosurezone','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','workermachinery_isregistered','FUNCTION','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','ticketstatetoday_setstate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','device_checklogin','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','worker_getfromhasmistake','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2154,6 +2140,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollection_new
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollection_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','setparking','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','shelvingparking_get','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','machine_getworkerplate','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','saletracking_addprevok','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','sectorcollectionsalegroup_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','saletracking_updateischecked','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2162,6 +2149,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','travel_updatepacking
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','freelance_getinfo','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','company_getfiscaldata','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expedition_getfromroute','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','machineworker_gethistorical','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','itemplacementsupplyaiming','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','delivery','expeditionstate_addbypallet','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','srt','delivery','expeditionloading_add','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@ -2223,10 +2211,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','guest','ticketCalculatePurge','
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_getUltimate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buy_getUltimate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT IGNORE INTO `procs_priv` VALUES ('','bs','buyerBoss','waste_addSales','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','saletracking_sectorcollectionaddprevok','PROCEDURE','alexm@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','saleSplit','PROCEDURE','carlosap@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','itemShelvingSale_deleteAdded','PROCEDURE','guillermo@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_getUltimate','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT IGNORE INTO `procs_priv` VALUES ('','bs','grafana','waste_addSales','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@ -2251,7 +2236,6 @@ INSERT IGNORE INTO `global_priv` VALUES ('','assetManager','{\"access\":0,\"vers
 INSERT IGNORE INTO `global_priv` VALUES ('','buyer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','buyerAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
-INSERT IGNORE INTO `global_priv` VALUES ('','buyerSalesAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
--- a/db/dump/.dump/triggers.sql
+++ b/db/dump/.dump/triggers.sql
@ -875,7 +875,7 @@ BEGIN
 			b.stickers = NEW.NumberOfUnits
 		WHERE i.supplyResponseFk = NEW.ID
 			AND am.name = 'LOGIFLORA'
-			AND tr.isRaid
+			AND e.isRaid
 			AND tr.landed >= util.VN_CURDATE();
 	
 END */;;
@ -1128,28 +1128,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `hedera`.`orderRow_afterInsert`
-	AFTER INSERT ON `orderRow`
-	FOR EACH ROW
-BEGIN
-	UPDATE `order`
-		SET rowUpdated = util.VN_NOW()
-	WHERE id = NEW.orderFk;
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;

 --
 -- Current Database: `pbx`
@ -1460,9 +1438,6 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-	IF NEW.`property` = '*' THEN
-		CALL util.throw('The property field cannot be *');
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -2003,7 +1978,6 @@ BEGIN
 	DECLARE vIsEqualizated BOOL;

 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = address_getGeo(NEW.id);

 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@ -2040,6 +2014,7 @@ DELIMITER ;;
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
+	
 	SET NEW.editorFk = account.myUser_getId();

 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@ -2050,11 +2025,6 @@ BEGIN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;

-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postalCode <=> OLD.postalCode) THEN
-
-		SET NEW.geoFk = address_getGeo(NEW.id);
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -2462,21 +2432,11 @@ DELIMITER ;;
 	AFTER UPDATE ON `business`
 	FOR EACH ROW
 BEGIN
-	DECLARE vIsActive BOOL;
-	DECLARE vExtension VARCHAR(10);
-
 	CALL worker_updateBusiness(NEW.workerFk);

 	IF NOT (OLD.workerFk <=> NEW.workerFk) THEN
 		CALL worker_updateBusiness(OLD.workerFk);
 	END IF;
-
-	IF NOT (OLD.departmentFk <=> NEW.departmentFk) THEN
-		SELECT COUNT(*) INTO vIsActive FROM worker WHERE businessFk = NEW.id;
-		IF vIsActive THEN
-			CALL queueMember_updateQueue(NEW.id);
-		END IF;
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -3431,10 +3391,8 @@ DELIMITER ;;
 	BEFORE INSERT ON `client`
 	FOR EACH ROW
 BEGIN
+
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
-	SET NEW.geoFk = client_getGeo(NEW.id);

 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@ -3443,6 +3401,10 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
+
+	SET NEW.accountingAccount = 4300000000 + NEW.id;
+    
+    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -3556,12 +3518,6 @@ BEGIN
 	IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
 		SET NEW.isTaxDataChecked = 0;
 	END IF;
-
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postcode <=> OLD.postcode) THEN
-
-		SET NEW.geoFk = client_getGeo(NEW.id);
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -4972,7 +4928,7 @@ DELIMITER ;;
 	BEFORE UPDATE ON `entry`
 	FOR EACH ROW
 BEGIN
-	DECLARE vIsRaid BOOL;
+	DECLARE vIsVirtual BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
@ -5007,10 +4963,8 @@ BEGIN
 			CALL travel_throwAwb(NEW.travelFk);
 		END IF;
 	
-		SELECT t.isRaid INTO vIsRaid
-			FROM travel t
-				JOIN entry e ON e.travelFk = t.id
-			WHERE e.id = NEW.id;
+		SELECT COUNT(*) > 0 INTO vIsVirtual
+			FROM entryVirtual WHERE entryFk = NEW.id;

 		SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
 			OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
@ -5019,7 +4973,7 @@ BEGIN
 			WHERE o.id = OLD.travelFk
 				AND n.id = NEW.travelFk;

-		IF vIsRaid AND vHasDistinctWarehouses THEN
+		IF vIsVirtual AND vHasDistinctWarehouses THEN
 			SIGNAL SQLSTATE '45000'
 				SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
 		END IF;
@ -5340,7 +5294,6 @@ BEGIN
 		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
 		WHERE t.id = OLD.ticketFk;	
        
-	CALL expedition_selfConsumptionPackaging(OLD.id, 'remove');
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -6601,9 +6554,6 @@ BEGIN
 		SET NEW.userFk = account.myUser_getId();
 	END IF;

-	IF NEW.shelvingFk <> OLD.shelvingFk THEN
-		SET NEW.movingState = NULL;
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -6704,11 +6654,11 @@ DELIMITER ;;
 	AFTER INSERT ON `itemShelvingSale`
 	FOR EACH ROW
 BEGIN 	
+	
 	UPDATE sale s
 			JOIN operator o ON o.workerFk = account.myUser_getId()
-			JOIN sector se ON se.id = o.sectorFk
-		SET s.isPicked = IF(IFNULL(se.isOnReservationMode, o.isOnReservationMode), s.isPicked, TRUE)
-		WHERE s.id = NEW.saleFk;
+		SET s.isPicked = IF(o.isOnReservationMode, s.isPicked, TRUE)		
+		WHERE id = NEW.saleFk;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -6924,31 +6874,10 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_beforeInsert`
-	BEFORE INSERT ON `itemType`
-	FOR EACH ROW
-BEGIN
-	SET NEW.editorFk = account.myUser_getId();
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_beforeUpdate`
 	BEFORE UPDATE ON `itemType`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
 	IF NEW.itemPackingTypeFk = '' THEN

 		SET NEW.itemPackingTypeFk = NULL;
@ -6975,30 +6904,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`itemType_afterDelete`
-	AFTER DELETE ON `itemType`
-	FOR EACH ROW
-BEGIN
-	INSERT INTO itemTypeLog
-		SET `action` = 'delete',
-			`changedModel` = 'ItemType',
-			`changedModelId` = OLD.id,
-			`userFk` = account.myUser_getId();
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`machine_beforeInsert`
 	BEFORE INSERT ON `machine`
 	FOR EACH ROW
@ -7644,7 +7549,7 @@ DELIMITER ;;
 	AFTER DELETE ON `productionConfig`
 	FOR EACH ROW
 BEGIN
-	INSERT INTO productionConfigLog
+	INSERT INTO productionConfig
 		SET `action` = 'delete',
 			`changedModel` = 'ProductionConfig',
 			`changedModelId` = OLD.id,
@ -8247,8 +8152,7 @@ BEGIN
 		OR !(NEW.kmEnd <=> OLD.kmEnd)
 		OR !(NEW.workerFk <=> OLD.workerFk)
 		OR !(NEW.m3 <=> OLD.m3)
-		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)
-		OR !(NEW.vehicleFk <=> OLD.vehicleFk)THEN
+		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)THEN
 			CALL route_calcCommission(NEW.id);
 	END IF;

@ -9147,7 +9051,6 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = supplier_getGeo(NEW.id);
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -9242,11 +9145,6 @@ BEGIN
 		SET NEW.isPayMethodChecked = FALSE;
 	END IF;

-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postCode <=> OLD.postCode) THEN
-
-		SET NEW.geoFk = supplier_getGeo(NEW.id);
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10090,8 +9988,6 @@ DELIMITER ;;
 	BEFORE INSERT ON `ticketRefund`
 	FOR EACH ROW
 BEGIN
-	CALL ticketRefund_upsert(NEW.refundTicketFk, NEW.originalTicketFk);
-	
 	SET NEW.editorFk = account.myUser_getId();
 END */;;
 DELIMITER ;
@ -10112,8 +10008,6 @@ DELIMITER ;;
 	BEFORE UPDATE ON `ticketRefund`
 	FOR EACH ROW
 BEGIN
-	CALL ticketRefund_upsert(NEW.refundTicketFk, NEW.originalTicketFk);
-	
 	SET NEW.editorFk = account.myUser_getId();
 END */;;
 DELIMITER ;
@ -10568,6 +10462,28 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_beforeUpdate`
+	BEFORE UPDATE ON `town`
+	FOR EACH ROW
+BEGIN
+	-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
+	-- 	CALL zoneGeo_throwNotEditable;
+	-- END IF;
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`vn`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterUpdate`
 	AFTER UPDATE ON `town`
 	FOR EACH ROW
@ -10626,10 +10542,6 @@ BEGIN

 	CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	
-	IF NEW.isRaid IS NOT NULL OR NEW.daysInForward IS NOT NULL THEN
-		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
-	END IF;
-
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
@ -10669,10 +10581,6 @@ BEGIN
 		CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	END IF;

-	IF NOT (NEW.isRaid <=> OLD.isRaid)  OR NOT (NEW.daysInForward <=> OLD.daysInForward) THEN
-		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
-	END IF;
-
 	IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
 		SELECT COUNT(*) INTO vHasAnyInvoiceBooked 
 			FROM travel t
@ -10770,15 +10678,6 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
-	IF NEW.travelFk IS NULL AND
-		(SELECT COUNT(*) FROM travelThermograph
-			WHERE thermographFk = NEW.thermographFk
-				AND travelFk IS NULL
-				AND id <> NEW.id) > 0
-	THEN
-		CALL util.throw('Duplicate thermographFk without travelFk not allowed.');
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -10799,15 +10698,6 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
-	IF NEW.travelFk IS NULL AND
-		(SELECT COUNT(*) FROM travelThermograph
-			WHERE thermographFk = NEW.thermographFk
-				AND travelFk IS NULL
-				AND id <> NEW.id) > 0
-	THEN
-		CALL util.throw('Duplicate thermographFk without travelFk not allowed.');
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -11579,4 +11469,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2024-11-26 12:09:13
+-- Dump completed on 2024-10-03  7:43:14
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -400,11 +400,11 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
-        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 0, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 0, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');

 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
-    SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 0, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
+    SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
        FROM `account`.`role` `r`
        WHERE `r`.`hasLogin` = 1;

@ -1254,9 +1254,9 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)

 INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`,`buyFk`, `userFk`)
    VALUES
-        (2, 11, 1, 1, 1, 2,1106),
-        (4, 12, 1, 1, 1, NULL,1106),
-        (1, 13, 2, 12, 12, NULL,1106);
+        (2, 'GVC', 1, 1, 1, 2,1106),
+        (4, 'HEJ', 1, 1, 1, NULL,1106),
+        (1, 'UXN', 2, 12, 12, NULL,1106);

 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
    VALUES
@ -1505,32 +1505,32 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
        (9,     '99610289193', 302, 2972,   util.VN_CURDATE(),  3871, 442, 1),
        (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);

-INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `isRaid`, `daysInForward`)
-    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, FALSE, NULL),
-        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, FALSE, NULL),
-        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, FALSE, NULL),
-        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, FALSE, NULL),
-        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, FALSE, NULL),
-        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, FALSE,NULL),
-        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, TRUE, 2),
-        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, FALSE, NULL),
-        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, TRUE, 2),
-        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
-        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
+INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `daysInForward`)
+    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, NULL),
+        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, NULL),
+        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, NULL),
+        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, NULL),
+        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, NULL),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, NULL),
+        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, 2),
+        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, NULL),
+        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, 2),
+        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL),
+        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL);

-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`)
    VALUES
-		(1,		1,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 	1, 442, 'IN2001', 'Movement 1', 0, '', 'packaging'),
-		(2,		2,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 442, 'IN2002', 'Movement 2', 0, 'observation two', 'product'),
-		(3,		1, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 	0, 442, 'IN2003', 'Movement 3', 0, 'observation three', 'product'),
-		(4,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 69,	'IN2004', 'Movement 4', 0, 'observation four', 'product'),
-		(5,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 	0, 442, 'IN2005', 'Movement 5', 0, 'observation five', 'product'),
-		(6,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 	0, 442, 'IN2006', 'Movement 6', 0, 'observation six', 'product'),
-		(7,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2007', 'Movement 7', 0, 'observation seven', 'product'),
-		(8,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2008', 'Movement 8', 1, '', 'product'),
-		(9,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 9', 1, '', 'product'),
-		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 10', 1, '', 'product'),
-		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99', 0, '', 'product');
+        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, ''),
+        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 'observation two'),
+        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 'observation three'),
+        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 'observation four'),
+        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 'observation five'),
+        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 'observation six'),
+        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 'observation seven'),
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1,''),
+        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, ''),
+        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, ''),
+        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, '');

 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@ -2046,13 +2046,6 @@ INSERT INTO `pbx`.`prefix` (country, prefix)
        ('fr', '0033'),
        ('pt', '00351');

-INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
-    VALUES
-        (1, 1010),
-        (3, 1101),
-        (5, 1102),
-        (9, 1201);
-
 INSERT INTO `vn`.`professionalCategory` (`id`, `description`)
    VALUES
        (1, 'employee'),
@ -2476,8 +2469,7 @@ INSERT INTO `vn`.`dmsType`
        (20, 	'Reclamación',         	1,      		1,      		'claim'),
        (21, 	'Entrada',             	1,      		1,      		'entry'),
 		(22, 	'Proveedor',           	1,      		1,      		'supplier'),
-		(23, 	'Termografos',			35,    			35,    			'thermograph'),
-		(24, 	'Sello de calidad',		1,    			1,    			'qualitySeal');
+		(23, 	'Termografos',			35,    			35,    			'thermograph');

 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
    VALUES
@ -2521,6 +2513,10 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`, `code`)
        (2, 'Normal', 'normal'),
        (3, 'Baja', 'low');

+INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`)
+    VALUES
+        (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000);
+
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');

 INSERT INTO `vn`.`thermograph`(`id`, `model`)
@ -2951,9 +2947,9 @@ INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
    VALUES
        (1, 9);

-INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`, `clientSelfConsumptionFk`, `addressSelfConsumptionFk`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`)
    VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600, 1112, 12);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);

 INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
    VALUES
@ -3421,7 +3417,7 @@ INSERT INTO vn.buy
 INSERT INTO vn.itemShelving
 	SET id = 9931,
 		itemFk = 999993,
-		shelvingFk = 16,
+		shelvingFk = 'NCC',
 		visible = 10,
 		`grouping` = 5,
 		packing = 10;
@ -3748,7 +3744,7 @@ INSERT vn.sale

 USE vn;
 DELETE ish.*  FROM vn.itemShelving ish
-		JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+		JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 		JOIN vn.parking p ON p.id = sh.parkingFk
 		JOIN vn.sector s ON s.id = p.sectorFk
 		JOIN vn.warehouse w ON w.id = s.warehouseFk
@ -3757,22 +3753,22 @@ DELETE ish.*  FROM vn.itemShelving ish
 INSERT INTO vn.itemShelving
 (itemFk, shelvingFk, visible, created, `grouping`, packing, packagingFk, userFk, isChecked)
 VALUES
-	(999991, 14, 8, '2023-09-20', 1, 20, NULL, 103, NULL),
-	(999998, 14, 80, '2023-09-20', 10, 30, NULL, 103, NULL),
-	(1000001, 14, 6, '2023-09-20', 3, 50, NULL, 103, NULL),
-	(1000000, 15, 50, '2023-09-18', 25, 500, NULL, 103, NULL),
-	(999993, 15, 25, '2023-09-18', NULL, 10, NULL, 103, NULL),
-	(999999, 15, 30, '2023-09-18', 10, 500, NULL, 103, NULL),
-	(999993, 16, 25, '2023-09-20', 5, 10, NULL, 103, NULL),
-	(999997, 16, 10, '2023-09-20', NULL, 100, NULL, 103, NULL),
-	(999999, 16, 40, '2023-09-20', 10, 500, NULL, 103, NULL),
-	(999995, 17, 10, '2023-09-19', NULL, 20, NULL, 103, NULL),
-	(999994, 17, 48, '2023-09-19', 4, 20, NULL, 103, NULL),
-	(1000001, 18, 6, '2023-09-21', 3, 50, NULL, 103, NULL),
-	(999992, 18, 50, '2023-09-21', NULL, 1, NULL, 103, NULL),
-	(1000000, 18, 25, '2023-09-21', 25, 500, NULL, 103, NULL),
-	(999996, 19, 5, '2023-09-27', 1, 5, NULL, 103, NULL),
-	(999997, 21, 10, '2023-09-27', 5, 100, NULL, 103, NULL);
+	(999991, 'NAA', 8, '2023-09-20', 1, 20, NULL, 103, NULL),
+	(999998, 'NAA', 80, '2023-09-20', 10, 30, NULL, 103, NULL),
+	(1000001, 'NAA', 6, '2023-09-20', 3, 50, NULL, 103, NULL),
+	(1000000, 'NBB', 50, '2023-09-18', 25, 500, NULL, 103, NULL),
+	(999993, 'NBB', 25, '2023-09-18', NULL, 10, NULL, 103, NULL),
+	(999999, 'NBB', 30, '2023-09-18', 10, 500, NULL, 103, NULL),
+	(999993, 'NCC', 25, '2023-09-20', 5, 10, NULL, 103, NULL),
+	(999997, 'NCC', 10, '2023-09-20', NULL, 100, NULL, 103, NULL),
+	(999999, 'NCC', 40, '2023-09-20', 10, 500, NULL, 103, NULL),
+	(999995, 'NDD', 10, '2023-09-19', NULL, 20, NULL, 103, NULL),
+	(999994, 'NDD', 48, '2023-09-19', 4, 20, NULL, 103, NULL),
+	(1000001, 'NEE', 6, '2023-09-21', 3, 50, NULL, 103, NULL),
+	(999992, 'NEE', 50, '2023-09-21', NULL, 1, NULL, 103, NULL),
+	(1000000, 'NEE', 25, '2023-09-21', 25, 500, NULL, 103, NULL),
+	(999996, 'PAA', 5, '2023-09-27', 1, 5, NULL, 103, NULL),
+	(999997, 'PCC', 10, '2023-09-27', 5, 100, NULL, 103, NULL);

 -- Previous for Bolas de madera
 INSERT IGNORE INTO vn.sectorCollection
@ -3999,37 +3995,7 @@ INSERT INTO pbx.queue (description, name, config)

 INSERT IGNORE INTO pbx.queueMember
    SET queue = '1000',
-        extension = '1010';
+        extension = '1111';

 UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
 UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
-
-INSERT INTO vn.workerRelatives (workerFk, isDescendant, disabilityGradeFk, birthed, adoptionYear, isDependend, isJointCustody, updated)
-	VALUES
-		(1106, 1, NULL, 0, NULL, 0, 0, '2024-10-29 08:42:44.000');
-INSERT INTO vn.routeAction (id, name, price, isMainlineDelivered) VALUES(1, 'Pintar traje', 50.00, 0);
-INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUES(1, util.VN_CURDATE(), 9, 50.00, 1);
-
-
-INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk)
-    VALUES  (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (2, 0, 0, 450, 13000, 1, 0, 1, '01A', 1, 1, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (3, 1400, 0, 450, 13000, 1, 0, 1, '01B', 1, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (4, 0, 500, 500, 13000, 1, 4, 1, '02A', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
-            (5, 1400, 500, 500, 13000, 1, 4, 1, '02B', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
-            (6, 0, 1000, 500, 13000, 1, 1, 1, '03A', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (7, 1400, 1000, 500, 13000, 1, 1, 1, '03B', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (8, 0, 1500, 500, 13000, 1, 0, 1, '04A', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
-            (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
-
-INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
-	VALUES (19, '1169'),
-			(8, '1183');
-
-INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
-	VALUES ('saysimle-url-mock', 1320);
-
-INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
-	VALUES (1106,'26493101E','2019-09-20');
--- a/db/routines/account/views/myUser.sql
+++ b/db/routines/account/views/myUser.sql
@ -7,7 +7,8 @@ AS SELECT `u`.`id` AS `id`,
 	`u`.`email` AS `email`,
 	`u`.`nickname` AS `nickname`,
 	`u`.`lang` AS `lang`,
-	`u`.`role` AS `role`
+	`u`.`role` AS `role`,
+	`u`.`recoverPass` AS `recoverPass`
 FROM `account`.`user` `u`
 WHERE `u`.`name` = `myUser_getName`()
 WITH CASCADED CHECK OPTION
--- a/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql
+++ b/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql
@ -32,7 +32,7 @@ BEGIN
 		CREATE OR REPLACE TEMPORARY TABLE tVisible
 			SELECT itemFk, SUM(visible) totalVisible
 				FROM vn.itemShelving ish
-					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+					JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector sc ON sc.id = p.sectorFk
 					WHERE sc.warehouseFk = vWarehouseFk
--- a/db/routines/cache/procedures/availableNoRaids_refresh.sql
+++ b/db/routines/cache/procedures/availableNoRaids_refresh.sql
@ -53,7 +53,7 @@ proc: BEGIN
 					WHERE t.landed BETWEEN vInventoryDate AND vStartDate
 						AND t.warehouseInFk = vWarehouse
 						AND s.name != 'INVENTARIO'
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 					GROUP BY b.itemFk
 			) c
 				JOIN vn.item i ON i.id = c.itemFk
--- a/db/routines/edi/triggers/supplyResponse_afterUpdate.sql
+++ b/db/routines/edi/triggers/supplyResponse_afterUpdate.sql
@ -14,7 +14,7 @@ BEGIN
 			b.stickers = NEW.NumberOfUnits
 		WHERE i.supplyResponseFk = NEW.ID
 			AND am.name = 'LOGIFLORA'
-			AND tr.isRaid
+			AND tr.daysInForward
 			AND tr.landed >= util.VN_CURDATE();

 END$$
--- a/db/routines/hedera/procedures/item_getVisible.sql
+++ b/db/routines/hedera/procedures/item_getVisible.sql
@ -59,7 +59,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.landed BETWEEN vDateInv AND vDate
 						AND t.warehouseInFk = vWarehouse
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, -b.quantity
 					FROM vn.buy b
@ -67,7 +67,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseOutFk = vWarehouse
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 						AND t.isDelivered
 				UNION ALL
 				SELECT m.itemFk, -m.quantity
--- a/db/routines/hedera/procedures/order_getTax.sql
+++ b/db/routines/hedera/procedures/order_getTax.sql
@ -9,54 +9,45 @@ BEGIN
 * @param vOrder El identificador del pedido
 * @return tmp.orderTax Bases imponibles, IVA y recargo de equivalencia
 */
- 	-- No poner create or replace, ya que da problemas
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
 	CREATE TEMPORARY TABLE tmp.addressCompany
 		(INDEX (addressFk, companyFk))
 		ENGINE = MEMORY 
 		SELECT DISTINCT o.address_id addressFk, o.company_id companyFk
 			FROM tmp.`order` tmpOrder
-				JOIN `order` o ON o.id = tmpOrder.orderFk;
+				JOIN hedera.`order` o ON o.id = tmpOrder.orderFk;

-	CALL vn.addressTaxArea();
+	CALL vn.addressTaxArea;

 	-- Calcula el IVA y el recargo desglosado.
-	CREATE OR REPLACE TEMPORARY TABLE tmp.orderTax
-		(PRIMARY KEY (orderFk, code, rate))
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.orderTax;
+	CREATE TEMPORARY TABLE tmp.orderTax
+		(INDEX (orderFk))
 		ENGINE = MEMORY
-		WITH orders AS (
-			SELECT tor.orderFk,
-					oro.amount * oro.price total,
-					s.countryFk,
-					ata.areaFk,
-					itc.taxClassFk
-				FROM hedera.orderRow oro
-					JOIN tmp.order tor ON tor.orderFk = oro.orderFk
-					JOIN hedera.`order` o ON o.id = tor.orderFk
-					JOIN vn.item i ON i.id = oro.itemFk
+		SELECT o.id orderFk,
+				tc.code,
+				SUM(m.amount * m.price) taxableBase,
+				pgc.rate
+			FROM tmp.`order` tmpOrder
+				JOIN `order` o ON o.id = tmpOrder.orderFk
+				JOIN orderRow m ON m.orderFk = o.id
+				JOIN vn.item i ON i.id = m.itemFk
 				JOIN vn.`client` c ON c.id = o.customer_id
 				JOIN vn.supplier s ON s.id = o.company_id
-					JOIN tmp.addressTaxArea ata ON ata.addressFk = o.address_id
-						AND ata.companyFk = o.company_id
-					JOIN vn.itemTaxCountry itc ON itc.itemFk = i.id
-						AND itc.countryFk = s.countryFk
-				HAVING total
-		)
-		SELECT o.orderFk,
-				tc.code,
-				SUM(o.total) taxableBase,
-				pgc.rate
-			FROM orders o
-				JOIN vn.bookingPlanner bp ON bp.countryFk = o.countryFk
-					AND bp.taxAreaFk = o.areaFk
-					AND bp.taxClassFk = o.taxClassFk
-				JOIN vn.pgc ON pgc.code = bp.pgcFk
+				JOIN tmp.addressTaxArea ata
+					ON ata.addressFk = o.address_id AND ata.companyFk = o.company_id
+				JOIN vn.itemTaxCountry itc
+					ON itc.itemFk = i.id AND itc.countryFk = s.countryFk
+				JOIN vn.bookingPlanner bp
+					ON bp.countryFk = s.countryFk
+						AND bp.taxAreaFk = ata.areaFk
+						AND bp.taxClassFk = itc.taxClassFk
+				JOIN vn.pgc ON pgc.`code` = bp.pgcFk
 				JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
-			GROUP BY o.orderFk, pgc.code, pgc.rate
-			HAVING taxableBase
-			ORDER BY bp.priority;
+			GROUP BY tmpOrder.orderFk, pgc.`code`, pgc.rate
+			HAVING taxableBase != 0;
 					
-	-- No poner create or replace, ya que da problemas
 	DROP TEMPORARY TABLE IF EXISTS tmp.orderAmount;
 	CREATE TEMPORARY TABLE tmp.orderAmount
 		(INDEX (orderFk))
--- a/db/routines/pbx/procedures/sip_isValid.sql
+++ b/db/routines/pbx/procedures/sip_isValid.sql
@ -1,21 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `pbx`.`sip_isValid`(vExtension VARCHAR(255))
-BEGIN
-/**
- * Check if an extension has the correct format and
- * throws an exception if it hasn't.
- *
- * @param vExtension The extension
- */
-	DECLARE vIsValid BOOL;
-
-	SET vIsValid =  vExtension IS NULL
-		OR (vExtension REGEXP '^[0-9]{4}$'
-		AND MOD(vExtension, 100) != 0);
-
-	IF NOT vIsValid THEN
-		SIGNAL SQLSTATE '45000'
-			SET MESSAGE_TEXT = 'Extension format is invalid';
-	END IF;
-END$$
-DELIMITER ;
--- a/db/routines/pbx/triggers/sip_beforeInsert.sql
+++ b/db/routines/pbx/triggers/sip_beforeInsert.sql
@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`sip_beforeInsert`
-	BEFORE INSERT ON `sip`
-	FOR EACH ROW
-BEGIN
-	CALL sip_isValid(NEW.extension);
-END$$
-DELIMITER ;
--- a/db/routines/pbx/triggers/sip_beforeUpdate.sql
+++ b/db/routines/pbx/triggers/sip_beforeUpdate.sql
@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `pbx`.`sip_beforeUpdate`
-	BEFORE UPDATE ON `sip`
-	FOR EACH ROW
-BEGIN
-	CALL sip_isValid(NEW.extension);
-END$$
-DELIMITER ;
--- a/db/routines/sage/procedures/invoiceIn_add.sql
+++ b/db/routines/sage/procedures/invoiceIn_add.sql
@ -26,7 +26,7 @@ BEGIN

 	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
-				CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
+				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
@ -39,8 +39,7 @@ BEGIN
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
 			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL
-			GROUP BY it.taxTypeSageFk;
+				AND d.id IS NULL;

 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

--- a/db/routines/stock/procedures/log_refreshBuy.sql
+++ b/db/routines/stock/procedures/log_refreshBuy.sql
@ -6,11 +6,12 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
 	CREATE TEMPORARY TABLE tValues
 		ENGINE = MEMORY
-		SELECT b.id buyFk,
+		SELECT
+				b.id buyFk,
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
-				t.isRaid,
+				t.daysInForward,
 				ADDTIME(t.shipped,
 					IFNULL(t.shipmentHour, '00:00:00')) shipped,
 				t.warehouseOutFk,
@ -49,7 +50,7 @@ BEGIN
 				itemFk,
 				TIMESTAMPADD(DAY, life, @dated),
 				quantity,
-				IF(isIn, isReceived, isDelivered) AND NOT isRaid
+				IF(isIn, isReceived, isDelivered) AND NOT daysInForward
 			FROM tValues
 			WHERE isIn OR !lessThanInventory;

@ -64,7 +65,7 @@ BEGIN
 				itemFk,
 				created,
 				quantity,
-				IF(isIn, isDelivered, isReceived) AND NOT isRaid
+				IF(isIn, isDelivered, isReceived) AND NOT daysInForward
 			FROM tValues
 			WHERE !isIn OR !lessThanInventory;

--- a/db/routines/vn/functions/address_getGeo.sql
+++ b/db/routines/vn/functions/address_getGeo.sql
@ -14,12 +14,9 @@ BEGIN
 	SELECT p.geoFk INTO vGeoFk
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-				AND (p.code = a.postalCode OR a.postalCode IS NULL)
-			JOIN zoneGeo zg ON zg.id = p.geoFk
+			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
-			(p.code = a.postalCode) DESC
+		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
 		LIMIT 1;

 	RETURN vGeoFk;
--- a/db/routines/vn/functions/client_getGeo.sql
+++ b/db/routines/vn/functions/client_getGeo.sql
@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getGeo`(vSelf INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the geo for the passed client.
- *
- * @param vSelf The address id
- * @return The geo id
- */
- 	DECLARE vGeoFk INT;
-
-	SELECT p.geoFk INTO vGeoFk
-		FROM client c
-			JOIN town t ON t.provinceFk = c.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-				AND (p.code = c.postcode OR c.postcode IS NULL)
-			JOIN zoneGeo zg ON zg.id = p.geoFk
-		WHERE c.id = vSelf
-		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
-			(p.code = c.postcode) DESC
-		LIMIT 1;
-
-	RETURN vGeoFk;
-END$$
-DELIMITER ;
--- a/db/routines/vn/functions/entry_getCommission.sql
+++ b/db/routines/vn/functions/entry_getCommission.sql
@ -9,14 +9,40 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getCommission`(v
 BEGIN
    DECLARE vCommission INT;
    DECLARE vCurrentCommission INT;
-	DECLARE vIsNotEUR INT;
+    DECLARE vIsCurrencyUsd INT;
    DECLARE vLastEntryFk INT;
    
-	SELECT count(*) INTO vIsNotEUR
+    SELECT count(*) INTO vIsCurrencyUsd
            FROM currency c
-			WHERE c.code <> 'EUR' AND id = vCurrencyFk;
+            WHERE c.code = 'USD' AND id = vCurrencyFk;
+    
+    IF NOT vIsCurrencyUsd THEN
+    
+		SELECT e.id INTO vLastEntryFk
+			FROM vn.entry e
+				JOIN vn.travel tr ON tr.id = e.travelFk
+                WHERE e.supplierFk = vSupplierFk
+                ORDER BY tr.landed DESC
+                LIMIT 1;
+        
+        IF vLastEntryFk THEN
+        
+			SELECT commission INTO vCurrentCommission
+				FROM vn.entry
+                WHERE id = vLastEntryFk;
+        
+        ELSE
+        
+			SELECT commission INTO vCurrentCommission
+				FROM supplier s
+				WHERE s.id = vSupplierFk;
+        
+		END IF;
+        
+        RETURN vCurrentCommission;
+        
+    ELSE

-	IF vIsNotEUR THEN
 		SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission
 			FROM travel t
 				LEFT JOIN referenceCurrent r ON r.currencyFk = vCurrencyFk AND r.`dated` <= t.shipped
@ -25,27 +51,8 @@ BEGIN
 			LIMIT 1;
        
 		RETURN IFNULL(vCommission, 0);
-	ELSE
-		SELECT e.id INTO vLastEntryFk
-			FROM `entry` e
-				JOIN travel tr ON tr.id = e.travelFk
-				WHERE e.supplierFk = vSupplierFk
-				ORDER BY tr.landed DESC
-				LIMIT 1;
-
-		IF vLastEntryFk THEN
-			SELECT commission INTO vCurrentCommission
-				FROM `entry`
-				WHERE id = vLastEntryFk;
-
-		ELSE
-			SELECT commission INTO vCurrentCommission
-				FROM supplier s
-				WHERE s.id = vSupplierFk;
    
    END IF;
    
-		RETURN vCurrentCommission;
-	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/functions/hasItemsInSector.sql
+++ b/db/routines/vn/functions/hasItemsInSector.sql
@ -9,7 +9,7 @@ BEGIN
    SELECT count(*) INTO vItemCount
 		FROM vn.sale s 
 			JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
-            JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
            JOIN vn.parking p ON p.id = sh.parkingFk
 		WHERE s.ticketFk = vTicketFk
 			AND p.sectorFk = vSectorFk;
--- a/db/routines/vn/functions/itemsInSector_get.sql
+++ b/db/routines/vn/functions/itemsInSector_get.sql
@ -10,7 +10,7 @@ BEGIN
    SELECT count(*) INTO vItemCount
 		FROM vn.sale s 
 			JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
-            JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
            JOIN vn.parking p ON p.id = sh.parkingFk
 		WHERE s.ticketFk = vTicketFk
 			AND p.sectorFk = vSectorFk;
--- a/db/routines/vn/functions/supplier_getGeo.sql
+++ b/db/routines/vn/functions/supplier_getGeo.sql
@ -1,29 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`supplier_getGeo`(vSelf INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the geo for the passed supplier.
- *
- * @param vSelf The address id
- * @return The geo id
- */
- 	DECLARE vGeoFk INT;
-
-	SELECT p.geoFk INTO vGeoFk
-		FROM supplier s
-			JOIN town t ON t.provinceFk = s.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-				AND (p.code = s.postCode OR s.postCode IS NULL)
-			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
-			JOIN zoneGeo zg ON zg.id = p.geoFk
-		WHERE s.id = vSelf
-		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
-			(p.code = s.postCode) DESC,
-			(p.code = sad.postalCode) DESC
-		LIMIT 1;
-
-	RETURN vGeoFk;
-END$$
-DELIMITER ;
--- a/db/routines/vn/functions/timeWorkerControl_getDirection.sql
+++ b/db/routines/vn/functions/timeWorkerControl_getDirection.sql
@ -0,0 +1,65 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`timeWorkerControl_getDirection`(vUserFk INT, vTimed DATETIME)
+	RETURNS varchar(6) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
+	NOT DETERMINISTIC
+	READS SQL DATA
+BEGIN
+/**
+ * Verifica la dirección de la fichada 
+ * @param vUserFk Identificador del trabajador
+ * @param vTimed Hora de la fichada
+ * @return Retorna sentido de la fichada 'in, out, middle'
+ */
+
+	DECLARE vPrevious DATETIME ;
+    DECLARE vNext DATETIME ;
+    DECLARE vPreviousDirection VARCHAR(3) ;
+    DECLARE vNextDirection VARCHAR(3) ;
+    DECLARE vDayStayMax INT;
+    DECLARE vTimedSeconds INT;
+    DECLARE vLastTimeIn INT;
+	
+    SELECT UNIX_TIMESTAMP(vTimed) INTO vTimedSeconds;
+    
+    SELECT dayStayMax INTO vDayStayMax
+		FROM vn.workerTimeControlParams;
+
+    SELECT timed, direction INTO vNext,vNextDirection
+		FROM vn.workerTimeControl 
+        WHERE userFk = vUserFk 
+			AND direction IN ('in','out')
+            AND timed > vTimed
+		ORDER BY timed ASC
+        LIMIT 1;
+        
+    SELECT timed, direction INTO vPrevious, vPreviousDirection
+		FROM vn.workerTimeControl 
+        WHERE userFk = vUserFk 
+			AND direction IN ('in','out')
+            AND timed < vTimed
+		ORDER BY timed DESC
+        LIMIT 1;   
+	
+    IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in'  AND vNextDirection = 'out' THEN 
+		RETURN 'middle';
+	END IF;
+    
+    
+    IF (vTimedSeconds> UNIX_TIMESTAMP(vPrevious)) THEN
+		IF vPreviousDirection = 'in' THEN 
+			RETURN 'out';
+		ELSE
+			SELECT UNIX_TIMESTAMP(MAX(timed)) INTO vLastTimeIn
+				FROM vn.workerTimeControl 
+				WHERE userFk = vUserFk 
+					AND direction ='in'
+					AND timed < vPrevious;
+			IF vTimedSeconds - vLastTimeIn <= vDayStayMax THEN
+				RETURN 'out';
+            END IF;
+		END IF;
+	END IF;
+
+	RETURN 'in';
+END$$
+DELIMITER ;
--- a/db/routines/vn/procedures/absoluteInventoryHistory.sql
+++ b/db/routines/vn/procedures/absoluteInventoryHistory.sql
@ -39,7 +39,7 @@ BEGIN
 						AND vWarehouseFk IN (tr.warehouseInFk, 0)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT tr.isRaid
+						AND NOT tr.daysInForward
 				UNION ALL
 				SELECT tr.shipped,
 						NULL,
@ -58,7 +58,7 @@ BEGIN
 						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT tr.isRaid
+						AND NOT tr.daysInForward
 				UNION ALL
 				SELECT t.shipped,
 						NULL,
--- a/db/routines/vn/procedures/available_traslate.sql
+++ b/db/routines/vn/procedures/available_traslate.sql
@ -42,7 +42,7 @@ proc: BEGIN
 			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
 				AND t.warehouseInFk = vWarehouseLanding
 				AND NOT e.isExcludedFromAvailable
-				AND NOT t.isRaid
+				AND NOT t.daysInForward
 			GROUP BY c.itemFk;

 	-- Tabla con el ultimo dia de last_buy para cada producto
@ -57,7 +57,7 @@ proc: BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
 			WHERE t.warehouseFk = vWarehouseShipment
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 	ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
 	tr.landed);

@ -94,7 +94,7 @@ proc: BEGIN
 				JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
 			WHERE NOT e.isExcludedFromAvailable
 				AND b.quantity <> 0
-				AND NOT t.isRaid
+				AND NOT t.daysInForward
 				AND t.warehouseInFk = vWarehouseLanding
 				AND t.landed >= vDatedFrom
 				AND (ir.dated IS NULL OR t.landed <= ir.dated)
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@ -56,7 +56,7 @@ BEGIN
 			AND ts.id IS NULL;
 	DELETE FROM claim WHERE ticketCreated < v4Years;
 	-- Robert ubicacion anterior de travelLog comentario para debug
-	DELETE FROM zoneEvent WHERE dated < v2Months OR ended < v2Months;
+	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months;
 	DELETE b FROM buy b
 			JOIN entryConfig e ON e.defaultEntry = b.entryFk
 		WHERE b.created < v2Months;
--- a/db/routines/vn/procedures/collectionPlacement_get.sql
+++ b/db/routines/vn/procedures/collectionPlacement_get.sql
@ -83,7 +83,7 @@ BEGIN
 								AND s.semaphore = 1
 							GROUP BY st.saleFk) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
-				JOIN shelving sh ON sh.id = ish.shelvingFk
+				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
 				JOIN sectorType st ON st.id = sc.typeFk
--- a/db/routines/vn/procedures/collection_getTickets.sql
+++ b/db/routines/vn/procedures/collection_getTickets.sql
@ -30,9 +30,7 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			IFNULL(ob.description,'') observaciones,
-			cc.rgb,
-			p.code parkingCode,
-			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
+			cc.rgb
 		FROM vn.ticket t
 			LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk
@ -45,9 +43,6 @@ BEGIN
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
-			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
-			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
-			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE t.id = vParamFk 
 			AND t.shipped >= vYesterday
 	UNION
@ -57,9 +52,7 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			ob.description,
-			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`,
-			p.code parkingCode,
-			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
+			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`
 		FROM vn.ticket t
 			JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	
@ -72,9 +65,6 @@ BEGIN
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
-			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
-			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
-			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE tc.collectionFk = vParamFk
 	UNION
 	SELECT sg.ticketFk,
@ -83,9 +73,7 @@ BEGIN
 			t.warehouseFk,
 			c.salesPersonFk,
 			ob.description,
-			NULL `rgb`,
-			p.code parkingCode,
-			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
+			NULL `rgb`
 		FROM vn.sectorCollection sc
 			JOIN vn.sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id 
 			JOIN vn.saleGroup sg ON sg.id = ss.saleGroupFk
@ -94,9 +82,6 @@ BEGIN
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk 
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 			LEFT JOIN vn.client c ON c.id = t.clientFk	
-			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
-			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
-			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE sc.id = vParamFk
 			AND t.shipped >= vYesterday
 			GROUP BY ticketFk;
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@ -146,6 +146,8 @@ BEGIN
 		DELETE pb
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
+				JOIN agencyMode am ON am.id = pb.agencyModeFk
+				JOIN agency a ON a.id = am.agencyFk
 				LEFT JOIN (
 					SELECT pb.ticketFk, MAX(i.`size`) maxSize
 						FROM tmp.productionBuffer pb
@ -156,7 +158,7 @@ BEGIN
 				) sub ON sub.ticketFk = pb.ticketFk
 				JOIN productionConfig pc
 			WHERE pb.shipped <> util.VN_CURDATE()
-				OR pb.ubicacion IS NULL
+				OR (pb.ubicacion IS NULL AND a.isOwn)
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL
--- a/db/routines/vn/procedures/entry_getTransfer.sql
+++ b/db/routines/vn/procedures/entry_getTransfer.sql
@ -166,7 +166,7 @@ BEGIN
 				LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id
 				LEFT JOIN buy b3 ON b3.id = bufi.buyFk
 		WHERE ic.display
-			AND NOT tr.isRaid
+			AND NOT tr.daysInForward
 			AND (ti.visible OR ti.available)
 			ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name;

--- a/db/routines/vn/procedures/entry_isEditable.sql
+++ b/db/routines/vn/procedures/entry_isEditable.sql
@ -9,18 +9,16 @@ BEGIN
 *
 * @param vSelf Id de entrada
 */
-	DECLARE vIsNotEditable BOOL DEFAULT FALSE;
+	DECLARE vIsEditable BOOL;

-	SELECT TRUE INTO vIsNotEditable
+	SELECT e.isBooked INTO vIsEditable
 		FROM `entry` e
-			LEFT JOIN entryType et ON et.code = e.typeFk
-		WHERE e.id = vSelf
-			AND e.isBooked
-			AND (e.typeFk IS NULL OR NOT et.isInformal);
+			JOIN entryType et ON et.code = e.typeFk 
+		WHERE NOT et.isInformal
+			AND e.id = vSelf;

-	IF vIsNotEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
 		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
-
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/entry_splitByShelving.sql
+++ b/db/routines/vn/procedures/entry_splitByShelving.sql
@ -1,15 +1,10 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_splitByShelving`(
-	vShelvingCode VARCHAR(10),
-	vFromEntryFk INT,
-	vToEntryFk INT
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_splitByShelving`(vShelvingFk VARCHAR(3), vFromEntryFk INT, vToEntryFk INT)
 BEGIN
 /**
- * Divide las compras entre dos entradas de
- * acuerdo con lo ubicado en una matricula.
+ * Divide las compras entre dos entradas de acuerdo con lo ubicado en una matr<EFBFBD>cula
 * 
- * @param vShelvingCode Código de vn.shelving
+ * @param vShelvingFk Identificador de vn.shelving
 * @param vFromEntryFk Entrada origen
 * @param vToEntryFk Entrada destino
 */
@ -28,7 +23,7 @@ BEGIN
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
-			WHERE ish.shelvingFk = vShelvingCode COLLATE utf8_general_ci
+			WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
 				AND NOT ish.isSplit
 			GROUP BY ish.id;
 			
@ -112,10 +107,9 @@ BEGIN
 			UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID();
 		END IF;

-		UPDATE itemShelving ish
-				JOIN shelving sh ON sh.id = ish.shelvingFk
-			SET ish.isSplit = TRUE
-			WHERE sh.code = vShelvingCode COLLATE utf8_general_ci;
+		UPDATE itemShelving
+			SET isSplit = TRUE
+				WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci;
 	END LOOP;
 	CLOSE cur;
 END$$
--- a/db/routines/vn/procedures/entry_updateComission.sql
+++ b/db/routines/vn/procedures/entry_updateComission.sql
@ -22,7 +22,7 @@ BEGIN
 			FROM vn.entry e
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
-			WHERE t.landed >= util.VN_CURDATE()
+			WHERE t.shipped >= util.VN_CURDATE()
 				AND e.currencyFk = vCurrency
 				AND NOT e.isBooked;

--- a/db/routines/vn/procedures/expeditionScan_Put.sql
+++ b/db/routines/vn/procedures/expeditionScan_Put.sql
@ -4,12 +4,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expeditionScan_Put`(
 	vExpeditionFk INT
 )
 BEGIN
-	IF NOT EXISTS (SELECT id FROM expeditionPallet WHERE id = vPalletFk) THEN
-		CALL util.throw('Pallet not exists');
+	IF NOT (SELECT TRUE FROM expedition WHERE id = vExpeditionFk LIMIT 1) THEN
+		CALL util.throw('Expedition not exists');
 	END IF;

-	IF NOT EXISTS (SELECT id FROM expedition WHERE id = vExpeditionFk) THEN
-		CALL util.throw('Expedition not exists');
+	IF NOT (SELECT TRUE FROM expeditionPallet WHERE id = vPalletFk LIMIT 1) THEN
+		CALL util.throw('Pallet not exists');
 	END IF;

 	REPLACE expeditionScan(expeditionFk, palletFk)
--- a/db/routines/vn/procedures/expedition_selfConsumptionPackaging.sql
+++ b/db/routines/vn/procedures/expedition_selfConsumptionPackaging.sql
@ -1,93 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expedition_selfConsumptionPackaging`(
-	vSelf INT,
-	vAction ENUM('add', 'remove')
-)
-proc:BEGIN
-/**
- * Maneja el consumo de cajas para autoconsumo, permitiendo
- * añadir o quitar cajas utilizadas según la acción indicada.
- *
- * @param vSelf Id de expedición
- */
-	DECLARE vClientFk INT;
-	DECLARE vAddressFk INT;
-	DECLARE vItemFk INT;
-	DECLARE vItemName VARCHAR(50);
-	DECLARE vWarehouseFk INT;
-	DECLARE vCreated DATE;
-	DECLARE vTicketFk INT;
-	DECLARE vSaleFk INT;
-	DECLARE vQuantity INT;
-
-	IF vAction NOT IN ('add', 'remove') THEN
-		CALL util.throw('Action not supported');
-	END IF;
-
-	SELECT pc.clientSelfConsumptionFk,
-			pc.addressSelfConsumptionFk,
-			i.id,
-			i.name,
-			t.warehouseFk,
-			e.created
-			INTO vClientFk,
-				vAddressFk,
-				vItemFk,
-				vItemName,
-				vWarehouseFk,
-				vCreated
-		FROM expedition e
-			LEFT JOIN packaging p ON p.id = e.packagingFk
-			LEFT JOIN item i ON i.id = p.itemFk
-			JOIN ticket t ON t.id = e.ticketFk
-			JOIN productionConfig pc
-		WHERE e.id = vSelf;
-
-	IF vClientFk IS NULL OR vItemFk IS NULL THEN
-		LEAVE proc;
-	END IF;
-
-	SET vCreated = DATE(vCreated);
-
-	SELECT id INTO vTicketFk
-		FROM ticket
-			WHERE shipped BETWEEN vCreated AND util.dayEnd(vCreated)
-				AND clientFk = vClientFk
-				AND addressFk = vAddressFk
-				AND warehouseFk = vWarehouseFk;
-
-	IF vTicketFk IS NULL AND vAction = 'add' THEN
-		INSERT INTO ticket(clientFk, warehouseFk, shipped, nickname, addressFk)
-			VALUES (vClientFk, vWarehouseFk, vCreated, 'CAJAS AUTOCONSUMO', vAddressFk);
-
-		SET vTicketFk = LAST_INSERT_ID();
-	END IF;
-
-	SELECT id, quantity INTO vSaleFk, vQuantity
-		FROM sale
-		WHERE itemFk = vItemFk
-			AND ticketFk = vTicketFk
-		LIMIT 1;
-
-	IF vAction = 'add' THEN
-		IF vSaleFk IS NOT NULL THEN
-			UPDATE sale
-				SET quantity = quantity + 1
-				WHERE id = vSaleFk;
-		ELSE
-			INSERT INTO sale(itemFk, ticketFk, concept, quantity)
-				VALUES (vItemFk, vTicketFk, vItemName, 1);
-		END IF;
-	ELSE
-		IF vSaleFk IS NOT NULL THEN
-			IF vQuantity > 1 THEN
-				UPDATE sale
-					SET quantity = quantity - 1
-					WHERE id = vSaleFk;
-			ELSE
-				DELETE FROM sale WHERE id = vSaleFk;
-			END IF;
-		END IF;
-	END IF;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/inventoryMake.sql
+++ b/db/routines/vn/procedures/inventoryMake.sql
@ -137,7 +137,7 @@ BEGIN
 					JOIN travel tr ON tr.id = e.travelFk
 				WHERE tr.warehouseInFk = vWarehouseFk
 					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
-					AND NOT tr.isRaid
+					AND NOT tr.daysInForward
 				GROUP BY b.itemFk;

 		-- Transfers
@ -150,7 +150,7 @@ BEGIN
 							JOIN travel tr ON tr.id = e.travelFk
 						WHERE tr.warehouseOutFk = vWarehouseFk
 							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
-							AND NOT tr.isRaid
+							AND NOT tr.daysInForward
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;
--- a/db/routines/vn/procedures/invoiceIn_booking.sql
+++ b/db/routines/vn/procedures/invoiceIn_booking.sql
@ -219,7 +219,7 @@ BEGIN
 						) eWithheld ON TRUE 
 			WHERE tii.taxTypeSageFk IS NOT NULL 
 				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) 
-			GROUP BY tii.CuentaIvaRepercutido;
+			GROUP BY tii.PorcentajeIva, tii.expenseFk;

 	-- Línea iva inversor sujeto pasivo
 	INSERT INTO XDiario( 
@ -284,7 +284,7 @@ BEGIN
 				AND NOT(tii.isVies 
 					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk 
 					AND tii.taxCode = 'nonTaxable')
-			GROUP BY tii.CuentaIvaRepercutido;
+			GROUP BY tii.PorcentajeIva, tii.expenseFk;
 		
 	-- Actualización del registro original		
 	UPDATE invoiceIn ii
--- a/db/routines/vn/procedures/itemPlacementSupplyAiming.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyAiming.sql
@ -1,9 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyAiming`(
-    vShelvingCode VARCHAR(10),
-    vQuantity INT,
-    vItemFk INT
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyAiming`(vShelvingFk VARCHAR(10), quantity INT, vItemFk INT)
 BEGIN

 	SELECT 	ish.itemFk,
@ -13,21 +9,21 @@ BEGIN
 			ish.itemShelvingFk,
            ish.shelving,
            ish.stock,
-            LEAST(ish.stock,vQuantity) total,
+            LEAST(ish.stock,quantity) as total,
            CONCAT(
-					CAST(FLOOR(LEAST(ish.stock, vQuantity) / ish.packing) AS DECIMAL(10,0)),
+					CAST(FLOOR(LEAST(ish.stock,quantity) / ish.packing) AS DECIMAL(10,0)),
                    ' x ',
                    ish.packing,
                    IF	(	
-						LEAST(ish.stock, vQuantity) MOD ish.packing,
-						CONCAT(' + ',CAST(LEAST(ish.stock, vQuantity) MOD ish.packing AS DECIMAL(10,0))),
+						LEAST(ish.stock,quantity) MOD ish.packing,
+						CONCAT(' + ',CAST(LEAST(ish.stock,quantity) MOD ish.packing AS DECIMAL(10,0))),
                        ''
                        ),
                    ' = ',
-                    LEAST(ish.stock, vQuantity)
-				   ) proposal
-		FROM itemShelvingPlacementSupplyStock ish
-        WHERE ish.shelving = vShelvingCode COLLATE utf8_general_ci
+                    LEAST(ish.stock,quantity)
+				   ) as proposal
+		FROM vn.itemShelvingPlacementSupplyStock ish
+        WHERE ish.shelving = vShelvingFk COLLATE utf8_general_ci
 			AND ish.itemFk = vItemFk;

 END$$
--- a/db/routines/vn/procedures/itemPlacementSupplyGetOrder.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyGetOrder.sql
@ -1,7 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyGetOrder`(
-    vSectorFk INT
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyGetOrder`(vSector INT )
 BEGIN

 	DECLARE vId INT;
@ -9,35 +7,31 @@ BEGIN
    DECLARE vNextParkingFk INT;
        
 	SELECT sh.parkingFk INTO vLastParkingFk
-		FROM itemShelvingPlacementSupply isps
-			JOIN itemShelving ish ON ish.id = isps.itemShelvingFk
-            JOIN shelving sh ON sh.id = ish.shelvingFk
+		FROM vn.itemShelvingPlacementSupply isps
+			JOIN vn.itemShelving ish ON ish.id = isps.itemShelvingFk
+            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
        WHERE isps.userFk = getUser()
        ORDER BY isps.created DESC
        LIMIT 1;
    
-    SET vNextParkingFk = itemShelvingPlacementSupply_ClosestGet(vLastParkingFk);
+    SET vNextParkingFk = vn.itemShelvingPlacementSupply_ClosestGet(vLastParkingFk);
    
 	SELECT ipsl.id INTO vId
-		FROM itemPlacementSupplyList ipsl
-			JOIN itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk
+		FROM vn.itemPlacementSupplyList ipsl
+			JOIN vn.itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk
 		WHERE ipsl.saldo > 0
 			AND (ipsl.repoUserFk is NULL OR ipsl.repoUserFk = getUser())
-            AND ipsl.sectorFk = vSectorFk
-         ORDER BY ipsl.repoUserFk DESC,
-            ipsl.priority DESC,
-            (ispss.parkingFk = vNextParkingFk) DESC,
-            ispss.parking DESC,
-            ipsl.created
+            AND ipsl.sectorFk = vSector
+         ORDER BY  ipsl.repoUserFk DESC, ipsl.priority DESC, (ispss.parkingFk = vNextParkingFk) DESC, ispss.parking DESC, ipsl.created
        LIMIT 1;
        
-    UPDATE itemPlacementSupply
+    UPDATE vn.itemPlacementSupply
 		SET repoUserFk = getUser()
        WHERE id = vId;
        
-    SELECT * FROM itemPlacementSupplyList 
+    SELECT * FROM vn.itemPlacementSupplyList 
 		WHERE id = vId 
-		    AND sectorFk = vSectorFk;
+		AND sectorFk = vSector;

 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
@ -1,8 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyStockGetTargetList`(
-	vItemFk INT,
-	vSectorFk INT
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyStockGetTargetList`(vItemFk INT,vSectorFk INT)
 BEGIN
 /**
 * Devuelve la lista de ubicaciones para itemFk en ese sector. Se utiliza en la preparación previa.
@ -16,11 +13,11 @@ BEGIN
 			SUM(ish.visible) stockTotal,
 			ish.created,
 			p.pickingOrder
-		FROM itemShelving ish
-			JOIN shelving sh ON sh.id = ish.shelvingFk
-			JOIN parking p ON p.id = sh.parkingFk
-			JOIN sector sc ON sc.id = p.sectorFk
-			JOIN warehouse w ON w.id = sc.warehouseFk
+		FROM vn.itemShelving ish
+			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+			JOIN vn.parking p ON p.id = sh.parkingFk
+			JOIN vn.sector sc ON sc.id = p.sectorFk
+			JOIN vn.warehouse w ON w.id = sc.warehouseFk
 		WHERE ish.visible > 0
 			AND ish.itemFk = vItemFk
 		GROUP BY ish.id
--- a/db/routines/vn/procedures/itemShelvingLog_get.sql
+++ b/db/routines/vn/procedures/itemShelvingLog_get.sql
@ -1,14 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(
-	vShelvingCode VARCHAR(10)
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(vShelvingFk VARCHAR(10) )
 BEGIN
+	
 /**
 * Devuelve el log de los item en cada carro
 *
- * @param vShelvingCode Matrícula del carro 
+ * @param vShelvingFk Matrícula del carro 
 * 
 */
+	
 	SELECT isl.itemShelvingFk, 
 			isl.created, 
 			isl.accion, 
@ -28,9 +28,8 @@ BEGIN
 	FROM item 
 		JOIN itemShelvingLog isl ON item.id = isl.itemFk 
 		JOIN worker ON isl.workerFk = worker.id
-		JOIN shelving sh ON sh.id = isl.shelvingFk
-	WHERE sh.code = vShelvingCode COLLATE utf8mb3_unicode_ci
-		OR isl.itemFk = vShelvingCode -- ?? Respeto porque ya estaba
+	WHERE shelvingFk = vShelvingFk OR isl.itemFk = vShelvingFk
 		ORDER BY isl.created DESC;
+	
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelvingMatch.sql
+++ b/db/routines/vn/procedures/itemShelvingMatch.sql
@ -20,7 +20,7 @@ BEGIN
 		LEFT JOIN (
 					SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas 
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.id = ish.shelvingFk
+							JOIN shelving sh ON sh.code = ish.shelvingFk
                            LEFT JOIN parking pk ON pk.id = sh.parkingFk
 						WHERE ish.created BETWEEN vFromTimed AND vToTimed
 						GROUP BY itemFk
--- a/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
@ -27,7 +27,7 @@ proc: BEGIN
 				ish.available
 			FROM sale s
 				JOIN itemShelving ish ON ish.itemFk = s.itemFk
-				JOIN shelving sh ON sh.id = ish.shelvingFk
+				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
 				JOIN productionConfig pc
@ -61,7 +61,7 @@ proc: BEGIN
 		FROM sale s
 			LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
 			LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
+			LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
 			LEFT JOIN parking p ON p.id = sh.parkingFk
 		WHERE s.id = vSaleFk;
 		
--- a/db/routines/vn/procedures/itemShelvingSale_setQuantity.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_setQuantity.sql
@ -3,8 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_setQ
 	vItemShelvingSaleFk INT(10),
 	vQuantity DECIMAL(10,0),
 	vIsItemShelvingSaleEmpty BOOLEAN,
-	vSectorFk INT,
-	vShelvingFk VARCHAR(10)
+	vSectorFk INT
 )
 BEGIN
 /**
@ -25,7 +24,6 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vTotalQuantity INT;
 	DECLARE vStateCode VARCHAR(45);
-	DECLARE vCurrentShelvingFk VARCHAR(10);

 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 		BEGIN
@ -47,26 +45,18 @@ BEGIN
 			iss.saleFk, 
 			iss.itemShelvingFk, 
 			SUM(IFNULL(iss.quantity,0)), 
-			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'),
-			sh.code
+			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED')
 		INTO vItemFk, 
 			vSaleFk, 
 			vItemShelvingFk, 
 			vReservedQuantity, 
-			vStateCode,
-			vCurrentShelvingFk
+			vStateCode
 		FROM itemShelvingSale iss
 			JOIN sale s ON s.id = iss.saleFk
-			JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
-			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
+			LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
 		WHERE iss.id = vItemShelvingSaleFk
 			AND NOT iss.isPicked;

-	IF NOT (vCurrentShelvingFk <=> vShelvingFk) THEN
-		CALL util.throw('The shelving can not be different from the shelving reserved');
-	END IF;
-
 	IF vQuantity > vReservedQuantity 
 		OR (vQuantity < vReservedQuantity AND NOT vIsItemShelvingSaleEmpty)
 		OR (vQuantity = vReservedQuantity AND vIsItemShelvingSaleEmpty) THEN
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_add`(
-	vShelvingCode VARCHAR(10),
+	vShelvingFk VARCHAR(8),
 	vBarcode VARCHAR(22),
 	vQuantity INT,
 	vPackagingFk VARCHAR(10),
@ -12,7 +12,7 @@ BEGIN
 /**
 * Añade registro o lo actualiza si ya existe.
 *
- * @param vShelvingCode matrícula del carro
+ * @param vShelvingFk matrícula del carro
 * @param vBarcode el id del registro
 * @param vQuantity indica la cantidad del producto
 * @param vPackagingFk el packaging del producto en itemShelving, NULL para coger el de la ultima compra
@ -23,15 +23,10 @@ BEGIN
 **/
 	DECLARE vItemFk INT;
 	DECLARE vBuyFk INT;
-	DECLARE vShelvingFk INT;

 	SELECT id INTO vBuyFk 
 		FROM buy WHERE id = vBarcode;

-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
-
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;

 	IF vBuyFk IS NULL THEN
@ -45,7 +40,7 @@ BEGIN
 	END IF;

 	IF (SELECT COUNT(*) FROM itemShelving
-			WHERE shelvingFk = vShelvingFk
+			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
 				AND itemFk  = vItemFk
 				AND packing  = vPacking
 				AND buyFk = vBuyFk) THEN
@ -53,9 +48,7 @@ BEGIN
 		UPDATE itemShelving
 			SET visible = visible + vQuantity,
 				available = available + vQuantity
-			WHERE shelvingFk = vShelvingFk
-				AND itemFk = vItemFk
-				AND packing = vPacking;
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;

 	ELSE

--- a/db/routines/vn/procedures/itemShelving_addByClaim.sql
+++ b/db/routines/vn/procedures/itemShelving_addByClaim.sql
@ -1,38 +1,29 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addByClaim`(
-	vClaimFk INT,
-	vShelvingCode VARCHAR(10)
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addByClaim`(vClaimFk INT, vShelvingFk VARCHAR(3))
 BEGIN
 /**
 * Insert items of claim into itemShelving.
 *
 * @param vClaimFk The claim
- * @param vShelvingCode The shelving code
+ * @param vShelvingFk The shelving
 * @table tmp.buyUltimate
 */
 	DECLARE vWarehouseFk INT;
-	DECLARE vShelvingFk INT;

 	SELECT t.warehouseFk INTO vWarehouseFk
 		FROM claim c
 			JOIN ticket t ON t.id = c.ticketFk
 		WHERE c.id = vClaimFk;

-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
-
 	CALL buy_getUltimate(NULL, vWarehouseFk, util.VN_CURDATE());

 	INSERT INTO itemShelving (itemFk, shelvingFk, packing, `grouping`, visible)
-		SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity visible
+		SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity AS visible
 			FROM claim c
 				JOIN claimBeginning cb ON c.id = cb.claimFk
 				JOIN sale s ON s.id = cb.saleFk
 				JOIN ticket t ON t.id = s.ticketFk
-				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-					AND bu.warehouseFk = t.warehouseFk
+				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk AND bu.warehouseFk = t.warehouseFk
 				JOIN buy b ON b.id = bu.buyFk
 			WHERE c.id = vClaimFk;
 END$$
--- a/db/routines/vn/procedures/itemShelving_addList.sql
+++ b/db/routines/vn/procedures/itemShelving_addList.sql
@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addList`(
-	vShelvingCode VARCHAR(10),
+	vShelvingFk VARCHAR(3),
 	vList TEXT,
 	vIsChecking BOOL,
 	vWarehouseFk INT
@ -13,7 +13,7 @@ BEGIN
 * Cuando es TRUE sólo inserta los elementos de la colección que no están ya en
 * ese shelving, actualizando los valores del campo itemShelving.isChecked
 *
- * @param vShelvingCode Código de shelving
+ * @param vShelvingFk Identificador de shelving
 * @param vList JSON array con esta estructura: '[value1, value2, ...]'
 * @param vIsChecking Define si hay que añadir o comprobar los items
 * @param vWarehouseFk Identificador de warehouse
@ -24,11 +24,6 @@ BEGIN
 	DECLARE vPath VARCHAR(6);
 	DECLARE vItemFk INT;
 	DECLARE vIsChecked BOOL;
-	DECLARE vShelvingFk INT;
-
-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;

 	WHILE vCounter < vListLength DO
 		SET vPath = CONCAT('$[', vCounter, ']');
@ -39,17 +34,17 @@ BEGIN

 			SELECT IF(COUNT(*), TRUE, FALSE) INTO vIsChecked
 				FROM itemShelving
-				WHERE shelvingFk = vShelvingFk
+				WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
 					AND itemFk = vItemFk;
 		END IF;

 		IF NOT vIsChecking OR NOT vIsChecked THEN
-			CALL itemShelving_add(vShelvingCode, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
+			CALL itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
 		END IF;

 		UPDATE itemShelving
 			SET isChecked = vIsChecked
-			WHERE shelvingFk = vShelvingFk
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
 				AND itemFk = vItemFk
 				AND isChecked IS NULL;

--- a/db/routines/vn/procedures/itemShelving_get.sql
+++ b/db/routines/vn/procedures/itemShelving_get.sql
@ -1,18 +1,15 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_get`(
-	vShelvingCode VARCHAR(10)
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_get`(IN vSelf VARCHAR(8))
 BEGIN
 /**
-* Lista artículos de itemShelving.
+* Lista artículos de itemshelving 
 *
-* @param vShelvingCode Matrícula del carro
+* @param vSelf matrícula del carro
 **/
 	SELECT ish.itemFk item, 
-			i.name, 
-			i.longName,
-			i.size, 
+			IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description, 
 			ish.visible,
+			CEIL(ish.visible/ish.packing) stickers,
 			ish.packing,
 			ish.grouping,
 			p.code,
@ -20,14 +17,12 @@ BEGIN
 			s.priority,
 			ish.isChecked,
 			ic.url,
-			ish.available,
-			ish.buyFk,
-			ish.shelvingFk
+			ish.available
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
-			JOIN shelving s ON s.id = ish.shelvingFk
-			LEFT JOIN parking p ON p.id = s.parkingFk
+			JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci
+			LEFT JOIN parking p ON s.parkingFk = p.id
 			JOIN hedera.imageConfig ic
-		WHERE s.code COLLATE utf8_unicode_ci = vShelvingCode;
+		WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelving_getAlternatives.sql
+++ b/db/routines/vn/procedures/itemShelving_getAlternatives.sql
@ -1,31 +1,21 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(
-	vShelvingCode VARCHAR(10)
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(vShelvingFk VARCHAR(10))
 BEGIN
 /**
- * Devuelve un listado de posibles ubicaciones alternativas a ubicar
- * los item de la matricula del carro que se le ha pasado.
+ * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula
+ * del carro que se le ha pasado.
 *
- * @param vShelvingCode Matricula del carro
+ * @param vShelvingFk matricula del carro
 */
-	DECLARE vShelvingFk INT;
-
-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
-
-	SELECT is2.id,is2.shelvingFk, p.code, is2.itemFk , is2.visible, p.pickingOrder 
+	SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder 
 		FROM itemShelving is2
-			JOIN shelving sh ON sh.id = is2.shelvingFk
+			JOIN shelving sh ON sh.code = is2.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			JOIN sector s ON s.id = p.sectorFk
-			LEFT JOIN operator o ON  o.sectorFk = s.id
-				AND o.workerFk = account.myUser_getId()
+			LEFT JOIN operator o ON  o.sectorFk = s.id AND o.workerFk = account.myUser_getId()
 			JOIN warehouse wh ON wh.id = s.warehouseFk
-			JOIN itemShelving is3 ON is3.itemFk = is2.itemFk
-				AND is3.shelvingFk = vShelvingFk
-		WHERE is2.shelvingFk <> vShelvingFk
+			JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+		WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci
 		GROUP BY is2.id
 		ORDER BY p.pickingOrder DESC;
 END$$
--- a/db/routines/vn/procedures/itemShelving_getInfo.sql
+++ b/db/routines/vn/procedures/itemShelving_getInfo.sql
@ -16,7 +16,7 @@ BEGIN
 			ish.itemFk itemFk,
 			sh.priority
 		FROM vn.itemShelving ish
-			JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.`code` = ish.shelvingFk
 			JOIN vn.parking pk ON pk.id = sh.parkingFk
 		WHERE ish.itemFk = vItemFk
 		ORDER BY sh.priority DESC, created ASC;
--- a/db/routines/vn/procedures/itemShelving_getItemDetails.sql
+++ b/db/routines/vn/procedures/itemShelving_getItemDetails.sql
@ -1,14 +1,14 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getItemDetails`(
 	vBarcodeItem INT, 
-	vShelvingCode VARCHAR(10) 
+	vShelvingFK VARCHAR(10) 
 )
 BEGIN
 /**
 * Obtiene el precio y visible de un item
 *
 * @param vBarcodeItem barcode de artículo
- * @param vShelvingCode Ubicación actual del artículo
+ * @param vShelvingFK Ubicación actual del artículo
 */
 	DECLARE vIsItem BOOL;
 	DECLARE vBuyFk INT;
@ -44,13 +44,12 @@ BEGIN
 			FROM vn.buy b 
 			WHERE b.id = vBuyFk
 	) SELECT v.itemFk,
-			vShelvingCode,
+			vShelvingFK,
 			v.itemCost,
 			SUM(ish.visible) visible
 		FROM vn.itemShelving ish
-			JOIN vn.shelving sh ON sh.id = ish.shelvingFK
 			JOIN visible v
-		WHERE sh.code = vShelvingCode COLLATE utf8mb3_general_ci
+		WHERE ish.shelvingFK = vShelvingFK COLLATE utf8mb3_general_ci
 				AND ish.itemFk = v.itemFk;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelving_getSaleDate.sql
+++ b/db/routines/vn/procedures/itemShelving_getSaleDate.sql
@ -1,20 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getSaleDate`(
-	vShelvingCode VARCHAR(10)
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
 BEGIN
-/**
- * Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.	
+	
+	/* Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.	
 	 * 
- * @param vShelvingCode Matrícula del carro o pallet
+	 *  @param vShelvingFk Matrícula del carro o pallet
 	 */
+
 	DECLARE vWarehouseFk INT;
 	DECLARE vStockScopeDays INT;
-	DECLARE vShelvingFk INT;
-
-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;

 	SELECT s.warehouseFk, stockScopeDays
 			INTO vWarehouseFk, vStockScopeDays
@ -36,7 +30,7 @@ BEGIN
 			ENGINE = MEMORY
 			SELECT itemFk, SUM(visible) visible
 				FROM itemShelving
-				WHERE shelvingFk = vShelvingFk
+				WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
 				GROUP BY itemFk;

 	CREATE OR REPLACE TEMPORARY TABLE tmp.tStockByDay
@ -58,7 +52,7 @@ BEGIN
 									SELECT ish.itemFk, - SUM(ish.visible), util.VN_CURDATE()
 										FROM itemShelving ish 
 											JOIN tmp.tItems i ON i.itemFk = ish.itemFk
-											JOIN shelving sh ON sh.id = ish.shelvingFk 
+											JOIN shelving sh ON sh.code = ish.shelvingFk 
 											JOIN parking p ON sh.parkingFk = p.id 
 											JOIN sector s ON s.id = p.sectorFk
 										WHERE s.isReserve 
@ -116,7 +110,7 @@ BEGIN
 		UPDATE tmp.tStockByDay sbd
 			JOIN (SELECT ish.itemFK, SUM(ish.visible) amount 
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.id = ish.shelvingFk
+							JOIN shelving sh ON sh.code = ish.shelvingFk
 							JOIN parking p ON p.id = sh.parkingFk
 							JOIN sector s ON s.id = p.sectorFk
 						WHERE s.warehouseFk = vWarehouseFk
@ -156,10 +150,10 @@ BEGIN
 								p.sectorFk,
 								ish.shelvingFk
 							FROM itemShelving ish
-								JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+								JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 								LEFT JOIN parking p ON p.id = parkingFk
 								LEFT JOIN vn.sector s ON s.id = p.sectorFk
-							WHERE ish.shelvingFk = vShelvingFk
+							WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
 					) sub4 ON sub4.itemFk = ts.itemFk
 					LEFT JOIN sector s ON s.id = sub4.sectorFk
 					LEFT JOIN item i ON i.id = ts.itemFk
--- a/db/routines/vn/procedures/itemShelving_inventory.sql
+++ b/db/routines/vn/procedures/itemShelving_inventory.sql
@ -42,7 +42,7 @@ BEGIN
 			JOIN item i ON i.id = ish.itemFk
 			JOIN itemType it ON it.id = i.typeFk
 			JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
-			JOIN shelving sh ON sh.id = ish.shelvingFk
+			JOIN shelving sh ON sh.code = ish.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			LEFT JOIN (
 				SELECT s.itemFk, sum(s.quantity) notPrepared
--- a/db/routines/vn/procedures/itemShelving_selfConsumption.sql
+++ b/db/routines/vn/procedures/itemShelving_selfConsumption.sql
@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_selfConsumption`(
-	vShelvingCode VARCHAR(10) COLLATE utf8_general_ci, 
+	vShelvingFk VARCHAR(10) COLLATE utf8_general_ci, 
 	vItemFk INT, 
 	vQuantity INT
 )
@ -9,9 +9,9 @@ BEGIN
 * Leave the indicated amount on the shelve
 * and create a ticket with the difference.
 * 
- * @param vShelvingCode Code of the shelve where the item is located
- * @param vItemFk Item of which the self-consumption ticket is to be created
- * @param vQuantity Amount that will stay on the shelve
+ * @param vShelvingFk id of the shelve where the item is located.
+ * @param vItemFk article of which the self-consumption ticket is to be created.
+ * @param vQuantity amount that will stay on the shelve
 */
 	DECLARE vVisible INT;
 	DECLARE vClientFk INT;
@ -21,11 +21,6 @@ BEGIN
 	DECLARE vAgencyModeFk INT;
 	DECLARE vItemShelvingFk INT;
 	DECLARE vAddressFk INT;
-	DECLARE vShelvingFk INT;
-
-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code = vShelvingCode;

 	SELECT c.id,
 			pc.clientSelfConsumptionFk,
@ -42,7 +37,7 @@ BEGIN
 			JOIN parking p ON p.sectorFk = s.id
 			JOIN shelving s2 ON s2.parkingFk = p.id
 			JOIN productionConfig pc
-		WHERE s2.id = vShelvingFk;
+		WHERE s2.code = vShelvingFk;

 	IF vClientFk IS NULL THEN
 		CALL util.throw('The company does not have a customer assigned');
@ -52,7 +47,7 @@ BEGIN
 		CALL util.throw('The shelf cannot have NULL or negative quantities');
 	END IF;

-	IF vShelvingCode IS NULL THEN
+	IF vShelvingFk IS NULL THEN
 		CALL util.throw('The shelf is necessary');
 	END IF;

--- a/db/routines/vn/procedures/itemShelving_transfer.sql
+++ b/db/routines/vn/procedures/itemShelving_transfer.sql
@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_transfer`(
 	vItemShelvingFk INT, 
-	vShelvingCode VARCHAR(10)
+	vShelvingFk VARCHAR(10)
 )
 BEGIN
 /**
@ -9,14 +9,9 @@ BEGIN
 * fusionando si coincide el packing y la fecha.
 *
 * @param vItemShelvingFk Identificador de itemShelving
- * @param vShelvingCode Código de shelving
+ * @param vShelvingFk Identificador de shelving
 */
 	DECLARE vNewItemShelvingFk INT;
-	DECLARE vShelvingFk INT;
-
-	SELECT id INTO vShelvingFk
-		FROM shelving
-		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;

 	SELECT MAX(ish.id) INTO vNewItemShelvingFk
 		FROM itemShelving ish
@ -31,7 +26,7 @@ BEGIN
 				AND ish2.packing = ish.packing
 				AND DATE(ish2.created) = DATE(ish.created)
 				AND ish2.buyFk = ish.buyFk
-		WHERE ish.shelvingFk = vShelvingFk;
+		WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci;

 	IF vNewItemShelvingFk THEN
 		UPDATE itemShelving ish
@ -43,7 +38,9 @@ BEGIN
 		DELETE FROM itemShelving
 			WHERE id = vItemShelvingFk;
 	ELSE
-		IF (SELECT EXISTS(SELECT id FROM shelving WHERE id = vShelvingFk)) THEN
+		IF (SELECT EXISTS(SELECT id FROM shelving
+			WHERE code = vShelvingFk COLLATE utf8_unicode_ci)) THEN
+
 			UPDATE itemShelving
 				SET shelvingFk = vShelvingFk
 				WHERE id = vItemShelvingFk;
--- a/db/routines/vn/procedures/item_devalueA2.sql
+++ b/db/routines/vn/procedures/item_devalueA2.sql
@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_devalueA2`(
 	vSelf INT, 
-	vShelvingCode VARCHAR(10) COLLATE utf8mb3_general_ci, 
+	vShelvingFK VARCHAR(10), 
 	vBuyingValue DECIMAL(10,4),
 	vQuantity INT
 )
@ -12,7 +12,7 @@ BEGIN
 * de almacén y shelvings correspondientes
 *
 * @param vSelf Id de artículo a devaluar
- * @param vShelvingCode Código de shelving / ubicación
+ * @param vShelvingFK Ubicación actual del artículo
 * @param vBuyingValue Nuevo precio de coste
 * @param vQuantity Cantidad del ítem a pasar a A2
 */
@ -109,11 +109,10 @@ BEGIN
 		CALL util.throw ('The item has not a buy');
 	END IF;

-	SELECT ish.id, ish.visible INTO vTargetItemShelvingFk, vCurrentVisible
-		FROM itemShelving ish
-			JOIN shelving sh ON sh.id = ish.shelvingFk
-		WHERE sh.code = vShelvingCode
-			AND ish.itemFk = vSelf
+	SELECT id,visible INTO vTargetItemShelvingFk, vCurrentVisible
+		FROM itemShelving
+		WHERE shelvingFk = vShelvingFK COLLATE utf8mb3_general_ci
+			AND itemFk = vSelf
 		LIMIT 1;
 	
 	IF vCurrentVisible IS NULL THEN
@ -389,17 +388,16 @@ BEGIN
 			userFk, 
 			isChecked) 
 		SELECT vItemA2Fk, 
-				ish.shelvingFk, 
+				shelvingFk, 
 				vQuantity ,
-				ish.`grouping`, 
-				ish.packing, 
-				ish.packagingFk, 
+				`grouping`, 
+				packing, 
+				packagingFk, 
 				account.myUser_getId(), 
-				ish.isChecked
-			FROM itemShelving ish
-				JOIN shelving sh ON sh.id = ish.shelvingFk
-			WHERE ish.itemFK = vSelf
-				AND sh.code = vShelvingCode
+				isChecked
+			FROM itemShelving
+			WHERE itemFK = vSelf
+				AND shelvingFk = vShelvingFK COLLATE utf8mb3_general_ci
 			ON DUPLICATE KEY UPDATE 
 				visible = vQuantity + VALUES(visible);

--- a/db/routines/vn/procedures/item_getBalance.sql
+++ b/db/routines/vn/procedures/item_getBalance.sql
@ -59,7 +59,7 @@ BEGIN
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
-					AND NOT tr.isRaid
+					AND NOT tr.daysInForward
 		),
 		entriesOut AS (
 			SELECT 'entry',
@ -95,7 +95,7 @@ BEGIN
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
-						AND NOT tr.isRaid
+						AND NOT tr.daysInForward
 		),
 		sales AS (
 			WITH itemSales AS (
--- a/db/routines/vn/procedures/item_getInfo.sql
+++ b/db/routines/vn/procedures/item_getInfo.sql
@ -42,6 +42,7 @@ BEGIN
 			i.minimum `min`,
 			p.name producer,
 			o.code origin,
+			v.visible - IFNULL(vVisibleItemShelving, 0) unlocated,
 			a.available,
 			vVisibleItemShelving,
 			v.visible,
--- a/db/routines/vn/procedures/item_getMinacum.sql
+++ b/db/routines/vn/procedures/item_getMinacum.sql
@ -63,7 +63,7 @@ BEGIN
 						AND NOT e.isExcludedFromAvailable
 						AND b.quantity <> 0
 						AND (vItemFk IS NULL OR b.itemFk = vItemFk)
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT r.itemFk,
 						r.shipment,
--- a/db/routines/vn/procedures/item_multipleBuyByDate.sql
+++ b/db/routines/vn/procedures/item_multipleBuyByDate.sql
@ -30,7 +30,7 @@ BEGIN
 			AND NOT s.name = 'INVENTARIO'
 			AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 			AND w.isComparative
-			AND NOT t.isRaid
+			AND NOT t.daysInForward
 		GROUP BY i.id;

 	UPDATE tmp.itemInventory y
--- a/db/routines/vn/procedures/item_valuateInventory.sql
+++ b/db/routines/vn/procedures/item_valuateInventory.sql
@ -109,7 +109,7 @@ BEGIN
 				JOIN warehouse w ON w.id = tr.warehouseInFk
 			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
 				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND e.supplierFk <> vInventorySupplierFk
@ -131,7 +131,7 @@ BEGIN
 				JOIN itemCategory ic ON ic.id = t.categoryFk
 				JOIN warehouse w ON w.id = tr.warehouseOutFk
 			WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND (t.id = vItemTypeFk OR vItemTypeFk IS NULL)
@ -196,7 +196,7 @@ BEGIN
 				JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
 				JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
 			WHERE vDated >= tr.shipped AND vDated < tr.landed
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 				AND wIn.valuatedInventory
 				AND t.isInventory
 				AND e.isConfirmed
--- a/db/routines/vn/procedures/multipleInventory.sql
+++ b/db/routines/vn/procedures/multipleInventory.sql
@ -60,7 +60,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, - b.quantity
 					FROM buy b
@ -71,7 +71,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 			) sub
 			GROUP BY itemFk;

@ -121,7 +121,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, t.shipped, - b.quantity
 					FROM buy b
@ -132,7 +132,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 			) sub
 			GROUP BY sub.itemFk, sub.dated;

--- a/db/routines/vn/procedures/productionControl.sql
+++ b/db/routines/vn/procedures/productionControl.sql
@ -217,7 +217,7 @@ proc: BEGIN
 				st.code = 'previousPrepared' isPreviousPrepared,
 				sc.itemPackingTypeFk
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.id = ish.shelvingFk
+				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
 				JOIN sectorType st ON st.id = sc.typeFk
--- a/db/routines/vn/procedures/queueMember_updateQueue.sql
+++ b/db/routines/vn/procedures/queueMember_updateQueue.sql
@ -23,7 +23,10 @@ BEGIN
 	DELETE FROM pbx.queueMember 
 		WHERE extension = vExtension COLLATE utf8_general_ci;

+	IF vNewQueue IS NOT NULL THEN
 	INSERT IGNORE INTO pbx.queueMember (queue, extension)
 		VALUES (vNewQueue, vExtension);
+	END IF;
+	
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/route_calcCommission.sql
+++ b/db/routines/vn/procedures/route_calcCommission.sql
@ -11,8 +11,6 @@ BEGIN
 */
 	DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
 	DECLARE vAgencyModePricePercentage DOUBLE;
-	DECLARE vIsKmTruckRate BOOL;
-	DECLARE vCountryFk INT;

 	SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
 		FROM route r
@ -23,17 +21,10 @@ BEGIN
 		DELETE FROM routeCommission
 			WHERE routeFk = vSelf;

-		SELECT w.isFreelance, v.isKmTruckRate, p.countryFk INTO vIsFreelance, vIsKmTruckRate, vCountryFk
+		SELECT w.isFreelance INTO vIsFreelance
 			FROM route r
 				JOIN worker w ON w.id = r.workerFk
-				JOIN vehicle v ON v.id = r.vehicleFk
-				LEFT JOIN ticket t ON t.routeFk = r.id
-				LEFT JOIN address a ON a.id = t.addressFk
-				LEFT JOIN province p ON p.id = a.provinceFk
-			WHERE r.id = vSelf
-			GROUP BY p.countryFk
-			ORDER BY COUNT(*) DESC
-			LIMIT 1;
+			WHERE r.id = vSelf;

 		SELECT ampp.percentage INTO vAgencyModePricePercentage
 			FROM route r
@ -48,9 +39,7 @@ BEGIN
 					workCenterFk,
 					freelanceYearlyM3,
 					cat4m3,
-					cat5m3,
-					isKmTruckRate,
-					countryFk
+					cat5m3
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@ -62,14 +51,11 @@ BEGIN
 							IFNULL(r.m3, 0),
 							0
 						),
-						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
-						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
-						vIsKmTruckRate,
-						vCountryFk
+						rc.distributionCat4M3 * IFNULL(r.m3, 0),
+						rc.distributionCat5M3 * IFNULL(r.m3, 0)
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
-						LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
 					WHERE r.id = vSelf
 						AND r.workerFk
 						AND r.commissionWorkCenterFk;
@ -82,28 +68,21 @@ BEGIN
 					yearlyKm,
 					yearlyM3,
 					cat4m3,
-					cat5m3,
-					isKmTruckRate,
-					countryFk
+					cat5m3
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
 						(r.kmEnd - r.kmStart) *
 							IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
 						IFNULL(r.m3, 0) *
-							IF(v.isKmTruckRate,
-								IFNULL(wc.deliveryM3Cat5, rc.deliveryM3Cat5),
-								IFNULL(wc.deliveryM3Cat4, rc.deliveryM3Cat4)),
+							IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
 						(r.kmEnd - r.kmStart) * rc.kmYearly,
 						IFNULL(r.m3, 0) * rc.m3Yearly,
-						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
-						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
-						vIsKmTruckRate,
-						vCountryFk
+						rc.distributionCat4M3 * IFNULL(r.m3, 0),
+						rc.distributionCat5M3 * IFNULL(r.m3, 0)
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
-						LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
 					WHERE r.id = vSelf
 						AND r.kmStart
 						AND r.kmEnd
--- a/db/routines/vn/procedures/sale_boxPickingPrint.sql
+++ b/db/routines/vn/procedures/sale_boxPickingPrint.sql
@ -27,7 +27,7 @@ BEGIN
 	DECLARE vQuantity INT;
 	DECLARE vRemainder INT DEFAULT 0;
 	DECLARE vRemainderSaleFk INT;
-	DECLARE vShelvingFk VARCHAR(10);
+	DECLARE vShelving VARCHAR(10);
 	DECLARE vTicketFk INT;

 	SELECT 	s.quantity,
@ -74,7 +74,7 @@ w1:	WHILE vQuantity >= vPacking DO
 						p.pickingOrder,
 						ish.created
 						FROM itemShelving ish 
-							JOIN shelving sh ON sh.id = ish.shelvingFk
+							JOIN shelving sh ON sh.code = ish.shelvingFk
 							JOIN parking p ON p.id = sh.parkingFk
 							LEFT JOIN itemShelvingSale iss
 								ON iss.itemShelvingFk = ish.id
@ -262,9 +262,9 @@ w1:	WHILE vQuantity >= vPacking DO
 		CALL dipole.expedition_Add(vExpeditionFk,vPrinterFk, TRUE);

 		SELECT shelvingFk, p.code 
-			INTO vShelvingFk, vParkingCode
+			INTO vShelving, vParkingCode
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.id = ish.shelvingFk
+				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 			WHERE ish.id = vItemShelvingFk;

@ -273,7 +273,7 @@ w1:	WHILE vQuantity >= vPacking DO
 				itemFk = vItemFk,
 				quantity = vPacking,
 				longName = vConcept,
-				shelvingFk = vShelvingFk,
+				shelvingFk = vShelving,
 				parkingCode = vParkingCode,
 				phone = RIGHT(phone,vMaxPhoneLength),
 				street = RIGHT(street, vMAxStreetLength)
--- a/db/routines/vn/procedures/sale_getBoxPickingList.sql
+++ b/db/routines/vn/procedures/sale_getBoxPickingList.sql
@ -41,7 +41,7 @@ BEGIN
 								AND iss.created >= vDated
 							GROUP BY iss.itemShelvingFk, s.itemFk) tISS 
 				ON tISS.itemFk = ish.itemFk AND tISS.itemShelvingFk = ish.id
-			JOIN shelving sh ON sh.id = ish.shelvingFk
+			JOIN shelving sh ON sh.code = ish.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			JOIN tmp.productionBuffer pb ON pb.ticketFk = s.ticketFk
 			JOIN agencyMode am ON am.id = pb.agencyModeFk
--- a/db/routines/vn/procedures/sale_getProblems.sql
+++ b/db/routines/vn/procedures/sale_getProblems.sql
@ -87,7 +87,7 @@ BEGIN
 				SUM(ish.visible) visible,
 				s.warehouseFk warehouseFk
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.id = ish.shelvingFk
+				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector s ON s.id = p.sectorFk
 			GROUP BY ish.itemFk, s.warehouseFk;
@ -127,7 +127,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) < 0
+							AND IFNULL(av.available, 0) < s.quantity
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND NOT s.isPicked
 							AND NOT s.reserved
@ -190,7 +190,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) >= 0
+							AND IFNULL(av.available, 0) >= s.quantity
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked
--- a/db/routines/vn/procedures/shelvingChange.sql
+++ b/db/routines/vn/procedures/shelvingChange.sql
@ -1,13 +1,11 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingChange`(
-	`vShelvingO` VARCHAR(10),
-	`vShelvingD` VARCHAR(10)
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingChange`(IN `vShelvingO` VARCHAR(8), IN `vShelvingD` VARCHAR(8))
 BEGIN
-	UPDATE itemShelving ish
-		JOIN shelving sh1 ON sh1.code = vShelvingD COLLATE utf8_unicode_ci
-		JOIN shelving sh2 ON sh2.code = vShelvingO COLLATE utf8_unicode_ci
-	SET ish.shelvingFk =  sh1.id
-	WHERE ish.shelvingFk = sh2.id;
+
+     UPDATE vn.itemShelving
+     SET shelvingFk =  vShelvingD COLLATE utf8_unicode_ci 
+     WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;  
+     
+    
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/shelvingParking_get.sql
+++ b/db/routines/vn/procedures/shelvingParking_get.sql
@ -1,10 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingParking_get`(
-	vShelvingCode VARCHAR(10),
-	vWarehouseFk INT,
-	vDayRange INT
-)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
 BEGIN
+
+	
 SELECT 	s.itemFk, 
 	s.concept,
 	CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir, 
@ -12,15 +10,14 @@ SELECT 	s.itemFk,
 	FROM vn.sale s
 		LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
 		JOIN vn.ticket t ON t.id = s.ticketFk
-		LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk
-			AND ist.warehouseFk = vWarehouseFk
-		JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
-		JOIN shelving sh ON sh.id = ish.shelvingFk
-			AND sh.code = vShelvingCode COLLATE utf8_general_ci
+		LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk
+		JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
 	WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE())) 
 		AND iss.saleFk IS NULL
 		AND t.warehouseFk = vWarehouseFk
 	GROUP BY s.itemFk
 	HAVING sinServir > aparcado;
+			
+
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/shelving_clean.sql
+++ b/db/routines/vn/procedures/shelving_clean.sql
@ -12,12 +12,12 @@ BEGIN

 	DELETE ish.* 
 		FROM itemShelving ish
-			JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 			WHERE sh.parkingFk IS NULL
 			AND ish.created < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());

 UPDATE shelving sh
-	LEFT JOIN itemShelving its ON its.shelvingFk = sh.id
+	LEFT JOIN itemShelving its ON its.shelvingFk = sh.`code`
 		SET isPrinted = 0,
 		parkingFk = NULL
 	WHERE its.id IS NULL
@ -27,11 +27,11 @@ UPDATE shelving sh
 			OR
 			sh.parked < util.VN_CURDATE() - INTERVAL 2 WEEK
 		)
+			
 		AND IF(code REGEXP '^[A-Za-z]{2}[0-9]', LEFT (code, 2) NOT IN (
-				SELECT DISTINCT LEFT(sh.code, 2)
+				SELECT DISTINCT LEFT(its.shelvingFk, 2)
 					FROM itemShelving its
-						JOIN shelving sh ON sh.id = its.shelvingFk
-					WHERE sh.code REGEXP '^[A-Za-z]{2}[0-9]'
+					WHERE its.shelvingFk REGEXP '^[A-Za-z]{2}[0-9]'
 				), TRUE);

 END$$
--- a/db/routines/vn/procedures/shelving_getSpam.sql
+++ b/db/routines/vn/procedures/shelving_getSpam.sql
@ -25,7 +25,7 @@ BEGIN
 		LEFT JOIN (
 			SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS reserva
 				FROM vn.itemShelving ish
-					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+					JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector s ON s.id = p.sectorFk
 				WHERE s.code = 'FUENTES_PICASSE'
@ -68,7 +68,7 @@ BEGIN
 			sh.isSpam
 		FROM vn.itemShelving ish
 			JOIN vn.item i ON i.id = ish.itemFk
-			JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 			JOIN vn.parking p ON p.id = sh.parkingFk
 			JOIN vn.sector s ON s.id = p.sectorFk
 			JOIN vn.warehouse w ON w.id = s.warehouseFk
--- a/db/routines/vn/procedures/stockBought_calculate.sql
+++ b/db/routines/vn/procedures/stockBought_calculate.sql
@ -7,13 +7,13 @@ proc: BEGIN
 * Calculate the stock of the auction warehouse from the inventory date to vDated
 * without taking into account the outputs of the same day vDated
 *
- * @param vDated Date to calculate the stock
+ * @param vDated Date to calculate the stock.
 */
 	IF vDated < util.VN_CURDATE() THEN
 		LEAVE proc;
 	END IF;

-	CREATE OR REPLACE TEMPORARY TABLE tCurrentData
+	CREATE OR REPLACE TEMPORARY TABLE tStockBought
 		SELECT workerFk, reserve
 			FROM stockBought
 			WHERE dated = vDated
@ -21,28 +21,15 @@ proc: BEGIN

 	DELETE FROM stockBought WHERE dated = vDated;

-	CREATE OR REPLACE TEMPORARY TABLE tStockSold
-		SELECT it.workerFk,
-				SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000) sold
-			FROM itemTicketOut ito
-				JOIN item i ON i.id = ito.itemFk
-				JOIN itemType it ON it.id = i.typeFk
-				JOIN ticket t ON t.id = ito.ticketFk
-				JOIN warehouse wh ON wh.id = t.warehouseFk
-				JOIN itemCost ic ON ic.itemFk = ito.itemFk
-					AND ic.warehouseFk = t.warehouseFk
-				JOIN volumeConfig vc
-			WHERE ito.shipped BETWEEN vDated AND util.dayEnd(vDated)
-				AND wh.code = 'VNH'
-			GROUP BY it.workerFk;
-
 	CALL item_calculateStock(vDated);

-	CREATE OR REPLACE TEMPORARY TABLE tStockBought
+	INSERT INTO stockBought(workerFk, bought, dated)
 		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) *
+				ROUND(SUM(
+						(ti.quantity / b.packing) *
 						buy_getVolume(b.id)
-				) / vc.palletM3 / 1000000 bought
+					) / vc.palletM3 / 1000000, 1) bought,
+				vDated
 			FROM itemType it
 				JOIN item i ON i.typeFk = it.id
 				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
@ -56,33 +43,20 @@ proc: BEGIN
 			GROUP BY it.workerFk
 			HAVING bought;

-	
-	INSERT INTO stockBought(workerFk, bought, dated)
-		SELECT tb.workerFk, 
-				ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 2), 
-				vDated
-			FROM tStockBought tb 
-				LEFT JOIN tStockSold ts ON ts.workerFk = tb.workerFk;
-
 	UPDATE stockBought s
-			JOIN tCurrentData ts ON ts.workerFk = s.workerFk
+			JOIN tStockBought ts ON ts.workerFk = s.workerFk
 				SET s.reserve = ts.reserve
 		WHERE s.dated = vDated;

 	INSERT INTO stockBought (workerFk, reserve, dated)
 		SELECT ts.workerFk, ts.reserve, vDated
-			FROM tCurrentData ts
+			FROM tStockBought ts
 			WHERE ts.workerFk NOT IN (
 				SELECT workerFk
 					FROM stockBought
 					WHERE dated = vDated
 			);

-	UPDATE stockBought s
-			JOIN tStockSold ts ON ts.workerFk = s.workerFk
-				SET s.bought = IF(s.bought < ABS(ts.sold), 0, ROUND(s.bought - ABS(ts.sold), 1))
-		WHERE s.dated = vDated;
-
-	DROP TEMPORARY TABLE tCurrentData, tmp.item, tmp.buyUltimate, tStockSold;
+	DROP TEMPORARY TABLE tStockBought, tmp.item, tmp.buyUltimate;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/stockBuyedByWorker.sql
+++ b/db/routines/vn/procedures/stockBuyedByWorker.sql
@ -1,74 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyedByWorker`(
-	vDated DATE,
-	vWorker INT
-)
-BEGIN
-/**
- * Inserta el volumen de compra de un comprador
- * en stockBuyed de acuerdo con la fecha.
- *
- * @param vDated Fecha de compra
- * @param vWorker Id de trabajador
- */
-	CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
-		(INDEX (userFk))
-		ENGINE = MEMORY
-		SELECT requested, reserved, userFk
-			FROM stockBuyed
-			WHERE dated = vDated
-				AND userFk = vWorker;
-
-	DELETE FROM stockBuyed
-		WHERE dated = vDated
-			AND userFk = vWorker;
-
-	CALL item_calculateStock(vDated);
-
-	INSERT INTO stockBuyed(userFk, buyed, `dated`, reserved, requested, description)
-		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
-				vDated,
-				sb.reserved,
-				sb.requested,
-				u.name
-			FROM itemType it
-				JOIN item i ON i.typeFk = it.id
-				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-					AND bu.warehouseFk = wh.id
-				JOIN buy b ON b.id = bu.buyFk
-				JOIN volumeConfig vc
-				JOIN account.`user` u ON u.id = it.workerFk
-				LEFT JOIN tStockBuyed sb ON sb.userFk = it.workerFk
-			WHERE ic.display
-				AND it.workerFk = vWorker;
-
-	SELECT b.entryFk Id_Entrada,
-			i.id Id_Article,
-			i.name Article,
-			ti.quantity Cantidad,
-			(ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
-				/ (vc.trolleyM3 * 1000000) buyed,
-			b.packagingFk id_cubo,
-			b.packing
-		FROM tmp.item ti
-			JOIN item i ON i.id = ti.itemFk
-			JOIN itemType it ON i.typeFk = it.id
-			JOIN itemCategory ic ON ic.id = it.categoryFk
-			JOIN worker w ON w.id = it.workerFk
-			JOIN auctionConfig ac
-			JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-				AND bu.warehouseFk = ac.warehouseFk
-			JOIN buy b ON b.id = bu.buyFk
-			JOIN volumeConfig vc
-		WHERE ic.display
-			AND w.id = vWorker;
-
-	DROP TEMPORARY TABLE tmp.buyUltimate,
-		tmp.item,
-		tStockBuyed;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/stockBuyed_add.sql
+++ b/db/routines/vn/procedures/stockBuyed_add.sql
@ -1,70 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyed_add`(
-	vDated DATE
-)
-BEGIN
-/**
- * Inserta el volumen de compra por comprador
- * en stockBuyed de acuerdo con la fecha.
- *
- * @param vDated Fecha de compra
- */
-	CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
-		(INDEX (userFk))
-		ENGINE = MEMORY
-		SELECT requested, reserved, userFk
-			FROM stockBuyed
-			WHERE dated = vDated;
-
-	DELETE FROM stockBuyed WHERE dated = vDated;
-
-	CALL item_calculateStock(vDated);
-
-	INSERT INTO stockBuyed(userFk, buyed, `dated`, description)
-		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
-				vDated,
-				u.name
-			FROM itemType it
-				JOIN item i ON i.typeFk = it.id
-				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
-				JOIN itemCategory ic ON ic.id = it.categoryFk
-				JOIN warehouse wh ON wh.code = 'VNH'
-				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = wh.id
-				JOIN buy b ON b.id = bu.buyFk
-				JOIN volumeConfig vc
-				JOIN account.`user` u ON u.id = it.workerFk
-				JOIN workerDepartment wd ON wd.workerFk = u.id
-				JOIN department d ON d.id = wd.departmentFk
-			WHERE ic.display
-				AND d.code IN ('shopping', 'logistic', 'franceTeam')
-			GROUP BY it.workerFk;
-
-	INSERT INTO stockBuyed(buyed, dated, description)
-		SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
-				vDated,
-				IF(c.code = 'ES', p.name, c.name) destiny
-			FROM itemTicketOut ito
-				JOIN ticket t ON t.id = ito.ticketFk
-				JOIN `address` a ON a.id = t.addressFk
-				JOIN province p ON p.id = a.provinceFk
-				JOIN country c ON c.id = p.countryFk
-				JOIN warehouse wh ON wh.id = t.warehouseFk
-				JOIN itemCost ic ON ic.itemFk = ito.itemFk
-					AND ic.warehouseFk = t.warehouseFk
-				JOIN volumeConfig vc
-			WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated)
-				AND wh.code = 'VNH'
-			GROUP BY destiny;
-
-	UPDATE stockBuyed s
-			JOIN tStockBuyed ts ON ts.userFk = s.userFk
-		SET s.requested = ts.requested,
-			s.reserved = ts.reserved
-		WHERE s.dated = vDated;
-
-	DROP TEMPORARY TABLE tmp.buyUltimate,
-		tmp.item,
-		tStockBuyed;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/ticketDown_PrintableSelection.sql
+++ b/db/routines/vn/procedures/ticketDown_PrintableSelection.sql
@ -9,7 +9,7 @@ BEGIN
 					JOIN vn.sale s ON s.ticketFk = t.id
                    JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
                    JOIN vn.itemShelving ish ON ish.id = iss.itemShelvingFk
-                    JOIN vn.shelving sh ON sh.id = ish.shelvingFk
+                    JOIN vn.shelving sh ON sh.code = ish.shelvingFk
                    JOIN vn.parking p ON p.id = sh.parkingFk
 					WHERE p.sectorFk = vSectorFk
 			) sub ON sub.id = td.ticketFk
--- a/db/routines/vn/procedures/ticket_DelayTruckSplit.sql
+++ b/db/routines/vn/procedures/ticket_DelayTruckSplit.sql
@ -27,7 +27,7 @@ BEGIN
 							SUM(ish.visible) visible,
 							s.warehouseFk warehouseFk
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.id = ish.shelvingFk
+							JOIN shelving sh ON sh.code = ish.shelvingFk
 							JOIN parking p ON p.id = sh.parkingFk
 							JOIN sector s ON s.id = p.sectorFk
 						GROUP BY ish.itemFk,
--- a/db/routines/vn/procedures/ticket_getSplitList.sql
+++ b/db/routines/vn/procedures/ticket_getSplitList.sql
@ -28,7 +28,7 @@ BEGIN
 				SUM(ish.visible) visible,
 				s.warehouseFk warehouseFk
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.id = ish.shelvingFk
+				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector s ON s.id = p.sectorFk
 			GROUP BY ish.itemFk,
--- a/db/routines/vn/procedures/ticket_splitItemPackingType.sql
+++ b/db/routines/vn/procedures/ticket_splitItemPackingType.sql
@ -3,124 +3,87 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 	vSelf INT,
 	vOriginalItemPackingTypeFk VARCHAR(1)
 )
-BEGIN
+proc:BEGIN
 /**
- * Separa en diferentes tickets según el tipo de empaquetado
- * El ticket original conserva las líneas del tipo de empaquetado especificado
- * Las líneas sin tipo de empaquetado se asignan al ticket del tipo por defecto.
+ * Clona y reparte las líneas de ventas de un ticket en funcion del tipo de empaquetado.
+ * Respeta el id de ticket original para el tipo de empaquetado propuesto.
 *
- * @param vSelf Id del ticket original
- * @param vOriginalItemPackingTypeFk Tipo de empaquetado a mantener en el ticket original
+ * @param vSelf Id ticket
+ * @param vOriginalItemPackingTypeFk Tipo empaquetado que se mantiene el ticket original
 * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
 */
-	DECLARE vIsDone BOOLEAN DEFAULT FALSE;
-	DECLARE vCurrentPackingType VARCHAR(1);
-	DECLARE vDefaultPackingType VARCHAR(1);
-	DECLARE vHasOriginalPackingType BOOLEAN;
+	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vHasItemPackingType BOOL;
+	DECLARE vItemPackingTypeFk INT;
 	DECLARE vNewTicketFk INT;
-	DECLARE vTicketFk INT;

 	DECLARE vItemPackingTypes CURSOR FOR 
-		SELECT DISTINCT itemPackingTypeFk FROM tSalesToMove;
+		SELECT DISTINCT itemPackingTypeFk 
+			FROM tSalesToMove;

-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;

-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
+	SELECT COUNT(*) INTO vHasItemPackingType
+			FROM ticket t	
+				JOIN sale s ON s.ticketFk = t.id
+				JOIN item i ON i.id = s.itemFk 
+			WHERE t.id = vSelf
+				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+		ticketFk INT,
+		itemPackingTypeFk VARCHAR(1)
+	) ENGINE=MEMORY
+		SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk;
+
+	IF NOT vHasItemPackingType THEN
+		LEAVE proc;
+	END IF;

 	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
 		ticketFk INT,
 		saleFk INT,
-		itemPackingTypeFk VARCHAR(1)
+		itemPackingTypeFk INT
 	) ENGINE=MEMORY;

-	SELECT COALESCE(MAX(ic.defaultPackingTypeFk), MAX(i.itemPackingTypeFk)) INTO vDefaultPackingType
-		FROM vn.sale s
-			JOIN item i ON i.id = s.itemFk
-			LEFT JOIN itemConfig ic ON ic.defaultPackingTypeFk = i.itemPackingTypeFk
-		WHERE s.ticketFk = vSelf
-		GROUP BY s.ticketFk;
-
-	SELECT EXISTS (
-		SELECT TRUE
-			FROM sale s
-				JOIN item i ON i.id = s.itemFk
-			WHERE s.ticketFk = vSelf
-				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk
-	) INTO vHasOriginalPackingType;
-
-	IF vOriginalItemPackingTypeFk IS NULL OR NOT vHasOriginalPackingType THEN
-		SET vOriginalItemPackingTypeFk = vDefaultPackingType;
-	END IF;
-
-	START TRANSACTION;
-
-	SELECT t.id INTO vTicketFk
-		FROM ticket t
-			JOIN sale s ON s.id = t.id
-		WHERE t.id = vSelf
-		FOR UPDATE;
-
 	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
 		SELECT s.id, i.itemPackingTypeFk 
-			FROM sale s
+			FROM ticket t	
+				JOIN sale s ON s.ticketFk = t.id
 				JOIN item i ON i.id = s.itemFk 
-			WHERE s.ticketFk = vSelf
+			WHERE t.id = vSelf
 				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;

 	OPEN vItemPackingTypes;
-	l: LOOP
-		SET vIsDone = FALSE;
-		FETCH vItemPackingTypes INTO vCurrentPackingType;

-		IF vIsDone THEN
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
+
+		IF vDone THEN
 			LEAVE l;
 		END IF;

 		CALL ticket_Clone(vSelf, vNewTicketFk);

-		SELECT id INTO vTicketFk
-			FROM ticket t
-			WHERE t.id = vNewTicketFk
-			FOR UPDATE;
-
 		UPDATE tSalesToMove
 			SET ticketFk = vNewTicketFk
-			WHERE itemPackingTypeFk = vCurrentPackingType;
-
-		IF vCurrentPackingType = vDefaultPackingType THEN
-			INSERT INTO tSalesToMove (ticketFk, saleFk, itemPackingTypeFk)
-				SELECT vNewTicketFk, s.id, i.itemPackingTypeFk
-					FROM sale s
-						JOIN item i ON i.id = s.itemFk
-				WHERE s.ticketFk = vSelf
-					AND i.itemPackingTypeFk IS NULL;
-		END IF;
+			WHERE itemPackingTypeFk = vItemPackingTypeFk;

 	END LOOP;
+
 	CLOSE vItemPackingTypes;

 	UPDATE sale s
-			JOIN tSalesToMove t ON t.saleFk = s.id
-		SET s.ticketFk = t.ticketFk;
+			JOIN tSalesToMove stm ON stm.saleFk = s.id
+		SET s.ticketFk = stm.ticketFk
+		WHERE stm.ticketFk;

-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT
-			ENGINE=MEMORY
-		SELECT s.ticketFk, MAX(i.itemPackingTypeFk) itemPackingTypeFk
-			FROM sale s
-				JOIN item i ON i.id = s.itemFk
-			WHERE s.ticketFk = vSelf
-			GROUP BY s.ticketFk
-		UNION
-		SELECT ticketFk, MAX(itemPackingTypeFk)
+	INSERT INTO tmp.ticketIPT (ticketFk, itemPackingTypeFk)
+		SELECT ticketFk, itemPackingTypeFk
 			FROM tSalesToMove
 			GROUP BY ticketFk;

-	COMMIT;
-
 	DROP TEMPORARY TABLE tSalesToMove;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/travelVolume_get.sql
+++ b/db/routines/vn/procedures/travelVolume_get.sql
@ -10,7 +10,7 @@ BEGIN
 			JOIN vn.entry e ON e.travelFk = tr.id
 			JOIN vn.buy b ON b.entryFk = e.id
 		WHERE tr.landed BETWEEN vFromDated AND vToDated
-			AND NOT tr.isRaid
+			AND NOT tr.daysInForward
 			AND tr.warehouseInFk = vWarehouseFk
 		GROUP BY tr.landed , a.name ;
 END$$
--- a/db/routines/vn/procedures/travel_checkRaid.sql
+++ b/db/routines/vn/procedures/travel_checkRaid.sql
@ -1,17 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`travel_checkRaid`(
-	vIsRaid BOOL,
-	vDaysInForward INT
-)
-BEGIN
-/**
- * Check if the values of isRaid and daysInforward are correct
- *
- * @param vIsRaid idRaid value
- * @param vDaysInForward daysInForward value
- */
-	IF (NOT vIsRaid AND vDaysInForward IS NOT NULL) OR (vIsRaid AND vDaysInForward IS NULL) THEN
-		CALL util.throw('The raid information is not correct');
-	END IF;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/travel_moveRaids.sql
+++ b/db/routines/vn/procedures/travel_moveRaids.sql
@ -37,8 +37,7 @@ BEGIN
 		SELECT id travelFk, 
 				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
 			FROM travel
-			WHERE isRaid
-				AND daysInForward;
+			WHERE daysInForward;

 	START TRANSACTION;

--- a/db/routines/vn/procedures/workerTimeControl_check.sql
+++ b/db/routines/vn/procedures/workerTimeControl_check.sql
@ -0,0 +1,168 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`workerTimeControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
+proc: BEGIN
+/**
+ * Verifica si el empleado puede fichar en el momento actual, si puede fichar llama a workerTimeControlAdd
+ *
+ * @param vUserFk Identificador del trabajador
+ * @return Retorna si encuentra un problema 'odd','maxTimeWork','breakDay','breakWeek' ;
+ *	En caso de tener algun problema retorna el primero que encuentra
+ */
+	DECLARE vLastIn DATETIME ;
+	DECLARE vLastOut DATETIME ;
+	DECLARE vDayWorkMax INT;
+	DECLARE vDayBreak INT;
+	DECLARE vWeekBreak INT ;
+	DECLARE vWeekScope INT;
+	DECLARE vDayStayMax INT;
+	DECLARE vProblem VARCHAR(20) DEFAULT NULL;
+	DECLARE vTimedWorked INT;
+	DECLARE vCalendarStateType VARCHAR(20) DEFAULT NULL;
+	DECLARE vDepartmentFk INT;
+	DECLARE vTo VARCHAR(50) DEFAULT NULL;
+	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
+	DECLARE vBody VARCHAR(255) DEFAULT NULL;
+		
+	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax 
+		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax
+		FROM workerTimeControlParams;
+
+	SELECT MAX(timed) INTO vLastIn
+		FROM workerTimeControl 
+		WHERE userFk = vUserFk 
+			AND direction = 'in';
+		
+	SELECT MAX(timed) INTO vLastOut
+		FROM workerTimeControl 
+		WHERE userFk = vUserFk 
+			AND direction = 'out'; 
+
+	SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo
+		FROM account.user u
+		WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);   
+		
+	SELECT CONCAT(firstName,' ',lastName) INTO vUserName
+		FROM worker w
+		WHERE w.id = vUserFk;
+
+
+	IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
+		
+		-- VERIFICAR DESCANSO DIARIO 
+		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN 
+			SELECT "Descansos 12 h" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;
+		END IF;   
+		
+		-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
+		IF (SELECT MOD(COUNT(*),2) -- <>0 							
+				FROM workerTimeControl 
+				WHERE userFk = vUserFk
+					AND timed >= vLastIn
+			) THEN				
+			SELECT "Dias con fichadas impares" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;	  
+		END IF;
+		
+		-- VERIFICAR VACACIONES
+		SELECT at2.name INTO vCalendarStateType
+			FROM calendar c 
+				JOIN business b ON b.id = c.businessFk
+				JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
+			WHERE c.dated = util.VN_CURDATE()
+				AND at2.isAllowedToWork = FALSE
+				AND b.workerFk = vUserFk
+			LIMIT 1;
+		
+			IF(LENGTH(vCalendarStateType)) THEN
+			SELECT vCalendarStateType AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;	
+				
+			END IF;
+		
+		-- VERIFICAR CONTRATO EN VIGOR
+			IF (SELECT COUNT(*)
+					FROM business b
+					WHERE b.workerFk = vUserFk
+						AND b.started <= vDated
+						AND IFNULL(b.ended, vDated) >= vDated
+				) = 0 THEN
+				SELECT "No hay un contrato en vigor" AS problem;
+				-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+				LEAVE proc;	
+					
+			END IF;
+
+		-- VERIFICAR DESCANSO SEMANAL
+		SET @vHasBreakWeek:= FALSE;
+		SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); 
+		
+		DROP TEMPORARY TABLE IF EXISTS tmp.trash;
+		CREATE TEMPORARY TABLE tmp.trash
+		SELECT  IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
+				@vLastTimed:= UNIX_TIMESTAMP(timed)
+			FROM workerTimeControl 
+			WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
+				AND userFk= vUserFk
+				AND direction IN ('in','out')
+			ORDER BY timed ASC;   
+			
+		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
+			SELECT "Descansos 36 h" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;
+		END IF;
+		
+		DROP TEMPORARY TABLE tmp.trash;    
+
+	ELSE  -- DIA ACTUAL   
+		
+		-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
+		SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) -  IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked 
+			FROM workerTimeControl wtc
+			WHERE userFk = vUserFk 
+				AND timed >= vLastIn
+			ORDER BY timed;
+
+		IF  vTimedWorked > vDayWorkMax THEN 
+			SELECT "Jornadas" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;
+		END IF;
+
+	END IF;
+
+		-- VERIFICAR DEPARTAMENTO
+	/*	IF vTabletFk IS NOT NULL  THEN
+			SELECT wtcu.departmentFk INTO vDepartmentFk
+				FROM workerTimeControlUserInfo wtcu
+				WHERE wtcu.userFk = vUserFk;
+			IF (SELECT COUNT(td.tabletFk)
+						FROM tabletDepartment td
+						WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk
+					) = 0 THEN
+					SELECT "No perteneces a este departamento." AS problem;
+					-- ENVIAMOS CORREO AL BOSSFK
+					SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
+					CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+					LEAVE proc;	
+			END IF;
+		END IF;*/
+	
+END$$
+DELIMITER ;
--- a/db/routines/vn/triggers/address_beforeInsert.sql
+++ b/db/routines/vn/triggers/address_beforeInsert.sql
@ -6,7 +6,6 @@ BEGIN
 	DECLARE vIsEqualizated BOOL;

 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = address_getGeo(NEW.id);

 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
--- a/db/routines/vn/triggers/address_beforeUpdate.sql
+++ b/db/routines/vn/triggers/address_beforeUpdate.sql
@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`address_beforeUpdate`
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
+	
 	SET NEW.editorFk = account.myUser_getId();

 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@ -13,10 +14,5 @@ BEGIN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;

-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postalCode <=> OLD.postalCode) THEN
-
-		SET NEW.geoFk = address_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/client_beforeInsert.sql
+++ b/db/routines/vn/triggers/client_beforeInsert.sql
@ -3,10 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`client_beforeInsert`
 	BEFORE INSERT ON `client`
 	FOR EACH ROW
 BEGIN
+
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
-	SET NEW.geoFk = client_getGeo(NEW.id);

 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@ -15,5 +13,9 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
+
+	SET NEW.accountingAccount = 4300000000 + NEW.id;
+    
+    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END$$
 DELIMITER ;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jorge Penadés	615faf48de	chore: refs #6452 drop script gitea/salix/pipeline/pr-dev This commit looks good Details	2024-11-06 10:54:12 +01:00
Jorge Penadés	b42b6db27c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6452-useIdAsSip gitea/salix/pipeline/pr-dev This commit looks good Details	2024-11-06 09:27:13 +01:00
Jorge Penadés	425229fcc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6452-useIdAsSip gitea/salix/pipeline/pr-dev This commit looks good Details	2024-10-15 16:48:34 +02:00
Jorge Penadés	48f6d0fccc	feat: refs #6452 add sip on create worker gitea/salix/pipeline/pr-dev Build queued... Details	2024-10-15 16:47:58 +02:00