Merge branch 'dev' into 6021-floranet

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2414.01] - 2024-04-04
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [2408.01] - 2024-02-22
 
 ### Added

Jenkinsfile

@@ -235,11 +235,12 @@ pipeline {
                     if (index != -1)
                         message = message.substring(0, index)
 
+                    setEnv()
                     rocketSend(
                         channel: 'vn-database',
                         message: "*DB version uploaded:* ${message}"
                             +"\n$COMMITTER_EMAIL ($BRANCH_NAME)"
-                            +"\n$GIT_URL/commit/$GIT_COMMIT",
+                            +"\n$RUN_DISPLAY_URL",
                         rawMessage: true
                     )
                 }

back/methods/collection/assign.js

@@ -0,0 +1,31 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    Self.remoteMethodCtx('assign', {
+        description: 'Assign a collection',
+        accessType: 'WRITE',
+        http: {
+            path: `/assign`,
+            verb: 'POST'
+        },
+        returns: {
+            type: ['object'],
+            root: true
+        },
+    });
+
+    Self.assign = async(ctx, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const [,, {collectionFk}] = await Self.rawSql('CALL vn.collection_assign(?, @vCollectionFk); SELECT @vCollectionFk collectionFk',
+            [userId], myOptions);
+
+        if (!collectionFk) throw new UserError('There are not picking tickets');
+        await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);
+
+        return collectionFk;
+    };
+};

back/methods/collection/getSales.js

@@ -0,0 +1,157 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('getSales', {
+        description: 'Get sales from ticket or collection',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'collectionOrTicketFk',
+                type: 'number',
+                required: true
+            }, {
+                arg: 'print',
+                type: 'boolean',
+                required: true
+            }, {
+                arg: 'source',
+                type: 'string',
+                required: true
+            },
+
+        ],
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/getSales`,
+            verb: 'GET'
+        },
+    });
+
+    Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+        const $t = ctx.req.__;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const [{id}] = await Self.rawSql('SELECT vn.ticket_get(?) as id',
+            [collectionOrTicketFk],
+            myOptions);
+
+        const [tickets] = await Self.rawSql('CALL vn.collection_getTickets(?)', [id], myOptions);
+
+        if (source) {
+            await Self.rawSql(
+                'CALL vn.ticketStateToday_setState(?,?)', [id, source], myOptions
+            );
+        }
+
+        const [sales] = await Self.rawSql('CALL vn.sale_getFromTicketOrCollection(?)',
+            [id], myOptions);
+
+        const isPicker = source != 'CHECKER';
+        const [placements] = await Self.rawSql('CALL vn.collectionPlacement_get(?, ?)',
+            [id, isPicker], myOptions
+        );
+
+        if (print) await Self.rawSql('CALL vn.collection_printSticker(?,NULL)', [id], myOptions);
+
+        for (let ticket of tickets) {
+            let observations = ticket.observaciones.split(' ');
+
+            for (let observation of observations) {
+                const salesPerson = ticket.salesPersonFk;
+                if (observation.startsWith('#') || observation.startsWith('@')) {
+                    await models.Chat.send(ctx,
+                        observation,
+                        $t('ticketCommercial', {ticket: ticket.ticketFk, salesPerson})
+                    );
+                }
+            }
+        }
+
+        return getCollection(id, tickets, sales, placements, myOptions);
+    };
+
+    async function getCollection(id, tickets, sales, placements, options) {
+        const collection = {
+            collectionFk: id,
+            tickets: [],
+        };
+        for (let ticket of tickets) {
+            const {ticketFk} = ticket;
+            ticket.sales = [];
+
+            const barcodes = await getBarcodes(ticketFk, options);
+            await Self.rawSql(
+                'CALL util.log_add(?, ?, ?, ?, ?, ?, ?, ?)',
+                ['vn', 'ticket', 'Ticket', ticketFk, ticketFk, 'select', null, null],
+                options
+            );
+
+            for (let sale of sales) {
+                if (sale.ticketFk == ticketFk) {
+                    sale.placements = [];
+                    for (const salePlacement of placements) {
+                        if (salePlacement.saleFk == sale.saleFk && salePlacement.order) {
+                            const placement = {
+                                saleFk: salePlacement.saleFk,
+                                itemFk: salePlacement.itemFk,
+                                placement: salePlacement.placement,
+                                shelving: salePlacement.shelving,
+                                created: salePlacement.created,
+                                visible: salePlacement.visible,
+                                order: salePlacement.order,
+                                grouping: salePlacement.grouping,
+                                priority: salePlacement.priority,
+                                saleOrder: salePlacement.saleOrder,
+                                isPreviousPrepared: salePlacement.isPreviousPrepared,
+                                itemShelvingSaleFk: salePlacement.itemShelvingSaleFk,
+                                ticketFk: salePlacement.ticketFk,
+                                id: salePlacement.id
+                            };
+                            sale.placements.push(placement);
+                        }
+                    }
+
+                    sale.barcodes = [];
+                    for (const barcode of barcodes) {
+                        if (barcode.movementId == sale.saleFk) {
+                            if (barcode.code) {
+                                sale.barcodes.push(barcode.code);
+                                sale.barcodes.push(`0 ${barcode.code}`);
+                            }
+
+                            if (barcode.id) {
+                                sale.barcodes.push(barcode.id);
+                                sale.barcodes.push(`0 ${barcode.id}`);
+                            }
+                        }
+                    }
+
+                    ticket.sales.push(sale);
+                }
+            }
+            collection.tickets.push(ticket);
+        }
+
+        return collection;
+    }
+
+    async function getBarcodes(ticketId, options) {
+        const query =
+                `SELECT s.id movementId, 
+                        b.code, 
+                        c.id
+                    FROM vn.sale s
+                        LEFT JOIN vn.itemBarcode b ON b.itemFk = s.itemFk
+                        LEFT JOIN vn.buy c ON c.itemFk = s.itemFk
+                        LEFT JOIN vn.entry e ON e.id = c.entryFk
+                        LEFT JOIN vn.travel tr ON tr.id = e.travelFk
+                    WHERE s.ticketFk = ? 
+                        AND tr.landed >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)`;
+        return Self.rawSql(query, [ticketId], options);
+    }
+};

back/methods/collection/getSectors.js

@@ -1,20 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('getSectors', {
-        description: 'Get all sectors',
-        accessType: 'READ',
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/getSectors`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getSectors = async() => {
-        const query = `CALL vn.sector_get()`;
-        const [result] = await Self.rawSql(query);
-        return result;
-    };
-};

back/methods/collection/spec/assign.spec.js

@@ -0,0 +1,38 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('ticket assign()', () => {
+    let ctx;
+    let options;
+    let tx;
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 1106},
+                headers: {origin: 'http://localhost'},
+                __: value => value
+            },
+            args: {}
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx.req
+        });
+
+        options = {transaction: tx};
+        tx = await models.Sale.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should throw an error when  there is not picking tickets', async() => {
+        try {
+            await models.Collection.assign(ctx, options);
+        } catch (e) {
+            expect(e.message).toEqual('There are not picking tickets');
+        }
+    });
+});

back/methods/collection/spec/getSales.spec.js

@@ -0,0 +1,62 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('collection getSales()', () => {
+    const collectionOrTicketFk = 999999;
+    const print = true;
+    const source = 'CHECKER';
+
+    beforeAll(() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'},
+            }
+        };
+    });
+
+    it('should return a collection with tickets, placements and barcodes settled correctly', async() => {
+        const tx = await models.Collection.beginTransaction({});
+        const options = {transaction: tx};
+        try {
+            const collection = await models.Collection.getSales(ctx,
+                collectionOrTicketFk, print, source, options);
+
+            const [firstTicket] = collection.tickets;
+            const [firstSale] = firstTicket.sales;
+            const [firstPlacement] = firstSale.placements;
+
+            expect(collection.tickets.length).toBeTruthy();
+            expect(collection.collectionFk).toEqual(firstTicket.ticketFk);
+
+            expect(firstSale.ticketFk).toEqual(firstTicket.ticketFk);
+            expect(firstSale.placements.length).toBeTruthy();
+            expect(firstSale.barcodes.length).toBeTruthy();
+
+            expect(firstSale.saleFk).toEqual(firstPlacement.saleFk);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should print a sticker', async() => {
+        const tx = await models.Collection.beginTransaction({});
+        const options = {transaction: tx};
+        const query = 'SELECT * FROM printQueue pq JOIN printQueueArgs pqa ON pqa.printQueueFk = pq.id';
+        try {
+            const printQueueBefore = await models.Collection.rawSql(
+                query, [], options);
+            await models.Collection.getSales(ctx,
+                collectionOrTicketFk, true, source, options);
+            const printQueueAfter = await models.Collection.rawSql(
+                query, [], options);
+
+            expect(printQueueAfter.length).toEqual(printQueueBefore.length + 1);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

back/methods/collection/spec/getSectors.spec.js

@@ -1,11 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('getSectors()', () => {
-    it('return list of sectors', async() => {
-        let response = await models.Collection.getSectors();
-
-        expect(response.length).toBeGreaterThan(0);
-        expect(response[0].id).toEqual(1);
-        expect(response[0].description).toEqual('First sector');
-    });
-});

back/methods/dms/downloadFile.js

@@ -29,7 +29,8 @@ module.exports = Self => {
         http: {
             path: `/:id/downloadFile`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

back/methods/dms/uploadFile.js

@@ -88,7 +88,7 @@ module.exports = Self => {
                     warehouseFk: args.warehouseId,
                     reference: args.reference,
                     description: args.description,
-                    contentType: args.contentType,
+                    contentType: uploadedFile.type,
                     hasFile: args.hasFile
                 };
                 const extension = await models.DmsContainer.getFileExtension(uploadedFile.name);

back/methods/docuware/download.js

@@ -42,7 +42,8 @@ module.exports = Self => {
         http: {
             path: `/:id/download`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/image/download.js

@@ -47,7 +47,8 @@ module.exports = Self => {
         http: {
             path: `/:collection/:size/:id/download`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, collection, size, id) {

back/methods/machine-worker/specs/updateInTime.spec.js

@@ -0,0 +1,132 @@
+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();
+            }
+        });
+    });
+});

back/methods/machine-worker/updateInTime.js

@@ -0,0 +1,77 @@
+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 Error($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()) / (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;
+        }
+    };
+};

back/methods/mobile-app-version-control/getVersion.js

@@ -0,0 +1,45 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('getVersion', {
+        description: 'gets app version data',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'app',
+            type: 'string',
+            required: true
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getVersion`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getVersion = async(ctx, app) => {
+        const {models} = Self.app;
+        const userId = ctx.req.accessToken.userId;
+
+        const workerFk = await models.WorkerAppTester.findOne({
+            where: {
+                workerFk: userId
+            }
+        });
+        let fields = ['id', 'appName'];
+
+        if (workerFk)
+            fields = fields.concat(['isVersionBetaCritical', 'versionBeta', 'urlBeta']);
+        else
+            fields = fields.concat(['isVersionCritical', 'version', 'urlProduction']);
+
+        const filter = {
+            where: {
+                appName: app
+            },
+            fields,
+        };
+
+        return Self.findOne(filter);
+    };
+};

back/methods/mobile-app-version-control/specs/getVersion.spec.js

@@ -0,0 +1,29 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('mobileAppVersionControl getVersion()', () => {
+    const appName = 'delivery';
+    beforeAll(async() => {
+        ctx = {
+            req: {
+                accessToken: {},
+                headers: {origin: 'http://localhost'},
+            }
+        };
+    });
+
+    it('should get the version app', async() => {
+        ctx.req.accessToken.userId = 9;
+        const {version, versionBeta} = await models.MobileAppVersionControl.getVersion(ctx, appName);
+
+        expect(version).toEqual('9.2');
+        expect(versionBeta).toBeUndefined();
+    });
+
+    it('should get the beta version app', async() => {
+        ctx.req.accessToken.userId = 66;
+        const {version, versionBeta} = await models.MobileAppVersionControl.getVersion(ctx, appName);
+
+        expect(versionBeta).toBeDefined();
+        expect(version).toBeUndefined();
+    });
+});

back/methods/mrw-config/cancelShipment.ejs

@@ -0,0 +1,20 @@
+<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:mrw="http://www.mrw.es/">
+    <soap:Header>
+        <mrw:AuthInfo>
+            <mrw:CodigoFranquicia><%= mrw.franchiseCode %></mrw:CodigoFranquicia>
+            <mrw:CodigoAbonado><%= mrw.subscriberCode %></mrw:CodigoAbonado>
+            <mrw:CodigoDepartamento/>
+            <mrw:UserName><%= mrw.user %></mrw:UserName>
+            <mrw:Password><%= mrw.password %></mrw:Password>
+        </mrw:AuthInfo>
+    </soap:Header>
+        <soap:Body>
+            <mrw:CancelarEnvio>
+                <mrw:request>
+                    <mrw:CancelaEnvio>
+                        <mrw:NumeroEnvioOriginal><%= externalId %></mrw:NumeroEnvioOriginal>
+                    </mrw:CancelaEnvio>
+                </mrw:request>
+            </mrw:CancelarEnvio>
+        </soap:Body>
+</soap:Envelope>

back/methods/mrw-config/cancelShipment.js

@@ -0,0 +1,46 @@
+const axios = require('axios');
+const fs = require('fs');
+const ejs = require('ejs');
+const {DOMParser} = require('xmldom');
+
+module.exports = Self => {
+    Self.remoteMethod('cancelShipment', {
+        description: 'Cancel a shipment by providing the expedition ID, interacting with MRW WebService',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'expeditionFk',
+            type: 'number',
+            required: true
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/cancelShipment`,
+            verb: 'POST'
+        }
+    });
+
+    Self.cancelShipment = async expeditionFk => {
+        const models = Self.app.models;
+
+        const mrw = await models.MrwConfig.findOne();
+        const {externalId} = await models.Expedition.findById(expeditionFk);
+
+        const template = fs.readFileSync(__dirname + '/cancelShipment.ejs', 'utf-8');
+        const renderedXml = ejs.render(template, {mrw, externalId});
+        const response = await axios.post(mrw.url, renderedXml, {
+            headers: {
+                'Content-Type': 'application/soap+xml; charset=utf-8'
+            }
+        });
+
+        const xmlString = response.data;
+        const parser = new DOMParser();
+        const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
+        const [resultElement] = xmlDoc.getElementsByTagName('Mensaje');
+
+        return resultElement.textContent;
+    };
+};

back/methods/mrw-config/createShipment.ejs

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:mrw="http://www.mrw.es/">
+    <soap:Header>
+        <mrw:AuthInfo>
+            <mrw:CodigoFranquicia><%= mrw.franchiseCode %></mrw:CodigoFranquicia>
+            <mrw:CodigoAbonado><%= mrw.subscriberCode %></mrw:CodigoAbonado>
+            <mrw:CodigoDepartamento/>
+            <mrw:UserName><%= mrw.user %></mrw:UserName>
+            <mrw:Password><%= mrw.password %></mrw:Password>
+        </mrw:AuthInfo>
+    </soap:Header>
+    <soap:Body>
+        <mrw:TransmEnvio>
+            <mrw:request>
+                <mrw:DatosEntrega>
+                    <mrw:Direccion>
+                        <mrw:CodigoTipoVia/>
+                        <mrw:Via><%= expeditionData.street %></mrw:Via>
+                        <mrw:Numero/>
+                        <mrw:Resto/>
+                        <mrw:CodigoPostal><%= expeditionData.postalCode %></mrw:CodigoPostal>
+                        <mrw:Poblacion><%= expeditionData.city %></mrw:Poblacion>
+                        <mrw:Provincia/>
+                        <mrw:CodigoPais/>
+                    </mrw:Direccion>
+                    <mrw:Nif><%= expeditionData.fi %></mrw:Nif>
+                    <mrw:Nombre><%= expeditionData.clientName %></mrw:Nombre>
+                    <mrw:Telefono><%= expeditionData.phone %></mrw:Telefono>
+                </mrw:DatosEntrega>
+                <mrw:DatosServicio>
+                    <mrw:Fecha><%= expeditionData.created %></mrw:Fecha>
+                    <mrw:Referencia><%= expeditionData.expeditionDataId %></mrw:Referencia>
+                    <mrw:CodigoServicio><%= expeditionData.serviceType %></mrw:CodigoServicio>
+                    <mrw:NumeroBultos>1</mrw:NumeroBultos>
+                    <mrw:EntregaSabado><%= expeditionData.weekDays %></mrw:EntregaSabado>
+                    <mrw:Peso><%= expeditionData.kg %></mrw:Peso>
+                    <mrw:Reembolso/>
+                    <mrw:ImporteReembolso/>
+                </mrw:DatosServicio>
+            </mrw:request>
+        </mrw:TransmEnvio>
+    </soap:Body>
+</soap:Envelope>

back/methods/mrw-config/createShipment.js

@@ -0,0 +1,118 @@
+const axios = require('axios');
+const {DOMParser} = require('xmldom');
+const fs = require('fs');
+const ejs = require('ejs');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('createShipment', {
+        description: 'Create an expedition and return a base64Binary label from de MRW WebService',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'expeditionFk',
+            type: 'number',
+            required: true
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/createShipment`,
+            verb: 'POST'
+        }
+    });
+
+    Self.createShipment = async(expeditionFk, options) => {
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        const models = Self.app.models;
+        const mrw = await models.MrwConfig.findOne(null, myOptions);
+
+        if (!mrw)
+            throw new UserError(`Some mrwConfig parameters are not set`);
+
+        const query =
+            `SELECT CASE co.code 
+                    WHEN 'ES' THEN a.postalCode
+                    WHEN 'PT' THEN LEFT(a.postalCode, 4)
+                    WHEN 'AD' THEN REPLACE(a.postalCode, 'AD', '00')
+                END postalCode,
+                a.city,
+                a.street,
+                co.code countryCode,
+                c.fi,
+                c.name clientName,
+                c.phone,
+                DATE_FORMAT(t.shipped, '%d/%m/%Y') created,
+                t.shipped,
+                e.id expeditionId,
+                LPAD(IF(mw.params IS NULL, ms.serviceType, mw.serviceType), 4 ,'0') serviceType,
+                IF(mw.weekdays, 'S', 'N') weekDays
+            FROM expedition e
+                JOIN ticket t ON e.ticketFk = t.id
+                JOIN agencyMode am ON am.id = t.agencyModeFk
+                JOIN mrwService ms ON ms.agencyModeCodeFk = am.code
+                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays = DATE_FORMAT(t.shipped, '%a') 
+                JOIN client c ON t.clientFk = c.id
+                JOIN address a ON t.addressFk = a.id
+                JOIN province p ON a.provinceFk = p.id
+                JOIN country co ON co.id = p.countryFk
+            WHERE e.id = ?
+            LIMIT 1`;
+
+        const [expeditionData] = await Self.rawSql(query, [expeditionFk], myOptions);
+
+        if (!expeditionData)
+            throw new UserError(`This expedition is not a MRW shipment`);
+
+        const today = Date.vnNew();
+        today.setHours(0, 0, 0, 0);
+        if (expeditionData?.shipped.setHours(0, 0, 0, 0) < today)
+            throw new UserError(`This ticket has a shipped date earlier than today`);
+
+        const shipmentResponse = await sendXmlDoc('createShipment', {mrw, expeditionData}, 'application/soap+xml');
+        const shipmentId = getTextByTag(shipmentResponse, 'NumeroEnvio');
+
+        if (!shipmentId)
+            throw new UserError(getTextByTag(shipmentResponse, 'Mensaje'));
+
+        const getLabelResponse = await sendXmlDoc('getLabel', {mrw, shipmentId}, 'text/xml');
+        const file = getTextByTag(getLabelResponse, 'EtiquetaFile');
+
+        try {
+            await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
+            if (tx) await tx.commit();
+        } catch (error) {
+            if (tx) await tx.rollback();
+            throw error;
+        }
+        return file;
+    };
+
+    function getTextByTag(xmlDoc, tag) {
+        return xmlDoc?.getElementsByTagName(tag)[0]?.textContent;
+    }
+
+    async function sendXmlDoc(xmlDock, params, contentType) {
+        const parser = new DOMParser();
+
+        const xmlTemplate = fs.readFileSync(__dirname + `/${xmlDock}.ejs`, 'utf-8');
+        const renderedTemplate = ejs.render(xmlTemplate, params);
+        const data = await axios.post(params.mrw.url, renderedTemplate, {
+            headers: {
+                'Content-Type': `${contentType}; charset=utf-8`
+            }
+        });
+        return parser.parseFromString(data.data, 'text/xml');
+    }
+};

back/methods/mrw-config/getLabel.ejs

@@ -0,0 +1,25 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:mrw="http://www.mrw.es/">
+    <soapenv:Header>
+        <mrw:AuthInfo>
+            <mrw:CodigoFranquicia><%= mrw.franchiseCode %></mrw:CodigoFranquicia>
+            <mrw:CodigoAbonado><%= mrw.subscriberCode %></mrw:CodigoAbonado>
+            <mrw:CodigoDepartamento/>
+            <mrw:UserName><%= mrw.user %></mrw:UserName>
+            <mrw:Password><%= mrw.password %></mrw:Password>
+        </mrw:AuthInfo>
+    </soapenv:Header>
+    <soapenv:Body>
+        <mrw:GetEtiquetaEnvio>
+            <mrw:request>
+                <mrw:NumeroEnvio><%= shipmentId %></mrw:NumeroEnvio>
+                <mrw:NumerosEtiqueta>1</mrw:NumerosEtiqueta>
+                <mrw:SeparadorNumerosEnvio></mrw:SeparadorNumerosEnvio>
+                <mrw:FechaInicioEnvio></mrw:FechaInicioEnvio>
+                <mrw:FechaFinEnvio></mrw:FechaFinEnvio>
+                <mrw:TipoEtiquetaEnvio>0</mrw:TipoEtiquetaEnvio>
+                <mrw:ReportTopMargin>0</mrw:ReportTopMargin>
+                <mrw:ReportLeftMargin>0</mrw:ReportLeftMargin>
+            </mrw:request>
+        </mrw:GetEtiquetaEnvio>
+    </soapenv:Body>
+</soapenv:Envelope>

back/methods/mrw-config/specs/createShipment.spec.js

@@ -0,0 +1,121 @@
+const models = require('vn-loopback/server/server').models;
+const axios = require('axios');
+const fs = require('fs');
+
+const mockBase64Binary = 'base64BinaryString';
+const ticket1 = {
+    'id': '44',
+    'clientFk': 1101,
+    'shipped': Date.vnNew(),
+    'nickname': 'MRW',
+    'addressFk': 1,
+    'agencyModeFk': 999
+};
+
+const expedition1 = {
+    'id': 17,
+    'agencyModeFk': 999,
+    'ticketFk': 44,
+    'freightItemFk': 71,
+    'created': '2001-01-01',
+    'counter': 1,
+    'workerFk': 18,
+    'packagingFk': '94',
+    'hostFk': '',
+    'stateTypeFk': 3,
+    'hasNewRoute': 0,
+    'isBox': 71,
+    'editorFk': 100
+};
+
+let tx;
+let options;
+
+describe('MRWConfig createShipment()', () => {
+    beforeEach(async() => {
+        options = tx = undefined;
+        tx = await models.MrwConfig.beginTransaction({});
+        options = {transaction: tx};
+
+        await models.Agency.create(
+            {'id': 999, 'name': 'mrw'},
+            options
+        );
+
+        await models.AgencyMode.create(
+            {'id': 999, 'name': 'mrw', 'agencyFk': 999, 'code': 'mrw'},
+            options
+        );
+
+        await models.MrwConfig.create(
+            {
+                'id': 1,
+                'url': 'https://url.com',
+                'user': 'user',
+                'password': 'password',
+                'franchiseCode': 'franchiseCode',
+                'subscriberCode': 'subscriberCode'
+            }, options
+        );
+
+        await models.Application.rawSql(
+            `INSERT INTO vn.mrwService 
+                    SET agencyModeCodeFk = 'mrw',
+                        clientType = 1,
+                        serviceType = 1,
+                        kg = 1`, null, options
+        );
+        await models.Ticket.create(ticket1, options);
+        await models.Expedition.create(expedition1, options);
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should create a shipment and return a base64Binary label', async() => {
+        const mockPostResponses = [
+            {data: fs.readFileSync(__dirname + '/mockGetLabel.xml', 'utf-8')},
+            {data: fs.readFileSync(__dirname + '/mockCreateShipment.xml', 'utf-8')}
+        ];
+
+        spyOn(axios, 'post').and.callFake(() => Promise.resolve(mockPostResponses.pop()));
+
+        const base64Binary = await models.MrwConfig.createShipment(expedition1.id, options);
+
+        expect(base64Binary).toEqual(mockBase64Binary);
+    });
+
+    it('should fail if mrwConfig has no data', async() => {
+        let error;
+        await models.MrwConfig.createShipment(expedition1.id).catch(e => {
+            error = e;
+        }).finally(async() => {
+            expect(error.message).toEqual(`Some mrwConfig parameters are not set`);
+        });
+
+        expect(error).toBeDefined();
+    });
+
+    it('should fail if expeditionFk is not a MrwExpedition', async() => {
+        let error;
+        await models.MrwConfig.createShipment(undefined, options).catch(e => {
+            error = e;
+        }).finally(async() => {
+            expect(error.message).toEqual(`This expedition is not a MRW shipment`);
+        });
+    });
+
+    it(' should fail if the creation date of this ticket is before the current date it', async() => {
+        let error;
+        const yesterday = Date.vnNew();
+
+        yesterday.setDate(yesterday.getDate() - 1);
+        await models.Ticket.updateAll({id: ticket1.id}, {shipped: yesterday}, options);
+        await models.MrwConfig.createShipment(expedition1.id, options).catch(e => {
+            error = e;
+        }).finally(async() => {
+            expect(error.message).toEqual(`This ticket has a shipped date earlier than today`);
+        });
+    });
+});

back/methods/mrw-config/specs/mockCreateShipment.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <soap:Body>
+        <TransmEnvioResponse xmlns="http://www.mrw.es/">
+            <TransmEnvioResult>
+                <Estado>1</Estado>
+                <Mensaje />
+                <NumeroSolicitud>1</NumeroSolicitud>
+                <NumeroEnvio>1</NumeroEnvio>
+                <Url>http://url.com</Url>
+            </TransmEnvioResult>
+        </TransmEnvioResponse>
+    </soap:Body>
+</soap:Envelope>

back/methods/mrw-config/specs/mockGetLabel.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <soap:Body>
+        <GetEtiquetaEnvioResponse xmlns="http://www.mrw.es/">
+            <GetEtiquetaEnvioResult>
+                <Estado>1</Estado>
+                <Mensaje />
+                <EtiquetaFile>base64BinaryString</EtiquetaFile>
+            </GetEtiquetaEnvioResult>
+        </GetEtiquetaEnvioResponse>
+    </soap:Body>
+</soap:Envelope>

back/methods/notification/specs/getList.spec.js

@@ -7,7 +7,7 @@ describe('NotificationSubscription getList()', () => {
         const notifications = await models.Notification.find({});
         const totalAvailable = notifications.length - active.length;
 
-        expect(active.length).toEqual(2);
+        expect(active.length).toEqual(3);
         expect(available.length).toEqual(totalAvailable);
     });
 });

back/methods/url/getUrl.js

@@ -22,7 +22,7 @@ module.exports = Self => {
         const {url} = await Self.app.models.Url.findOne({
             where: {
                 appName,
-                enviroment: process.env.NODE_ENV || 'development'
+                environment: process.env.NODE_ENV || 'development'
             }
         });
         return url;

back/methods/vn-user/share-token.js

@@ -0,0 +1,27 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('shareToken', {
+        description: 'Returns token to view files or images and share it',
+        accessType: 'WRITE',
+        accepts: [],
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/shareToken`,
+            verb: 'GET'
+        }
+    });
+
+    Self.shareToken = async function(ctx) {
+        const {accessToken: token} = ctx.req;
+
+        const user = await Self.findById(token.userId);
+        const multimediaToken = await user.accessTokens.create({
+            scopes: ['read:multimedia']
+        });
+
+        return {multimediaToken};
+    };
+};

back/methods/vn-user/specs/share-token.spec.js

@@ -0,0 +1,27 @@
+const {models} = require('vn-loopback/server/server');
+describe('Share Token', () => {
+    let ctx = null;
+    beforeAll(async() => {
+        const unAuthCtx = {
+            req: {
+                headers: {},
+                connection: {
+                    remoteAddress: '127.0.0.1'
+                },
+                getLocale: () => 'en'
+            },
+            args: {}
+        };
+        let login = await models.VnUser.signIn(unAuthCtx, 'salesAssistant', 'nightmare');
+        let accessToken = await models.AccessToken.findById(login.token);
+        ctx = {req: {accessToken: accessToken}};
+    });
+
+    it('should renew token', async() => {
+        const multimediaToken = await models.VnUser.shareToken(ctx);
+
+        expect(Object.keys(multimediaToken).length).toEqual(1);
+        expect(multimediaToken.multimediaToken.userId).toEqual(ctx.req.accessToken.userId);
+        expect(multimediaToken.multimediaToken.scopes[0]).toEqual('read:multimedia');
+    });
+});

back/model-config.json

@@ -13,10 +13,10 @@
     "AuthCode": {
         "dataSource": "vn"
     },
-    "Bank": {
+    "Accounting": {
         "dataSource": "vn"
     },
-     "Buyer": {
+    "Buyer": {
         "dataSource": "vn"
     },
     "Campaign": {
@@ -79,15 +79,24 @@
     "Language": {
         "dataSource": "vn"
     },
+    "Machine": {
+        "dataSource": "vn"
+    },
     "MachineWorker": {
         "dataSource": "vn"
     },
+    "MachineWorkerConfig": {
+        "dataSource": "vn"
+    },
     "MobileAppVersionControl": {
         "dataSource": "vn"
     },
     "Module": {
         "dataSource": "vn"
     },
+    "MrwConfig": {
+        "dataSource": "vn"
+    },
     "Notification": {
         "dataSource": "vn"
     },
@@ -159,8 +168,11 @@
     },
     "VnRole": {
         "dataSource": "vn"
+    },
+    "WorkerActivity": {
+        "dataSource": "vn"
+    },
+    "WorkerActivityType": {
+        "dataSource": "vn"
     }
-}
-
-
-
+}

back/models/accounting.json

@@ -1,9 +1,9 @@
 {
-    "name": "Bank",
+    "name": "Accounting",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "bank"
+            "table": "accounting"
         }
     },
     "properties": {
@@ -22,10 +22,7 @@
         },
         "accountingTypeFk": {
             "type": "number",
-            "required": true,
-            "mysql": {
-                "columnName": "cash"
-            }
+            "required": true
         },
         "entityFk": {
             "type": "number",

back/models/collection.js

@@ -1,7 +1,8 @@
 module.exports = Self => {
     require('../methods/collection/getCollection')(Self);
-    require('../methods/collection/getSectors')(Self);
     require('../methods/collection/setSaleQuantity')(Self);
     require('../methods/collection/previousLabel')(Self);
     require('../methods/collection/getTickets')(Self);
+    require('../methods/collection/assign')(Self);
+    require('../methods/collection/getSales')(Self);
 };

back/models/machine-worker-config.json

@@ -0,0 +1,18 @@
+{
+	"name": "MachineWorkerConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "vn.machineWorkerConfig"
+		}
+	},
+	"properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "maxHours": {
+            "type": "number"
+        }
+	}
+}

back/models/machine-worker.js

@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/machine-worker/updateInTime')(Self);
+};

back/models/machine.json

@@ -0,0 +1,18 @@
+{
+	"name": "Machine",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "vn.machine"
+		}
+	},
+	"properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "plate": {
+            "type": "string"
+        }
+	}
+}

back/models/mobile-app-version-control.js

@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/mobile-app-version-control/getVersion')(Self);
+};

back/models/mobile-app-version-control.json

@@ -0,0 +1,39 @@
+{
+	"name": "MobileAppVersionControl",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "vn.mobileAppVersionControl"
+		}
+	},
+	"properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "appName": {
+            "type": "string"
+        },
+        
+        "version": {
+            "type": "string"
+        },
+        
+        "isVersionCritical": {
+            "type": "boolean"
+        },
+        
+        "urlProduction": {
+            "type": "string"
+        },
+        "urlBeta": {
+            "type": "string"
+        },
+        "versionBeta": {
+            "type": "string"
+        },
+        "isVersionBetaCritical": {
+            "type": "boolean"
+        }
+	}
+}

back/models/mrw-config.js

@@ -0,0 +1,4 @@
+module.exports = Self => {
+    require('../methods/mrw-config/createShipment')(Self);
+    require('../methods/mrw-config/cancelShipment')(Self);
+};

back/models/mrw-config.json

@@ -0,0 +1,32 @@
+{
+	"name": "MrwConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "mrwConfig"
+		}
+	},
+	"properties": {
+		"id": {
+			"type": "number",
+			"id": true,
+			"required": true
+		},
+		"url": {
+			"type": "string",
+			"required": true
+		},
+		"user": {
+			"type": "string"
+		},
+		"password": {
+			"type": "string"
+		},
+		"franchiseCode": {
+			"type": "string"
+		},
+		"subscriberCode": {
+			"type": "string"
+		}
+	}
+}

back/models/payment.json

@@ -47,7 +47,7 @@
         },
         "bank": {
             "type": "belongsTo",
-            "model": "Bank",
+            "model": "Accounting",
             "foreignKey": "bankFk"
         },
         "payMethod": {

back/models/vn-user.js

@@ -13,6 +13,7 @@ module.exports = function(Self) {
     require('../methods/vn-user/privileges')(Self);
     require('../methods/vn-user/validate-auth')(Self);
     require('../methods/vn-user/renew-token')(Self);
+    require('../methods/vn-user/share-token')(Self);
     require('../methods/vn-user/update-user')(Self);
 
     Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');

back/models/vn-user.json

@@ -1,129 +1,140 @@
 {
-	"name": "VnUser",
-	"base": "User",
-	"validateUpsert": true,
-	"options": {
-		"mysql": {
-			"table": "account.user"
-		}
-	},
+    "name": "VnUser",
+    "base": "User",
+    "validateUpsert": true,
+    "options": {
+        "mysql": {
+            "table": "account.user"
+        }
+    },
     "mixins": {
         "Loggable": true
     },
     "resetPasswordTokenTTL": "604800",
-	"properties": {
-		"id": {
-			"type": "number",
-			"id": true
-		},
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
         "name": {
-			"type": "string",
-			"required": true
-		},
-		"username": {
-			"type": "string"
-		},
-		"roleFk": {
-			"type": "number",
-			"mysql": {
-				"columnName": "role"
-			}
-		},
-		"nickname": {
-			"type": "string"
-		},
-		"lang": {
-			"type": "string"
-		},
-		"active": {
-			"type": "boolean"
-		},
-		"email": {
-			"type": "string"
-		},
-		"emailVerified": {
-			"type": "boolean"
-		},
-		"created": {
-			"type": "date"
-		},
-		"updated": {
-			"type": "date"
-		},
-		"image": {
-			"type": "string"
-		},
-		"hasGrant": {
-			"type": "boolean"
-		},
+            "type": "string",
+            "required": true
+        },
+        "username": {
+            "type": "string"
+        },
+        "roleFk": {
+            "type": "number",
+            "mysql": {
+                "columnName": "role"
+            }
+        },
+        "nickname": {
+            "type": "string"
+        },
+        "lang": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "email": {
+            "type": "string"
+        },
+        "emailVerified": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "date"
+        },
+        "updated": {
+            "type": "date"
+        },
+        "image": {
+            "type": "string"
+        },
+        "hasGrant": {
+            "type": "boolean"
+        },
         "passExpired": {
             "type": "date"
         },
-		"twoFactor": {
-			"type": "string"
-		}
-	},
-	"relations": {
-		"role": {
-			"type": "belongsTo",
-			"model": "VnRole",
-			"foreignKey": "roleFk"
-		},
-		"roles": {
-			"type": "hasMany",
-			"model": "RoleRole",
-			"foreignKey": "role",
-			"primaryKey": "roleFk"
-		},
-		"emailUser": {
-			"type": "hasOne",
-			"model": "EmailUser",
-			"foreignKey": "userFk"
-		},
-		"worker": {
-			"type": "hasOne",
-			"model": "Worker",
-			"foreignKey": "id"
-		},
-		"userConfig": {
-			"type": "hasOne",
-			"model": "UserConfig",
-			"foreignKey": "userFk"
-		}
-	},
-	"acls": [
-		{
-			"property": "signIn",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}, {
-			"property": "recoverPassword",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}, {
-			"property": "validateAuth",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}, {
-			"property": "privileges",
-			"accessType": "*",
-			"principalType": "ROLE",
-			"principalId": "$authenticated",
-			"permission": "ALLOW"
-		}, {
-			"property": "renewToken",
-			"accessType": "WRITE",
-			"principalType": "ROLE",
-			"principalId": "$authenticated",
-			"permission": "ALLOW"
-		}
-	],
+        "twoFactor": {
+            "type": "string"
+        }
+    },
+    "relations": {
+        "role": {
+            "type": "belongsTo",
+            "model": "VnRole",
+            "foreignKey": "roleFk"
+        },
+        "roles": {
+            "type": "hasMany",
+            "model": "RoleRole",
+            "foreignKey": "role",
+            "primaryKey": "roleFk"
+        },
+        "emailUser": {
+            "type": "hasOne",
+            "model": "EmailUser",
+            "foreignKey": "userFk"
+        },
+        "worker": {
+            "type": "hasOne",
+            "model": "Worker",
+            "foreignKey": "id"
+        },
+        "userConfig": {
+            "type": "hasOne",
+            "model": "UserConfig",
+            "foreignKey": "userFk"
+        }
+    },
+    "acls": [
+        {
+            "property": "signIn",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "recoverPassword",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "validateAuth",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "privileges",
+            "accessType": "*",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "renewToken",
+            "accessType": "WRITE",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "shareToken",
+            "accessType": "WRITE",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ],
     "scopes": {
         "preview": {
             "fields": [
@@ -140,7 +151,7 @@
                 "hasGrant",
                 "realm",
                 "email",
-				"emailVerified"
+                "emailVerified"
             ]
         }
     }

back/models/workerActivity.json

@@ -0,0 +1,39 @@
+{
+	"name": "WorkerActivity",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "workerActivity"
+		}
+	},
+	"properties": {
+		"id": {
+			"id": true,
+			"type": "number"
+		},
+		"created": {
+			"type": "date"
+		},
+		"model": {
+			"type": "string"
+		},
+		"event": {
+			"type": "string"
+		},
+		"description": {
+			"type": "string"
+		},
+		"relations": {
+			"workerFk": {
+				"type": "belongsTo",
+				"model": "Worker",
+				"foreignKey": "workerFk"
+			},
+			"workerActivityTypeFk": {
+				"type": "belongsTo",
+				"model": "WorkerActivityType",
+				"foreignKey": "workerActivityTypeFk"
+			}
+		}
+	}
+}

back/models/workerActivityType.json

@@ -0,0 +1,19 @@
+{
+	"name": "WorkerActivityType",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "workerActivityType"
+		}
+	},
+	"properties": {
+		"code": {
+			"id": true,
+			"type": "string"
+		},
+		"description": {
+			"type": "string",
+			"required": false
+		}
+	}
+}

db/dump/.dump/data.sql

@@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','10861','6685a201143a320920bbe04db7f8d0d1bd32d415','2024-02-15 10:04:54','10886');
+INSERT INTO `version` VALUES ('vn-database','10943','fbdebad12c9b306004dee3fba252c1fc4613584e','2024-03-07 10:29:57','10943');
 
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@@ -586,7 +586,42 @@ INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_rollback.sql'
 INSERT INTO `versionLog` VALUES ('vn-database','10832','00-util_tx_start.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','01-update_procedure_TravelCloneWithEntries.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10832','02-grant_privileges_util_tx.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','01-Bancos_poliza.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:52',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','03-Entradas_orden.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','04-Pagares.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','05-Proveedores_gestdoc.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','06-Remesas.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','07-Saldos_Prevision.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','08-Series.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','09-Split_lines.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','10-Split.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','11-Vehiculos_consumo.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','12-account_conciliacion.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','13-account_detail.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','14-account_detail_type.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','15-agencia_descuadre.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','16-airline.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','17-airport.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','18-albaran.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','19-albaran_gestdoc.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','20-albaran_state.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:53',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','21-awb_component.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','22-awb_component_template.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','23-awb_component_type.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','24-awb_gestdoc.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','25-awb_recibida.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','26-awb_role.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','27-awb_unit.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','28-balance_nest_tree.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','29-buy_edi_k012.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','30-buy_edi_k03.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','31-buy_edi_k04.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','32-definitivo.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','33-dropTables.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10835','34-permisos.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10838','00-createInventoryConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-07 22:36:27',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10841','00-entryDms.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10845','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10848','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10849','00-roleLog.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:45:55',NULL,NULL);
@@ -612,8 +647,65 @@ INSERT INTO `versionLog` VALUES ('vn-database','10853','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','10853','00-secondScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10854','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-01-30 16:20:34',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10855','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10856','00-cloneAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10857','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:57',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10858','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10861','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-15 09:46:06',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterAgencyTermConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterGastosResumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterInvoiceOutTaxConfig.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','00-alterItemGroupToOffer.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:55',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','01-ventasContablesPk.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','02-updateExpenseRegularize.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','03-updateExpense.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10862','04-updateExpenseConflict.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10863','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10865','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10867','00-createAclInvoiceIn.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:32:59',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10867','01-createInvoiceInCorrection.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10868','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10869','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10871','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10872','00-aclUpdateFiscalData.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10873','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10874','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10876','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10878','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10879','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10882','00-vehicle.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10883','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10884','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10885','00-revokeUpdateClient.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10888','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-16 07:39:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10889','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-23 09:55:56',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10890','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-22 08:33:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10891','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','01-financialProductType.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','02-flight.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:12:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','03-gastos_resumen.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:00',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','04-integra2.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','05-integra2_province.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','06-intervalos__delete.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','10-mail_templates__delete.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','12-ticket_location__delete.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','13-turn__delete.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','14-movement_label.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','15-pago_sdc.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','25-warehouse_pickup.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:01',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','29-kk.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:03',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10896','30-permissions.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:03',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10898','00-table.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:03',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10903','00-professionalCategoryAddCode.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-23 08:38:28',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10906','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:04',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10908','00-createSupplierDms.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:24',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10909','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-02-26 11:07:35',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10912','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 08:13:25',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10914','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-28 11:52:54',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10922','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-02-29 13:44:58',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10940','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-06 16:48:18',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10941','00-restoreVn2008Jerarquia.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 09:36:57',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10942','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-03-07 10:24:45',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','10943','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2024-03-07 10:29:57',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -821,7 +913,6 @@ INSERT INTO `roleInherit` VALUES (142,35,75,NULL);
 INSERT INTO `roleInherit` VALUES (143,15,49,NULL);
 INSERT INTO `roleInherit` VALUES (145,17,67,NULL);
 INSERT INTO `roleInherit` VALUES (146,38,13,NULL);
-INSERT INTO `roleInherit` VALUES (147,101,35,NULL);
 INSERT INTO `roleInherit` VALUES (148,101,13,NULL);
 INSERT INTO `roleInherit` VALUES (150,15,56,NULL);
 INSERT INTO `roleInherit` VALUES (152,69,47,NULL);
@@ -973,6 +1064,8 @@ INSERT INTO `roleInherit` VALUES (356,123,125,NULL);
 INSERT INTO `roleInherit` VALUES (357,36,35,NULL);
 INSERT INTO `roleInherit` VALUES (358,36,49,NULL);
 INSERT INTO `roleInherit` VALUES (359,129,35,NULL);
+INSERT INTO `roleInherit` VALUES (360,101,129,NULL);
+INSERT INTO `roleInherit` VALUES (361,50,112,NULL);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -1211,7 +1304,7 @@ INSERT INTO `ACL` VALUES (293,'RoleInherit','*','*','ALLOW','ROLE','it');
 INSERT INTO `ACL` VALUES (294,'RoleRole','*','*','ALLOW','ROLE','it');
 INSERT INTO `ACL` VALUES (295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin');
 INSERT INTO `ACL` VALUES (296,'Collection','*','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (297,'Sale','refund','WRITE','ALLOW','ROLE','invoicing');
+INSERT INTO `ACL` VALUES (297,'Sale','clone','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative');
 INSERT INTO `ACL` VALUES (299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (302,'AgencyTerm','*','*','ALLOW','ROLE','administrative');
@@ -1238,8 +1331,8 @@ INSERT INTO `ACL` VALUES (323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','clai
 INSERT INTO `ACL` VALUES (324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant');
 INSERT INTO `ACL` VALUES (326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager');
-INSERT INTO `ACL` VALUES (327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant');
-INSERT INTO `ACL` VALUES (328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager');
+INSERT INTO `ACL` VALUES (327,'Sale','clone','WRITE','ALLOW','ROLE','salesAssistant');
+INSERT INTO `ACL` VALUES (328,'Sale','clone','WRITE','ALLOW','ROLE','claimManager');
 INSERT INTO `ACL` VALUES (329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson');
 INSERT INTO `ACL` VALUES (331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson');
@@ -1300,8 +1393,6 @@ INSERT INTO `ACL` VALUES (385,'Route','driverRoutePdf','READ','ALLOW','ROLE','em
 INSERT INTO `ACL` VALUES (386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer');
 INSERT INTO `ACL` VALUES (388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative');
-INSERT INTO `ACL` VALUES (389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager');
-INSERT INTO `ACL` VALUES (390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager');
 INSERT INTO `ACL` VALUES (391,'Notification','*','WRITE','ALLOW','ROLE','system');
 INSERT INTO `ACL` VALUES (392,'Boxing','*','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (393,'Url','*','READ','ALLOW','ROLE','employee');
@@ -1547,8 +1638,6 @@ INSERT INTO `ACL` VALUES (673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','R
 INSERT INTO `ACL` VALUES (674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing');
 INSERT INTO `ACL` VALUES (676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','developerBoss');
 INSERT INTO `ACL` VALUES (684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement');
 INSERT INTO `ACL` VALUES (685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement');
@@ -1593,7 +1682,7 @@ INSERT INTO `ACL` VALUES (725,'Account','findOne','READ','ALLOW','ROLE','employe
 INSERT INTO `ACL` VALUES (726,'Account','findById','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (727,'Account','find','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (728,'Account','exists','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (729,'Sale','refund','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (729,'Sale','clone','WRITE','ALLOW','ROLE','buyer');
 INSERT INTO `ACL` VALUES (730,'Ticket','setDeleted','WRITE','ALLOW','ROLE','deliveryAssistant');
 INSERT INTO `ACL` VALUES (732,'Sale','isInPreparing','*','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (733,'Train','*','READ','ALLOW','ROLE','production');
@@ -1652,6 +1741,18 @@ INSERT INTO `ACL` VALUES (785,'VnRole','*','WRITE','ALLOW','ROLE','it');
 INSERT INTO `ACL` VALUES (786,'State','isAllEditable','READ','ALLOW','ROLE','delivery');
 INSERT INTO `ACL` VALUES (787,'Ticket','makePdfList','*','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (788,'Ticket','invoiceTicketsAndPdf','*','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (789,'InvoiceIn','*','*','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (790,'InvoiceIn','getSerial','READ','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (791,'InvoiceIn','corrective','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (792,'InvoiceInCorrection','*','*','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (793,'Supplier','updateAllFiscalData','WRITE','ALLOW','ROLE','administrative');
+INSERT INTO `ACL` VALUES (794,'Supplier','updateFiscalData','WRITE','ALLOW','ROLE','buyer');
+INSERT INTO `ACL` VALUES (795,'Ticket','myLastModified','*','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (796,'MrwConfig','cancelShipment','WRITE','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (797,'MrwConfig','createShipment','WRITE','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (798,'MailAliasAccount','*','*','ALLOW','ROLE','itManagement');
+INSERT INTO `ACL` VALUES (799,'Ticket','saveCmr','*','ALLOW','ROLE','developer');
+INSERT INTO `ACL` VALUES (800,'EntryDms','*','*','ALLOW','ROLE','employee');
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -1750,8 +1851,6 @@ USE `vn`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
-
 INSERT INTO `alertLevel` VALUES ('FREE',0,1);
 INSERT INTO `alertLevel` VALUES ('ON_PREPARATION',1,1);
 INSERT INTO `alertLevel` VALUES ('PACKED',2,0);
@@ -1972,61 +2071,61 @@ INSERT INTO `continent` VALUES (3,'África','AF');
 INSERT INTO `continent` VALUES (4,'Europa','EU');
 INSERT INTO `continent` VALUES (5,'Oceanía','OC');
 
-INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,110,763,0,0,0,0,28,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL);
-INSERT INTO `department` VALUES (31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (35,'finance','FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (36,'labor','LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,35,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL);
-INSERT INTO `department` VALUES (38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',36,37,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (43,'VT','VENTAS',38,65,NULL,0,0,0,1,13,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (44,'management','GERENCIA',66,67,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',68,69,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (46,'delivery','REPARTO',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',72,73,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',74,75,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',19,20,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL);
-INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',21,22,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL);
-INSERT INTO `department` VALUES (58,'CMP','CAMPOS',82,85,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (61,NULL,'VNH',90,93,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (80,NULL,'EQUIPO J VALLES',39,40,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (89,NULL,'COORDINACION',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (90,NULL,'TRAILER',91,92,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',41,42,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (94,NULL,'EQUIPO J BROCAL',43,44,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (95,NULL,'EQUIPO C ZAMBRANO',45,46,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'equipoczambrano@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',47,48,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',49,50,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',51,52,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (125,NULL,'EQUIPO MIRIAM MAR',53,54,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',27,28,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL);
-INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',83,84,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',55,56,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',57,58,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'francia@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',59,60,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',106,107,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (137,'sorter','SORTER',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (139,NULL,'EQUIPO J SORIA ',61,62,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',63,64,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL);
-INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL);
+INSERT INTO `department` VALUES (1,'VN','VERDNATURA',1,110,763,0,0,0,0,27,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (34,'accounting','CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (35,'finance','FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (36,'labor','LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (37,'PROD','PRODUCCION',12,35,NULL,72,1,1,1,11,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (38,'picking','SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (39,'packing','ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (41,'administration','ADMINISTRACION',36,37,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (43,'VT','VENTAS',38,67,NULL,0,0,0,1,14,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (44,'management','GERENCIA',68,69,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (45,'logistic','LOGISTICA',70,71,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (46,'delivery','REPARTO',72,73,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (48,'storage','ALMACENAJE',74,75,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (49,NULL,'PROPIEDAD',76,77,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (52,NULL,'CARGA AEREA',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (53,'marketing','MARKETING Y COMUNICACIÓN',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (54,NULL,'ORNAMENTALES',82,83,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (55,NULL,'TALLER NATURAL',19,20,14548,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1118,NULL,NULL);
+INSERT INTO `department` VALUES (56,NULL,'TALLER ARTIFICIAL',21,22,8470,72,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,1927,NULL,NULL);
+INSERT INTO `department` VALUES (58,'CMP','CAMPOS',84,87,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (59,'maintenance','MANTENIMIENTO',88,89,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (60,'claims','RECLAMACIONES',39,40,NULL,72,0,0,2,0,43,'/1/43/',NULL,1,NULL,1,1,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (61,NULL,'VNH',90,93,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (66,NULL,'VERDNAMADRID',94,95,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (68,NULL,'COMPLEMENTOS',23,24,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (69,NULL,'VERDNABARNA',96,97,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (80,NULL,'EQUIPO J VALLES',41,42,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'equipojvalles@verdnatura.es',0,0,0,0,NULL,NULL,'5300');
+INSERT INTO `department` VALUES (86,NULL,'LIMPIEZA',98,99,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (89,NULL,'COORDINACION',100,101,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (90,NULL,'TRAILER',91,92,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (91,'artificial','ARTIFICIAL',25,26,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (92,NULL,'EQUIPO SILVERIO',43,44,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (94,NULL,'EQUIPO J BROCAL',45,46,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',0,'equipojbrocal@verdnatura.es',0,0,0,0,NULL,NULL,'5100');
+INSERT INTO `department` VALUES (95,NULL,'EQUIPO C ZAMBRANO',47,48,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',0,'equipoczambrano@verdnatura.es',0,0,0,0,NULL,NULL,'5000');
+INSERT INTO `department` VALUES (96,NULL,'EQUIPO C LOPEZ',49,50,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (115,NULL,'EQUIPO CLAUDI',51,52,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (123,NULL,'EQUIPO ELENA BASCUÑANA',53,54,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',0,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',102,103,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (125,NULL,'EQUIPO MIRIAM MAR',55,56,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',0,'equipomirgir@verdnatura.es',0,0,0,0,NULL,NULL,'5200');
+INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',27,28,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (130,NULL,'REVISION',31,32,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',85,86,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',57,58,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (133,'franceTeam','EQUIPO FRANCIA',59,60,1731,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'francia@verdnatura.es',0,0,0,0,NULL,NULL,'3300');
+INSERT INTO `department` VALUES (134,'portugalTeam','EQUIPO PORTUGAL',61,62,6264,0,0,0,2,0,43,'/1/43/','pt_equipo',1,'portugal@verdnatura.es',0,0,0,0,NULL,NULL,'3500');
+INSERT INTO `department` VALUES (135,'routers','ENRUTADORES',104,105,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (136,'heavyVehicles','VEHICULOS PESADOS',106,107,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (137,'sorter','SORTER',108,109,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (139,NULL,'EQUIPO J SORIA ',63,64,3803,0,0,0,2,0,43,'/1/43/','jss_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,'5400');
+INSERT INTO `department` VALUES (140,'hollandTeam','EQUIPO HOLANDA',65,66,NULL,0,0,0,2,0,43,'/1/43/','nl_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL);
+INSERT INTO `department` VALUES (141,NULL,'PREVIA',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL);
 
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);

db/dump/.dump/privileges.sql

@@ -76,6 +76,7 @@ INSERT  IGNORE INTO `db` VALUES ('','bs','developer','Y','Y','Y','Y','N','N','N'
 INSERT  IGNORE INTO `db` VALUES ('','bi','developer','Y','Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','util','grafana','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 INSERT  IGNORE INTO `db` VALUES ('','mysql','developerBoss','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
+INSERT  IGNORE INTO `db` VALUES ('','rfid','developerBoss','Y','Y','Y','Y','N','N','Y','N','N','N','N','N','N','N','N','N','Y','N','N','N');
 /*!40000 ALTER TABLE `db` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `tables_priv` DISABLE KEYS */;
@@ -101,18 +102,17 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','value','alexm@%','00
 INSERT  IGNORE INTO `tables_priv` VALUES ('','mysql','developerBoss','general_log','juan@10.5.1.1','0000-00-00 00:00:00','Select,Drop','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','dipole','employee','expedition_PrintOut','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','logistic','marketPlace','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','definitivo','alexm@%','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','definitivo','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','manager','item_group','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','administrative','item_feature','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','item_feature','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','itemTag','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','itemCategoryL10n','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','guest','warehouse','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financialBoss','credit','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','guest','Tipos','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','producer','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','mdbVersion','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','province','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','versiones','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','mistakeType','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','warehouse','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','account','itemTaxCountry','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
@@ -165,8 +165,8 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','location','root@p
 INSERT  IGNORE INTO `tables_priv` VALUES ('','account','hr','mailAliasAccount','$itBoss@10.0.2.69','2022-08-03 23:44:43','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','tag','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','news','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi_k012','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','buy_edi_k012','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi_k012','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','buy_edi_k012','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','myMenu','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','myBasket','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','guest','message','root@pc-juan.dyn.verdnatura.es','2022-08-03 23:44:43','Select','');
@@ -177,7 +177,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','account','hr','account','$itBoss@1
 INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','android','AccessToken','jenkins@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerBoss','itemTag','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','itemTag','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','buy_edi_k03','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','buy_edi_k03','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','psico','hr','examQuestion','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','psico','hr','exam','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','manager','exchange','alexm@%','0000-00-00 00:00:00','Select','');
@@ -221,7 +221,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','salesPerson','item_groupToOf
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','account','myTicketService','root@10.2.3.180','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','sage','administrative','movConta','carlosap@172.16.5.232','2022-08-03 23:44:43','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','hedera','employee','mailConfig','jgallego@81.202.38.190','2022-08-03 23:44:43','','Select');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','account_conciliacion','alexm@%','0000-00-00 00:00:00','Select,Insert,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','account_conciliacion','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','accion_dits','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','guest','config','juan@%','0000-00-00 00:00:00','','Select');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','util','account','config','$itBoss@10.0.2.69','2022-08-03 23:44:43','Select','');
@@ -243,49 +243,47 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','time','guillermo@db-p
 INSERT  IGNORE INTO `tables_priv` VALUES ('','mysql','developer','slow_log','$itBoss@10.0.2.68','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','mysql','developer','user','$itBoss@10.0.2.68','2022-08-03 23:44:43','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','mysql','developer','proc','$itBoss@10.0.2.68','2022-08-03 23:44:43','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','account_detail','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','account_detail_type','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','account_detail','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','account_detail_type','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','entryEditor','Compres','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Agencias','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','awb_component','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','awb_component','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','account','developer','emailUser','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','agencia_descuadre','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','airline','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','airline','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','airline','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','airline','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','agency_warehouse','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','albaran','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','albaran','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vncontrol','salesPerson','inter','alexm@%','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Articles_botanical','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','albaran_gestdoc','alexm@%','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','albaran_state','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','albaran_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','albaran_state','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Articles','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Articles_botanical','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','awb','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_component','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_template','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_component_type','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','awb_gestdoc','alexm@%','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_gestdoc','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_recibida','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_role','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_unit','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financialBoss','balance_nest_tree','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_component','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_template','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_component_type','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','awb_gestdoc','alexm@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','awb_recibida','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_role','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_unit','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financialBoss','balance_nest_tree','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vncontrol','deliveryBoss','inter','juan@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Bancos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','barcodes','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','barcodes','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vncontrol','buyer','inter','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vncontrol','employee','inter','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_gestdoc','alexm@%','0000-00-00 00:00:00','Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','agency','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','buySource','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','buy_edi','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','buy_edi_k04','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi_k03','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi_k04','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','buy_edi_k04','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi_k03','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','buy_edi_k04','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesAssistant','Clientes','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','v_empresa','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','v_empresa','alexm@%','0000-00-00 00:00:00','Select','');
@@ -293,17 +291,15 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','chanel','al
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','v_empresa','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Clientes','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','V_edi_item_track','alexm@%','0000-00-00 00:00:00','Select,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','v_compres','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionPlus','v_botanic_export','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','manager','v_botanic_export','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionPlus','v_Articles_botanical','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Colores','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Clientes','alexm@%','0000-00-00 00:00:00','Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','recibida_vencimiento','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','jerarquia','juan@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','warehouse','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerBusinessAgreement','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','tarifa_componentes','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','officeBoss','Vehiculos','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','tarifa_componentes_series','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','Entradas','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemType','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -314,31 +310,30 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','producer','alexm@
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','officeBoss','ticket_observation','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Cajas','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','cmrConfig','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','awb_recibida','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','awb_recibida','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','awb','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Compres','alexm@%','0000-00-00 00:00:00','Select,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','workerDocument','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','buy_edi','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','ACL','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Vehiculos_consumo','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Vehiculos_consumo','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','palletizer','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Colores','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','state','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Consignatarios','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','travel','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','price_fixed','alexm@%','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','Vehiculos','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','printQueue','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','preservedBoss','travel','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','alexm@%','0000-00-00 00:00:00','Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','travel','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerAssistant','itemType','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Cubos','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos_Retorno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','state','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','travel','alexm@%','0000-00-00 00:00:00','Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Bancos_poliza','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Bancos_poliza','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','production','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','edi_bucket_type','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','edi_bucket','alexm@%','0000-00-00 00:00:00','Select','');
@@ -362,7 +357,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Entradas','ale
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','ticket_observation','juan@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Entradas_dits','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','sale','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Entradas_orden','alexm@%','0000-00-00 00:00:00','Select,Insert,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Entradas_orden','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','ticket_observation','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas_turno','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','entrySource','alexm@%','0000-00-00 00:00:00','Select','');
@@ -375,18 +370,15 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','tickets_gestdoc'
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','tickets_gestdoc','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Tickets','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Entradas','root@localhost','0000-00-00 00:00:00','Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','expeditions','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Entradas','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas','alexm@%','0000-00-00 00:00:00','Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Facturas','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Facturas','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Tintas','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','filtros','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Entradas_kop','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','flight','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','warehouse_pickup','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','flight','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','warehouse_pickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','zones','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','warehouse_pickup','juan@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','warehouse_pickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','businessReasonEnd','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','businessCalendar','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','business','alexm@%','0000-00-00 00:00:00','Select','');
@@ -413,17 +405,15 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','calendarHolidays'
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','mandato','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','mandato','alexm@%','0000-00-00 00:00:00','Select,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','iva_group','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','invoiceCorrection','alexm@%','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','intrastat_data','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','intrastat_data','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','greugeType','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceInIntrastat','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','greuge','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Intrastat','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Intrastat','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','integra2_province','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','integra2_province','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Grupos','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Greuges','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','gesttip','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','gestdoc','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Gastos','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','dms','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','continent','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','Movimientos_componentes','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','Movimientos_componentes','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Movimientos_mark','alexm@%','0000-00-00 00:00:00','Delete','');
@@ -439,7 +429,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','pago','a
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','awb','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Paises','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','salesAssistant','clientDied','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','warehouse_pickup','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','warehouse_pickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_categorias','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_centros','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','payroll_conceptos','alexm@%','0000-00-00 00:00:00','Select,Update','');
@@ -461,16 +451,14 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Proveedo
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','PreciosEspeciales','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','agencia_descuadre','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','price_fixed','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','gestdoc','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','iva_tipo','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','iva_codigo','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','pago','alexm@%','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Proveedores','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Proveedores_cargueras','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Proveedores_gestdoc','juan@%','0000-00-00 00:00:00','Select,Insert,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','palletizer','Facturas','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','expedition','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Proveedores_gestdoc','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','claimManager','recibida','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','recibida','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','adminOfficer','recibida_iva','alexm@%','0000-00-00 00:00:00','Delete','');
@@ -481,10 +469,10 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesPerson','Recibos','a
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','officeBoss','bankEntity','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','agency','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','bankEntity','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','reference_min','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','versiones','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','reference_rate','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','saleComponent','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','Remesas','juan@%','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','Remesas','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','Reservas','alexm@%','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','cmr','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','Rutas','alexm@%','0000-00-00 00:00:00','Select','');
@@ -504,9 +492,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','bufferState','juan
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','coolerAssist','state','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','absenceType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','artificialBoss','Entradas_Auto','alexm@%','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','XDiario','alexm@%','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','Vehiculos_consumo','alexm@%','0000-00-00 00:00:00','Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','XDiario','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionAssi','Vehiculos_consumo','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','employee','tblContadores','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','buyMark','juan@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','calendar','juan@10.5.1.2','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -558,7 +544,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionBoss','sale','alexm
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','packingSite','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionPlus','province','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','productionPlus','province','alexm@%','0000-00-00 00:00:00','Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','property','juan@%','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','pbx','grafana','sip','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','','Select');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','clientCredit','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','artificialBoss','saleTracking','alexm@%','0000-00-00 00:00:00','Delete','');
@@ -568,8 +553,8 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleTracking','ale
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','client','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','client','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleVolume','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Proveedores_gestdoc','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','awb_gestdoc','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Proveedores_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','awb_gestdoc','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','Cubos','alexm@%','0000-00-00 00:00:00','Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','routesMonitor','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','sale','alexm@%','0000-00-00 00:00:00','Insert','');
@@ -582,8 +567,8 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','saleComponent'
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','marketingBoss','saleGoal','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleGroup','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','saleGroupDetail','alexm@%','0000-00-00 00:00:00','Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','account_detail','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_type','alexm@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','account_detail','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','awb_component_type','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vncontrol','employee','accion','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','volumeConfig','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','currency','alexm@%','0000-00-00 00:00:00','Select','');
@@ -592,12 +577,11 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','currency','a
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','creditClassification','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','creditInsurance','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','currency','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','dms','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','workerTimeControl','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','defaulter','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','deliveryMethod','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','deliveryMethod','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','dms','alexm@%','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','administrative','v_compres','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','deviceProductionUser','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','department','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','deviceProductionConfig','alexm@%','0000-00-00 00:00:00','Select','');
@@ -607,7 +591,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionBoss','absenceType'
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','deviceProductionConfig','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','deviceProductionUser','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','disabilityGrade','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','dms','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','duaInvoiceIn','alexm@%','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','dmsType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','duaEntry','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
@@ -657,7 +640,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','artificialBoss','entryObserva
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','dock','alexm@%','0000-00-00 00:00:00','Select,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','expeditionTruck','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','expeditionPallet','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','expense','guillermo@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','expense','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','expeditionScan','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','entryObservation','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','ppeGroup','alexm@%','0000-00-00 00:00:00','Select','');
@@ -672,7 +655,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','postCode','alexm@%','000
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','pgcMaster','alexm@%','0000-00-00 00:00:00','Select,Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','itemBarcode','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','host','alexm@%','0000-00-00 00:00:00','Select,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','Facturas','guillermo@10.5.1.4','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ticket','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceIn','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','invoiceIn','alexm@%','0000-00-00 00:00:00','Select','');
@@ -687,7 +669,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesPerson','invoiceCorrecti
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','invoiceIn','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceInDueDay','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','invoiceInDueDay','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','invoiceInIntrastat__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','invoiceInIntrastat__','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','invoiceInTax','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceInSage','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','invoiceInTax','alexm@%','0000-00-00 00:00:00','Select','');
@@ -728,8 +710,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','itemShelving','ale
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','itemShelvingLog','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ticketWeekly','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','itemShelvingLog','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','airport','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyer','XDiario','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','logistic','airport','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','itemShelvingSale','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hrBoss','Tickets','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimEnd','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -785,7 +766,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','invoiceOut',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','dua','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','duaEntry','alexm@%','0000-00-00 00:00:00','Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','expeditionTruck','alexm@%','0000-00-00 00:00:00','Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','moving','alexm@%','0000-00-00 00:00:00','Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','moving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDetail','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','machineDms','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','vehicle','alexm@%','0000-00-00 00:00:00','Select','');
@@ -801,7 +782,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferType','a
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferState','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','vehicle','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','buffer','alexm@%','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferGroup','alexm@%','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','bufferGroup','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','lastRFID','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','person__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenance','config','alexm@%','0000-00-00 00:00:00','Select','');
@@ -839,7 +820,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','recovery','al
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','employee','photocell','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','grafana','supplyResponse','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','cache','customer','last_buy','alexm@%','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','financial','Greuges_type','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','client','carlosap@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','invoiceInTax','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesAssistant','workerTeam','juan@10.5.1.2','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','profile_type','alexm@%','0000-00-00 00:00:00','Select','');
@@ -871,12 +852,11 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','bi','salesPerson','tarifa_componen
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','employee','expeditionLog','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','salesPerson','clientNewBorn','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleItemShelving__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','XDiario','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','salesBoss','workerTeam','juan@10.5.1.2','0000-00-00 00:00:00','Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','employee','expedition','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemShelvingStock','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','saleParking__','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','property','juan@10.5.1.1','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','property','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','employee','config','alexm@%','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicleEvent','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','vehicle','alexm@%','0000-00-00 00:00:00','Insert,Update','');
@@ -918,7 +898,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','taxCode','alexm@%','
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','grafana','salesPersonEvolution','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','postgresql','hr','calendar_employee','juan@10.5.1.2','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','ticket','alexm@%','0000-00-00 00:00:00','Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticket','alexm@%','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticket','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','Update');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','ticketCollection','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminBoss','ticketDms','alexm@%','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','ticketDocumentation','alexm@%','0000-00-00 00:00:00','Select,Insert','');
@@ -963,6 +943,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','travel','alexm@%',
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','travelClonedWeekly','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bi','employee','facturacion_media_anual','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','travelObservation','alexm@%','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','bankPolicy','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','travelThermograph','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','tillConfig','juan@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','till','juan@%','0000-00-00 00:00:00','Select','');
@@ -1013,7 +994,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerRelatives','guille
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','ticketPackagingStartingStock','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','supplierPackaging','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','workerDocument','alexm@%','0000-00-00 00:00:00','Select,Insert','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','hr','gestdoc','alexm@%','0000-00-00 00:00:00','Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','invoiceCorrection','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','ink','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','zone','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','XDiario','alexm@%','0000-00-00 00:00:00','Select','');
@@ -1028,7 +1009,6 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','zonePromo__','alex
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accountingConfig','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','accountingType','alexm@%','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','agencyMode','alexm@%','0000-00-00 00:00:00','Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerBoss','XDiario','alexm@%','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','cache','employee','visible','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerAssist','productionConfig','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','cache','employee','available','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1181,8 +1161,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','packager','glsExpedition','ju
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','clientType','juan@10.5.1.2','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','expeditionMistake','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','deviceProductionLog','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesAssistant','workerTeam','juan@10.5.1.2','0000-00-00 00:00:00','Select,Insert,Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','salesBoss','workerTeam','juan@10.5.1.2','0000-00-00 00:00:00','Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','integra2Province','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','vehicleState','juan@10.5.1.1','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','machineDetail','juan@10.5.1.1','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','machineDms','juan@10.5.1.1','0000-00-00 00:00:00','Select','');
@@ -1203,7 +1182,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','packager','chronopostExpediti
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','sectorCollection','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','packager','sendingService','jenkins@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','adminOfficer','tickets_gestdoc','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Delete','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','maintenanceBos','moving','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','flight','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','routeAction','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','bankErrorCode','jgallego@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','farming','alexm@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
@@ -1258,13 +1237,13 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','url','juan@db-
 INSERT  IGNORE INTO `tables_priv` VALUES ('','salix','developer','userConfigView','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRedelivery','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','clientRisk','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyerBoss','itemType','carlosap@db-proxy1.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','supplierDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','bs','buyer','sale','guillermo@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','chain','juan@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','routesMonitor','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Update','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','warehouse_pickup','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','warehouse_pickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','cl_main','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
-INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Vehiculos','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','company','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','routeAction','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','ticket_observation','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Insert','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryAssistant','Tickets_turno','alexm@db-proxy2.static.verdnatura.es','0000-00-00 00:00:00','Select','');
@@ -1336,8 +1315,53 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','item','guillermo@db-p
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','coolerBoss','itemShelving','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','negativeOrigin','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn2008','deliveryBoss','Vehiculos_consumo','carlosap@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','entryOrder','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','project','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','ink','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','supplierDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','supplierDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','remittance','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','adminOfficer','vehicleConsumption','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','vehicleConsumption','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','accountReconciliation','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financial','accountDetail','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','accountDetail','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','accountDetailType','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','airline','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','airline','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','airport','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','deliveryNote','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','deliveryNoteDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','deliveryNoteState','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','awbComponent','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','awbComponent','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','awbComponent','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','awbComponentTemplate','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','awbComponentType','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','awbComponentType','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Update','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','awbDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','awbDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','awbDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Insert','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','awbDms','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','administrative','awbInvoiceIn','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hrBoss','awbInvoiceIn','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','awbRole','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','awbUnit','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','financialBoss','balanceNestTree','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','ektK1','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','administrative','ektK1','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','ektK2','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','administrative','ektK2','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','ektK3','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','administrative','ektK3','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','buyer','ektK4','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','edi','administrative','ektK4','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','productionAssi','dmsStorageBox','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','hr','company','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','logistic','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','claimManager','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','employee','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryAssistant','warehousePickup','jenkins@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
@@ -1537,6 +1561,40 @@ INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','size','0000-0
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','originFk','0000-00-00 00:00:00','Select,Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','longName','0000-00-00 00:00:00','Update');
 INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','buyer','item','name','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','id','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','warehouseFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','shipped','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','nickname','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','refFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','addressFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','workerFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','observations','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','isSigned','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','isLabeled','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','isPrinted','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','packages','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','location','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','hour','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','created','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','isBlocked','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','solution','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','routeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','priority','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','hasPriority','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','companyFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','agencyModeFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','landed','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','isBoxed','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','isDeleted','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','zoneFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','zonePrice','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','zoneBonus','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','totalWithVat','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','totalWithoutVat','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','weight','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','clonedFrom','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','cmrFk','0000-00-00 00:00:00','Update');
+INSERT  IGNORE INTO `columns_priv` VALUES ('','vn','employee','ticket','editorFk','0000-00-00 00:00:00','Update');
 /*!40000 ALTER TABLE `columns_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `procs_priv` DISABLE KEYS */;
@@ -1613,26 +1671,14 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','entry_fixMisfit','P
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','employee','buy_tarifas_entry','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_CURDATE','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','calculoremesas','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hr','cc_to_iban','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','cc_to_iban','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','marketingBoss','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','clientTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','client_checkBalance','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','addressTaxArea','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesPerson','client_getSalesPersonByTicket','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','handmadeBoss','confection_control_source','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','travelDetail','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','claimManager','traslado','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','traslado','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','administrative','supplierStatement','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','buyer','supplierStatement','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','supplierStatement','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','red','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','salesPerson','red','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','administrative','intrastat_neto','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','productionAssi','confection_control_source','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','artificialBoss','confection_control_source','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','logistic','nz','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','deliveryAssistant','preordenarruta','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','financial','pay','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','salesAssistant','defaultersFromDate','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1661,7 +1707,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_commit','PROCEDUR
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','hrBoss','balance_create','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','cooler','buyultimate','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','grafana','firstdayofyear','FUNCTION','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','officeBoss','fustcontrol','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','claimManager','dayend','FUNCTION','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','employee','log_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','srt','employee','moving_between','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1711,7 +1756,6 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','cache','employee','available_refres
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerBoss','ticket_clone','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','itemproposal','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','salesAssistant','itemproposal_add','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','timebusiness_calculatebyuser','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','itemsale_byweek','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','itemsale_byweek','PROCEDURE','alexm@%','Execute','0000-00-00 00:00:00');
@@ -1814,10 +1858,8 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','logistic','travel_weeklyclone'
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByBuy','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','coolerAssist','itemproposal','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','financial','company_getsuppliersdebt','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','agency','desglose_volume','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','bi','productionAssi','rutasanalyze','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','productionPlus','workerCreateExternal','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn2008','adminBoss','XDiario_Quadrator','PROCEDURE','juan@10.5.1.2','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_NOW','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_UNIX_TIMESTAMP','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_UTC_DATE','FUNCTION','juan@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1826,7 +1868,7 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','VN_UTC_TIMESTAMP','F
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','itemshelving_getsaledate','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','production','ticket_setState','PROCEDURE','guillermo@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','invoicing','invoiceout_new','PROCEDURE','alexm@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
-INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','sale_replaceItem','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','employee','sale_replaceItem','PROCEDURE','jgallego@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hr','ledger_next','PROCEDURE','guillermo@db-proxy1.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','deliveryAssistant','workerjourney_replace','PROCEDURE','alexm@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','account','developerBoss','role_sync','PROCEDURE','juan@db-proxy2.static.verdnatura.es','Execute','0000-00-00 00:00:00');
@@ -1945,6 +1987,16 @@ INSERT  IGNORE INTO `procs_priv` VALUES ('','util','guest','tx_start','PROCEDURE
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPrices','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByAwb','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','buy_recalcPricesByEntry','PROCEDURE','guillermo@db-proxy2.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','util','hr','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','util','financial','accountNumberToIban','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','supplier_statement','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','supplier_statement','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','hrBoss','supplier_statement','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','adminBoss','XDiario_check','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','travel_getDetailFromContinent','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','claimManager','entry_getTransfer','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','buyer','entry_getTransfer','PROCEDURE','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
+INSERT  IGNORE INTO `procs_priv` VALUES ('','vn','administrative','intrastat_estimateNet','FUNCTION','jenkins@db-proxy1.servers.dc.verdnatura.es','Execute','0000-00-00 00:00:00');
 /*!40000 ALTER TABLE `procs_priv` ENABLE KEYS */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1958,52 +2010,53 @@ USE `mysql`;
 
 /*!40000 ALTER TABLE `global_priv` DISABLE KEYS */;
 INSERT  IGNORE INTO `global_priv` VALUES ('','account','{\"access\": 0, \"is_role\": true,\"version_id\":100707}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','adminBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','adminOfficer','{\"access\": 0, \"version_id\": 100707, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','administrative','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','adminBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','adminOfficer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','administrative','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','agency','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 20000, \"max_user_connections\": 50, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','android','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','artificialBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','assetManager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','buyer','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','buyerAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','buyerBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','claimManager','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','cooler','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','coolerAssist','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','coolerBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','customer','{\"access\": 0, \"max_questions\": 0, \"max_updates\": 30000, \"max_connections\": 300000, \"max_user_connections\": 400, \"max_statement_time\": 0.000000, \"is_role\": true,\"version_id\":100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','delivery','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryAssistant','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','deliveryBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','developer','{\"access\": 5909905728, \"is_role\": true, \"version_id\": 100707}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','developerBoss','{\"access\":33554432,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','developerBoss','{\"access\":33554432,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','employee','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','entryEditor','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','ext','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 100707, \"is_role\": true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','financial','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','financialBoss','{\"access\": 0, \"version_id\": 101106, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','grafana','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','greenhouseBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','guest','{\"access\": 0, \"max_questions\": 40000, \"max_updates\": 1000, \"max_connections\": 150000, \"max_user_connections\": 200, \"max_statement_time\": 0.000000, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','handmadeBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','hedera-web','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','hr','{\"access\": 0, \"is_role\": true, \"version_id\": 100707}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','hrBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','hr','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','hrBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','invoicing','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','itBoss','{\"access\": 541165846527, \"is_role\": true, \"version_id\": 100707}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','itManagement','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','itemPicker','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','logistic','{\"access\": 0, \"is_role\": true, \"version_id\": 101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','logisticBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','maintenance','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','maintenance','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBos','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','maintenanceBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','manager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','marketing','{\"access\": 0, \"is_role\": true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','marketingBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','officeBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','officeBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','packager','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','palletizer','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','palletizer','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','palletizerBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','preservedBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','production','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
@@ -2011,9 +2064,9 @@ INSERT  IGNORE INTO `global_priv` VALUES ('','productionAssi','{\"access\": 0, \
 INSERT  IGNORE INTO `global_priv` VALUES ('','productionBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','productionPlus','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','root','{\"access\": 549755781119, \"version_id\": 100705, \"is_role\": true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','salesAssistant','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','salesBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
-INSERT  IGNORE INTO `global_priv` VALUES ('','salesPerson','{\"access\": 0, \"is_role\": true,\"version_id\":100707}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','salesAssistant','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','salesBoss','{\"access\":0,\"version_id\":101106,\"is_role\":true}');
+INSERT  IGNORE INTO `global_priv` VALUES ('','salesPerson','{\"access\": 0, \"is_role\": true,\"version_id\":101106}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','salesTeamBoss','{\"access\":0,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','salix','{\"access\":33555456,\"version_id\":100707,\"is_role\":true}');
 INSERT  IGNORE INTO `global_priv` VALUES ('','sysadmin','{\"access\": 201326592, \"is_role\": true, \"version_id\": 100707}');

db/dump/.dump/triggers.sql

@@ -1735,6 +1735,33 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`accountReconciliation_beforeInsert`
+	BEFORE INSERT ON `accountReconciliation`
+	FOR EACH ROW
+
+	SET NEW.calculatedCode = REPLACE(
+							REPLACE(
+								REPLACE(
+									REPLACE(
+											CONCAT(NEW.supplierAccountFk,NEW.operationDated,NEW.amount,NEW.concept,NEW.debitCredit)
+											,' ','')
+										,":",'')
+									,'-','')
+								,'.','') */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`address_beforeInsert`
 	BEFORE INSERT ON `address`
 	FOR EACH ROW
@@ -2002,6 +2029,33 @@ BEGIN
 	SET NEW.year= year(util.VN_CURDATE());
 
 
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`awbInvoiceIn_afterDelete`
+	AFTER DELETE ON `awbInvoiceIn`
+	FOR EACH ROW
+BEGIN
+	IF (NOT(SELECT COUNT(*) FROM invoiceInTax where invoiceInFk = OLD.invoiceInFk))
+		AND
+		(NOT(SELECT COUNT(*) FROM invoiceInDueDay where invoiceInFk = OLD.invoiceInFk))
+		AND 
+		(NOT(SELECT isBooked FROM invoiceIn WHERE id = OLD.invoiceInFk) )
+	THEN
+		DELETE FROM invoiceIn WHERE id = OLD.invoiceInFk;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -2389,8 +2443,8 @@ trig:BEGIN
 			FROM genericAllocation ga
 				JOIN entry e ON e.id = NEW.entryFk
 				JOIN travel tr on tr.id = e.travelFk
-				WHERE ga.itemFk = vGenericFk
-					AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+			WHERE ga.itemFk = vGenericFk
+				AND tr.landed BETWEEN ga.startDated AND ga.endDated;
 		IF vGenericInDate THEN
 			SET NEW.itemOriginalFk = NEW.itemFk;
 			SET NEW.itemFk = vGenericFk;
@@ -2412,6 +2466,13 @@ trig:BEGIN
 	IF NEW.quantity < 0 THEN
 		SET	NEW.isIgnored = TRUE;
 	END IF;
+
+	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
+		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
+		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+		SELECT NEW.id;
+		CALL buy_checkItem();		
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -4648,9 +4709,9 @@ BEGIN
 		SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
 	END IF;
 
-	IF NOT (NEW.travelFk <=> OLD.travelFk)
-	OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN 
-		SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);
+	IF NOT (NEW.travelFk <=> OLD.travelFk)		
+	OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN 		
+		SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);		
 	END IF;
 END */;;
 DELIMITER ;
@@ -4681,6 +4742,16 @@ BEGIN
 		CALL travel_requestRecalc(OLD.travelFk);
 		CALL travel_requestRecalc(NEW.travelFk);
 	END IF;
+
+	
+	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
+		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+			SELECT b.id
+				FROM buy b
+				WHERE b.entryFk = NEW.id;
+		
+		CALL buy_checkItem();
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -4742,6 +4813,70 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entryDms_beforeInsert`
+	BEFORE INSERT ON `entryDms`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entryDms_beforeUpdate`
+	BEFORE UPDATE ON `entryDms`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entryDms_afterDelete`
+	AFTER DELETE ON `entryDms`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO entryLog
+		SET `action` = 'delete',
+			`changedModel` = 'EntryDms',
+			`changedModelId` = OLD.entryFk,
+			`userFk` = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`entryObservation_beforeInsert`
 	BEFORE INSERT ON `entryObservation`
 	FOR EACH ROW
@@ -4800,33 +4935,33 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb3 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
-/*!50003 SET collation_connection  = utf8mb3_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`expedition_beforeInsert`
 	BEFORE INSERT ON `expedition`
 	FOR EACH ROW
 BEGIN
 	DECLARE intcounter INT;
-    DECLARE vShipFk INT;
+	DECLARE vShipFk INT;
 
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NEW.freightItemFk IS NOT NULL THEN 
 
-		UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
+		UPDATE ticket SET packages = IFNULL(packages, 0) + 1 WHERE id = NEW.ticketFk;
 
 		SELECT IFNULL(MAX(counter),0) +1 INTO intcounter 
-            FROM expedition e 
+			FROM expedition e 
 				INNER JOIN ticket t1 ON e.ticketFk = t1.id 
-                LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
+				LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
 				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) 
-                    AND t1.warehouseFk = t2.warehouseFk
+					AND t1.warehouseFk = t2.warehouseFk
 			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk 
-                AND t1.agencyModeFk = t2.agencyModeFk;
+				AND t1.agencyModeFk = t2.agencyModeFk;
 
 		SET NEW.`counter` = intcounter;
 	END IF;
@@ -5196,6 +5331,10 @@ BEGIN
 	DECLARE vActive TINYINT;
 	DECLARE vWithholdingSageFk INT;
 
+	IF NOT util.checkPrintableChars(NEW.supplierRef) THEN
+		CALL util.throw('The invoiceIn reference contains invalid characters');
+	END IF;
+
 	SET NEW.editorFk = account.myUser_getId();
 	
 	SELECT  withholdingSageFk INTO  vWithholdingSageFk 
@@ -5254,9 +5393,12 @@ DELIMITER ;;
 	BEFORE UPDATE ON `invoiceIn`
 	FOR EACH ROW
 BEGIN
-
 	DECLARE vWithholdingSageFk INT;
 
+	IF NOT (NEW.supplierRef <=> OLD.supplierRef) AND NOT util.checkPrintableChars(NEW.supplierRef) THEN
+		CALL util.throw('The invoiceIn reference contains invalid characters');
+	END IF;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF (SELECT COUNT(*) FROM vn.invoiceIn 
@@ -7973,6 +8115,26 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleLabel_afterUpdate`
+	AFTER UPDATE ON `vn`.`saleLabel`
+	FOR EACH ROW
+IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
+	UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk;
+END IF */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleTracking_afterInsert`
 	AFTER INSERT ON `saleTracking`
 	FOR EACH ROW
@@ -8612,6 +8774,70 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierDms_beforeInsert`
+	BEFORE INSERT ON `supplierDms`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierDms_beforeUpdate`
+	BEFORE UPDATE ON `supplierDms`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierDms_afterDelete`
+	AFTER DELETE ON `supplierDms`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO clientLog
+		SET `action` = 'delete',
+			`changedModel` = 'supplierDms',
+			`changedModelId` = OLD.dmsFk,
+			`userFk` = account.myUser_getId();
+END */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`tag_beforeInsert`
 	BEFORE INSERT ON `tag`
 	FOR EACH ROW
@@ -8709,7 +8935,6 @@ DELIMITER ;;
 	FOR EACH ROW
 BEGIN
 	DECLARE vNewTime TIME;
-	DECLARE vHasTicketRefund BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
 
@@ -8769,15 +8994,6 @@ BEGIN
 
 		CALL vn.routeUpdateM3(NEW.routeFk);
 	END IF;
-
-	SELECT COUNT(*) INTO vHasTicketRefund 
-		FROM ticketRefund 
-		WHERE originalTicketFk = NEW.id 
-			OR refundTicketFk = NEW.id;
-	
-	IF vHasTicketRefund AND NEW.clientFk <> OLD.clientFk THEN
-		CALL util.throw('The ticket has a refund associated');
-	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -9806,17 +10022,11 @@ DELIMITER ;;
 	BEFORE UPDATE ON `travel`
 	FOR EACH ROW
 BEGIN
+	DECLARE vHasAnyInvoiceBooked BOOL;
+
 	SET NEW.editorFk = account.myUser_getId();
-/*
-	IF ((NOT NEW.shipped <=> OLD.shipped )
-		OR (NOT NEW.landed <=> OLD.landed )
-		OR (NOT NEW.warehouseInFk <=> OLD.warehouseInFk )
-		OR (NOT NEW.warehouseOutFk <=> OLD.warehouseOutFk ))
-		AND (OLD.totalEntries AND OLD.landed < CURDATE()) THEN
-		CALL util.throw("Cannot past travels with entries");
-	END IF;
-*/
-	IF NOT (NEW.landed <=> OLD.landed)
+
+	IF NOT (NEW.landed <=> OLD.landed) 
 	OR NOT (NEW.shipped <=> OLD.shipped) THEN
 		CALL travel_checkDates(NEW.shipped, NEW.landed);
 	END IF;
@@ -9828,6 +10038,19 @@ BEGIN
 	IF NOT (NEW.warehouseInFk <=> OLD.warehouseInFk) THEN
 		CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	END IF;
+
+	IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
+		SELECT COUNT(*) INTO vHasAnyInvoiceBooked 
+			FROM travel t
+				JOIN entry e ON e.travelFk = t.id 
+				JOIN invoiceIn ii ON ii.id = e.invoiceInFk 
+			WHERE t.id = NEW.id
+				AND ii.isBooked; 
+				
+		IF vHasAnyInvoiceBooked THEN
+			CALL util.throw('The travel has entries with booked invoices');
+		END IF;
+	END IF;	
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -9854,6 +10077,19 @@ BEGIN
 			SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
 			WHERE travelFk = NEW.id;
 	END IF;
+
+	IF NOT (NEW.agencyModeFk <=> OLD.agencyModeFk) THEN
+		IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN
+			CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+				SELECT b.id
+					FROM entry e 
+						JOIN buy b ON b.entryFk = e.id
+						JOIN item i ON i.id = b.itemFk
+					WHERE e.travelFk = NEW.id;
+		
+			CALL buy_checkItem();
+		END IF;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -10019,30 +10255,6 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`warehouse_afterUpdate`
-	AFTER UPDATE ON `warehouse`
-	FOR EACH ROW
-BEGIN
-	IF NEW.isFeedStock IS TRUE AND OLD.isFeedStock IS FALSE THEN
-		INSERT IGNORE INTO warehouseAlias(`name`) VALUES(NEW.`name`);
-		INSERT IGNORE INTO warehouseJoined(warehouseFk, warehouseAliasFk)
-			VALUES(NEW.id,LAST_INSERT_ID());
-	END IF;
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`worker_beforeInsert`
 	BEFORE INSERT ON `worker`
 	FOR EACH ROW
@@ -10704,170 +10916,10 @@ DELIMITER ;
 --
 
 USE `vn2008`;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`Conteo_afterInsert`
-	AFTER INSERT ON `Conteo`
-	FOR EACH ROW
-BEGIN
-	DECLARE intTravel INTEGER;
-	SELECT t.id INTO intTravel FROM Compres c JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada 
-			JOIN travel t ON t.id = e.travel_id 
-				WHERE landing = util.VN_CURDATE() AND c.Id_Article = NEW.Id_Article AND warehouse_id = NEW.warehouse_id AND received <> TRUE LIMIT 1;
-	IF (intTravel) then
-		UPDATE travel SET received = TRUE WHERE id = intTravel;
-	END IF;
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`account_conciliacion_beforeInsert`
-	BEFORE INSERT ON `account_conciliacion`
-	FOR EACH ROW
-set new.id_calculated = replace(
-						replace(
-							replace(
-								replace(
-										concat(new.Id_Proveedores_account,new.Fechaoperacion,new.importe,new.Concepto,new.DebeHaber)
-                                        ,' ','')
-									,":",'')
-								,'-','')
-							,'.','') */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`agency_hour_beforeInsert`
-	BEFORE INSERT ON `agency_hour`
-	FOR EACH ROW
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-	IF NEW.week_day IS NULL AND NEW.province_id IS NULL AND NEW.subtract_day = 0 AND NEW.max_hour = 0 THEN
-		CALL util.throw ('FILL_MORE_FIELDS');
-	END IF;
-    
-    SELECT COUNT(*) INTO vAlreadyExists
-	FROM vn2008.agency_hour
-	 WHERE NEW.week_day <=> week_day AND NEW.province_id <=> province_id 
-		AND NEW.warehouse_id <=> warehouse_id AND NEW.max_hour <=> max_hour
-        AND NEW.agency_id <=> agency_id;
-        
-	IF vAlreadyExists > 1 THEN
-		CALL util.throw('ALREADY_EXISTS');
-    END IF;
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`agency_hour_afterUpdate`
-	AFTER UPDATE ON `agency_hour`
-	FOR EACH ROW
-BEGIN
-DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-    SELECT COUNT(*) INTO vAlreadyExists
-	FROM vn2008.agency_hour
-	 WHERE NEW.week_day <=> week_day AND NEW.province_id <=> province_id 
-		AND NEW.warehouse_id <=> warehouse_id AND NEW.max_hour <=> max_hour
-        AND NEW.agency_id <=> agency_id;
-        
-	IF vAlreadyExists > 1 THEN
-		CALL util.throw('ALREADY_EXISTS');
-    END IF;
-END */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`awb_recibida_afterDelete`
-	AFTER DELETE ON `awb_recibida`
-	FOR EACH ROW
-IF (SELECT COUNT(*) FROM recibida_iva where recibida_id = OLD.recibida_id) = 0
-	AND
-	(SELECT COUNT(*) FROM recibida_vencimiento where recibida_id = OLD.recibida_id) = 0
-	AND 
-	(SELECT contabilizada FROM recibida WHERE id = OLD.recibida_id) = 0
-THEN
-	DELETE FROM recibida WHERE id = OLD.recibida_id;
-END IF */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn2008`.`movement_label_afterUpdate`
-	AFTER UPDATE ON `movement_label`
-	FOR EACH ROW
-IF NEW.stem >= (SELECT Cantidad FROM Movimientos WHERE Id_Movimiento = NEW.Id_Movimiento) THEN
-	UPDATE Movimientos SET OK = 1 WHERE Id_Movimiento = NEW.Id_Movimiento;
-END IF */;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-02-15 10:21:45
+-- Dump completed on 2024-03-07  9:31:50

db/dump/fixtures.after.sql

@@ -7,8 +7,8 @@ SET foreign_key_checks = 0;
 
 -- XXX: vn-database
 
-INSERT INTO util.config (environment, mockTime, mockUtcTime, mockEnabled)
-    VALUES ('local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
+INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled)
+    VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
 /* #5483
 INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk)
     VALUES(1, NULL, 1, 300, 1);
@@ -70,7 +70,7 @@ UPDATE vn.supplier
 
 UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');
 
-INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`) 
+INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     VALUES
     ('Agencia', '1', '1', '1'),
     ('Otra agencia ', '1', '0', '0');
@@ -137,9 +137,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
 INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded)
     VALUES (1, 24, 'Ranged weapon longbow 2m', 1.00, NULL, 8.07, 0, 0.00, 0, 0, 0, '2022-07-06 00:00:00', 0);
 */
-INSERT INTO vn2008.zones (zone_id,name,printingOrder)
-    VALUES (1,'zone Test',1);
-
 -- XXX: lab
 
 INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)

db/routines/bi/procedures/rutasAnalyze.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`rutasAnalyze`(
-	vYear INT,
-	vMonth INT
+	vDatedFrom DATE,
+	vDatedTo DATE
 )
 BEGIN
 /**
@@ -9,8 +9,7 @@ BEGIN
  * y lo almacena en la tabla bi.rutasBoard
  */
 	DELETE FROM rutasBoard
-		WHERE YEAR(Fecha) = vYear
-			AND MONTH(Fecha) = vMonth;
+		WHERE Fecha BETWEEN vDatedFrom AND vDatedTo;
 
 	-- Rellenamos la tabla con los datos de las rutas VOLUMETRICAS, especialmente con los bultos "virtuales"
 	INSERT INTO rutasBoard(
@@ -27,7 +26,7 @@ BEGIN
 				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
 				JOIN vn.saleVolume sv ON sv.ticketFk = t.id
 				JOIN vn.expeditionBoxVol ebv ON ebv.code = 'transportBox'
-			WHERE YEAR(r.created) = vYear AND MONTH(r.created) = vMonth
+			WHERE r.created BETWEEN vDatedFrom AND vDatedTo
 				AND z.isVolumetric
 			GROUP BY r.id;
 		
@@ -44,8 +43,7 @@ BEGIN
 			FROM vn.route r
 				JOIN vn.ticket t ON t.routeFk = r.id
 				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
-			WHERE YEAR(r.created) = vYear
-				AND MONTH(r.created) = vMonth
+			WHERE r.created BETWEEN vDatedFrom AND vDatedTo
 				AND NOT z.isVolumetric
 			GROUP BY r.id
 		ON DUPLICATE KEY UPDATE Bultos = Bultos + VALUES(Bultos);
@@ -56,15 +54,13 @@ BEGIN
 				SELECT t.routeFk,
 						SUM(s.quantity * sc.value) totalPractice
 					FROM vn.route r
-						JOIN vn.`time` tm ON tm.dated = r.created
 						JOIN vn.ticket t ON t.routeFk = r.id
 						JOIN vn.sale s ON s.ticketFk = t.id
 						JOIN vn.saleComponent sc ON sc.saleFk = s.id
 						JOIN vn.component c ON c.id = sc.componentFk
 						JOIN vn.componentType ct ON ct.id = c.typeFk
 					WHERE ct.code = 'FREIGHT'
-						AND tm.`year` = vYear 
-						AND tm.`month` = vMonth
+						AND r.created BETWEEN vDatedFrom AND vDatedTo
 					GROUP BY r.id
 			 ) sub ON sub.routeFk = r.Id_Ruta
 		SET r.practico = IFNULL(sub.totalPractice / r.Bultos, 0);
@@ -76,14 +72,12 @@ BEGIN
 					SUM(t.zonePrice/ ebv.ratio) / COUNT(*) averageTheoreticalVolume
 				FROM vn.ticket t
 					JOIN vn.route r ON r.id = t.routeFk
-					JOIN vn.`time` tm ON tm.dated = r.created
 					JOIN vn.expedition e ON e.ticketFk = t.id
 					JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
 					JOIN vn.address ad ON ad.id = t.addressFk
 					JOIN vn.client c ON c.id = ad.clientFk
 					LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
-				WHERE tm.`year` = vYear 
-					AND tm.`month` = vMonth
+				WHERE r.created BETWEEN vDatedFrom AND vDatedTo
 					AND NOT z.isVolumetric
 				GROUP BY t.routeFk
 			) sub ON r.Id_Ruta = sub.routeFk
@@ -96,12 +90,10 @@ BEGIN
 					SUM(freight) averageTheoreticalVolume
 				FROM vn.ticket t
 					JOIN vn.route r ON r.id = t.routeFk
-					JOIN vn.`time` tm ON tm.dated = r.created
 					JOIN vn.saleVolume sf ON sf.ticketFk = t.id
 					JOIN vn.client c ON c.id = t.clientFk
 					JOIN vn.`zone` z ON z.id = t.zoneFk
-				WHERE tm.`year` = vYear 
-					AND tm.`month` = vMonth
+				WHERE r.created BETWEEN vDatedFrom AND vDatedTo
 					AND z.isVolumetric
 				GROUP BY t.routeFk
 			) sub ON r.Id_Ruta = sub.routeFk
@@ -114,11 +106,9 @@ BEGIN
 					SUM(g.amount) greuge
 				FROM vn.ticket t
 					JOIN vn.route r ON r.id = t.routeFk
-					JOIN vn.`time` tm ON tm.dated = r.created
 					JOIN vn.greuge g ON g.ticketFk = t.id
 					JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
-				WHERE tm.`year` = vYear 
-					AND tm.`month` = vMonth
+				WHERE r.created BETWEEN vDatedFrom AND vDatedTo
 					AND gt.code = 'freightDifference'
 				GROUP BY t.routeFk
 			) sub ON r.Id_Ruta = sub.routeFk

db/routines/bi/procedures/rutasAnalyze_launcher.sql

@@ -4,6 +4,6 @@ BEGIN
 /**
  * Call rutasAnalyze
  */
-    CALL rutasAnalyze(YEAR(util.VN_CURDATE()), MONTH(util.VN_CURDATE()));
+	CALL rutasAnalyze(util.VN_CURDATE() - INTERVAL 30 DAY , util.VN_CURDATE());
 END$$
 DELIMITER ;

db/routines/bi/views/v_clientes_jerarquia.sql

@@ -1,21 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bi`.`v_clientes_jerarquia`
-AS SELECT `c`.`id_cliente` AS `Id_Cliente`,
-	`c`.`cliente` AS `Cliente`,
-	`t`.`CodigoTrabajador` AS `Comercial`,
-	`tj`.`CodigoTrabajador` AS `Jefe`
-FROM (
-		(
-			(
-				`vn2008`.`Clientes` `c`
-				JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `c`.`Id_Trabajador`)
-			)
-			JOIN `vn2008`.`jerarquia` ON(
-				`vn2008`.`jerarquia`.`worker_id` = `c`.`Id_Trabajador`
-			)
-		)
-		JOIN `vn2008`.`Trabajadores` `tj` ON(
-			`tj`.`Id_Trabajador` = `vn2008`.`jerarquia`.`boss_id`
-		)
-	)

db/routines/bs/procedures/manaCustomerUpdate.sql

@@ -22,7 +22,7 @@ BEGIN
 		FROM vn.component WHERE code = 'manaClaim';
 	
 	SELECT id INTO vManaBankId 
-		FROM vn.bank WHERE code = 'mana';
+		FROM vn.accounting WHERE code = 'mana';
 	
 	SELECT id INTO vManaGreugeTypeId 
 		FROM vn.greugeType WHERE code = 'mana';

db/routines/bs/procedures/ventas_contables_add.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT)
 BEGIN
-	
+
 	/**
 	 * Reemplaza las ventas contables del último año.
 	 * Es el origen de datos para el balance de Entradas
@@ -13,8 +13,8 @@ BEGIN
 
 	DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
 
-	DELETE FROM bs.ventas_contables 
-		WHERE year = vYear 
+	DELETE FROM bs.ventas_contables
+		WHERE year = vYear
 	    	AND month = vMonth;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
@@ -23,9 +23,9 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT Id_Ticket
 			FROM vn2008.Tickets t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
+				JOIN vn.invoiceOut io ON io.`ref` = t.Factura
 			WHERE year(io.issued) = vYear
-				AND month(io.issued) = vMonth;   
+				AND month(io.issued) = vMonth;
 
 	INSERT INTO bs.ventas_contables(year
 								  , month
@@ -35,7 +35,7 @@ BEGIN
 								  , tipo_id
 								  , empresa_id
 								  , gasto)
-	
+
 		SELECT  vYear
 			  , vMonth
 			  , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
@@ -47,13 +47,13 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , 7000000000 
+			  , a.expenseFk
 				+ IF(e.empresa_grupo = e2.empresa_grupo
 									  ,1
 									  ,IF(e2.empresa_grupo,2,0)
-									  ) * 1000000  
-				+ tp.reino_id * 10000 as Gasto
-			FROM vn2008.Movimientos m 
+									  ) * 100000
+				+ tp.reino_id * 1000 as Gasto
+			FROM vn2008.Movimientos m
 				JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
 				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
 				JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
@@ -67,7 +67,7 @@ BEGIN
 				AND m.Descuento <> 100
 				AND a.tipo_id != TIPO_PATRIMONIAL
 			GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
-		
+
 	INSERT INTO bs.ventas_contables(year
 								  , month
 								  , venta
@@ -86,17 +86,17 @@ BEGIN
 				  ) as grupo
 			  , NULL
 			  , NULL
-			  , t.companyFk 
+			  , t.companyFk
 			  , 7050000000
-			FROM vn.ticketService ts 
+			FROM vn.ticketService ts
 				JOIN vn.ticket t ON ts.ticketFk = t.id
-				JOIN vn.address a on a.id = t.addressFk 
-				JOIN vn.client cl on cl.id = a.clientFk 
+				JOIN vn.address a on a.id = t.addressFk
+				JOIN vn.client cl on cl.id = a.clientFk
 				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
-				JOIN vn.company c on c.id = t.companyFk 
+				JOIN vn.company c on c.id = t.companyFk
 				LEFT JOIN vn.company c2 on c2.clientFk = cl.id
-			GROUP BY grupo, t.companyFk ;	
-		
+			GROUP BY grupo, t.companyFk ;
+
 	DROP TEMPORARY TABLE tmp.ticket_list;
 END$$
 DELIMITER ;

db/routines/bs/procedures/waste_addSales.sql

@@ -19,7 +19,7 @@ BEGIN
 				itemFk,
 				itemTypeFk,
 				floor(sum(value)) as total, 
-				floor(sum(IF(clientTypeFk = 'loses', value, 0))) as mermas
+				floor(sum(IF(typeFk = 'loses', value, 0))) as mermas
 			FROM vn.saleValue 
 			where year = vYear and week = vWeek
 			

db/routines/cache/procedures/clean.sql

@@ -1,10 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`()
 BEGIN
-	DECLARE vDateShort DATETIME;
-
-	SET vDateShort = TIMESTAMPADD(MONTH, -1, util.VN_CURDATE());
-
-	DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
+	DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
 END$$
 DELIMITER ;

db/routines/hedera/procedures/tpvTransaction_undo.sql

@@ -54,7 +54,7 @@ p: BEGIN
 		 FROM vn.`client` WHERE id = vCustomer;
 
 	SELECT account INTO vAccount
-		FROM vn.bank WHERE id = vBank;
+		FROM vn.accounting WHERE id = vBank;
 
 	DELETE FROM vn.XDiario
 		WHERE SUBCTA = vSubaccount

db/routines/sage/procedures/accountingMovements_add.sql

@@ -253,9 +253,9 @@ BEGIN
 									LIMIT 10000000000000000000
 								) sub GROUP BY ASIEN
 						 )sub2 ON sub2.ASIEN = x.ASIEN
-				LEFT JOIN ( SELECT DISTINCT(account),cu.code
-								FROM vn.bank b
-									JOIN vn.currency cu ON cu.id = b.currencyFk
+				LEFT JOIN ( SELECT DISTINCT(a.account),cu.code
+								FROM vn.accounting a
+									JOIN vn.currency cu ON cu.id = a.currencyFk
 								WHERE cu.code <> 'EUR' -- no se informa cuando la divisa en EUR
 							)sub3 ON sub3.account = x.SUBCTA
 			WHERE x.enlazadoSage = FALSE

db/routines/sage/procedures/invoiceIn_add.sql

@@ -3,10 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vI
 BEGIN
 /**
  * Traslada la info de contabilidad relacionada con las facturas recibidas
- * 
+ *
  * @vInvoiceInFk Factura recibida
  * @vXDiarioFk Id tabla XDiario
- */	
+ */
+    DECLARE vInvoiceInOriginalFk INT;
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBase DOUBLE;
 	DECLARE vVat DOUBLE;
@@ -23,25 +24,25 @@ BEGIN
 	DECLARE vInvoiceTypeInformative VARCHAR(1);
 	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
 
-	DECLARE vCursor CURSOR FOR 
+	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
 				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
 				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto 
+				tt.ClaveOperacionDefecto
 			FROM vn.invoiceIn i
 				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
 				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
 				JOIN taxType tty ON tty.id = t.CodigoIva
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk 
+			WHERE i.id = vInvoiceInFk
 				AND d.id IS NULL;
-	
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	
+
 	DELETE FROM movContaIVA
 		WHERE id = vXDiarioFk;
 
@@ -64,22 +65,22 @@ BEGIN
 				vTaxCode,
 				vIsIntracommunity,
 				vOperationCode;
-		
-		IF vDone THEN 
+
+		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		SET vTransactionCodeOld = vTransactionCode; 
-		SET vTaxCodeOld = vTaxCode; 
+		SET vTransactionCodeOld = vTransactionCode;
+		SET vTaxCodeOld = vTaxCode;
 
-		IF vOperationCode IS NOT NULL THEN 
+		IF vOperationCode IS NOT NULL THEN
 			UPDATE movContaIVA
 				SET ClaveOperacionFactura = vOperationCode
 				WHERE id = vXDiarioFk;
 		END IF;
-		
+
 		SET vCounter = vCounter + 1;
-		CASE vCounter 
+		CASE vCounter
 			WHEN 1 THEN
 				 UPDATE movContaIVA
 					SET BaseIva1 = vBase,
@@ -115,31 +116,31 @@ BEGIN
 					WHERE id = vXDiarioFk;
 			ELSE
 				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE; 
+		END CASE;
 
 		IF vIsIntracommunity THEN
 			UPDATE movContaIVA
 				SET Intracomunitaria = TRUE
 				WHERE id = vXDiarioFk;
 		END IF;
-	
-		SET vTransactionCodeOld = vTransactionCode; 
-		SET vTaxCodeOld = vTaxCode; 		
-		
+
+		SET vTransactionCodeOld = vTransactionCode;
+		SET vTaxCodeOld = vTaxCode;
+
 	END LOOP;
 
 	CLOSE vCursor;
 
 	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
 		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN 
+			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
 				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
 		WHERE d.ASIEN = (
 			SELECT ASIEN
-				FROM vn.XDiario 
+				FROM vn.XDiario
 				WHERE id = vXDiarioFk)
 		LIMIT 1;
- 
+
 	UPDATE movContaIVA mci
 			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
 			JOIN vn.XDiario x ON x.id = mci.id
@@ -151,13 +152,13 @@ BEGIN
 			mci.Serie = ii.serial,
 			mci.Factura = ii.id,
 			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) + 
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) + 
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) + 
+			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
+								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
+								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
 								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id, 
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative), 
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)), 
+			mci.TipoFactura = IF(id.id,
+				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
+				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
 			mci.CodigoCuentaFactura = x.SUBCTA,
 			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
 			mci.Nombre = s.name,
@@ -185,7 +186,7 @@ BEGIN
 			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
 					FROM vn.XDiario x1
 						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0 
+					WHERE x2.BASEEURO <> 0
 						AND x1.id = vXDiarioFk
 				)sub
 			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
@@ -193,10 +194,41 @@ BEGIN
 			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
 			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
 			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1 
-		WHERE mci.id = vXDiarioFk 
+			mci.ImporteRetencion = iit.taxableBase * - 1
+		WHERE mci.id = vXDiarioFk
 			AND e.name = 'Retenciones'
 			AND id.id IS NULL;
 
+	SELECT correctedFk INTO vInvoiceInOriginalFk
+		FROM vn.invoiceInCorrection
+		WHERE correctingFk = vInvoiceInFk;
+
+	IF vInvoiceInOriginalFk THEN 
+
+		UPDATE movContaIVA mci
+				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
+				JOIN (SELECT issued,
+							SUM(sub.taxableBase) taxableBase, 
+							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
+						FROM(SELECT issued,
+									SUM(iit.taxableBase) taxableBase, 
+									ti.PorcentajeIva
+								FROM vn.invoiceIn i 
+									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
+									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
+								WHERE i.id = vInvoiceInOriginalFk
+								GROUP BY ti.CodigoIva)sub
+					)invoiceInOriginal
+				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
+			SET mci.TipoRectificativa = iir.refundCategoryFk,
+				mci.ClaseAbonoRectificativas = iir.refundType, 
+				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
+				mci.FechaOperacion = invoiceInOriginal.issued,
+				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
+				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
+				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
+			WHERE mci.id = vXDiarioFk;
+
+	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/sage/procedures/pgc_add.sql

@@ -20,12 +20,12 @@ BEGIN
 					FROM vn.expense e
 					UNION 
 					SELECT company_getCode(vCompanyFk),
-							b.account, 
-							UCASE(b.bank),
+							a.account, 
+							UCASE(a.bank),
 							'' 
-						FROM vn.bank b
-						WHERE b.isActive
-							AND b.`account`
+						FROM vn.accounting a
+						WHERE a.isActive
+							AND a.`account`
 					UNION 
 					SELECT CodigoEmpresa,
 							CodigoCuenta,

db/routines/util/functions/checkPrintableChars.sql

@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`checkPrintableChars`(
+    vString VARCHAR(255)
+)   RETURNS tinyint(1)
+    DETERMINISTIC
+BEGIN
+/**
+ * Validates whether the input string contains only printable characters  
+ * and Spanish special characters (such as ¡, ÿ, etc.).
+ *
+ * @vString string to check
+ */
+    RETURN vString REGEXP '^[ -~¡-ÿ]*$';
+END$$
+DELIMITER ;

db/routines/vn/events/sale_checkWithoutComponents.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`sale_checkWithoutComponents`
-	ON SCHEDULE EVERY 10 MINUTE
-		STARTS '2020-05-04 11:56:23.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO call sale_checkNoComponents(DATE_ADD(util.VN_NOW(), INTERVAL -10 MINUTE),DATE_ADD(util.VN_NOW(), INTERVAL -1 MINUTE))$$
-DELIMITER ;

db/routines/vn/functions/isPalletHomogeneus.sql

@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`isPalletHomogeneus`(vExpedition INT)
-	RETURNS tinyint(1)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	DECLARE vScanId INT;
-	DECLARE vDistinctRoutesInThePallet INT;
-
-	SELECT scan_id INTO vScanId
-		FROM vn2008.scan_line
-		WHERE code = vExpedition
-		LIMIT 1;
-
-		SELECT COUNT(*) INTO vDistinctRoutesInThePallet
-		FROM (
-			SELECT DISTINCT t.Id_Ruta
-			FROM vn2008.scan_line sl
-				JOIN expedition e ON e.id = sl.code
-				JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticketFk
-			WHERE sl.scan_id = vScanId
-				AND t.Id_Ruta
-		) t1;
-			
-	RETURN vDistinctRoutesInThePallet = 1;
-END$$
-DELIMITER ;

db/routines/vn/functions/till_new.sql

@@ -34,7 +34,7 @@ BEGIN
 	-- Inserta los asientos contables
 
 	SELECT account INTO vAccount
-		FROM bank WHERE id = vBank;
+		FROM accounting WHERE id = vBank;
 
 	SELECT accountingAccount INTO vSubaccount
 		FROM `client` WHERE id = vClient;

db/routines/vn/functions/travel_hasUniqueAwb.sql

@@ -0,0 +1,28 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`travel_hasUniqueAwb`(
+	vSelf INT
+)
+	RETURNS BOOL
+	READS SQL DATA
+BEGIN
+/**
+ * Comprueba que el travel pasado tiene un AWB lógico, 
+ * no se pueden tener varios AWB asociados al mismo DUA
+ *
+ * @param vSelf Id del travel
+ */
+	DECLARE vHasUniqueAwb BOOL DEFAULT TRUE;
+
+	SELECT NOT COUNT(t2.awbFk) INTO vHasUniqueAwb
+		FROM entry e 
+			JOIN travel t ON t.id = e.travelFk 
+			JOIN duaEntry de ON de.entryFk = e.id 
+			JOIN duaEntry de2 ON de2.duaFk = de.duaFk 
+			JOIN entry e2 ON e2.id = de2.entryFk 
+			JOIN travel t2 ON t2.id = e2.travelFk 
+		WHERE t.id = vSelf
+			AND t2.awbFk <> t.awbFk;
+
+	RETURN vHasUniqueAwb;
+END$$
+DELIMITER ;

db/routines/vn/procedures/absoluteInventoryHistory.sql

@@ -0,0 +1,102 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
+	vItemFk INT,
+	vWarehouseFk INT,
+	vDate DATETIME
+)
+BEGIN
+/**
+* Calcula y proporciona un historial de inventario absoluto
+* para un artículo específico en un almacén dado
+* hasta una fecha determinada.
+*
+* @param vItemFk Id de artículo
+* @param vWarehouseFk Id de almacén
+* @param vDate Fecha
+*/
+	DECLARE vCalculatedInventory INT;
+	DECLARE vToday DATETIME DEFAULT util.VN_CURDATE();
+	DECLARE vStartDate DATE DEFAULT '2001-01-01';
+
+	CREATE OR REPLACE TEMPORARY TABLE tHistoricalPast
+		ENGINE = MEMORY
+		SELECT *
+			FROM (
+				SELECT tr.landed `date`,
+						b.quantity input,
+						NULL `output`,
+						tr.isReceived ok,
+						s.name alias,
+						e.invoiceNumber reference,
+						e.id id,
+						tr.isDelivered f5
+					FROM buy b
+						JOIN `entry` e ON e.id = b.entryFk
+						JOIN travel tr ON tr.id = e.travelFk
+						JOIN supplier s ON s.id = e.supplierFk
+					WHERE tr.landed >= vStartDate
+						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
+						AND vWarehouseFk IN (tr.warehouseInFk, 0)
+						AND b.itemFk = vItemFk
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT tr.shipped,
+						NULL,
+						b.quantity,
+						tr.isDelivered,
+						s.name,
+						e.invoiceNumber,
+						e.id,
+						tr.isDelivered
+					FROM buy b
+						JOIN `entry` e ON e.id = b.entryFk
+						JOIN travel tr ON tr.id = e.travelFk
+						JOIN supplier s ON s.id = e.supplierFk
+					WHERE tr.shipped >= vStartDate
+						AND vWarehouseFk = tr.warehouseOutFk
+						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
+						AND b.itemFk = vItemFk
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT t.shipped,
+						NULL,
+						m.quantity,
+						(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
+						t.nickname,
+						t.refFk,
+						t.id,
+						t.isPrinted
+					FROM sale m
+						JOIN ticket t ON t.id = m.ticketFk
+						JOIN client c ON c.id = t.clientFk
+					WHERE t.shipped >= vStartDate
+						AND m.itemFk = vItemFk
+						AND vWarehouseFk IN (t.warehouseFk, 0)
+			) t1
+			ORDER BY `date`, input DESC, ok DESC;
+
+	SELECT SUM(input) - SUM(`output`) INTO vCalculatedInventory
+		FROM tHistoricalPast
+			WHERE `date` < vDate;
+
+	SELECT p1.*, NULL v_virtual 
+		FROM (
+			SELECT vDate `date`,
+				vCalculatedInventory input,
+				NULL `output`,
+				1 ok,
+				'Inventario calculado' alias,
+				'' reference,
+				0 id,
+				1 f5
+			UNION ALL
+			SELECT *
+				FROM tHistoricalPast
+					WHERE `date` >= vDate
+			) p1;
+	
+	DROP TEMPORARY TABLE tHistoricalPast;
+END$$
+DELIMITER ;

db/routines/vn/procedures/balanceNestTree_addChild.sql

@@ -0,0 +1,52 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`(
+	vSelf INT,
+	vName VARCHAR(45)
+)
+BEGIN
+/**
+ * Agrega un nuevo nodo hijo a un nodo existente dentro de la estructura
+ * de árbol de vn.balanceNestTree.
+ *
+ * @param vSelf Identificador del nodo
+ * @param vName Nombre del nuevo nodo hijo
+ */
+	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
+	DECLARE vLeft INT;
+
+	CREATE OR REPLACE TEMPORARY TABLE tAux
+		SELECT 0 lft;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux 
+			SET lft = (SELECT lft 
+				FROM ', vTable, 
+				' WHERE id = ?)')
+		USING vSelf;
+	
+	SELECT lft INTO vLeft FROM tAux;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable, ' 
+			SET rgt = rgt + 2 
+			WHERE rgt > ? 
+			ORDER BY rgt DESC')
+		USING vLeft;
+	
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable, ' 
+			SET lft = lft + 2
+			WHERE lft > ? 
+			ORDER BY lft DESC')
+		USING vLeft;
+	
+	EXECUTE IMMEDIATE CONCAT(
+		'INSERT INTO ', vTable, ' (name, lft, rgt)
+			VALUES(?, ? + 1, ? + 2)')
+		USING vName,
+			vLeft,
+			vLeft;
+
+	DROP TEMPORARY TABLE tAux;
+END$$
+DELIMITER ;

db/routines/vn/procedures/balanceNestTree_delete.sql

@@ -0,0 +1,53 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_delete`(
+    vSelf INT
+)
+BEGIN
+/**
+ * Elimina un nodo dentro de la estructura de árbol de vn.balanceNestTree.
+ *
+ * @param vSelf Identificador del nodo
+ */
+	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
+	DECLARE vRight INT;
+	DECLARE vLeft INT;
+	DECLARE vWidth INT;
+
+	CREATE OR REPLACE TEMPORARY TABLE tAux
+		SELECT 0 rgt, 0 lft, 0 wdt;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a 
+				JOIN ', vTable, ' t 
+			SET a.rgt = t.rgt, 
+				a.lft = t.lft,
+				a.wdt = t.rgt - t.lft + 1 
+			WHERE t.id = ?')
+		USING vSelf;
+
+	SELECT rgt, lft, wdt 
+		INTO vRight, vLeft, vWidth 
+		FROM tAux;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'DELETE FROM ', vTable, 
+			' WHERE lft BETWEEN ? AND ?')
+		USING vLeft, vRight;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable, 
+			' SET rgt = rgt - ? 
+			WHERE rgt > ? 
+			ORDER BY rgt')
+		USING vWidth,vRight;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable, 
+			' SET lft = lft - ?
+			WHERE lft > ? 
+			ORDER BY lft')
+		USING vWidth, vRight;
+
+	DROP TEMPORARY TABLE tAux;
+END$$
+DELIMITER ;

db/routines/vn/procedures/balanceNestTree_move.sql

@@ -0,0 +1,117 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`(
+	vSelf INT,
+	vFather INT
+)
+BEGIN
+/**
+ * Mueve un nodo dentro de la estructura de árbol de vn.balanceNestTree.
+ *
+ * @param vSelf Identificador del nodo
+ * @param vFather Identificador del nuevo padre del nodo
+ */
+	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
+	DECLARE vRight INT;
+	DECLARE vLeft INT;
+	DECLARE vWidth INT;
+	DECLARE vFatherRight INT;
+	DECLARE vFatherLeft INT;
+	DECLARE vGap INT;
+
+	CREATE OR REPLACE TEMPORARY TABLE tAux
+		SELECT 0 rgt, 0 lft, 0 wdt, 0 frg, 0 flf;
+
+	-- Averiguamos el ancho de la rama
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a
+				JOIN ', vTable, ' t 
+			SET a.wdt = t.rgt - t.lft + 1
+			WHERE t.id = ?')
+		USING vSelf;
+
+	-- Averiguamos la posicion del nuevo padre
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a
+				JOIN ', vTable, ' t 
+			SET a.frg = t.rgt,
+				a.flf = t.lft
+			WHERE t.id = ?')
+		USING vFather;
+
+	SELECT wdt, frg, flf
+		INTO vWidth, vFatherRight, vFatherLeft 
+		FROM tAux;
+
+	-- 1º Incrementamos los valores de todos los nodos a la derecha
+	-- del punto de inserción (vFatherRight) , para hacer sitio
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET rgt = rgt + ?
+			WHERE rgt >= ? 
+			ORDER BY rgt DESC')
+		USING vWidth,
+			vFatherRight;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET lft = lft + ?
+			WHERE lft >= ? 
+			ORDER BY lft DESC')
+		USING vWidth,
+			vFatherRight;
+
+	-- Es preciso recalcular los valores del nodo en el
+	-- caso de que estuviera a la derecha del nuevo padre
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a
+				JOIN ', vTable, ' t 
+			SET a.rgt = t.rgt, 
+				a.lft = t.lft 
+			WHERE t.id = ?')
+		USING vSelf;
+
+	SELECT lft, rgt, frg - lft
+		INTO vLeft, vRight, vGap 
+		FROM tAux;
+
+	-- 2º Incrementamos el valor de todos los nodos a
+	-- trasladar hasta alcanzar su nueva posicion
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET lft = lft + ?
+			WHERE lft BETWEEN ? AND ?
+			ORDER BY lft DESC')
+		USING vGap,
+			vLeft,
+			vRight;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET rgt = rgt + ?
+			WHERE rgt BETWEEN ? AND ?
+			ORDER BY rgt DESC')
+		USING vGap,
+			vLeft,
+			vRight;
+
+	-- 3º Restaremos a todos los nodos resultantes, a la derecha
+	-- de la posicion arrancada el ancho de la rama escindida
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET lft = lft - ?
+			WHERE lft > ?
+			ORDER BY lft')
+		USING vWidth,
+			vLeft;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET rgt = rgt - ?
+			WHERE rgt > ?
+			ORDER BY rgt')
+		USING vWidth,
+			vRight;
+
+	DROP TEMPORARY TABLE tAux;
+END$$
+DELIMITER ;

db/routines/vn/procedures/bankPolicy_notifyExpired.sql

@@ -10,13 +10,11 @@ BEGIN
 	INSERT INTO mail (receiver,replyTo,subject,body)
 		SELECT 'administracion@verdnatura.es' receiver,
 				'noreply@verdnatura.es' replyTo,
-				CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') subject,
-				CONCAT('El seguro de la poliza ',b.id,' ',b.bank,' ha finalizado.') body
-			FROM  vn.bankPolicy bp 
-				LEFT JOIN vn.supplier s 
-					ON s.id = bp.supplierFk
-				LEFT JOIN vn.bank b
-					ON b.id = bp.bankFk
+				CONCAT('El seguro de la poliza ',a.id,' ',a.bank,' ha finalizado.') subject,
+				CONCAT('El seguro de la poliza ',a.id,' ',a.bank,' ha finalizado.') body
+			FROM  bankPolicy bp 
+				LEFT JOIN supplier s ON s.id = bp.supplierFk
+				LEFT JOIN accounting a ON a.id = bp.accountingFk
 		    WHERE bp.insuranceExpired = util.VN_CURDATE();
 END$$
 DELIMITER ;

db/routines/vn/procedures/buyUltimateFromInterval.sql

@@ -39,11 +39,11 @@ BEGIN
 					WHERE t.landed BETWEEN vStarted AND vEnded
 							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 							AND b.price2 > 0
-							AND b.quantity > 0
 					ORDER BY NOT b.isIgnored DESC, t.landed DESC, b.id DESC
 					LIMIT 10000000000000000000) sub
 			GROUP BY itemFk, warehouseFk;
 
+
 	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
 		SELECT
 				b.itemFk,

db/routines/vn/procedures/clean.sql

@@ -1,46 +1,42 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
 BEGIN
-	DECLARE vDateShort DATETIME;
-	DECLARE vOneYearAgo DATE;
-	DECLARE vFourYearsAgo DATE;
-	DECLARE vFiveYearsAgo DATE;
-	DECLARE v18Month DATE;
-	DECLARE v26Month DATE;
-	DECLARE v3Month DATE;
+/**
+ * Purges outdated data to optimize performance.
+ * Exercise caution when executing.
+ */
+	DECLARE v2Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 MONTH;
+	DECLARE v3Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 3 MONTH;
+	DECLARE v18Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 18 MONTH;
+	DECLARE v26Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 26 MONTH;
+	DECLARE v1Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR;
+	DECLARE v2Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 YEAR;
+	DECLARE v4Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 4 YEAR;
+	DECLARE v5Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 5 YEAR;	
 	DECLARE vTrashId VARCHAR(15);
-	DECLARE v2Years DATE;
-	DECLARE v5Years DATE;
+	DECLARE vCompanyBlk INT;
 
-	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
-	SET vOneYearAgo = util.VN_CURDATE() - INTERVAL 1 YEAR;
-	SET vFourYearsAgo = util.VN_CURDATE() - INTERVAL 4 YEAR;
-	SET vFiveYearsAgo = util.VN_CURDATE() - INTERVAL 5 YEAR;
-	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
-	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
-	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
-	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
-	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
-
-	DELETE FROM ticketParking WHERE created < vDateShort;
-	DELETE FROM routesMonitor WHERE dated < vDateShort;
-	DELETE FROM workerTimeControlLog WHERE created < vDateShort;
-	DELETE FROM `message` WHERE sendDate < vDateShort;
-	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
+	DELETE FROM workerActivity WHERE created < v2Years;
+	DELETE FROM ticketParking WHERE created < v2Months;
+	DELETE FROM routesMonitor WHERE dated < v2Months;
+	DELETE FROM workerTimeControlLog WHERE created < v2Months;
+	DELETE FROM `message` WHERE sendDate < v2Months;
+	DELETE FROM messageInbox WHERE sendDate < v2Months;
+	DELETE FROM messageInbox WHERE sendDate < v2Months;
+	DELETE FROM workerTimeControl WHERE timed < v4Years;
 	DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
-	DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
-	DELETE FROM entryLog WHERE creationDate < vDateShort;
-	DELETE IGNORE FROM expedition WHERE created < v26Month;
-	DELETE FROM sms WHERE created < v18Month;
-	DELETE FROM saleTracking WHERE created < vOneYearAgo;
-	DELETE FROM ticketTracking WHERE created < v18Month;
+	DELETE FROM ticketDown WHERE created < util.yesterday();
+	DELETE FROM entryLog WHERE creationDate < v2Months;
+	DELETE IGNORE FROM expedition WHERE created < v26Months;
+	DELETE FROM sms WHERE created < v18Months;
+	DELETE FROM saleTracking WHERE created < v1Years;
+	DELETE FROM ticketTracking WHERE created < v18Months;
 	DELETE tobs FROM ticketObservation tobs 
-		JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
-	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
-	DELETE FROM sharingCart where ended < vDateShort;
-	DELETE FROM sharingClient where ended < vDateShort;
+		JOIN ticket t ON tobs.ticketFk = t.id
+		WHERE t.shipped < v5Years;
+	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < v1Years;
+	DELETE FROM sharingCart where ended < v2Months;
+	DELETE FROM sharingClient where ended < v2Months;
 	DELETE tw.* FROM ticketWeekly tw
 			LEFT JOIN sale s ON s.ticketFk = tw.ticketFk
 			LEFT JOIN ticketRequest tr ON tr.ticketFk = tw.ticketFk
@@ -48,144 +44,182 @@ BEGIN
 		WHERE s.id IS NULL
 			AND tr.id IS NULL
 			AND ts.id IS NULL;
-	DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
-	DELETE FROM message WHERE sendDate < vDateShort;
-	-- Robert ubicacion anterior de trevelLog comentario para debug
-	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
+	DELETE FROM claim WHERE ticketCreated < v4Years;
+	-- Robert ubicacion anterior de travelLog comentario para debug
+	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months;
 	DELETE bm
 		FROM buyMark bm
 			JOIN buy b ON b.id = bm.id
 			JOIN entry e ON e.id = b.entryFk
 			JOIN travel t ON t.id = e.travelFk
-		WHERE t.landed <= vDateShort;
-	DELETE b FROM vn.buy b
-			JOIN vn.entryConfig e ON e.defaultEntry = b.entryFk
-		WHERE b.created < vDateShort;
-	DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
-	DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
-	DELETE FROM vn.itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
-	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < vDateShort;
-	DELETE FROM ticketLog WHERE creationDate <= vFiveYearsAgo;
+		WHERE t.landed <= v2Months;
+	DELETE b FROM buy b
+			JOIN entryConfig e ON e.defaultEntry = b.entryFk
+		WHERE b.created < v2Months;
+	DELETE FROM itemShelvingLog WHERE created < v2Months;
+	DELETE FROM stockBuyed WHERE creationDate < v2Months;
+	DELETE FROM itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
+	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < v2Months;
+	DELETE FROM ticketLog WHERE creationDate <= v5Years;
 	-- Equipos duplicados
 	DELETE w.*
 		FROM workerTeam w
-		JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
+		JOIN (
+			SELECT id, team, workerFk, COUNT(*) - 1 duplicated
 				FROM workerTeam
 				GROUP BY team,workerFk
 				HAVING duplicated
-			 ) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
+		) d ON d.team = w.team
+			AND d.workerFk = w.workerFk
+			AND d.id <> w.id;
 
 	DELETE sc
 		FROM  saleComponent sc
 			JOIN sale s ON s.id=  sc.saleFk
 			JOIN ticket t ON t.id= s.ticketFk
-		WHERE t.shipped < v18Month;
+		WHERE t.shipped < v18Months;
 
 	DELETE c
-		FROM vn.claim c
-			JOIN vn.claimState cs ON cs.id = c.claimStateFk
-		WHERE cs.description = "Anulado" AND
-			c.created < vDateShort;
-	DELETE
-		FROM vn.expeditionTruck
-		WHERE eta < v3Month;
+		FROM claim c
+			JOIN claimState cs ON cs.id = c.claimStateFk
+		WHERE cs.description = 'Anulado'
+			AND c.created < v2Months;
 
-	DELETE FROM XDiario WHERE FECHA < v3Month OR FECHA IS NULL;
-	-- borrar travels sin entradas
-	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
-	CREATE TEMPORARY TABLE tmp.thermographToDelete
+	DELETE FROM expeditionTruck WHERE eta < v3Months;
+	DELETE FROM XDiario WHERE FECHA < v3Months OR FECHA IS NULL;
+
+	-- Borrar travels sin entradas
+	CREATE OR REPLACE TEMPORARY TABLE tThermographToDelete
 		SELECT th.id,th.dmsFk
-		FROM vn.travel t
-			LEFT JOIN vn.entry e ON e.travelFk = t.id
-			JOIN vn.travelThermograph th ON th.travelFk = t.id
-		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+		FROM travel t
+			LEFT JOIN entry e ON e.travelFk = t.id
+			JOIN travelThermograph th ON th.travelFk = t.id
+		WHERE t.shipped < v3Months
+			AND e.travelFk IS NULL;
 
 	SELECT dt.id INTO vTrashId
-		FROM vn.dmsType dt
+		FROM dmsType dt
 		WHERE dt.code = 'trash';
 
-	UPDATE tmp.thermographToDelete th
-		JOIN vn.dms d ON d.id = th.dmsFk
+	UPDATE tThermographToDelete th
+			JOIN dms d ON d.id = th.dmsFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE th
-		FROM tmp.thermographToDelete tmp
-		JOIN vn.travelThermograph th ON th.id = tmp.id;
+		FROM tThermographToDelete tmp
+			JOIN travelThermograph th ON th.id = tmp.id;
 
 	DELETE t
-		FROM vn.travel t
-		LEFT JOIN vn.entry e ON e.travelFk = t.id
-		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+		FROM travel t
+			LEFT JOIN entry e ON e.travelFk = t.id
+		WHERE t.shipped < v3Months AND e.travelFk IS NULL;
 	
 	UPDATE dms d
 			JOIN dmsType dt ON dt.id = d.dmsTypeFk 
 		SET d.dmsTypeFk = vTrashId 
-		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
+		WHERE created < util.VN_CURDATE() - INTERVAL dt.monthToDelete MONTH;
 	
 	-- borrar entradas sin compras
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	CREATE TEMPORARY TABLE tmp.entryToDelete
+	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		SELECT e.*
-			FROM vn.entry e
-			LEFT JOIN vn.buy b ON b.entryFk = e.id
-			JOIN vn.entryConfig  ec ON e.id != ec.defaultEntry
-		WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
+			FROM entry e
+				LEFT JOIN buy b ON b.entryFk = e.id
+				JOIN entryConfig  ec ON e.id <> ec.defaultEntry
+			WHERE e.dated < v3Months
+				AND b.entryFK IS NULL;
 
 	DELETE e
-		FROM vn.entry e
-		JOIN tmp.entryToDelete tmp ON tmp.id = e.id;
+		FROM entry e
+			JOIN tEntryToDelete tmp ON tmp.id = e.id;
 
 	-- borrar de route registros menores a 4 años
-	DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
-	CREATE TEMPORARY TABLE tmp.routeToDelete
+	CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
 		SELECT *
-		FROM vn.route r
-		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());   
+			FROM route r
+			WHERE created < v4Years;   
 
-	UPDATE tmp.routeToDelete tmp
-		JOIN vn.dms d ON d.id = tmp.gestdocFk
+	UPDATE tRouteToDelete tmp
+			JOIN dms d ON d.id = tmp.gestdocFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE r
-		FROM tmp.routeToDelete tmp
-		JOIN vn.route r ON  r.id = tmp.id;
+		FROM tRouteToDelete tmp
+			JOIN route r ON  r.id = tmp.id;
 
 	-- borrar registros de dua y awb menores a 2 años
-	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-	CREATE TEMPORARY TABLE tmp.duaToDelete
+	CREATE OR REPLACE TEMPORARY TABLE tDuaToDelete
 		SELECT *
-			FROM vn.dua
-			WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE());
+			FROM dua
+			WHERE operated < v2Years;
 
-	UPDATE  tmp.duaToDelete tm
-		JOIN vn.dms d ON d.id = tm.gestdocFk
+	UPDATE tDuaToDelete tm
+			JOIN dms d ON d.id = tm.gestdocFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE d
-		FROM tmp.duaToDelete tmp
-		JOIN vn.dua d ON d.id = tmp.id;
+		FROM tDuaToDelete tmp
+			JOIN dua d ON d.id = tmp.id;
 
 	DELETE a
-		FROM vn.awb a
-			LEFT JOIN vn.travel t ON t.awbFk = a.id
+		FROM awb a
+			LEFT JOIN travel t ON t.awbFk = a.id
 		WHERE a.created < v2Years
 			AND t.id IS NULL;
 
 	-- Borra los registros de collection y ticketcollection
-	DELETE FROM vn.collection  WHERE created < vDateShort;
+	DELETE FROM collection WHERE created < v2Months;
+	DELETE FROM travelLog WHERE creationDate < v3Months;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-
-	DELETE FROM travelLog WHERE creationDate < v3Month;
-
-	CALL shelving_clean;
+	CALL shelving_clean();
 
 	DELETE FROM chat WHERE dated < v5Years;
+	DELETE tt FROM ticketTracking tt
+			JOIN ticket t ON tt.ticketFk = t.id
+		WHERE t.shipped <= v2Months;
 
-	DELETE tt FROM ticketTracking tt JOIN vn.ticket t ON tt.ticketFk = t.id
-		WHERE t.shipped <= vDateShort;
+	DELETE FROM mail WHERE creationDate < v2Months;
+	DELETE FROM split WHERE dated < v18Months;
+	DELETE FROM remittance WHERE dated < v18Months;
+	
+	CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
+		SELECT DISTINCT tl.originFk ticketFk
+			FROM ticketLog tl
+				JOIN (
+					SELECT MAX(tl.id)ids
+						FROM ticket t
+							JOIN ticketLog tl ON tl.originFk = t.id
+							LEFT JOIN ticketWeekly tw ON tw.ticketFk = t.id
+						WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31' 
+							AND t.isDeleted
+							AND tw.ticketFk IS NULL
+						GROUP BY t.id
+				) sub ON sub.ids = tl.id 
+			WHERE tl.creationDate <= v2Months;
+	DELETE t
+		FROM ticket t
+			JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
 
+	DELETE sl
+		FROM saleLabel sl
+			JOIN sale s ON s.id = sl.saleFk
+			JOIN ticket t ON t.id = s.ticketFk
+		WHERE t.shipped < v2Months;
+
+	-- Tickets Nulos PAK 11/10/2016
+	SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
+	UPDATE ticket
+		SET companyFk = vCompanyBlk
+		WHERE clientFk = (SELECT id FROM client WHERE name = 'AUTOCONSUMO')
+			AND companyFk <> vCompanyBlk;
+
+	DROP TEMPORARY TABLE tTicketDelete,
+		tThermographToDelete,
+		tEntryToDelete,
+		tDuaToDelete,
+		tRouteToDelete;
+
+	-- Other schemas
+	DELETE FROM hedera.`order` WHERE date_send < v18Months;
+	DELETE FROM pbx.cdr WHERE call_date < v18Months;
 END$$
 DELIMITER ;

db/routines/vn/procedures/client_getMana.sql

@@ -39,7 +39,8 @@ BEGIN
 					FROM receipt r
 						JOIN `client` c ON c.id = r.clientFk
 						JOIN tmp.client tc ON tc.id = c.id
-						JOIN bank b ON r.bankFk = b.id AND b.code = 'mana'
+						JOIN accounting a ON r.bankFk = a.id
+							AND a.code = 'mana'
 					WHERE r.payed > vFromDated
 						AND r.payed <= util.VN_CURDATE()
 				UNION ALL

db/routines/vn/procedures/comparative_add.sql

@@ -47,12 +47,11 @@ BEGIN
 				JOIN itemCategory ic ON ic.id = tp.categoryFk
 				JOIN ticket t ON t.id = s.ticketFk
                 JOIN client c ON c.id = t.clientFk
-				JOIN clientType ct ON ct.id = c.clientTypeFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 				JOIN address ad ON ad.id = t.addressFk
 				LEFT JOIN province p ON p.id = ad.provinceFk
 			WHERE tm.period BETWEEN vMaxPeriod AND vPeriod
-				AND ct.code <> 'loses'
+				AND c.typeFk <> 'loses'
 				AND NOT w.code = 'inv'
 			GROUP BY p.countryFk, s.itemFk, tm.period, t.warehouseFk;
 	END IF;

db/routines/vn/procedures/confection_controlSource.sql

@@ -0,0 +1,103 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`confection_controlSource`(
+	vDated DATE,
+	vScopeDays INT,
+	vMaxAlertLevel INT,
+	vWarehouseFk INT
+)
+BEGIN
+/**
+ * Obtiene la información para el control de confección,
+ * ya sean tickets y/o entradas.
+ *
+ * @param vDated Fecha a calcular
+ * @param vScopeDays Número de días desde hoy en adelante que entran en el cálculo.
+ * @param vMaxAlertLevel Id nivel de alerta
+ * @param vWarehouseFk Id de almacén
+ */
+	DECLARE vEndingDate DATETIME DEFAULT util.dayEnd(vDated) + INTERVAL vScopeDays DAY;
+
+		SELECT t.shipped,
+			t.id ticketFk,
+			s.id saleFk,
+			s.quantity,
+			s.concept,
+			ABS(s.reserved) isReserved,
+			i.category,
+			it.name itemType,
+			t.nickname,
+			wh.name warehouse,
+			t.warehouseFk warehouseFk,
+			a.provinceFk,
+			am.agencyFk,
+			ct.description,
+			stock.visible,
+			stock.available
+		FROM ticket t
+			JOIN agencyMode am ON am.id = t.agencyModeFk
+			JOIN warehouse wh ON wh.id = t.warehouseFk
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemType it ON it.id = i.typeFk
+			JOIN confectionType ct ON ct.id = it.making
+			JOIN `address` a on a.id = t.addressFk
+			LEFT JOIN ticketState tls on tls.ticketFk = t.id
+			LEFT JOIN
+				(
+					SELECT item_id,
+							SUM(visible) visible,
+							SUM(available) available
+					FROM (
+						SELECT a.item_id,
+								0 visible,
+								a.available
+						FROM cache.cache_calc cc
+							LEFT JOIN cache.available a ON a.calc_id = cc.id
+						WHERE cc.cache_id IN ('visible', 'available')
+							AND cc.params = CONCAT(vWarehouseFk, "/", util.VN_CURDATE())
+						UNION ALL
+						SELECT v.item_id,
+								v.visible,
+								0
+							FROM cache.cache_calc cc
+								LEFT JOIN cache.visible v ON v.calc_id = cc.id
+							WHERE cc.cacheName IN ('visible', 'available')
+								AND cc.params = vWarehouseFk
+					) sub
+					GROUP BY item_id
+				) stock ON stock.item_id = s.itemFk
+		WHERE it.making 
+			AND tls.alertLevel < vMaxAlertLevel
+			AND wh.hasConfectionTeam
+			AND t.shipped BETWEEN vDated AND vEndingDate
+			AND s.quantity > 0
+		UNION ALL
+		SELECT tr.shipped, 
+				e.id,
+				NULL,
+				b.quantity,
+				i.name,
+				NULL,
+				i.category,
+				NULL,
+				whi.name,
+				who.name,
+				NULL,
+				NULL,
+				NULL,
+				ct.description,
+				NULL,
+				NULL
+			FROM buy b
+				JOIN `entry` e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				JOIN warehouse whi ON whi.id = tr.warehouseInFk
+				JOIN warehouse who ON who.id = tr.warehouseOutFk
+				JOIN item i ON i.id = b.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+				JOIN confectionType ct ON ct.id = it.making
+			WHERE who.hasConfectionTeam
+				AND it.making
+				AND tr.shipped BETWEEN vDated AND vEndingDate;
+END$$
+DELIMITER ;

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -48,7 +48,7 @@ BEGIN
 
 		IF vCounter > 0 OR vASIEN > 0 THEN
 
-			UPDATE vn2008.XDiario x
+			UPDATE XDiario x
 				JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
 				SET x.ASIEN = vASIEN;
 

db/routines/vn/procedures/entry_getTransfer.sql

@@ -13,15 +13,15 @@ BEGIN
 	DECLARE vWarehouseIn INT;
 	DECLARE vWarehouseOut INT;
 	DECLARE vCalcVisible INT;
-	DECLARE vInventoryDate DATE DEFAULT vn.getInventoryDate();
+	DECLARE vInventoryDate DATE DEFAULT getInventoryDate();
 
 	SELECT shipped, landed, warehouseInFk, warehouseOutFk
 			INTO vDateShipped, vDateLanded, vWarehouseIn, vWarehouseOut
-		FROM vn.travel t
-			JOIN vn.entry e ON e.travelFk = t.id
+		FROM travel t
+			JOIN entry e ON e.travelFk = t.id
 		WHERE e.id = vSelf;
 
-	CALL vn.rate_getPrices(vDateShipped, vWarehouseIn);
+	CALL rate_getPrices(vDateShipped, vWarehouseIn);
 
 	-- Traslado en almacen origen
 	CREATE OR REPLACE TEMPORARY TABLE tBuy
@@ -84,7 +84,7 @@ BEGIN
 				WHERE a.available
 			ON DUPLICATE KEY UPDATE availableLanding = a.available;
 	ELSE
-		CALL vn.item_getStock(vWarehouseOut, vDateShipped, NULL);
+		CALL item_getStock(vWarehouseOut, vDateShipped, NULL);
 
 		CREATE OR REPLACE TEMPORARY TABLE tItem
 			(UNIQUE INDEX i USING HASH (itemFk))
@@ -97,7 +97,7 @@ BEGIN
 				FROM tmp.itemList;
 	END IF;
 
-	CALL vn.buyUltimateFromInterval(vWarehouseIn,vInventoryDate, vDateLanded);
+	CALL buyUltimateFromInterval(vWarehouseIn,vInventoryDate, vDateLanded);
 
 	CREATE OR REPLACE TEMPORARY TABLE tTransfer
 		ENGINE = MEMORY
@@ -145,26 +145,26 @@ BEGIN
 				b.id buyFkOrigin,
 				pa.returnCost,
 				b.weight
-			FROM vn.item i
+			FROM item i
 				JOIN tItem ti ON ti.itemFk = i.id
-				LEFT JOIN vn.producer p ON p.id = i.producerFk
-				LEFT JOIN vn.itemType it ON it.id = i.typeFk
-				JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-				LEFT JOIN vn.origin o ON o.id = i.originFk
+				LEFT JOIN producer p ON p.id = i.producerFk
+				LEFT JOIN itemType it ON it.id = i.typeFk
+				JOIN itemCategory ic ON ic.id = it.categoryFk
+				LEFT JOIN origin o ON o.id = i.originFk
 				LEFT JOIN tBuy lb ON lb.itemFk = i.id
-				LEFT JOIN vn.buy b ON b.id = lb.buyFk
-				LEFT JOIN vn.packaging pa ON pa.id = b.packagingFk
-				LEFT JOIN vn.entry e2 ON e2.id = b.entryFk
-				LEFT JOIN vn.supplier s ON s.id = e2.supplierFk
-				LEFT JOIN vn.entry e ON e.id = vSelf
-				LEFT JOIN vn.travel tr ON tr.id = e.travelFk
-				LEFT JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
-				LEFT JOIN vn.buy b2 ON b2.itemFk = i.id
+				LEFT JOIN buy b ON b.id = lb.buyFk
+				LEFT JOIN packaging pa ON pa.id = b.packagingFk
+				LEFT JOIN entry e2 ON e2.id = b.entryFk
+				LEFT JOIN supplier s ON s.id = e2.supplierFk
+				LEFT JOIN entry e ON e.id = vSelf
+				LEFT JOIN travel tr ON tr.id = e.travelFk
+				LEFT JOIN agencyMode am ON am.id = tr.agencyModeFk
+				LEFT JOIN buy b2 ON b2.itemFk = i.id
 					AND b2.entryFk = vSelf
-				LEFT JOIN vn.packaging pa2 ON pa2.id = b.packagingFk
+				LEFT JOIN packaging pa2 ON pa2.id = b.packagingFk
 				LEFT JOIN tmp.rate r ON TRUE
 				LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id
-				LEFT JOIN vn.buy b3 ON b3.id = bufi.buyFk
+				LEFT JOIN buy b3 ON b3.id = bufi.buyFk
 		WHERE ic.display
 			AND NOT e.isRaid
 			AND (ti.visible OR ti.available)
@@ -172,11 +172,6 @@ BEGIN
 
 	CREATE INDEX tIndex USING HASH ON tTransfer (itemFk);
 
-	SET @carriage := 0;
-	SET @comission := 0;
-	SET @packaging := 0;
-	SET @rate3 := 0;
-	SET @cost := 0;
 	SELECT *,
 			quantity - MOD(quantity , `grouping`) subQuantity,
 			MOD(quantity, `grouping`) soll,

db/routines/vn/procedures/inventory_repair.sql

@@ -37,7 +37,7 @@ BEGIN
 				LEFT JOIN origin o ON o.id = i.originFk
 				) ON it.id = i.typeFk
 		LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
-		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
+		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
 	  
 	DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
 	CREATE TEMPORARY TABLE tmp.lastEntryOk  
@@ -94,11 +94,6 @@ BEGIN
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		 SET b.price2 = eo.price2 WHERE  b.price2 = 0 ;
 		
-		UPDATE buy b
-		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
-		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
-		SET b.packing = eo.packing WHERE b.packing = 0;
-		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk

db/routines/vn/procedures/invoiceInTaxMakeByDua.sql

@@ -1,8 +1,11 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(vDuaFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTaxMakeByDua`(
+	vDuaFk INT
+)
 BEGIN
 /**
- * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry
+ * Borra los valores de duaTax y sus vctos. y los vuelve a
+ * crear en base a la tabla duaEntry.
  *  
  * @param vDuaFk Id del dua a recalcular
  */
@@ -26,7 +29,7 @@ BEGIN
 			LEAVE l;
 		END IF;
 
-		CALL vn2008.recibidaIvaInsert(vInvoiceInFk);
+		CALL invoiceInTax_recalc(vInvoiceInFk);
 		CALL invoiceInDueDay_recalc(vInvoiceInFk);
 
 	END LOOP;

db/routines/vn/procedures/invoiceInTax_afterUpsert.sql

@@ -8,6 +8,7 @@ BEGIN
  */
 	DECLARE vTaxRowLimit INT;
 	DECLARE vLines INT;
+	DECLARE vHasDistinctTransactions INT;
 
 	SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
 	
@@ -18,6 +19,18 @@ BEGIN
 	
 	IF vLines >= vTaxRowLimit THEN 
 		CALL util.throw (CONCAT('The maximum number of lines is ', vTaxRowLimit));
-	END IF;	
+	END IF;
+
+	SELECT COUNT(DISTINCT transactionTypeSageFk) INTO vHasDistinctTransactions
+		FROM invoiceIn ii
+			JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
+			JOIN invoiceInSerial iis ON iis.code = ii.serial 
+		WHERE ii.id = vInvoiceInFk
+			AND iis.taxAreaFk = 'CEE'
+			AND transactionTypeSageFk;
+
+	IF vHasDistinctTransactions > 1 THEN 
+		CALL util.throw ('This invoice does not allow different types of transactions');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceInTax_recalc.sql

@@ -0,0 +1,57 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_recalc`(
+	vInvoiceInFk INT
+)
+BEGIN
+/**
+ * Recalcula y actualiza los impuestos de la factura
+ * usando la última tasa de cambio y detalles de compra. 
+ *
+ * @param vInvoiceInFk Id de factura recibida
+ */
+	DECLARE vRate DOUBLE DEFAULT 1;
+	DECLARE vExpenseFk VARCHAR(10);
+
+	SELECT `value` INTO vRate
+		FROM referenceRate rr
+			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
+		WHERE rr.dated <= ii.issued
+			AND rr.currencyFk = ii.currencyFk
+		ORDER BY dated DESC
+		LIMIT 1;
+
+	DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;
+
+	SELECT id INTO vExpenseFk
+		FROM expense
+		WHERE code = 'extraCommGoodsAcquisition';
+	
+	IF vExpenseFk IS NULL THEN
+		CALL util.throw('Expense extraCommGoodsAcquisition not exists');
+	END IF;
+
+	INSERT INTO invoiceInTax(
+		invoiceInFk,
+		taxableBase,
+		expenseFk,
+		foreignValue,
+		taxTypeSageFk,
+		transactionTypeSageFk
+	)
+		SELECT ii.id,
+				SUM(b.buyingValue * b.quantity) / vRate bi,
+				vExpenseFk,
+				IF(c.code = 'EUR', NULL, SUM(b.buyingValue * b.quantity)),
+				s.taxTypeSageFk,
+				s.transactionTypeSageFk
+			FROM invoiceIn ii
+				JOIN currency c ON c.id = ii.currencyFk
+				JOIN `entry` e ON e.invoiceInFk = ii.id
+				JOIN supplier s ON s.id = e.supplierFk
+				JOIN buy b ON b.entryFk = e.id
+				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk
+					AND rr.dated = ii.issued
+			WHERE ii.id = vInvoiceInFk
+			HAVING bi IS NOT NULL;
+END$$
+DELIMITER ;

db/routines/vn/procedures/invoiceIn_add.sql

@@ -1,234 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
-BEGIN
-/**
- * Traslada la info de contabilidad relacionada con las facturas recibidas
- *
- * @vInvoiceInFk Factura recibida
- * @vXDiarioFk Id tabla XDiario
- */
-    DECLARE vInvoiceInOriginalFk INT;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vBase DOUBLE;
-	DECLARE vVat DOUBLE;
-	DECLARE vRate DOUBLE;
-	DECLARE vTransactionCode INT;
-	DECLARE vCounter INT DEFAULT 0;
-	DECLARE vTransactionCodeOld INT;
-	DECLARE vTaxCode INT;
-	DECLARE vTaxCodeOld INT;
-	DECLARE vOperationCode VARCHAR(1);
-	DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
-	DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
-	DECLARE vInvoiceTypeReceived VARCHAR(1);
-	DECLARE vInvoiceTypeInformative VARCHAR(1);
-	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
-
-	DECLARE vCursor CURSOR FOR
-		SELECT it.taxableBase,
-				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
-				t.PorcentajeIva,
-				it.transactionTypeSageFk,
-				it.taxTypeSageFk,
-				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto
-			FROM vn.invoiceIn i
-				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
-				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
-				JOIN taxType tty ON tty.id = t.CodigoIva
-				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
-				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	DELETE FROM movContaIVA
-		WHERE id = vXDiarioFk;
-
-	SELECT codeSage INTO vInvoiceTypeReceived
-		FROM invoiceType WHERE code ='received';
-
-	SELECT codeSage INTO vInvoiceTypeInformative
-		FROM invoiceType WHERE code ='informative';
-
-	INSERT INTO movContaIVA(id, LibreA1)
-		VALUES (vXDiarioFk, vInvoiceInFk);
-
-	OPEN vCursor;
-
-	l: LOOP
-		FETCH vCursor INTO vBase,
-				vVat,
-				vRate,
-				vTransactionCode,
-				vTaxCode,
-				vIsIntracommunity,
-				vOperationCode;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
-		IF vOperationCode IS NOT NULL THEN
-			UPDATE movContaIVA
-				SET ClaveOperacionFactura = vOperationCode
-				WHERE id = vXDiarioFk;
-		END IF;
-
-		SET vCounter = vCounter + 1;
-		CASE vCounter
-			WHEN 1 THEN
-				 UPDATE movContaIVA
-					SET BaseIva1 = vBase,
-						PorIva1 = vRate,
-						CuotaIva1 = vVat,
-						CodigoTransaccion1 = vTransactionCode,
-						CodigoIva1 = vTaxCode
-					WHERE id = vXDiarioFk;
-
-			WHEN 2 THEN
-				UPDATE movContaIVA
-					SET BaseIva2 = vBase,
-						PorIva2 = vRate,
-						CuotaIva2 = vVat,
-						CodigoTransaccion2 = vTransactionCode,
-						CodigoIva2 = vTaxCode
-					WHERE id = vXDiarioFk;
-			WHEN 3 THEN
-				UPDATE movContaIVA
-					SET BaseIva3 = vBase,
-						PorIva3 = vRate,
-						CuotaIva3 = vVat,
-						CodigoTransaccion3 = vTransactionCode,
-						CodigoIva3 = vTaxCode
-					WHERE id = vXDiarioFk;
-			WHEN 4 THEN
-				UPDATE movContaIVA
-					SET BaseIva4 = vBase,
-						PorIva4 = vRate,
-						CuotaIva4 = vVat,
-						CodigoTransaccion4 = vTransactionCode,
-						CodigoIva4 = vTaxCode
-					WHERE id = vXDiarioFk;
-			ELSE
-				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE;
-
-		IF vIsIntracommunity THEN
-			UPDATE movContaIVA
-				SET Intracomunitaria = TRUE
-				WHERE id = vXDiarioFk;
-		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
-	END LOOP;
-
-	CLOSE vCursor;
-
-	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
-		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
-				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
-		WHERE d.ASIEN = (
-			SELECT ASIEN
-				FROM vn.XDiario
-				WHERE id = vXDiarioFk)
-		LIMIT 1;
-
-	UPDATE movContaIVA mci
-			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
-			JOIN vn.XDiario x ON x.id = mci.id
-			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
-			JOIN vn.supplier s ON s.id = ii.supplierFk
-			JOIN Naciones n ON n.countryFk = s.countryFk
-		SET mci.CodigoDivisa = ii.currencyFk,
-			mci.Año = YEAR(ii.issued),
-			mci.Serie = ii.serial,
-			mci.Factura = ii.id,
-			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
-								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id,
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
-			mci.CodigoCuentaFactura = x.SUBCTA,
-			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
-			mci.Nombre = s.name,
-			mci.SiglaNacion = n.SiglaNacion,
-			mci.EjercicioFactura = YEAR(ii.issued),
-			mci.FechaOperacion = ii.issued,
-			mci.MantenerAsiento = TRUE,
-			mci.SuFacturaNo = ii.supplierRef,
-			mci.IvaDeducible1 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva1, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible2 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva2, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible3 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva3, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible4 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva4, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.FechaFacturaOriginal = x.FECHA_EX
-		WHERE mci.id = vXDiarioFk;
-
-	-- RETENCIONES
-	UPDATE movContaIVA mci
-			JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
-			JOIN vn.XDiario x ON x.id = mci.id
-			JOIN vn.supplier s ON s.id = supplierFk
-			JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
-			JOIN vn.expense e ON e.id = iit.expenseFk
-			JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
-			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
-			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
-					FROM vn.XDiario x1
-						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0
-						AND x1.id = vXDiarioFk
-				)sub
-			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
-		SET mci.CodigoRetencion = t.CodigoRetencion,
-			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
-			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
-			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1
-		WHERE mci.id = vXDiarioFk
-			AND e.name = 'Retenciones'
-			AND id.id IS NULL;
-
-	SELECT correctedFk INTO vInvoiceInOriginalFk
-		FROM vn.invoiceInCorrection
-		WHERE correctingFk = vInvoiceInFk;
-
-	IF vInvoiceInOriginalFk THEN 
-
-		UPDATE movContaIVA mci
-				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
-				JOIN (SELECT issued,
-							SUM(sub.taxableBase) taxableBase, 
-							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
-						FROM(SELECT issued,
-									SUM(iit.taxableBase) taxableBase, 
-									ti.PorcentajeIva
-								FROM vn.invoiceIn i 
-									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
-									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
-								WHERE i.id = vInvoiceInOriginalFk
-								GROUP BY ti.CodigoIva)sub
-					)invoiceInOriginal
-				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
-			SET mci.TipoRectificativa = iir.refundCategoryFk,
-				mci.ClaseAbonoRectificativas = iir.refundType, 
-				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
-				mci.FechaOperacion = invoiceInOriginal.issued,
-				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
-				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
-				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
-			WHERE mci.id = vXDiarioFk;
-
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemProposal.sql

@@ -1,87 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL)
-BEGIN
-
-/**
- * Propone articulos disponible ordenado, con la cantidad de veces usado y segun sus caracteristicas
- *
- * @param vItemFk item id
- * @param vTicketFk ticket id
- * @param vShowType mostrar tipos
- */
-
-	DECLARE vWarehouseFk INT;
-	DECLARE vShipped DATE;
-	DECLARE vCalcFk INT;
-	DECLARE vTypeFk INT;
-
-	DECLARE vTag1 VARCHAR(25);
-	DECLARE vTag5 VARCHAR(25);
-	DECLARE vTag6 VARCHAR(25);
-	DECLARE vTag7 VARCHAR(25);
-	DECLARE vTag8 VARCHAR(25);
-
-	DECLARE vValue1 VARCHAR(50);
-	DECLARE vValue5 VARCHAR(50);
-	DECLARE vValue6 VARCHAR(50);
-	DECLARE vValue7 VARCHAR(50);
-	DECLARE vValue8 VARCHAR(50);
-
-	SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
-		FROM vn.ticket
-		WHERE id = vTicketFk;
-
-	SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
-		INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-		FROM vn.item i
-			LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-		WHERE i.id = vItemFk;
-
-	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-
-	SELECT i.id itemFk,
-			i.longName,
-			i.subName,
-			i.tag5,
-			i.value5,
-			(i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
-			i.tag6,
-			i.value6,
-			(i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
-			i.tag7,
-			i.value7,
-			(i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
-			i.tag8,
-			i.value8,
-			(i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
-			a.available,
-			IFNULL(ip.counter,0) counter,
-			IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity,
-			iss.visible located
-		FROM item i
-			JOIN cache.available a ON a.item_id = i.id
-			LEFT JOIN itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
-			LEFT JOIN itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-			LEFT JOIN tag t1 ON t1.id = it1.tagFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
-			LEFT JOIN buy b ON b.id = lb.buy_id
-			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id AND iss.warehouseFk = vWarehouseFk
-		WHERE a.calc_id = vCalcFk
-			AND available > 0
-			AND IF(vShowType,i.typeFk = vTypeFk,true)
-			AND i.id != vItemFk
-		ORDER BY counter DESC,
-			(t1.name = vTag1 COLLATE utf8_general_ci) DESC,
-			(it1.value = vValue1 COLLATE utf8_general_ci) DESC,
-			(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
-			(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
-			(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
-			(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
-			(i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
-			(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
-			(i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
-			(i.value8 = vValue8 COLLATE utf8_general_ci) DESC;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemProposal_beta.sql

@@ -1,76 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal_beta`(vItemFk INT, vTicketFk INT)
-BEGIN
-
-	DECLARE vWarehouseFk INT;
-    DECLARE vShipped DATE;
-    DECLARE vCalcFk INT;
-    DECLARE vTypeFk INT;
-    DECLARE vResultsMax INT DEFAULT 10;
-    
-    DECLARE vTag1 VARCHAR(25);
-    DECLARE vTag5 VARCHAR(25);
-    DECLARE vTag6 VARCHAR(25);
-    DECLARE vTag7 VARCHAR(25);
-    DECLARE vTag8 VARCHAR(25);
-    
-    DECLARE vValue1 VARCHAR(50);
-    DECLARE vValue5 VARCHAR(50);
-    DECLARE vValue6 VARCHAR(50);
-    DECLARE vValue7 VARCHAR(50);
-    DECLARE vValue8 VARCHAR(50);
-
-	SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
-		FROM vn.ticket
-        WHERE id = vTicketFk;
-    
-    SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
-		INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-		FROM vn.item i 
-            LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-        WHERE i.id = vItemFk;
-    
-	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-	
-	SELECT i.id itemFk,
-			i.longName,
-            i.subName,
-            i.tag5,
-            i.value5,
-            (i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
-			i.tag6,
-            i.value6,
-            (i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
-			i.tag7,
-            i.value7,
-            (i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
-            i.tag8,
-            i.value8,
-            (i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
-            a.available,
-            IFNULL(ip.counter,0) counter
-		FROM vn.item i 
-			JOIN cache.available a ON a.item_id = i.id
-            LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
-			LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-		WHERE a.calc_id = vCalcFk
-			AND available > 0
-            AND i.typeFk = vTypeFk
-            AND i.id != vItemFk
-		ORDER BY counter DESC,
-				(t1.name = vTag1 COLLATE utf8_general_ci) DESC,
-                (it1.value = vValue1 COLLATE utf8_general_ci) DESC,
-				(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
-				(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
-				(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,                
-				(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
-                (i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
-				(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
-                (i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
-				(i.value8 = vValue8 COLLATE utf8_general_ci) DESC
-		LIMIT vResultsMax;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemShelving_add.sql

@@ -19,6 +19,10 @@ BEGIN
 	DECLARE vItemFk INT;
 
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
+	
+	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
+
+	SET vQuantity = vQuantity * vPacking;
 
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
 

db/routines/vn/procedures/itemShelving_filterBuyer.sql

@@ -44,10 +44,9 @@ proc:BEGIN
 										LEFT JOIN saleTracking st ON st.saleFk = s.id
 										JOIN ticket t ON t.id = s.ticketFk 
 										JOIN client c on c.id = t.clientFk
-										JOIN clientType ct ON ct.id = c.clientTypeFk
 									WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 										AND st.saleFk IS NULL
-										AND ct.code IN ('normal', 'trust')
+										AND c.typeFk IN ('normal', 'trust')
 									GROUP BY s.itemFk
 								) sub2 ON sub2.itemFk = sub.itemFk
 			UNION ALL
@@ -70,10 +69,9 @@ proc:BEGIN
 										LEFT JOIN saleTracking st ON st.saleFk = s.id
 										JOIN ticket t ON t.id = s.ticketFk 
 										JOIN client c on c.id = t.clientFk
-										JOIN clientType ct ON ct.id = c.clientTypeFk
 									WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 										AND st.saleFk IS NULL
-										AND ct.code IN ('normal', 'trust')
+										AND c.typeFk IN ('normal', 'trust')
 									GROUP BY s.itemFk
 							) sub5 ON sub5.itemFk = v.item_id
 				WHERE v.calc_id = vCalcVisibleFk

db/routines/vn/procedures/itemShelving_inventory.sql

@@ -30,10 +30,11 @@ BEGIN
 			ish.visible,
 			p.sectorFk,
 			it.workerFk buyer,
-			CONCAT('http:',ic.url, '/catalog/1600x900/',i.image) urlImage,
+			ic.url,
+			i.image,
 			ish.isChecked,
 			CASE
-				WHEN s.notPrepared > sm.parked THEN 0
+				WHEN IFNULL (s.notPrepared, 0) > sm.parked THEN 0
 				WHEN sm.visible > sm.parked THEN 1
 			ELSE 2
 			END priority
@@ -43,7 +44,7 @@ BEGIN
 			JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
 			JOIN shelving sh ON sh.code = ish.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
-			JOIN (
+			LEFT JOIN (
 				SELECT s.itemFk, sum(s.quantity) notPrepared
 					FROM sale s
 						JOIN ticket t ON t.id = s.ticketFk

db/routines/vn/procedures/item_getBalance.sql

@@ -120,7 +120,7 @@ BEGIN
 			TRUE,
 			s.id,
 			st.`order`,
-			ct.`code`,
+			c.typeFk,
 			cb.claimFk,
 			NULL
 		FROM sale s
@@ -128,7 +128,6 @@ BEGIN
 			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
 			LEFT JOIN state st ON st.`code` = ts.`code`
 			JOIN client c ON c.id = t.clientFk
-			JOIN clientType ct ON ct.id = c.clientTypeFk
 			JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
 				'DELIVERED', 
 				IF (t.shipped > util.dayEnd(util.VN_CURDATE()),

db/routines/vn/procedures/item_getSimilar.sql

@@ -1,84 +1,92 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(vItemFk INT, vWarehouseFk INT, vDate DATE, vIsShowedByType BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
+	vSelf INT,
+	vWarehouseFk INT,
+	vDated DATE,
+	vShowType BOOL
+)
 BEGIN
-
 /**
- * Propone articulos similares para posible cambio,
- * ordenado con la cantidad de veces usado y segun sus caracteristicas
- *
- * @param vItemFk item id
- * @param vWarehouseFk warehouse id
- * @param vDate fecha para revisar disponible
- * @param vIsShowedByType para mostrar solo artículos de ese tipo
- */  
+* Propone articulos disponibles ordenados, con la cantidad
+* de veces usado y segun sus caracteristicas.
+*
+* @param vSelf Id de artículo
+* @param vWarehouseFk Id de almacen
+* @param vDated Fecha
+* @param vShowType Mostrar tipos
+*/
+	DECLARE vCalcFk INT;
+	DECLARE vTypeFk INT;
+	DECLARE vPriority INT DEFAULT 1;
 
-    DECLARE vCalcFk INT;
-    DECLARE vTypeFk INT;
-    
-    DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    
-    DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
 
-       
-    SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
-        INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-        FROM vn.item i
-            LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-            LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-        WHERE i.id = vItemFk;
-    
-    CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDate);
-    
-    SELECT i.id itemFk,
-            i.longName,
-            i.subName,
-            i.tag5,
-            i.value5,
-            (i.value5 <=> vValue5) match5,
-            i.tag6,
-            i.value6,
-            (i.value6 <=> vValue6) match6,
-            i.tag7,
-            i.value7,
-            (i.value7 <=> vValue7) match7,
-            i.tag8,
-            i.value8,
-            (i.value8 <=> vValue8) match8,
-            a.available,
-            IFNULL(ip.counter,0) counter,
-            IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity
-        FROM vn.item i
-            JOIN cache.available a ON a.item_id = i.id
-            LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
-            LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-			LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
+
+	WITH itemTags AS (
+		SELECT i.id,
+				typeFk,
+				tag5,
+				value5,
+				tag6,
+				value6,
+				tag7,
+				value7,
+				tag8,
+				value8,
+				t.name,
+				it.value
+			FROM vn.item i
+				LEFT JOIN vn.itemTag it ON it.itemFk = i.id
+					AND it.priority = vPriority
+				LEFT JOIN vn.tag t ON t.id = it.tagFk
+			WHERE i.id = vSelf
+	)
+	SELECT i.id itemFk,
+			i.longName,
+			i.subName,
+			i.tag5,
+			i.value5,
+			(i.value5 <=> its.value5) match5,
+			i.tag6,
+			i.value6,
+			(i.value6 <=> its.value6) match6,
+			i.tag7,
+			i.value7,
+			(i.value7 <=> its.value7) match7,
+			i.tag8,
+			i.value8,
+			(i.value8 <=> its.value8) match8,
+			a.available,
+			IFNULL(ip.counter, 0) `counter`,
+			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
+			iss.visible located
+		FROM vn.item i
+			JOIN cache.available a ON a.item_id = i.id
+				AND a.calc_id = vCalcFk
+			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
+				AND ip.itemFk = vSelf
+			LEFT JOIN vn.itemTag it ON it.itemFk = i.id
+				AND it.priority = vPriority
+			LEFT JOIN vn.tag t ON t.id = it.tagFk
+			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN vn.buy b ON b.id = lb.buy_id
-        WHERE a.calc_id = vCalcFk
-            AND available > 0
-            AND IF(vIsShowedByType, i.typeFk = vTypeFk, TRUE)
-            AND i.id != vItemFk
-        ORDER BY counter DESC,
-                (t1.name = vTag1) DESC,
-                (it1.value = vValue1) DESC,
-                (i.tag6 = vTag6) DESC,                
-                (i.value6 = vValue6) DESC,
-                (i.tag5 = vTag5) DESC,
-                (i.value5 = vValue5) DESC,
-                (i.tag7 = vTag7) DESC,
-                (i.value7 = vValue7) DESC,
-                (i.tag8 = vTag8) DESC,
-                (i.value8 = vValue8) DESC
-         LIMIT 30;
-       
-
+			LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
+				AND iss.warehouseFk = vWarehouseFk
+			JOIN itemTags its
+		WHERE a.available > 0
+			AND IF(vShowType, i.typeFk = its.typeFk, TRUE)
+			AND i.id <> vSelf
+		ORDER BY `counter` DESC,
+			(t.name = its.name) DESC,
+			(it.value = its.value) DESC,
+			(i.tag5 = its.tag5) DESC,
+			match5 DESC,
+			(i.tag6 = its.tag6) DESC,
+			match6 DESC,
+			(i.tag7 = its.tag7) DESC,
+			match7 DESC,
+			(i.tag8 = its.tag8) DESC,
+			match8 DESC;
 END$$
 DELIMITER ;

db/routines/vn/procedures/multipleInventoryHistory.sql

@@ -0,0 +1,158 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
+	vItemFk INT
+)
+BEGIN
+/**
+* Calcula y proporciona un historial de inventario detallado
+* para un artículo dividiendo la información
+* por almacén.
+*
+* @param vItemFk Artículo
+*/
+	DECLARE vDateInventory DATETIME;
+
+	SELECT inventoried INTO vDateInventory FROM config;
+
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory1;
+
+	CREATE TEMPORARY TABLE tMultipleHistory1
+	SELECT DATE(`date`) `date`,
+		input,
+		`output`,
+		ok,
+		reference,
+		history.id,
+		warehouse,
+		`name` warehouseName
+		FROM ( 
+			SELECT tr.landed `date`,
+				c.quantity input,
+				NULL `output`,
+				tr.warehouseInFk warehouse,
+				tr.isReceived ok,
+				e.invoiceNumber reference,
+				e.id
+				FROM buy c
+					JOIN `entry` e ON e.id = c.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+				WHERE tr.landed >= vDateInventory
+					AND c.itemFk = vItemFk
+					AND NOT e.isRaid
+					AND c.quantity
+			UNION ALL
+			SELECT tr.shipped,
+				NULL,
+				c.quantity,
+				tr.warehouseOutFk,
+				tr.isDelivered,
+				e.invoiceNumber,
+				e.id
+				FROM buy c
+					JOIN `entry` e ON e.id = c.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+				WHERE tr.shipped >= vDateInventory
+					AND c.itemFk = vItemFk
+					AND NOT e.isRaid
+					AND c.quantity
+			UNION ALL
+			SELECT t.shipped,
+				NULL,
+				m.quantity,
+				t.warehouseFk,
+				(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
+				t.refFk,
+				t.id
+				FROM sale m
+					JOIN ticket t ON t.id = m.ticketFk
+				WHERE t.shipped >= vDateInventory
+					AND m.itemFk = vItemFk
+			) history
+			JOIN warehouse ON warehouse.id = history.warehouse
+			ORDER BY `date`, input DESC, ok DESC;
+
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory2, tMultipleHistory3,
+		tMultipleHistory4, tMultipleHistory5, tMultipleHistory6, tMultipleHistory7, tMultipleHistory8;
+	CREATE TEMPORARY TABLE tMultipleHistory2 SELECT * FROM tMultipleHistory1 WHERE warehouse = 19;
+	CREATE TEMPORARY TABLE tMultipleHistory3 SELECT * FROM tMultipleHistory1 WHERE warehouse = 7;
+	CREATE TEMPORARY TABLE tMultipleHistory4 SELECT * FROM tMultipleHistory1 WHERE warehouse = 60;
+	CREATE TEMPORARY TABLE tMultipleHistory5 SELECT * FROM tMultipleHistory1 WHERE warehouse = 5;
+	CREATE TEMPORARY TABLE tMultipleHistory6 SELECT * FROM tMultipleHistory1 WHERE warehouse = 17;
+	CREATE TEMPORARY TABLE tMultipleHistory7 SELECT * FROM tMultipleHistory1 WHERE warehouse = 37;
+	CREATE TEMPORARY TABLE tMultipleHistory8 SELECT * FROM tMultipleHistory1 WHERE warehouse = 55;
+
+	SELECT *
+		FROM (
+			SELECT `date`, input BOGinput, `output` BOGoutput, ok BOGok, reference BOGreference, id BOGid,
+			NULL VNHinput, NULL VNHoutput, NULL VNHok, NULL VNHreference, NULL VNHid,
+			NULL ALGinput, NULL ALGoutput, NULL ALGok, NULL ALGreference, NULL ALGid,
+			NULL MADinput, NULL MADoutput, NULL MADok, NULL MADreference, NULL MADid,
+			NULL MCFinput, NULL MCFoutput, NULL MCFok, NULL MCFreference, NULL MCFid,
+			NULL VILinput, NULL VILoutput, NULL VILok, NULL VILreference, NULL VILid,
+			NULL BARinput, NULL BARoutput, NULL BARok, NULL BARreference, NULL BARid
+				FROM tMultipleHistory2
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory3
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory4
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory5
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory6
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory7
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id
+				FROM tMultipleHistory8
+		) sub
+		ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL,
+			MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
+END$$
+DELIMITER ;

db/routines/vn/procedures/payment_add.sql

@@ -0,0 +1,84 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`payment_add`(
+	vDated DATE,
+	vSupplierFk INT,
+	vAmount DOUBLE,
+	vCurrencyFk INT,
+	vForeignValue DOUBLE,
+	vBankFk INT,
+	vPayMethodFk INT,
+	vExpenseFk DOUBLE,
+	vConcept VARCHAR(40),
+	vCompanyFk INT)
+BEGIN
+/**
+ * Registra un pago realizado a un proveedor y
+ * su correspondiente registro en caja.
+ *
+ * @param vDated Fecha del pago
+ * @param vSupplierFk Id del proveedor
+ * @param vAmount Cantidad a pagar
+ * @param vCurrencyFk Id de la moneda
+ * @param vForeignValue Tipo de cambio utilizado
+ * @param vBankFk Id del banco
+ * @param vPayMethodFk Id del método de pago
+ * @param vExpenseFk Id de gasto
+ * @param vConcept Concepto del pago
+ * @param vCompanyFk Id de la empresa
+ * @return paymentFk Id de pago insertado
+ */
+	INSERT INTO till(
+			concept,
+			serie,
+			`number`,
+			`out`,
+			dated,
+			isAccountable,
+			bankFk,
+			workerFk,
+			companyFk,
+			isConciliate
+	) 
+		SELECT CONCAT('n/pago a ', `name`),
+				'R',
+				vSupplierFk,
+				vAmount, 
+				vDated,
+				1,
+				vBankFk,
+				account.myUser_getId(),
+				vCompanyFk,
+				1
+			FROM supplier
+			WHERE id = vSupplierFk;
+
+	INSERT INTO payment(
+			received,
+			dueDated,
+			supplierFk,
+			amount,
+			currencyFk,
+			divisa,
+			bankFk,
+			payMethodFk,
+			bankingFees,
+			concept,
+			companyFk
+	)
+		VALUES(
+			vDated,
+			vDated,
+			vSupplierFk,
+			vAmount,
+			vCurrencyFk,
+			IF(NOT vForeignValue, NULL, vForeignValue),
+			vBankFk,
+			vPayMethodFk,
+			vExpenseFk,
+			vConcept,
+			vCompanyFk
+		);
+			
+	SELECT LAST_INSERT_ID() paymentFk;
+END$$
+DELIMITER ;

db/routines/vn/procedures/remittance_calc.sql

@@ -0,0 +1,70 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`remittance_calc`(
+	vDated DATE
+)
+BEGIN
+/**
+* Calcula los datos de remesa, incluyendo el importe,
+* el vencimiento, y otros datos relevantes.
+*
+* @param vDated Fecha a calcular
+* @return tmp.remittance
+*/
+	CREATE OR REPLACE TEMPORARY TABLE tmp.remittance
+		SELECT CONCAT(s.nif, REPEAT('0', 12 - LENGTH(s.nif))) cif,
+				c.id clientFk,
+				c.name client,
+				c.fi,
+				sub.paymentDate,
+				0 invoiceAmount,
+				CAST(sub.receipt AS DECIMAL(10,2)) receiptAmount,
+				0 currentAmount,
+				sub.companyFk,
+				c.socialName,
+				CAST(sub.receipt AS DECIMAL(10,2)) totalAmount,
+				CAST(sub.receipt AS DECIMAL(10,2)) balance,
+				s.name company,
+				co.code companyCode,
+				c.accountingAccount,
+				c.iban,
+				c.hasSepaVnl,
+				c.hasCoreVnl,
+				c.hasLcr,
+				be.bic,
+				be.`name` entityName
+			FROM client c
+				JOIN (
+					SELECT risk.companyFk,
+							c.id,
+							SUM(risk.amount) receipt,
+							IF((c.dueDay + graceDays) MOD 30.001 <= DAY(vDated),
+								LAST_DAY(vDated - INTERVAL 1 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY,
+								LAST_DAY(vDated - INTERVAL 2 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY
+							) paymentDate												
+						FROM client c
+							JOIN payMethod pm ON pm.id = c.payMethodFk
+							JOIN (
+									SELECT cr.companyFk, cr.clientFk, cr.amount
+										FROM client c
+											JOIN clientRisk cr ON cr.clientFk = c.id
+											JOIN payMethod pm ON pm.id = c.payMethodFk
+										WHERE pm.code = 'bankDraft'
+									UNION ALL
+									SELECT io.companyFk, io.clientFk, - io.amount
+										FROM invoiceOut io 
+											JOIN client c ON c.id = io.clientFk
+											JOIN payMethod pm ON pm.id = c.payMethodFk
+										WHERE io.dued > vDated
+											AND pm.code = 'bankDraft'
+											AND pm.outstandingDebt
+											AND io.amount > 0
+										
+							) risk ON risk.clientFk = c.id
+						GROUP BY risk.companyFk, c.id
+						HAVING receipt > 10
+				) sub ON sub.id = c.id
+			JOIN supplier s ON s.id = sub.companyFk
+			JOIN company co ON co.id = sub.companyFk
+			LEFT JOIN bankEntity be ON be.id = c.bankEntityFk; 
+END$$
+DELIMITER ;

db/routines/vn/procedures/sale_checkNoComponents.sql

@@ -1,70 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_checkNoComponents`(vCreatedFrom DATETIME, vCreatedTo DATETIME)
-BEGIN
-/**
- * Comprueba que las ventas creadas entre un rango de fechas tienen componentes
- *
- * @param vCreatedFrom inicio del rango
- * @param vCreatedTo fin del rango
- */
-	DECLARE v_done BOOL DEFAULT FALSE;
-	DECLARE vSaleFk INTEGER;
-	DECLARE vTicketFk INTEGER;
-	DECLARE vConcept VARCHAR(50);
-	DECLARE vCur CURSOR FOR
-		SELECT s.id
-			FROM sale s
-				JOIN ticket t ON t.id = s.ticketFk
-				JOIN item i ON i.id = s.itemFk
-				JOIN itemType tp ON tp.id = i.typeFk
-				JOIN itemCategory ic ON ic.id = tp.categoryFk
-				LEFT JOIN tmp.coste c ON c.id = s.id
-			WHERE s.created >= vCreatedFrom AND s.created <= vCreatedTo
-				AND c.id IS NULL
-				AND t.agencyModeFk IS NOT NULL
-                AND t.isDeleted IS FALSE
-                 AND t.warehouseFk = 60
-				AND ic.merchandise != FALSE
-			GROUP BY s.id;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET v_done = TRUE; 
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
-	CREATE TEMPORARY TABLE tmp.coste
-		(PRIMARY KEY (id)) ENGINE = MEMORY
-		SELECT s.id
-		FROM sale s 
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType tp ON tp.id = i.typeFk
-			JOIN itemCategory ic ON ic.id = tp.categoryFk
-			JOIN saleComponent sc ON sc.saleFk = s.id
-			JOIN component c ON c.id = sc.componentFk
-			JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 6
-		WHERE s.created >= vCreatedFrom
-			AND ic.merchandise != FALSE;
-
-	OPEN vCur;
-
-	l: LOOP
-		SET v_done = FALSE;
-		FETCH vCur INTO vSaleFk;
-
-		IF v_done THEN
-			LEAVE l;
-		END IF;
-		
-		SELECT ticketFk, concept
-			INTO vTicketFk, vConcept
-			FROM sale
-			WHERE id = vSaleFk;
-			
-		CALL sale_calculateComponent(vSaleFk, 'renewPrices');
-	END LOOP;
-
-	CLOSE vCur;
-	DROP TEMPORARY TABLE tmp.coste;	
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_getBoxPickingList.sql

@@ -17,7 +17,6 @@ BEGIN
 
 	CALL productionControl(vWarehouseFk, 0);
 
-	-- Products with vn.item.isBoxPickingMode = TRUE, pay atention to vn.itemShelving.packing
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 	(saleFk INT PRIMARY KEY)
 	SELECT
@@ -28,8 +27,8 @@ BEGIN
 		s.quantity,
 		MAKETIME(pb.HH,pb.mm,0) etd, 
 		pb.routeFk,
-		FLOOR(s.quantity / ish.packing) stickers,
-		ish.packing,
+		FLOOR(s.quantity / IF(i.isBoxPickingMode, ish.packing, i.packingOut)) stickers,
+		IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
 		b.packagingFk
 		FROM sale s
 			JOIN item i ON i.id = s.itemFk
@@ -52,8 +51,8 @@ BEGIN
 			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN buy b ON b.id = lb.buy_id
-		WHERE s.quantity BETWEEN ish.packing AND (ish.visible - IFNULL(tISS.reserve,0))
-			AND i.isBoxPickingMode
+		WHERE IF(i.isBoxPickingMode, ish.packing, i.packingOut) 
+				<= LEAST(s.quantity, ish.visible - IFNULL(tISS.reserve,0))
 			AND NOT pb.problem
 			AND sgd.saleFk IS NULL
 			AND p.sectorFk = vSectorFk
@@ -64,45 +63,9 @@ BEGIN
 		GROUP BY s.id
 		ORDER BY etd;
 
-	-- Remaining products, vn.item.packingOut
-	INSERT IGNORE INTO tmp.sale
-	SELECT
-		s.ticketFk,	
-		s.id saleFk,
-		s.itemFk,
-		s.concept,
-		s.quantity,
-		MAKETIME(pb.HH,pb.mm,0) etd, 
-		pb.routeFk,
-		s.quantity / i.packingOut stickers,
-		i.packingOut,
-		pc.defaultBigPackageFk
-		FROM sale s
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemShelving ish ON ish.itemFk = s.itemFk
-			JOIN shelving sh ON sh.code = ish.shelvingFk
-			JOIN parking p ON p.id = sh.parkingFk
-			JOIN tmp.productionBuffer pb ON pb.ticketFk = s.ticketFk
-			JOIN agencyMode am ON am.id = pb.agencyModeFk
-			JOIN packagingConfig pc
-			LEFT JOIN routesMonitor rm ON rm.routeFk = pb.routeFk
-			LEFT JOIN itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = p.sectorFk
-			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
-		WHERE s.quantity >= i.packingOut 
-			AND NOT pb.problem
-			AND s.quantity > 0
-			AND sgd.saleFk IS NULL
-			AND p.sectorFk = vSectorFk
-			AND ts.isPreviousPreparable
-			AND iss.visible >= s.quantity
-			AND ((rm.bufferFk AND rm.isPickingAllowed)
-				OR am.code = 'REC_ALG') 
-			AND pb.shipped = vDated
-		GROUP BY s.id
-		ORDER BY etd;
-
-	SELECT * FROM tmp.sale;
+	SELECT *
+		FROM tmp.sale
+		WHERE stickers;
 
 	DROP TEMPORARY TABLE tmp.productionBuffer;
 	DROP TEMPORARY TABLE tmp.sale;

db/routines/vn/procedures/sale_getFromTicketOrCollection.sql

@@ -79,7 +79,10 @@ DECLARE vIsCollection BOOL;
 			IF(SUM(iss.quantity) IS NULL, 0, SUM(iss.quantity)) pickedQuantity,
 			MIN(iss.created) picked,
 			IF(sm.id, TRUE, FALSE) hasMistake,
-			sg.sectorFk
+			sg.sectorFk,
+			b.packing,
+			b.grouping,
+			o.code
 		FROM tmp.ticket t
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN ticket tt ON tt.id = t.id

db/routines/vn/procedures/sectorCollectionSaleGroup_add.sql

@@ -8,6 +8,25 @@ BEGIN
  * @param vSaleGroupFk Identificador de vn.saleGroup
  * @param vSectorCollectionFk Identificador de vn.sectorCollection
  */
+ 	DECLARE vHasSaleGroup INT;
+	DECLARE vHasSectorCollection INT;
+
+	SELECT COUNT(id) INTO vHasSaleGroup
+		FROM saleGroup
+		WHERE id = vSaleGroupFk;
+
+	IF !vHasSaleGroup THEN 
+		CALL util.throw ("invalid saleGroup");
+	END IF;
+
+	SELECT COUNT(id) INTO vHasSectorCollection
+		FROM sectorCollection 
+		WHERE id = vSectorCollectionFk;
+
+	IF !vHasSectorCollection THEN 
+		CALL util.throw ("invalid sectorCollection");
+	END IF;
+
 	REPLACE sectorCollectionSaleGroup
 		SET sectorCollectionFk = vSectorCollectionFk, 
 			saleGroupFk = vSaleGroupFk;

db/routines/vn/procedures/sector_get.sql

@@ -1,13 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sector_get`()
-BEGIN
-
-/**
- * Obtiene los sectores
-*/
-
-	SELECT s.id,s.description,s.warehouseFk
-		FROM vn.sector s;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/supplier_statement.sql

@@ -94,7 +94,7 @@ BEGIN
 								'payment'
 						FROM payment p
 							LEFT JOIN currency c ON c.id = p.currencyFk
-							LEFT JOIN bank b ON b.id = p.bankFk
+							LEFT JOIN accounting a ON a.id = p.bankFk
 							LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
 							LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
 						WHERE p.received > '2014-12-31'

db/routines/vn/procedures/ticket_closeByTicket.sql

@@ -15,10 +15,11 @@ BEGIN
 			JOIN agencyMode am ON am.id = t.agencyModeFk
 			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
 			JOIN alertLevel al ON al.id = ts.alertLevel
-		WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
+		WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
 			AND t.id = vTicketFk
 			AND t.refFk IS NULL
-		GROUP BY t.id);
+		GROUP BY t.id
+    );
 
 	CALL ticket_close();
 

db/routines/vn/procedures/ticket_getTax.sql

@@ -9,6 +9,8 @@ BEGIN
  * @return tmp.ticketAmount (ticketFk, taxableBase, tax, code)
  * @return tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code) Impuesto desglosado para cada ticket.
  */
+	-- Mantengo el drop porque si no da error en los tests de back de salix
+	-- Table 'addressCompany' was locked with a READ lock and can't be updated'
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
 	CREATE TEMPORARY TABLE tmp.addressCompany
 		(INDEX (addressFk, companyFk))
@@ -17,24 +19,24 @@ BEGIN
 			FROM tmp.ticket tmpTicket
 				JOIN ticket t ON t.id = tmpTicket.ticketFk;
 
-	CALL addressTaxArea ();
+	CALL addressTaxArea();
  
 	IF vTaxArea IS NOT NULL THEN
 		UPDATE tmp.addressTaxArea
 			SET areaFk = vTaxArea;
 	END IF;
 
-	/* Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente
-	* No se debería cambiar el sistema por problemas con los decimales
-	*/
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
-	CREATE TEMPORARY TABLE tmp.ticketTax
+	-- Solo se calcula la base imponible (taxableBase) y
+	-- el impuesto se calculará posteriormente
+	-- No se debería cambiar el sistema por problemas con los decimales
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
 		SELECT * FROM (
 			SELECT tmpTicket.ticketFk,
 					bp.pgcFk,
-					SUM(s.quantity * s.price * (100 - s.discount)/100 ) taxableBase,
+					SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
 					pgc.rate,
 					tc.code,
 					bp.priority
@@ -43,22 +45,21 @@ BEGIN
 					JOIN item i ON i.id = s.itemFk
 					JOIN ticket t ON t.id = tmpTicket.ticketFk
 					JOIN supplier su ON su.id = t.companyFk
-					JOIN tmp.addressTaxArea ata
-						ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
-					JOIN itemTaxCountry itc
-						ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
-					JOIN bookingPlanner bp
-						ON bp.countryFk = su.countryFk
-							AND bp.taxAreaFk = ata.areaFk
-							AND bp.taxClassFk = itc.taxClassFk
+					JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
+						AND ata.companyFk = t.companyFk
+					JOIN itemTaxCountry itc ON itc.itemFk = i.id
+						AND itc.countryFk = su.countryFk
+					JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
+						AND bp.taxAreaFk = ata.areaFk
+						AND bp.taxClassFk = itc.taxClassFk
 					JOIN pgc ON pgc.code = bp.pgcFk
 					JOIN taxClass tc ON tc.id = bp.taxClassFk
 				GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
-				HAVING taxableBase <> 0) t3
+				HAVING taxableBase
+			) t3
 			ORDER BY priority;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax;
-	CREATE TEMPORARY TABLE tmp.ticketServiceTax
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
 		SELECT tt.ticketFk,
@@ -70,24 +71,22 @@ BEGIN
 				JOIN ticketService ts ON ts.ticketFk = tt.ticketFk
 				JOIN ticket t ON t.id = tt.ticketFk
 				JOIN supplier su ON su.id = t.companyFk
-				JOIN tmp.addressTaxArea ata
-					ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
-				JOIN bookingPlanner bp
-					ON bp.countryFk = su.countryFk
-						AND bp.taxAreaFk = ata.areaFk
-						AND bp.taxClassFk = ts.taxClassFk
+				JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
+					AND ata.companyFk = t.companyFk
+				JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
+					AND bp.taxAreaFk = ata.areaFk
+					AND bp.taxClassFk = ts.taxClassFk
 				JOIN pgc ON pgc.code = bp.pgcFk
 				JOIN taxClass tc ON tc.id = bp.taxClassFk
 			GROUP BY tt.ticketFk, pgc.code
-			HAVING taxableBase <> 0;
+			HAVING taxableBase;
 
 	INSERT INTO tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code)
 		SELECT ts.ticketFk, ts.pgcFk, ts.taxableBase, ts.rate, ts.code
 			FROM tmp.ticketServiceTax ts
 	ON DUPLICATE KEY UPDATE ticketTax.taxableBase = VALUES (taxableBase) + ticketTax.taxableBase ;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
-	CREATE TEMPORARY TABLE tmp.ticketAmount
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketAmount
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
 		SELECT ticketFk, 
@@ -97,7 +96,8 @@ BEGIN
 			FROM tmp.ticketTax
 			GROUP BY ticketFk, code;
 
-	DROP TEMPORARY TABLE tmp.addressCompany;
-	DROP TEMPORARY TABLE tmp.addressTaxArea;
+	DROP TEMPORARY TABLE
+		tmp.addressCompany,
+		tmp.addressTaxArea;
 END$$
 DELIMITER ;