Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph

back/methods/chat/getServiceAuth.js

@@ -0,0 +1,55 @@
+const axios = require('axios');
+const tokenLifespan = 10;
+module.exports = Self => {
+    Self.remoteMethodCtx('getServiceAuth', {
+        description: 'Authenticates with the service and request a new token',
+        accessType: 'READ',
+        accepts: [],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/getServiceAuth`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getServiceAuth = async() => {
+        if (!this.login)
+            this.login = await requestToken();
+
+        if (!this.login) return;
+
+        if (Date.now() > this.login.expires)
+            this.login = await requestToken();
+
+        return this.login;
+    };
+
+    /**
+     * Requests a new Rocketchat token
+     */
+    async function requestToken() {
+        const models = Self.app.models;
+        const chatConfig = await models.ChatConfig.findOne();
+
+        const {data} = await axios.post(`${chatConfig.api}/login`, {
+            user: chatConfig.user,
+            password: chatConfig.password
+        });
+
+        const requestData = data.data;
+        if (requestData) {
+            return {
+                host: chatConfig.host,
+                api: chatConfig.api,
+                auth: {
+                    userId: requestData.userId,
+                    token: requestData.authToken
+                },
+                expires: Date.now() + (1000 * 60 * tokenLifespan)
+            };
+        }
+    }
+};

back/methods/chat/send.js

@@ -1,4 +1,4 @@
-const got = require('got');
+const axios = require('axios');
 module.exports = Self => {
     Self.remoteMethodCtx('send', {
         description: 'Send a RocketChat message',
@@ -30,122 +30,35 @@ module.exports = Self => {
         const sender = await models.Account.findById(accessToken.userId);
         const recipient = to.replace('@', '');
 
-        if (sender.name != recipient) {
-            let {body} = await sendMessage(sender, to, message);
-            if (body)
-                body = JSON.parse(body);
-            else
-                body = false;
-
-            return body;
-        }
-
-        return false;
+        if (sender.name != recipient)
+            return sendMessage(sender, to, message);
     };
 
     async function sendMessage(sender, channel, message) {
-        const config = await getConfig();
-        const avatar = `${config.host}/avatar/${sender.name}`;
-        const uri = `${config.api}/chat.postMessage`;
+        if (process.env.NODE_ENV !== 'production') {
+            return new Promise(resolve => {
+                return resolve({
+                    statusCode: 200,
+                    message: 'Fake notification sent'
+                });
+            });
+        }
 
-        return sendAuth(uri, {
+        const login = await Self.getServiceAuth();
+        const avatar = `${login.host}/avatar/${sender.name}`;
+
+        const options = {
+            headers: {
+                'X-Auth-Token': login.auth.token,
+                'X-User-Id': login.auth.userId
+            },
+        };
+
+        return axios.post(`${login.api}/chat.postMessage`, {
             'channel': channel,
             'avatar': avatar,
             'alias': sender.nickname,
             'text': message
-        }).catch(async error => {
-            if (error.statusCode === 401) {
-                this.auth = null;
-
-                return sendMessage(sender, channel, message);
-            }
-
-            throw new Error(error.message);
-        });
-    }
-
-    /**
-     * Returns a rocketchat token
-     * @return {Object} userId and authToken
-     */
-    async function getAuthToken() {
-        if (!this.auth || this.auth && !this.auth.authToken) {
-            const config = await getConfig();
-            const uri = `${config.api}/login`;
-            let {body} = await send(uri, {
-                user: config.user,
-                password: config.password
-            });
-
-            if (body) {
-                body = JSON.parse(body);
-                this.auth = body.data;
-            }
-        }
-
-        return this.auth;
-    }
-
-    /**
-     * Returns a rocketchat config
-     * @return {Object} Auth config
-     */
-    async function getConfig() {
-        if (!this.chatConfig) {
-            const models = Self.app.models;
-
-            this.chatConfig = await models.ChatConfig.findOne();
-        }
-
-        return this.chatConfig;
-    }
-
-    /**
-     * Send unauthenticated request
-     * @param {*} uri - Request uri
-     * @param {*} params - Request params
-     * @param {*} options - Request options
-     *
-     * @return {Object} Request response
-     */
-    async function send(uri, params, options = {}) {
-        if (process.env.NODE_ENV !== 'production') {
-            return new Promise(resolve => {
-                return resolve({
-                    body: JSON.stringify(
-                        {statusCode: 200, message: 'Fake notification sent'}
-                    )
-                });
-            });
-        }
-
-        const defaultOptions = {
-            form: params
-        };
-
-        if (options) Object.assign(defaultOptions, options);
-
-        return got.post(uri, defaultOptions);
-    }
-
-    /**
-     * Send authenticated request
-     * @param {*} uri - Request uri
-     * @param {*} body - Request params
-     *
-     * @return {Object} Request response
-     */
-    async function sendAuth(uri, body) {
-        const login = await getAuthToken();
-        const options = {
-            headers: {}
-        };
-
-        if (login) {
-            options.headers['X-Auth-Token'] = login.authToken;
-            options.headers['X-User-Id'] = login.userId;
-        }
-
-        return send(uri, body, options);
+        }, options);
     }
 };

back/methods/chat/sendCheckingPresence.js

@@ -1,21 +1,23 @@
+const axios = require('axios');
+
 module.exports = Self => {
     Self.remoteMethodCtx('sendCheckingPresence', {
-        description: 'Sends a RocketChat message to a working worker or department channel',
+        description: 'Sends a RocketChat message to a connected user or department channel',
         accessType: 'WRITE',
         accepts: [{
-            arg: 'workerId',
-            type: 'Number',
+            arg: 'recipientId',
+            type: 'number',
             required: true,
-            description: 'The worker id of the destinatary'
+            description: 'The recipient user id'
         },
         {
             arg: 'message',
-            type: 'String',
+            type: 'string',
             required: true,
             description: 'The message'
         }],
         returns: {
-            type: 'Object',
+            type: 'object',
             root: true
         },
         http: {
@@ -33,18 +35,19 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const models = Self.app.models;
-        const account = await models.Account.findById(recipientId, null, myOptions);
         const userId = ctx.req.accessToken.userId;
+        const recipient = await models.Account.findById(recipientId, null, myOptions);
 
+        // Prevent sending messages to yourself
         if (recipientId == userId) return false;
 
-        if (!account)
+        if (!recipient)
             throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
 
-        const query = `SELECT worker_isWorking(?) isWorking`;
-        const [result] = await Self.rawSql(query, [recipientId], myOptions);
-
-        if (!result.isWorking) {
+        const {data} = await Self.getUserStatus(recipient.name);
+        if (data) {
+            if (data.status === 'offline') {
+                // Send message to department room
                 const workerDepartment = await models.WorkerDepartment.findById(recipientId, {
                     include: {
                         relation: 'department'
@@ -54,9 +57,39 @@ module.exports = Self => {
                 const channelName = department && department.chatName;
 
                 if (channelName)
-                return Self.send(ctx, `#${channelName}`, `@${account.name} ➔ ${message}`);
+                    return Self.send(ctx, `#${channelName}`, `@${recipient.name} ➔ ${message}`);
+            } else
+                return Self.send(ctx, `@${recipient.name}`, message);
+        }
+    };
+
+    /**
+     * Returns the current user status on Rocketchat
+     *
+     * @param {string} username - The recipient user name
+     * @return {Promise} - The request promise
+     */
+    Self.getUserStatus = async function getUserStatus(username) {
+        if (process.env.NODE_ENV !== 'production') {
+            return new Promise(resolve => {
+                return resolve({
+                    data: {
+                        status: 'online'
+                    }
+                });
+            });
         }
 
-        return Self.send(ctx, `@${account.name}`, message);
+        const login = await Self.getServiceAuth();
+
+        const options = {
+            params: {username},
+            headers: {
+                'X-Auth-Token': login.auth.token,
+                'X-User-Id': login.auth.userId
+            },
+        };
+
+        return axios.get(`${login.api}/users.getStatus`, options);
     };
 };

back/methods/chat/spec/sendCheckingPresence.spec.js

@@ -1,37 +1,50 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
 describe('Chat sendCheckingPresence()', () => {
     const today = new Date();
     today.setHours(6, 0);
     const ctx = {req: {accessToken: {userId: 1}}};
-    const chatModel = app.models.Chat;
+    const chatModel = models.Chat;
     const departmentId = 23;
     const workerId = 1107;
 
-    it(`should call send() method with the worker name if he's currently working then return a response`, async() => {
+    it(`should call to send() method with "@HankPym" as recipient argument`, async() => {
         spyOn(chatModel, 'send').and.callThrough();
-
-        const timeEntry = await app.models.WorkerTimeControl.create({
-            userFk: workerId,
-            timed: today,
-            manual: false,
-            direction: 'in'
+        spyOn(chatModel, 'getUserStatus').and.returnValue(
+            new Promise(resolve => {
+                return resolve({
+                    data: {
+                        status: 'online'
+                    }
                 });
+            })
+        );
 
         const response = await chatModel.sendCheckingPresence(ctx, workerId, 'I changed something');
 
         expect(response.statusCode).toEqual(200);
         expect(response.message).toEqual('Fake notification sent');
         expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', 'I changed something');
-
-        // restores
-        await app.models.WorkerTimeControl.destroyById(timeEntry.id);
     });
 
-    it(`should call to send() method with the worker department channel if he's not currently working then return a response`, async() => {
+    it(`should call to send() method with "#cooler" as recipient argument`, async() => {
         spyOn(chatModel, 'send').and.callThrough();
+        spyOn(chatModel, 'getUserStatus').and.returnValue(
+            new Promise(resolve => {
+                return resolve({
+                    data: {
+                        status: 'offline'
+                    }
+                });
+            })
+        );
 
-        const department = await app.models.Department.findById(departmentId);
+        const tx = await models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const department = await models.Department.findById(departmentId, null, options);
             await department.updateAttribute('chatName', 'cooler');
 
             const response = await chatModel.sendCheckingPresence(ctx, workerId, 'I changed something');
@@ -40,7 +53,10 @@ describe('Chat sendCheckingPresence()', () => {
             expect(response.message).toEqual('Fake notification sent');
             expect(chatModel.send).toHaveBeenCalledWith(ctx, '#cooler', '@HankPym ➔ I changed something');
 
-        // restores
-        await department.updateAttribute('chatName', null);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

back/methods/collection/setSaleQuantity.js

@@ -0,0 +1,34 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('setSaleQuantity', {
+        description: 'Update sale quantity',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'saleId',
+            type: 'number',
+            required: true,
+            description: 'The sale id'
+        },
+        {
+            arg: 'quantity',
+            type: 'number',
+            required: true,
+            description: 'The quantity to picked'
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/setSaleQuantity`,
+            verb: 'POST'
+        }
+    });
+
+    Self.setSaleQuantity = async ctx => {
+        const args = ctx.args;
+        const models = Self.app.models;
+
+        const sale = await models.Sale.findById(args.saleId,);
+        return await sale.updateAttribute('quantity', args.quantity);
+    };
+};

back/methods/collection/spec/setSaleQuantity.spec.js

@@ -0,0 +1,23 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('setSaleQuantity()', () => {
+    it('should change quantity sale', async() => {
+        const saleId = 30;
+        const newQuantity = 10;
+
+        const ctx = {
+            args: {
+                saleId: saleId,
+                quantity: newQuantity
+            }
+        };
+
+        const originalSale = await models.Sale.findById(saleId);
+
+        await models.Collection.setSaleQuantity(ctx);
+        const updateSale = await models.Sale.findById(saleId);
+
+        expect(updateSale.quantity).toBeLessThan(originalSale.quantity);
+        expect(updateSale.quantity).toEqual(newQuantity);
+    });
+});

back/methods/collection/spec/updateCollectionSale.spec.js

@@ -1,62 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('updateCollectionSale()', () => {
-    it('should return a new collection', async() => {
-        const sectorOneWarehouseID = 1;
-        let ctx = {req: {accessToken: {userId: 1106}}};
-        ctx.args = {
-            sale: 1,
-            originalQuantity: 5,
-            quantity: 5,
-            quantityPicked: 5,
-            ticketFk: 1,
-            stateFk: 4,
-            isNicho: false,
-            shelvingFk: 'UXN',
-            itemFk: 1,
-            sectorFk: 1
-        };
-        let originalSaleTracking = await app.models.SaleTracking.findOne({
-            where: {
-                saleFk: ctx.args.sale,
-                stateFk: ctx.args.stateFk
-            }
-        });
-        let itemPlacement = await app.models.ItemPlacement.findOne({
-            where: {
-                itemFk: ctx.args.itemFk,
-                warehouseFk: sectorOneWarehouseID
-            }
-        });
-        const originalSale = await app.models.Sale.findById(ctx.args.sale);
-        const originalItemShelving = await app.models.ItemShelving.findOne({where: {shelvingFk: ctx.args.shelvingFk, itemFk: ctx.args.itemFk}});
-        const originalTicketLastState = await app.models.TicketLastState.findById(ctx.args.ticketFk);
-
-        let response = await app.models.Collection.updateCollectionSale(ctx);
-
-        expect(response.length).toBeGreaterThan(0);
-        expect(response[0][0].id).toEqual(1);
-        expect(response[0][0].quantity).toEqual(5);
-
-        // restores
-        if (originalSaleTracking)
-            await originalSaleTracking.save();
-        else {
-            originalSaleTracking = await app.models.SaleTracking.findOne({
-                where: {
-                    saleFk: ctx.args.sale,
-                    stateFk: ctx.args.stateFk
-                }
-            });
-            await originalSaleTracking.destroy();
-        }
-        await originalSale.save();
-        const itemShelvingsToDestroy = await app.models.ItemShelving.find({where: {shelvingFk: ctx.args.shelvingFk, itemFk: ctx.args.itemFk}});
-        for (itemShelving of itemShelvingsToDestroy)
-            await itemShelving.destroy();
-
-        await originalItemShelving.save();
-        await originalTicketLastState.save();
-        await itemPlacement.save();
-    });
-});

back/methods/collection/updateCollectionSale.js

@@ -1,90 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('updateCollectionSale', {
-        description: 'Update sale of a collection',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'sale',
-            type: 'Number',
-            required: true,
-            description: 'The sale id'
-        }, {
-            arg: 'originalQuantity',
-            type: 'Number',
-            required: true,
-            description: 'The quantity to sale'
-        },
-        {
-            arg: 'quantity',
-            type: 'Number',
-            required: true,
-            description: 'The quantity to picked'
-        },
-        {
-            arg: 'quantityPicked',
-            type: 'Number',
-            required: true,
-            description: 'The quantity to picked'
-        }, {
-            arg: 'ticketFk',
-            type: 'Number',
-            required: true,
-            description: 'The ticket id'
-        }, {
-            arg: 'stateFk',
-            type: 'Number',
-            required: true,
-            description: 'The state id'
-        }, {
-            arg: 'isNicho',
-            type: 'Boolean',
-            required: true,
-            description: 'Determine if sale is picked from nicho or not'
-        }, {
-            arg: 'shelvingFk',
-            type: 'String',
-            required: false,
-            description: 'The shelving id'
-        }, {
-            arg: 'itemFk',
-            type: 'Number',
-            required: true,
-            description: 'The item id'
-        }, {
-            arg: 'sectorFk',
-            type: 'Number',
-            required: true,
-            description: 'The sector id'
-        }],
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/updateCollectionSale`,
-            verb: 'POST'
-        }
-    });
-
-    Self.updateCollectionSale = async ctx => {
-        const userId = ctx.req.accessToken.userId;
-        const args = ctx.args;
-
-        if (args.originalQuantity == args.quantity) {
-            query = `CALL vn.collection_updateSale(?,?,?,?,?)`;
-            await Self.rawSql(query, [args.sale, args.originalQuantity, userId, args.stateFk, args.ticketFk]);
-        }
-
-        if (!args.isNicho) {
-            query = `CALL vn.collection_faults(?,?,?)`;
-            await Self.rawSql(query, [args.shelvingFk, args.quantityPicked, args.itemFk]);
-        } else {
-            query = `CALL vn.sector_getWarehouse(?)`;
-            const [result] = await Self.rawSql(query, [args.sectorFk]);
-
-            query = `CALL vn.itemPlacementSave(?,?,?)`;
-            await Self.rawSql(query, [args.shelvingFk, args.quantityPicked, result[0]['warehouseFk']]);
-        }
-        query = `CALL vn.sale_updateOriginalQuantity(?,?)`;
-        return await Self.rawSql(query, [args.sale, args.quantity]);
-    };
-};

back/methods/dms/uploadFile.js

@@ -9,35 +9,35 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'warehouseId',
-                type: 'Number',
+                type: 'number',
                 description: 'The warehouse id',
                 required: true
             }, {
                 arg: 'companyId',
-                type: 'Number',
+                type: 'number',
                 description: 'The company id',
                 required: true
             }, {
                 arg: 'dmsTypeId',
-                type: 'Number',
+                type: 'number',
                 description: 'The dms type id',
                 required: true
             }, {
                 arg: 'reference',
-                type: 'String',
+                type: 'string',
                 required: true
             }, {
                 arg: 'description',
-                type: 'String',
+                type: 'string',
                 required: true
             }, {
                 arg: 'hasFile',
-                type: 'Boolean',
+                type: 'boolean',
                 description: 'True if has an attached file',
                 required: true
             }],
         returns: {
-            type: 'Object',
+            type: 'object',
             root: true
         },
         http: {

back/methods/docuware/checkFile.js

@@ -0,0 +1,93 @@
+const got = require('got');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('checkFile', {
+        description: 'Check if exist docuware file',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The  id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'fileCabinet',
+                type: 'string',
+                required: true,
+                description: 'The fileCabinet name'
+            },
+            {
+                arg: 'dialog',
+                type: 'string',
+                required: true,
+                description: 'The dialog name'
+            }
+        ],
+        returns: {
+            type: 'boolean',
+            root: true
+        },
+        http: {
+            path: `/:id/checkFile`,
+            verb: 'POST'
+        }
+    });
+
+    Self.checkFile = async function(ctx, id, fileCabinet, dialog) {
+        const myUserId = ctx.req.accessToken.userId;
+        if (!myUserId)
+            return false;
+
+        const models = Self.app.models;
+        const docuwareConfig = await models.DocuwareConfig.findOne();
+        const docuwareInfo = await models.Docuware.findOne({
+            where: {
+                code: fileCabinet,
+                dialogName: dialog
+            }
+        });
+
+        const docuwareUrl = docuwareConfig.url;
+        const cookie = docuwareConfig.token;
+        const fileCabinetName = docuwareInfo.fileCabinetName;
+        const find = docuwareInfo.find;
+        const options = {
+            'headers': {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+                'Cookie': cookie
+            }
+        };
+        const searchFilter = {
+            condition: [
+                {
+                    DBName: find,
+                    Value: [id]
+                }
+            ]
+        };
+
+        try {
+            // get fileCabinetId
+            const fileCabinetResponse = await got.get(`${docuwareUrl}/FileCabinets`, options);
+            const fileCabinetJson = JSON.parse(fileCabinetResponse.body).FileCabinet;
+            const fileCabinetId = fileCabinetJson.find(dialogs => dialogs.Name === fileCabinetName).Id;
+
+            // get dialog
+            const dialogResponse = await got.get(`${docuwareUrl}/FileCabinets/${fileCabinetId}/dialogs`, options);
+            const dialogJson = JSON.parse(dialogResponse.body).Dialog;
+            const dialogId = dialogJson.find(dialogs => dialogs.DisplayName === 'find').Id;
+
+            // get docuwareID
+            Object.assign(options, {'body': JSON.stringify(searchFilter)});
+            const response = await got.post(
+                `${docuwareUrl}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`, options);
+            JSON.parse(response.body).Items[0].Id;
+
+            return true;
+        } catch (error) {
+            return false;
+        }
+    };
+};

back/methods/docuware/download.js

@@ -0,0 +1,120 @@
+/* eslint max-len: ["error", { "code": 180 }]*/
+const got = require('got');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('download', {
+        description: 'Download an docuware PDF',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'fileCabinet',
+                type: 'string',
+                description: 'The id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'dialog',
+                type: 'string',
+                description: 'The id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'string',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'string',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: `/:id/download/:fileCabinet/:dialog`,
+            verb: 'GET'
+        }
+    });
+
+    Self.download = async function(ctx, id, fileCabinet, dialog) {
+        const myUserId = ctx.req.accessToken.userId;
+        if (!myUserId)
+            throw new UserError(`You don't have enough privileges`);
+
+        const models = Self.app.models;
+        const docuwareConfig = await models.DocuwareConfig.findOne();
+        const docuwareInfo = await models.Docuware.findOne({
+            where: {
+                code: fileCabinet,
+                dialogName: dialog
+            }
+        });
+
+        const docuwareUrl = docuwareConfig.url;
+        const cookie = docuwareConfig.token;
+        const fileCabinetName = docuwareInfo.fileCabinetName;
+        const find = docuwareInfo.find;
+        const options = {
+            'headers': {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+                'Cookie': cookie
+            }
+        };
+        const searchFilter = {
+            condition: [
+                {
+                    DBName: find,
+                    Value: [id]
+                }
+            ]
+        };
+
+        try {
+            // get fileCabinetId
+            const fileCabinetResponse = await got.get(`${docuwareUrl}/FileCabinets`, options);
+            const fileCabinetJson = JSON.parse(fileCabinetResponse.body).FileCabinet;
+            const fileCabinetId = fileCabinetJson.find(dialogs => dialogs.Name === fileCabinetName).Id;
+
+            // get dialog
+            const dialogResponse = await got.get(`${docuwareUrl}/FileCabinets/${fileCabinetId}/dialogs`, options);
+            const dialogJson = JSON.parse(dialogResponse.body).Dialog;
+            const dialogId = dialogJson.find(dialogs => dialogs.DisplayName === 'find').Id;
+
+            // get docuwareID
+            Object.assign(options, {'body': JSON.stringify(searchFilter)});
+            const response = await got.post(`${docuwareUrl}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`, options);
+            const docuwareId = JSON.parse(response.body).Items[0].Id;
+
+            // download & save file
+            const fileName = `filename="${id}.pdf"`;
+            const contentType = 'application/pdf';
+            const downloadUri = `${docuwareUrl}/FileCabinets/${fileCabinetId}/Documents/${docuwareId}/FileDownload?targetFileType=Auto&keepAnnotations=false`;
+            const downloadOptions = {
+                'headers': {
+                    'Cookie': cookie
+                }
+            };
+
+            const stream = got.stream(downloadUri, downloadOptions);
+
+            return [stream, contentType, fileName];
+        } catch (error) {
+            if (error.code === 'ENOENT')
+                throw new UserError('The DOCUWARE PDF document does not exists');
+
+            throw error;
+        }
+    };
+};

back/methods/docuware/specs/checkFile.spec.js

@@ -0,0 +1,64 @@
+const models = require('vn-loopback/server/server').models;
+const got = require('got');
+
+describe('docuware download()', () => {
+    const ticketId = 1;
+    const userId = 9;
+    const ctx = {
+        req: {
+
+            accessToken: {userId: userId},
+            headers: {origin: 'http://localhost:5000'},
+        }
+    };
+
+    const fileCabinetName = 'deliveryClientTest';
+    const dialogDisplayName = 'find';
+    const dialogName = 'findTest';
+
+    const gotGetResponse = {
+        body: JSON.stringify(
+            {
+                FileCabinet: [
+                    {Id: 12, Name: fileCabinetName}
+                ],
+                Dialog: [
+                    {Id: 34, DisplayName: dialogDisplayName}
+                ]
+            })
+    };
+
+    it('should return exist file in docuware', async() => {
+        const gotPostResponse = {
+            body: JSON.stringify(
+                {
+                    Items: [
+                        {Id: 56}
+                    ],
+                })
+        };
+
+        spyOn(got, 'get').and.returnValue(new Promise(resolve => resolve(gotGetResponse)));
+        spyOn(got, 'post').and.returnValue(new Promise(resolve => resolve(gotPostResponse)));
+
+        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, dialogName);
+
+        expect(result).toEqual(true);
+    });
+
+    it('should return not exist file in docuware', async() => {
+        const gotPostResponse = {
+            body: JSON.stringify(
+                {
+                    Items: [],
+                })
+        };
+
+        spyOn(got, 'get').and.returnValue(new Promise(resolve => resolve(gotGetResponse)));
+        spyOn(got, 'post').and.returnValue(new Promise(resolve => resolve(gotPostResponse)));
+
+        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, dialogName);
+
+        expect(result).toEqual(false);
+    });
+});

back/methods/docuware/specs/download.spec.js

@@ -0,0 +1,50 @@
+const models = require('vn-loopback/server/server').models;
+const got = require('got');
+const stream = require('stream');
+
+describe('docuware download()', () => {
+    const userId = 9;
+    const ticketId = 1;
+    const ctx = {
+        req: {
+
+            accessToken: {userId: userId},
+            headers: {origin: 'http://localhost:5000'},
+        }
+    };
+
+    it('should return the downloaded file name', async() => {
+        const fileCabinetName = 'deliveryClientTest';
+        const dialogDisplayName = 'find';
+        const dialogName = 'findTest';
+        const gotGetResponse = {
+            body: JSON.stringify(
+                {
+                    FileCabinet: [
+                        {Id: 12, Name: fileCabinetName}
+                    ],
+                    Dialog: [
+                        {Id: 34, DisplayName: dialogDisplayName}
+                    ]
+                })
+        };
+
+        const gotPostResponse = {
+            body: JSON.stringify(
+                {
+                    Items: [
+                        {Id: 56}
+                    ],
+                })
+        };
+
+        spyOn(got, 'get').and.returnValue(new Promise(resolve => resolve(gotGetResponse)));
+        spyOn(got, 'post').and.returnValue(new Promise(resolve => resolve(gotPostResponse)));
+        spyOn(got, 'stream').and.returnValue(new stream.PassThrough({objectMode: true}));
+
+        const result = await models.Docuware.download(ctx, ticketId, fileCabinetName, dialogName);
+
+        expect(result[1]).toEqual('application/pdf');
+        expect(result[2]).toEqual(`filename="${ticketId}.pdf"`);
+    });
+});

back/model-config.json

@@ -44,6 +44,12 @@
     "DmsType": {
         "dataSource": "vn"
     },
+    "Docuware": {
+        "dataSource": "vn"
+    },
+    "DocuwareConfig": {
+        "dataSource": "vn"
+    },
     "EmailUser": {
         "dataSource": "vn"
     },

back/models/chat.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
+    require('../methods/chat/getServiceAuth')(Self);
     require('../methods/chat/send')(Self);
     require('../methods/chat/sendCheckingPresence')(Self);
     require('../methods/chat/notifyIssues')(Self);

back/models/collection.js

@@ -2,6 +2,6 @@ module.exports = Self => {
     require('../methods/collection/getCollection')(Self);
     require('../methods/collection/newCollection')(Self);
     require('../methods/collection/getSectors')(Self);
-    require('../methods/collection/updateCollectionSale')(Self);
+    require('../methods/collection/setSaleQuantity')(Self);
     require('../methods/collection/collectionFaults')(Self);
 };

back/models/company.json

@@ -18,9 +18,6 @@
         },
         "expired": {
             "type": "date"
-        },
-        "isOfficial": {
-            "type": "boolean"
         }
     },
 

back/models/docuware-config.json

@@ -0,0 +1,32 @@
+{
+    "name": "DocuwareConfig",
+    "description": "Docuware config",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "docuwareConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "url": {
+            "type": "string"
+        },
+        "token": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "property": "*",
+            "accessType": "*",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+	    }
+    ]
+}

back/models/docuware.js

@@ -0,0 +1,4 @@
+module.exports = Self => {
+    require('../methods/docuware/download')(Self);
+    require('../methods/docuware/checkFile')(Self);
+};

back/models/docuware.json

@@ -0,0 +1,38 @@
+{
+    "name": "Docuware",
+    "description": "Docuware sections",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "docuware"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "code": {
+            "type": "string"
+        },
+        "fileCabinetName": {
+            "type": "string"
+        },
+        "dialogName": {
+            "type": "string"
+        },
+        "find": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "property": "*",
+            "accessType": "*",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+	    }
+    ]
+}

db/changes/10360-september/00-ACL.sql

@@ -1,4 +0,0 @@
-DELETE FROM `salix`.`ACL` WHERE id = 48;
-DELETE FROM `salix`.`ACL` WHERE id = 49;
-DELETE FROM `salix`.`ACL` WHERE id = 50;
-DELETE FROM `salix`.`ACL` WHERE id = 107;

db/changes/10360-september/00-sale_problems.sql

@@ -1,197 +0,0 @@
-drop procedure `vn`.`sale_getProblems`;
-
-DELIMITER $$
-$$
-create
-    definer = root@`%` procedure `vn`.`sale_getProblems`(IN vIsTodayRelative tinyint(1))
-BEGIN
-/**
- * Calcula los problemas de cada venta 
- * para un conjunto de tickets.
- *
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
- * @return tmp.sale_problems
- */
-    DECLARE vWarehouse INT;
-    DECLARE vDate DATE;
-    DECLARE vAvailableCache INT;
-    DECLARE vDone INT DEFAULT 0;
-   	DECLARE vComponentCount INT;
-
-    DECLARE vCursor CURSOR FOR
-        SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, CURDATE(), date(tt.shipped))
-            FROM tmp.sale_getProblems tt
-            WHERE DATE(tt.shipped) BETWEEN CURDATE()
-                AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), CURDATE());
-  
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale_problems;
-    CREATE TEMPORARY TABLE tmp.sale_problems (
-        ticketFk INT(11),
-        saleFk INT(11),
-        isFreezed INTEGER(1) DEFAULT 0,
-        risk DECIMAL(10,2) DEFAULT 0,
-        hasHighRisk TINYINT(1) DEFAULT 0,
-        hasTicketRequest INTEGER(1) DEFAULT 0,
-        isAvailable INTEGER(1) DEFAULT 1,
-        itemShortage VARCHAR(250),
-        isTaxDataChecked  INTEGER(1) DEFAULT 1,
-        itemDelay VARCHAR(250), 
-        hasComponentLack INTEGER(1),
-        PRIMARY KEY (ticketFk, saleFk)
-    ) ENGINE = MEMORY;
-
-     DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
-        CREATE TEMPORARY TABLE tmp.ticket_list
-        (PRIMARY KEY (ticketFk))
-         ENGINE = MEMORY
-            SELECT tp.ticketFk, c.id clientFk
-                FROM tmp.sale_getProblems tp
-        JOIN vn.client c ON c.id = tp.clientFk;
- 
-    SELECT COUNT(*) INTO vComponentCount
-    	FROM vn.component c 
-    	WHERE c.isRequired;
-    
-    INSERT INTO tmp.sale_problems(ticketFk, hasComponentLack, saleFk)
-    	SELECT tl.ticketFk, (COUNT(DISTINCT s.id) * vComponentCount > COUNT(c.id)), s.id 
-            FROM tmp.ticket_list tl
-            	JOIN vn.sale s ON s.ticketFk = tl.ticketFk
-            	LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id 
-            	LEFT JOIN vn.component c ON c.id = sc.componentFk AND c.isRequired 
-                JOIN vn.ticket t ON t.id = tl.ticketFk
-                JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-                JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
-                WHERE dm.code IN('AGENCY','DELIVERY','PICKUP')
-            GROUP BY tl.ticketFk, s.id;
-         
-    INSERT INTO tmp.sale_problems(ticketFk, isFreezed)
-        SELECT DISTINCT tl.ticketFk, TRUE
-            FROM tmp.ticket_list tl
-                JOIN vn.client c ON c.id = tl.clientFk
-            WHERE c.isFreezed
-            ON DUPLICATE KEY UPDATE
-            isFreezed = c.isFreezed;
-            
-     DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
-     CREATE TEMPORARY TABLE tmp.clientGetDebt
-        (PRIMARY KEY (clientFk))
-        ENGINE = MEMORY
-            SELECT DISTINCT clientFk
-                FROM tmp.ticket_list;
-
-    CALL clientGetDebt(CURDATE());
-
-    INSERT INTO tmp.sale_problems(ticketFk, risk, hasHighRisk)
-        SELECT DISTINCT tl.ticketFk, r.risk, ((r.risk - cc.riskTolerance) > c.credit + 10)
-            FROM tmp.ticket_list tl
-                JOIN vn.ticket t ON t.id = tl.ticketFk
-                JOIN vn.agencyMode a ON t.agencyModeFk = a.id
-                JOIN tmp.risk r ON r.clientFk = t.clientFk
-                JOIN vn.client c ON c.id = t.clientFk
-                JOIN vn.clientConfig cc
-            WHERE r.risk > c.credit + 10
-                AND a.isRiskFree = FALSE
-        ON DUPLICATE KEY UPDATE
-            risk = r.risk, hasHighRisk = ((r.risk - cc.riskTolerance) > c.credit + 10);
-     
-    INSERT INTO tmp.sale_problems(ticketFk, hasTicketRequest)
-        SELECT DISTINCT tl.ticketFk, TRUE
-            FROM tmp.ticket_list tl
-                JOIN vn.ticketRequest tr ON tr.ticketFk = tl.ticketFk
-            WHERE tr.isOK IS NULL
-        ON DUPLICATE KEY UPDATE
-            hasTicketRequest = TRUE;
-
-    OPEN vCursor;
-
-    WHILE NOT vDone
-    DO
-        FETCH vCursor INTO vWarehouse, vDate;
-   
-        CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouse, vDate);
-
-        INSERT INTO tmp.sale_problems(ticketFk, isAvailable, saleFk)
-            SELECT tl.ticketFk, FALSE, s.id
-                FROM tmp.ticket_list tl
-                    JOIN vn.ticket t ON t.id = tl.ticketFk
-                    JOIN vn.sale s ON s.ticketFk = t.id
-                    JOIN vn.item i ON i.id = s.itemFk
-                    JOIN vn.itemType it on it.id = i.typeFk
-                    LEFT JOIN cache.available av ON av.item_id = i.id
-                    AND av.calc_id = vAvailableCache
-                WHERE date(t.shipped) = vDate
-                    AND it.categoryFk != 6
-                    AND IFNULL(av.available, 0) < 0
-                    AND s.isPicked = FALSE
-                    AND NOT i.generic
-                    AND vWarehouse = t.warehouseFk
-                GROUP BY tl.ticketFk
-            ON DUPLICATE KEY UPDATE
-                isAvailable = FALSE, saleFk = VALUES(saleFk);
-
-    INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
-    	SELECT ticketFk, problem, saleFk
-    	FROM (
-        SELECT tl.ticketFk, CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')) problem, s.id AS saleFk
-            FROM tmp.ticket_list tl
-                JOIN vn.ticket t ON t.id = tl.ticketFk
-                JOIN vn.sale s ON s.ticketFk = t.id
-                JOIN vn.item i ON i.id = s.itemFk
-                JOIN vn.itemType it on it.id = i.typeFk
-                LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk 
-                LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
-            WHERE IFNULL(av.available, 0) < 0
-                AND s.quantity > IFNULL(issw.visible, 0)
-                AND s.quantity > 0
-                AND s.isPicked = FALSE
-                AND s.reserved = FALSE
-                AND it.categoryFk != 6
-                AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
-                AND NOT i.generic
-                AND CURDATE() = vDate
-                AND t.warehouseFk = vWarehouse
-            GROUP BY tl.ticketFk LIMIT 1) sub
-        ON DUPLICATE KEY UPDATE
-            itemShortage = sub.problem, saleFk = sub.saleFk;
-
-           INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
-           SELECT ticketFk, problem, saleFk
-    		FROM (
-	        SELECT tl.ticketFk, GROUP_CONCAT('I: ',i.id, ' ', i.longName, ' ') problem, s.id AS saleFk
-	            FROM tmp.ticket_list tl
-	                JOIN vn.ticket t ON t.id = tl.ticketFk
-	                JOIN vn.sale s ON s.ticketFk = t.id
-	                JOIN vn.item i ON i.id = s.itemFk
-	                JOIN vn.itemType it on it.id = i.typeFk
-	              	LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk 
-               WHERE s.quantity > IFNULL(issw.visible, 0)
-	                AND s.quantity > 0
-	                AND s.isPicked = FALSE
-	                AND s.reserved = FALSE
-	                AND it.categoryFk != 6
-	                AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
-                	AND NOT i.generic
-	                AND CURDATE() = vDate
-	                AND t.warehouseFk = vWarehouse
-	            GROUP BY tl.ticketFk LIMIT 1) sub
-        ON DUPLICATE KEY UPDATE
-            itemDelay = sub.problem, saleFk = sub.saleFk;
-    END WHILE;
-
-    CLOSE vCursor;
-	
-	INSERT INTO tmp.sale_problems(ticketFk, isTaxDataChecked)
-        SELECT DISTINCT tl.ticketFk, FALSE
-            FROM tmp.ticket_list tl
-                JOIN vn.client c ON c.id = tl.clientFk
-            WHERE c.isTaxDataChecked = FALSE
-		ON DUPLICATE KEY UPDATE
-            isTaxDataChecked = FALSE;
-
-    DROP TEMPORARY TABLE
-        tmp.clientGetDebt,
-        tmp.ticket_list; 
-END;;$$
-DELIMITER ;

db/changes/10360-september/00-ticket_getProblems.sql

@@ -1,48 +0,0 @@
-drop procedure `vn`.`ticket_getProblems`;
-
-DELIMITER $$
-$$
-create
-    definer = root@`%` procedure `vn`.`ticket_getProblems`(IN vIsTodayRelative tinyint(1))
-BEGIN
-/**
- * Calcula los problemas para un conjunto de tickets.
- * Agrupados por ticket
- *
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
- * @return tmp.ticket_problems
- */
-    CALL sale_getProblems(vIsTodayRelative);
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticket_problems;
-    CREATE TEMPORARY TABLE tmp.ticket_problems 
-    (INDEX (ticketFk))
-    ENGINE = MEMORY
-    SELECT 
-        ticketFk,
-        MAX(p.isFreezed)            AS isFreezed,
-        MAX(p.risk)                 AS risk,
-        MAX(p.hasHighRisk)          AS hasHighRisk,
-        MAX(p.hasTicketRequest)     AS hasTicketRequest,
-        MIN(p.isAvailable)          AS isAvailable,
-        MAX(p.itemShortage)         AS itemShortage,
-        MIN(p.isTaxDataChecked)     AS isTaxDataChecked,
-        MAX(p.hasComponentLack)     AS hasComponentLack,
-        0 AS totalProblems
-     FROM tmp.sale_problems p
-        GROUP BY ticketFk;
-
-    UPDATE tmp.ticket_problems tp
-        SET tp.totalProblems = (
-            (tp.isFreezed) +
-            IF(tp.risk, TRUE, FALSE) +
-            (tp.hasTicketRequest) +
-            (tp.isAvailable = 0) +
-            (tp.isTaxDataChecked = 0) +
-            (tp.hasComponentLack)
-        );
-
-    DROP TEMPORARY TABLE
-        tmp.sale_problems;
-END;;$$
-DELIMITER ;

db/changes/10360-september/01-travelThermograph.sql

@@ -1 +0,0 @@
-alter table `vn`.`travelThermograph` modify `temperature` enum('COOL', 'WARM') null;

db/changes/10370-pickles/00-ACL.sql

@@ -1 +0,0 @@
-UPDATE salix.ACL t SET t.principalId = 'employee' WHERE t.id = 269;

db/changes/10370-pickles/00-accountingType.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.accountingType ADD maxAmount INT DEFAULT NULL NULL;
-
-UPDATE vn.accountingType SET maxAmount = 1000 WHERE code = 'cash';

db/changes/10370-pickles/00-payMethod.sql

@@ -1,4 +0,0 @@
-ALTER TABLE vn.payMethod CHANGE ibanRequired ibanRequiredForClients tinyint(3) DEFAULT 0 NULL;
-ALTER TABLE vn.payMethod ADD ibanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL;
-ALTER TABLE vn.payMethod CHANGE ibanRequiredForSuppliers ibanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL AFTER ibanRequiredForClients;
-UPDATE vn.payMethod SET ibanRequiredForSuppliers = 1 WHERE code = 'wireTransfer';

db/changes/10370-pickles/00-silexACL.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.silexACL MODIFY module VARCHAR(50) NOT NULL;
-ALTER TABLE vn.silexACL MODIFY method VARCHAR(50) NOT NULL;

db/changes/10370-pickles/00-ticket_getProblems.sql

@@ -1,48 +0,0 @@
-drop procedure `vn`.`ticket_getProblems`;
-
-DELIMITER $$
-$$
-create
-    definer = root@`%` procedure `vn`.`ticket_getProblems`(IN vIsTodayRelative tinyint(1))
-BEGIN
-/**
- * Calcula los problemas para un conjunto de tickets.
- * Agrupados por ticket
- *
- * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
- * @return tmp.ticket_problems
- */
-    CALL sale_getProblems(vIsTodayRelative);
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticket_problems;
-    CREATE TEMPORARY TABLE tmp.ticket_problems 
-    (PRIMARY KEY (ticketFk))
-    ENGINE = MEMORY
-    SELECT 
-        ticketFk,
-        MAX(p.isFreezed)            AS isFreezed,
-        MAX(p.risk)                 AS risk,
-        MAX(p.hasHighRisk)          AS hasHighRisk,
-        MAX(p.hasTicketRequest)     AS hasTicketRequest,
-        MIN(p.isAvailable)          AS isAvailable,
-        MAX(p.itemShortage)         AS itemShortage,
-        MIN(p.isTaxDataChecked)     AS isTaxDataChecked,
-        MAX(p.hasComponentLack)     AS hasComponentLack,
-        0 AS totalProblems
-     FROM tmp.sale_problems p
-        GROUP BY ticketFk;
-
-    UPDATE tmp.ticket_problems tp
-        SET tp.totalProblems = (
-            (tp.isFreezed) +
-            IF(tp.risk, TRUE, FALSE) +
-            (tp.hasTicketRequest) +
-            (tp.isAvailable = 0) +
-            (tp.isTaxDataChecked = 0) +
-            (tp.hasComponentLack)
-        );
-
-    DROP TEMPORARY TABLE
-        tmp.sale_problems;
-END;;$$
-DELIMITER ;

db/changes/10380-allsaints/00-defaultViewConfig.sql

@@ -1,14 +0,0 @@
-CREATE TABLE `salix`.`defaultViewConfig`
-(
-	tableCode VARCHAR(25) not null,
-	columns JSON not null
-)
-comment 'The default configuration of columns for views';
-
-INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
-	VALUES 
-		('itemsIndex', '{"intrastat":false,"stemMultiplier":false,"landed":false}'),
-		('latestBuys', '{"intrastat":false,"description":false,"density":false,"isActive":false,"freightValue":false,"packageValue":false,"isIgnored":false,"price2":false,"minPrice":true,"ektFk":false,"weight":false,"id":true,"packing":true,"grouping":true,"quantity":true,"size":false,"name":true,"code":true,"origin":true,"family":true,"entryFk":true,"buyingValue":true,"comissionValue":false,"price3":true,"packageFk":true,"packingOut":true}'),
-		('ticketsMonitor', '{"id":false}');
-
-		

db/changes/10390-constitution/00-absenceType.sql

@@ -1,3 +0,0 @@
-UPDATE vn.absenceType
-	SET code='halfPaidLeave'
-	WHERE id=15 AND name='Permiso retribuido 1/2 día' AND rgb='#5151c0' AND code IS NULL AND permissionRate=NULL AND holidayEntitlementRate=0.50 AND discountRate=0.00;

db/changes/10390-constitution/00-acl.sql

@@ -1,27 +0,0 @@
-INSERT INTO `salix`.`ACL`
-    (model, property, accessType, permission, principalType, principalId)
-    VALUES
-        ('EntryObservation', '*', '*', 'ALLOW', 'ROLE', 'buyer'),
-        ('LdapConfig', '*', '*', 'ALLOW', 'ROLE', 'sysadmin'),
-        ('SambaConfig', '*', '*', 'ALLOW', 'ROLE', 'sysadmin'),
-        ('ACL', '*', '*', 'ALLOW', 'ROLE', 'developer'),
-        ('AccessToken', '*', '*', 'ALLOW', 'ROLE', 'developer'),
-        ('MailAliasAccount', '*', '*', 'ALLOW', 'ROLE', 'marketing'),
-        ('MailAliasAccount', '*', '*', 'ALLOW', 'ROLE', 'hr'),
-        ('MailAlias', '*', '*', 'ALLOW', 'ROLE', 'hr'),
-        ('MailForward', '*', '*', 'ALLOW', 'ROLE', 'marketing'),
-        ('MailForward', '*', '*', 'ALLOW', 'ROLE', 'hr'),
-        ('RoleInherit', '*', '*', 'ALLOW', 'ROLE', 'it'),
-        ('RoleRole', '*', '*', 'ALLOW', 'ROLE', 'it'),
-        ('AccountConfig', '*', '*', 'ALLOW', 'ROLE', 'sysadmin');
-
-UPDATE `salix`.`ACL`
-    SET accessType='*', principalId='it'
-    WHERE model = 'Role';
-
-DELETE FROM `salix`.`ACL`
-    WHERE id IN (280, 281);
-
-UPDATE `salix`.`ACL`
-    SET accessType='*', principalId='marketing'
-    WHERE id=279;

db/changes/10390-constitution/00-defaultViewConfig.sql

@@ -1,5 +0,0 @@
-UPDATE `salix`.`defaultViewConfig`
-	SET `columns` = '{"intrastat":false,"description":false,"density":false,"isActive":false,
-	"freightValue":false,"packageValue":false,"isIgnored":false,"price2":false,"ektFk":false,"weight":false,
-	"size":false,"comissionValue":false,"landing":false}'
-	WHERE tableCode = 'latestBuys'

db/changes/10390-constitution/00-department.sql

@@ -1,33 +0,0 @@
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=96;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=95;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=115;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=123;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=94;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=101;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=80;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=125;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=98;
-UPDATE vn.department
-	SET notificationEmail='direccioncomercial@verdnatura.es'
-	WHERE id=92;
-UPDATE vn.department
-	SET notificationEmail=''
-	WHERE id=43;

db/changes/10390-constitution/00-item_getBalance.sql

@@ -1,142 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`item_getBalance`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`item_getBalance`(IN vItemId int, IN vWarehouse int)
-BEGIN
-    DECLARE vDateInventory DATETIME;
-    DECLARE vCurdate DATE DEFAULT CURDATE();
-    DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
-
-    SELECT inventoried INTO vDateInventory FROM config;
-    SET @a = 0;
-    SET @currentLineFk = 0;
-    SET @shipped = '';
-
-    SELECT DATE(@shipped:= shipped) shipped,
-        alertLevel,
-        stateName,
-        origin,
-        reference,
-        clientFk,
-        name,
-        `in` AS invalue,
-        `out`,
-        @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
-        @currentLineFk := IF (@shipped < CURDATE() 
-                            OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)),
-                        lineFk,@currentLineFk) lastPreparedLineFk,
-        isTicket,
-        lineFk,
-        isPicked,
-        clientType,
-        claimFk
-        FROM
-            ( SELECT  tr.landed AS shipped,
-                    b.quantity AS `in`,
-                    NULL AS `out`,
-                    al.id AS alertLevel,
-                    st.name AS stateName,
-                    s.name AS name,
-                    e.ref AS reference,
-                    e.id AS origin,
-                    s.id AS clientFk,
-                    IF(al.id = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id lineFk,
-                    NULL `order`,
-                    NULL AS clientType,
-                    NULL AS claimFk
-                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
-                    JOIN alertLevel al ON al.id = 
-                        CASE
-                            WHEN tr.shipped < CURDATE() THEN 3
-                            WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.landed >= vDateInventory
-                    AND vWarehouse = tr.warehouseInFk 
-                    AND b.itemFk = vItemId
-                    AND e.isInventory = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
-
-            SELECT tr.shipped,
-                    NULL,
-                    b.quantity,
-                    al.id,
-                    st.name,
-                    s.name,
-                    e.ref,
-                    e.id,
-                    s.id,
-                    IF(al.id = 3, TRUE, FALSE),
-                    FALSE,
-                    b.id,
-                    NULL,
-                    NULL,
-                    NULL
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN warehouse w ON w.id = tr.warehouseOutFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.id = 
-                        CASE
-                            WHEN tr.shipped < CURDATE() THEN 3
-                            WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.shipped >= vDateInventory
-                    AND vWarehouse =tr.warehouseOutFk
-                    AND s.id <> 4
-                    AND b.itemFk = vItemId
-                    AND e.isInventory = FALSE
-                    AND w.isFeedStock = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
-
-            SELECT DATE(t.shipped),
-                NULL,
-                s.quantity,
-                al.id,
-                st.name,
-                t.nickname,
-                t.refFk,
-                t.id,
-                t.clientFk,
-                stk.id,
-                TRUE,
-                s.id,
-                st.`order`,
-                ct.code,
-                cb.claimFk
-                FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk
-                    LEFT JOIN ticketState ts ON ts.ticket = 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 alertLevel al ON al.id = 
-                        CASE
-                            WHEN t.shipped < curdate() THEN 3
-                            WHEN t.shipped > util.dayEnd(curdate()) THEN 0
-                            ELSE IFNULL(ts.alertLevel, 0)
-                        END
-                    LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-                    LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
-                    LEFT JOIN claimBeginning cb ON s.id = cb.saleFk 
-                WHERE t.shipped >= vDateInventory
-                    AND s.itemFk = vItemId
-                    AND vWarehouse =t.warehouseFk
-                ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
-            ) AS itemDiary;
-
-END;
-$$
-DELIMITER ;

db/changes/10390-constitution/00-payMethod.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.payMethod CHANGE ibanRequiredForClients isIbanRequiredForClients tinyint(3) DEFAULT 0 NULL;
-ALTER TABLE vn.payMethod CHANGE ibanRequiredForSuppliers isIbanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL;

db/changes/10390-constitution/00-sale_recalcComponent.sql

@@ -1,120 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`sale_recalcComponent`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_recalcComponent`(vOption INT)
-proc: BEGIN
-/**  
- * Actualiza los componentes
- *
- * @table tmp.recalculateSales
- */ 
-	DECLARE vShipped DATE; 
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vTicketFk BIGINT;
-    DECLARE vItemFk BIGINT;
-    DECLARE vLanded DATE; 
-    DECLARE vIsEditable BOOLEAN;
-    DECLARE vZoneFk INTEGER;
-   	DECLARE vOption INTEGER;
-   
-    DECLARE vSale INTEGER;
-    DECLARE vDone BOOL DEFAULT FALSE;
-    
-	DECLARE vCur CURSOR FOR
-		SELECT id from tmp.recalculateSales;
-        
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; 
-	   
-	OPEN vCur;
-
-	l: LOOP
-		SET vDone = FALSE;
-		FETCH vCur INTO vSale; 
-		
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-    
-		SELECT t.refFk IS NULL AND (IFNULL(ts.alertLevel, 0) = 0 OR s.price = 0), 
-					s.ticketFk, 
-					s.itemFk , 
-					t.zoneFk, 
-					t.warehouseFk, 
-					t.shipped, 
-					t.addressFk, 
-					t.agencyModeFk, 
-					t.landed
-				INTO vIsEditable, 
-					vTicketFk, 
-					vItemFk, 
-					vZoneFk, 
-					vWarehouseFk, 
-					vShipped, 
-					vAddressFk, 
-					vAgencyModeFk, 
-					vLanded
-			FROM ticket t
-				JOIN sale s ON s.ticketFk = t.id
-				LEFT JOIN ticketState ts ON ts.ticketFk = t.id
-			WHERE s.id = vSale;
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-	
-		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
-			CALL util.throw('There is no zone for these parameters');
-		END IF;
-	
-		IF vLanded IS NULL OR vZoneFk IS NULL THEN
-	
-			UPDATE ticket t
-				SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
-				WHERE t.id = vTicketFk AND t.landed IS NULL;
-	
-			IF vZoneFk IS NULL THEN
-				SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-				UPDATE ticket t
-					SET t.zoneFk = vZoneFk
-					WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
-			END IF;
-			
-		END IF;
-	
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-	        
-		-- rellena la tabla buyUltimate con la ultima compra	
-	    CALL buyUltimate (vWarehouseFk, vShipped);  
-	    
-		DELETE FROM tmp.buyUltimate WHERE itemFk != vItemFk;
-	    
-	    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	    CREATE TEMPORARY TABLE tmp.ticketLot 
-			SELECT vWarehouseFk warehouseFk, NULL available, vItemFk itemFk, buyFk, vZoneFk zoneFk
-					FROM tmp.buyUltimate
-					WHERE itemFk = vItemFk;
-	                    
-		CALL catalog_componentPrepare();           
-		CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-	
-	    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-		CREATE TEMPORARY TABLE tmp.sale
-						(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT vSale saleFk,vWarehouseFk warehouseFk;
-	
-		IF vOption IS NULL THEN
-			SET vOption = IF(vIsEditable, 1, 6);
-    	END IF;
-	    
-		CALL ticketComponentUpdateSale(vOption); 
-	    CALL catalog_componentPurge();
-	    
-		DROP TEMPORARY TABLE tmp.buyUltimate;
-	    DROP TEMPORARY TABLE tmp.sale;
-	   
-	END LOOP;
-	CLOSE vCur; 
-
-END$$
-DELIMITER ;

db/changes/10390-constitution/01-sale_calculateComponent.sql

@@ -1,23 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`sale_calculateComponent`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_calculateComponent`(vSale INT, vOption INT)
-proc: BEGIN
-/**
- * Crea tabla temporal para vn.sale_recalcComponent() para recalcular los componentes
- *
- * @param vSale Id de la venta
- * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
- */  
-	DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
-    CREATE TEMPORARY TABLE tmp.recalculateSales
-        SELECT s.id
-            FROM sale s
-            WHERE s.id = vSale;
-           
-    CALL vn.sale_recalcComponent(vOption);
-   
-    DROP TEMPORARY TABLE tmp.recalculateSales;
-END$$
-DELIMITER ;

db/changes/10400-christmas/00-ACL.sql

@@ -1,2 +0,0 @@
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Sale','payBack','WRITE','ALLOW','ROLE','employee');

db/changes/10400-christmas/00-payMethod_hasVerified.sql

@@ -1 +0,0 @@
-ALTER TABLE `vn`.`payMethod` ADD hasVerified TINYINT(1) DEFAULT 0 NULL;

db/changes/10400-christmas/00-ticket_doRefund.sql

@@ -1,90 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(IN vOriginTicket INT, OUT vNewTicket INT)
-BEGIN
-	
-	DECLARE vDone BIT DEFAULT 0;
-	DECLARE vCustomer MEDIUMINT;
-	DECLARE vWarehouse TINYINT;
-	DECLARE vCompany MEDIUMINT;
-	DECLARE vAddress MEDIUMINT;
-    DECLARE vRefundAgencyMode INT;
-    DECLARE vItemFk INT;
-    DECLARE vQuantity DECIMAL (10,2);
-    DECLARE vConcept VARCHAR(50);
-    DECLARE vPrice DECIMAL (10,2);
-    DECLARE vDiscount TINYINT;
-	DECLARE vSaleNew INT;
-    DECLARE vSaleMain INT;
-    DECLARE vZoneFk INT;
-    
-    DECLARE vRsMainTicket CURSOR FOR
-		SELECT *
-			FROM tmp.sale;
-    
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1;
-	
-    SELECT id INTO vRefundAgencyMode
-		FROM agencyMode WHERE `name` = 'ABONO';
-
-	SELECT clientFk, warehouseFk, companyFk, addressFk 
-			INTO vCustomer, vWarehouse, vCompany, vAddress
-		FROM ticket 
-        WHERE id = vOriginTicket;
-    
-    SELECT id INTO vZoneFk 
-		FROM zone WHERE agencyModeFk = vRefundAgencyMode
-        LIMIT 1;
-        
-	INSERT INTO vn.ticket (
-			clientFk,
-			shipped,
-			addressFk,
-			agencyModeFk,
-			nickname,
-			warehouseFk,
-			companyFk,
-			landed,
-            zoneFk
-		)
-		SELECT
-					vCustomer,
-					CURDATE(),
-					vAddress,
-					vRefundAgencyMode,
-					a.nickname,
-					vWarehouse,
-					vCompany,
-					CURDATE(),
-                    vZoneFk
-			FROM address a
-			WHERE a.id = vAddress;
-
-	SET vNewTicket = LAST_INSERT_ID();
-
-	SET vDone := 0;	
-	OPEN vRsMainTicket ;
-    FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	WHILE NOT vDone DO
-    
-		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
-			VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-            
-        SET vSaleNew = LAST_INSERT_ID();
-        
-        INSERT INTO vn.saleComponent(saleFk,componentFk,`value`) 
-        SELECT vSaleNew,componentFk,`value`  
-			FROM vn.saleComponent 
-            WHERE saleFk = vSaleMain;
-        
-		FETCH vRsMainTicket INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-        
-	END WHILE;
-	CLOSE vRsMainTicket; 
-
-END;
-$$
-DELIMITER ;

db/changes/10400-christmas/00-updateDepartment.sql

@@ -1,3 +0,0 @@
-UPDATE `vn`.`department`
-	SET `notificationEmail` = 'finanzas@verdnatura.es'
-	WHERE `name` = 'FINANZAS';

db/changes/10400-christmas/00-updateSupplier.sql

@@ -1,2 +0,0 @@
-UPDATE `vn`.`supplier`
-	SET isPayMethodChecked = TRUE;

db/changes/10400-christmas/01-payment_afterInsert.sql

@@ -1,33 +0,0 @@
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`payment_afterInsert` AFTER INSERT ON `payment` FOR EACH ROW
-BEGIN
-	DECLARE vIsPayMethodChecked BOOLEAN;
-	DECLARE vEmail VARCHAR(150);
-		
-	SELECT isPayMethodChecked INTO vIsPayMethodChecked
-			FROM supplier
-			WHERE id = NEW.supplierFk;
-			
-	
-	IF vIsPayMethodChecked = FALSE THEN
-
-		SELECT notificationEmail INTO vEmail
-			FROM department
-				WHERE name = 'FINANZAS';
-
-        CALL mail_insert(
-			vEmail,
-       		NULL,
-       		'Pago con método sin verificar',
-       		CONCAT(
-				'Se ha realizado el pago ',
-				NEW.id,
-       			' al proveedor ',
-       			NEW.supplierFk,
-       			' con el método de pago sin verificar.'
-       		)
-       	);
-    END IF;
-END$$
-DELIMITER ;

db/changes/10400-christmas/01-supplier_beforeUpdate.sql

@@ -1,26 +0,0 @@
-DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` TRIGGER `vn`.`supplier_beforeUpdate`
-	BEFORE UPDATE ON `vn`.`supplier` FOR EACH ROW
-BEGIN
-	DECLARE vHasChange BOOL DEFAULT FALSE;
-	DECLARE vPayMethodHasVerified BOOL;
-
-	SELECT hasVerified INTO vPayMethodHasVerified
-		FROM payMethod
-			WHERE id = NEW.payMethodFk;
-
-	SET vHasChange =  (NEW.payDemFk <> OLD.payDemFk) OR (NEW.payDay <> OLD.payDay);
-
-	IF vPayMethodHasVerified AND !vHasChange THEN
-		SET vHasChange = (NEW.payMethodFk <> OLD.payMethodFk);
-	END IF;
-	
-	IF vHasChange THEN
-		SET NEW.isPayMethodChecked = FALSE;
-	END IF;
-
-END$$
-DELIMITER ;

db/changes/10410-noname/00-smsConfig.sql

@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`smsConfig` ADD apiKey varchar(50) NULL;
-ALTER TABLE `vn`.`smsConfig` CHANGE `user` user__ varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-ALTER TABLE `vn`.`smsConfig` CHANGE password password__ varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL;
-ALTER TABLE `vn`.`sms` MODIFY COLUMN statusCode smallint(9) DEFAULT 0 NULL;
-ALTER TABLE `vn`.`sms` MODIFY COLUMN status varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'OK' NULL;

db/changes/10410-noname/01-smsConfig_update.sql

@@ -1,7 +0,0 @@
-UPDATE `vn`.`smsConfig`
-	SET `uri` = 'https://api.gateway360.com/api/3.0/sms/send'
-	WHERE `id` = 1;
-    
-UPDATE `vn`.`smsConfig`
-	SET `apiKey` = '5715476da95b46d686a5a255e6459523'
-	WHERE `id` = 1;

db/changes/10411-january/00-acl.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES('InvoiceInDueDay', '*', '*', 'ALLOW', 'ROLE', 'administrative');

db/changes/10411-january/00-booking.sql

@@ -0,0 +1,248 @@
+DROP PROCEDURE IF EXISTS vn.invoiceInBookingMain;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`invoiceInBookingMain`(vInvoiceInId INT)
+BEGIN
+	DECLARE vTotalAmount,vTotalAmountDivisa DECIMAL(10,2);
+	DECLARE vBookNumber,vSerialNumber INT;
+	DECLARE vRate DECIMAL(10,4);
+
+	CALL invoiceInBookingCommon(vInvoiceInId,vSerialNumber);
+
+	SELECT SUM(iit.taxableBase * IF( i.serial= 'R' AND ti.Iva <> 'HP DEVENGADO 21 ISP', 1 +(ti.PorcentajeIva/100),1)), 
+			SUM(iit.foreignValue * IF( i.serial= 'R', 1 + (ti.PorcentajeIva/100),1)),
+			iit.taxableBase/iit.foreignValue
+			INTO vTotalAmount, vTotalAmountDivisa, vRate
+		FROM newInvoiceIn i
+			JOIN invoiceInTax iit ON iit.invoiceInFk = i.id
+			LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk;
+
+	CALL vn.ledger_next(vBookNumber);
+
+	-- Apunte del proveedor
+
+	INSERT INTO XDiario(ASIEN,
+			FECHA,
+			SUBCTA,
+			EUROHABER,
+			CONCEPTO,
+			CAMBIO,
+			HABERME,
+			NFACTICK,
+			CLAVE,
+			empresa_id
+			)
+		SELECT 
+			vBookNumber,
+			n.bookEntried,
+			s.supplierAccount,
+			vTotalAmount EUROHABER,
+			n.conceptWithSupplier,
+			vRate,
+			vTotalAmountDivisa,
+			n.invoicesCount,
+			vInvoiceInId,
+			n.companyFk
+		FROM newInvoiceIn n 
+			JOIN newSupplier s;
+
+	-- Línea de Gastos
+	INSERT INTO XDiario ( ASIEN,
+			FECHA,
+			SUBCTA,
+			CONTRA,
+			EURODEBE,
+			EUROHABER,
+			CONCEPTO, 
+			CAMBIO,
+			DEBEME,
+			HABERME,
+			NFACTICK,
+			empresa_id
+			)
+		SELECT vBookNumber ASIEN,
+				n.bookEntried FECHA,
+				IF(e.isWithheld , LPAD(RIGHT(s.supplierAccount,5),10,iit.expenceFk),iit.expenceFk) SUBCTA,
+				s.supplierAccount CONTRA,
+				IF(e.isWithheld AND iit.taxableBase < 0, NULL, ROUND(SUM(iit.taxableBase),2)) EURODEBE,
+				IF(e.isWithheld AND iit.taxableBase < 0,ROUND(SUM(-iit.taxableBase),2),NULL) EUROHABER,
+				n.conceptWithSupplier CONCEPTO,
+				vRate,
+				IF(e.isWithheld,NULL,ABS(ROUND(SUM(iit.foreignValue),2))) DEBEME,
+				IF(e.isWithheld,ABS(ROUND(SUM(iit.foreignValue),2)),NULL) HABERME,
+				n.invoicesCount NFACTICK,
+				n.companyFk empresa_id
+			FROM newInvoiceIn n
+				JOIN newSupplier s 
+				JOIN invoiceInTax iit ON iit.invoiceInFk = n.id
+				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = iit.expenceFk
+			WHERE e.name != 'Suplidos Transitarios nacionales'
+			GROUP BY iit.expenceFk;
+
+	-- Líneas de IVA
+
+	INSERT INTO XDiario( ASIEN,
+			FECHA,
+			SUBCTA,
+			CONTRA, 
+			EURODEBE,
+			BASEEURO,
+			CONCEPTO, 
+			FACTURA, 
+			IVA,
+			AUXILIAR, 
+			SERIE,
+			TIPOOPE,
+			FECHA_EX,
+			FECHA_OP,
+			NFACTICK,
+			FACTURAEX,
+			L340,
+			LRECT349,
+			TIPOCLAVE,
+			TIPOEXENCI,
+			TIPONOSUJE,
+			TIPOFACT,
+			TIPORECTIF,
+			TERIDNIF,
+			TERNIF,
+			TERNOM,
+			FECREGCON,
+			empresa_id
+			)
+		SELECT vBookNumber ASIEN,
+				n.bookEntried FECHA,
+				IF(n.expenceFkDeductible>0, n.expenceFkDeductible, ti.CuentaIvaSoportado) SUBCTA,
+				s.supplierAccount CONTRA,
+				SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100 /* + 0.0001*/ , 2)) EURODEBE,
+				SUM(it.taxableBase) BASEEURO,
+				GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
+				vSerialNumber FACTURA,
+				ti.PorcentajeIva IVA,
+				IF(isUeeMember AND eWithheld.id IS NULL,'','*') AUXILIAR,
+				n.serial SERIE,
+				ttr.ClaveOperacionDefecto,
+				n.issued FECHA_EX,
+				n.operated FECHA_OP,
+				n.invoicesCount NFACTICK,
+				n.supplierRef FACTURAEX,
+				TRUE L340,
+				(isSameCountry OR NOT isUeeMember) LRECT349,
+				n.cplusTrascendency472Fk TIPOCLAVE,
+				n.cplusTaxBreakFk TIPOEXENCI,
+				n.cplusSubjectOpFk TIPONOSUJE,
+				n.cplusInvoiceType472Fk TIPOFACT,
+				n.cplusRectificationTypeFk TIPORECTIF,
+				iis.cplusTerIdNifFk TERIDNIF,
+				s.nif AS TERNIF,
+				s.name AS TERNOM,
+				n.booked FECREGCON,
+				n.companyFk
+			FROM newInvoiceIn n
+				JOIN newSupplier s 
+				JOIN invoiceInTax it ON n.id = it.invoiceInFk
+				JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
+				JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
+				JOIN invoiceInSerial iis ON iis.code = n.serial
+				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
+				LEFT JOIN (
+					SELECT eWithheld.id 
+						FROM invoiceInTax hold 
+							JOIN expence eWithheld ON eWithheld.id = hold.expenceFk AND eWithheld.isWithheld 
+						WHERE hold.invoiceInFk = vInvoiceInId LIMIT 1
+						) eWithheld ON TRUE 
+			WHERE it.taxTypeSageFk IS NOT NULL 
+				AND it.taxTypeSageFk NOT IN (22, 90)
+			GROUP BY ti.PorcentajeIva, e.id;
+
+	-- Línea iva inversor sujeto pasivo
+ 
+	INSERT INTO XDiario( ASIEN,
+			FECHA,
+			SUBCTA,
+			CONTRA, 
+			EUROHABER,
+			BASEEURO,
+			CONCEPTO, 
+			FACTURA, 
+			IVA,
+			AUXILIAR, 
+			SERIE,
+			TIPOOPE,
+			FECHA_EX,
+			FECHA_OP,
+			NFACTICK,
+			FACTURAEX,
+			L340,
+			LRECT349,
+			TIPOCLAVE,
+			TIPOEXENCI,
+			TIPONOSUJE,
+			TIPOFACT,
+			TIPORECTIF,
+			TERIDNIF,
+			TERNIF,
+			TERNOM,
+			empresa_id
+			)
+		SELECT vBookNumber ASIEN,
+				n.bookEntried FECHA,
+				ti.CuentaIvaRepercutido SUBCTA,
+				s.supplierAccount CONTRA,
+				SUM(ROUND(ti.PorcentajeIva * it.taxableBase / 100,2)) EUROHABER,
+				ROUND(SUM(it.taxableBase),2) BASEEURO,
+				GROUP_CONCAT(DISTINCT e.`name` SEPARATOR ', ') CONCEPTO,
+				vSerialNumber FACTURA,
+				ti.PorcentajeIva IVA,
+				'*' AUXILIAR,
+				n.serial SERIE,
+				ttr.ClaveOperacionDefecto,
+				n.issued FECHA_EX,
+				n.operated FECHA_OP,
+				n.invoicesCount NFACTICK,
+				n.supplierRef FACTURAEX,
+				FALSE L340,
+				(isSameCountry OR NOT isUeeMember) LRECT349,
+				1 TIPOCLAVE,
+				n.cplusTaxBreakFk TIPOEXENCI,
+				n.cplusSubjectOpFk TIPONOSUJE,
+				n.cplusInvoiceType472Fk TIPOFACT,
+				n.cplusRectificationTypeFk TIPORECTIF,
+				iis.cplusTerIdNifFk TERIDNIF,
+				s.nif AS TERNIF,
+				s.name AS TERNOM,
+				n.companyFk
+			FROM newInvoiceIn n 
+				JOIN newSupplier s 
+				JOIN invoiceInTax it ON n.id = it.invoiceInFk
+				JOIN sage.TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
+				JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = it.transactionTypeSageFk
+				JOIN invoiceInSerial iis ON iis.code = n.serial 
+				JOIN (SELECT * FROM expence e GROUP BY e.id)e ON e.id = it.expenceFk
+			WHERE ti.Iva = 'HP DEVENGADO 21 ISP' OR MID(s.account, 4, 1) = '1'
+			GROUP BY ti.PorcentajeIva, e.id;
+		
+	-- Actualización del registro original		
+	UPDATE invoiceIn ii
+			JOIN newInvoiceIn ni ON ii.id = ni.id
+		SET ii.serialNumber = vSerialNumber,
+			ii.isBooked = TRUE;
+	
+	-- Problemas derivados de la precisión en los decimales al calcular los impuestos
+	UPDATE XDiario 
+		SET EURODEBE = EURODEBE - 
+			(SELECT IF(ABS(sub.difference) = 0.01, sub.difference, 0)
+				FROM(
+					SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference 
+						FROM XDiario
+						WHERE ASIEN = vBookNumber
+					)sub
+			)
+		WHERE ASIEN = vBookNumber 
+			AND EURODEBE <> 0
+		ORDER BY id DESC
+		LIMIT 1;
+	
+END$$
+DELIMITER ;

db/changes/10411-january/00-companyGroup.sql

@@ -0,0 +1,12 @@
+UPDATE `vn`.`companyGroup`
+	SET `code`='verdnatura'
+	WHERE `id`=1;
+UPDATE `vn`.`companyGroup`
+	SET `code`='ornamental'
+	WHERE `id`=2;
+UPDATE `vn`.`companyGroup`
+	SET `code`='other'
+	WHERE `id`=3;
+UPDATE `vn`.`companyGroup`
+	SET `code`='provisional'
+	WHERE `id`=4;

db/changes/10411-january/00-saleVolume.sql

@@ -0,0 +1,38 @@
+USE vn;
+DELIMITER $$
+$$
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`saleVolume` AS
+select
+    `s`.`ticketFk` AS `ticketFk`,
+    `s`.`id` AS `saleFk`,
+    round(`ic`.`cm3delivery` * `s`.`quantity` / 1000, 0) AS `litros`,
+    `t`.`routeFk` AS `routeFk`,
+    `t`.`shipped` AS `shipped`,
+    `t`.`landed` AS `landed`,
+    `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `volume`,
+    `s`.`quantity` * `ic`.`grams` / 1000 AS `physicalWeight`,
+    `s`.`quantity` * `ic`.`cm3delivery` * greatest(`i`.`density`, 167) / 1000000 AS `weight`,
+    `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `physicalVolume`,
+    `s`.`quantity` * `ic`.`cm3delivery` * ifnull(`t`.`zonePrice`, `z`.`price`) / (`vc`.`standardFlowerBox` * 1000) AS `freight`,
+    `t`.`zoneFk` AS `zoneFk`,
+    `t`.`clientFk` AS `clientFk`,
+    `s`.`isPicked` AS `isPicked`,
+    `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 AS `eurosValue`,
+    `i`.`itemPackingTypeFk` AS `itemPackingTypeFk`
+from
+    (((((`sale` `s`
+join `item` `i` on
+    (`i`.`id` = `s`.`itemFk`))
+join `ticket` `t` on
+    (`t`.`id` = `s`.`ticketFk`))
+join `zone` `z` on
+    (`z`.`id` = `t`.`zoneFk`))
+join `volumeConfig` `vc`)
+join `itemCost` `ic` on
+    (`ic`.`itemFk` = `s`.`itemFk`
+        and `ic`.`warehouseFk` = `t`.`warehouseFk`))
+where
+    `s`.`quantity` > 0;
+$$
+DELIMITER ;

db/changes/10411-january/00-workerLabour.sql

@@ -0,0 +1,25 @@
+ALTER TABLE `postgresql`.`business` ADD payedHolidays INT NULL;
+ALTER TABLE `postgresql`.`business` CHANGE payedHolidays payedHolidays INT NULL AFTER reasonEndFk;
+
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`workerLabour` AS
+select
+`b`.`business_id` AS `businessFk`,
+`p`.`id_trabajador` AS `workerFk`,
+`bl`.`workcenter_id` AS `workCenterFk`,
+`b`.`date_start` AS `started`,
+`b`.`date_end` AS `ended`,
+`d`.`id` AS `departmentFk`,
+`b`.`payedHolidays` AS `payedHolidays`
+from
+((((`postgresql`.`person` `p`
+join `postgresql`.`profile` `pr` on
+((`pr`.`person_id` = `p`.`person_id`)))
+join `postgresql`.`business` `b` on
+((`b`.`client_id` = `pr`.`profile_id`)))
+join `postgresql`.`business_labour` `bl` on
+((`b`.`business_id` = `bl`.`business_id`)))
+join `vn`.`department` `d` on
+((`d`.`id` = `bl`.`department_id`)))
+order by
+`b`.`date_start` desc

db/changes/10420-valentines/00-ImportTicketAcl.sql

@@ -0,0 +1,2 @@
+DELETE FROM salix.ACL
+WHERE model = 'ClaimEnd' AND property = 'importTicketSales';

db/changes/10420-valentines/00-aclCollection.sql

@@ -0,0 +1,3 @@
+INSERT INTO salix.ACL
+(model, property, accessType, permission, principalType, principalId)
+VALUES('Collection', 'setSaleQuantity', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10420-valentines/00-aclDocuware.sql

@@ -0,0 +1,3 @@
+INSERT INTO salix.ACL
+(model, property, accessType, permission, principalType, principalId)
+VALUES('Docuware', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10420-valentines/00-defaultViewConfig.sql

@@ -0,0 +1,3 @@
+UPDATE salix.defaultViewConfig
+    SET `columns`='{"intrastat":false,"stemMultiplier":false,"landed":false,"producer":false}'
+        WHERE tableCode ='itemsIndex';

db/changes/10420-valentines/00-docuware.sql

@@ -0,0 +1,11 @@
+CREATE TABLE `vn`.`docuware` (
+    `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    `code` varchar(50) NULL,
+    `fileCabinetName` varchar(50) NULL,
+    `dialogName` varchar(255) DEFAULT NULL,
+    `find` varchar(50) DEFAULT NULL
+);
+
+INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `dialogName` , `find`)
+    VALUES
+        ('deliveryClient', 'Albaranes cliente', 'findTicket', 'N__ALBAR_N');

db/changes/10420-valentines/00-docuwareConfig.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `vn`.`docuwareConfig` (
+    `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    `url` varchar(75) NULL,
+    `token` varchar(1000) DEFAULT NULL
+);
+
+INSERT INTO `vn`.`docuwareConfig` (`url`)
+    VALUES
+        ('https://verdnatura.docuware.cloud/docuware/platform');

db/changes/10420-valentines/00-state.sql

@@ -0,0 +1,26 @@
+ALTER TABLE `vn`.`state` ADD classColor varchar(12) NULL;
+
+UPDATE `vn`.`state` s
+    SET s.classColor = 'warning'
+        WHERE s.alertLevel = 1;
+
+UPDATE `vn`.`state` s
+    SET s.classColor = 'alert'
+        WHERE s.alertLevel = 0;
+
+UPDATE `vn`.`state` s
+    SET s.classColor = 'success'
+        WHERE s.code LIKE 'OK';
+
+UPDATE `vn`.`state` s
+    SET s.classColor = 'notice'
+        WHERE s.code LIKE 'FREE';
+
+UPDATE `vn`.`state` s
+    SET s.classColor = 'success'
+        WHERE s.order >= 4 
+            AND (s.alertLevel = 0 OR s.alertLevel = 1);
+
+UPDATE `vn`.`state` s
+    SET s.classColor = 'warning'
+        WHERE s.code IN ('PREVIOUS_PREPARATION', 'PREPARED', 'ON_PREPARATION', 'ON_CHECKING', 'CHECKED');

db/changes/10420-valentines/00-ticket_getMovable.sql

@@ -0,0 +1,46 @@
+DROP PROCEDURE IF EXISTS `vn`.`ticket_getMovable`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
+BEGIN
+/**
+ * Cálcula el stock movible para los artículos de un ticket
+ * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * asume que siempre es posible
+ *
+ * @param vTicketFk -> Ticket
+ * @param vDatedNew -> Nueva fecha
+ * @return Sales con Movible
+*/    
+    DECLARE vDatedOld DATETIME;
+	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
+
+    SELECT t.shipped INTO vDatedOld
+        FROM ticket t 
+        WHERE t.id = vTicketFk;
+
+    CALL itemStock(vWarehouseFk, vDatedNew, NULL); 
+    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
+	
+    SELECT s.id, 
+			s.itemFk, 
+			s.quantity, 
+			s.concept, 
+			s.price, 
+			s.reserved,
+			s.discount,  
+			i.image, 
+			i.subName, 
+			il.stock + IFNULL(im.amount, 0) AS movable
+        FROM ticket t
+            JOIN sale s ON s.ticketFk = t.id
+            JOIN item i ON i.id = s.itemFk 
+            LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
+            LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
+        WHERE t.id = vTicketFk;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
+    DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
+END$$
+DELIMITER ;

db/changes/10430-ash/00-aclAgency.sql

@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (id, model, property, accessType, permission, principalType, principalId)
+VALUES(301, 'Agency', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/10430-ash/00-aclAgencyTerm.sql

@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (model,property,accessType,principalId)
+	VALUES ('AgencyTerm','*','*','administrative');

db/changes/10430-ash/00-aclClaimLog.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('ClaimLog', '*', 'READ', 'ALLOW', 'ROLE', 'claimManager');

db/changes/10430-ash/00-agencyTerm.sql

@@ -0,0 +1,10 @@
+CREATE TABLE `vn`.`agencyTermConfig` (
+  `expenceFk` varchar(10) DEFAULT NULL,
+  `vatAccountSupported` varchar(15) DEFAULT NULL,
+  `vatPercentage` decimal(28,10) DEFAULT NULL,
+  `transaction` varchar(50) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `vn`.`agencyTermConfig`
+(`expenceFk`, `vatAccountSupported`, `vatPercentage`, `transaction`)
+VALUES('6240000000', '4721000015', 21.0000000000, 'Adquisiciones intracomunitarias de servicios');

db/changes/10430-ash/00-deliveryBoss.sql

@@ -0,0 +1,3 @@
+UPDATE `account`.`user`
+SET `role` = 57
+WHERE id IN (2294, 4365, 7294);

db/changes/10440-fallas/00-claimConfig.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `vn`.`claimConfig` (
+  `id` int(11) NOT NULL,
+  `pickupContact` varchar(250),
+  PRIMARY KEY (`id`)
+);
+
+INSERT INTO vn.claimConfig (id, pickupContact)
+    VALUES(1, 'Email: cmorenoa@logista.com Telf: 961594250 Extensión: 206');

db/changes/10440-fallas/00-claim_packages.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.claim ADD packages smallint(10) unsigned DEFAULT 0 NULL COMMENT 'packages received by the client';

db/docker.js

@@ -137,7 +137,8 @@ module.exports = class Docker {
                 user: this.dbConf.username,
                 password: this.dbConf.password,
                 host: this.dbConf.host,
-                port: this.dbConf.port
+                port: this.dbConf.port,
+                connectTimeout: maxInterval
             };
 
             log('Waiting for MySQL init process...');

db/dump/fixtures.sql

@@ -8,7 +8,7 @@ ALTER TABLE `vn`.`ticket` AUTO_INCREMENT = 1;
 
 INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`) 
     VALUES 
-        ('TOTALLY_SECURE_TOKEN', '1209600', CURDATE(), 66);
+        ('DEFAULT_TOKEN', '1209600', CURDATE(), 66);
 
 
 INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`) 
@@ -32,6 +32,11 @@ INSERT INTO `vn`.`packagingConfig`(`upperGap`)
         ('10');
 
 UPDATE `account`.`role` SET id = 100 WHERE id = 0;
+
+INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPrefix`, `userHost`, `tplUser`)
+    VALUES
+        (1, 'mysqlPassword', '$', '!', '%', 'any');
+
 CALL `account`.`role_sync`;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`, `lang`, `image`)
@@ -104,17 +109,17 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
         (3, 'GBP', 'Libra',         1),
         (4, 'JPY', 'Yen Japones',   1);
         
-INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`)
+INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
     VALUES 
-        (1, 'España',   1, 'ES', 1, 24, 4),
-        (2, 'Italia',   1, 'IT', 1, 27, 4),
-        (3, 'Alemania', 1, 'DE', 1, 22, 4),
-        (4, 'Rumania',  1, 'RO', 1, 24, 4),
-        (5, 'Holanda',  1, 'NL', 1, 18, 4),
-        (8, 'Portugal', 1, 'PT', 1, 27, 4),
-        (13,'Ecuador',  0, 'EC', 1, 24, 2),
-        (19,'Francia',  1, 'FR', 1, 27, 4),
-        (30,'Canarias', 1, 'IC', 1, 24, 4);
+        (1, 'España',   1, 'ES', 1, 24, 4, 0, 1),
+        (2, 'Italia',   1, 'IT', 1, 27, 4, 0, 1),
+        (3, 'Alemania', 1, 'DE', 1, 22, 4, 0, 1),
+        (4, 'Rumania',  1, 'RO', 1, 24, 4, 0, 1),
+        (5, 'Holanda',  1, 'NL', 1, 18, 4, 0, 1),
+        (8, 'Portugal', 1, 'PT', 1, 27, 4, 0, 1),
+        (13,'Ecuador',  0, 'EC', 1, 24, 2, 1, 2),
+        (19,'Francia',  1, 'FR', 1, 27, 4, 0, 1),
+        (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
 
 INSERT INTO `hedera`.`language` (`code`, `name`, `orgName`, `isActive`)
     VALUES
@@ -169,7 +174,9 @@ INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`,
     VALUES 
         (1,     'Pay on receipt',           '5720000001', 3, 0,     1, 1),
         (2,     'Cash',                     '5700000001', 2, 0,     1, 1),
-        (3, 'Compensation',     '4000000000', 8, 0, 1, 1);
+        (3,     'Compensation',             '4000000000', 8, 0,     1, 1),
+        (3117,  'Caixa Rural d''Algemesi',  '5720000000', 8, 3117,  1, 1);
+
 
 INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
     VALUES
@@ -243,7 +250,7 @@ INSERT INTO `vn`.`province`(`id`, `name`, `countryFk`, `autonomyFk`, `warehouseF
     VALUES
         (1, 'Province one',     1, 1, NULL),
         (2, 'Province two',     1, 1, NULL),
-        (3, 'Province three',   1, 2, NULL),
+        (3, 'Province three',   30, 2, NULL),
         (4, 'Province four',    2, 3, NULL),
         (5, 'Province five',    13, 4, NULL);
 
@@ -455,7 +462,8 @@ INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassification`, `credit`, `crea
 
 INSERT INTO `vn`.`companyGroup`(`id`, `code`)
     VALUES
-        (1, 'Wayne Industries');
+        (1, 'wayneIndustries'),
+        (2, 'verdnatura');
  
 INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`)
     VALUES
@@ -466,13 +474,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
     VALUES
          (241, 442, 'ES111122333344111122221111', 128);
 
-INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `phytosanitary`)
+INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `companyGroupFk`, `phytosanitary`)
     VALUES
-        (69  , 'CCs', NULL, 30,  NULL, 0, NULL,         NULL),
-        (442 , 'VNL', 241,  30,  2   , 1, NULL,         'VNL Company - Plant passport'),
-        (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         'VNH Company - Plant passport'),
-        (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', NULL),
-        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         'ORN Company - Plant passport');  
+        (69  , 'CCs', NULL, 30,  NULL, 0, NULL,         1, NULL),
+        (442 , 'VNL', 241,  30,  2   , 1, NULL,         2, 'VNL Company - Plant passport'),
+        (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         1, 'VNH Company - Plant passport'),
+        (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', 1, NULL),
+        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport');  
 
 INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`)
     VALUES
@@ -486,7 +494,9 @@ INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaF
         ('A', 'Global nacional',         1, 'NATIONAL',  0),
         ('T', 'Española rapida',         1, 'NATIONAL',  0),
         ('V', 'Intracomunitaria global', 0, 'CEE',       1),
-        ('M', 'Múltiple nacional',       1, 'NATIONAL',  0);
+        ('M', 'Múltiple nacional',       1, 'NATIONAL',  0),
+        ('E', 'Exportación rápida',      0, 'WORLD',     0);
+;
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
@@ -519,6 +529,8 @@ INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`)
         (4751000000, 1, 'Retenciones',                      1),
         (4751000000, 6, 'Retencion',                        0),
         (6210000567, 0, 'Alquiler VNH',                     0),
+        (6240000000, 1, 'Transportes de ventas rutas',      0),
+        (6240000000, 4, 'Transportes de ventas rutas',      0),
         (7001000000, 1, 'Mercaderia',                       0),
         (7050000000, 1, 'Prestacion de servicios',          1);
 
@@ -622,6 +634,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (25 ,NULL,  8,  1, NULL,    CURDATE(),                              CURDATE(),                                                        1101, 'Bruce Wayne',                                   1,   NULL,       0, 1,      5, 1, CURDATE()),
         (26 ,NULL,  8,  1, NULL,    CURDATE(),                              CURDATE(),                                                        1101, 'An incredibly long alias for testing purposes', 1,   NULL,       0, 1,      5, 1, CURDATE()),
         (27 ,NULL,  8,  1, NULL,    CURDATE(),                              CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,       0, 1,      5, 1, CURDATE());
+
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
         (1,  11, 1, 'ready'),
@@ -799,25 +812,25 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('VT',  'Sales');
 
 INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, 
-    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`)
+    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`)
     VALUES
-        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT',   0,  NULL),
-        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL),
-        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL),
-        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL),
-        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT',   0,  NULL),
-        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT',   0,  NULL),
-        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT',   0,  NULL),
-        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT',   0,  NULL),
-        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT',   1,  NULL),
-        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT',   0,  NULL),
-        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT',   0,  NULL),
-        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT',   0,  NULL),
-        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 0, 2, 'VT',   1,  NULL),
-        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT',   1,  NULL),
-        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL),
-        (16, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL),
-        (71, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT',   0,  NULL);
+        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT',   0,  NULL,   'V',  0),
+        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0),
+        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0),
+        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0),
+        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0),
+        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0),
+        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0),
+        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0),
+        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0),
+        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0),
+        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0),
+        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0),
+        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 2, 'VT',   1,  NULL,   NULL, 1),
+        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0),
+        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0),
+        (16, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0),
+        (71, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT',   0,  NULL,   NULL, 0);
 
 -- Update the taxClass after insert of the items
 UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2
@@ -827,7 +840,7 @@ INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`
     VALUES
         (1, 1, 0,   0,  2.5,    2,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
         (2, 3, 10,  10, 10,     10, CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
-        (3, 5, 8.5, 10, 7.5,    6,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 1, 2, CURDATE());
+        (3, 13, 8.5, 10, 7.5,    6,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 1, 2, CURDATE());
 
 INSERT INTO `vn`.`expeditionBoxVol`(`boxFk`, `m3`, `ratio`)
     VALUES
@@ -896,7 +909,8 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (29, 4, 17, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, CURDATE()),
         (30, 4, 18, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, CURDATE()),
         (31, 2, 23, 'Melee weapon combat fist 15cm',    -5, 7.08,   0, 0, 0, CURDATE()),
-        (32, 1, 24, 'Ranged weapon longbow 2m',         -1, 8.07,   0, 0, 0, CURDATE());
+        (32, 1, 24, 'Ranged weapon longbow 2m',         -1, 8.07,   0, 0, 0, CURDATE()),
+        (33, 5, 14, 'Ranged weapon pistol 9mm',          50, 1.79,   0, 0, 0, CURDATE());
 
 INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
     VALUES
@@ -1696,12 +1710,12 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`)
         ( 6, 'mana',        'Mana',        1,   4),
         ( 7, 'lack',        'Faltas',      1,   2);
 
-INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `observation`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created` )
+INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `observation`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`)
     VALUES
-        (1, CURDATE(), 1, 'observation one',   1101, 18, 3, 0, CURDATE()),
-        (2, CURDATE(), 2, 'observation two',   1101, 18, 3, 0, CURDATE()),
-        (3, CURDATE(), 3, 'observation three', 1101, 18, 1, 1, CURDATE()),
-        (4, CURDATE(), 3, 'observation four',  1104, 18, 5, 0, CURDATE());
+        (1, CURDATE(), 1, 'Cu nam labores lobortis definiebas, ei aliquyam salutatus persequeris quo, cum eu nemore fierent dissentiunt. Per vero dolor id, vide democritum scribentur eu vim, pri erroribus temporibus ex.',   1101, 18, 3, 0, CURDATE(), 0),
+        (2, CURDATE(), 2, 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.',   1101, 18, 3, 0, CURDATE(), 1),
+        (3, CURDATE(), 3, 'An vim commodo dolorem volutpat, cu expetendis voluptatum usu, et mutat consul adversarium his. His natum numquam legimus an, diam fabulas mei ut. Melius fabellas sadipscing vel id. Partem diceret mandamus mea ne, has te tempor nostrud. Aeque nostro eum no.', 1101, 18, 1, 1, CURDATE(), 5),
+        (4, CURDATE(), 3, 'Wisi forensibus mnesarchum in cum. Per id impetus abhorreant, his no magna definiebas, inani rationibus in quo. Ut vidisse dolores est, ut quis nominavi mel. Ad pri quod apeirian concludaturque.',  1104, 18, 5, 0, CURDATE(), 10);
 
 INSERT INTO `vn`.`claimBeginning`(`id`, `claimFk`, `saleFk`, `quantity`)
     VALUES
@@ -1846,6 +1860,15 @@ INSERT INTO `postgresql`.`business_labour`(`business_id`, `notes`, `department_i
         SELECT b.business_id, NULL, 23, 1, 0, 1, 1, 1, 1
 			FROM `postgresql`.`business` `b`;
 
+INSERT INTO `postgresql`.`business` (`client_id`, `provider_id`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
+    SELECT p.profile_id, 1000, CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
+			FROM `postgresql`.`profile` `p`
+			WHERE `p`.`profile_id` = 1109;
+
+INSERT INTO `postgresql`.`business_labour` (`business_id`, `notes`, `department_id`, `professional_category_id`, `incentivo`, `calendar_labour_type_id`, `porhoras`, `labour_agreement_id`, `workcenter_id`)
+    VALUES
+        (1111, NULL, 23, 1, 0.0, 1, 1, 1, 1);
+
 UPDATE `postgresql`.`business_labour` bl 
     JOIN `postgresql`.`business` b ON b.business_id = bl.business_id
     JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id
@@ -2350,7 +2373,7 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
 
 INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
     VALUES
-        (1, CURDATE(), 1, 237),
+        (1, CURDATE(), 1, 336.99),
         (1, CURDATE(), 1, 15.25),
         (2, CURDATE(), 1, 168),
         (2, CURDATE(), 1, 55.17),
@@ -2430,3 +2453,53 @@ CALL `cache`.`last_buy_refresh`(FALSE);
 
 UPDATE `vn`.`item` SET `genericFk` = 9
     WHERE `id` = 2;
+
+INSERT INTO `bs`.`defaulter` (`clientFk`, `amount`, `created`, `defaulterSinced`)
+    VALUES
+        (1101,     500,    CURDATE(),  CURDATE()),
+        (1102,     500,    CURDATE(),  CURDATE()),
+        (1103,     500,    CURDATE(),  CURDATE()),
+        (1107,     500,    CURDATE(),  CURDATE()),
+        (1109,     500,    CURDATE(),  CURDATE());
+
+INSERT INTO `vn`.`agencyTerm` (`agencyFk`, `minimumPackages`, `kmPrice`, `packagePrice`, `routePrice`, `minimumKm`, `minimumM3`, `m3Price`)
+    VALUES
+        (1, 0, 0.00, 0.00, NULL, 0, 0.00, 0),
+        (3, 0, 0.00, 3.05, NULL, 0, 0.00, 0),
+        (2, 60, 0.00, 0.00, NULL, 0, 5.00, 33);
+
+UPDATE `vn`.`agency`
+SET `supplierFk`=1
+WHERE `id`=1;
+UPDATE `vn`.`agency`
+SET `supplierFk`=1
+WHERE `id`=2;
+UPDATE `vn`.`agency`
+SET `supplierFk`=2
+WHERE `id`=3;
+
+UPDATE `vn`.`route`
+SET `invoiceInFk`=1
+WHERE `id`=1;
+UPDATE `vn`.`route`
+SET `invoiceInFk`=2
+WHERE `id`=2;
+INSERT INTO `bs`.`salesPerson` (`workerFk`, `year`, `month`, `portfolioWeight`)
+    VALUES
+        (18,     YEAR(CURDATE()),    MONTH(CURDATE()),  807.23),
+        (19,     YEAR(CURDATE()),    MONTH(CURDATE()),  34.40);      
+
+INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
+    VALUES
+        (1,     501.95,    CURDATE(),    2,  1101),
+        (2,     70.7,      CURDATE(),    2,  1101),
+        (3,     200.78,    CURDATE(),    2,  1101),
+        (4,     33.8,      CURDATE(),    1,  1101),
+        (30,    34.4,      CURDATE(),    1,  1108);
+INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `dialogName` , `find`)
+    VALUES
+        ('deliveryClientTest', 'deliveryClientTest', 'findTest', 'word');
+
+INSERT INTO `vn`.`docuwareConfig` (`url`)
+    VALUES
+        ('https://verdnatura.docuware.cloud/docuware/platform');

db/export-structure.sh

@@ -25,7 +25,6 @@ IGNORETABLES=(
     --ignore-table=bs.productionIndicators
     --ignore-table=bs.VentasPorCliente
     --ignore-table=bs.v_ventas
-    --ignore-table=edi.supplyOffer
     --ignore-table=postgresql.currentWorkersStats
     --ignore-table=vn.accounting__
     --ignore-table=vn.agencyModeZone

e2e/helpers/selectors.js

@@ -304,6 +304,16 @@ export default {
         saveNewInsuranceCredit: 'vn-client-credit-insurance-insurance-create button[type="submit"]',
         anyCreditInsuranceLine: 'vn-client-credit-insurance-insurance-index vn-tbody > vn-tr',
     },
+    clientDefaulter: {
+        anyClient: 'vn-client-defaulter tbody > tr',
+        firstClientName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(2) > span',
+        firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(3) > span',
+        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(6) > vn-textarea[ng-model="defaulter.observation"]',
+        allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check',
+        addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]',
+        observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]',
+        saveButton: 'button[response="accept"]'
+    },
     clientContacts: {
         addContactButton: 'vn-client-contact vn-icon[icon="add_circle"]',
         name: 'vn-client-contact vn-textfield[ng-model="contact.name"]',
@@ -336,16 +346,17 @@ export default {
         saveFieldsButton: '.vn-popover.shown vn-button[label="Save"] > button'
     },
     itemFixedPrice: {
-        add: 'vn-fixed-price vn-icon[icon="add_circle"]',
-        fourthFixedPrice: 'vn-fixed-price vn-tr:nth-child(4)',
-        fourthItemID: 'vn-fixed-price vn-tr:nth-child(4) vn-autocomplete[ng-model="price.itemFk"]',
-        fourthWarehouse: 'vn-fixed-price vn-tr:nth-child(4) vn-autocomplete[ng-model="price.warehouseFk"]',
-        fourthPPU: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(4)',
-        fourthPPP: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(5)',
-        fourthMinPrice: 'vn-fixed-price vn-tr:nth-child(4) > vn-td-editable:nth-child(6)',
-        fourthStarted: 'vn-fixed-price vn-tr:nth-child(4) vn-date-picker[ng-model="price.started"]',
-        fourthEnded: 'vn-fixed-price vn-tr:nth-child(4) vn-date-picker[ng-model="price.ended"]',
-        fourthDeleteIcon: 'vn-fixed-price vn-tr:nth-child(4) > vn-td:nth-child(9) > vn-icon-button[icon="delete"]'
+        add: 'vn-fixed-price vn-icon-button[icon="add_circle"]',
+        fourthFixedPrice: 'vn-fixed-price tr:nth-child(5)',
+        fourthItemID: 'vn-fixed-price tr:nth-child(5) vn-autocomplete[ng-model="price.itemFk"]',
+        fourthWarehouse: 'vn-fixed-price tr:nth-child(5) vn-autocomplete[ng-model="price.warehouseFk"]',
+        fourthPPU: 'vn-fixed-price tr:nth-child(5) > td:nth-child(4)',
+        fourthPPP: 'vn-fixed-price tr:nth-child(5) > td:nth-child(5)',
+        fourthHasMinPrice: 'vn-fixed-price tr:nth-child(5) > td:nth-child(6) > vn-check[ng-model="price.hasMinPrice"]',
+        fourthMinPrice: 'vn-fixed-price tr:nth-child(5) >  td:nth-child(6) > vn-input-number[ng-model="price.minPrice"]',
+        fourthStarted: 'vn-fixed-price tr:nth-child(5) vn-date-picker[ng-model="price.started"]',
+        fourthEnded: 'vn-fixed-price tr:nth-child(5) vn-date-picker[ng-model="price.ended"]',
+        fourthDeleteIcon: 'vn-fixed-price tr:nth-child(5) > td:nth-child(9) > vn-icon-button[icon="delete"]'
     },
     itemCreateView: {
         temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]',
@@ -526,6 +537,7 @@ export default {
         acceptDialog: '.vn-dialog.shown button[response="accept"]',
         acceptChangeHourButton: '.vn-dialog.shown button[response="accept"]',
         descriptorDeliveryDate: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(4) > section > span',
+        descriptorDeliveryAgency: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(5) > section > span',
         acceptInvoiceOutButton: '.vn-confirm.shown button[response="accept"]',
         acceptDeleteStowawayButton: '.vn-dialog.shown button[response="accept"]'
     },
@@ -603,10 +615,12 @@ export default {
     ticketBasicData: {
         agency: 'vn-autocomplete[ng-model="$ctrl.agencyModeId"]',
         zone: 'vn-autocomplete[ng-model="$ctrl.zoneId"]',
+        shipped: 'vn-date-picker[ng-model="$ctrl.shipped"]',
         nextStepButton: 'vn-step-control .buttons > section:last-child vn-button',
         finalizeButton: 'vn-step-control .buttons > section:last-child button[type=submit]',
         stepTwoTotalPriceDif: 'vn-ticket-basic-data-step-two > vn-side-menu div:nth-child(4)',
         chargesReason: 'vn-ticket-basic-data-step-two div:nth-child(3) > vn-radio',
+        withoutNegatives: 'vn-check[ng-model="$ctrl.ticket.withoutNegatives"]',
     },
     ticketComponents: {
         base: 'vn-ticket-components > vn-side-menu div:nth-child(1) > div:nth-child(2)'
@@ -667,18 +681,19 @@ export default {
         header: 'vn-claim-summary > vn-card > h5',
         state: 'vn-claim-summary vn-label-value[label="State"] > section > span',
         observation: 'vn-claim-summary vn-textarea[ng-model="$ctrl.summary.claim.observation"]',
-        firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span',
+        firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span',
         firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img',
         itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor',
         itemDescriptorPopoverItemDiaryButton: '.vn-popover vn-item-descriptor vn-quick-link[icon="icon-transaction"] > a',
-        firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span',
+        firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span',
         firstDevelopmentWorkerGoToClientButton: '.vn-popover vn-worker-descriptor vn-quick-link[icon="person"] > a',
-        firstActionTicketId: 'vn-claim-summary > vn-card > vn-horizontal > vn-auto:nth-child(6) vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
+        firstActionTicketId: 'vn-claim-summary > vn-card > vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
         firstActionTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor'
     },
     claimBasicData: {
         claimState: 'vn-claim-basic-data vn-autocomplete[ng-model="$ctrl.claim.claimStateFk"]',
         observation: 'vn-textarea[ng-model="$ctrl.claim.observation"]',
+        packages: 'vn-input-number[ng-model="$ctrl.claim.packages"]',
         hasToPickUpCheckbox: 'vn-claim-basic-data vn-check[ng-model="$ctrl.claim.hasToPickUp"]',
         saveButton: `button[type=submit]`
     },
@@ -709,10 +724,7 @@ export default {
     },
     claimAction: {
         importClaimButton: 'vn-claim-action vn-button[label="Import claim"]',
-        importTicketButton: 'vn-claim-action vn-button[label="Import ticket"]',
-        secondImportableTicket: '.vn-popover.shown .content > div > vn-table > div > vn-tbody > vn-tr:nth-child(2)',
-        firstLineDestination: 'vn-claim-action vn-tr:nth-child(1) vn-autocomplete[ng-model="saleClaimed.claimDestinationFk"]',
-        secondLineDestination: 'vn-claim-action vn-tr:nth-child(2) vn-autocomplete[ng-model="saleClaimed.claimDestinationFk"]',
+        anyLine: 'vn-claim-action vn-tbody > vn-tr',
         firstDeleteLine: 'vn-claim-action vn-tr:nth-child(1) vn-icon-button[icon="delete"]',
         isPaidWithManaCheckbox: 'vn-claim-action vn-check[ng-model="$ctrl.claim.isChargedToMana"]'
     },
@@ -888,6 +900,7 @@ export default {
         sundayWorkedHours: 'vn-worker-time-control vn-table > div > vn-tfoot > vn-tr:nth-child(1) > vn-td:nth-child(7)',
         weekWorkedHours: 'vn-worker-time-control vn-side-menu vn-label-value > section > span',
         nextMonthButton: 'vn-worker-time-control vn-side-menu vn-calendar vn-button[icon=keyboard_arrow_right]',
+        previousMonthButton: 'vn-worker-time-control vn-side-menu vn-calendar vn-button[icon=keyboard_arrow_left]',
         secondWeekDay: 'vn-worker-time-control vn-side-menu vn-calendar .day:nth-child(8) > .day-number',
         navigateBackToIndex: 'vn-worker-descriptor [name="goToModuleIndex"]'
     },

e2e/paths/02-client/21_defaulter.spec.js

@@ -0,0 +1,74 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Client defaulter path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('insurance', 'client');
+        await page.accessToSection('client.defaulter');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should count the amount of clients in the turns section', async() => {
+        const result = await page.countElement(selectors.clientDefaulter.anyClient);
+
+        expect(result).toEqual(5);
+    });
+
+    it('should check contain expected client', async() => {
+        const clientName =
+            await page.waitToGetProperty(selectors.clientDefaulter.firstClientName, 'innerText');
+        const salesPersonName =
+            await page.waitToGetProperty(selectors.clientDefaulter.firstSalesPersonName, 'innerText');
+
+        expect(clientName).toEqual('Batman');
+        expect(salesPersonName).toEqual('salesPersonNick');
+    });
+
+    it('should first observation not changed', async() => {
+        const expectedObservation = 'Madness, as you know, is like gravity, all it takes is a little push';
+        const result = await page.waitToGetProperty(selectors.clientDefaulter.firstObservation, 'value');
+
+        expect(result).toContain(expectedObservation);
+    });
+
+    it('should not add empty observation', async() => {
+        await page.waitToClick(selectors.clientDefaulter.allDefaulterCheckbox);
+
+        await page.waitToClick(selectors.clientDefaulter.addObservationButton);
+        await page.write(selectors.clientDefaulter.observation, '');
+        await page.waitToClick(selectors.clientDefaulter.saveButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain(`The message can't be empty`);
+    });
+
+    it('shoul checked all defaulters', async() => {
+        await page.loginAndModule('insurance', 'client');
+        await page.accessToSection('client.defaulter');
+
+        await page.waitToClick(selectors.clientDefaulter.allDefaulterCheckbox);
+    });
+
+    it('should add observation for all clients', async() => {
+        await page.waitToClick(selectors.clientDefaulter.addObservationButton);
+        await page.write(selectors.clientDefaulter.observation, 'My new observation');
+        await page.waitToClick(selectors.clientDefaulter.saveButton);
+    });
+
+    it('should first observation changed', async() => {
+        const message = await page.waitForSnackbar();
+        await page.waitForSelector(selectors.clientDefaulter.firstObservation);
+        const result = await page.waitToGetProperty(selectors.clientDefaulter.firstObservation, 'value');
+
+        expect(message.text).toContain('Observation saved!');
+        expect(result).toContain('My new observation');
+    });
+});

e2e/paths/03-worker/04_time_control.spec.js

@@ -10,6 +10,8 @@ describe('Worker time control path', () => {
         await page.loginAndModule('salesBoss', 'worker');
         await page.accessToSearchResult('HankPym');
         await page.accessToSection('worker.card.timeControl');
+        await page.waitToClick(selectors.workerTimeControl.previousMonthButton);
+        await page.waitToClick(selectors.workerTimeControl.secondWeekDay);
     });
 
     afterAll(async() => {
@@ -97,9 +99,9 @@ describe('Worker time control path', () => {
 
                 expect(result).toEqual(scanTime);
             });
-
-            it(`should check Hank Pym worked 7 hours`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.mondayWorkedHours, '07:00 h.');
+            // 3736 check proc vn.timeControl_calculate
+            xit(`should check Hank Pym worked 6:40 hours`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.mondayWorkedHours, '06:40 h.');
             });
         });
 
@@ -152,8 +154,8 @@ describe('Worker time control path', () => {
                 expect(result).toEqual(scanTime);
             });
 
-            it(`should check Hank Pym worked 8 happy hours`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.tuesdayWorkedHours, '08:00 h.');
+            it(`should check Hank Pym worked 7:40  hours`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.tuesdayWorkedHours, '07:40 h.');
             });
         });
 
@@ -206,8 +208,8 @@ describe('Worker time control path', () => {
                 expect(result).toEqual(scanTime);
             });
 
-            it(`should check Hank Pym worked 8 cheerfull hours`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.wednesdayWorkedHours, '08:00 h.');
+            it(`should check Hank Pym worked 7:40 cheerfull hours`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.wednesdayWorkedHours, '07:40 h.');
             });
         });
 
@@ -257,8 +259,8 @@ describe('Worker time control path', () => {
                 expect(result).toEqual(scanTime);
             });
 
-            it(`should check Hank Pym worked 8 joyfull hours`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.thursdayWorkedHours, '08:00 h.');
+            it(`should check Hank Pym worked 7:40 joyfull hours`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.thursdayWorkedHours, '07:40 h.');
             });
         });
 
@@ -307,8 +309,8 @@ describe('Worker time control path', () => {
                 expect(result).toEqual(scanTime);
             });
 
-            it(`should check Hank Pym worked 8 hours with a smile on his face`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.fridayWorkedHours, '08:00 h.');
+            it(`should check Hank Pym worked 7:40 hours with a smile on his face`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.fridayWorkedHours, '07:40 h.');
             });
         });
     });
@@ -327,6 +329,8 @@ describe('Worker time control path', () => {
             it('should access to the time control section', async() => {
                 await page.accessToSection('worker.card.timeControl');
                 await page.waitForState('worker.card.timeControl');
+                await page.waitToClick(selectors.workerTimeControl.previousMonthButton);
+                await page.waitToClick(selectors.workerTimeControl.secondWeekDay);
             });
 
             it('should lovingly scan in Hank Pym', async() => {
@@ -352,8 +356,8 @@ describe('Worker time control path', () => {
                 expect(result).toEqual(scanTime);
             });
 
-            it(`should check Hank Pym worked 8 hours with all his will`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.saturdayWorkedHours, '08:00 h.');
+            it(`should check Hank Pym worked 7:40 hours with all his will`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.saturdayWorkedHours, '07:40 h.');
             });
         });
 
@@ -380,11 +384,11 @@ describe('Worker time control path', () => {
                 expect(result).toEqual(scanTime);
             });
 
-            it(`should check Hank Pym worked 8 glad hours`, async() => {
-                await page.waitForTextInElement(selectors.workerTimeControl.sundayWorkedHours, '08:00 h.');
+            it(`should check Hank Pym worked 7:40 glad hours`, async() => {
+                await page.waitForTextInElement(selectors.workerTimeControl.sundayWorkedHours, '07:40 h.');
             });
 
-            it(`should check Hank Pym doesn't have hours set on the next months first week`, async() => {
+            it(`should check Hank Pym doesn't have hours set on the next months second week`, async() => {
                 await page.waitToClick(selectors.workerTimeControl.nextMonthButton);
                 await page.waitToClick(selectors.workerTimeControl.secondWeekDay);
                 await page.waitForTextInElement(selectors.workerTimeControl.weekWorkedHours, '00:00 h.');
@@ -408,10 +412,12 @@ describe('Worker time control path', () => {
             await page.loginAndModule('HankPym', 'worker');
             await page.accessToSearchResult('HankPym');
             await page.accessToSection('worker.card.timeControl');
+            await page.waitToClick(selectors.workerTimeControl.previousMonthButton);
+            await page.waitToClick(selectors.workerTimeControl.secondWeekDay);
         });
 
         it('should check his weekly hours are alright', async() => {
-            await page.waitForTextInElement(selectors.workerTimeControl.weekWorkedHours, '55:00 h.');
+            await page.waitForTextInElement(selectors.workerTimeControl.weekWorkedHours, '52:40 h.');
         });
     });
 });

e2e/paths/03-worker/05_calendar.spec.js

@@ -9,7 +9,7 @@ describe('Worker calendar path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('hr', 'worker');
-        await page.accessToSearchResult('Hank Pym');
+        await page.accessToSearchResult('Charles Xavier');
         await page.accessToSection('worker.card.calendar');
     });
 
@@ -18,12 +18,6 @@ describe('Worker calendar path', () => {
     });
 
     describe('as hr', () => {
-        it('should check 5 total holidays have been used so far before testing anything', async() => {
-            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
-
-            expect(result).toContain(' 5 ');
-        });
-
         it('should set two days as holidays on the calendar and check the total holidays increased by 1.5', async() => {
             await page.waitToClick(selectors.workerCalendar.holidays);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
@@ -56,14 +50,14 @@ describe('Worker calendar path', () => {
 
             const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
 
-            expect(result).toContain(' 6.5 ');
+            expect(result).toContain(' 1.5 ');
         });
     });
 
     describe(`as salesBoss`, () => {
-        it(`should log in and get to Hank's calendar`, async() => {
+        it(`should log in and get to Charles Xavier's calendar`, async() => {
             await page.loginAndModule('salesBoss', 'worker');
-            await page.accessToSearchResult('Hank Pym');
+            await page.accessToSearchResult('Charles Xavier');
             await page.accessToSection('worker.card.calendar');
         });
 
@@ -101,14 +95,14 @@ describe('Worker calendar path', () => {
         it('should check the total holidays used are back to what it was', async() => {
             const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
 
-            expect(result).toContain(' 5 ');
+            expect(result).toContain(' 0 ');
         });
     });
 
-    describe(`as Hank`, () => {
+    describe(`as Charles Xavier`, () => {
         it(`should log in and get to his calendar`, async() => {
-            await page.loginAndModule('HankPym', 'worker');
-            await page.accessToSearchResult('Hank Pym');
+            await page.loginAndModule('CharlesXavier', 'worker');
+            await page.accessToSearchResult('Charles Xavier');
             await page.accessToSection('worker.card.calendar');
         });
 
@@ -122,7 +116,7 @@ describe('Worker calendar path', () => {
         it('should check the total holidays used are now the initial ones', async() => {
             const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
 
-            expect(result).toContain(' 5 ');
+            expect(result).toContain(' 0 ');
         });
 
         it('should use the year selector to go to the previous year', async() => {

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -16,33 +16,17 @@ describe('Item fixed prices path', () => {
     });
 
     it('should click on the add new foxed price button', async() => {
+        await page.doSearch();
         await page.waitToClick(selectors.itemFixedPrice.add);
         await page.waitForSelector(selectors.itemFixedPrice.fourthFixedPrice);
     });
 
     it('should fill the fixed price data', async() => {
         const now = new Date();
-        const searchValue = 'Chest ammo box';
-        await page.waitToClick(selectors.itemFixedPrice.fourthItemID);
-        await page.write('body > div > div > div.content > div.filter.ng-scope > vn-textfield', searchValue);
-        try {
-            await page.waitForFunction(searchValue => {
-                const element = document.querySelector('li.active');
-                if (element)
-                    return element.innerText.toLowerCase().includes(searchValue.toLowerCase());
-            }, {}, searchValue);
-        } catch (error) {
-            const builtSelector = await page.selectorFormater(selectors.ticketSales.moreMenuState);
-            const inputValue = await page.evaluate(() => {
-                return document.querySelector('.vn-drop-down.shown vn-textfield input').value;
-            });
-            throw new Error(`${builtSelector} value is ${inputValue}! ${error}`);
-        }
-        await page.keyboard.press('Enter');
         await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
-        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPPU, '20');
-        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPPP, '10');
-        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthMinPrice, '5');
+        await page.write(selectors.itemFixedPrice.fourthPPU, '1');
+        await page.write(selectors.itemFixedPrice.fourthPPP, '1');
+        await page.write(selectors.itemFixedPrice.fourthMinPrice, '1');
         await page.pickDate(selectors.itemFixedPrice.fourthStarted, now);
         await page.pickDate(selectors.itemFixedPrice.fourthEnded, now);
         const message = await page.waitForSnackbar();
@@ -53,7 +37,9 @@ describe('Item fixed prices path', () => {
     it('should reload the section and check the created price has the expected ID', async() => {
         await page.accessToSection('item.index');
         await page.accessToSection('item.fixedPrice');
-        const result = await page.getProperty('vn-fixed-price > div > vn-card > vn-table > div > vn-tbody > vn-tr:nth-child(4) > vn-td:nth-child(1) > span', 'innerText');
+        await page.doSearch();
+
+        const result = await page.waitToGetProperty(selectors.itemFixedPrice.fourthItemID, 'value');
 
         expect(result).toContain('13');
     });

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -206,6 +206,12 @@ describe('Ticket Edit sale path', () => {
         expect(message.text).toContain('Data saved!');
     });
 
+    it('should log in as salesAssistant and navigate to ticket sales', async() => {
+        await page.loginAndModule('salesAssistant', 'ticket');
+        await page.accessToSearchResult('16');
+        await page.accessToSection('ticket.card.sale');
+    });
+
     it('should select the third sale and create a pay back', async() => {
         await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.moreMenu);

e2e/paths/05-ticket/05_tracking_state.spec.js

@@ -25,7 +25,7 @@ describe('Ticket Create new tracking state path', () => {
         });
 
         it(`should create a new state`, async() => {
-            await page.autocompleteSearch(selectors.createStateView.state, '¿Fecha?');
+            await page.autocompleteSearch(selectors.createStateView.state, 'OK');
             await page.waitToClick(selectors.createStateView.saveStateButton);
             const message = await page.waitForSnackbar();
 

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -83,4 +83,62 @@ describe('Ticket Edit basic data path', () => {
         await page.waitToClick(selectors.ticketBasicData.finalizeButton);
         await page.waitForState('ticket.card.summary');
     });
+
+    it(`should not find ticket`, async() => {
+        await page.doSearch('29');
+        const count = await page.countElement(selectors.ticketsIndex.searchResult);
+
+        expect(count).toEqual(0);
+    });
+
+    it(`should split ticket without negatives`, async() => {
+        const newAgency = 'Silla247';
+        const newDate = new Date();
+        newDate.setDate(newDate.getDate() - 1);
+
+        await page.accessToSearchResult('14');
+        await page.accessToSection('ticket.card.basicData.stepOne');
+
+        await page.autocompleteSearch(selectors.ticketBasicData.agency, newAgency);
+        await page.pickDate(selectors.ticketBasicData.shipped, newDate);
+
+        await page.waitToClick(selectors.ticketBasicData.nextStepButton);
+
+        await page.waitToClick(selectors.ticketBasicData.withoutNegatives);
+        await page.waitToClick(selectors.ticketBasicData.finalizeButton);
+
+        await page.waitForState('ticket.card.summary');
+
+        const newTicketAgency = await page
+            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryAgency, 'innerText');
+        const newTicketDate = await page
+            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
+
+        expect(newAgency).toEqual(newTicketAgency);
+        expect(newTicketDate).toContain(newDate.getDate());
+    });
+
+    it(`should new ticket have sale of old ticket`, async() => {
+        await page.accessToSection('ticket.card.sale');
+        await page.waitForState('ticket.card.sale');
+
+        const item = await page.waitToGetProperty(selectors.ticketSales.firstSaleId, 'innerText');
+
+        expect(item).toEqual('4');
+    });
+
+    it(`should old ticket have old date and agency`, async() => {
+        const oldDate = new Date();
+        const oldAgency = 'Super-Man delivery';
+
+        await page.accessToSearchResult('14');
+
+        const oldTicketAgency = await page
+            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryAgency, 'innerText');
+        const oldTicketDate = await page
+            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
+
+        expect(oldTicketAgency).toEqual(oldAgency);
+        expect(oldTicketDate).toContain(oldDate.getDate());
+    });
 });

e2e/paths/06-claim/01_basic_data.spec.js

@@ -24,6 +24,8 @@ describe('Claim edit basic data path', () => {
         await page.autocompleteSearch(selectors.claimBasicData.claimState, 'Gestionado');
         await page.clearTextarea(selectors.claimBasicData.observation);
         await page.write(selectors.claimBasicData.observation, 'edited observation');
+        await page.clearInput(selectors.claimBasicData.packages);
+        await page.write(selectors.claimBasicData.packages, '2');
         await page.waitToClick(selectors.claimBasicData.saveButton);
         const message = await page.waitForSnackbar();
 
@@ -64,10 +66,19 @@ describe('Claim edit basic data path', () => {
         expect(result).toEqual('edited observation');
     });
 
+    it('should confirm the claim packages was edited', async() => {
+        const result = await page
+            .waitToGetProperty(selectors.claimBasicData.packages, 'value');
+
+        expect(result).toEqual('2');
+    });
+
     it(`should edit the claim to leave it untainted`, async() => {
         await page.autocompleteSearch(selectors.claimBasicData.claimState, 'Pendiente');
         await page.clearTextarea(selectors.claimBasicData.observation);
         await page.write(selectors.claimBasicData.observation, 'Observation one');
+        await page.clearInput(selectors.claimBasicData.packages);
+        await page.write(selectors.claimBasicData.packages, '0');
         await page.waitToClick(selectors.claimBasicData.saveButton);
         const message = await page.waitForSnackbar();
 

e2e/paths/06-claim/04_claim_action.spec.js

@@ -24,22 +24,6 @@ describe('Claim action path', () => {
         expect(message.text).toContain('Data saved!');
     });
 
-    it('should import the second importable ticket', async() => {
-        await page.waitToClick(selectors.claimAction.importTicketButton);
-        await page.waitToClick(selectors.claimAction.secondImportableTicket);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should edit the second line destination field', async() => {
-        await page.waitForContentLoaded();
-        await page.autocompleteSearch(selectors.claimAction.secondLineDestination, 'Bueno');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
     it('should delete the first line', async() => {
         await page.waitToClick(selectors.claimAction.firstDeleteLine);
         const message = await page.waitForSnackbar();
@@ -47,18 +31,11 @@ describe('Claim action path', () => {
         expect(message.text).toContain('Data saved!');
     });
 
-    it('should refresh the view to check the remaining line is the expected one', async() => {
+    it('should refresh the view to check not have lines', async() => {
         await page.reloadSection('claim.card.action');
-        const result = await page.waitToGetProperty(selectors.claimAction.firstLineDestination, 'value');
+        const result = await page.countElement(selectors.claimAction.anyLine);
 
-        expect(result).toEqual('Bueno');
-    });
-
-    it('should delete the current first line', async() => {
-        await page.waitToClick(selectors.claimAction.firstDeleteLine);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
+        expect(result).toEqual(0);
     });
 
     it('should check the "is paid with mana" checkbox', async() => {

e2e/paths/06-claim/05_summary.spec.js

@@ -1,3 +1,4 @@
+
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
@@ -38,7 +39,7 @@ describe('Claim summary path', () => {
     it('should display the observation', async() => {
         const result = await page.waitToGetProperty(selectors.claimSummary.observation, 'value');
 
-        expect(result).toContain('observation four');
+        expect(result).toContain('Wisi forensibus mnesarchum in cum. Per id impetus abhorreant');
     });
 
     it('should display the claimed line(s)', async() => {

e2e/paths/12-entry/07_buys.spec.js

@@ -9,7 +9,7 @@ describe('Entry import, create and edit buys path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'entry');
-        await page.accessToSearchResult('1');
+        await page.accessToSearchResult('3');
     });
 
     afterAll(async() => {
@@ -19,7 +19,7 @@ describe('Entry import, create and edit buys path', () => {
     it('should count the summary buys and find there only one at this point', async() => {
         const buysCount = await page.countElement(selectors.entrySummary.anyBuyLine);
 
-        expect(buysCount).toEqual(1);
+        expect(buysCount).toEqual(2);
     });
 
     it('should navigate to the buy section and then click the import button opening the import form', async() => {
@@ -41,11 +41,10 @@ describe('Entry import, create and edit buys path', () => {
         await page.waitForTextInField(selectors.entryBuys.ref, '200573095, 200573106, 200573117, 200573506');
         await page.waitForTextInField(selectors.entryBuys.observation, '729-6340 2846');
 
-        await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged Reinforced weapon pistol 9mm');
-        const itemName = 'Melee Reinforced weapon heavy shield 1x0.5m';
-        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, itemName);
-        await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Container medical box 1m');
-        await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Container ammo box 1m');
+        await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged weapon longbow 2m');
+        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, 'Ranged weapon longbow 2m');
+        await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Ranged weapon sniper rifle 300mm');
+        await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Melee weapon heavy shield 1x0.5m');
 
         await page.waitToClick(selectors.entryBuys.importBuysButton);
 
@@ -57,7 +56,7 @@ describe('Entry import, create and edit buys path', () => {
     });
 
     it('should count the buys to find 4 buys have been added', async() => {
-        await page.waitForNumberOfElements(selectors.entryBuys.anyBuyLine, 5);
+        await page.waitForNumberOfElements(selectors.entryBuys.anyBuyLine, 6);
     });
 
     it('should delete the four buys that were just added', async() => {

e2e/paths/14-account/01_create_and_basic_data.spec.js

@@ -80,7 +80,7 @@ describe('Account create and basic data path', () => {
                 await page.reloadSection('account.card.roles');
                 const rolesCount = await page.countElement(selectors.accountRoles.anyResult);
 
-                expect(rolesCount).toEqual(35);
+                expect(rolesCount).toEqual(61);
             });
         });
 

front/core/components/check/style.scss

@@ -43,4 +43,10 @@
     &.disabled.checked > .btn {
         background-color: $color-font-secondary;
     }
+
+    &[triple-state]:not(.indeterminate):not(.checked) {
+        .btn {
+            background-color: lighten($color-alert, 5%);
+        }
+    }
 }

front/core/components/smart-table/index.js

@@ -32,6 +32,9 @@ export default class SmartTable extends Component {
         this._options = options;
         if (!options) return;
 
+        if (options.defaultSearch)
+            this.displaySearch();
+
         const activeButtons = options.activeButtons;
         const missingId = activeButtons && activeButtons.shownColumns && !this.viewConfigId;
         if (missingId)
@@ -171,9 +174,10 @@ export default class SmartTable extends Component {
             if (field.length === 2)
                 sortType = field[1];
 
+            const priority = this.sortCriteria.length + 1;
             const column = this.columns.find(column => column.field == fieldName);
             if (column) {
-                this.sortCriteria.push({field: fieldName, sortType: sortType});
+                this.sortCriteria.push({field: fieldName, sortType: sortType, priority: priority});
 
                 const isASC = sortType == 'ASC';
                 const isDESC = sortType == 'DESC';
@@ -187,6 +191,8 @@ export default class SmartTable extends Component {
                     column.element.classList.remove('desc');
                     column.element.classList.add('asc');
                 }
+
+                this.setPriority(column.element, priority);
             }
         }
     }
@@ -241,9 +247,13 @@ export default class SmartTable extends Component {
         const isDESC = existingCriteria && existingCriteria.sortType == 'DESC';
 
         if (!existingCriteria) {
-            this.sortCriteria.push({field: field, sortType: 'ASC'});
+            const priority = this.sortCriteria.length + 1;
+
+            this.sortCriteria.push({field: field, sortType: 'ASC', priority: priority});
             element.classList.remove('desc');
             element.classList.add('asc');
+
+            this.setPriority(element, priority);
         }
 
         if (isDESC) {
@@ -252,6 +262,8 @@ export default class SmartTable extends Component {
             }), 1);
             element.classList.remove('desc');
             element.classList.remove('asc');
+
+            element.querySelector('sort-priority').remove();
         }
 
         if (isASC) {
@@ -260,9 +272,29 @@ export default class SmartTable extends Component {
             element.classList.add('desc');
         }
 
+        let priority = 0;
+        for (const criteria of this.sortCriteria) {
+            const column = this.columns.find(column => column.field == criteria.field);
+            if (column) {
+                criteria.priority = priority;
+                priority++;
+
+                column.element.querySelector('sort-priority').remove();
+
+                this.setPriority(column.element, priority);
+            }
+        }
+
         this.applySort();
     }
 
+    setPriority(column, priority) {
+        const sortPriority = document.createElement('sort-priority');
+        sortPriority.setAttribute('class', 'sort-priority');
+        sortPriority.innerHTML = priority;
+        column.appendChild(sortPriority);
+    }
+
     displaySearch() {
         const header = this.element.querySelector('thead > tr');
         if (!header) return;

front/core/components/smart-table/index.spec.js

@@ -96,9 +96,10 @@ describe('Component smartTable', () => {
 
             expect(firstSortCriteria.field).toEqual('id');
             expect(firstSortCriteria.sortType).toEqual('ASC');
+            expect(firstSortCriteria.priority).toEqual(1);
         });
 
-        it('should insert two new objects to the controller sortCriteria with a sortType values of "ASC" and "DESC"', () => {
+        it('should add new entries to the controller sortCriteria with a sortType values of "ASC" and "DESC"', () => {
             const element = document.createElement('div');
             controller.model = {order: 'test1, id DESC'};
             controller.columns = [
@@ -114,8 +115,11 @@ describe('Component smartTable', () => {
 
             expect(firstSortCriteria.field).toEqual('test1');
             expect(firstSortCriteria.sortType).toEqual('ASC');
+            expect(firstSortCriteria.priority).toEqual(1);
+
             expect(secondSortCriteria.field).toEqual('id');
             expect(secondSortCriteria.sortType).toEqual('DESC');
+            expect(secondSortCriteria.priority).toEqual(2);
         });
     });
 

front/core/components/smart-table/style.scss

@@ -9,7 +9,7 @@ smart-table {
 
     }
     th[field][number] {
-        & > :before {
+        & > span:before {
             vertical-align: middle;
             font-family: 'Material Icons';
             content: 'arrow_downward';
@@ -19,26 +19,26 @@ smart-table {
         
         }
 
-        &.asc > :before, &.desc > :before {
+        &.asc > span:before, &.desc > span:before {
             color: $color-font;
             opacity: 1;
         }
 
-        &.asc > :before {
+        &.asc > span:before {
             content: 'arrow_upward';
         }
 
-        &.desc > :before {
+        &.desc > span:before {
             content: 'arrow_downward';
         }
 
-        &:hover > :before {
+        &:hover > span:before {
             opacity: 1;
         }
     }
 
     th[field]:not([number]) {
-        & > :after {
+        & > span:after {
             vertical-align: middle;
             font-family: 'Material Icons';
             content: 'arrow_downward';
@@ -48,20 +48,20 @@ smart-table {
         
         }
 
-        &.asc > :after, &.desc > :after {
+        &.asc > span:after, &.desc > span:after {
             color: $color-font;
             opacity: 1;
         }
 
-        &.asc > :after {
+        &.asc > span:after {
             content: 'arrow_upward';
         }
 
-        &.desc > :after {
+        &.desc > span:after {
             content: 'arrow_downward';
         }
 
-        &:hover > :after {
+        &:hover > span:after {
             opacity: 1;
         }
     }
@@ -144,3 +144,15 @@ smart-table {
         width: 33%
     }
 }
+.sort-priority {
+    background-color: $color-font-bg-marginal;
+    border-radius: 50%;
+    padding: 2px 5px;
+    display: inline-block;
+    text-align: center;
+    width: 7px;
+    height: 13px;
+
+    font-size: 10px;
+    color: $color-font-bg
+}

front/core/styles/icons/salixfont.css

@@ -23,59 +23,200 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-isTooLittle:before {
-  content: "\e91b";
+
+.icon-100:before {
+  content: "\e95a";
+}
+.icon-accessory:before {
+  content: "\e90a";
+}
+.icon-account:before {
+  content: "\e92a";
+}
+.icon-actions:before {
+  content: "\e960";
+}
+.icon-addperson:before {
+  content: "\e90e";
+}
+.icon-agency:before {
+  content: "\e938";
+}
+.icon-albaran:before {
+  content: "\e94d";
+}
+.icon-anonymous:before {
+  content: "\e930";
+}
+.icon-apps:before {
+  content: "\e951";
+}
+.icon-artificial:before {
+  content: "\e90b";
+}
+.icon-attach:before {
+  content: "\e92e";
+}
+.icon-barcode:before {
+  content: "\e971";
+}
+.icon-basket:before {
+  content: "\e914";
+}
+.icon-basketadd:before {
+  content: "\e913";
+}
+.icon-bin:before {
+  content: "\e96f";
+}
+.icon-botanical:before {
+  content: "\e972";
+}
+.icon-bucket:before {
+  content: "\e97a";
+}
+.icon-buscaman:before {
+  content: "\e93b";
+}
+.icon-buyrequest:before {
+  content: "\e932";
+}
+.icon-calc_volum .path1:before {
+  content: "\e915";
+}
+.icon-calc_volum .path2:before {
+  content: "\e916";
+  margin-left: -1em;
+}
+.icon-calc_volum .path3:before {
+  content: "\e917";
+  margin-left: -1em;
+}
+.icon-calc_volum .path4:before {
+  content: "\e918";
+  margin-left: -1em;
+}
+.icon-calc_volum .path5:before {
+  content: "\e919";
+  margin-left: -1em;
+}
+.icon-calc_volum .path6:before {
+  content: "\e91a";
+  margin-left: -1em;
+}
+.icon-calendar:before {
+  content: "\e93d";
+}
+.icon-catalog:before {
+  content: "\e937";
+}
+.icon-claims:before {
+  content: "\e963";
+}
+.icon-client:before {
+  content: "\e928";
+}
+.icon-clone:before {
+  content: "\e973";
+}
+.icon-columnadd:before {
+  content: "\e954";
+}
+.icon-columndelete:before {
+  content: "\e953";
+}
+.icon-components:before {
+  content: "\e946";
+}
+.icon-consignatarios:before {
+  content: "\e93f";
+}
+.icon-control:before {
+  content: "\e949";
+}
+.icon-credit:before {
+  content: "\e927";
+}
+.icon-defaulter:before {
+  content: "\e94b";
+}
+.icon-deletedTicket:before {
+  content: "\e935";
+}
+.icon-deleteline:before {
+  content: "\e955";
+}
+.icon-delivery:before {
+  content: "\e939";
+}
+.icon-deliveryprices:before {
+  content: "\e91c";
+}
+.icon-details:before {
+  content: "\e961";
+}
+.icon-dfiscales:before {
+  content: "\e984";
+}
+.icon-disabled:before {
+  content: "\e921";
+}
+.icon-doc:before {
+  content: "\e977";
+}
+.icon-entry:before {
+  content: "\e934";
+}
+.icon-exit:before {
+  content: "\e92f";
+}
+.icon-eye:before {
+  content: "\e976";
+}
+.icon-fixedPrice:before {
+  content: "\e90d";
+}
+.icon-flower:before {
+  content: "\e90c";
 }
 .icon-frozen:before {
   content: "\e900";
 }
-.icon-Person:before {
-  content: "\e901";
-}
-.icon-handmadeArtificial:before {
-  content: "\e902";
-}
 .icon-fruit:before {
   content: "\e903";
 }
 .icon-funeral:before {
   content: "\e904";
 }
-.icon-treatments:before {
-  content: "\e905";
-}
-.icon-preserved:before {
-  content: "\e906";
-}
 .icon-greenery:before {
   content: "\e907";
 }
-.icon-plant:before {
-  content: "\e908";
+.icon-greuge:before {
+  content: "\e944";
+}
+.icon-grid:before {
+  content: "\e980";
 }
 .icon-handmade:before {
   content: "\e909";
 }
-.icon-accessory:before {
-  content: "\e90a";
+.icon-handmadeArtificial:before {
+  content: "\e902";
 }
-.icon-artificial:before {
-  content: "\e90b";
+.icon-headercol:before {
+  content: "\e958";
 }
-.icon-flower:before {
-  content: "\e90c";
+.icon-history:before {
+  content: "\e968";
 }
-.icon-fixedPrice:before {
-  content: "\e90d";
+.icon-info:before {
+  content: "\e952";
 }
-.icon-addperson:before {
-  content: "\e90e";
+.icon-inventory:before {
+  content: "\e92b";
 }
-.icon-supplierfalse:before {
-  content: "\e90f";
-}
-.icon-invoice-out:before {
-  content: "\e910";
+.icon-invoice:before {
+  content: "\e923";
 }
 .icon-invoice-in:before {
   content: "\e911";
@@ -83,348 +224,174 @@
 .icon-invoice-in-create:before {
   content: "\e912";
 }
-.icon-basketadd:before {
-  content: "\e913";
+.icon-invoice-out:before {
+  content: "\e910";
 }
-.icon-basket:before {
-  content: "\e914";
-}
-.icon-calc_volum .path1:before {
-  content: "\e915";
-  color: rgb(0, 0, 0);
-}
-.icon-calc_volum .path2:before {
-  content: "\e916";
-  margin-left: -1em;
-  color: rgb(0, 0, 0);
-}
-.icon-calc_volum .path3:before {
-  content: "\e917";
-  margin-left: -1em;
-  color: rgb(0, 0, 0);
-}
-.icon-calc_volum .path4:before {
-  content: "\e918";
-  margin-left: -1em;
-  color: rgb(0, 0, 0);
-}
-.icon-calc_volum .path5:before {
-  content: "\e919";
-  margin-left: -1em;
-  color: rgb(0, 0, 0);
-}
-.icon-calc_volum .path6:before {
-  content: "\e91a";
-  margin-left: -1em;
-  color: rgb(255, 255, 255);
-}
-.icon-deliveryprices:before {
-  content: "\e91c";
-}
-.icon-onlinepayment:before {
-  content: "\e91d";
-}
-.icon-risk:before {
-  content: "\e91e";
-}
-.icon-noweb:before {
-  content: "\e91f";
-}
-.icon-no036:before {
-  content: "\e920";
-}
-.icon-inactive:before {
-  content: "\e921";
-}
-.icon-unavailable:before {
-  content: "\e922";
-}
-.icon-invoice-01:before {
-  content: "\e923";
-}
-.icon-invoice:before {
-  content: "\e924";
-  color: #5f5f5f;
-}
-.icon-supplier:before {
-  content: "\e925";
-}
-.icon-client2:before {
-  content: "\e926";
-}
-.icon-supplier2:before {
-  content: "\e927";
-}
-.icon-client:before {
-  content: "\e928";
-}
-.icon-shipment-01:before {
-  content: "\e929";
-  color: #000;
-}
-.icon-inventory:before {
-  content: "\e92b";
-}
-.icon-zone:before {
-  content: "\e92c";
-}
-.icon-wiki:before {
-  content: "\e92d";
-}
-.icon-attach:before {
-  content: "\e92e";
-}
-.icon-zone2:before {
-  content: "\e92f";
-}
-.icon-anonymous:before {
-  content: "\e930";
-}
-.icon-net:before {
-  content: "\e931";
-}
-.icon-buyrequest:before {
-  content: "\e932";
-}
-.icon-thermometer:before {
-  content: "\e933";
-}
-.icon-entry:before {
-  content: "\e934";
-}
-.icon-deletedTicket:before {
-  content: "\e935";
-}
-.icon-deliveryprices-01:before {
-  content: "\e936";
-}
-.icon-catalog:before {
-  content: "\e937";
-}
-.icon-agency:before {
-  content: "\e938";
-}
-.icon-delivery:before {
-  content: "\e939";
-}
-.icon-wand:before {
-  content: "\e93a";
-}
-.icon-buscaman:before {
-  content: "\e93b";
-}
-.icon-pbx:before {
-  content: "\e93c";
-}
-.icon-calendar:before {
-  content: "\e93d";
-}
-.icon-splitline:before {
-  content: "\e93e";
-}
-.icon-consignatarios:before {
-  content: "\e93f";
-}
-.icon-tax:before {
-  content: "\e940";
-}
-.icon-notes:before {
-  content: "\e941";
-}
-.icon-lines:before {
-  content: "\e942";
-}
-.icon-languaje:before {
-  content: "\e943";
-}
-.icon-greuge:before {
-  content: "\e944";
-}
-.icon-credit:before {
-  content: "\e945";
-}
-.icon-components:before {
-  content: "\e946";
-}
-.icon-pets:before {
-  content: "\e947";
-}
-.icon-linesprepaired:before {
-  content: "\e948";
-}
-.icon-control:before {
-  content: "\e949";
-}
-.icon-revision:before {
-  content: "\e94a";
-}
-.icon-newinvoices:before {
-  content: "\e94b";
-}
-.icon-services:before {
-  content: "\e94c";
-}
-.icon-newalbaran:before {
-  content: "\e94d";
-}
-.icon-solunion:before {
-  content: "\e94e";
-}
-.icon-stowaway:before {
-  content: "\e94f";
-}
-.icon-exit:before {
-  content: "\e950";
-}
-.icon-apps:before {
-  content: "\e951";
-}
-.icon-info:before {
-  content: "\e952";
-}
-.icon-columndelete:before {
-  content: "\e953";
-}
-.icon-columnadd:before {
-  content: "\e954";
-}
-.icon-deleteline:before {
-  content: "\e955";
+.icon-isTooLittle:before {
+  content: "\e91b";
 }
 .icon-item:before {
   content: "\e956";
 }
-.icon-worker:before {
-  content: "\e957";
+.icon-languaje:before {
+  content: "\e926";
 }
-.icon-headercol:before {
-  content: "\e958";
+.icon-lines:before {
+  content: "\e942";
 }
-.icon-reserva:before {
-  content: "\e959";
+.icon-linesprepaired:before {
+  content: "\e948";
 }
-.icon-100:before {
-  content: "\e95a";
-}
-.icon-noweb1:before {
-  content: "\e95b";
-}
-.icon-settings1:before {
-  content: "\e95c";
-}
-.icon-sign:before {
-  content: "\e95d";
-}
-.icon-polizon:before {
-  content: "\e95e";
-}
-.icon-solclaim:before {
-  content: "\e95f";
-}
-.icon-actions:before {
-  content: "\e960";
-}
-.icon-details:before {
-  content: "\e961";
-}
-.icon-traceability:before {
-  content: "\e962";
-}
-.icon-claims:before {
-  content: "\e963";
-}
-.icon-regentry:before {
-  content: "\e964";
-}
-.icon-regentry-1:before {
-  content: "\e965";
-}
-.icon-transaction:before {
-  content: "\e966";
-}
-.icon-history:before {
-  content: "\e968";
-}
-.icon-entry:before {
-  content: "\e969";
+.icon-logout:before {
+  content: "\e936";
 }
 .icon-mana:before {
   content: "\e96a";
 }
-.icon-ticket:before {
-  content: "\e96b";
+.icon-mandatory:before {
+  content: "\e97b";
+}
+.icon-net:before {
+  content: "\e931";
 }
 .icon-niche:before {
   content: "\e96c";
 }
-.icon-tags:before {
-  content: "\e96d";
+.icon-no036:before {
+  content: "\e920";
 }
-.icon-volume:before {
-  content: "\e96e";
+.icon-noPayMethod:before {
+  content: "\e905";
 }
-.icon-bin:before {
-  content: "\e96f";
+.icon-notes:before {
+  content: "\e941";
 }
-.icon-splur:before {
-  content: "\e970";
+.icon-noweb:before {
+  content: "\e91f";
 }
-.icon-barcode:before {
-  content: "\e971";
-}
-.icon-botanical:before {
-  content: "\e972";
-}
-.icon-clone:before {
-  content: "\e973";
-}
-.icon-photo:before {
-  content: "\e974";
-}
-.icon-sms:before {
-  content: "\e975";
-}
-.icon-eye:before {
-  content: "\e976";
-}
-.icon-doc:before {
-  content: "\e977";
+.icon-onlinepayment:before {
+  content: "\e91d";
 }
 .icon-package:before {
   content: "\e978";
 }
-.icon-settings:before {
-  content: "\e979";
+.icon-payment:before {
+  content: "\e97e";
 }
-.icon-bucket:before {
-  content: "\e97a";
-  color: #000;
+.icon-pbx:before {
+  content: "\e93c";
 }
-.icon-mandatory:before {
-  content: "\e97b";
+.icon-Person:before {
+  content: "\e901";
+}
+.icon-pets:before {
+  content: "\e947";
+}
+.icon-photo:before {
+  content: "\e924";
+}
+.icon-plant:before {
+  content: "\e908";
+}
+.icon-polizon:before {
+  content: "\e95e";
+}
+.icon-preserved:before {
+  content: "\e906";
 }
 .icon-recovery:before {
   content: "\e97c";
 }
-.icon-payment:before {
-  content: "\e97e";
+.icon-regentry:before {
+  content: "\e964";
 }
-.icon-invoices:before {
-  content: "\e97f";
-  color: #000;
+.icon-reserva:before {
+  content: "\e959";
 }
-.icon-grid:before {
-  content: "\e980";
+.icon-revision:before {
+  content: "\e94a";
 }
-.icon-logout:before {
-  content: "\e981";
+.icon-risk:before {
+  content: "\e91e";
+}
+.icon-services:before {
+  content: "\e94c";
+}
+.icon-settings:before {
+  content: "\e979";
+}
+.icon-shipment-01:before {
+  content: "\e929";
+}
+.icon-sign:before {
+  content: "\e95d";
+}
+.icon-sms:before {
+  content: "\e975";
+}
+.icon-solclaim:before {
+  content: "\e95f";
+}
+.icon-solunion:before {
+  content: "\e94e";
+}
+.icon-splitline:before {
+  content: "\e93e";
+}
+.icon-splur:before {
+  content: "\e970";
+}
+.icon-stowaway:before {
+  content: "\e94f";
+}
+.icon-supplier:before {
+  content: "\e925";
+}
+.icon-supplierfalse:before {
+  content: "\e90f";
+}
+.icon-tags:before {
+  content: "\e96d";
+}
+.icon-tax:before {
+  content: "\e940";
+}
+.icon-thermometer:before {
+  content: "\e933";
+}
+.icon-ticket:before {
+  content: "\e96b";
+}
+.icon-ticketAdd:before {
+  content: "\e945";
+}
+.icon-traceability:before {
+  content: "\e962";
+}
+.icon-transaction:before {
+  content: "\e966";
+}
+.icon-treatments:before {
+  content: "\e922";
+}
+.icon-unavailable:before {
+  content: "\e92c";
+}
+.icon-volume:before {
+  content: "\e96e";
+}
+.icon-wand:before {
+  content: "\e93a";
 }
 .icon-web:before {
   content: "\e982";
 }
-.icon-albaran:before {
-  content: "\e983";
+.icon-wiki:before {
+  content: "\e92d";
 }
-.icon-dfiscales:before {
-  content: "\e984";
+.icon-worker:before {
+  content: "\e957";
+}
+.icon-zone:before {
+  content: "\e943";
 }

front/package-lock.json

@@ -0,0 +1,133 @@
+{
+	"name": "salix-front",
+	"version": "1.0.0",
+	"lockfileVersion": 1,
+	"requires": true,
+	"dependencies": {
+		"@uirouter/angularjs": {
+			"version": "1.0.29",
+			"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.29.tgz",
+			"integrity": "sha512-RImWnBarNixkMto0o8stEaGwZmvhv5cnuOLXyMU2pY8MP2rgEF74ZNJTLeJCW14LR7XDUxVH8Mk8bPI6lxedmQ==",
+			"requires": {
+				"@uirouter/core": "6.0.7"
+			}
+		},
+		"@uirouter/core": {
+			"version": "6.0.7",
+			"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.7.tgz",
+			"integrity": "sha512-KUTJxL+6q0PiBnFx4/Z+Hsyg0pSGiaW5yZQeJmUxknecjpTbnXkLU8H2EqRn9N2B+qDRa7Jg8RcgeNDPY72O1w=="
+		},
+		"angular": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.2.tgz",
+			"integrity": "sha512-IauMOej2xEe7/7Ennahkbb5qd/HFADiNuLSESz9Q27inmi32zB0lnAsFeLEWcox3Gd1F6YhNd1CP7/9IukJ0Gw=="
+		},
+		"angular-animate": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.8.2.tgz",
+			"integrity": "sha512-Jbr9+grNMs9Kj57xuBU3Ju3NOPAjS1+g2UAwwDv7su1lt0/PLDy+9zEwDiu8C8xJceoTbmBNKiWGPJGBdCQLlA=="
+		},
+		"angular-moment": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/angular-moment/-/angular-moment-1.3.0.tgz",
+			"integrity": "sha512-KG8rvO9MoaBLwtGnxTeUveSyNtrL+RNgGl1zqWN36+HDCCVGk2DGWOzqKWB6o+eTTbO3Opn4hupWKIElc8XETA==",
+			"requires": {
+				"moment": ">=2.8.0 <3.0.0"
+			}
+		},
+		"angular-translate": {
+			"version": "2.18.4",
+			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.18.4.tgz",
+			"integrity": "sha512-KohNrkH6J9PK+VW0L/nsRTcg5Fw70Ajwwe3Jbfm54Pf9u9Fd+wuingoKv+h45mKf38eT+Ouu51FPua8VmZNoCw==",
+			"requires": {
+				"angular": "^1.8.0"
+			}
+		},
+		"angular-translate-loader-partial": {
+			"version": "2.18.4",
+			"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.18.4.tgz",
+			"integrity": "sha512-bsjR+FbB0sdA2528E/ugwKdlPPQhA1looxLxI3otayBTFXBpED33besfSZhYAISLgNMSL038vSssfRUen9qD8w==",
+			"requires": {
+				"angular-translate": "~2.18.4"
+			}
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"croppie": {
+			"version": "2.6.5",
+			"resolved": "https://registry.npmjs.org/croppie/-/croppie-2.6.5.tgz",
+			"integrity": "sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ=="
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+		},
+		"js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			}
+		},
+		"mg-crud": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/mg-crud/-/mg-crud-1.1.2.tgz",
+			"integrity": "sha1-p6AWGzWSPK7/8ZpIBpS2V1vDggw=",
+			"requires": {
+				"angular": "^1.6.1"
+			}
+		},
+		"moment": {
+			"version": "2.29.1",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+			"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+		},
+		"oclazyload": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/oclazyload/-/oclazyload-0.6.3.tgz",
+			"integrity": "sha1-Kjirv/QJDAihEBZxkZRbWfLoJ5w="
+		},
+		"require-yaml": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/require-yaml/-/require-yaml-0.0.1.tgz",
+			"integrity": "sha1-LhsY2RPDuqcqWk03O28Tjd0sMr0=",
+			"requires": {
+				"js-yaml": "^4.1.0"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+				},
+				"js-yaml": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+					"requires": {
+						"argparse": "^2.0.1"
+					}
+				}
+			}
+		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+		},
+		"validator": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-6.3.0.tgz",
+			"integrity": "sha1-R84j7Y1Ord+p1LjvAHG2zxB418g="
+		}
+	}
+}

front/salix/components/descriptor/index.js

@@ -97,7 +97,8 @@ ngModule.vnComponent('vnDescriptor', {
         btnOne: '?btnOne',
         btnTwo: '?btnTwo',
         btnThree: '?btnThree',
-        btnFour: '?btnFour'
+        btnFour: '?btnFour',
+        btnFive: '?btnFive'
     }
 });
 

front/salix/components/descriptor/style.scss

@@ -104,7 +104,7 @@ vn-descriptor-content {
                         align-items: center;
                         justify-content: center;
                         padding: 0 $spacing-sm;
-                        margin: 0 $spacing-sm;
+                        margin: 0 $spacing-xs;
 
                         & > vn-icon {
                             font-size: 1.75rem;

loopback/common/models/loggable.js

@@ -291,7 +291,8 @@ module.exports = function(Self) {
      * @param {*} properties Modified object properties
      */
     function removeUnloggable(definition, properties) {
-        const propList = Object.keys(properties);
+        const objectCopy = Object.assign({}, properties);
+        const propList = Object.keys(objectCopy);
         const propDefs = new Map();
 
         for (let property in definition.properties) {
@@ -302,10 +303,15 @@ module.exports = function(Self) {
 
         for (let property of propList) {
             const propertyDef = propDefs.get(property);
+            const firstChar = property.substring(0, 1);
+            const isPrivate = firstChar == '$';
 
-            if (!propertyDef) return;
+            if (isPrivate || !propertyDef)
+                delete properties[property];
 
-            if (propertyDef.log === false)
+            if (!propertyDef) continue;
+
+            if (propertyDef.log === false || isPrivate)
                 delete properties[property];
             else if (propertyDef.logValue === false)
                 properties[property] = null;

loopback/locale/en.json

@@ -119,5 +119,8 @@
 	"The PDF document does not exists": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
 	"This item is not available": "This item is not available",
 	"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
-	"The type of business must be filled in basic data": "The type of business must be filled in basic data"
+	"The type of business must be filled in basic data": "The type of business must be filled in basic data",
+	"The worker has hours recorded that day": "The worker has hours recorded that day",
+	"isWithoutNegatives": "isWithoutNegatives",
+	"routeFk": "routeFk"
 }

loopback/locale/es.json

@@ -210,11 +210,16 @@
 	"Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
 	"You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
 	"You can't change the credit set to zero from a manager": "No puedes cambiar el cŕedito establecido a cero por un gerente",
+	"Amounts do not match": "Las cantidades no coinciden",
 	"The PDF document does not exists": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
 	"The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
 	"You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
 	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
 	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
 	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
-	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas"
+	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
+	"You don't have privileges to create pay back": "No tienes permisos para crear un abono",
+	"The item is required": "El artículo es requerido",
+	"date in the future": "Fecha en el futuro",
+	"reference duplicated": "Referencia duplicada"
 }