Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulter

Reviewed-on: #3143
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

back/Dockerfile

@@ -32,8 +32,7 @@ RUN apt-get update \
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         samba-common-bin samba-dsdb-modules\
-    && rm -rf /var/lib/apt/lists/* \
-    && npm -g install pm2
+    && rm -rf /var/lib/apt/lists/*
 
 # Salix
 
@@ -55,7 +54,4 @@ COPY \
     README.md \
     ./
 
-CMD ["pm2-runtime", "./back/process.yml"]
-
-HEALTHCHECK --interval=15s --timeout=10s \
-    CMD curl -f http://localhost:3000/api/Applications/status || exit 1
+CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]

back/methods/collection/assignCollection.js

@@ -19,8 +19,15 @@ module.exports = Self => {
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
-        const [info, info2, [{'@vCollectionFk': collectionFk}]] = await Self.rawSql(
-            'CALL vn.collection_getAssigned(?, @vCollectionFk);SELECT @vCollectionFk', [userId], myOptions);
+
+        const randStr = Math.random().toString(36).substring(3);
+        const result = await Self.rawSql(`
+            CALL vn.collection_getAssigned(?, @vCollectionFk);
+            SELECT @vCollectionFk ?
+            `, [userId, randStr], myOptions);
+
+        const collectionFk = result.find(item => item[0]?.[randStr] !== undefined)?.[0]?.[randStr];
+
         if (!collectionFk) throw new UserError('There are not picking tickets');
         await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);
 

back/methods/collection/getTickets.js

@@ -62,7 +62,8 @@ module.exports = Self => {
                     p.code parkingCodePrevia,
                     p.pickingOrder pickingOrderPrevia,
                     iss.id itemShelvingSaleFk,
-                    iss.isPicked
+                    iss.isPicked,
+                    iss.itemShelvingFk
                 FROM ticketCollection tc
                     LEFT JOIN collection c ON c.id = tc.collectionFk
                     JOIN sale s ON s.ticketFk = tc.ticketFk
@@ -102,7 +103,8 @@ module.exports = Self => {
                 p.code,
                 p.pickingOrder,
                 iss.id itemShelvingSaleFk,
-                iss.isPicked
+                iss.isPicked,
+                iss.itemShelvingFk
             FROM sectorCollection sc
                 JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
                 JOIN saleGroup sg ON sg.id = ss.saleGroupFk

back/methods/docuware/core.js

@@ -4,21 +4,45 @@ module.exports = Self => {
     /**
      * Returns basic headers
      *
-     * @param {string} cookie - The docuware cookie
      * @return {object} - The headers
      */
     Self.getOptions = async() => {
         const docuwareConfig = await Self.app.models.DocuwareConfig.findOne();
+        const now = Date.vnNow();
+        let {url, username, password, token, expired} = docuwareConfig;
+
+        if (process.env.NODE_ENV && (!expired || expired < now + 60)) {
+            const {data: {IdentityServiceUrl}} = await axios.get(`${url}/Home/IdentityServiceInfo`);
+            const {data: {token_endpoint}} = await axios.get(`${IdentityServiceUrl}/.well-known/openid-configuration`);
+            const {data} = await axios.post(token_endpoint, {
+                grant_type: 'password',
+                scope: 'docuware.platform',
+                client_id: 'docuware.platform.net.client',
+                username,
+                password
+            }, {headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/x-www-form-urlencoded'
+            }});
+
+            const newToken = data.access_token;
+            token = data.token_type + ' ' + newToken;
+            await docuwareConfig.updateAttributes({
+                token,
+                expired: now + data.expires_in
+            });
+        }
+
         const headers = {
             headers: {
                 'Accept': 'application/json',
                 'Content-Type': 'application/json',
-                'Cookie': docuwareConfig.cookie
+                'Authorization': token
             }
         };
 
         return {
-            url: docuwareConfig.url,
+            url,
             headers
         };
     };

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

@@ -2,26 +2,21 @@ const axios = require('axios');
 const models = require('vn-loopback/server/server').models;
 
 describe('Docuware core', () => {
-    beforeAll(() => {
+    const fileCabinetCode = 'deliveryNote';
+    beforeAll(async() => {
         process.env.NODE_ENV = 'testing';
+
+        const docuwareInfo = await models.Docuware.findOne({
+            where: {
+                code: fileCabinetCode
+            }
         });
 
-    afterAll(() => {
-        delete process.env.NODE_ENV;
-    });
-
-    describe('getOptions()', () => {
-        it('should return url and headers', async() => {
-            const result = await models.Docuware.getOptions();
-
-            expect(result.url).toBeDefined();
-            expect(result.headers).toBeDefined();
-        });
-    });
-
-    describe('getDialog()', () => {
-        it('should return dialogId', async() => {
-            const dialogs = {
+        spyOn(axios, 'get').and.callFake(url => {
+            if (url.includes('IdentityServiceInfo')) return {data: {IdentityServiceUrl: 'IdentityServiceUrl'}};
+            if (url.includes('IdentityServiceUrl')) return {data: {token_endpoint: 'token_endpoint'}};
+            if (url.includes('dialogs')) {
+                return {
                     data: {
                         Dialog: [
                             {
@@ -31,58 +26,30 @@ describe('Docuware core', () => {
                         ]
                     }
                 };
-            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
-            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
-
-            expect(result).toEqual('getDialogTest');
-        });
-    });
-
-    describe('getFileCabinet()', () => {
-        it('should return fileCabinetId', async() => {
-            const code = 'deliveryNote';
-            const docuwareInfo = await models.Docuware.findOne({
-                where: {
-                    code
             }
-            });
-            const dialogs = {
-                data: {
+
+            if (url.includes('FileCabinets')) {
+                return {data: {
                     FileCabinet: [
                         {
                             Name: docuwareInfo.fileCabinetName,
                             Id: 'getFileCabinetTest'
                         }
                     ]
+                }};
             }
-            };
-            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
-            const result = await models.Docuware.getFileCabinet(code);
-
-            expect(result).toEqual('getFileCabinetTest');
-        });
         });
 
-    describe('get()', () => {
-        it('should return data without parse', async() => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            const data = {
-                data: {
-                    id: 1
+        spyOn(axios, 'post').and.callFake(url => {
+            if (url.includes('token_endpoint')) {
+                return {data: {
+                    access_token: 'access_token',
+                    token_type: 'bearer',
+                    expires_in: 10000
+                }};
             }
-            };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
-            const result = await models.Docuware.get('deliveryNote');
-
-            expect(result.id).toEqual(1);
-        });
-
-        it('should return data with parse', async() => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            const data = {
-                data: {
+            if (url.includes('DialogExpression')) {
+                return {data: {
                     Items: [{
                         Fields: [
                             {
@@ -104,11 +71,51 @@ describe('Docuware core', () => {
                     }]
                 }
                 };
+            }
+        });
+    });
+
+    afterAll(() => {
+        delete process.env.NODE_ENV;
+    });
+
+    describe('getOptions()', () => {
+        it('should return url and headers', async() => {
+            const result = await models.Docuware.getOptions();
+
+            expect(result.url).toBeDefined();
+            expect(result.headers).toBeDefined();
+        });
+    });
+
+    describe('Dialog()', () => {
+        it('should return dialogId', async() => {
+            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+
+            expect(result).toEqual('getDialogTest');
+        });
+    });
+
+    describe('getFileCabinet()', () => {
+        it('should return fileCabinetId', async() => {
+            const result = await models.Docuware.getFileCabinet(fileCabinetCode);
+
+            expect(result).toEqual('getFileCabinetTest');
+        });
+    });
+
+    describe('get()', () => {
+        it('should return data without parse', async() => {
+            const [result] = await models.Docuware.get('deliveryNote');
+
+            expect(result.firstRequiredField).toEqual(1);
+        });
+
+        it('should return data with parse', async() => {
             const parse = {
                 'firstRequiredField': 'id',
                 'secondRequiredField': 'name',
             };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
             const [result] = await models.Docuware.get('deliveryNote', null, parse);
 
             expect(result.id).toEqual(1);
@@ -119,17 +126,14 @@ describe('Docuware core', () => {
 
     describe('getById()', () => {
         it('should return data', async() => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-            const data = {
-                data: {
-                    id: 1
-                }
-            };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
-            const result = await models.Docuware.getById('deliveryNote', 1);
+            spyOn(models.Docuware, 'get');
+            await models.Docuware.getById('deliveryNote', 1);
 
-            expect(result.id).toEqual(1);
+            expect(models.Docuware.get).toHaveBeenCalledWith(
+                'deliveryNote',
+                {condition: [Object({DBName: 'N__ALBAR_N', Value: [1]})]},
+                undefined
+            );
         });
     });
 });

back/methods/docuware/upload.js

@@ -143,7 +143,7 @@ module.exports = Self => {
                 headers: {
                     'Content-Type': 'multipart/form-data',
                     'X-File-ModifiedDate': Date.vnNew(),
-                    'Cookie': docuwareOptions.headers.headers.Cookie,
+                    'Authorization': docuwareOptions.headers.headers.Authorization,
                     ...data.getHeaders()
                 },
             };

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

@@ -1,132 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('machineWorker updateInTime()', () => {
-    const itBoss = 104;
-    const davidCharles = 1106;
-
-    beforeAll(async() => {
-        ctx = {
-            req: {
-                accessToken: {},
-                headers: {origin: 'http://localhost'},
-                __: value => value
-            }
-        };
-    });
-
-    it('should throw an error if the plate does not exist', async() => {
-        const tx = await models.MachineWorker.beginTransaction({});
-        const options = {transaction: tx};
-        const plate = 'RE-123';
-        ctx.req.accessToken.userId = 1106;
-        try {
-            await models.MachineWorker.updateInTime(ctx, plate, options);
-            await tx.rollback();
-        } catch (e) {
-            const error = e;
-
-            expect(error.message).toContain('the plate does not exist');
-            await tx.rollback();
-        }
-    });
-
-    it('should grab a machine where is not in use', async() => {
-        const tx = await models.MachineWorker.beginTransaction({});
-        const options = {transaction: tx};
-        const plate = 'RE-003';
-        ctx.req.accessToken.userId = 1107;
-        try {
-            const totalBefore = await models.MachineWorker.find(null, options);
-            await models.MachineWorker.updateInTime(ctx, plate, options);
-            const totalAfter = await models.MachineWorker.find(null, options);
-
-            expect(totalAfter.length).toEqual(totalBefore.length + 1);
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-        }
-    });
-
-    describe('less than 12h', () => {
-        const plate = 'RE-001';
-        it('should trow an error if it is not himself', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = davidCharles;
-
-            try {
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                await tx.rollback();
-            } catch (e) {
-                const error = e;
-
-                expect(error.message).toContain('This machine is already in use');
-                await tx.rollback();
-            }
-        });
-
-        it('should throw an error if it is himself with a different machine', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = itBoss;
-            const plate = 'RE-003';
-            try {
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                await tx.rollback();
-            } catch (e) {
-                const error = e;
-
-                expect(error.message).toEqual('You are already using a machine');
-                await tx.rollback();
-            }
-        });
-
-        it('should set the out time if it is himself', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = itBoss;
-
-            try {
-                const isNotParked = await models.MachineWorker.findOne({
-                    where: {workerFk: itBoss}
-                }, options);
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                const isParked = await models.MachineWorker.findOne({
-                    where: {workerFk: itBoss}
-                }, options);
-
-                expect(isNotParked.outTime).toBeNull();
-                expect(isParked.outTime).toBeDefined();
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-            }
-        });
-    });
-
-    describe('equal or more than 12h', () => {
-        const plate = 'RE-002';
-        it('should set the out time and grab the machine', async() => {
-            const tx = await models.MachineWorker.beginTransaction({});
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = davidCharles;
-            const filter = {
-                where: {workerFk: davidCharles, machineFk: 2}
-            };
-            try {
-                const isNotParked = await models.MachineWorker.findOne(filter, options);
-                const totalBefore = await models.MachineWorker.find(null, options);
-                await models.MachineWorker.updateInTime(ctx, plate, options);
-                const isParked = await models.MachineWorker.findOne(filter, options);
-                const totalAfter = await models.MachineWorker.find(null, options);
-
-                expect(isNotParked.outTime).toBeNull();
-                expect(isParked.outTime).toBeDefined();
-                expect(totalAfter.length).toEqual(totalBefore.length + 1);
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-            }
-        });
-    });
-});

back/methods/machine-worker/updateInTime.js

@@ -1,77 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-module.exports = Self => {
-    Self.remoteMethodCtx('updateInTime', {
-        description: 'Updates the corresponding registry if the worker has been registered in the last few hours',
-        accessType: 'WRITE',
-        accepts: [
-            {
-                arg: 'plate',
-                type: 'string',
-            }
-        ],
-        http: {
-            path: `/updateInTime`,
-            verb: 'POST'
-        }
-    });
-
-    Self.updateInTime = async(ctx, plate, options) => {
-        const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-        const $t = ctx.req.__;
-
-        let tx;
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const machine = await models.Machine.findOne({
-                fields: ['id', 'plate'],
-                where: {plate}
-            }, myOptions);
-
-            if (!machine)
-                throw new UserError($t('the plate does not exist', {plate}));
-
-            const machineWorker = await Self.findOne({
-                where: {
-                    or: [{machineFk: machine.id}, {workerFk: userId}],
-                    outTime: null,
-                }
-            }, myOptions);
-
-            const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions);
-            const hoursDifference = (Date.vnNow() - machineWorker?.inTime?.getTime() ?? 0) / (60 * 60 * 1000);
-
-            if (machineWorker) {
-                const isHimself = userId == machineWorker.workerFk;
-                const isSameMachine = machine.id == machineWorker.machineFk;
-
-                if (hoursDifference < maxHours && !isHimself)
-                    throw new UserError($t('This machine is already in use.'));
-
-                if (hoursDifference < maxHours && isHimself && !isSameMachine)
-                    throw new UserError($t('You are already using a machine'));
-
-                await machineWorker.updateAttributes({
-                    outTime: Date.vnNew()
-                }, myOptions);
-            }
-
-            if (!machineWorker || hoursDifference >= maxHours)
-                await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);
-
-            if (tx) await tx.commit();
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

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

@@ -72,9 +72,9 @@ describe('Renew Token', () => {
         }
 
         expect(error).toBeDefined();
-        const query = 'SELECT * FROM util.debug';
 
-        const debugLog = await models.Application.rawSql(query, null);
+        const query = 'SELECT * FROM util.debug WHERE variable = "renewToken"';
+        const debugLog = await models.Application.rawSql(query);
 
         expect(debugLog.length).toEqual(1);
     });

back/model-config.json

@@ -88,12 +88,6 @@
     "Machine": {
         "dataSource": "vn"
     },
-    "MachineWorker": {
-        "dataSource": "vn"
-    },
-    "MachineWorkerConfig": {
-        "dataSource": "vn"
-    },
     "MobileAppVersionControl": {
         "dataSource": "vn"
     },
@@ -175,6 +169,9 @@
     "PrintConfig": {
         "dataSource": "vn"
     },
+    "QueueMember": {
+        "dataSource": "vn"
+    },
     "ViaexpressConfig": {
         "dataSource": "vn"
     },

back/models/autonomy.json

@@ -16,6 +16,10 @@
         "name": {
             "type": "string",
             "required": true
+        },
+        "hasDailyInvoice": {
+            "type": "boolean",
+            "description": "Indicates if the autonomy has daily invoice enabled"
         }
     },
     "relations": {

back/models/country.json

@@ -28,6 +28,10 @@
         },
         "continentFk": {
             "type": "number"
+        },
+        "hasDailyInvoice": {
+            "type": "boolean",
+            "description": "Indicates if the autonomy has daily invoice enabled"
         }
     },
     "relations": {

back/models/docuware-config.json

@@ -16,17 +16,17 @@
         "url": {
             "type": "string"
         },
-        "cookie": {
+        "token": {
             "type": "string"
-        }
         },
-    "acls": [
-        {
-            "property": "*",
-            "accessType": "*",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
+        "username": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "expired":{
+            "type": "number"
+        }
     }
-    ]
 }

back/models/machine-worker-config.json

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

back/models/machine-worker.js

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

back/models/machine-worker.json

@@ -1,33 +0,0 @@
-{
-	"name": "MachineWorker",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "vn.machineWorker"
-		}
-	},
-	"properties": {
-		"id": {
-			"type": "number",
-			"id": true
-		},
-		"workerFk": {
-			"type": "number"
-		},
-		"machineFk": {
-			"type": "number"
-		},
-		"inTime": {
-			"type": "date",
-			"mysql": {
-				"columnName": "inTimed"
-			}
-		},
-		"outTime": {
-			"type": "date",
-			"mysql": {
-				"columnName": "outTimed"
-			}
-		}
-	}
-}

back/models/province.json

@@ -16,6 +16,9 @@
         "name": {
             "type": "string",
             "required": true
+        },
+        "autonomyFk": {
+            "type": "number"
         }
     },
     "relations": {

back/models/queue-member.json

@@ -0,0 +1,38 @@
+{
+    "name": "QueueMember",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "pbx.queueMember"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "queue": {
+            "type": "string"
+        },
+        "extension": {
+            "type": "string"
+        }
+    },
+    "relations": {
+        "queueRelation": {
+            "type": "belongsTo",
+            "model": "Queue",
+            "foreignKey": "queue",
+            "primaryKey": "name"
+        }
+    },
+    "acls": [
+        {
+            "property": "*",
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/process.yml

@@ -1,7 +0,0 @@
-apps:
-  - script: ./loopback/server/server.js
-    name: salix-back
-    instances: 1
-    max_restarts: 0
-    autorestart: false
-    node_args: --tls-min-v1.0 --openssl-legacy-provider

db/dump/fixtures.before.sql

@@ -388,23 +388,23 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
         (4, 'GCN Channel'),
         (5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
     VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
-        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
-        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
-        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
-        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
-        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
 
-INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
-    SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
+INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
+    SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
         FROM `account`.`role` `r`
         WHERE `r`.`hasLogin` = 1;
 
@@ -546,7 +546,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (6, 'Weight',           'weight'),
         (7, 'InvoiceOut',       'invoiceOut'),
         (8, 'DropOff',          'dropOff'),
-		(9, 'Sustitución',		'substitution');
+		(9, 'Sustitución',		'substitution'),
+		(10, 'Finance',         'finance');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -631,14 +632,21 @@ INSERT INTO vn.invoiceOutConfig
     SET id = 1,
         parallelism = 8;
 
-INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
+INSERT INTO `vn`.`invoiceOutSerial`
+        (`code`,`description`,                  `isTaxed`,  `taxAreaFk`, 	`isCEE`,   `type`)
     VALUES
         ('A',   'Global nacional',              1,          'NATIONAL',		0,         'global'),
         ('T',   'Española rapida',              1,          'NATIONAL',		0,         'quick'),
         ('V',   'Intracomunitaria global',      0,          'CEE',     		1,         'global'),
         ('M',   'Múltiple nacional',            1,          'NATIONAL',		0,         'multiple'),
         ('R',   'Rectificativa',                1,          'NATIONAL',		0,         NULL),
-        ('E', 'Exportación rápida',         0, 'WORLD',     0,  'quick');
+        ('E',   'Exportación rápida',           0,          'WORLD',   		0,         'quick'),
+        ('H',   'Intracomunitaria rápida',      0,          'CEE',     		1,         'quick'),
+        ('P',   'Factura simplificada',         1,          'NATIONAL',		0,         NULL),
+        ('PE',  'COOPERATIE FLORAHOLLAND UA',   0,          'CEE',     		1,          NULL),
+        ('S',   'Simplificada',                 1,          'NATIONAL',		0,         NULL),
+        ('X',   'Exportación global',           0,          'WORLD',   		0,         'global'),
+        ('N',   'Múltiple Intracomunitaria',	0,          'CEE',			1,         'multiple');
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
@@ -2834,12 +2842,6 @@ INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmen
         ('RE-001', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442),
         ('RE-002', 'STILL', 'LTX-20', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);
 
-INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`)
-    VALUES
-        (1106, 1, util.VN_CURDATE(),                                util.VN_CURDATE()),
-        (1106, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),    DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY)),
-        (1106, 2, util.VN_CURDATE(),                                NULL),
-        (1106, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),    DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY));
 
 INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
 VALUES
@@ -2910,7 +2912,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (6, 'book-entry-deleted', 'accounting entries deleted'),
         (7, 'zone-included','An email to notify zoneCollisions'),
         (8, 'backup-printer-selected','A backup printer has been selected'),
-        (9, 'mrw-deadline','The MRW deadline has passed');
+        (9, 'mrw-deadline','The MRW deadline has passed'),
+        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -3822,8 +3825,6 @@ UPDATE vn.collection
 UPDATE vn.sale
 	SET isPicked =FALSE;
 
-INSERT INTO vn.machineWorkerConfig(id, maxHours)
-	VALUES(1, 12);
 
 INSERT INTO vn.workerAppTester(workerFk) VALUES(66);
 
@@ -3831,9 +3832,6 @@ INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmen
     VALUES
         ('RE-003', 'IRON', 'JPH-24', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442);
 
-
-INSERT INTO vn.machineWorker(workerFk,machineFk,inTimed) VALUES (104,1,'2001-01-01 10:00:00.00.000');
-
 UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1;
 
 UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
@@ -3988,3 +3986,25 @@ VALUES
 INSERT IGNORE INTO ormConfig
     SET id =1,
         selectLimit = 1000;
+
+INSERT INTO pbx.queueMultiConfig
+	SET id = 'ring',
+		strategy = 20,
+		timeout = 2,
+		retry = 0,
+		weight = 0,
+		maxLen = 0,
+		ringInUse = 0;
+
+INSERT INTO pbx.queue (description, name, config)
+    VALUES ('X-men', '1000', 1),
+        ('Avengers', '2000', 1);
+
+INSERT IGNORE INTO pbx.queueMember
+    SET queue = '1000',
+        extension = '1010';
+
+UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
+UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
+
+

db/routines/bs/procedures/clientNewBorn_recalc.sql

@@ -6,8 +6,8 @@ BLOCK1: BEGIN
 	DECLARE vShipped DATE; 
 	DECLARE vPreviousShipped DATE;
 	DECLARE vDone boolean;  
-	DECLARE cur cursor for         
 
+	DECLARE cur CURSOR FOR  
 		SELECT clientFk, firstShipped  
 			FROM bs.clientNewBorn;    
         
@@ -17,14 +17,16 @@ BLOCK1: BEGIN
 	DELETE FROM	bs.clientNewBorn WHERE isModified = FALSE;
 
 	INSERT INTO clientNewBorn(clientFk, firstShipped, lastShipped)
-			SELECT  c.id, MAX(t.shipped), MAX(t.shipped)
+		SELECT  c.id, DATE(MAX(t.shipped)), DATE(MAX(t.shipped))
 			FROM vn.client c
-					JOIN vn.ticket t on t.clientFk =  c.id
-                    LEFT JOIN clientNewBorn cb on cb.clientFk = c.id
-				WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) AND util.VN_CURDATE() AND cb.isModified is null
+				JOIN vn.ticket t ON t.clientFk =  c.id
+				LEFT JOIN clientNewBorn cb ON cb.clientFk = c.id
+			WHERE t.shipped BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR 
+					AND util.VN_CURDATE() 
+				AND cb.isModified IS NULL
 			GROUP BY c.id;
-	OPEN cur;
 
+	OPEN cur;
 	LOOP1: LOOP
 		SET vDone := FALSE;
 		FETCH cur INTO vClientFk, vShipped;

db/routines/hedera/procedures/order_confirmWithUser.sql

@@ -22,7 +22,6 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vConcept VARCHAR(30);
 	DECLARE vAmount INT;
-	DECLARE vAvailable INT;
 	DECLARE vPrice DECIMAL(10,2);
 	DECLARE vSaleFk INT;
 	DECLARE vRowFk INT;
@@ -32,7 +31,6 @@ BEGIN
 	DECLARE vClientFk INT;
 	DECLARE vCompanyFk INT;
 	DECLARE vAgencyModeFk INT;
-	DECLARE vCalcFk INT;
 	DECLARE vIsTaxDataChecked BOOL;
 
 	DECLARE vDates CURSOR FOR
@@ -109,7 +107,7 @@ BEGIN
 	) INTO vHas0Amount;
 
 	IF vHas0Amount THEN
-		CALL util.throw('Remove lines with quantity = 0 before confirming');
+		CALL util.throw('Hay líneas vacías. Por favor, elimínelas');
 	END IF;
 
 	START TRANSACTION;

db/routines/hedera/triggers/orderRow_afterInsert.sql

@@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterIns
 	FOR EACH ROW
 BEGIN
 	UPDATE `order`
-		SET rowUpdated = NOW() 
+		SET rowUpdated = util.VN_NOW()
 	WHERE id = NEW.orderFk;
 END$$
 DELIMITER ;

db/routines/salix/triggers/ACL_beforeInsert.sql

@@ -4,5 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_beforeInsert`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+	IF NEW.`property` = '*' THEN
+		CALL util.throw('The property field cannot be *');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/events/itemCampaign_add.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`itemCampaig_add`
+	ON SCHEDULE EVERY 1 DAY
+		STARTS '2024-10-18 03:00:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL itemCampaign_add()$$
+DELIMITER ;

db/routines/vn/functions/workerMachinery_isRegistered.sql

@@ -1,23 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`workerMachinery_isRegistered`(vWorkerFk VARCHAR(10))
-	RETURNS tinyint(1)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-/**
- * Comprueba si existen registros en las últimas horas (maxHours de machineWorkerConfig) del trabajador vWorkerFk y si tiene a nulo la hora outTimed  (indica la hora que deja el vehículo)
- *
- * @param vWorkerFk id del trabajador
- * @return Devuelve TRUE/FALSE en caso de que haya o no registros
- */
-	IF (SELECT COUNT(*)
-		FROM machineWorker m
-		WHERE  m.workerFk = vWorkerFk
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -(SELECT maxHours from machineWorkerConfig), util.VN_NOW()) AND ISNULL(m.outTimed))
-	THEN
-		RETURN TRUE;
-	ELSE
-		RETURN FALSE;
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/procedures/client_create.sql

@@ -34,22 +34,19 @@ BEGIN
 	DECLARE vIsTaxDataChecked TINYINT(1);
 	DECLARE vHasCoreVnl BOOLEAN;
 	DECLARE vMandateTypeFk INT;
-	DECLARE vHasDailyInvoice BOOLEAN;
 
 	SELECT cc.defaultPayMethodFk,
 			cc.defaultDueDay,
 			cc.defaultCredit,
 			cc.defaultIsTaxDataChecked,
 			cc.defaultHasCoreVnl,
-			cc.defaultMandateTypeFk,
-			c.hasDailyInvoice
+			cc.defaultMandateTypeFk
 		INTO vPayMethodFk,
 			vDueDay,
 			vDefaultCredit,
 			vIsTaxDataChecked,
 			vHasCoreVnl,
-			vMandateTypeFk,
-			vHasDailyInvoice
+			vMandateTypeFk
 		FROM clientConfig cc
 			LEFT JOIN province p ON p.id = vProvinceFk
 			LEFT JOIN country c ON c.id = p.countryFk;
@@ -70,8 +67,7 @@ BEGIN
 			credit = vDefaultCredit,
 			isTaxDataChecked = vIsTaxDataChecked,
 			hasCoreVnl = vHasCoreVnl,
-			isEqualizated = FALSE,
-			hasDailyInvoice = vHasDailyInvoice
+			isEqualizated = FALSE
 		ON duplicate KEY UPDATE
 			payMethodFk = vPayMethodFk,
 			dueDay = vDueDay,

db/routines/vn/procedures/collection_getAssigned.sql

@@ -5,100 +5,139 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_getAssigne
 )
 BEGIN
 /**
- * Comprueba si existen colecciones libres que se ajustan al perfil del usuario
- * y le asigna la más antigua.
- * Añade un registro al semillero de colecciones y hace la reserva para la colección
+ * Comprueba si existen colecciones libres que se ajustan
+ * al perfil del usuario y le asigna la más antigua.
+ * Añade un registro al semillero de colecciones.
  *
  * @param vUserFk Id de usuario
  * @param vCollectionFk Id de colección
  */
 	DECLARE vHasTooMuchCollections BOOL;
-	DECLARE vItemPackingTypeFk VARCHAR(1);
-	DECLARE vWarehouseFk INT;
-	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 30;
+	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vCollectionWorker INT;
+	DECLARE vMaxNotAssignedCollectionLifeTime TIME;
+
+	DECLARE vCollections CURSOR FOR
+		WITH collections AS (			
+			SELECT tc.collectionFk, 
+					SUM(sv.volume) volume,
+					c.saleTotalCount,
+					c.itemPackingTypeFk,
+					c.trainFk,
+					c.warehouseFk,
+					c.wagons
+				FROM vn.ticketCollection tc
+					JOIN vn.collection c ON c.id = tc.collectionFk 
+					JOIN vn.saleVolume sv ON sv.ticketFk = tc.ticketFk
+				WHERE c.workerFk IS NULL 
+					AND sv.shipped >= util.VN_CURDATE()
+				GROUP BY tc.collectionFk
+		) SELECT c.collectionFk
+			FROM collections c
+				JOIN vn.operator o
+			WHERE o.workerFk = vUserFk
+				AND (c.saleTotalCount <= o.linesLimit OR o.linesLimit IS NULL)
+				AND (c.itemPackingTypeFk = o.itemPackingTypeFk OR o.itemPackingTypeFk IS NULL)
+				AND o.numberOfWagons = c.wagons
+				AND o.trainFk = c.trainFk
+				AND o.warehouseFk = c.warehouseFk;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	-- Si hay colecciones sin terminar, sale del proceso
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		IF vLockName IS NOT NULL THEN
-			DO RELEASE_LOCK(vLockName);
-		END IF;
-		
+		ROLLBACK;
 		RESIGNAL;
 	END;
 
-	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0,
-			pc.collection_assign_lockname
-		INTO vHasTooMuchCollections,
-			vLockName
-		FROM tmp.collection c
-			JOIN productionConfig pc;
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, pc.maxNotAssignedCollectionLifeTime 
+			INTO vHasTooMuchCollections, vMaxNotAssignedCollectionLifeTime
+		FROM productionConfig pc
+			LEFT JOIN tmp.collection ON TRUE;
 
 	DROP TEMPORARY TABLE tmp.collection;
 
 	IF vHasTooMuchCollections THEN
-		CALL util.throw('There are pending collections');
-	END IF;
-
-	SELECT warehouseFk, itemPackingTypeFk
-		INTO vWarehouseFk, vItemPackingTypeFk
-		FROM operator
-		WHERE workerFk = vUserFk;
-
-	SET vLockName = CONCAT_WS('/',
-		vLockName,
-		vWarehouseFk,
-		vItemPackingTypeFk
-	);
-
-	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
+		CALL util.throw('Hay colecciones pendientes');
 	END IF;
 
 	-- Se eliminan las colecciones sin asignar que estan obsoletas
+
 	INSERT INTO ticketTracking(stateFk, ticketFk)
 		SELECT s.id, tc.ticketFk
-				FROM collection c
+			FROM `collection` c
 				JOIN ticketCollection tc ON tc.collectionFk = c.id
-					JOIN state s ON s.code = 'PRINTED_AUTO'
-					JOIN productionConfig pc 
+				JOIN `state` s ON s.code = 'PRINTED_AUTO'
 			WHERE c.workerFk IS NULL 
-				AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
+				AND TIMEDIFF(util.VN_NOW(), c.created) > vMaxNotAssignedCollectionLifeTime;
 
-	DELETE c
-		FROM collection c
-			JOIN productionConfig pc 
-		WHERE c.workerFk IS NULL 
-			AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
+	DELETE FROM `collection` 
+		WHERE workerFk IS NULL 
+			AND TIMEDIFF(util.VN_NOW(), created) > vMaxNotAssignedCollectionLifeTime;
 
 	-- Se añade registro al semillero
-	INSERT INTO collectionHotbed
-		SET userFk = vUserFk;
+
+	INSERT INTO collectionHotbed(userFk) VALUES(vUserFk);
 
 	-- Comprueba si hay colecciones disponibles que se ajustan a su configuracion
-	SELECT MIN(c.id) INTO vCollectionFk
-		FROM collection c 
-			JOIN operator o ON (o.itemPackingTypeFk = c.itemPackingTypeFk 
-					OR c.itemPackingTypeFk IS NULL)
-				AND o.numberOfWagons = c.wagons
-				AND o.trainFk = c.trainFk
-				AND o.warehouseFk = c.warehouseFk
-				AND c.workerFk IS NULL
-		WHERE o.workerFk = vUserFk;
 
-	IF vCollectionFk IS NULL THEN
-		CALL collection_new(vUserFk, vCollectionFk);
+	OPEN vCollections;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vCollections INTO vCollectionFk;
+
+		IF vDone THEN
+			LEAVE l;
 		END IF;
 
-	UPDATE collection
+		BEGIN
+			DECLARE EXIT HANDLER FOR SQLEXCEPTION
+			BEGIN
+				ROLLBACK;
+				SET vCollectionFk = NULL;
+				RESIGNAL;
+			END;
+
+			START TRANSACTION;
+
+			SELECT workerFk INTO vCollectionWorker
+				FROM `collection` 
+				WHERE id = vCollectionFk FOR UPDATE;
+
+			IF vCollectionWorker IS NULL THEN
+				UPDATE `collection`
 					SET workerFk = vUserFk
 					WHERE id = vCollectionFk;
 
-	CALL itemShelvingSale_addByCollection(vCollectionFk);
+				COMMIT;
+				LEAVE l;
+			END IF;
 
-	DO RELEASE_LOCK(vLockName);
+			ROLLBACK;
+		END;
+	END LOOP;
+	CLOSE vCollections;
+
+	IF vCollectionFk IS NULL THEN
+		CALL collection_new(vUserFk, vCollectionFk);
+		
+		START TRANSACTION;
+
+		SELECT workerFk INTO vCollectionWorker
+			FROM `collection` 
+			WHERE id = vCollectionFk FOR UPDATE;
+
+		IF vCollectionWorker IS NULL THEN
+			UPDATE `collection`
+				SET workerFk = vUserFk
+				WHERE id = vCollectionFk;
+		END IF;
+
+		COMMIT;
+	END IF;
+	CALL itemShelvingSale_addByCollection(vCollectionFk);
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_getTickets.sql

@@ -45,7 +45,7 @@ BEGIN
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 		WHERE t.id = vParamFk 
 			AND t.shipped >= vYesterday
-	UNION ALL
+	UNION
 	SELECT t.id ticketFk, 
 			IF(NOT(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
 			am.name agencyName,
@@ -66,7 +66,7 @@ BEGIN
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 		WHERE tc.collectionFk = vParamFk
-	UNION ALL
+	UNION
 	SELECT sg.ticketFk,
 			NULL `level`,
 			am.name agencyName,
@@ -83,6 +83,7 @@ BEGIN
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 			LEFT JOIN vn.client c ON c.id = t.clientFk	
 		WHERE sc.id = vParamFk
-			AND t.shipped >= vYesterday;
+			AND t.shipped >= vYesterday
+			GROUP BY ticketFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemCampaign_add.sql

@@ -0,0 +1,54 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemCampaign_add`()
+proc: BEGIN
+/**
+ * Añade registros a tabla itemCampaign.
+ *
+ * @param vDateFrom Fecha desde
+ * @param vDateTo Fecha hasta
+ * @param vCampaign Código de la campaña
+ */
+	DECLARE vYesterday DATE;
+	DECLARE vCampaign VARCHAR(100);
+	DECLARE vScopeDays INT;
+	DECLARE vPreviousDays INT;
+	DECLARE vDateSumFrom DATE;
+	DECLARE vDateSumTo DATE;
+
+	SET vYesterday = util.yesterday();
+
+	SELECT dated, code, scopeDays, previousDays
+			INTO vDateSumTo, vCampaign, vScopeDays, vPreviousDays
+		FROM campaign
+		WHERE dated >= vYesterday
+		ORDER BY dated
+		LIMIT 1;
+
+	IF vCampaign IS NULL THEN
+		CALL util.throw('Missing data in campaign table');
+	END IF;
+
+	IF NOT vYesterday BETWEEN vDateSumTo - INTERVAL vPreviousDays DAY
+			AND vDateSumTo THEN
+		LEAVE proc;
+	END IF;
+
+	SET vDateSumFrom = vDateSumTo - INTERVAL vScopeDays DAY;
+	SET vDateSumTo = vDateSumTo - INTERVAL 1 DAY;
+
+	INSERT INTO itemCampaign(dated, itemFk, quantity, total, campaign)
+		SELECT vYesterday,
+				s.itemFk,
+				SUM(s.quantity) quantity,
+				SUM((s.quantity  * s.price) * (100 - s.discount) / 100) total,
+				vCampaign
+			FROM sale s
+				JOIN ticket t ON t.id = s.ticketFk
+				JOIN client c ON c.id = t.clientFk
+			WHERE t.shipped BETWEEN vDateSumFrom AND util.dayEnd(vDateSumTo)
+				AND c.typeFk = 'normal'
+				AND NOT t.isDeleted
+			GROUP BY s.itemFk
+			HAVING quantity;
+END$$
+DELIMITER ;

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -20,6 +20,7 @@ proc: BEGIN
 	DECLARE vUserFk INT; 
     DECLARE vTotalReservedQuantity INT;
 	DECLARE vSaleQuantity INT;
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 
 	DECLARE vItemShelvingAvailable CURSOR FOR 
 		SELECT ish.id itemShelvingFk,
@@ -44,11 +45,11 @@ proc: BEGIN
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 		BEGIN
-			ROLLBACK;
+			CALL util.tx_rollback(vIsRequiredTx);
 			RESIGNAL;
 		END;
 
-	START TRANSACTION;
+	CALL util.tx_start(vIsRequiredTx);
 
 	SELECT id INTO vSaleFk
 		FROM sale
@@ -65,7 +66,7 @@ proc: BEGIN
 		WHERE s.id = vSaleFk;
 		
 	IF vOutStanding <= 0 THEN
-		COMMIT;
+		CALL util.tx_commit(vIsRequiredTx);
 		LEAVE proc;
 	END IF;
 
@@ -123,6 +124,6 @@ proc: BEGIN
 		END IF;
 	END LOOP;
 	CLOSE vItemShelvingAvailable;
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelvingSale_deleteAdded.sql

@@ -0,0 +1,49 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_deleteAdded`(
+	vSelf INT(11)
+)
+proc: BEGIN
+/**
+ * Borra una reservea devolviendo la cantidad al itemShelving
+ *
+ * @param vSelf Identificador del itemShelvingSale
+ */
+	DECLARE vSaleFk INT;
+	DECLARE vHasSalesPicked BOOL;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	START TRANSACTION;
+
+	SELECT iss.saleFk INTO vSaleFk
+		FROM itemShelvingSale iss
+			JOIN sale s ON s.id = iss.saleFk
+		WHERE iss.id = vSelf AND s.isAdded
+		FOR UPDATE;
+
+	IF vSaleFk IS NULL THEN
+		CALL util.throw('The sale can not be deleted');
+	END IF;
+
+	SELECT COUNT(*) INTO vHasSalesPicked
+		FROM itemShelvingSale 
+		WHERE saleFk = vSaleFk AND isPicked;
+
+	IF vHasSalesPicked THEN
+		CALL util.throw('A sale with picked sales cannot be deleted');
+	END IF;
+
+	UPDATE itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			SET ish.available = ish.available + iss.quantity
+			WHERE iss.saleFk = vSaleFk;
+
+	DELETE FROM sale WHERE id = vSaleFk;
+
+	COMMIT;
+END$$
+DELIMITER ;

db/routines/vn/procedures/item_getSimilar.sql

@@ -24,6 +24,7 @@ BEGIN
 
 	CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
 	CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
+	CALL buy_getUltimate(NULL, vWarehouseFk, vDated);
 
 	WITH itemTags AS (
 		SELECT i.id,
@@ -74,14 +75,13 @@ BEGIN
 				AND a.calc_id = vAvailableCalcFk
 			LEFT JOIN cache.visible v ON v.item_id = i.id
 				AND v.calc_id = vVisibleCalcFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
-				AND lb.warehouse_id = vWarehouseFk
+			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
 			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
 				AND ip.itemFk = vSelf
 			LEFT JOIN vn.itemTag it ON it.itemFk = i.id
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
-			LEFT JOIN vn.buy b ON b.id = lb.buy_id
+			LEFT JOIN vn.buy b ON b.id = bu.buyFk
 			JOIN itemTags its
 		WHERE a.available > 0
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
@@ -98,5 +98,7 @@ BEGIN
 			(i.tag8 = its.tag8) DESC,
 			match8 DESC
 		LIMIT 100;
+
+	DROP TEMPORARY TABLE tmp.buyUltimate;
 END$$
 DELIMITER ;

db/routines/vn/procedures/machineWorker_add.sql

@@ -1,22 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT)
-BEGIN
-	
-/**
- * Inserta registro si el vWorkerFk no ha registrado nada en las últimas 12 horas
- * @param vPlate número de matrícula
- * @param vWorkerFk id del worker 
- * 
-*/    
-		UPDATE vn.machineWorker mw 
-	    		JOIN vn.machine m ON m.id = mw.machineFk 
-    		SET mw.outTimed = util.VN_NOW()
-	    	WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate)
-	    		AND ISNULL(mw.outTimed);
-	    	
-    	INSERT INTO machineWorker (machineFk, workerFk)
-	        SELECT m.id, vWorkerFk
-	        	FROM machine m
-	            WHERE m.plate= vPlate;	     
-END$$
-DELIMITER ;

db/routines/vn/procedures/machineWorker_getHistorical.sql

@@ -1,21 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machineWorker_getHistorical`(vPlate VARCHAR(20), vWorkerFk INT)
-BEGIN
-/**
- * Obtiene historial de la matrícula vPlate que el  trabajador vWorkerFk escanea, 
- * si es jefe de producción muestra el historial completo.
- * 
- * @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador 
- * 
-*/
-	DECLARE vWorkerName VARCHAR(255) DEFAULT account.user_getNameFromId(vWorkerFk);
-
-	SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed 
-		FROM machineWorker mw
-			JOIN machine m ON m.plate = vPlate
-		WHERE mw.machineFk = m.id
-			AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'coolerAssist'), mw.workerFk, vWorkerFk)
-			ORDER BY mw.inTimed DESC;	
-END$$
-DELIMITER ;

db/routines/vn/procedures/machineWorker_update.sql

@@ -1,38 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT)
-BEGIN
-	
-/**
- * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate, 
- * 
- * @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador 
- * 
-*/
-
-	DECLARE vMachineFk INT(10);
-	DECLARE vMaxHours INT(10);
-
-	SELECT m.id  INTO vMachineFk
-	FROM machine m
-		WHERE m.plate  = vPlate;
-	
-	SELECT maxHours INTO vMaxHours
-	FROM machineWorkerConfig;
-
-	IF (SELECT COUNT(*) 
-			FROM machineWorker m
-			WHERE  m.workerFk = vWorkerFk
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN				
-				
-		UPDATE machineWorker m
-			SET m.outTimed = CURRENT_TIMESTAMP()
-			WHERE m.workerFk = vWorkerFk 
-				AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) 
-				AND ISNULL(m.outTimed)
-				AND m.machineFk = vMachineFk;
-		
-    END IF;
-       
-END$$
-DELIMITER ;

db/routines/vn/procedures/machine_getWorkerPlate.sql

@@ -1,16 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`machine_getWorkerPlate`(vWorkerFk INT)
-BEGIN
-/**
- * Selecciona la matrícula del vehículo del workerfk
- *
- * @param vWorkerFk el id del trabajador
- */
-	SELECT m.plate
-		FROM machine m
-			JOIN machineWorker mw ON mw.machineFk = m.id
-		WHERE mw.inTimed >= TIMESTAMPADD(HOUR , -12,util.VN_NOW())
-			AND ISNULL(mw.outTimed)
-			AND mw.workerFk = vWorkerFk;
-END$$
-DELIMITER ;

db/routines/vn/procedures/queueMember_updateQueue.sql

@@ -0,0 +1,29 @@
+DELIMITER $$
+
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`queueMember_updateQueue`(
+	vBusinessFk INT
+)
+BEGIN
+	/**
+	* Elimina la entrada de la cola anterior y luego inserta la nueva para un trabajador.
+	*
+	* @param vBusinessFk ID del negocio
+	*/
+	DECLARE vNewQueue VARCHAR(10);
+	DECLARE vExtension VARCHAR(10);
+	DECLARE exit handler FOR SQLEXCEPTION
+
+	SELECT d.pbxQueue, s.extension
+		INTO vNewQueue, vExtension
+		FROM business b
+			JOIN department d ON d.id = b.departmentFk
+			JOIN pbx.sip s ON s.user_id = b.workerFk
+	WHERE b.id = vBusinessFk;
+
+	DELETE FROM pbx.queueMember 
+		WHERE extension = vExtension COLLATE utf8_general_ci;
+
+	INSERT IGNORE INTO pbx.queueMember (queue, extension)
+		VALUES (vNewQueue, vExtension);
+END$$
+DELIMITER ;

db/routines/vn/procedures/saleTracking_sectorCollectionAddPrevOK.sql

@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`saleTracking_sectorCollectionAddPrevOK`(
+	vSectorCollectionFk INT
+)
+BEGIN
+/**
+ * Inserta los registros de sectorCollection con el estado PREVIA OK si la reserva está picked
+ *
+ * @param vSectorCollectionFk Identificador de vn.sectorCollection
+ */
+	REPLACE saleTracking(saleFk, isChecked, workerFk, stateFk)
+		SELECT sgd.saleFk, TRUE, sc.userFk, s.id
+			FROM sectorCollection sc
+				JOIN sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+				JOIN saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
+				JOIN state s ON s.code = 'OK PREVIOUS'
+				JOIN itemShelvingSale iss ON iss.saleFk = sgd.saleFk
+			WHERE sc.id = vSectorCollectionFk AND iss.isPicked;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_canAdvance.sql

@@ -51,7 +51,8 @@ BEGIN
 				origin.companyFk futureCompanyFk,
 				IFNULL(dest.nickname, origin.nickname) nickname,
 				dest.landed,
-				dest.preparation
+				dest.preparation,
+				origin.departmentFk
 			FROM (
 				SELECT s.ticketFk,
 						c.salesPersonFk workerFk,
@@ -71,9 +72,11 @@ BEGIN
 						t.addressFk,
 						t.warehouseFk,
 						t.companyFk,
-						t.agencyModeFk
+						t.agencyModeFk,
+						wd.departmentFk
 					FROM ticket t
 						JOIN client c ON c.id = t.clientFk
+						JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
 						JOIN sale s ON s.ticketFk = t.id
 						JOIN saleVolume sv ON sv.saleFk = s.id
 						JOIN item i ON i.id = s.itemFk

db/routines/vn/procedures/ticket_close.sql

@@ -43,7 +43,7 @@ BEGIN
 				c.isTaxDataChecked,
 				t.companyFk,
 				t.shipped,
-				IFNULL(a.hasDailyInvoice, co.hasDailyInvoice),
+				c.hasDailyInvoice,
 				w.isManaged,
 				c.hasToInvoice
 			INTO vClientFk,
@@ -55,9 +55,6 @@ BEGIN
 				vHasToInvoice
 			FROM ticket t
 				JOIN `client` c ON c.id = t.clientFk
-				JOIN province p ON p.id = c.provinceFk
-				LEFT JOIN autonomy a ON a.id = p.autonomyFk
-				JOIN country co ON co.id = p.countryFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 			WHERE t.id = vCurTicketFk;
 

db/routines/vn/procedures/ticket_getTax.sql

@@ -1,5 +1,7 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getTax`(IN vTaxArea VARCHAR(25))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getTax`(
+	vTaxArea VARCHAR(25)
+)
 BEGIN
 /**
  * Calcula la base imponible, el IVA y el recargo de equivalencia para
@@ -33,30 +35,39 @@ BEGIN
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
-		SELECT * FROM (
-			SELECT tmpTicket.ticketFk,
+		WITH sales AS (
+			SELECT s.ticketFk,
+					s.itemFk,
+					s.quantity * s.price * (100 - s.discount) / 100 total,
+					t.companyFk,
+					t.addressFk,
+					su.countryFk,
+					ata.areaFk,
+					itc.taxClassFk
+				FROM vn.sale s
+					JOIN tmp.ticket tmp ON tmp.ticketFk = s.ticketFk
+					JOIN vn.ticket t ON t.id = s.ticketFk
+					JOIN vn.supplier su ON su.id = t.companyFk
+					JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
+						AND ata.companyFk = t.companyFk
+					JOIN vn.itemTaxCountry itc ON itc.itemFk = s.itemFk
+						AND itc.countryFk = su.countryFk
+				HAVING total
+		)
+		SELECT s.ticketFk,
 				bp.pgcFk,
-					SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
+				SUM(s.total) taxableBase,
 				pgc.rate,
 				tc.code,
 				bp.priority
-				FROM tmp.ticket tmpTicket
-					JOIN sale s ON s.ticketFk = tmpTicket.ticketFk
-					JOIN item i ON i.id = s.itemFk
-					JOIN ticket t ON t.id = tmpTicket.ticketFk
-					JOIN supplier su ON su.id = t.companyFk
-					JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
-						AND ata.companyFk = t.companyFk
-					JOIN itemTaxCountry itc ON itc.itemFk = i.id
-						AND itc.countryFk = su.countryFk
-					JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
-						AND bp.taxAreaFk = ata.areaFk
-						AND bp.taxClassFk = itc.taxClassFk
-					JOIN pgc ON pgc.code = bp.pgcFk
-					JOIN taxClass tc ON tc.id = bp.taxClassFk
-				GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
+			FROM sales s
+				JOIN vn.bookingPlanner bp ON bp.countryFk = s.countryFk
+					AND bp.taxAreaFk = s.areaFk
+					AND bp.taxClassFk = s.taxClassFk
+				JOIN vn.pgc ON pgc.code = bp.pgcFk
+				JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
+			GROUP BY s.ticketFk, pgc.code, pgc.rate
 			HAVING taxableBase
-			) t3
 			ORDER BY priority;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax

db/routines/vn/procedures/worker_updateBusiness.sql

@@ -21,6 +21,8 @@ BEGIN
 		SET businessFk = vNewBusinessFk
 		WHERE id = vSelf;
 
+	CALL queueMember_updateQueue(vNewBusinessFk);
+
 	IF vOldBusinessFk IS NULL THEN
 		CALL account.account_enable(vSelf);
 				

db/routines/vn/triggers/business_afterUpdate.sql

@@ -3,10 +3,20 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`business_afterUpdate`
 	AFTER UPDATE ON `business`
 	FOR EACH ROW
 BEGIN
+	DECLARE vIsActive BOOL;
+	DECLARE vExtension VARCHAR(10);
+
 	CALL worker_updateBusiness(NEW.workerFk);
 
 	IF NOT (OLD.workerFk <=> NEW.workerFk) THEN
 		CALL worker_updateBusiness(OLD.workerFk);
 	END IF;
+
+	IF NOT (OLD.departmentFk <=> NEW.departmentFk) THEN
+		SELECT COUNT(*) INTO vIsActive FROM worker WHERE businessFk = NEW.id;
+		IF vIsActive THEN
+			CALL queueMember_updateQueue(NEW.id);
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/itemShelvingSale_afterInsert.sql

@@ -3,10 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelvingSale_afterI
 	AFTER INSERT ON `itemShelvingSale`
 	FOR EACH ROW
 BEGIN 	
-	
 	UPDATE sale s
 			JOIN operator o ON o.workerFk = account.myUser_getId()
-		SET s.isPicked = IF(o.isOnReservationMode, s.isPicked, TRUE)		
-		WHERE id = NEW.saleFk;
+			JOIN sector se ON se.id = o.sectorFk
+		SET s.isPicked = IF(IFNULL(se.isOnReservationMode, o.isOnReservationMode), s.isPicked, TRUE)
+		WHERE s.id = NEW.saleFk;
 END$$
 DELIMITER ;

db/routines/vn/triggers/itemShelving_beforeUpdate.sql

@@ -9,5 +9,8 @@ BEGIN
 		SET NEW.userFk = account.myUser_getId();
 	END IF;
 
+	IF NEW.shelvingFk <> OLD.shelvingFk THEN
+		SET NEW.movingState = NULL;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/views/workerWithoutTractor.sql

@@ -10,11 +10,10 @@ FROM (
 			`vn`.`collection` `c`
 			JOIN `vn`.`client` `cl` ON(`cl`.`id` = `c`.`workerFk`)
 		)
-		LEFT JOIN `vn`.`machineWorker` `mw` ON(
-			`mw`.`workerFk` = `c`.`workerFk`
-			AND `mw`.`inTimed` > `util`.`VN_CURDATE`()
+		JOIN `vn`.`operator` `o` ON(
+			`o`.`workerFk` = `c`.`workerFk`
 		)
 	)
 WHERE `c`.`created` > `util`.`VN_CURDATE`()
-	AND `mw`.`workerFk` IS NULL
+	AND `o`.`machineFk` IS NULL
 GROUP BY `c`.`workerFk`

db/routines/vn2008/views/Clientes.sql

@@ -22,7 +22,6 @@ AS SELECT `c`.`id` AS `id_cliente`,
 	`c`.`credit` AS `credito`,
 	`c`.`countryFk` AS `Id_Pais`,
 	`c`.`isActive` AS `activo`,
-	`c`.`gestdocFk` AS `gestdoc_id`,
 	`c`.`quality` AS `calidad`,
 	`c`.`payMethodFk` AS `pay_met_id`,
 	`c`.`created` AS `created`,

db/versions/11230-brownEucalyptus/00-addClientObservationType.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.clientObservation DROP COLUMN IF EXISTS observationTypeFk;
+ALTER TABLE vn.clientObservation ADD COLUMN IF NOT EXISTS observationTypeFk TINYINT(3) UNSIGNED NULL;
+ALTER TABLE vn.clientObservation ADD CONSTRAINT clientObservationTypeFk FOREIGN KEY IF NOT EXISTS (observationTypeFk) REFERENCES vn.observationType(id);

db/versions/11230-brownEucalyptus/01-addNewObservation.vn.sql

@@ -0,0 +1,3 @@
+INSERT IGNORE INTO vn.observationType
+	SET description = 'Finance',
+		code = 'finance';

db/versions/11251-navyChrysanthemum/00-firstScript.sql

@@ -0,0 +1,3 @@
+UPDATE vn.sale
+    SET originalQuantity = quantity
+    WHERE originalQuantity IS NULL

db/versions/11251-navyChrysanthemum/01-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';

db/versions/11285-orangeErica/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemShelving DROP COLUMN IF EXISTS isMoving;
+ALTER TABLE vn.itemShelving ADD IF NOT EXISTS movingState ENUM('selected','printed') NULL;

db/versions/11287-azureRaphis/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE hedera.`order` ADD IF NOT EXISTS rowUpdated DATETIME NULL 
+    COMMENT 'Timestamp for last updated record in orderRow table';

db/versions/11288-purpleFern/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE hedera.`order` ADD IF NOT EXISTS rowUpdated DATETIME NULL 
+    COMMENT 'Timestamp for last updated record in orderRow table';

db/versions/11289-azureAralia/00-firstScript.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE vn.sector ADD isOnReservationMode tinyint(1) DEFAULT FALSE NULL;

db/versions/11290-blackOrchid/00-firstScript.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `vn`.`operator`
+ADD COLUMN `machineFk` int(11) DEFAULT NULL,
+ADD CONSTRAINT `operator_machine_FK` FOREIGN KEY (`machineFk`) REFERENCES `vn`.`machine` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Machine','*','*','ALLOW','ROLE','productionBoss');

db/versions/11291-purpleChico/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS username varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS password varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS token text NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS expired int(11) NULL;

db/versions/11294-azureFern/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemShelving DROP COLUMN IF EXISTS isMoving;
+ALTER TABLE vn.itemShelving ADD IF NOT EXISTS movingState ENUM('selected','printed') NULL;

db/versions/11295-brownLaurel/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemShelving DROP COLUMN IF EXISTS isMoving;
+ALTER TABLE vn.itemShelving ADD IF NOT EXISTS movingState ENUM('selected','printed') NULL;

db/versions/11298-wheatIvy/00-closure.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`ticketConfig`
+ADD COLUMN `closureDaysAgo` int(11) NOT NULL DEFAULT 2 COMMENT 'Number of days to look back for ticket closure',
+ADD CONSTRAINT `closureDaysAgo_check` CHECK (`closureDaysAgo` > 0);

db/versions/11300-limeMedeola/00-firstScript.sql

@@ -0,0 +1,137 @@
+CREATE TABLE IF NOT EXISTS `vn`.`itemFarmingTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemFarmingTag` (`name`) VALUES ('Enraizado');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemFarmingTag'
+	WHERE name= 'cultivo';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemWrappingTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Bolsa');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Caja cartón');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Caja decorativa');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Celofán');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Papel kraft');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Variable');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemWrappingTag'
+	WHERE name= 'Envoltorio';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemLanguageTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+	
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Castellano');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Catalán');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Euskera');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Francés');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Gallego');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Inglés');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Portugués');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemLanguageTag'
+	WHERE name= 'Idioma';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemStemTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Natural');
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Seminatural');
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Sintético');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemStemTag'
+	WHERE name= 'Tronco';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemBreederTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemBreederTag` (`name`) VALUES ('David Austin');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemBreederTag'
+	WHERE name= 'Obtentor';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemBaseTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+	
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Biodegradable');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Caballete');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Cerámica');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Cristal');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Plástico por inyección');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Madera');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Rígido');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Ruedas');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Sin soporte rígido');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemBaseTag'
+	WHERE name= 'Soporte';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemVatRateTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemVatRateTag` (`name`) VALUES ('General');
+INSERT IGNORE INTO `vn`.`itemVatRateTag` (`name`) VALUES ('Reducido');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemVatRateTag'
+	WHERE name= 'Tipo de IVA';	
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemFarmingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemWrappingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemLanguageTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemStemTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemWrappingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemBaseTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemBreederTag TO logisticAssist;

db/versions/11302-limeTulip/00-firstScript.sql

@@ -0,0 +1,13 @@
+
+UPDATE `vn`.`client` c
+	JOIN `vn`.`country` co ON co.id=c.countryFk
+SET c.hasDailyInvoice = co.hasDailyInvoice
+WHERE co.hasDailyInvoice IS NOT NULL
+	AND c.hasDailyInvoice = FALSE;
+
+UPDATE `vn`.`client` c
+	JOIN `vn`.`province` p ON p.id=c.provinceFk
+	JOIN `vn`.`autonomy` a ON a.id = p.autonomyFk
+SET c.hasDailyInvoice = a.hasDailyInvoice
+WHERE a.hasDailyInvoice IS NOT NULL
+	AND c.hasDailyInvoice = FALSE;

db/versions/11308-redCymbidium/00-firstScript.sql

@@ -0,0 +1,25 @@
+CREATE TABLE IF NOT EXISTS `vn`.`itemCampaign` (
+	`id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+	dated date NOT NULL,
+	itemFk int(11) NOT NULL,
+	quantity decimal(10,2) NOT NULL,
+	total decimal(10,2) NOT NULL,
+	campaign varchar(100) NOT NULL,
+	UNIQUE KEY `itemCampaign_UNIQUE` (`dated`,`itemFk`),
+	CONSTRAINT itemCampaign_item_FK FOREIGN KEY (itemFk) REFERENCES vn.item(id) ON DELETE RESTRICT ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Tallos confirmados por día en los días de más producción de una campaña. La tabla está pensada para que sea una foto.';
+
+ALTER TABLE vn.campaign
+	ADD previousDays int(10) unsigned DEFAULT 30 NOT NULL COMMENT 'Días previos para calcular e insertar en la tabla itemCampaign';
+
+UPDATE vn.campaign
+	SET previousDays = 90
+	WHERE code = 'allSaints';
+
+UPDATE vn.campaign
+	SET previousDays = 60
+	WHERE code IN ('valentinesDay', 'mothersDay');

db/versions/11311-tealFern/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.client CHANGE gestdocFk gestdocFk__ int(11) DEFAULT NULL NULL COMMENT '@deprecated 2024-10-17';

db/versions/11314-redTulip/00-restrictedAsterisk.sql

@@ -0,0 +1,3 @@
+DELETE FROM `salix`.`ACL`
+WHERE `model` = 'Worker'
+  AND `property` IN ('find', 'findById', 'findOne');

db/versions/11317-silverCordyline/00-firstScript.sql

@@ -0,0 +1,9 @@
+
+USE vn;
+RENAME TABLE machineWorker TO machineWorker__;
+ALTER TABLE machineWorker__ COMMENT = '@deprecated 2024-10-23 not used';
+
+RENAME TABLE machineWorkerConfig TO machineWorkerConfig__;
+ALTER TABLE machineWorkerConfig__ COMMENT = '@deprecated 2024-10-23 not used';
+
+DELETE FROM salix.ACL WHERE model = 'MachineWorker';

e2e/paths/02-client/08_add_notes.spec.js

@@ -1,42 +0,0 @@
-import selectors from '../../helpers/selectors';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Client Add notes path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'client');
-        await page.accessToSearchResult('Bruce Banner');
-        await page.accessToSection('client.card.note.index');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should reach the notes index`, async() => {
-        await page.waitForState('client.card.note.index');
-    });
-
-    it(`should click on the add note button`, async() => {
-        await page.waitToClick(selectors.clientNotes.addNoteFloatButton);
-        await page.waitForState('client.card.note.create');
-    });
-
-    it(`should create a note`, async() => {
-        await page.waitForSelector(selectors.clientNotes.note);
-        await page.type(`${selectors.clientNotes.note} textarea`, 'Meeting with Black Widow 21st 9am');
-        await page.waitToClick(selectors.clientNotes.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the note was created', async() => {
-        const result = await page.waitToGetProperty(selectors.clientNotes.firstNoteText, 'innerText');
-
-        expect(result).toEqual('Meeting with Black Widow 21st 9am');
-    });
-});

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

@@ -28,12 +28,12 @@ describe('Client defaulter path', () => {
         const salesPersonName =
             await page.waitToGetProperty(selectors.clientDefaulter.firstSalesPersonName, 'innerText');
 
-        expect(clientName).toEqual('Bruce Banner');
-        expect(salesPersonName).toEqual('developer');
+        expect(clientName).toEqual('Ororo Munroe');
+        expect(salesPersonName).toEqual('salesperson');
     });
 
     it('should first observation not changed', async() => {
-        const expectedObservation = 'Meeting with Black Widow 21st 9am';
+        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);
@@ -62,13 +62,4 @@ describe('Client defaulter path', () => {
         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');
-    });
 });

loopback/locale/en.json

@@ -240,5 +240,6 @@
 	"There is already a tray with the same height": "There is already a tray with the same height",
 	"The height must be greater than 50cm": "The height must be greater than 50cm",
 	"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
-    "The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line"
+    "The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line",
+    "There are tickets for this area, delete them first": "There are tickets for this area, delete them first"
 }

loopback/locale/es.json

@@ -350,6 +350,7 @@
 	"Cmr file does not exist": "El archivo del cmr no existe",
 	"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
 	"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
+	"No invoice series found for these parameters": "No se encontró una serie para estos parámetros",
 	"The line could not be marked": "La linea no puede ser marcada",
 	"Through this procedure, it is not possible to modify the password of users with verified email": "Mediante este procedimiento, no es posible modificar la contraseña de usuarios con correo verificado",
 	"They're not your subordinate": "No es tu subordinado/a.",
@@ -381,5 +382,7 @@
 	"The entry does not have stickers": "La entrada no tiene etiquetas",
 	"This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha",
 	"No valid travel thermograph found": "No se encontró un termógrafo válido",
-    "The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea"
+	"The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea",
+	"type cannot be blank": "Se debe rellenar el tipo",
+    "There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero"
 }

loopback/locale/fr.json

@@ -350,6 +350,7 @@
 	"Cmr file does not exist": "Le fichier cmr n'existe pas",
 	"You are not allowed to modify the alias": "Vous n'êtes pas autorisé à modifier l'alias",
 	"The address of the customer must have information about Incoterms and Customs Agent": "L'adresse du client doit contenir des informations sur les Incoterms et l'agent des douanes",
+	"No invoice series found for these parameters": "Aucune série de facture trouvée pour ces paramètres",
 	"The line could not be marked": "La ligne ne peut pas être marquée",
 	"This password can only be changed by the user themselves": "Ce mot de passe ne peut être modifié que par l'utilisateur lui-même",
 	"They're not your subordinate": "Ce n'est pas votre subordonné.",

loopback/locale/pt.json

@@ -350,6 +350,7 @@
 	"Cmr file does not exist": "O arquivo CMR não existe",
 	"You are not allowed to modify the alias": "Você não tem permissão para modificar o alias",
 	"The address of the customer must have information about Incoterms and Customs Agent": "O endereço do cliente deve ter informações sobre Incoterms e Agente Aduaneiro",
+	"No invoice series found for these parameters": "Nenhuma série de fatura encontrada para esses parâmetros",
 	"The line could not be marked": "A linha não pôde ser marcada",
 	"This password can only be changed by the user themselves": "Esta senha só pode ser alterada pelo próprio usuário",
 	"They're not your subordinate": "Eles não são seus subordinados.",

modules/account/back/models/sip.json

@@ -25,7 +25,12 @@
             "type": "belongsTo",
             "model": "VnUser",
             "foreignKey": "user_id"
+        },
+        "queueMember": {
+            "type": "belongsTo",
+            "model": "QueueMember",
+            "foreignKey": "extension",
+            "primaryKey": "extension"
         }
     }
 }
-  

modules/claim/back/methods/claim/updateClaim.js

@@ -85,17 +85,12 @@ module.exports = Self => {
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
             const salesPerson = claim.client().salesPersonUser();
-            if (salesPerson) {
-                if (changedPickup && updatedClaim.pickup)
-                    await notifyPickUp(ctx, salesPerson.id, claim);
-
-                if (args.claimStateFk) {
+            if (salesPerson && args.claimStateFk) {
                 const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
                 await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
                 if (newState.code == 'canceled')
                     await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
             }
-            }
 
             if (tx) await tx.commit();
 
@@ -119,18 +114,4 @@ module.exports = Self => {
         });
         await models.Chat.sendCheckingPresence(ctx, workerId, message);
     }
-
-    async function notifyPickUp(ctx, workerId, claim) {
-        const models = Self.app.models;
-        const url = await models.Url.getUrl();
-        const $t = ctx.req.__; // $translate
-
-        const message = $t('Claim will be picked', {
-            claimId: claim.id,
-            clientName: claim.client().name,
-            claimUrl: `${url}claim/${claim.id}/summary`,
-            claimPickup: $t(claim.pickup)
-        });
-        await models.Chat.sendCheckingPresence(ctx, workerId, message);
-    }
 };

modules/client/back/methods/client/createWithUser.js

@@ -43,6 +43,23 @@ module.exports = function(Self) {
         };
 
         try {
+            const province = await models.Province.findOne({
+                where: {id: data.provinceFk},
+                fields: ['autonomyFk']
+            });
+
+            const autonomy = province ? await models.Autonomy.findOne({
+                where: {id: province.autonomyFk},
+                fields: ['hasDailyInvoice']
+            }) : null;
+
+            const country = await models.Country.findOne({
+                where: {id: data.countryFk},
+                fields: ['hasDailyInvoice']
+            });
+
+            const hasDailyInvoice = (autonomy?.hasDailyInvoice ?? country?.hasDailyInvoice) || false;
+
             const account = await models.VnUser.create(user, myOptions);
             const client = await Self.create({
                 id: account.id,
@@ -57,7 +74,8 @@ module.exports = function(Self) {
                 provinceFk: data.provinceFk,
                 countryFk: data.countryFk,
                 isEqualizated: data.isEqualizated,
-                businessTypeFk: data.businessTypeFk
+                businessTypeFk: data.businessTypeFk,
+                hasDailyInvoice: hasDailyInvoice
             }, myOptions);
 
             const address = await models.Address.create({

modules/client/back/methods/client/specs/createWithUser.spec.js

@@ -1,5 +1,54 @@
 const models = require('vn-loopback/server/server').models;
+
 describe('Client Create', () => {
+    let options;
+    let tx;
+
+    beforeAll.mockLoopBackContext();
+
+    beforeEach(async() => {
+        tx = await models.Client.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => await tx.rollback());
+
+    it('should not find deadpool as he is not created yet', async() => {
+        try {
+            const account = await models.VnUser.findOne({where: {name: 'deadpool'}}, options);
+            const client = await models.Client.findOne({where: {name: 'Wade'}}, options);
+
+            expect(account).toBeNull();
+            expect(client).toBeNull();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should throw an error when creating a new account without email', async() => {
+        let error;
+        const newAccountWithoutEmail = {
+            userName: 'deadpool',
+            fi: '16195279J',
+            name: 'Wade',
+            socialName: 'DEADPOOL MARVEL',
+            street: 'WALL STREET',
+            city: 'New York',
+            businessTypeFk: 'florist',
+            provinceFk: 1
+        };
+
+        try {
+            await models.Client.createWithUser(newAccountWithoutEmail, options);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error.message).toEqual('An email is necessary');
+    });
+
+    it('should create a new account with dailyInvoice', async() => {
         const newAccount = {
             userName: 'deadpool',
             email: 'deadpool@marvel.com',
@@ -11,57 +60,19 @@ describe('Client Create', () => {
             businessTypeFk: 'florist',
             provinceFk: 1
         };
-    const newAccountWithoutEmail = JSON.parse(JSON.stringify(newAccount));
-    delete newAccountWithoutEmail.email;
-
-    beforeAll.mockLoopBackContext();
-
-    it(`should not find deadpool as he's not created yet`, async() => {
-        const tx = await models.Client.beginTransaction({});
 
         try {
-            const options = {transaction: tx};
-
-            const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
-            const client = await models.Client.findOne({where: {name: newAccount.name}}, options);
-
-            expect(account).toEqual(null);
-            expect(client).toEqual(null);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
+            const province = await models.Province.findById(newAccount.provinceFk, {
+                fields: ['id', 'name', 'autonomyFk'],
+                include: {
+                    relation: 'autonomy'
                 }
-    });
-
-    it('should not create a new account', async() => {
-        const tx = await models.Client.beginTransaction({});
-
-        let error;
-        try {
-            const options = {transaction: tx};
-            await models.Client.createWithUser(newAccountWithoutEmail, options);
-
-            await tx.rollback();
-        } catch (e) {
-            error = e.message;
-
-            await tx.rollback();
-        }
-
-        expect(error).toEqual(`An email is necessary`);
-    });
-
-    it('should create a new account', async() => {
-        const tx = await models.Client.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
+            }, options);
 
             const client = await models.Client.createWithUser(newAccount, options);
             const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
 
+            expect(province.autonomy().hasDailyInvoice).toBeTruthy();
             expect(account.name).toEqual(newAccount.userName);
             expect(client.id).toEqual(account.id);
             expect(client.name).toEqual(newAccount.name);
@@ -69,8 +80,38 @@ describe('Client Create', () => {
             expect(client.fi).toEqual(newAccount.fi);
             expect(client.socialName).toEqual(newAccount.socialName);
             expect(client.businessTypeFk).toEqual(newAccount.businessTypeFk);
-
+            expect(client.hasDailyInvoice).toBeTruthy();
+        } catch (e) {
             await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should create a new account without dailyInvoice', async() => {
+        const newAccount = {
+            userName: 'deadpool',
+            email: 'deadpool@marvel.com',
+            fi: '16195279J',
+            name: 'Wade',
+            socialName: 'DEADPOOL MARVEL',
+            street: 'WALL STREET',
+            city: 'New York',
+            businessTypeFk: 'florist',
+            provinceFk: 3
+        };
+
+        try {
+            const province = await models.Province.findById(newAccount.provinceFk, {
+                fields: ['id', 'name', 'autonomyFk'],
+                include: {
+                    relation: 'autonomy'
+                }
+            }, options);
+
+            const client = await models.Client.createWithUser(newAccount, options);
+
+            expect(province.autonomy.hasDailyInvoice).toBeFalsy();
+            expect(client.hasDailyInvoice).toBeFalsy();
         } catch (e) {
             await tx.rollback();
             throw e;
@@ -78,26 +119,25 @@ describe('Client Create', () => {
     });
 
     it('should not be able to create a user if exists', async() => {
-        const tx = await models.Client.beginTransaction({});
-
         let error;
-
+        const newAccount = {
+            userName: 'deadpool',
+            email: 'deadpool@marvel.com',
+            fi: '16195279J',
+            name: 'Wade',
+            socialName: 'DEADPOOL MARVEL',
+            street: 'WALL STREET',
+            city: 'New York',
+            businessTypeFk: 'florist',
+            provinceFk: 1
+        };
         try {
-            const options = {transaction: tx};
-
             await models.Client.createWithUser(newAccount, options);
-            const client = await models.Client.createWithUser(newAccount, options);
-
-            expect(client).toBeNull();
-
-            await tx.rollback();
+            await models.Client.createWithUser(newAccount, options);
         } catch (e) {
-            await tx.rollback();
             error = e;
         }
 
-        const errorName = error.details.codes.name[0];
-
-        expect(errorName).toEqual('uniqueness');
+        expect(error.message).toContain('already exists');
     });
 });

modules/client/back/methods/defaulter/filter.js

@@ -73,7 +73,8 @@ module.exports = Self => {
                         pm.name payMethod,
                         r.finished IS NULL hasRecovery,
                         dp.id departmentFk,
-                        dp.name departmentName`;
+                        dp.name departmentName
+                        dp.notificationEmail departmentEmail`;
         const date = Date.vnNew();
         date.setHours(0, 0, 0, 0);
         const stmt = new ParameterizedSQL(

modules/client/back/methods/defaulter/observationEmail.js

@@ -47,7 +47,7 @@ module.exports = Self => {
             await models.Mail.create({
                 subject: $t('Comment added to client', {clientFk: defaulter.clientFk}),
                 body: body,
-                receiver: `${defaulter.salesPersonName}@verdnatura.es`,
+                receiver: `${defaulter.departmentEmail}`,
                 replyTo: `${user.name}@verdnatura.es`
             }, myOptions);
         }

modules/client/back/models/client-observation.js

@@ -1,8 +1,11 @@
 module.exports = function(Self) {
-    Self.validate('text', isEnabled, {message: 'Description cannot be blank'});
-    function isEnabled(err) {
+    Self.validate('text', function(err) {
         if (!this.text) err();
-    }
+    }, {message: 'Description cannot be blank'});
+
+    Self.validate('observationTypeFk', function(err) {
+        if (!this.observationTypeFk) err();
+    }, {message: 'type cannot be blank'});
 
     Self.observe('before save', function(ctx, next) {
         ctx.instance.created = Date();

modules/client/back/models/client-observation.json

@@ -26,6 +26,10 @@
 		"created": {
 			"type": "date",
 			"description": "Creation date and time"
+		},
+		"observationTypeFk": {
+			"type": "number",
+			"description": "Type of observation"
 		}
 	},
 	"relations": {
@@ -44,11 +48,15 @@
 		"include": {
 			"relation": "worker",
 			"scope": {
-				"fields": ["id"],
+				"fields": [
+					"id"
+				],
 				"include": {
 					"relation": "user",
 					"scope": {
-						"fields": ["nickname"]
+						"fields": [
+							"nickname"
+						]
 					}
 				}
 			}

modules/client/front/note/index/index.html

@@ -1,31 +0,0 @@
-<vn-crud-model
-    vn-id="model"
-    url="clientObservations"
-    filter="$ctrl.filter"
-    link="{clientFk: $ctrl.$params.id}"
-    data="notes"
-    auto-load="true">
-</vn-crud-model>
-<vn-data-viewer
-    model="model"
-    class="vn-w-md">
-    <vn-card class="vn-pa-md">
-        <div
-            ng-repeat="note in notes" 
-            class="note vn-pa-sm border-solid border-radius vn-mb-md">
-            <vn-horizontal class="vn-mb-sm" style="color: #666">
-                <vn-one>{{::note.worker.user.nickname}}</vn-one>
-                <vn-auto>{{::note.created | date:'dd/MM/yyyy HH:mm'}}</vn-auto>
-            </vn-horizontal>   
-            <vn-horizontal class="text">
-                {{::note.text}}
-            </vn-horizontal>
-        </div>
-    </vn-card>
-</vn-data-viewer>
-<a vn-tooltip="New note"
-    ui-sref="client.card.note.create({id: $ctrl.$params.id})" 
-    vn-bind="+" 
-    fixed-bottom-right>
-    <vn-float-button icon="add"></vn-float-button>
-</a>

modules/client/front/note/index/index.js

@@ -5,9 +5,10 @@ import './style.scss';
 export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.filter = {
-            order: 'created DESC',
-        };
+    }
+    async $onInit() {
+        this.$state.go('home');
+        window.location.href = await this.vnApp.getUrl(`customer/${this.$params.id}/notes`);
     }
 }
 

modules/invoiceOut/back/methods/invoiceOut/delete.js

@@ -57,11 +57,11 @@ module.exports = Self => {
                     const params = {
                         bookEntry: bookEntry.ASIEN,
                         invoiceOutRef: invoiceOut.ref
-                    }        
+                    };
                     await Self.rawSql(`SELECT util.notification_send('book-entry-deleted', ?, NULL)`,
                         [JSON.stringify(params)],
                         myOptions);
-                };
+                }
 
                 await models.Xdiario.destroyAll({
                     ASIEN: bookEntry.ASIEN

modules/invoiceOut/back/methods/invoiceOut/negativeBases.js

@@ -48,13 +48,13 @@ module.exports = Self => {
         let stmt;
         stmts.push(new ParameterizedSQL(
             `CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
-                (KEY (ticketFk))
+                (INDEX (ticketFk))
                 ENGINE = MEMORY
                 SELECT id ticketFk
-                    FROM ticket t
+                    FROM ticket
                     WHERE shipped BETWEEN ? AND util.dayEnd(?)
                         AND refFk IS NULL`, [args.from, args.to]));
-        stmts.push(`CALL vn.ticket_getTax(NULL)`);
+        stmts.push(`CALL ticket_getTax(NULL)`);
         stmts.push(new ParameterizedSQL(
             `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                 ENGINE = MEMORY
@@ -71,12 +71,12 @@ module.exports = Self => {
                         c.isTaxDataChecked,
                         w.id comercialId,
                         u.name workerName
-                    FROM vn.ticket t
-                        JOIN vn.company co ON co.id = t.companyFk
-                        JOIN vn.sale s ON s.ticketFk = t.id
-                        JOIN vn.client c ON c.id = t.clientFk
-                        JOIN vn.country cou ON cou.id = c.countryFk
-                        LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+                    FROM ticket t
+                        JOIN company co ON co.id = t.companyFk
+                        JOIN sale s ON s.ticketFk = t.id
+                        JOIN client c ON c.id = t.clientFk
+                        JOIN country cou ON cou.id = c.countryFk
+                        LEFT JOIN worker w ON w.id = c.salesPersonFk
                         JOIN account.user u ON u.id = w.id
                         LEFT JOIN (
                             SELECT ticketFk, taxableBase

modules/invoiceOut/back/models/invoice-out.js

@@ -79,6 +79,8 @@ module.exports = Self => {
                 type
             ],
             myOptions);
+        if (!serial)
+            throw new UserError('No invoice series found for these parameters');
 
         const invoiceOutSerial = await Self.app.models.InvoiceOutSerial.findById(serial);
         if (invoiceOutSerial?.taxAreaFk == 'WORLD') {

modules/item/front/item-type/basic-data/index.html

@@ -24,8 +24,8 @@
             <vn-autocomplete
                 label="Worker"
                 ng-model="$ctrl.itemType.workerFk"
-                url="Workers"
-                show-field="firstName"
+                url="Workers/search"
+                show-field="nickname"
                 value-field="id"
                 rule>
             </vn-autocomplete>

modules/item/front/item-type/create/index.html

@@ -25,8 +25,8 @@
             <vn-autocomplete
                 label="Worker"
                 ng-model="$ctrl.itemType.workerFk"
-                url="Workers"
-                show-field="firstName"
+                url="Workers/search"
+                show-field="nickname"
                 value-field="id"
                 rule>
             </vn-autocomplete>

modules/monitor/front/locale/es.yml

@@ -0,0 +1,16 @@
+Tickets monitor: Monitor de tickets		
+Clients on website: Clientes activos en la web		
+Recent order actions: Acciones recientes en pedidos		
+Search tickets: Buscar tickets		
+Delete selected elements: Eliminar los elementos seleccionados		
+All the selected elements will be deleted. Are you sure you want to continue?: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?		
+Component lack: Faltan componentes		
+Ticket too little: Ticket demasiado pequeño		
+Minimize/Maximize: Minimizar/Maximizar		
+Problems: Problemas		
+Theoretical: Teórica		
+Practical: Práctica		
+Preparation: Preparación		
+Auto-refresh: Auto-refresco		
+Toggle auto-refresh every 2 minutes: Conmuta el refresco automático cada 2 minutos		
+Is fragile: Es frágil

modules/shelving/back/models/sector.json

@@ -59,6 +59,9 @@
         "isReserve": {
             "type": "boolean",
             "required": true
+        },
+        "isOnReservationMode": {
+            "type": "boolean"
         }
     }
 }

modules/supplier/back/methods/supplier/getWithPackaging.js

@@ -0,0 +1,45 @@
+module.exports = Self => {
+    Self.remoteMethod('getWithPackaging', {
+        description: 'Returns the list of suppliers with an entry of type packaging',
+        accessType: 'READ',
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/getWithPackaging`,
+            verb: 'GET'
+        },
+        nolimit: true
+    });
+    Self.getWithPackaging = async options => {
+        const models = Self.app.models;
+        const myOptions = {};
+        const oneYearAgo = new Date();
+        oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const entries = await models.Entry.find({
+            where: {
+                typeFk: 'packaging',
+                created: {gte: oneYearAgo}
+            },
+            include: {
+                relation: 'supplier',
+                scope: {
+                    fields: ['id', 'name']
+                }
+            },
+            fields: {supplierFk: true}
+        }, myOptions);
+
+        const result = entries.map(item => ({
+            id: item.supplier().id,
+            name: item.supplier().name
+        }));
+        return Array.from(new Map(result.map(entry => [entry.id, entry])).values());
+    };
+};
+

modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js

@@ -0,0 +1,33 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Supplier getWithPackaging()', () => {
+    it('should return a list of suppliers with an entry of type packaging', async() => {
+        const typeFk = 'packaging';
+
+        const tx = await models.Supplier.beginTransaction({});
+        const myOptions = {transaction: tx};
+
+        try {
+            const entry = await models.Entry.findOne(
+                {
+                    where: {
+                        id: 1
+                    },
+                    myOptions
+                });
+
+            await entry.updateAttributes({
+                typeFk: typeFk,
+                created: new Date()
+            });
+
+            const result = await models.Supplier.getWithPackaging(myOptions);
+
+            expect(result.length).toEqual(1);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/supplier/back/models/supplier.js

@@ -12,6 +12,7 @@ module.exports = Self => {
     require('../methods/supplier/campaignMetricsEmail')(Self);
     require('../methods/supplier/newSupplier')(Self);
     require('../methods/supplier/getItemsPackaging')(Self);
+    require('../methods/supplier/getWithPackaging')(Self);
 
     Self.validatesPresenceOf('name', {
         message: 'The social name cannot be empty'

modules/ticket/back/methods/expedition-state/filter.js

@@ -29,7 +29,7 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const stmt = new ParameterizedSQL(
-            `SELECT es.created, u.name, u.id workerFk, est.description state
+            `SELECT es.created, u.name, u.id workerFk, est.description state, es.isScanned
                 FROM vn.expeditionState es 
                     JOIN vn.expeditionStateType est ON est.id = es.typeFk
                     JOIN account.user u ON u.id = es.userFk