Merge pull request '8231_testToMaster_2448' (!3241) from 8231_testToMaster_2448 into master

Reviewed-on: #3241 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-26 06:04:21 +00:00 · 2024-11-26 06:04:21 +00:00 · 1a11832281
parent c73196edec ed39ae7e4b
commit 1a11832281
253 changed files with 4456 additions and 3247 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,117 @@
+# 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/getTickets.js
+++ b/back/methods/collection/getTickets.js
@ -73,7 +73,7 @@ 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.code = ish.shelvingFk
+                    LEFT JOIN shelving sh ON sh.id = 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
@ -114,7 +114,7 @@ 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.code = ish.shelvingFk
+                LEFT JOIN shelving sh ON sh.id = 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
--- a/back/methods/machine-worker/specs/updateInTime.spec.js
+++ b/back/methods/machine-worker/specs/updateInTime.spec.js
@ -1,132 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('machineWorker updateInTime()', () => {
-    const itBoss = 104;
-    const davidCharles = 1106;
-
-    beforeAll(async() => {
-        ctx = {
-            req: {
-                accessToken: {},
-                headers: {origin: 'http://localhost'},
-                __: value => value
-            }
-        };
-    });
-
-    it('should throw an error if the plate does not exist', async() => {
-        const tx = await models.MachineWorker.beginTransaction({});
-        const options = {transaction: tx};
-        const plate = 'RE-123';
-        ctx.req.accessToken.userId = 1106;
-        try {
-            await models.MachineWorker.updateInTime(ctx, plate, options);
-            await tx.rollback();
-        } catch (e) {
-            const error = e;
-
-            expect(error.message).toContain('the plate does not exist');
-            await tx.rollback();
-        }
-    });
-
-    it('should grab a machine where is not in use', async() => {
-        const tx = await models.MachineWorker.beginTransaction({});
-        const options = {transaction: tx};
-        const plate = 'RE-003';
-        ctx.req.accessToken.userId = 1107;
-        try {
-            const totalBefore = await models.MachineWorker.find(null, options);
-            await models.MachineWorker.updateInTime(ctx, plate, options);
-            const totalAfter = await models.MachineWorker.find(null, options);
-
-            expect(totalAfter.length).toEqual(totalBefore.length + 1);
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-        }
-    });
-
-    describe('less than 12h', () => {
-        const plate = 'RE-001';
-        it('should trow an error if it is not himself', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = davidCharles;
-
-            try {
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                await tx.rollback();
-            } catch (e) {
-                const error = e;
-
-                expect(error.message).toContain('This machine is already in use');
-                await tx.rollback();
-            }
-        });
-
-        it('should throw an error if it is himself with a different machine', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = itBoss;
-            const plate = 'RE-003';
-            try {
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                await tx.rollback();
-            } catch (e) {
-                const error = e;
-
-                expect(error.message).toEqual('You are already using a machine');
-                await tx.rollback();
-            }
-        });
-
-        it('should set the out time if it is himself', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = itBoss;
-
-            try {
-                const isNotParked = await models.MachineWorker.findOne({
-                    where: {workerFk: itBoss}
-                }, options);
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                const isParked = await models.MachineWorker.findOne({
-                    where: {workerFk: itBoss}
-                }, options);
-
-                expect(isNotParked.outTime).toBeNull();
-                expect(isParked.outTime).toBeDefined();
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-            }
-        });
-    });
-
-    describe('equal or more than 12h', () => {
-        const plate = 'RE-002';
-        it('should set the out time and grab the machine', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = davidCharles;
-            const filter = {
-                where: {workerFk: davidCharles, machineFk: 2}
-            };
-            try {
-                const isNotParked = await models.MachineWorker.findOne(filter, options);
-                const totalBefore = await models.MachineWorker.find(null, options);
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                const isParked = await models.MachineWorker.findOne(filter, options);
-                const totalAfter = await models.MachineWorker.find(null, options);
-
-                expect(isNotParked.outTime).toBeNull();
-                expect(isParked.outTime).toBeDefined();
-                expect(totalAfter.length).toEqual(totalBefore.length + 1);
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-            }
-        });
-    });
-});
--- a/back/methods/machine-worker/updateInTime.js
+++ b/back/methods/machine-worker/updateInTime.js
@ -1,77 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-module.exports = Self => {
-    Self.remoteMethodCtx('updateInTime', {
-        description: 'Updates the corresponding registry if the worker has been registered in the last few hours',
-        accessType: 'WRITE',
-        accepts: [
-            {
-                arg: 'plate',
-                type: 'string',
-            }
-        ],
-        http: {
-            path: `/updateInTime`,
-            verb: 'POST'
-        }
-    });
-
-    Self.updateInTime = async(ctx, plate, options) => {
-        const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-        const $t = ctx.req.__;
-
-        let tx;
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const machine = await models.Machine.findOne({
-                fields: ['id', 'plate'],
-                where: {plate}
-            }, myOptions);
-
-            if (!machine)
-                throw new UserError($t('the plate does not exist', {plate}));
-
-            const machineWorker = await Self.findOne({
-                where: {
-                    or: [{machineFk: machine.id}, {workerFk: userId}],
-                    outTime: null,
-                }
-            }, myOptions);
-
-            const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions);
-            const hoursDifference = (Date.vnNow() - machineWorker?.inTime?.getTime() ?? 0) / (60 * 60 * 1000);
-
-            if (machineWorker) {
-                const isHimself = userId == machineWorker.workerFk;
-                const isSameMachine = machine.id == machineWorker.machineFk;
-
-                if (hoursDifference < maxHours && !isHimself)
-                    throw new UserError($t('This machine is already in use.'));
-
-                if (hoursDifference < maxHours && isHimself && !isSameMachine)
-                    throw new UserError($t('You are already using a machine'));
-
-                await machineWorker.updateAttributes({
-                    outTime: Date.vnNew()
-                }, myOptions);
-            }
-
-            if (!machineWorker || hoursDifference >= maxHours)
-                await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);
-
-            if (tx) await tx.commit();
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};
--- a/back/model-config.json
+++ b/back/model-config.json
@ -79,6 +79,9 @@
    "ImageCollectionSize": {
        "dataSource": "vn"
    },
+    "ImageConfig": {
+        "dataSource": "vn"
+    },
    "ImageContainer": {
        "dataSource": "imageStorage"
    },
@ -88,12 +91,6 @@
    "Machine": {
        "dataSource": "vn"
    },
-    "MachineWorker": {
-        "dataSource": "vn"
-    },
-    "MachineWorkerConfig": {
-        "dataSource": "vn"
-    },
    "MobileAppVersionControl": {
        "dataSource": "vn"
    },
@ -145,6 +142,12 @@
    "StarredModule": {
        "dataSource": "vn"
    },
+    "SaySimpleCountry": {
+        "dataSource": "vn"
+    },
+    "SaySimpleConfig": {
+        "dataSource": "vn"
+    },
    "TempContainer": {
        "dataSource": "tempStorage"
    },
--- a/back/models/country.json
+++ b/back/models/country.json
@ -44,6 +44,11 @@
            "type": "belongsTo",
            "model": "Continent",
            "foreignKey": "continentFk"
+        },
+        "saySimpleCountry": {
+            "type": "hasOne",
+            "model": "SaySimpleCountry",
+            "foreignKey": "countryFk"
        }
    },
    "acls": [
--- a/back/models/image-config.json
+++ b/back/models/image-config.json
@ -0,0 +1,22 @@
+{
+    "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/machine-worker-config.json
+++ b/back/models/machine-worker-config.json
@ -1,18 +0,0 @@
-{
-	"name": "MachineWorkerConfig",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "vn.machineWorkerConfig"
-		}
-	},
-	"properties": {
-        "id": {
-            "type": "number",
-            "id": true
-        },
-        "maxHours": {
-            "type": "number"
-        }
-	}
-}
--- a/back/models/machine-worker.js
+++ b/back/models/machine-worker.js
@ -1,3 +0,0 @@
-module.exports = Self => {
-    require('../methods/machine-worker/updateInTime')(Self);
-};
--- a/back/models/machine-worker.json
+++ b/back/models/machine-worker.json
@ -1,33 +0,0 @@
-{
-	"name": "MachineWorker",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "vn.machineWorker"
-		}
-	},
-	"properties": {
-		"id": {
-			"type": "number",
-			"id": true
-		},
-		"workerFk": {
-			"type": "number"
-		},
-		"machineFk": {
-			"type": "number"
-		},
-		"inTime": {
-			"type": "date",
-			"mysql": {
-				"columnName": "inTimed"
-			}
-		},
-		"outTime": {
-			"type": "date",
-			"mysql": {
-				"columnName": "outTimed"
-			}
-		}
-	}
-}
--- a/back/models/say-simple-config.json
+++ b/back/models/say-simple-config.json
@ -0,0 +1,29 @@
+{
+    "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
@ -0,0 +1,26 @@
+{
+    "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
@ -1762,7 +1762,6 @@ INSERT INTO `ACL` VALUES (378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','
 INSERT INTO `ACL` VALUES (379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system',NULL);
 INSERT INTO `ACL` VALUES (380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager',NULL);
-INSERT INTO `ACL` VALUES (382,'Item','labelPdf','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (383,'Sector','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (384,'Sector','*','WRITE','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee',NULL);
@ -2085,7 +2084,7 @@ INSERT INTO `ACL` VALUES (756,'Route','findOne','READ','ALLOW','ROLE','employee'
 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 (760,'Cmr','downloadZip','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);
--- 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, 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');
+        (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');

 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, 1, 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, 0, 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, 'GVC', 1, 1, 1, 2,1106),
-        (4, 'HEJ', 1, 1, 1, NULL,1106),
-        (1, 'UXN', 2, 12, 12, NULL,1106);
+        (2, 11, 1, 1, 1, 2,1106),
+        (4, 12, 1, 1, 1, NULL,1106),
+        (1, 13, 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`)
-    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),
-        (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),
-        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3),
-        (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),
-        (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),
-        (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),
-        (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),
-        (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),
-        (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),
-        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4),
-        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4);
+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`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
+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, 0,    ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0,    'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0,  'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0,   'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0,   'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0,    'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  ''),
-        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  ''),
-        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, 1,  ''),
-        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, 0, '');
+        (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);
@ -2454,7 +2454,7 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
 INSERT INTO `vn`.`dmsType`
 		(`id`, `name`, 					`readRoleFk`, 	`writeRoleFk`, `code`)
    VALUES
-        (1,  	'Facturas Recibidas',  	NULL,   		NULL,   		'invoiceIn'),
+        (1,  	'Facturas Recibidas',		1,   			1,   		'invoiceIn'),
        (2,  	'Doc oficial',         	NULL,   		NULL,   		'officialDoc'),
        (3,  	'Laboral',             	37,     		37,     		'hhrrData'),
        (4,  	'Albaranes recibidos', 	NULL,   		NULL,   		'deliveryNote'),
@ -2476,7 +2476,8 @@ 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');
+		(23, 	'Termografos',			35,    			35,    			'thermograph'),
+		(24, 	'Sello de calidad',		1,    			1,    			'qualitySeal');

 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
    VALUES
@ -2842,12 +2843,6 @@ INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmen
        ('RE-001', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442),
        ('RE-002', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);

-INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`)
-    VALUES
-        (1106, 1, util.VN_CURDATE(),                                util.VN_CURDATE()),
-        (1106, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),    DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
-        (1106, 2, util.VN_CURDATE(),                                NULL),
-        (1106, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),    DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY));

 INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
 VALUES
@ -2960,9 +2955,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`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`, `clientSelfConsumptionFk`, `addressSelfConsumptionFk`)
    VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600, 1112, 12);

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

 USE vn;
 DELETE ish.*  FROM vn.itemShelving ish
-		JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+		JOIN vn.shelving sh ON sh.id = 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
@ -3766,22 +3761,22 @@ DELETE ish.*  FROM vn.itemShelving ish
 INSERT INTO vn.itemShelving
 (itemFk, shelvingFk, visible, created, `grouping`, packing, packagingFk, userFk, isChecked)
 VALUES
-	(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);
+	(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);

 -- Previous for Bolas de madera
 INSERT IGNORE INTO vn.sectorCollection
@ -3831,8 +3826,6 @@ UPDATE vn.collection
 UPDATE vn.sale
 	SET isPicked =FALSE;

-INSERT INTO vn.machineWorkerConfig(id, maxHours)
-	VALUES(1, 12);

 INSERT INTO vn.workerAppTester(workerFk) VALUES(66);

@ -3840,9 +3833,6 @@ INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmen
    VALUES
        ('RE-003', 'IRON', 'JPH-24', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);

-
-INSERT INTO vn.machineWorker(workerFk,machineFk,inTimed) VALUES (104,1,'2001-01-01 10:00:00.00.000');
-
 UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1;

 UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
@ -4018,4 +4008,27 @@ INSERT IGNORE INTO pbx.queueMember
 UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
 UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";

+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);
--- a/db/routines/account/views/myUser.sql
+++ b/db/routines/account/views/myUser.sql
@ -7,8 +7,7 @@ AS SELECT `u`.`id` AS `id`,
 	`u`.`email` AS `email`,
 	`u`.`nickname` AS `nickname`,
 	`u`.`lang` AS `lang`,
-	`u`.`role` AS `role`,
-	`u`.`recoverPass` AS `recoverPass`
+	`u`.`role` AS `role`
 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.code = ish.shelvingFk
+					JOIN vn.shelving sh ON sh.id = 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 e.isRaid
+						AND NOT t.isRaid
 					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 e.isRaid
+			AND tr.isRaid
 			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 e.isRaid
+						AND NOT t.isRaid
 				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 e.isRaid
+						AND NOT t.isRaid
 						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,45 +9,54 @@ 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 hedera.`order` o ON o.id = tmpOrder.orderFk;
+				JOIN `order` o ON o.id = tmpOrder.orderFk;

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

 	-- Calcula el IVA y el recargo desglosado.
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.orderTax;
-	CREATE TEMPORARY TABLE tmp.orderTax
-		(INDEX (orderFk))
+	CREATE OR REPLACE TEMPORARY TABLE tmp.orderTax
+		(PRIMARY KEY (orderFk, code, rate))
 		ENGINE = MEMORY
-		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
+		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
 					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
-				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 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 vn.taxClass tc ON tc.id = bp.taxClassFk
-			GROUP BY tmpOrder.orderFk, pgc.`code`, pgc.rate
-			HAVING taxableBase != 0;
+			GROUP BY o.orderFk, pgc.code, pgc.rate
+			HAVING taxableBase
+			ORDER BY bp.priority;
 					
+	-- 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/salix/triggers/ACL_beforeInsert.sql
+++ b/db/routines/salix/triggers/ACL_beforeInsert.sql
@ -4,5 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_beforeInsert`
 	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 ;
--- a/db/routines/stock/procedures/log_refreshBuy.sql
+++ b/db/routines/stock/procedures/log_refreshBuy.sql
@ -11,7 +11,7 @@ BEGIN
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
-				e.isRaid,
+				t.isRaid,
 				ADDTIME(t.shipped,
 					IFNULL(t.shipmentHour, '00:00:00')) shipped,
 				t.warehouseOutFk,
@ -50,7 +50,7 @@ BEGIN
 				itemFk,
 				TIMESTAMPADD(DAY, life, @dated),
 				quantity,
-				IF(isIn, isReceived, isDelivered) AND !isRaid
+				IF(isIn, isReceived, isDelivered) AND NOT isRaid
 			FROM tValues
 			WHERE isIn OR !lessThanInventory;

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

--- a/db/routines/vn/events/raidUpdate.sql
+++ b/db/routines/vn/events/raidUpdate.sql
@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`raidUpdate`
-	ON SCHEDULE EVERY 1 DAY
-		STARTS '2017-12-29 00:05:00.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO CALL raidUpdate$$
-DELIMITER ;
--- a/db/routines/vn/functions/address_getGeo.sql
+++ b/db/routines/vn/functions/address_getGeo.sql
@ -14,9 +14,12 @@ 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
+			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
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
+		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
+			(p.code = a.postalCode) DESC
 		LIMIT 1;

 	RETURN vGeoFk;
--- a/db/routines/vn/functions/buy_getUltimate.sql
+++ b/db/routines/vn/functions/buy_getUltimate.sql
@ -0,0 +1,31 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`buy_getUltimate`(
+	vItemFk INT,
+	vWarehouseFk INT,
+	vDated DATE
+)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Calcula las últimas compras realizadas hasta una fecha.
+ *
+ * @param vItemFk Id del artículo
+ * @param vWarehouseFk Id del almacén
+ * @param vDated Compras hasta fecha
+ * @return Id de compra
+ */
+	DECLARE vBuyFk INT;
+
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, vDated);
+
+	SELECT buyFk INTO vBuyFk
+		FROM tmp.buyUltimate;
+
+	DROP TEMPORARY TABLE IF EXISTS
+		tmp.buyUltimate,
+		tmp.buyUltimateFromInterval;
+
+	RETURN vBuyFk;
+END$$
+DELIMITER ;
--- a/db/routines/vn/functions/client_getGeo.sql
+++ b/db/routines/vn/functions/client_getGeo.sql
@ -0,0 +1,27 @@
+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,40 +9,14 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getCommission`(v
 BEGIN
 	DECLARE vCommission INT;
 	DECLARE vCurrentCommission INT;
-    DECLARE vIsCurrencyUsd INT;
+	DECLARE vIsNotEUR INT;
 	DECLARE vLastEntryFk INT;

-    SELECT count(*) INTO vIsCurrencyUsd
+	SELECT count(*) INTO vIsNotEUR
 			FROM currency c
-            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
+			WHERE c.code <> 'EUR' AND id = vCurrencyFk;

+	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
@ -51,8 +25,27 @@ 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.code = ish.shelvingFk
+            JOIN vn.shelving sh ON sh.id = 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.code = ish.shelvingFk
+            JOIN vn.shelving sh ON sh.id = 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
@ -0,0 +1,29 @@
+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/workerMachinery_isRegistered.sql
+++ b/db/routines/vn/functions/workerMachinery_isRegistered.sql
@ -1,23 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`workerMachinery_isRegistered`(vWorkerFk VARCHAR(10))
-	RETURNS tinyint(1)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-/**
- * Comprueba si existen registros en las últimas horas (maxHours de machineWorkerConfig) del trabajador vWorkerFk y si tiene a nulo la hora outTimed  (indica la hora que deja el vehículo)
- *
- * @param vWorkerFk id del trabajador
- * @return Devuelve TRUE/FALSE en caso de que haya o no registros
- */
-	IF (SELECT COUNT(*)
-		FROM machineWorker m
-		WHERE  m.workerFk = vWorkerFk
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -(SELECT maxHours from machineWorkerConfig), util.VN_NOW()) AND ISNULL(m.outTimed))
-	THEN
-		RETURN TRUE;
-	ELSE
-		RETURN FALSE;
-	END IF;
-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 e.isRaid
+						AND NOT tr.isRaid
 				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 e.isRaid
+						AND NOT tr.isRaid
 				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 e.isRaid
+				AND NOT t.isRaid
 			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 e.isRaid
+				AND NOT tr.isRaid
 	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 e.isRaid
+				AND NOT t.isRaid
 				AND t.warehouseInFk = vWarehouseLanding
 				AND t.landed >= vDatedFrom
 				AND (ir.dated IS NULL OR t.landed <= ir.dated)
--- a/db/routines/vn/procedures/buy_getUltimate.sql
+++ b/db/routines/vn/procedures/buy_getUltimate.sql
@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
 	vItemFk INT,
-	vWarehouseFk SMALLINT, 
+	vWarehouseFk INT, 
 	vDated DATE
 )
 BEGIN
--- 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 `type` = 'day' AND dated < v3Months;
+	DELETE FROM zoneEvent WHERE dated < v2Months OR ended < v2Months;
 	DELETE b FROM buy b
 			JOIN entryConfig e ON e.defaultEntry = b.entryFk
 		WHERE b.created < v2Months;
--- a/db/routines/vn/procedures/clean_logiflora.sql
+++ b/db/routines/vn/procedures/clean_logiflora.sql
@ -28,7 +28,7 @@ BEGIN
 				JOIN agencyMode am ON am.id = tr.agencyModeFk
 			WHERE NOT b.quantity
 				AND am.code = 'logiflora'
-				AND e.isRaid;
+				AND tr.daysInForward;

 	START TRANSACTION;

--- 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.code = ish.shelvingFk
+				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 sectorType st ON st.id = sc.typeFk
--- a/db/routines/vn/procedures/collection_getTickets.sql
+++ b/db/routines/vn/procedures/collection_getTickets.sql
@ -30,7 +30,9 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			IFNULL(ob.description,'') observaciones,
-			cc.rgb
+			cc.rgb,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk
@ -43,6 +45,9 @@ 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
@ -52,7 +57,9 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			ob.description,
-			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`
+			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	
@ -65,6 +72,9 @@ 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,
@ -73,7 +83,9 @@ BEGIN
 			t.warehouseFk,
 			c.salesPersonFk,
 			ob.description,
-			NULL `rgb`
+			NULL `rgb`,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.sectorCollection sc
 			JOIN vn.sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id 
 			JOIN vn.saleGroup sg ON sg.id = ss.saleGroupFk
@ -82,6 +94,9 @@ 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/entry_cloneHeader.sql
+++ b/db/routines/vn/procedures/entry_cloneHeader.sql
@ -17,7 +17,6 @@ BEGIN
 			supplierFk,
 			dated,
 			isExcludedFromAvailable,
-			isRaid,
 			commission,
 			currencyFk,
 			companyFk,
@ -28,7 +27,6 @@ BEGIN
 				supplierFk,
 				dated,
 				isExcludedFromAvailable,
-				isRaid,
 				commission,
 				currencyFk,
 				companyFk,
--- 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 e.isRaid
+			AND NOT tr.isRaid
 			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_splitByShelving.sql
+++ b/db/routines/vn/procedures/entry_splitByShelving.sql
@ -1,10 +1,15 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_splitByShelving`(vShelvingFk VARCHAR(3), vFromEntryFk INT, vToEntryFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_splitByShelving`(
+	vShelvingCode VARCHAR(10),
+	vFromEntryFk INT,
+	vToEntryFk INT
+)
 BEGIN
 /**
- * Divide las compras entre dos entradas de acuerdo con lo ubicado en una matr<EFBFBD>cula
+ * Divide las compras entre dos entradas de
+ * acuerdo con lo ubicado en una matricula.
 * 
- * @param vShelvingFk Identificador de vn.shelving
+ * @param vShelvingCode Código de vn.shelving
 * @param vFromEntryFk Entrada origen
 * @param vToEntryFk Entrada destino
 */
@ -23,7 +28,7 @@ BEGIN
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
-			WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
+			WHERE ish.shelvingFk = vShelvingCode COLLATE utf8_general_ci
 				AND NOT ish.isSplit
 			GROUP BY ish.id;
 			
@ -107,9 +112,10 @@ BEGIN
 			UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID();
 		END IF;

-		UPDATE itemShelving
-			SET isSplit = TRUE
-				WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci;
+		UPDATE itemShelving ish
+				JOIN shelving sh ON sh.id = ish.shelvingFk
+			SET ish.isSplit = TRUE
+			WHERE sh.code = vShelvingCode 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.shipped >= util.VN_CURDATE()
+			WHERE t.landed >= util.VN_CURDATE()
 				AND e.currencyFk = vCurrency
 				AND NOT e.isBooked;

--- a/db/routines/vn/procedures/expedition_getFromRoute.sql
+++ b/db/routines/vn/procedures/expedition_getFromRoute.sql
@ -16,7 +16,8 @@ BEGIN
 			a.nickname,
 			sub2.itemPackingTypeConcat,
 			est.code,
-			es.isScanned
+			es2.isScanned,
+			es2.scanOrder
 		FROM expedition e
 			JOIN ticket t ON t.id = e.ticketFk
 			JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@ -38,6 +39,7 @@ BEGIN
 				    SELECT MAX(id)
 				    	FROM expeditionState es
 				    	WHERE expeditionFk = e.id)
+			LEFT JOIN expeditionState es2 ON es2.id = es.id
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END$$
--- a/db/routines/vn/procedures/expedition_selfConsumptionPackaging.sql
+++ b/db/routines/vn/procedures/expedition_selfConsumptionPackaging.sql
@ -0,0 +1,93 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expedition_selfConsumptionPackaging`(
+	vSelf INT,
+	vAction ENUM('add', 'remove')
+)
+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
+			JOIN packaging p ON p.id = e.packagingFk
+			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 vAddressFk IS NULL THEN
+		CALL util.throw('Some config parameters are not set');
+	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 isRaid
+					AND NOT tr.isRaid
 				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 isRaid
+							AND NOT tr.isRaid
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;
--- a/db/routines/vn/procedures/itemPlacementSupplyAiming.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyAiming.sql
@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyAiming`(vShelvingFk VARCHAR(10), quantity INT, vItemFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyAiming`(
+    vShelvingCode VARCHAR(10),
+    vQuantity INT,
+    vItemFk INT
+)
 BEGIN

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

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

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

 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
@ -1,5 +1,8 @@
 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.
@ -13,11 +16,11 @@ BEGIN
 			SUM(ish.visible) stockTotal,
 			ish.created,
 			p.pickingOrder
-		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
+		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
 		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`(vShelvingFk VARCHAR(10) )
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
-	
 /**
 * Devuelve el log de los item en cada carro
 *
- * @param vShelvingFk Matrícula del carro 
+ * @param vShelvingCode Matrícula del carro 
 * 
 */
-	
 	SELECT isl.itemShelvingFk, 
 			isl.created, 
 			isl.accion, 
@ -28,8 +28,9 @@ BEGIN
 	FROM item 
 		JOIN itemShelvingLog isl ON item.id = isl.itemFk 
 		JOIN worker ON isl.workerFk = worker.id
-	WHERE shelvingFk = vShelvingFk OR isl.itemFk = vShelvingFk
+		JOIN shelving sh ON sh.id = isl.shelvingFk
+	WHERE sh.code = vShelvingCode COLLATE utf8mb3_unicode_ci
+		OR isl.itemFk = vShelvingCode -- ?? Respeto porque ya estaba
 	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.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = 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.code = ish.shelvingFk
+				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 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.code = ish.shelvingFk
+			LEFT JOIN shelving sh ON sh.id = 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
@ -48,7 +48,7 @@ BEGIN
 			iss.itemShelvingFk, 
 			SUM(IFNULL(iss.quantity,0)), 
 			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'),
-			ish.shelvingFk
+			sh.code
 		INTO vItemFk, 
 			vSaleFk, 
 			vItemShelvingFk, 
@ -58,7 +58,8 @@ BEGIN
 		FROM itemShelvingSale iss
 			JOIN sale s ON s.id = iss.saleFk
 			JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
+			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
+			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
 		WHERE iss.id = vItemShelvingSaleFk
 			AND NOT iss.isPicked;

--- 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`(
-	vShelvingFk VARCHAR(8),
+	vShelvingCode VARCHAR(10),
 	vBarcode VARCHAR(22),
 	vQuantity INT,
 	vPackagingFk VARCHAR(10),
@ -12,7 +12,7 @@ BEGIN
 /**
 * Añade registro o lo actualiza si ya existe.
 *
- * @param vShelvingFk matrícula del carro
+ * @param vShelvingCode 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,10 +23,15 @@ 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
@ -40,7 +45,7 @@ BEGIN
 	END IF;

 	IF (SELECT COUNT(*) FROM itemShelving
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
+			WHERE shelvingFk = vShelvingFk
 				AND itemFk  = vItemFk
 				AND packing  = vPacking
 				AND buyFk = vBuyFk) THEN
@ -48,7 +53,9 @@ BEGIN
 		UPDATE itemShelving
 			SET visible = visible + vQuantity,
 				available = available + vQuantity
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
+			WHERE shelvingFk = 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,29 +1,38 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addByClaim`(vClaimFk INT, vShelvingFk VARCHAR(3))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addByClaim`(
+	vClaimFk INT,
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
 /**
 * Insert items of claim into itemShelving.
 *
 * @param vClaimFk The claim
- * @param vShelvingFk The shelving
+ * @param vShelvingCode The shelving code
 * @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 AS visible
+		SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity 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`(
-	vShelvingFk VARCHAR(3),
+	vShelvingCode VARCHAR(10),
 	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 vShelvingFk Identificador de shelving
+ * @param vShelvingCode Código 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,6 +24,11 @@ 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, ']');
@ -34,17 +39,17 @@ BEGIN

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

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

 		UPDATE itemShelving
 			SET isChecked = vIsChecked
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
+			WHERE shelvingFk = 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,15 +1,18 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_get`(IN vSelf VARCHAR(8))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_get`(
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
 /**
-* Lista artículos de itemshelving 
+* Lista artículos de itemShelving.
 *
-* @param vSelf matrícula del carro
+* @param vShelvingCode Matrícula del carro
 **/
 	SELECT ish.itemFk item, 
-			IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description, 
+			i.name, 
+			i.longName,
+			i.size, 
 			ish.visible,
-			CEIL(ish.visible/ish.packing) stickers,
 			ish.packing,
 			ish.grouping,
 			p.code,
@ -17,12 +20,14 @@ BEGIN
 			s.priority,
 			ish.isChecked,
 			ic.url,
-			ish.available
+			ish.available,
+			ish.buyFk,
+			ish.shelvingFk
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
-			JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci
-			LEFT JOIN parking p ON s.parkingFk = p.id
+			JOIN shelving s ON s.id = ish.shelvingFk
+			LEFT JOIN parking p ON p.id = s.parkingFk
 			JOIN hedera.imageConfig ic
-		WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf;
+		WHERE s.code COLLATE utf8_unicode_ci = vShelvingCode;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelving_getAlternatives.sql
+++ b/db/routines/vn/procedures/itemShelving_getAlternatives.sql
@ -1,21 +1,31 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(vShelvingFk VARCHAR(10))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(
+	vShelvingCode 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 vShelvingFk matricula del carro
+ * @param vShelvingCode 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 
 		FROM itemShelving is2
-			JOIN shelving sh ON sh.code = is2.shelvingFk
+			JOIN shelving sh ON sh.id = 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 COLLATE utf8_unicode_ci
-		WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci
+			JOIN itemShelving is3 ON is3.itemFk = is2.itemFk
+				AND is3.shelvingFk = vShelvingFk
+		WHERE is2.shelvingFk <> vShelvingFk
 		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.`code` = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.id = 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, 
-	vShelvingFK VARCHAR(10) 
+	vShelvingCode VARCHAR(10) 
 )
 BEGIN
 /**
 * Obtiene el precio y visible de un item
 *
 * @param vBarcodeItem barcode de artículo
- * @param vShelvingFK Ubicación actual del artículo
+ * @param vShelvingCode Ubicación actual del artículo
 */
 	DECLARE vIsItem BOOL;
 	DECLARE vBuyFk INT;
@ -44,12 +44,13 @@ BEGIN
 			FROM vn.buy b
 			WHERE b.id = vBuyFk
 	) SELECT v.itemFk,
-			vShelvingFK,
+			vShelvingCode,
 			v.itemCost,
 			SUM(ish.visible) visible
 		FROM vn.itemShelving ish
+			JOIN vn.shelving sh ON sh.id = ish.shelvingFK
 			JOIN visible v
-		WHERE ish.shelvingFK = vShelvingFK COLLATE utf8mb3_general_ci
+		WHERE sh.code = vShelvingCode 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,14 +1,20 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getSaleDate`(
+	vShelvingCode VARCHAR(10)
+)
 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 vShelvingFk Matrícula del carro o pallet
+ * @param vShelvingCode 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
@ -30,7 +36,7 @@ BEGIN
 			ENGINE = MEMORY
 			SELECT itemFk, SUM(visible) visible
 				FROM itemShelving
-				WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+				WHERE shelvingFk = vShelvingFk
 				GROUP BY itemFk;

 	CREATE OR REPLACE TEMPORARY TABLE tmp.tStockByDay
@ -52,7 +58,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.code = ish.shelvingFk 
+											JOIN shelving sh ON sh.id = ish.shelvingFk 
 											JOIN parking p ON sh.parkingFk = p.id 
 											JOIN sector s ON s.id = p.sectorFk
 										WHERE s.isReserve 
@ -110,7 +116,7 @@ BEGIN
 		UPDATE tmp.tStockByDay sbd
 			JOIN (SELECT ish.itemFK, SUM(ish.visible) amount 
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = ish.shelvingFk
 							JOIN parking p ON p.id = sh.parkingFk
 							JOIN sector s ON s.id = p.sectorFk
 						WHERE s.warehouseFk = vWarehouseFk
@ -150,10 +156,10 @@ BEGIN
 								p.sectorFk,
 								ish.shelvingFk
 							FROM itemShelving ish
-								JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+								JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 								LEFT JOIN parking p ON p.id = parkingFk
 								LEFT JOIN vn.sector s ON s.id = p.sectorFk
-							WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+							WHERE ish.shelvingFk = vShelvingFk
 					) 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.code = ish.shelvingFk
+			JOIN shelving sh ON sh.id = 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`(
-	vShelvingFk VARCHAR(10) COLLATE utf8_general_ci, 
+	vShelvingCode 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 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
+ * @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
 */
 	DECLARE vVisible INT;
 	DECLARE vClientFk INT;
@ -21,6 +21,11 @@ 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,
@ -37,7 +42,7 @@ BEGIN
 			JOIN parking p ON p.sectorFk = s.id
 			JOIN shelving s2 ON s2.parkingFk = p.id
 			JOIN productionConfig pc
-		WHERE s2.code = vShelvingFk;
+		WHERE s2.id = vShelvingFk;

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

-	IF vShelvingFk IS NULL THEN
+	IF vShelvingCode 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, 
-	vShelvingFk VARCHAR(10)
+	vShelvingCode VARCHAR(10)
 )
 BEGIN
 /**
@ -9,9 +9,14 @@ BEGIN
 * fusionando si coincide el packing y la fecha.
 *
 * @param vItemShelvingFk Identificador de itemShelving
- * @param vShelvingFk Identificador de shelving
+ * @param vShelvingCode Código 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
@ -26,7 +31,7 @@ BEGIN
 				AND ish2.packing = ish.packing
 				AND DATE(ish2.created) = DATE(ish.created)
 				AND ish2.buyFk = ish.buyFk
-		WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci;
+		WHERE ish.shelvingFk = vShelvingFk;

 	IF vNewItemShelvingFk THEN
 		UPDATE itemShelving ish
@ -38,9 +43,7 @@ BEGIN
 		DELETE FROM itemShelving
 			WHERE id = vItemShelvingFk;
 	ELSE
-		IF (SELECT EXISTS(SELECT id FROM shelving
-			WHERE code = vShelvingFk COLLATE utf8_unicode_ci)) THEN
-
+		IF (SELECT EXISTS(SELECT id FROM shelving WHERE id = vShelvingFk)) 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, 
-	vShelvingFK VARCHAR(10), 
+	vShelvingCode VARCHAR(10) COLLATE utf8mb3_general_ci, 
 	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 vShelvingFK Ubicación actual del artículo
+ * @param vShelvingCode Código de shelving / ubicación
 * @param vBuyingValue Nuevo precio de coste
 * @param vQuantity Cantidad del ítem a pasar a A2
 */
@ -109,10 +109,11 @@ BEGIN
 		CALL util.throw ('The item has not a buy');
 	END IF;

-	SELECT id,visible INTO vTargetItemShelvingFk, vCurrentVisible
-		FROM itemShelving
-		WHERE shelvingFk = vShelvingFK COLLATE utf8mb3_general_ci
-			AND itemFk = vSelf
+	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
 		LIMIT 1;
 	
 	IF vCurrentVisible IS NULL THEN
@ -388,16 +389,17 @@ BEGIN
 			userFk, 
 			isChecked) 
 		SELECT vItemA2Fk, 
-				shelvingFk, 
+				ish.shelvingFk, 
 				vQuantity ,
-				`grouping`, 
-				packing, 
-				packagingFk, 
+				ish.`grouping`, 
+				ish.packing, 
+				ish.packagingFk, 
 				account.myUser_getId(), 
-				isChecked
-			FROM itemShelving
-			WHERE itemFK = vSelf
-				AND shelvingFk = vShelvingFK COLLATE utf8mb3_general_ci
+				ish.isChecked
+			FROM itemShelving ish
+				JOIN shelving sh ON sh.id = ish.shelvingFk
+			WHERE ish.itemFK = vSelf
+				AND sh.code = vShelvingCode
 			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 e.isRaid
+					AND NOT tr.isRaid
 		),
 		entriesOut AS (
 			SELECT 'entry',
@ -95,7 +95,7 @@ BEGIN
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
-						AND NOT e.isRaid
+						AND NOT tr.isRaid
 		),
 		sales AS (
 			WITH itemSales AS (
--- a/db/routines/vn/procedures/item_getInfo.sql
+++ b/db/routines/vn/procedures/item_getInfo.sql
@ -42,7 +42,6 @@ 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 e.isRaid
+						AND NOT t.isRaid
 				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 e.isRaid
+			AND NOT t.isRaid
 		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 e.isRaid
+				AND NOT tr.isRaid
 				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 e.isRaid
+				AND NOT tr.isRaid
 				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 isRaid
+				AND NOT tr.isRaid
 				AND wIn.valuatedInventory
 				AND t.isInventory
 				AND e.isConfirmed
--- a/db/routines/vn/procedures/machineWorker_add.sql
+++ b/db/routines/vn/procedures/machineWorker_add.sql
@ -1,22 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT)
-BEGIN
-	
-/**
- * Inserta registro si el vWorkerFk no ha registrado nada en las últimas 12 horas
- * @param vPlate número de matrícula
- * @param vWorkerFk id del worker 
- * 
-*/    
-		UPDATE vn.machineWorker mw 
-	    		JOIN vn.machine m ON m.id = mw.machineFk 
-    		SET mw.outTimed = util.VN_NOW()
-	    	WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate)
-	    		AND ISNULL(mw.outTimed);
-	    	
-    	INSERT INTO machineWorker (machineFk, workerFk)
-	        SELECT m.id, vWorkerFk
-	        	FROM machine m
-	            WHERE m.plate= vPlate;	     
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/machineWorker_getHistorical.sql
+++ b/db/routines/vn/procedures/machineWorker_getHistorical.sql
@ -1,21 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machineWorker_getHistorical`(vPlate VARCHAR(20), vWorkerFk INT)
-BEGIN
-/**
- * Obtiene historial de la matrícula vPlate que el  trabajador vWorkerFk escanea, 
- * si es jefe de producción muestra el historial completo.
- * 
- * @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador 
- * 
-*/
-	DECLARE vWorkerName VARCHAR(255) DEFAULT account.user_getNameFromId(vWorkerFk);
-
-	SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed 
-		FROM machineWorker mw
-			JOIN machine m ON m.plate = vPlate
-		WHERE mw.machineFk = m.id
-			AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'coolerAssist'), mw.workerFk, vWorkerFk)
-			ORDER BY mw.inTimed DESC;	
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/machineWorker_update.sql
+++ b/db/routines/vn/procedures/machineWorker_update.sql
@ -1,38 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT)
-BEGIN
-	
-/**
- * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate, 
- * 
- * @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador 
- * 
-*/
-
-	DECLARE vMachineFk INT(10);
-	DECLARE vMaxHours INT(10);
-
-	SELECT m.id  INTO vMachineFk
-	FROM machine m
-		WHERE m.plate  = vPlate;
-	
-	SELECT maxHours INTO vMaxHours
-	FROM machineWorkerConfig;
-
-	IF (SELECT COUNT(*) 
-			FROM machineWorker m
-			WHERE  m.workerFk = vWorkerFk
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN				
-				
-		UPDATE machineWorker m
-			SET m.outTimed = CURRENT_TIMESTAMP()
-			WHERE m.workerFk = vWorkerFk 
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) 
-				AND ISNULL(m.outTimed)
-				AND m.machineFk = vMachineFk;
-		
-    END IF;
-       
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/machine_getWorkerPlate.sql
+++ b/db/routines/vn/procedures/machine_getWorkerPlate.sql
@ -1,16 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machine_getWorkerPlate`(vWorkerFk INT)
-BEGIN
-/**
- * Selecciona la matrícula del vehículo del workerfk
- *
- * @param vWorkerFk el id del trabajador
- */
-	SELECT m.plate
-		FROM machine m
-			JOIN machineWorker mw ON mw.machineFk = m.id
-		WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,util.VN_NOW())
-			AND ISNULL(mw.outTimed)
-			AND mw.workerFk = vWorkerFk;
-END$$
-DELIMITER ;
--- 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 e.isRaid
+						AND NOT t.isRaid
 				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 e.isRaid
+						AND NOT t.isRaid
 			) 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 e.isRaid
+						AND NOT t.isRaid
 				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 e.isRaid
+						AND NOT t.isRaid
 			) 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.code = ish.shelvingFk
+				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 sectorType st ON st.id = sc.typeFk
--- a/db/routines/vn/procedures/raidUpdate.sql
+++ b/db/routines/vn/procedures/raidUpdate.sql
@ -1,31 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`raidUpdate`()
-BEGIN
-/**
- * Actualiza el travel de las entradas de redadas
- */
-	UPDATE entry e
-		JOIN entryVirtual ev ON ev.entryFk = e.id
-		JOIN travel t ON t.id = e.travelFk
-		JOIN (
-			SELECT *
-				FROM (
-					SELECT t.id, t.landed, tt.warehouseInFk, tt.warehouseOutFk
-						FROM travel t
-							JOIN (
-								SELECT t.warehouseInFk, t.warehouseOutFk
-									FROM entryVirtual ev
-										JOIN entry e ON e.id = ev.entryFk
-										JOIN travel t ON t.id = e.travelFk
-									GROUP BY t.warehouseInFk, t.warehouseOutFk
-							) tt ON t.warehouseInFk = tt.warehouseInFk AND t.warehouseOutFk = tt.warehouseOutFk
-						WHERE shipped > util.VN_CURDATE() AND NOT isDelivered
-						ORDER BY t.landed
-						LIMIT 10000000000000000000
-				) t
-				GROUP BY t.warehouseInFk, t.warehouseOutFk
-		) tt ON t.warehouseInFk = tt.warehouseInFk AND t.warehouseOutFk = tt.warehouseOutFk
-		SET e.travelFk = t.id;
-
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/route_calcCommission.sql
+++ b/db/routines/vn/procedures/route_calcCommission.sql
@ -11,6 +11,8 @@ 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
@ -21,10 +23,16 @@ BEGIN
 		DELETE FROM routeCommission
 			WHERE routeFk = vSelf;

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

 		SELECT ampp.percentage INTO vAgencyModePricePercentage
 			FROM route r
@ -39,7 +47,9 @@ BEGIN
 					workCenterFk,
 					freelanceYearlyM3,
 					cat4m3,
-					cat5m3
+					cat5m3,
+					isKmTruckRate,
+					countryFk
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@ -51,11 +61,14 @@ BEGIN
 							IFNULL(r.m3, 0),
 							0
 						),
-						rc.distributionCat4M3 * IFNULL(r.m3, 0),
-						rc.distributionCat5M3 * IFNULL(r.m3, 0)
+						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
+						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
+						vIsKmTruckRate,
+						vCountryFk
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
+						LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
 					WHERE r.id = vSelf
 						AND r.workerFk
 						AND r.commissionWorkCenterFk;
@ -68,7 +81,9 @@ BEGIN
 					yearlyKm,
 					yearlyM3,
 					cat4m3,
-					cat5m3
+					cat5m3,
+					isKmTruckRate,
+					countryFk
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@ -78,11 +93,14 @@ BEGIN
 							IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
 						(r.kmEnd - r.kmStart) * rc.kmYearly,
 						IFNULL(r.m3, 0) * rc.m3Yearly,
-						rc.distributionCat4M3 * IFNULL(r.m3, 0),
-						rc.distributionCat5M3 * IFNULL(r.m3, 0)
+						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
+						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
+						vIsKmTruckRate,
+						vCountryFk
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
+						LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
 					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 vShelving VARCHAR(10);
+	DECLARE vShelvingFk 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.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = 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 vShelving, vParkingCode
+			INTO vShelvingFk, vParkingCode
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = 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 = vShelving,
+				shelvingFk = vShelvingFk,
 				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.code = ish.shelvingFk
+			JOIN shelving sh ON sh.id = 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.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector s ON s.id = p.sectorFk
 			GROUP BY ish.itemFk, s.warehouseFk;
--- a/db/routines/vn/procedures/shelvingChange.sql
+++ b/db/routines/vn/procedures/shelvingChange.sql
@ -1,11 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingChange`(IN `vShelvingO` VARCHAR(8), IN `vShelvingD` VARCHAR(8))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingChange`(
+	`vShelvingO` VARCHAR(10),
+	`vShelvingD` VARCHAR(10)
+)
 BEGIN
-
-     UPDATE vn.itemShelving
-     SET shelvingFk =  vShelvingD COLLATE utf8_unicode_ci 
-     WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;  
-     
-    
+	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;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/shelvingParking_get.sql
+++ b/db/routines/vn/procedures/shelvingParking_get.sql
@ -1,8 +1,10 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingParking_get`(
+	vShelvingCode VARCHAR(10),
+	vWarehouseFk INT,
+	vDayRange INT
+)
 BEGIN	
-
-	
 SELECT 	s.itemFk, 
 	s.concept,
 	CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir, 
@ -10,14 +12,15 @@ 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 AND ish.shelvingFk = vShelvingFk 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
+		JOIN shelving sh ON sh.id = ish.shelvingFk
+			AND sh.code = vShelvingCode 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.code = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.id = 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.`code`
+	LEFT JOIN itemShelving its ON its.shelvingFk = sh.id
 		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(its.shelvingFk, 2)
+				SELECT DISTINCT LEFT(sh.code, 2)
 					FROM itemShelving its
-					WHERE its.shelvingFk REGEXP '^[A-Za-z]{2}[0-9]'
+						JOIN shelving sh ON sh.id = its.shelvingFk
+					WHERE sh.code 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.code = ish.shelvingFk
+					JOIN vn.shelving sh ON sh.id = 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.code = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.id = 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/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.code = ish.shelvingFk
+                    JOIN vn.shelving sh ON sh.id = 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.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = 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.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = 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/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 e.isRaid = FALSE
+			AND NOT tr.isRaid
 			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
@ -0,0 +1,17 @@
+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_cloneWithEntries.sql
+++ b/db/routines/vn/procedures/travel_cloneWithEntries.sql
@ -71,6 +71,8 @@ BEGIN
 		UPDATE entry
 			SET evaNotes = vEvaNotes
 			WHERE id = vNewEntryFk;
+		
+		CALL buy_recalcPricesByEntry(vNewEntryFk);
 	END LOOP;

 	SET @isModeInventory = FALSE;
--- a/db/routines/vn/procedures/travel_moveRaids.sql
+++ b/db/routines/vn/procedures/travel_moveRaids.sql
@ -1,30 +1,31 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`travel_moveRaids`()
 BEGIN
-
-/*
- * Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores
+/**
+ * Desplaza los travels en el futuro y avisa a los compradores
 *
 */
 	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWorkerName VARCHAR(50);
-	DECLARE vRaid TEXT;
-	DECLARE vWorker VARCHAR(50) DEFAULT '';
+	DECLARE vBuyerEmail VARCHAR(40);
+	DECLARE vTravelLink TEXT;
 	DECLARE vMailBody TEXT DEFAULT '';

 	DECLARE vCur CURSOR FOR
-		SELECT GROUP_CONCAT( DISTINCT CONCAT('https://salix.verdnatura.es/#!/travel/', ttr.id, '/summary ') ORDER BY ttr.id SEPARATOR '\n\r'),
-			u.name
-			FROM tmp.travel ttr
-				JOIN entry e ON e.travelFk = ttr.id 
+		SELECT GROUP_CONCAT(DISTINCT
+				CONCAT('https://salix.verdnatura.es/#!/travel/',
+					ttm.travelFk,
+					'/summary ')
+				ORDER BY ttm.travelFk SEPARATOR '\n\r') travelLink,
+			CONCAT(u.name, '@verdnatura.es') buyerEmail
+			FROM tTravelToMove ttm
+				JOIN entry e ON e.travelFk = ttm.travelFk
 				JOIN buy b ON b.entryFk = e.id
 				JOIN item i ON i.id = b.itemFk
 				JOIN itemType it ON it.id = i.typeFk
 				JOIN account.user u ON u.id = it.workerFk
 			GROUP BY u.name;

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

 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@ -32,41 +33,37 @@ BEGIN
 		RESIGNAL;
 	END;

-	DROP TEMPORARY TABLE IF EXISTS tmp.travel;
-	CREATE TEMPORARY TABLE tmp.travel
-		SELECT tr.id,tr.landed
-			FROM travel tr
-					JOIN entry e ON e.travelFk = tr.id 
-				WHERE tr.landed = util.tomorrow()
-					AND e.isRaid
-				GROUP BY tr.id;
+	CREATE OR REPLACE TEMPORARY TABLE tTravelToMove
+		SELECT id travelFk,
+				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
+			FROM travel
+			WHERE isRaid
+				AND daysInForward;

 	START TRANSACTION;

 	UPDATE travel tr
-		JOIN tmp.travel ttr ON ttr.id = tr.id
-		SET tr.landed = TIMESTAMPADD(DAY, 1, tr.landed);
+			JOIN tTravelToMove ttm ON ttm.travelFk = tr.id
+		SET tr.landed = ttm.newLanded;

 	OPEN vCur;

 	l: LOOP
 		SET vDone = FALSE;
-		FETCH vCur INTO vRaid, vWorkerName;
+		FETCH vCur INTO vTravelLink, vBuyerEmail;

 		IF vDone THEN
 			LEAVE l;
 		END IF;

-		CALL `vn`.`mail_insert`(CONCAT(vWorkerName, '@verdnatura.es'),
+		CALL `vn`.`mail_insert`(
+			vBuyerEmail,
 			'noreply@verdnatura.es',
 			'Cambio de fecha en Redadas',
-								CONCAT('Se ha movido las siguientes redadas: \n\r ', vRaid)
-								);
-
+			CONCAT('Se ha movido los siguientes travels: \n\r ', vTravelLink));
 	END LOOP;
 	CLOSE vCur;
 	COMMIT;
-	DROP TEMPORARY TABLE tmp.travel;
-
+	DROP TEMPORARY TABLE tTravelToMove;
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/address_beforeInsert.sql
+++ b/db/routines/vn/triggers/address_beforeInsert.sql
@ -6,6 +6,7 @@ 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,7 +3,6 @@ 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
@ -14,5 +13,10 @@ 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,8 +3,10 @@ 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);
@ -13,9 +15,5 @@ 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/db/routines/vn/triggers/client_beforeUpdate.sql
+++ b/db/routines/vn/triggers/client_beforeUpdate.sql
@ -72,5 +72,11 @@ 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 ;
--- a/db/routines/vn/triggers/entry_beforeUpdate.sql
+++ b/db/routines/vn/triggers/entry_beforeUpdate.sql
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`entry_beforeUpdate`
 	BEFORE UPDATE ON `entry`
 	FOR EACH ROW
 BEGIN
-	DECLARE vIsVirtual BOOL;
+	DECLARE vIsRaid BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
@ -38,8 +38,10 @@ BEGIN
 			CALL travel_throwAwb(NEW.travelFk);
 		END IF;

-		SELECT COUNT(*) > 0 INTO vIsVirtual
-			FROM entryVirtual WHERE entryFk = NEW.id;
+		SELECT isRaid INTO vIsRaid
+			FROM travel t
+				JOIN entry e ON e.travelFk = t.id
+			WHERE entryFk = NEW.id;

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

-		IF vIsVirtual AND vHasDistinctWarehouses THEN
+		IF vIsRaid AND vHasDistinctWarehouses THEN
 			SIGNAL SQLSTATE '45000'
 				SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
 		END IF;
--- a/db/routines/vn/triggers/expedition_beforeDelete.sql
+++ b/db/routines/vn/triggers/expedition_beforeDelete.sql
@ -8,5 +8,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 ;
--- a/db/routines/vn/triggers/itemType_afterDelete.sql
+++ b/db/routines/vn/triggers/itemType_afterDelete.sql
@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` 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 ;
--- a/db/routines/vn/triggers/itemType_beforeInsert.sql
+++ b/db/routines/vn/triggers/itemType_beforeInsert.sql
@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemType_beforeInsert`
+	BEFORE INSERT ON `itemType`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
--- a/db/routines/vn/triggers/itemType_beforeUpdate.sql
+++ b/db/routines/vn/triggers/itemType_beforeUpdate.sql
@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` 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;
--- a/Show More
+++ b/Show More