Merge branch 'dev' into 6822-entryTransfer

Reviewed-on: #3129
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/* \
+    && rm -rf /var/lib/apt/lists/*
-    && npm -g install pm2
 
 # Salix
 
@@ -55,7 +54,4 @@ COPY \
     README.md \
     ./
 
-CMD ["pm2-runtime", "./back/process.yml"]
+CMD ["node", "--tls-min-v1.0", "--openssl-legacy-provider", "./loopback/server/server.js"]
-
-HEALTHCHECK --interval=15s --timeout=10s \
-    CMD curl -f http://localhost:3000/api/Applications/status || exit 1

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,87 +2,54 @@ 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';
-    });
 
-    afterAll(() => {
+        const docuwareInfo = await models.Docuware.findOne({
-        delete process.env.NODE_ENV;
+            where: {
-    });
+                code: fileCabinetCode
-
+            }
-    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()', () => {
+        spyOn(axios, 'get').and.callFake(url => {
-        it('should return dialogId', async() => {
+            if (url.includes('IdentityServiceInfo')) return {data: {IdentityServiceUrl: 'IdentityServiceUrl'}};
-            const dialogs = {
+            if (url.includes('IdentityServiceUrl')) return {data: {token_endpoint: 'token_endpoint'}};
-                data: {
+            if (url.includes('dialogs')) {
-                    Dialog: [
+                return {
-                        {
+                    data: {
-                            DisplayName: 'find',
+                        Dialog: [
-                            Id: 'getDialogTest'
+                            {
-                        }
+                                DisplayName: 'find',
-                    ]
+                                Id: 'getDialogTest'
-                }
+                            }
-            };
+                        ]
-            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
+                    }
-            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+                };
+            }
 
-            expect(result).toEqual('getDialogTest');
+            if (url.includes('FileCabinets')) {
-        });
+                return {data: {
-    });
-
-    describe('getFileCabinet()', () => {
-        it('should return fileCabinetId', async() => {
-            const code = 'deliveryNote';
-            const docuwareInfo = await models.Docuware.findOne({
-                where: {
-                    code
-                }
-            });
-            const dialogs = {
-                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.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(axios, 'post').and.callFake(url => {
-            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            if (url.includes('token_endpoint')) {
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+                return {data: {
-            const data = {
+                    access_token: 'access_token',
-                data: {
+                    token_type: 'bearer',
+                    expires_in: 10000
+                }};
+            }
+            if (url.includes('DialogExpression')) {
+                return {data: {
                     Items: [{
                         Fields: [
                             {
@@ -103,12 +70,52 @@ 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, 'get');
-            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            await models.Docuware.getById('deliveryNote', 1);
-            const data = {
-                data: {
-                    id: 1
-                }
-            };
-            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
-            const result = 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/model-config.json

@@ -88,12 +88,6 @@
     "Machine": {
         "dataSource": "vn"
     },
-    "MachineWorker": {
-        "dataSource": "vn"
-    },
-    "MachineWorkerConfig": {
-        "dataSource": "vn"
-    },
     "MobileAppVersionControl": {
         "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"
+        },
+        "username": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "expired":{
+            "type": "number"
         }
-    },
+    }
-    "acls": [
-        {
-            "property": "*",
-            "accessType": "*",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
-	    }
-    ]
 }

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/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/.dump/data.sql

@@ -1723,7 +1723,6 @@ INSERT INTO `ACL` VALUES (378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','
 INSERT INTO `ACL` VALUES (379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system',NULL);
 INSERT INTO `ACL` VALUES (380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager',NULL);
-INSERT INTO `ACL` VALUES (382,'Item','labelPdf','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (383,'Sector','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (384,'Sector','*','WRITE','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee',NULL);

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'),
+        (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, 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, 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'),
+        (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, 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, 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'),
+        (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, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   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, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 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, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 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, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    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, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, '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, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 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, 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`)
+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'), 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
+    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;
 
@@ -632,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'),
+        ('A',   'Global nacional',              1,          'NATIONAL',		0,         'global'),
-        ('T', 'Española rapida',            1, 'NATIONAL',  0,  'quick'),
+        ('T',   'Española rapida',              1,          'NATIONAL',		0,         'quick'),
-        ('V', 'Intracomunitaria global',    0, 'CEE',       1,  'global'),
+        ('V',   'Intracomunitaria global',      0,          'CEE',     		1,         'global'),
-        ('M', 'Múltiple nacional',          1, 'NATIONAL',  0,  'multiple'),
+        ('M',   'Múltiple nacional',            1,          'NATIONAL',		0,         'multiple'),
-        ('R', 'Rectificativa',              1, 'NATIONAL',  0,   NULL),
+        ('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
@@ -2835,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
@@ -2911,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`)
@@ -3823,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);
 
@@ -3832,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;

db/routines/bs/procedures/clientNewBorn_recalc.sql

@@ -6,25 +6,27 @@ BLOCK1: BEGIN
 	DECLARE vShipped DATE; 
 	DECLARE vPreviousShipped DATE;
 	DECLARE vDone boolean;  
-	DECLARE cur cursor for         
 
-	SELECT clientFk, firstShipped  
+	DECLARE cur CURSOR FOR  
-		FROM bs.clientNewBorn;  
+		SELECT clientFk, firstShipped  
+			FROM bs.clientNewBorn;    
         
 	DECLARE continue HANDLER FOR NOT FOUND SET vDone = TRUE;      
 	SET vDone := FALSE;  
 
 	DELETE FROM	bs.clientNewBorn WHERE isModified = FALSE;
 
-        INSERT INTO clientNewBorn(clientFk, firstShipped, lastShipped)
+	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
+			FROM vn.client c
-					JOIN vn.ticket t on t.clientFk =  c.id
+				JOIN vn.ticket t ON t.clientFk =  c.id
-                    LEFT JOIN clientNewBorn cb on cb.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
+			WHERE t.shipped BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR 
-				GROUP BY c.id;
+					AND util.VN_CURDATE() 
-	OPEN cur;
+				AND cb.isModified IS NULL
+			GROUP BY c.id;
 
+	OPEN cur;
 	LOOP1: LOOP
 		SET vDone := FALSE;
 		FETCH cur INTO vClientFk, vShipped;

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/buy_getUltimate.sql

@@ -0,0 +1,31 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`buy_getUltimate`(
+	vItemFk INT,
+	vWarehouseFk INT,
+	vDated DATE
+)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Calcula las últimas compras realizadas hasta una fecha.
+ *
+ * @param vItemFk Id del artículo
+ * @param vWarehouseFk Id del almacén
+ * @param vDated Compras hasta fecha
+ * @return Id de compra
+ */
+	DECLARE vBuyFk INT;
+
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, vDated);
+
+	SELECT buyFk INTO vBuyFk
+		FROM tmp.buyUltimate;
+
+	DROP TEMPORARY TABLE IF EXISTS
+		tmp.buyUltimate,
+		tmp.buyUltimateFromInterval;
+
+	RETURN vBuyFk;
+END$$
+DELIMITER ;

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/buy_getUltimate.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
 	vItemFk INT,
-	vWarehouseFk SMALLINT, 
+	vWarehouseFk INT, 
 	vDated DATE
 )
 BEGIN

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,
+			cc.defaultMandateTypeFk
-			c.hasDailyInvoice
 		INTO vPayMethodFk,
 			vDueDay,
 			vDefaultCredit,
 			vIsTaxDataChecked,
 			vHasCoreVnl,
-			vMandateTypeFk,
+			vMandateTypeFk
-			vHasDailyInvoice
 		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,
+			isEqualizated = FALSE
-			hasDailyInvoice = vHasDailyInvoice
 		ON duplicate KEY UPDATE
 			payMethodFk = vPayMethodFk,
 			dueDay = vDueDay,

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;
 
@@ -93,7 +94,7 @@ proc: BEGIN
 			LEAVE l;
 		END IF;
 	
-	SELECT id INTO vItemShelvingFk 
+		SELECT id INTO vItemShelvingFk 
 			FROM itemShelving 
 			WHERE id = vItemShelvingFk 
 			FOR UPDATE;
@@ -102,19 +103,19 @@ proc: BEGIN
 		SET vOutStanding = vOutStanding - vReservedQuantity;
 		
 		IF vReservedQuantity > 0 THEN 
-	CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
+			CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
-				CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
+						CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
-			INSERT INTO itemShelvingSale(
+					INSERT INTO itemShelvingSale(
-					itemShelvingFk,
+							itemShelvingFk,
-					saleFk,
+							saleFk,
-					quantity,
+							quantity,
-					userFk,
+							userFk,
-					isPicked)
+							isPicked)
-				SELECT vItemShelvingFk, 
+						SELECT vItemShelvingFk, 
-					vSaleFk, 
+							vSaleFk, 
-					vReservedQuantity, 
+							vReservedQuantity, 
-					vUserFk,
+							vUserFk,
-					FALSE;
+							FALSE;
 			
 			UPDATE itemShelving 
 				SET available = available - vReservedQuantity
@@ -123,6 +124,6 @@ proc: BEGIN
 		END IF;
 	END LOOP;
 	CLOSE vItemShelvingAvailable;
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
 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
+			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-				AND lb.warehouse_id = vWarehouseFk
 			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/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 (
+		WITH sales AS (
-			SELECT tmpTicket.ticketFk,
+			SELECT s.ticketFk,
-					bp.pgcFk,
+					s.itemFk,
-					SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
+					s.quantity * s.price * (100 - s.discount) / 100 total,
-					pgc.rate,
+					t.companyFk,
-					tc.code,
+					t.addressFk,
-					bp.priority
+					su.countryFk,
-				FROM tmp.ticket tmpTicket
+					ata.areaFk,
-					JOIN sale s ON s.ticketFk = tmpTicket.ticketFk
+					itc.taxClassFk
-					JOIN item i ON i.id = s.itemFk
+				FROM vn.sale s
-					JOIN ticket t ON t.id = tmpTicket.ticketFk
+					JOIN tmp.ticket tmp ON tmp.ticketFk = s.ticketFk
-					JOIN supplier su ON su.id = t.companyFk
+					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 itemTaxCountry itc ON itc.itemFk = i.id
+					JOIN vn.itemTaxCountry itc ON itc.itemFk = s.itemFk
 						AND itc.countryFk = su.countryFk
-					JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
+				HAVING total
-						AND bp.taxAreaFk = ata.areaFk
+		)
-						AND bp.taxClassFk = itc.taxClassFk
+		SELECT s.ticketFk,
-					JOIN pgc ON pgc.code = bp.pgcFk
+				bp.pgcFk,
-					JOIN taxClass tc ON tc.id = bp.taxClassFk
+				SUM(s.total) taxableBase,
-				GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
+				pgc.rate,
-				HAVING taxableBase
+				tc.code,
-			) t3
+				bp.priority
+			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
 			ORDER BY priority;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax

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)		
+			JOIN sector se ON se.id = o.sectorFk
-		WHERE id = NEW.saleFk;
+		SET s.isPicked = IF(IFNULL(se.isOnReservationMode, o.isOnReservationMode), s.isPicked, TRUE)
+		WHERE s.id = NEW.saleFk;
 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(
+		JOIN `vn`.`operator` `o` ON(
-			`mw`.`workerFk` = `c`.`workerFk`
+			`o`.`workerFk` = `c`.`workerFk`
-			AND `mw`.`inTimed` > `util`.`VN_CURDATE`()
 		)
 	)
 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/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/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/11315-grayCamellia/00-firstScript.sql

@@ -0,0 +1,3 @@
+DELETE FROM salix.ACL
+	WHERE property = 'labelPdf'
+		AND model = 'Item';

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';

db/versions/11321-wheatChrysanthemum/00-firstScript.sql

@@ -0,0 +1,3 @@
+INSERT INTO vn.report (name, `method`)
+	VALUES ('LabelItemBarcode','Items/{id}/label-barcode-pdf'),
+		('LabelItemQr','Items/{id}/label-qr-pdf');

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.",
@@ -382,5 +383,7 @@
 	"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",
-	"type cannot be blank": "Se debe rellenar el tipo"
+	"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",
+	"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén"
 }

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/claim/back/methods/claim/updateClaim.js

@@ -85,16 +85,11 @@ module.exports = Self => {
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
             const salesPerson = claim.client().salesPersonUser();
-            if (salesPerson) {
+            if (salesPerson && args.claimStateFk) {
-                if (changedPickup && updatedClaim.pickup)
+                const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
-                    await notifyPickUp(ctx, salesPerson.id, claim);
+                await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
-
+                if (newState.code == 'canceled')
-                if (args.claimStateFk) {
+                    await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
-                    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,67 +1,78 @@
 const models = require('vn-loopback/server/server').models;
+
 describe('Client Create', () => {
-    const newAccount = {
+    let options;
-        userName: 'deadpool',
+    let tx;
-        email: 'deadpool@marvel.com',
-        fi: '16195279J',
-        name: 'Wade',
-        socialName: 'DEADPOOL MARVEL',
-        street: 'WALL STREET',
-        city: 'New York',
-        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() => {
+    beforeEach(async() => {
-        const tx = await models.Client.beginTransaction({});
+        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 options = {transaction: tx};
+            const account = await models.VnUser.findOne({where: {name: 'deadpool'}}, options);
+            const client = await models.Client.findOne({where: {name: 'Wade'}}, options);
 
-            const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
+            expect(account).toBeNull();
-            const client = await models.Client.findOne({where: {name: newAccount.name}}, options);
+            expect(client).toBeNull();
-
-            expect(account).toEqual(null);
-            expect(client).toEqual(null);
-
-            await tx.rollback();
         } catch (e) {
             await tx.rollback();
             throw e;
         }
     });
 
-    it('should not create a new account', async() => {
+    it('should throw an error when creating a new account without email', async() => {
-        const tx = await models.Client.beginTransaction({});
-
         let error;
+        const newAccountWithoutEmail = {
+            userName: 'deadpool',
+            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(newAccountWithoutEmail, options);
-
-            await tx.rollback();
         } catch (e) {
-            error = e.message;
+            error = e;
-
-            await tx.rollback();
         }
 
-        expect(error).toEqual(`An email is necessary`);
+        expect(error.message).toEqual('An email is necessary');
     });
 
-    it('should create a new account', async() => {
+    it('should create a new account with dailyInvoice', async() => {
-        const tx = await models.Client.beginTransaction({});
+        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};
+            const province = await models.Province.findById(newAccount.provinceFk, {
+                fields: ['id', 'name', 'autonomyFk'],
+                include: {
+                    relation: 'autonomy'
+                }
+            }, 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);
+            await models.Client.createWithUser(newAccount, options);
-
-            expect(client).toBeNull();
-
-            await tx.rollback();
         } catch (e) {
-            await tx.rollback();
             error = e;
         }
 
-        const errorName = error.details.codes.name[0];
+        expect(error.message).toContain('already exists');
-
-        expect(errorName).toEqual('uniqueness');
     });
 });

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

@@ -74,7 +74,8 @@ module.exports = Self => {
                         pm.name payMethod,
                         r.finished IS NULL hasRecovery,
                         dp.id departmentFk,
-                        dp.name departmentName
+                        dp.name departmentName,
+                        dp.notificationEmail departmentEmail
                     FROM defaulter d
                         JOIN client c ON c.id = d.clientFk
                         JOIN country cn ON cn.id = c.countryFk

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/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
+                    FROM ticket t
-                        JOIN vn.company co ON co.id = t.companyFk
+                        JOIN company co ON co.id = t.companyFk
-                        JOIN vn.sale s ON s.ticketFk = t.id
+                        JOIN sale s ON s.ticketFk = t.id
-                        JOIN vn.client c ON c.id = t.clientFk
+                        JOIN client c ON c.id = t.clientFk
-                        JOIN vn.country cou ON cou.id = c.countryFk
+                        JOIN country cou ON cou.id = c.countryFk
-                        LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+                        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/back/methods/item/labelBarcodePdf.js

@@ -1,6 +1,6 @@
 module.exports = Self => {
-    Self.remoteMethodCtx('labelPdf', {
+    Self.remoteMethodCtx('labelBarcodePdf', {
-        description: 'Returns the item label pdf',
+        description: 'Returns the item label pdf with barcode',
         accessType: 'READ',
         accepts: [
             {
@@ -9,28 +9,24 @@ module.exports = Self => {
                 required: true,
                 description: 'The item id',
                 http: {source: 'path'}
-            },
+            }, {
-            {
-                arg: 'recipientId',
-                type: 'number',
-                description: 'The recipient id',
-                required: false
-            },
-            {
                 arg: 'warehouseId',
                 type: 'number',
-                description: 'The warehouse id',
                 required: true
-            },
+            }, {
-            {
+                arg: 'packing',
-                arg: 'labelNumber',
                 type: 'number',
                 required: false
-            },
+            }, {
-            {
+                arg: 'copies',
-                arg: 'totalLabels',
                 type: 'number',
                 required: false
+            }, {
+                arg: 'userId',
+                type: 'number',
+                description: 'The user id from accessToken',
+                http: ctx => ctx.req.accessToken.userId,
+                required: true
             }
         ],
         returns: [
@@ -49,11 +45,11 @@ module.exports = Self => {
             }
         ],
         http: {
-            path: '/:id/label-pdf',
+            path: '/:id/label-barcode-pdf',
             verb: 'GET'
         },
         accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
-    Self.labelPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label');
+    Self.labelBarcodePdf = (ctx, id) => Self.printReport(ctx, id, 'item-label-barcode');
 };

modules/item/back/methods/item/labelQrPdf.js

@@ -0,0 +1,55 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('labelQrPdf', {
+        description: 'Returns the item label pdf with qr',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The item id',
+                http: {source: 'path'}
+            }, {
+                arg: 'warehouseId',
+                type: 'number',
+                required: true
+            }, {
+                arg: 'packing',
+                type: 'number',
+                required: false
+            }, {
+                arg: 'copies',
+                type: 'number',
+                required: false
+            }, {
+                arg: 'userId',
+                type: 'number',
+                description: 'The user id from accessToken',
+                http: ctx => ctx.req.accessToken.userId,
+                required: true
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/label-qr-pdf',
+            verb: 'GET'
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
+    });
+
+    Self.labelQrPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label-qr');
+};

modules/item/back/models/item.js

@@ -15,7 +15,8 @@ module.exports = Self => {
     require('../methods/item/getWasteByItem')(Self);
     require('../methods/item/createIntrastat')(Self);
     require('../methods/item/buyerWasteEmail')(Self);
-    require('../methods/item/labelPdf')(Self);
+    require('../methods/item/labelBarcodePdf')(Self);
+    require('../methods/item/labelQrPdf')(Self);
     require('../methods/item/setVisibleDiscard')(Self);
     require('../methods/item/get')(Self);
 

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

@@ -24,8 +24,8 @@
             <vn-autocomplete
                 label="Worker"
                 ng-model="$ctrl.itemType.workerFk"
-                url="Workers"
+                url="Workers/search"
-                show-field="firstName"
+                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"
+                url="Workers/search"
-                show-field="firstName"
+                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/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 

modules/ticket/back/methods/sale/usesMana.js

@@ -31,6 +31,6 @@ module.exports = Self => {
 
         const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
-        return usesMana ? true : false;
+        return !!usesMana;
     };
 };

modules/ticket/back/methods/ticket-request/filter.js

@@ -59,6 +59,11 @@ module.exports = Self => {
                 arg: 'state',
                 type: 'string',
                 description: `Search request by request state`
+            },
+            {
+                arg: 'myTeam',
+                type: 'boolean',
+                description: `Team partners`
             }
         ],
         returns: {
@@ -75,6 +80,8 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {};
+        const models = Self.app.models;
+        const args = ctx.args;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -82,6 +89,21 @@ module.exports = Self => {
         if (ctx.args.mine)
             ctx.args.attenderFk = userId;
 
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
+            }, myOptions);
+            const collegues = worker.collegues() || [];
+            for (let collegue of collegues)
+                teamMembersId.push(collegue.collegueFk);
+
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
+
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
@@ -113,6 +135,11 @@ module.exports = Self => {
                 return {'w.id': value};
             case 'salesPersonFk':
                 return {'c.salesPersonFk': value};
+            case 'myTeam':
+                if (value)
+                    return {'tr.requesterFk': {inq: teamMembersId}};
+                else
+                    return {'tr.requesterFk': {nin: teamMembersId}};
             }
         });
 

modules/ticket/back/methods/ticket/closeAll.js

@@ -1,11 +1,17 @@
-const UserError = require('vn-loopback/util/user-error');
 const closure = require('./closure');
 
 module.exports = Self => {
     Self.remoteMethodCtx('closeAll', {
         description: 'Makes the closure process from all warehouses',
         accessType: 'WRITE',
-        accepts: [],
+        accepts: [
+            {
+                arg: 'options',
+                type: 'object',
+                http: {source: 'body'},
+                description: 'Optional parameters, including transaction.'
+            }
+        ],
         returns: {
             type: 'object',
             root: true
@@ -16,21 +22,20 @@ module.exports = Self => {
         }
     });
 
-    Self.closeAll = async ctx => {
+    Self.closeAll = async(ctx, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        let tx;
+        // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
+
         const toDate = Date.vnNew();
         toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
 
-        const todayMinDate = Date.vnNew();
-        todayMinDate.setHours(0, 0, 0, 0);
-
-        const todayMaxDate = Date.vnNew();
-        todayMaxDate.setHours(23, 59, 59, 59);
-
-        // Prevent closure for current day
-        if (toDate >= todayMinDate && toDate <= todayMaxDate)
-            throw new UserError('You cannot close tickets for today');
-
         const tickets = await Self.rawSql(`
             SELECT t.id,
                     t.clientFk,
@@ -41,7 +46,7 @@ module.exports = Self => {
                     c.salesPersonFk,
                     c.isToBeMailed,
                     c.hasToInvoice,
-                    co.hasDailyInvoice,
+                    c.hasDailyInvoice,
                     eu.email salesPersonEmail,
                     t.addressFk
                 FROM ticket t
@@ -58,12 +63,12 @@ module.exports = Self => {
                     AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                     AND t.refFk IS NULL
                 GROUP BY t.id
-        `, [toDate, toDate]);
+        `, [toDate, toDate], myOptions);
         const ticketIds = tickets.map(ticket => ticket.id);
         await Self.rawSql(`
             INSERT INTO util.debug (variable, value)
                 VALUES ('nightInvoicing', ?)
-        `, [ticketIds.join(',')]);
+        `, [ticketIds.join(',')], myOptions);
 
         await Self.rawSql(`
         WITH ticketNotInvoiceable AS(
@@ -120,7 +125,7 @@ module.exports = Self => {
                             WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
                                 AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                                 AND t.refFk IS NULL
-                                AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
+                                AND c.hasDailyInvoice
                             GROUP BY ticketFk
                             HAVING hasErrorToInvoice
                                 OR hasErrorTaxDataChecked
@@ -133,9 +138,9 @@ module.exports = Self => {
             ) SELECT IF(errors = '{"tickets": null}',
                     'No errors',
                     util.notification_send('invoice-ticket-closure', errors, NULL))
-                FROM ticketNotInvoiceable`, [toDate, toDate]);
+                FROM ticketNotInvoiceable`, [toDate, toDate], myOptions);
 
-        await closure(ctx, Self, tickets);
+        await closure(ctx, Self, tickets, myOptions);
 
         await Self.rawSql(`
             UPDATE ticket t
@@ -150,7 +155,10 @@ module.exports = Self => {
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
                     AND NOT t.packages
                     AND tob.id IS NULL
-                    AND t.routeFk`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
+                    AND t.routeFk`, [toDate, toDate], myOptions);
+
+        if (tx)
+            await tx.commit();
 
         return {
             message: 'Success'

modules/ticket/back/methods/ticket/closeByTicket.js

@@ -50,7 +50,7 @@ module.exports = Self => {
                 c.salesPersonFk,
                 c.isToBeMailed,
                 c.hasToInvoice,
-                co.hasDailyInvoice,
+                c.hasDailyInvoice,
                 eu.email salesPersonEmail,
                 t.addressFk
             FROM expedition e
@@ -58,8 +58,6 @@ module.exports = Self => {
                 JOIN ticketState ts ON ts.ticketFk = t.id
                 JOIN alertLevel al ON al.id = ts.alertLevel
                 JOIN client c ON c.id = t.clientFk
-                JOIN province p ON p.id = c.provinceFk
-                JOIN country co ON co.id = p.countryFk
                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
             WHERE al.code = 'PACKED'
                 AND t.id = ?

modules/ticket/back/methods/ticket/closure.js

@@ -19,9 +19,14 @@ module.exports = async function(ctx, Self, tickets, options) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
-            await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
+            await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], myOptions);
 
-            await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'quick');
+            await Self.app.models.InvoiceOut.getSerial(
+                ticket.clientFk,
+                ticket.companyFk,
+                ticket.addressFk,
+                'quick',
+                myOptions);
             await Self.rawSql(
                 `CALL vn.ticket_closeByTicket(?)`,
                 [ticket.id],

modules/ticket/back/methods/ticket/filter.js

@@ -228,52 +228,57 @@ module.exports = Self => {
         stmt = new ParameterizedSQL(`
             CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                 (INDEX (id))
-                ENGINE = MEMORY
+                ENGINE = InnoDB
                     SELECT t.id,
-                        t.shipped,
+                       t.shipped,
-                        CAST(DATE(t.shipped) AS CHAR) shippedDate,
+                       CAST(DATE(t.shipped) AS CHAR) shippedDate,
-                        HOUR(t.shipped) shippedHour,
+                       HOUR(t.shipped) shippedHour,
-                        t.nickname,
+                       t.nickname,
-                        t.refFk,
+                       t.refFk,
-                        t.routeFk,
+                       t.routeFk,
-                        t.warehouseFk,
+                       t.warehouseFk,
-                        t.clientFk,
+                       t.clientFk,
-                        t.totalWithoutVat,
+                       t.totalWithoutVat,
-                        t.totalWithVat,
+                       t.totalWithVat,
-                        io.id invoiceOutId,
+                       io.id invoiceOutId,
-                        a.provinceFk,
+                       a.provinceFk,
-                        p.name province,
+                       p.name province,
-                        w.name warehouse,
+                       w.name warehouse,
-                        am.name agencyMode,
+                       am.name agencyMode,
-                        am.id agencyModeFk,
+                       am.id agencyModeFk,
-                        st.name state,
+                       st.name state,
-                        st.classColor,
+                       st.classColor,
-                        wk.lastName salesPerson,
+                       wk.lastName salesPerson,
-                        ts.stateFk stateFk,
+                       ts.stateFk stateFk,
-                        ts.alertLevel alertLevel,
+                       ts.alertLevel alertLevel,
-                        ts.code alertLevelCode,
+                       ts.code alertLevelCode,
-                        u.name userName,
+                       u.name userName,
-                        c.salesPersonFk,
+                       c.salesPersonFk,
-                        z.hour zoneLanding,
+                       z.hour zoneLanding,
-                        HOUR(z.hour) zoneHour,
+                       HOUR(z.hour) zoneHour,
-                        MINUTE(z.hour) zoneMinute,
+                       MINUTE(z.hour) zoneMinute,
-                        z.name zoneName,
+                       z.name zoneName,
-                        z.id zoneFk,
+                       z.id zoneFk,
-                        CAST(z.hour AS CHAR) hour,
+                       CAST(z.hour AS CHAR) hour,
-                        a.nickname addressNickname
+                       a.nickname addressNickname,
-                    FROM ticket t
+                        (SELECT GROUP_CONCAT(DISTINCT i2.itemPackingTypeFk ORDER BY i2.itemPackingTypeFk SEPARATOR ',')
-                        LEFT JOIN invoiceOut io ON t.refFk = io.ref
+                            FROM sale s2
-                        LEFT JOIN zone z ON z.id = t.zoneFk
+                            JOIN item i2 ON i2.id = s2.itemFk
-                        LEFT JOIN address a ON a.id = t.addressFk
+                            WHERE s2.ticketFk = t.id
-                        LEFT JOIN province p ON p.id = a.provinceFk
+                        ) AS packing
-                        LEFT JOIN warehouse w ON w.id = t.warehouseFk
+                   FROM ticket t
-                        LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+                       LEFT JOIN invoiceOut io ON t.refFk = io.ref
-                        LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                       LEFT JOIN zone z ON z.id = t.zoneFk
-                        LEFT JOIN state st ON st.id = ts.stateFk
+                       LEFT JOIN address a ON a.id = t.addressFk
-                        LEFT JOIN client c ON c.id = t.clientFk
+                       LEFT JOIN province p ON p.id = a.provinceFk
-                        LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+                       LEFT JOIN warehouse w ON w.id = t.warehouseFk
-                        LEFT JOIN account.user u ON u.id = wk.id
+                       LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-                        LEFT JOIN route r ON r.id = t.routeFk
+                       LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                       LEFT JOIN state st ON st.id = ts.stateFk
+                       LEFT JOIN client c ON c.id = t.clientFk
+                       LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+                       LEFT JOIN account.user u ON u.id = wk.id
+                       LEFT JOIN route r ON r.id = t.routeFk
         `);
 
         if (args.orderFk) {
@@ -292,6 +297,7 @@ module.exports = Self => {
         }
 
         stmt.merge(conn.makeWhere(filter.where));
+
         stmts.push(stmt);
 
         stmt = new ParameterizedSQL(`

modules/ticket/back/methods/ticket/getTicketsAdvance.js

@@ -50,6 +50,11 @@ module.exports = Self => {
                 type: 'boolean',
                 description: 'True when lines and stock of origin are equal'
             },
+            {
+                arg: 'departmentFk',
+                type: 'number',
+                description: 'Department identifier'
+            },
             {
                 arg: 'filter',
                 type: 'object',
@@ -96,6 +101,8 @@ module.exports = Self => {
                 };
             case 'isFullMovable':
                 return {'f.isFullMovable': value};
+            case 'departmentFk':
+                return {'f.departmentFk': value};
             }
         });
 

modules/ticket/back/methods/ticket/setDeleted.js

@@ -49,9 +49,12 @@ module.exports = Self => {
                 where: {originalTicketFk: id}
             }, myOptions);
 
+            const hasRefund = !!ticketRefunds?.length;
+
             const allDeleted = ticketRefunds.every(refund => refund.refundTicket().isDeleted);
 
-            if (ticketRefunds?.length && !allDeleted) {
+            if (!hasRefund) await models.TicketRefund.destroyAll({refundTicketFk: id}, myOptions);
+            if (hasRefund && !allDeleted) {
                 const notDeleted = [];
                 for (const refund of ticketRefunds)
                     if (!refund.refundTicket().isDeleted) notDeleted.push(refund.refundTicket().id);

modules/ticket/back/methods/ticket/specs/closeAll.spec.js

@@ -0,0 +1,54 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('Ticket Closure - closeAll function', () => {
+    let ctx = {
+        req: {
+            getLocale: () => 'es',
+            accessToken: {userId: 1106},
+            headers: {origin: 'http://localhost'},
+            __: value => value,
+        },
+        args: {}
+    };
+    let options;
+    let tx;
+    let originalVnNew;
+
+    beforeEach(async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({active: ctx.req});
+
+        tx = await models.Ticket.beginTransaction({});
+        options = {transaction: tx};
+        originalVnNew = Date.vnNew;
+        spyOn(Date, 'vnNew').and.callFake(() => {
+            const mockDate = originalVnNew();
+            mockDate.setDate(mockDate.getDate() + 1);
+            return mockDate;
+        });
+    });
+
+    afterEach(async() => {
+        if (tx)
+            await tx.rollback();
+    });
+
+    it('should set routeFk to NULL when conditions are met', async() => {
+        const ticketsBefore = await models.Ticket.find({
+            where: {
+                routeFk: {neq: null}
+            }
+        }, options);
+
+        await models.Ticket.closeAll(ctx, options);
+
+        const ticketsAfter = await models.Ticket.find({
+            where: {
+                id: {inq: ticketsBefore.map(ticket => ticket.id)},
+                routeFk: {neq: null}
+            }
+        }, options);
+
+        expect(ticketsBefore.length).toBeGreaterThan(ticketsAfter.length);
+    });
+});

modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js

@@ -6,6 +6,9 @@ describe('TicketFuture getTicketsAdvance()', () => {
     today.setHours(0, 0, 0, 0);
     let tomorrow = Date.vnNew();
     tomorrow.setDate(today.getDate() + 1);
+    const salesDeptId = 43;
+    const spain1DeptId = 95;
+    beforeAll.mockLoopBackContext();
 
     it('should return the tickets passing the required data', async() => {
         const tx = await models.Ticket.beginTransaction({});
@@ -129,4 +132,39 @@ describe('TicketFuture getTicketsAdvance()', () => {
             throw e;
         }
     });
+
+    it('should return the tickets matching the right department', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            ctx.args = {
+                dateFuture: tomorrow,
+                dateToAdvance: today,
+                warehouseFk: 1,
+            };
+
+            await models.Ticket.updateAll({id: {inq: [12, 31]}}, {clientFk: 1}, options);
+            const client = await models.Client.findById(1, null, options);
+            await client.updateAttribute('salesPersonFk', 1, options);
+            const business = await models.Business.findById(1, null, options);
+            await business.updateAttributes({departmentFk: spain1DeptId}, options);
+
+            const saleTickets = await models.Ticket.getTicketsAdvance(ctx, options);
+            const filteredSaleTickets = await models.Ticket.getTicketsAdvance(
+                {args: {...ctx.args, departmentFk: spain1DeptId}},
+                options);
+
+            expect(saleTickets.length).toBeGreaterThan(filteredSaleTickets.length);
+            expect(saleTickets.some(ticket => ticket.departmentFk === salesDeptId)).toBeTrue();
+            expect(saleTickets.some(ticket => ticket.departmentFk === spain1DeptId)).toBeTrue();
+
+            expect(filteredSaleTickets.some(ticket => ticket.departmentFk === salesDeptId)).toBeFalse();
+            expect(filteredSaleTickets.some(ticket => ticket.departmentFk === spain1DeptId)).toBeTrue();
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/ticket/back/methods/ticket/specs/setDeleted.spec.js

@@ -113,5 +113,27 @@ describe('ticket setDeleted()', () => {
 
             expect(error.message).not.toContain('Tickets with associated refunds');
         });
+
+        it('should delete the refund - original ticket relation', async() => {
+            const tx = await models.Ticket.beginTransaction({});
+            try {
+                const options = {transaction: tx};
+
+                const ticketId = 24;
+                const refundTicket = await models.TicketRefund.findOne({where: {refundTicketFk: ticketId}}, options);
+
+                expect(refundTicket).toBeTruthy();
+
+                await models.Ticket.setDeleted(ctx, ticketId, options);
+                const removedRefundTicket = await models.TicketRefund.findOne({
+                    where: {refundTicketFk: ticketId}},
+                options);
+
+                expect(removedRefundTicket).toBeNull();
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+            }
+        });
     });
 });

modules/ticket/back/models/expedition.json

@@ -1,63 +1,66 @@
 {
-    "name": "Expedition",
+  "name": "Expedition",
-    "base": "VnModel",
+  "base": "VnModel",
-    "mixins": {
+  "mixins": {
-        "Loggable": true
+    "Loggable": true
+  },
+  "options": {
+    "mysql": {
+      "table": "expedition"
+    }
+  },
+  "properties": {
+    "id": {
+      "id": true,
+      "type": "number",
+      "description": "Identifier"
     },
-    "options": {
+    "freightItemFk": {
-        "mysql": {
+      "type": "number"
-          "table": "expedition"
-        }
     },
-    "properties": {
+    "created": {
-      "id": {
+      "type": "date"
-        "id": true,
-        "type": "number",
-        "description": "Identifier"
-      },
-      "freightItemFk": {
-        "type": "number"
-      },
-      "created": {
-        "type": "date"
-      },
-      "counter": {
-        "type": "number"
-      },
-      "externalId": {
-        "type": "string"
-      }
     },
-    "relations": {
+    "counter": {
-      "ticket": {
+      "type": "number"
-        "type": "belongsTo",
+    },
-        "model": "Ticket",
+    "externalId": {
-        "foreignKey": "ticketFk"
+      "type": "string"
-      },
+    },
-      "agencyMode": {
+    "stateTypeFk": {
-        "type": "belongsTo",
+      "type": "number"
-        "model": "AgencyMode",
+    }
-        "foreignKey": "agencyModeFk"
+  },
-      },
+  "relations": {
-      "worker": {
+    "ticket": {
-        "type": "belongsTo",
+      "type": "belongsTo",
-        "model": "Worker",
+      "model": "Ticket",
-        "foreignKey": "workerFk"
+      "foreignKey": "ticketFk"
-      },
+    },
-      "packages": {
+    "agencyMode": {
-        "type": "hasMany",
+      "type": "belongsTo",
-        "model": "TicketPackaging",
+      "model": "AgencyMode",
-        "foreignKey": "ticketFk"
+      "foreignKey": "agencyModeFk"
-      },
+    },
-      "freightItem": {
+    "worker": {
-        "type": "belongsTo",
+      "type": "belongsTo",
-        "model": "Item",
+      "model": "Worker",
-        "foreignKey": "freightItemFk"
+      "foreignKey": "workerFk"
-      },
+    },
-      "packaging": {
+    "packages": {
-        "type": "belongsTo",
+      "type": "hasMany",
-        "model": "Package",
+      "model": "TicketPackaging",
-        "foreignKey": "packagingFk"
+      "foreignKey": "ticketFk"
-      }
+    },
+    "freightItem": {
+      "type": "belongsTo",
+      "model": "Item",
+      "foreignKey": "freightItemFk"
+    },
+    "packaging": {
+      "type": "belongsTo",
+      "model": "Package",
+      "foreignKey": "packagingFk"
     }
   }
+}

modules/worker/back/models/operator.json

@@ -24,13 +24,28 @@
 		"warehouseFk": {
 			"type": "number"
 		},
+        "sectorFk": {
+            "type": "number"
+        },
 		"labelerFk": {
 			"type": "number"
 		},
 		"isOnReservationMode": {
 			"type": "boolean",
 			"required": true
-		}
+		},
+        "machineFk": {
+            "type": "number"
+        },
+        "linesLimit": {
+            "type": "number"
+        },
+        "volumeLimit": {
+            "type": "number"
+        },
+        "sizeLimit": {
+            "type": "number"
+        }
 	},
 	"relations": {
 		"sector": {
@@ -53,6 +68,11 @@
 			"model": "ItemPackingType",
 			"foreignKey": "itemPackingTypeFk",
 			"primaryKey": "code"
-		}
+		},
+        "machine": {
+            "type": "belongsTo",
+            "model": "Machine",
+            "foreignKey": "machineFk"
+        }
 	}
 }

modules/zone/back/methods/zone/deleteZone.js

@@ -1,3 +1,4 @@
+const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     Self.remoteMethodCtx('deleteZone', {
         description: 'Delete a zone',
@@ -49,26 +50,12 @@ module.exports = Self => {
                     }
                 }
             };
-            const promises = [];
 
             const ticketList = await models.Ticket.find(filter, myOptions);
-            const fixingState = await models.State.findOne({where: {code: 'FIXING'}}, myOptions);
-            const worker = await models.Worker.findOne({
-                where: {id: userId}
-            }, myOptions);
 
-            await models.Ticket.rawSql('UPDATE ticket SET zoneFk = NULL WHERE zoneFk = ?', [id], myOptions);
+            if (ticketList.length > 0)
+                throw new UserError('There are tickets for this area, delete them first');
 
-            for (ticket of ticketList) {
-                if (ticket.ticketState().alertLevel == 0) {
-                    promises.push(models.Ticket.state(ctx, {
-                        ticketFk: ticket.id,
-                        stateFk: fixingState.id,
-                        userFk: worker.id
-                    }, myOptions));
-                }
-            }
-            await Promise.all(promises);
             await models.Zone.destroyById(id, myOptions);
 
             if (tx) await tx.commit();

modules/zone/back/methods/zone/specs/deleteZone.spec.js

@@ -8,9 +8,9 @@ describe('zone deletezone()', () => {
         __: value => value
     };
     const ctx = {req: activeCtx};
-    const zoneId = 9;
+    const zoneId = 4;
+    const zoneId2 = 3;
     let ticketIDs;
-    let originalTicketStates;
 
     beforeAll(async() => {
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
@@ -35,18 +35,8 @@ describe('zone deletezone()', () => {
             await models.Zone.deleteZone(ctx, zoneId, options);
 
             const updatedZone = await models.Zone.findById(zoneId, null, options);
-            const anUpdatedTicket = await models.Ticket.findById(ticketIDs[0], null, options);
-
-            const updatedTicketStates = await models.TicketState.find({
-                where: {
-                    ticketFk: {inq: ticketIDs},
-                    code: 'FIXING'
-                }
-            }, options);
 
             expect(updatedZone).toBeNull();
-            expect(anUpdatedTicket.zoneFk).toBeNull();
-            expect(updatedTicketStates.length).toBeGreaterThan(originalTicketStates.length);
 
             await tx.rollback();
         } catch (e) {
@@ -54,4 +44,20 @@ describe('zone deletezone()', () => {
             throw e;
         }
     });
+
+    it('should not delete the zone if it has tickets', async() => {
+        const tx = await models.Zone.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.Zone.deleteZone(ctx, zoneId2, options);
+            await tx.rollback();
+        } catch (e) {
+            error = e.message;
+            await tx.rollback();
+        }
+
+        expect(error).toEqual('There are tickets for this area, delete them first');
+    });
 });

print/templates/reports/delivery-note/delivery-note.html

@@ -58,6 +58,7 @@
                         <th width="5%">{{$t('reference')}}</th>
                         <th class="number">{{$t('quantity')}}</th>
                         <th width="50%">{{$t('concept')}}</th>
+                        <th width="50%">{{$t('producer')}}</th>
                         <th class="number" v-if="showPrices">{{$t('price')}}</th>
                         <th class="centered" width="5%" v-if="showPrices">{{$t('discount')}}</th>
                         <th class="centered" v-if="showPrices">{{$t('vat')}}</th>
@@ -69,6 +70,7 @@
                         <td width="5%">{{sale.itemFk}}</td>
                         <td class="number">{{sale.quantity}}</td>
                         <td width="50%">{{sale.concept}}</td>
+                        <td width="5%" class="font light-gray" v-if="sale.subName">{{sale.subName}}</td>
                         <td class="number" v-if="showPrices">{{sale.price | currency('EUR', $i18n.locale)}}</td>
                         <td class="centered" width="5%" v-if="showPrices">{{(sale.discount / 100) | percentage}}</td>
                         <td class="centered" v-if="showPrices">{{sale.vatType}}</td>
@@ -81,7 +83,6 @@
                             <span v-if="sale.value5"> <strong>{{sale.tag5}}</strong> {{sale.value5}} </span>
                             <span v-if="sale.value6"> <strong>{{sale.tag6}}</strong> {{sale.value6}} </span>
                             <span v-if="sale.value7"> <strong>{{sale.tag7}}</strong> {{sale.value7}} </span>
-                            <span v-if="sale.subName"> <strong>{{$t('producer')}}</strong> {{ sale.subName }}</span>
                         </td>
                     </tr>
                 </tbody>

print/templates/reports/item-label-barcode/assets/css/style.css

@@ -0,0 +1,84 @@
+html {
+    font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+    margin-top: -9px;
+    margin-left: -6px;
+}
+table {
+    width: 100%;
+    font-size: 14px;
+}
+td {
+    border: 6px solid white;
+}
+.center {
+    text-align: center;
+}
+.right {
+    text-align: right;
+}
+.cursive {
+    font-style: italic;
+}
+.bold {
+    font-weight: bold;
+}
+.black-bg {
+    background-color: black;
+    color: white;
+}
+.xs-txt {
+    font-size: 18px;
+}
+.md-txt {
+    font-size: 26px;
+}
+.xl-txt {
+    font-size: 50px;
+}
+.cell {
+    border: 2px solid black;
+    box-sizing: content-box;
+    width: 100%;
+    height: 30px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.padding {
+    padding: 7px;
+}
+.xs-height {
+    height: 50px;
+    max-height: 50px;
+}
+.md-height {
+    height: 75px;
+    max-height: 75px;
+}
+.sm-width {
+    width: 60px;
+    max-width: 60px;
+}
+.md-width {
+    width: 125px;
+    max-width: 125px;
+}
+.lg-width {
+    width: 380px;
+    max-width: 380px;
+}
+.overflow-multiline {
+    max-height: inherit;
+    display: -webkit-box;
+    overflow: hidden;
+    word-wrap: break-word;
+    line-clamp: 2;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+.overflow-line {
+    width: inherit;
+    max-width: inherit;
+    overflow: hidden;
+    white-space: nowrap;
+}

print/templates/reports/item-label-barcode/item-label-barcode.html

@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<body table v-for="item in items" style="break-before: page">
+	<table>
+			<tr>
+				<td class="md-txt bold center black-bg lg-width md-height">
+					<div class="overflow-multiline">
+						{{item.item}}
+					</div>
+				</td>
+				<td colspan="2" class="xl-txt bold center black-bg md-height md-width">
+					<div class="overflow-line">
+						{{item.size}}
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td class="right lg-width">
+					<div class="overflow-line">
+						{{
+							(item.longName && item.size && item.subName)
+							? `${item.longName} ${item.size} ${item.subName}`
+							: item.comment
+						}}
+					</div>
+				</td>
+				<td class="center sm-width">
+					<div class="overflow-line">
+						{{item.producerName || item.producerFk}}
+					</div>
+				</td>
+				<td class="center sm-width">
+					<div class="overflow-line">
+						{{item.inkFk}}
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td class="md-txt xl-width bold center">
+					<div class="overflow-line">
+						{{item.itemFk}}
+					</div>
+				</td>
+				<td colspan="2" class="md-txt md-width center">
+					<div class="overflow-line">
+						{{`${(packing || item.packing)} x ${item.stems || ''}`}}
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td rowspan="2" class="center">
+					<div v-html="getBarcode(item.buyFk)"></div>
+				</td>
+				<td colspan="2" class="center md-width xs-height xs-txt">
+					<div class="overflow-line">
+						{{item.entryFk}}
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td class="center xs-txt sm-width">
+					<div class="overflow-line">
+						{{item.buyerName}}
+					</div>
+				</td>
+				<td class="center xs-txt sm-width">
+					<div class="overflow-line">
+						{{item.origin}}
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td class="center xl-width">
+					<div class="overflow-line">
+						{{item.buyFk}}
+					</div>
+				</td>
+				<td class="xs-txt sm-width center">
+					<div class="overflow-line">
+						{{date}}
+					</div>
+				</td>
+				<td class="xs-txt sm-width cursive center bold">
+					<div class="overflow-line">
+						{{`${item.labelNum}/${item.quantity / (packing || item.packing)}`}}
+					</div>
+				</td>
+			</tr>
+	</table>
+</body>
+</html> 

print/templates/reports/item-label-barcode/item-label-barcode.js

@@ -0,0 +1,58 @@
+const UserError = require('vn-loopback/util/user-error');
+const {DOMImplementation, XMLSerializer} = require('xmldom');
+const moment = require('moment');
+const jsbarcode = require('jsbarcode');
+
+module.exports = {
+    name: 'item-label-barcode',
+    async serverPrefetch() {
+        this.company = await this.findOneFromDef('company', [this.warehouseId]);
+        if (!this.company)
+            throw new UserError(`There is no company associated with that warehouse`);
+
+        this.date = Date.vnNew();
+        this.lastBuy = await this.findOneFromDef('lastBuy', [
+            this.id,
+            this.warehouseId,
+            this.date
+        ]);
+        this.items = await this.rawSqlFromDef('item', [this.copies || 1, this.lastBuy.id]);
+        if (!this.items.length) throw new UserError(`Empty data source`);
+        this.date = moment(this.date).format('WW/E');
+    },
+    methods: {
+        getBarcode(data) {
+            const document = new DOMImplementation().createDocument('http://www.w3.org/1999/xhtml', 'html', null);
+            const svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+
+            jsbarcode(svgNode, data, {
+                xmlDocument: document,
+                format: 'code128',
+                displayValue: false,
+                width: 3.8,
+                height: 85,
+                margin: 0
+            });
+            return new XMLSerializer().serializeToString(svgNode);
+        }
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true,
+            description: 'The item id'
+        },
+        warehouseId: {
+            type: Number
+        },
+        packing: {
+            type: Number
+        },
+        copies: {
+            type: Number
+        },
+        userId: {
+            type: Number
+        }
+    }
+};

print/templates/reports/item-label-barcode/locale/es.yml

@@ -0,0 +1 @@
+reportName: Etiqueta de artículo barcode

print/templates/reports/item-label-barcode/options.json

@@ -0,0 +1,11 @@
+{
+    "width": "10.4cm",
+    "height": "4.9cm",
+    "margin": {
+        "top": "0.17cm",
+        "right": "0.745cm",
+        "bottom": "0cm",
+        "left": "0cm"
+    },
+    "printBackground": true
+}

print/templates/reports/item-label-barcode/sql/company.sql

@@ -0,0 +1,5 @@
+SELECT co.code
+	FROM warehouse w
+		JOIN address a ON a.id = w.addressFk
+		JOIN company co ON co.clientFk = a.clientFk
+	WHERE w.id = ?

print/templates/reports/item-label-barcode/sql/item.sql

@@ -0,0 +1,34 @@
+WITH RECURSIVE numbers AS (
+	SELECT 1 n
+	UNION ALL
+	SELECT n + 1
+		FROM numbers
+		WHERE n < ?
+)
+SELECT ROW_NUMBER() OVER() labelNum,
+		b.itemFk,
+		i.name item,
+		b.id buyFk,
+		b.quantity,
+		b.packing,
+		b.entryFk,
+		o.code origin,
+		p.`name` producerName,
+		p.id producerFk,
+		i.`size`,
+		i.category,
+		i.stems,
+		i.inkFk,
+		ig.longName,
+		ig.subName,
+		i.comment,
+		w.code buyerName
+	FROM vn.buy b
+		JOIN vn.item i ON i.id = b.itemFk
+		LEFT JOIN vn.item ig ON ig.id = b.itemOriginalFk
+		JOIN vn.origin o ON o.id = i.originFk
+		LEFT JOIN vn.producer p ON p.id = i.producerFk
+		JOIN vn.itemType it ON it.id = i.typeFk
+		JOIN vn.worker w ON w.id = it.workerFk
+		JOIN numbers num
+	WHERE b.id = ?

print/templates/reports/item-label-barcode/sql/lastBuy.sql

@@ -0,0 +1 @@
+SELECT buy_getUltimate(?, ?, ?) id

print/templates/reports/item-label-qr/assets/css/import.js

@@ -0,0 +1,12 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
+    `${__dirname}/style.css`])
+    .mergeStyles();