From 31a6db5da0cc02f9062e17bb2a07f59632e1abbb Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Thu, 12 Dec 2024 20:30:38 +0100
Subject: [PATCH 01/57] feat: refs #7569 refs#7569 sendMail

---
 loopback/locale/en.json                       |  8 +--
 loopback/locale/es.json                       | 13 ++---
 loopback/locale/fr.json                       | 12 +++--
 loopback/locale/pt.json                       |  6 ++-
 .../ticket/back/methods/ticket/saveSign.js    | 52 ++++++++++++++++++-
 .../methods/ticket/specs/saveSign.spec.js     | 42 +++++++++++++++
 6 files changed, 116 insertions(+), 17 deletions(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 7372ac9a6..f5c27726b 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -246,6 +246,8 @@
 	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
 	"The raid information is not correct": "The raid information is not correct",
 	"Payment method is required": "Payment method is required",
-    "Sales already moved": "Sales already moved",
-    "Holidays to past days not available": "Holidays to past days not available"
-}
+	"Sales already moved": "Sales already moved",
+	"Holidays to past days not available": "Holidays to past days not available",
+	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
+	"Ticket has been delivered out of order": "The ticket {{ ticket }} ({{ fullUrl }}) has been delivered out of order. Tickets that have not been delivered in their route are: {{ ticketsToMail }}"
+}
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 0dc8e53a8..2a93407fc 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -388,10 +388,11 @@
 	"You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada",
 	"ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
 	"The web user's email already exists": "El correo del usuario web ya existe",
-    "Sales already moved": "Ya han sido transferidas",
-    "The raid information is not correct": "La información de la redada no es correcta",
-    "There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
+	"Sales already moved": "Ya han sido transferidas",
+	"The raid information is not correct": "La información de la redada no es correcta",
+	"There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
 	"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
-    "Holidays to past days not available": "Las vacaciones a días pasados no están disponibles"
-}
-
+	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
+	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
+	"Ticket has been delivered out of order": "El ticket {{ ticket }} ({{ fullUrl }}) no ha sigo entregado en su orden. Los tickets de la ruta que no han sido entregados en su orden son: {{ ticketsToMail }}"
+}
\ No newline at end of file
diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json
index 9941358be..719cbf99c 100644
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@@ -362,9 +362,11 @@
 	"The invoices have been created but the PDFs could not be generated": "La facture a été émise mais le PDF n'a pas pu être généré",
 	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré",
 	"Cannot send mail": "Impossible d'envoyer le mail",
-    "Original invoice not found": "Facture originale introuvable",
-    "The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne",
-    "You do not have permission to modify the booked field": "Vous n'avez pas la permission de modifier le champ comptabilisé",
+	"Original invoice not found": "Facture originale introuvable",
+	"The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne",
+	"You do not have permission to modify the booked field": "Vous n'avez pas la permission de modifier le champ comptabilisé",
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
-	"The web user's email already exists": "L'email de l'internaute existe déjà"
-}
+	"The web user's email already exists": "L'email de l'internaute existe déjà",
+	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} ({{fullUrl}}) a été livré hors ordre. Les tickets qui n'ont pas été livrés dans leur itinéraire sont : {{ticketsToMail}}"
+}
\ No newline at end of file
diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json
index e84b30f3d..5dfad3725 100644
--- a/loopback/locale/pt.json
+++ b/loopback/locale/pt.json
@@ -365,5 +365,7 @@
 	"Cannot send mail": "Não é possível enviar o email",
 	"The quantity claimed cannot be greater than the quantity of the line": "O valor reclamado não pode ser superior ao valor da linha",
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
-	"The web user's email already exists": "O e-mail do utilizador da web já existe."
-}
+	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
+	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
+	"Ticket has been delivered out of order": "O ticket {{ ticket }} ({{ fullUrl }}) foi entregue fora de ordem. Os tickets que não foram entregues na sua rota são: {{ ticketsToMail }}"
+}
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index ac2a7bc66..eeb753614 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -28,7 +28,6 @@ module.exports = Self => {
             verb: 'POST'
         }
     });
-
     Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
@@ -111,6 +110,12 @@ module.exports = Self => {
                         scope: {
                             fields: ['id']
                         }
+                    },
+                    {
+                        relation: 'zone',
+                        scope: {
+                            fields: ['id', 'zoneFk,', 'name']
+                        }
                     }]
                 }, myOptions);
 
@@ -151,6 +156,29 @@ module.exports = Self => {
 
                 await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, stateCode], myOptions);
 
+                if (stateCode == 'DELIVERED' && ticket.priority) {
+                    const orderState = await models.State.findOne({
+                        where: {code: 'DELIVERED'},
+                        fields: ['id']
+                    }, myOptions);
+
+                    const ticketsToMail = await Self.rawSql(`
+                        SELECT t.id
+                        FROM ticket t
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state s ON s.code = ts.code
+                        WHERE t.routeFk = ?  
+                            AND s.\`order\` < ? 
+                            AND priority <(SELECT t.priority 
+                                            FROM ticket t
+                                            WHERE t.id = ?)`
+                    , [ticket.routeFk, orderState.id, ticket.id], myOptions);
+                    const ticketIds = ticketsToMail.map(row => row.id);
+
+                    if (ticketsToMail)
+                        await sendMail(ctx, ticket.routeFk, ticket.id, ticket.zone().name, ticketIds);
+                }
+
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.$cmrFk) {
                     await models.Ticket.saveCmr(ctx, [ticketId], myOptions);
                     externalTickets.push(ticketId);
@@ -163,4 +191,26 @@ module.exports = Self => {
         }
         await models.Ticket.sendCmrEmail(ctx, externalTickets);
     };
+
+    async function sendMail(ctx, route, ticket, zoneName, ticketsToMail) {
+        const $t = ctx.req.__;
+        const url = await Self.app.models.Url.getUrl();
+        const sendTo = 'repartos@verdnatura.es';
+        const fullUrl = `${url}route/${route}/summary`;
+        const emailSubject = $t('Incorrect delivery order alert on route', {
+            route: route,
+            zone: zoneName
+        });
+        const emailBody = $t('Ticket has been delivered out of order', {
+            ticket: ticket,
+            fullUrl: fullUrl,
+            ticketsToMail: ticketsToMail,
+        }, {escape: false});
+
+        await Self.app.models.Mail.create({
+            receiver: sendTo,
+            subject: emailSubject,
+            body: emailBody
+        });
+    }
 };
diff --git a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
index e93408973..559c413e5 100644
--- a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
@@ -51,4 +51,46 @@ describe('Ticket saveSign()', () => {
 
         expect(ticketTrackingAfter.name).toBe('Entregado en parte');
     });
+
+    fit('should send an email to notify that the delivery order is not correct', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+        const ticketFk = 8;
+        const priority = 5;
+        const stateFk = 10;
+        const stateTicketFk = 2;
+        const expeditionFk = 11;
+        const expeditionStateFK = 2;
+
+        let mailCountBefore;
+        let mailCountAfter;
+        spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]);
+
+        const options = {transaction: tx};
+        const tickets = [ticketFk];
+
+        const expedition = await models.Expedition.findById(expeditionFk, null, options);
+        expedition.updateAttribute('stateTypeFk', expeditionStateFK, options);
+
+        const ticket = await models.Ticket.findById(ticketFk, null, options);
+        ticket.updateAttribute('priority', priority, options);
+
+        const filter = {where: {
+            ticketFk: ticketFk,
+            stateFk: stateTicketFk}
+        };
+        try {
+            const ticketTracking = await models.TicketTracking.findOne(filter, options);
+            ticketTracking.updateAttribute('stateFk', stateFk, options);
+            mailCountBefore = await models.Mail.count(options);
+            await models.Ticket.saveSign(ctx, tickets, null, null, options);
+            mailCountAfter = await models.Mail.count(options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+
+        expect(mailCountAfter).toBeGreaterThan(mailCountBefore);
+    });
 });

From 2c672951c6428f27958ee850f11093db08748c5e Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Thu, 12 Dec 2024 20:33:00 +0100
Subject: [PATCH 02/57] fix: refs #7569 refs#8188 add IfNotExists

---
 modules/ticket/back/methods/ticket/saveSign.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index eeb753614..6dc90e330 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -205,7 +205,7 @@ module.exports = Self => {
             ticket: ticket,
             fullUrl: fullUrl,
             ticketsToMail: ticketsToMail,
-        }, {escape: false});
+        });
 
         await Self.app.models.Mail.create({
             receiver: sendTo,

From 1d7e69cb25f809ca2d26c1fa2e90facff815cbc4 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 16 Dec 2024 07:40:49 +0100
Subject: [PATCH 03/57] feat: refs #7584 workerTimeControl_afterDelete

---
 .../vn/triggers/workerTimeControl_afterDelete.sql    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
index 27432fccb..762754591 100644
--- a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
+++ b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
@@ -3,10 +3,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerTimeControl_after
 	AFTER DELETE ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
-	INSERT INTO workerLog
-		SET `action` = 'delete',
-			`changedModel` = 'WorkerTimeControl',
-			`changedModelId` = OLD.id,
-			`userFk` = account.myUser_getId();
+	IF account.myUser_getId() THEN
+		INSERT INTO workerLog
+			SET `action` = 'delete',
+				`changedModel` = 'WorkerTimeControl',
+				`changedModelId` = OLD.id,
+				`userFk` = account.myUser_getId();
+	END IF;
 END$$
 DELIMITER ;

From 48d2d1d3271eb6d92ef8cda0979e38daed999e30 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 26 Dec 2024 10:41:20 +0100
Subject: [PATCH 04/57] feat: refs #8117 add worker first and last name to item
 type query

---
 modules/ticket/back/methods/ticket-request/getItemTypeWorker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
index f160cfaac..2f2a85abb 100644
--- a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
+++ b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
@@ -30,7 +30,7 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const query =
-            `SELECT DISTINCT u.id, u.nickname
+            `SELECT DISTINCT u.id, u.nickname, w.firstName, w.lastName
                 FROM itemType it
                     JOIN worker w ON w.id = it.workerFk
                     JOIN account.user u ON u.id = w.id`;

From 73d5d508cef2567ccbcfbf7796e45ad77fcd6c8d Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 7 Jan 2025 10:45:51 +0100
Subject: [PATCH 05/57] test: refs #8361 enhance exchangeRateUpdate specs with
 additional scenarios

---
 .../methods/invoice-in/exchangeRateUpdate.js  | 134 +++++++++++-----
 .../specs/exchangeRateUpdate.spec.js          | 148 ++++++++++++++----
 2 files changed, 217 insertions(+), 65 deletions(-)

diff --git a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
index 989b1d4a2..b5a081fc6 100644
--- a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
+++ b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
@@ -13,66 +13,126 @@ module.exports = Self => {
         }
     });
 
-    Self.exchangeRateUpdate = async() => {
-        const response = await axios.get('http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml');
-        const xmlData = response.data;
-
-        const doc = new DOMParser({errorHandler: {warning: () => {}}})?.parseFromString(xmlData, 'text/xml');
-        const cubes = doc?.getElementsByTagName('Cube');
-        if (!cubes || cubes.length === 0)
-            throw new UserError('No cubes found. Exiting the method.');
-
+    Self.exchangeRateUpdate = async(options = {}) => {
         const models = Self.app.models;
+        const myOptions = {};
+        Object.assign(myOptions, options);
 
-        const maxDateRecord = await models.ReferenceRate.findOne({order: 'dated DESC'});
+        let createdTx = false;
+        if (!myOptions.transaction) {
+            myOptions.transaction = await Self.beginTransaction({});
+            createdTx = true;
+        }
 
-        const maxDate = maxDateRecord?.dated ? new Date(maxDateRecord.dated) : null;
+        try {
+            const response = await axios.get('http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml');
+            const xmlData = response.data;
 
-        for (const cube of Array.from(cubes)) {
-            if (cube.nodeType === doc.ELEMENT_NODE && cube.attributes.getNamedItem('time')) {
-                const xmlDate = new Date(cube.getAttribute('time'));
-                const xmlDateWithoutTime = new Date(xmlDate.getFullYear(), xmlDate.getMonth(), xmlDate.getDate());
-                if (!maxDate || maxDate < xmlDateWithoutTime) {
+            const doc = new DOMParser({errorHandler: {warning: () => {}}})
+                .parseFromString(xmlData, 'text/xml');
+            const cubes = doc?.getElementsByTagName('Cube');
+            if (!cubes || cubes.length === 0)
+                throw new UserError('No cubes found. Exiting the method.');
+
+            const maxDateRecord = await models.ReferenceRate.findOne({order: 'dated DESC'}, myOptions);
+            const maxDate = maxDateRecord?.dated ? new Date(maxDateRecord.dated) : null;
+            let lastProcessedDate = maxDate;
+
+            for (const cube of Array.from(cubes)) {
+                if (cube.nodeType === doc.ELEMENT_NODE && cube.attributes.getNamedItem('time')) {
+                    const xmlDate = new Date(cube.getAttribute('time'));
+                    const xmlDateWithoutTime = new Date(
+                        xmlDate.getFullYear(),
+                        xmlDate.getMonth(),
+                        xmlDate.getDate()
+                    );
+
+                    if (!maxDate || xmlDateWithoutTime > maxDate) {
+                        if (lastProcessedDate && xmlDateWithoutTime > lastProcessedDate) {
+                            for (const code of ['USD', 'CNY', 'GBP']) {
+                                const currency = await models.Currency.findOne(
+                                    {where: {code}},
+                                    myOptions
+                                );
+                                if (!currency)
+                                    throw new UserError(`Currency not found for code: ${code}`);
+
+                                await fillMissingDates(
+                                    models, currency, lastProcessedDate, xmlDateWithoutTime, myOptions
+                                );
+                            }
+                        }
+                    }
                     for (const rateCube of Array.from(cube.childNodes)) {
                         if (rateCube.nodeType === doc.ELEMENT_NODE) {
                             const currencyCode = rateCube.getAttribute('currency');
                             const rate = rateCube.getAttribute('rate');
                             if (['USD', 'CNY', 'GBP'].includes(currencyCode)) {
-                                const currency = await models.Currency.findOne({where: {code: currencyCode}});
-                                if (!currency) throw new UserError(`Currency not found for code: ${currencyCode}`);
+                                const currency = await models.Currency.findOne(
+                                    {where: {code: currencyCode}},
+                                    myOptions
+                                );
+                                if (!currency)
+                                    throw new UserError(`Currency not found for code: ${currencyCode}`);
+
                                 const existingRate = await models.ReferenceRate.findOne({
-                                    where: {currencyFk: currency.id, dated: xmlDate}
-                                });
+                                    where: {currencyFk: currency.id, dated: xmlDateWithoutTime}
+                                }, myOptions);
 
                                 if (existingRate) {
                                     if (existingRate.value !== rate)
-                                        await existingRate.updateAttributes({value: rate});
+                                        await existingRate.updateAttributes({value: rate}, myOptions);
                                 } else {
                                     await models.ReferenceRate.create({
                                         currencyFk: currency.id,
-                                        dated: xmlDate,
+                                        dated: xmlDateWithoutTime,
                                         value: rate
-                                    });
-                                }
-                                const monday = 1;
-                                if (xmlDateWithoutTime.getDay() === monday) {
-                                    const saturday = new Date(xmlDateWithoutTime);
-                                    saturday.setDate(xmlDateWithoutTime.getDate() - 2);
-                                    const sunday = new Date(xmlDateWithoutTime);
-                                    sunday.setDate(xmlDateWithoutTime.getDate() - 1);
-
-                                    for (const date of [saturday, sunday]) {
-                                        await models.ReferenceRate.upsertWithWhere(
-                                            {currencyFk: currency.id, dated: date},
-                                            {currencyFk: currency.id, dated: date, value: rate}
-                                        );
-                                    }
+                                    }, myOptions);
                                 }
                             }
                         }
                     }
+
+                    lastProcessedDate = xmlDateWithoutTime;
                 }
             }
+
+            if (createdTx)
+                await myOptions.transaction.commit();
+        } catch (error) {
+            if (createdTx)
+                await myOptions.transaction.rollback();
+
+            throw error;
         }
     };
+
+    async function getLastValidRate(models, currencyId, date, myOptions) {
+        return models.ReferenceRate.findOne({
+            where: {currencyFk: currencyId, dated: {lt: date}},
+            order: 'dated DESC'
+        }, myOptions);
+    }
+
+    async function fillMissingDates(models, currency, startDate, endDate, myOptions) {
+        const cursor = new Date(startDate);
+        cursor.setDate(cursor.getDate() + 1);
+        while (cursor < endDate) {
+            const existingRate = await models.ReferenceRate.findOne({
+                where: {currencyFk: currency.id, dated: cursor}
+            }, myOptions);
+
+            if (!existingRate) {
+                const lastValid = await getLastValidRate(models, currency.id, cursor, myOptions);
+                if (lastValid) {
+                    await models.ReferenceRate.create({
+                        currencyFk: currency.id,
+                        dated: new Date(cursor),
+                        value: lastValid.value
+                    }, myOptions);
+                }
+            }
+            cursor.setDate(cursor.getDate() + 1);
+        }
+    }
 };
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
index 0fd7ea165..70e7dbad7 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
@@ -1,52 +1,144 @@
 describe('exchangeRateUpdate functionality', function() {
     const axios = require('axios');
     const models = require('vn-loopback/server/server').models;
+    let tx; let options;
 
-    beforeEach(function() {
-        spyOn(axios, 'get').and.returnValue(Promise.resolve({
-            data: `<Cube>
-                    <Cube time='2024-04-12'>
-                        <Cube currency='USD' rate='1.1'/>
-                        <Cube currency='CNY' rate='1.2'/>
-                    </Cube>
-                </Cube>`
-        }));
+    function formatYmd(d) {
+        const mm = (d.getMonth() + 1).toString().padStart(2, '0');
+        const dd = d.getDate().toString().padStart(2, '0');
+        return `${d.getFullYear()}-${mm}-${dd}`;
+    }
+
+    afterEach(async() => {
+        await tx.rollback();
     });
 
-    it('should process XML data and update or create rates in the database', async function() {
+    beforeEach(async() => {
+        tx = await models.Sale.beginTransaction({});
+        options = {transaction: tx};
+        spyOn(axios, 'get').and.returnValue(Promise.resolve({data: ''}));
+    });
+
+    it('should process XML data and create rates', async function() {
+        const d1 = Date.vnNew();
+        const d4 = Date.vnNew();
+        d4.setDate(d4.getDate() + 1);
+        const xml = `<Cube>
+        <Cube time='${formatYmd(d1)}'>
+          <Cube currency='USD' rate='1.1'/>
+          <Cube currency='CNY' rate='1.2'/>
+        </Cube>
+        <Cube time='${formatYmd(d4)}'>
+          <Cube currency='USD' rate='1.3'/>
+        </Cube>
+      </Cube>`;
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
         spyOn(models.ReferenceRate, 'findOne').and.returnValue(Promise.resolve(null));
         spyOn(models.ReferenceRate, 'create').and.returnValue(Promise.resolve());
+        await models.InvoiceIn.exchangeRateUpdate(options);
 
-        await models.InvoiceIn.exchangeRateUpdate();
-
-        expect(models.ReferenceRate.create).toHaveBeenCalledTimes(2);
+        expect(models.ReferenceRate.create).toHaveBeenCalledTimes(3);
     });
 
-    it('should not create or update rates when no XML data is available', async function() {
+    it('should handle no data', async function() {
         axios.get.and.returnValue(Promise.resolve({}));
         spyOn(models.ReferenceRate, 'create');
-
-        let thrownError = null;
+        let e;
         try {
-            await models.InvoiceIn.exchangeRateUpdate();
-        } catch (error) {
-            thrownError = error;
+            await models.InvoiceIn.exchangeRateUpdate(options);
+        } catch (err) {
+            e = err;
         }
 
-        expect(thrownError.message).toBe('No cubes found. Exiting the method.');
+        expect(e.message).toBe('No cubes found. Exiting the method.');
+        expect(models.ReferenceRate.create).not.toHaveBeenCalled();
     });
 
-    it('should handle errors gracefully', async function() {
+    it('should handle errors', async function() {
         axios.get.and.returnValue(Promise.reject(new Error('Network error')));
-        let error;
-
+        let e;
         try {
-            await models.InvoiceIn.exchangeRateUpdate();
-        } catch (e) {
-            error = e;
+            await models.InvoiceIn.exchangeRateUpdate(options);
+        } catch (err) {
+            e = err;
         }
 
-        expect(error).toBeDefined();
-        expect(error.message).toBe('Network error');
+        expect(e).toBeDefined();
+        expect(e.message).toBe('Network error');
+    });
+
+    it('should update existing rate', async function() {
+        const existingRate = await models.ReferenceRate.findOne({
+            order: 'id DESC'
+        }, options);
+
+        if (!existingRate) return fail('No ReferenceRate records in DB');
+
+        const currency = await models.Currency.findById(existingRate.currencyFk, null, options);
+
+        const xml = `<Cube>
+          <Cube time='${formatYmd(existingRate.dated)}'>
+            <Cube currency='${currency.code}' rate='2.22'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        await models.InvoiceIn.exchangeRateUpdate(options);
+
+        const updatedRate = await models.ReferenceRate.findById(existingRate.id, null, options);
+
+        expect(updatedRate.value).toBeCloseTo('2.22');
+    });
+
+    it('should not update if same rate', async function() {
+        const existingRate = await models.ReferenceRate.findOne({order: 'id DESC'}, options);
+        if (!existingRate) return fail('No existing ReferenceRate in DB');
+
+        const currency = await models.Currency.findById(existingRate.currencyFk, null, options);
+
+        const oldValue = existingRate.value;
+        const xml = `<Cube>
+          <Cube time='${formatYmd(existingRate.dated)}'>
+            <Cube currency='${currency.code}' rate='${oldValue}'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        await models.InvoiceIn.exchangeRateUpdate(options);
+
+        const updatedRate = await models.ReferenceRate.findById(existingRate.id, null, options);
+
+        expect(updatedRate.value).toBe(oldValue);
+    });
+
+    it('should backfill missing dates', async function() {
+        const lastRate = await models.ReferenceRate.findOne({order: 'dated DESC'}, options);
+        if (!lastRate) return fail('No existing ReferenceRate data in DB');
+
+        const currency = await models.Currency.findById(lastRate.currencyFk, null, options);
+
+        const d1 = new Date(lastRate.dated);
+        d1.setDate(d1.getDate() + 1);
+        const d4 = new Date(lastRate.dated);
+        d4.setDate(d4.getDate() + 4);
+
+        const xml = `<Cube>
+          <Cube time='${formatYmd(d1)}'>
+            <Cube currency='${currency.code}' rate='1.0'/>
+          </Cube>
+          <Cube time='${formatYmd(d4)}'>
+            <Cube currency='${currency.code}' rate='2.0'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        const beforeCount = await models.ReferenceRate.count({}, options);
+        await models.InvoiceIn.exchangeRateUpdate(options);
+        const afterCount = await models.ReferenceRate.count({}, options);
+
+        expect(afterCount - beforeCount).toBe(4);
     });
 });

From 786f1fe661a40204831fb8942a7f1734d9e86322 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 7 Jan 2025 11:06:09 +0100
Subject: [PATCH 06/57] test: refs #8361 enhance exchangeRateUpdate specs to
 validate day1 and day2 entries without backfilling day3

---
 .../specs/exchangeRateUpdate.spec.js          | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
index 70e7dbad7..4b53f65c6 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
@@ -141,4 +141,50 @@ describe('exchangeRateUpdate functionality', function() {
 
         expect(afterCount - beforeCount).toBe(4);
     });
+
+    fit('should create entries for day1 and day2 from the feed, and not backfill day3', async function() {
+        const lastRate = await models.ReferenceRate.findOne({order: 'dated DESC'}, options);
+        if (!lastRate) return fail('No existing ReferenceRate data in DB');
+
+        const currency = await models.Currency.findById(lastRate.currencyFk, null, options);
+        if (!currency) return fail(`No currency for ID ${lastRate.currencyFk}`);
+
+        const day1 = new Date(lastRate.dated);
+        day1.setDate(day1.getDate() + 1);
+
+        const day2 = new Date(lastRate.dated);
+        day2.setDate(day2.getDate() + 2);
+
+        const day3 = new Date(lastRate.dated);
+        day3.setDate(day3.getDate() + 3);
+
+        const xml = `<Cube>
+          <Cube time='${formatYmd(day1)}'>
+            <Cube currency='${currency.code}' rate='1.1'/>
+          </Cube>
+          <Cube time='${formatYmd(day2)}'>
+            <Cube currency='${currency.code}' rate='2.2'/>
+          </Cube>
+        </Cube>`;
+
+        axios.get.and.returnValue(Promise.resolve({data: xml}));
+
+        await models.InvoiceIn.exchangeRateUpdate(options);
+
+        const day3Record = await models.ReferenceRate.findOne({
+            where: {currencyFk: currency.id, dated: day3}
+        }, options);
+
+        expect(day3Record).toBeNull();
+
+        const day1Record = await models.ReferenceRate.findOne({
+            where: {currencyFk: currency.id, dated: day1}
+        }, options);
+        const day2Record = await models.ReferenceRate.findOne({
+            where: {currencyFk: currency.id, dated: day2}
+        }, options);
+
+        expect(day1Record.value).toBeCloseTo('1.1');
+        expect(day2Record.value).toBeCloseTo('2.2');
+    });
 });

From dbd8d816c06a6a0dc066b14baea4333f712e9a81 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 7 Jan 2025 14:53:26 +0100
Subject: [PATCH 07/57] fix: refs #8361 streamline transaction handling in
 exchangeRateUpdate

---
 .../methods/invoice-in/exchangeRateUpdate.js    | 17 ++++++++---------
 .../invoice-in/specs/exchangeRateUpdate.spec.js |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
index b5a081fc6..a6bad405f 100644
--- a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
+++ b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
@@ -16,12 +16,14 @@ module.exports = Self => {
     Self.exchangeRateUpdate = async(options = {}) => {
         const models = Self.app.models;
         const myOptions = {};
-        Object.assign(myOptions, options);
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
 
-        let createdTx = false;
         if (!myOptions.transaction) {
-            myOptions.transaction = await Self.beginTransaction({});
-            createdTx = true;
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
         }
 
         try {
@@ -97,12 +99,9 @@ module.exports = Self => {
                 }
             }
 
-            if (createdTx)
-                await myOptions.transaction.commit();
+            if (tx) await tx.commit();
         } catch (error) {
-            if (createdTx)
-                await myOptions.transaction.rollback();
-
+            if (tx) await tx.rollback();
             throw error;
         }
     };
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
index 4b53f65c6..c3dcca5ae 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
@@ -142,7 +142,7 @@ describe('exchangeRateUpdate functionality', function() {
         expect(afterCount - beforeCount).toBe(4);
     });
 
-    fit('should create entries for day1 and day2 from the feed, and not backfill day3', async function() {
+    it('should create entries for day1 and day2 from the feed, and not backfill day3', async function() {
         const lastRate = await models.ReferenceRate.findOne({order: 'dated DESC'}, options);
         if (!lastRate) return fail('No existing ReferenceRate data in DB');
 

From 1816b6de678ff5a9254483ae33ac0c855bb9e797 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 8 Jan 2025 10:24:18 +0100
Subject: [PATCH 08/57] feat: refs #8298 add priceOptimum and
 packagesDiscountFactor to zone and client tables

---
 .../client_setPackagesDiscountFactor.sql      |  8 ++++++
 .../procedures/catalog_componentCalculate.sql | 19 +++++++++++++-
 .../client_setPackagesDiscountFactor.sql      | 25 +++++++++++++++++++
 .../procedures/zone_getOptionsForShipment.sql |  3 ++-
 .../00-zoneEventPriceOptimum.sql              |  5 ++++
 .../11398-orangeRose/00-zonePriceOptimum.sql  |  5 ++++
 .../11398-orangeRose/01-zoneUpdate.sql        |  2 ++
 .../11398-orangeRose/02-clientAlter.sql       |  3 +++
 .../11398-orangeRose/03-clientConfig.sql      |  3 +++
 loopback/locale/en.json                       |  3 ++-
 modules/zone/back/models/zone-event.json      |  3 +++
 modules/zone/back/models/zone.json            |  3 +++
 12 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 db/routines/vn/events/client_setPackagesDiscountFactor.sql
 create mode 100644 db/routines/vn/procedures/client_setPackagesDiscountFactor.sql
 create mode 100644 db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql
 create mode 100644 db/versions/11398-orangeRose/00-zonePriceOptimum.sql
 create mode 100644 db/versions/11398-orangeRose/01-zoneUpdate.sql
 create mode 100644 db/versions/11398-orangeRose/02-clientAlter.sql
 create mode 100644 db/versions/11398-orangeRose/03-clientConfig.sql

diff --git a/db/routines/vn/events/client_setPackagesDiscountFactor.sql b/db/routines/vn/events/client_setPackagesDiscountFactor.sql
new file mode 100644
index 000000000..a0dc33cac
--- /dev/null
+++ b/db/routines/vn/events/client_setPackagesDiscountFactor.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`client_setPackagesDiscountFactor`
+	ON SCHEDULE EVERY 1 DAY
+		STARTS '2024-10-18 03:00:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL client_setPackagesDiscountFactor()$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/catalog_componentCalculate.sql b/db/routines/vn/procedures/catalog_componentCalculate.sql
index e29e13a8c..991ff412f 100644
--- a/db/routines/vn/procedures/catalog_componentCalculate.sql
+++ b/db/routines/vn/procedures/catalog_componentCalculate.sql
@@ -231,7 +231,23 @@ BEGIN
 		SELECT tcc.warehouseFK,
 				tcc.itemFk,
 				c2.id,
-				z.inflation * ROUND(ic.cm3delivery * (IFNULL(zo.price,5000) - IFNULL(zo.bonus,0)) / (1000 * vc.standardFlowerBox) , 4) cost
+				z.inflation
+				* ROUND(
+					ic.cm3delivery
+					* (
+						(
+							zo.price
+							- (
+								(zo.price - zo.priceOptimum)
+								* c.packagesDiscountFactor
+							)
+						)
+						- IFNULL(zo.bonus, 0)
+					)
+					/ (1000 * vc.standardFlowerBox),
+					4
+				) cost
+
 		FROM tmp.ticketComponentCalculate tcc
 			JOIN item i ON i.id = tcc.itemFk
 			JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
@@ -239,6 +255,7 @@ BEGIN
 			JOIN agencyMode am ON am.id = z.agencyModeFk
 			JOIN vn.volumeConfig vc
 			JOIN vn.component c2 ON c2.code = 'delivery'
+			JOIN `client` c on c.id = vClientFk
 			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk
 				AND ic.itemFk = tcc.itemFk
 			HAVING cost <> 0;
diff --git a/db/routines/vn/procedures/client_setPackagesDiscountFactor.sql b/db/routines/vn/procedures/client_setPackagesDiscountFactor.sql
new file mode 100644
index 000000000..f6068ca37
--- /dev/null
+++ b/db/routines/vn/procedures/client_setPackagesDiscountFactor.sql
@@ -0,0 +1,25 @@
+DELIMITER $$
+
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
+PROCEDURE `vn`.`client_setPackagesDiscountFactor`()
+BEGIN
+	/**
+	 * Set the discount factor for the packages of the clients.
+	 */
+	UPDATE client c
+		JOIN (
+			SELECT t.clientFk,
+					LEAST((
+						SUM(t.packages) / COUNT(DISTINCT DATE(t.shipped))
+					) / cc.packagesOptimum, 1) discountFactor
+				FROM ticket t
+					JOIN clientConfig cc ON TRUE
+				WHERE t.shipped > util.VN_CURDATE() - INTERVAL cc.monthsToCalcOptimumPrice MONTH
+					AND t.packages
+				GROUP BY t.clientFk
+		) ca ON c.id = ca.clientFk
+	SET c.packagesDiscountFactor = ca.discountFactor;
+
+END$$
+
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getOptionsForShipment.sql b/db/routines/vn/procedures/zone_getOptionsForShipment.sql
index fa48b0b0f..17d1b3d11 100644
--- a/db/routines/vn/procedures/zone_getOptionsForShipment.sql
+++ b/db/routines/vn/procedures/zone_getOptionsForShipment.sql
@@ -9,7 +9,7 @@ BEGIN
  * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
  */
 	DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
-		
+
 	DROP TEMPORARY TABLE IF EXISTS tLandings;
 	CREATE TEMPORARY TABLE tLandings
 		(INDEX (eventFk))
@@ -30,6 +30,7 @@ BEGIN
 						TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
 						l.travelingDays,
 						IFNULL(e.price, z.price) price,
+						IFNULL(e.priceOptimum, z.priceOptimum) priceOptimum,
 						IFNULL(e.bonus, z.bonus) bonus,
 						l.landed,
 						vShipped shipped
diff --git a/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql b/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql
new file mode 100644
index 000000000..8f08eb3e7
--- /dev/null
+++ b/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`zoneEvent`
+  ADD COLUMN `priceOptimum` DECIMAL(10,2) NOT NULL COMMENT 'Precio mínimo que puede pagar un bulto'
+    AFTER `price`,
+  ADD CONSTRAINT `ck_zoneEvent_priceOptimum`
+    CHECK (priceOptimum <= price)
diff --git a/db/versions/11398-orangeRose/00-zonePriceOptimum.sql b/db/versions/11398-orangeRose/00-zonePriceOptimum.sql
new file mode 100644
index 000000000..82b2001cd
--- /dev/null
+++ b/db/versions/11398-orangeRose/00-zonePriceOptimum.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`zone`
+  ADD COLUMN `priceOptimum` DECIMAL(10,2) NOT NULL COMMENT 'Precio mínimo que puede pagar un bulto'
+    AFTER `price`,
+  ADD CONSTRAINT `ck_zone_priceOptimum`
+    CHECK (priceOptimum <= price)
diff --git a/db/versions/11398-orangeRose/01-zoneUpdate.sql b/db/versions/11398-orangeRose/01-zoneUpdate.sql
new file mode 100644
index 000000000..042f2a92b
--- /dev/null
+++ b/db/versions/11398-orangeRose/01-zoneUpdate.sql
@@ -0,0 +1,2 @@
+UPDATE `vn`.`zone`
+	SET `priceOptimum` = `price`;
diff --git a/db/versions/11398-orangeRose/02-clientAlter.sql b/db/versions/11398-orangeRose/02-clientAlter.sql
new file mode 100644
index 000000000..4119f05ff
--- /dev/null
+++ b/db/versions/11398-orangeRose/02-clientAlter.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`client`
+  ADD COLUMN `packagesDiscountFactor` DECIMAL(4,3) NOT NULL DEFAULT 1.000
+    COMMENT 'Factor (1-0) que pondera el precio final entre priceOptimum (mejor) y price (peor)';
diff --git a/db/versions/11398-orangeRose/03-clientConfig.sql b/db/versions/11398-orangeRose/03-clientConfig.sql
new file mode 100644
index 000000000..2869f26a2
--- /dev/null
+++ b/db/versions/11398-orangeRose/03-clientConfig.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`clientConfig`
+  ADD COLUMN `packagesOptimum` INT UNSIGNED NOT NULL DEFAULT 20 COMMENT 'Numero de bultos por cliente/dia para conseguir el precio optimo',
+  ADD COLUMN `monthsToCalcOptimumPrice` TINYINT UNSIGNED NOT NULL DEFAULT 3 COMMENT 'Número de meses a usar para el cálculo de client.packagesDiscountFactor';
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 80da13ae5..72346a364 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -250,5 +250,6 @@
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
-	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent"
+	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent",
+	"CONSTRAINT `ck_zoneEvent_priceOptimum` failed for `vn`.`zoneEvent`": "CONSTRAINT `ck_zoneEvent_priceOptimum` failed for `vn`.`zoneEvent`"
 }
\ No newline at end of file
diff --git a/modules/zone/back/models/zone-event.json b/modules/zone/back/models/zone-event.json
index 366bdec9d..cf5045a8c 100644
--- a/modules/zone/back/models/zone-event.json
+++ b/modules/zone/back/models/zone-event.json
@@ -42,6 +42,9 @@
 		"price": {
 			"type": "number"
 		},
+		"priceOptimum": {
+			"type": "number"
+		},
 		"bonus": {
 			"type": "number"
 		},
diff --git a/modules/zone/back/models/zone.json b/modules/zone/back/models/zone.json
index 141b28750..4f963568f 100644
--- a/modules/zone/back/models/zone.json
+++ b/modules/zone/back/models/zone.json
@@ -28,6 +28,9 @@
 		"price": {
 			"type": "number"
 		},
+		"priceOptimum": {
+			"type": "number"
+		},
 		"bonus": {
 			"type": "number"
 		},

From 0d822d03c929094e6f685a4fb05cee51ead9db79 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 8 Jan 2025 10:30:47 +0100
Subject: [PATCH 09/57] fix: refs #8298 remove duplicate entry in English
 locale file

---
 loopback/locale/en.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 72346a364..2e25408c6 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -250,6 +250,5 @@
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
-	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent",
-	"CONSTRAINT `ck_zoneEvent_priceOptimum` failed for `vn`.`zoneEvent`": "CONSTRAINT `ck_zoneEvent_priceOptimum` failed for `vn`.`zoneEvent`"
-}
\ No newline at end of file
+	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent"
+}

From be5631370649bc90bf6c4b059bc1082f403494e9 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 8 Jan 2025 11:58:50 +0100
Subject: [PATCH 10/57] feat: refs #8298 add priceOptimum column to zoneEvent
 and update zone fixture data

---
 db/dump/fixtures.before.sql                   | 32 +++++++++----------
 .../00-zoneEventPriceOptimum.sql              |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index ff896b84d..9e46e3c2e 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -694,22 +694,22 @@ INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`
         (6, 4, 8.07,    2000000000, util.VN_CURDATE()),
         (7, 5, 8.07,    2000000000, util.VN_CURDATE());
 
-INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`)
-    VALUES
-        (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
-        (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
-        (3,  'Zone 247 A',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
-        (4,  'Zone 247 B',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
-        (5,  'Zone expensive A',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100),
-        (6,  'Zone expensive B',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100),
-        (7,  'Zone refund',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 1,    0, 100),
-        (8,  'Zone others',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 1,    0, 100),
-        (9,  'Zone superMan',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2,  0, 1,    0, 100),
-        (10, 'Zone teleportation',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3,  0, 1,    0, 100),
-        (11, 'Zone pickup C',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100),
-        (12, 'Zone entanglement',   CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4,  0, 1,    0, 100),
-        (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 1,    0, 100);
-
+INSERT INTO `vn`.`zone`
+    (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`, `priceOptimum`)
+VALUES
+    (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100, 1),
+    (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100, 1),
+    (3,  'Zone 247 A',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100, 1),
+    (4,  'Zone 247 B',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100, 1),
+    (5,  'Zone expensive A',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100, 500),
+    (6,  'Zone expensive B',    CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8,  1, 1000, 0, 100, 500),
+    (7,  'Zone refund',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 1,    0, 100, 0.5),
+    (8,  'Zone others',         CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 1,    0, 100, 0.5),
+    (9,  'Zone superMan',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2,  0, 1,    0, 100, 0.5),
+    (10, 'Zone teleportation',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3,  0, 1,    0, 100, 0.5),
+    (11, 'Zone pickup C',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 1,    0, 100, 0.5),
+    (12, 'Zone entanglement',   CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4,  0, 1,    0, 100, 0.5),
+    (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 1,    0, 100, 0.5);
 
 INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`)
     VALUES
diff --git a/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql b/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql
index 8f08eb3e7..0440714e4 100644
--- a/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql
+++ b/db/versions/11398-orangeRose/00-zoneEventPriceOptimum.sql
@@ -1,5 +1,5 @@
 ALTER TABLE `vn`.`zoneEvent`
-  ADD COLUMN `priceOptimum` DECIMAL(10,2) NOT NULL COMMENT 'Precio mínimo que puede pagar un bulto'
+  ADD COLUMN `priceOptimum` DECIMAL(10,2) NULL COMMENT 'Precio mínimo que puede pagar un bulto'
     AFTER `price`,
   ADD CONSTRAINT `ck_zoneEvent_priceOptimum`
     CHECK (priceOptimum <= price)

From 446ffac7f848c3dc47f7667e001778c939baabde Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 9 Jan 2025 13:44:59 +0100
Subject: [PATCH 11/57] feat: sendCheckingPresence debug

---
 back/methods/chat/sendCheckingPresence.js | 69 +++++++++++++----------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/back/methods/chat/sendCheckingPresence.js b/back/methods/chat/sendCheckingPresence.js
index 7ab5d63fe..83e8da304 100644
--- a/back/methods/chat/sendCheckingPresence.js
+++ b/back/methods/chat/sendCheckingPresence.js
@@ -27,38 +27,47 @@ module.exports = Self => {
     });
 
     Self.sendCheckingPresence = async(ctx, recipientId, message) => {
-        if (!recipientId) return false;
-        const models = Self.app.models;
-
         const userId = ctx.req.accessToken.userId;
-        const sender = await models.VnUser.findById(userId, {fields: ['id']});
-        const recipient = await models.VnUser.findById(recipientId, null);
-
-        // Prevent sending messages to yourself
-        if (recipientId == userId) return false;
-        if (!recipient)
-            throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
-
-        if (!isProduction())
-            message = `[Test:Environment to user ${userId}] ` + message;
-
-        const chat = await models.Chat.create({
-            senderFk: sender.id,
-            recipient: `@${recipient.name}`,
-            dated: Date.vnNew(),
-            checkUserStatus: 1,
-            message: message,
-            status: 'sending',
-            attempts: 0
-        });
-
         try {
-            await Self.sendCheckingUserStatus(chat);
-            await Self.updateChat(chat, 'sent');
-        } catch (error) {
-            await Self.updateChat(chat, 'error', error);
-        }
+            const models = Self.app.models;
+            const sender = await models.VnUser.findById(userId, {fields: ['id']});
+            const error = `Could not send message from user ${userId}`;
 
-        return true;
+            if (!recipientId) throw new Error(error);
+            const recipient = await models.VnUser.findById(recipientId, null);
+            if (!recipient)
+                throw new Error(error);
+
+            // Prevent sending messages to yourself
+            if (recipientId == userId) return false;
+
+            if (!isProduction())
+                message = `[Test:Environment to user ${userId}] ` + message;
+
+            const chat = await models.Chat.create({
+                senderFk: sender.id,
+                recipient: `@${recipient.name}`,
+                dated: Date.vnNew(),
+                checkUserStatus: 1,
+                message: message,
+                status: 'sending',
+                attempts: 0
+            });
+
+            try {
+                await Self.sendCheckingUserStatus(chat);
+                await Self.updateChat(chat, 'sent');
+            } catch (error) {
+                await Self.updateChat(chat, 'error', error);
+            }
+
+            return true;
+        } catch (e) {
+            await Self.rawSql(`
+                INSERT INTO util.debug (variable, value)
+                    VALUES ('sendCheckingPresence_error', ?)
+            `, [`User: ${userId}, recipient: ${recipientId}, message: ${message}, error: ${e}`]);
+            throw e;
+        }
     };
 };

From 12fa87a93cbb53f7ce95b9cc257f522ff010fdbf Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Thu, 9 Jan 2025 16:15:29 +0100
Subject: [PATCH 12/57] =?UTF-8?q?fix:=20refs=20#7569=20refs=C2=B76861=20ti?=
 =?UTF-8?q?cketOrderReserve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 loopback/locale/en.json                        | 2 +-
 loopback/locale/es.json                        | 2 +-
 loopback/locale/fr.json                        | 2 +-
 modules/ticket/back/methods/ticket/saveSign.js | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index f5c27726b..0f53cf572 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -249,5 +249,5 @@
 	"Sales already moved": "Sales already moved",
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
-	"Ticket has been delivered out of order": "The ticket {{ ticket }} ({{ fullUrl }}) has been delivered out of order. Tickets that have not been delivered in their route are: {{ ticketsToMail }}"
+	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order. Tickets that have not been delivered in their route are: {{ ticketsToMail }}"
 }
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 2a93407fc..163fbaa71 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -394,5 +394,5 @@
 	"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "El ticket {{ ticket }} ({{ fullUrl }}) no ha sigo entregado en su orden. Los tickets de la ruta que no han sido entregados en su orden son: {{ ticketsToMail }}"
+	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden. Los tickets de la ruta que no han sido entregados en su orden son: {{ ticketsToMail }}"
 }
\ No newline at end of file
diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json
index 719cbf99c..082aedd2b 100644
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@@ -368,5 +368,5 @@
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
 	"The web user's email already exists": "L'email de l'internaute existe déjà",
 	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
-	"Ticket has been delivered out of order": "Le ticket {{ticket}} ({{fullUrl}}) a été livré hors ordre. Les tickets qui n'ont pas été livrés dans leur itinéraire sont : {{ticketsToMail}}"
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} {{{fullUrl}}} a été livré hors ordre. Les tickets qui n'ont pas été livrés dans leur itinéraire sont : {{ticketsToMail}}"
 }
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index 6dc90e330..443b2c1c7 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -198,13 +198,13 @@ module.exports = Self => {
         const sendTo = 'repartos@verdnatura.es';
         const fullUrl = `${url}route/${route}/summary`;
         const emailSubject = $t('Incorrect delivery order alert on route', {
-            route: route,
+            route,
             zone: zoneName
         });
         const emailBody = $t('Ticket has been delivered out of order', {
-            ticket: ticket,
-            fullUrl: fullUrl,
-            ticketsToMail: ticketsToMail,
+            ticket,
+            fullUrl,
+            ticketsToMail,
         });
 
         await Self.app.models.Mail.create({

From a1e1d4fa72fd906a65659fbfb3425fd683c25652 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Fri, 10 Jan 2025 07:20:24 +0100
Subject: [PATCH 13/57] =?UTF-8?q?fix:=20refs=20#7569=20refs=C2=B76861=20ti?=
 =?UTF-8?q?cketOrderReserve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 loopback/locale/pt.json                                   | 2 +-
 modules/ticket/back/methods/ticket/specs/saveSign.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json
index 5dfad3725..1fa16074f 100644
--- a/loopback/locale/pt.json
+++ b/loopback/locale/pt.json
@@ -367,5 +367,5 @@
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
 	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
 	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "O ticket {{ ticket }} ({{ fullUrl }}) foi entregue fora de ordem. Os tickets que não foram entregues na sua rota são: {{ ticketsToMail }}"
+	"Ticket has been delivered out of order": "O ticket {{ticket}} {{{fullUrl}}} foi entregue fora de ordem. Os tickets que não foram entregues na sua rota são: {{ ticketsToMail }}"
 }
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
index 559c413e5..ed802e311 100644
--- a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
@@ -52,7 +52,7 @@ describe('Ticket saveSign()', () => {
         expect(ticketTrackingAfter.name).toBe('Entregado en parte');
     });
 
-    fit('should send an email to notify that the delivery order is not correct', async() => {
+    it('should send an email to notify that the delivery order is not correct', async() => {
         const tx = await models.Ticket.beginTransaction({});
         const ticketFk = 8;
         const priority = 5;

From 1ac75d87ade3d238585c075813fc136601417f3c Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Fri, 10 Jan 2025 08:55:45 +0100
Subject: [PATCH 14/57] fix: refs #6861 refs#6861 addPrevOK

---
 db/routines/vn/procedures/saleTracking_addPrevOK.sql | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/db/routines/vn/procedures/saleTracking_addPrevOK.sql b/db/routines/vn/procedures/saleTracking_addPrevOK.sql
index 34d1cfac8..9f823e9a0 100644
--- a/db/routines/vn/procedures/saleTracking_addPrevOK.sql
+++ b/db/routines/vn/procedures/saleTracking_addPrevOK.sql
@@ -16,10 +16,11 @@ BEGIN
 				TRUE,
 				sc.userFk,
 				s.id
-			FROM vn.sectorCollection sc
-				JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
-				JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
-				JOIN vn.state s ON s.code = 'OK PREVIOUS'
+			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;
 END$$
 DELIMITER ;

From bdaaffbbd76247d2eaf64635c58fbd8e707bff2b Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 10 Jan 2025 10:33:19 +0100
Subject: [PATCH 15/57] feat: refs #7584 changes request

---
 db/routines/vn/triggers/workerTimeControl_afterDelete.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
index 762754591..96db381b5 100644
--- a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
+++ b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql
@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerTimeControl_after
 	AFTER DELETE ON `workerTimeControl`
 	FOR EACH ROW
 BEGIN
-	IF account.myUser_getId() THEN
+	IF account.myUser_getId() IS NOT NULL THEN
 		INSERT INTO workerLog
 			SET `action` = 'delete',
 				`changedModel` = 'WorkerTimeControl',

From 9d05b16404da3a7d3d7d5e14300f7b4a9d8baa9f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 13 Jan 2025 09:18:46 +0100
Subject: [PATCH 16/57] fix: canBeInvoiced only in makeInvoice

---
 loopback/locale/en.json                       |  3 +-
 loopback/locale/es.json                       |  2 +-
 loopback/locale/fr.json                       |  2 +-
 loopback/locale/pt.json                       |  2 +-
 .../methods/invoiceOut/clientsToInvoice.js    |  6 ---
 .../invoiceOut/specs/clientsToInvoice.spec.js | 54 +++++++++++--------
 6 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 80da13ae5..8d5eab4bc 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -211,6 +211,7 @@
 	"Name should be uppercase": "Name should be uppercase",
 	"You cannot update these fields": "You cannot update these fields",
 	"CountryFK cannot be empty": "Country cannot be empty",
+    "No tickets to invoice": "There are no tickets to invoice that meet the invoicing requirements",
 	"You are not allowed to modify the alias": "You are not allowed to modify the alias",
 	"You already have the mailAlias": "You already have the mailAlias",
 	"This machine is already in use.": "This machine is already in use.",
@@ -251,4 +252,4 @@
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
 	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent"
-}
\ No newline at end of file
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index fcee0e111..cde81e0cb 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -339,7 +339,7 @@
 	"Incorrect pin": "Pin incorrecto.",
 	"You already have the mailAlias": "Ya tienes este alias de correo",
 	"The alias cant be modified": "Este alias de correo no puede ser modificado",
-	"No tickets to invoice": "No hay tickets para facturar",
+	"No tickets to invoice": "No hay tickets para facturar que cumplan los requisitos de facturación",
 	"this warehouse has not dms": "El Almacén no acepta documentos",
 	"This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
 	"Name should be uppercase": "El nombre debe ir en mayúscula",
diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json
index 9941358be..f49196a8f 100644
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@@ -339,7 +339,7 @@
 	"Incorrect pin": "Pin incorrect.",
 	"You already have the mailAlias": "Vous avez déjà cet alias de courrier",
 	"The alias cant be modified": "Cet alias de courrier ne peut pas être modifié",
-	"No tickets to invoice": "Pas de tickets à facturer",
+	"No tickets to invoice": "Il n'y a pas de tickets à facturer qui répondent aux exigences de facturation",
 	"this warehouse has not dms": "L'entrepôt n'accepte pas les documents",
 	"This ticket already has a cmr saved": "Ce ticket a déjà un cmr enregistré",
 	"Name should be uppercase": "Le nom doit être en majuscules",
diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json
index e84b30f3d..e2374d35f 100644
--- a/loopback/locale/pt.json
+++ b/loopback/locale/pt.json
@@ -339,7 +339,7 @@
 	"Incorrect pin": "PIN incorreto.",
 	"You already have the mailAlias": "Você já tem o alias de e-mail",
 	"The alias cant be modified": "O alias não pode ser modificado",
-	"No tickets to invoice": "Não há tickets para faturar",
+	"No tickets to invoice": "Não há bilhetes para faturar que atendam aos requisitos de faturamento",
 	"this warehouse has not dms": "Este armazém não tem DMS",
 	"This ticket already has a cmr saved": "Este ticket já tem um CMR salvo",
 	"Name should be uppercase": "O nome deve estar em maiúsculas",
diff --git a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
index 7befdcbeb..f66221409 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
@@ -49,12 +49,6 @@ module.exports = Self => {
         }
 
         try {
-            const clientCanBeInvoiced =
-                await Self.app.models.Client.canBeInvoiced(clientId, companyFk, myOptions);
-
-            if (!clientCanBeInvoiced)
-                throw new UserError(`This client can't be invoiced`);
-
             const vIsAllInvoiceable = false;
             await Self.rawSql('CALL ticketPackaging_add(?, ?, ?, ?)', [
                 clientId,
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/clientsToInvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/clientsToInvoice.spec.js
index df0566c54..6e536f433 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/clientsToInvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/clientsToInvoice.spec.js
@@ -1,4 +1,5 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('InvoiceOut clientsToInvoice()', () => {
     const userId = 1;
@@ -20,6 +21,21 @@ describe('InvoiceOut clientsToInvoice()', () => {
         headers: {origin: 'http://localhost'}
     };
     const ctx = {req: activeCtx};
+    let tx;
+    let options;
+
+    beforeEach(async() => {
+        LoopBackContext.getCurrentContext = () => ({
+            active: activeCtx,
+        });
+
+        tx = await models.InvoiceOut.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
 
     it('should return a list of clients to invoice', async() => {
         spyOn(models.InvoiceOut, 'rawSql').and.callFake(query => {
@@ -37,24 +53,14 @@ describe('InvoiceOut clientsToInvoice()', () => {
             }
         });
 
-        const tx = await models.InvoiceOut.beginTransaction({});
-        const options = {transaction: tx};
+        const addresses = await models.InvoiceOut.clientsToInvoice(
+            ctx, clientId, invoiceDate, maxShipped, companyFk, options);
 
-        try {
-            const addresses = await models.InvoiceOut.clientsToInvoice(
-                ctx, clientId, invoiceDate, maxShipped, companyFk, options);
-
-            expect(addresses.length).toBeGreaterThan(0);
-            expect(addresses[0].clientId).toBe(clientId);
-            expect(addresses[0].clientName).toBe('Test Client');
-            expect(addresses[0].id).toBe(1);
-            expect(addresses[0].nickname).toBe('Address 1');
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
+        expect(addresses.length).toBeGreaterThan(0);
+        expect(addresses[0].clientId).toBe(clientId);
+        expect(addresses[0].clientName).toBe('Test Client');
+        expect(addresses[0].id).toBe(1);
+        expect(addresses[0].nickname).toBe('Address 1');
     });
 
     it('should handle errors and rollback transaction', async() => {
@@ -62,14 +68,20 @@ describe('InvoiceOut clientsToInvoice()', () => {
             return Promise.reject(new Error('Test Error'));
         });
 
-        const tx = await models.InvoiceOut.beginTransaction({});
-        const options = {transaction: tx};
-
         try {
             await models.InvoiceOut.clientsToInvoice(ctx, clientId, invoiceDate, maxShipped, companyFk, options);
         } catch (e) {
             expect(e.message).toBe('Test Error');
-            await tx.rollback();
         }
     });
+
+    it('should return all list', async() => {
+        const minShipped = Date.vnNew();
+        minShipped.setFullYear(maxShipped.getFullYear() - 1);
+
+        const toInvoice = await models.InvoiceOut.clientsToInvoice(
+            ctx, null, invoiceDate, maxShipped, companyFk, options);
+
+        expect(toInvoice).toBeDefined();
+    });
 });

From c15a3bfe501f46159e3868ddfb8a90ac7c493527 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 13 Jan 2025 11:28:30 +0100
Subject: [PATCH 17/57] feat: refs #8381 add initial and final temperature
 fields to entry model and queries

---
 db/versions/11405-blackMoss/00-entryAlter.sql    |  3 +++
 modules/entry/back/methods/entry/filter.js       | 16 ++++++++++++++++
 modules/entry/back/models/entry.json             |  6 ++++++
 modules/travel/back/methods/travel/getEntries.js |  4 +++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 db/versions/11405-blackMoss/00-entryAlter.sql

diff --git a/db/versions/11405-blackMoss/00-entryAlter.sql b/db/versions/11405-blackMoss/00-entryAlter.sql
new file mode 100644
index 000000000..3320b9dd3
--- /dev/null
+++ b/db/versions/11405-blackMoss/00-entryAlter.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`entry`
+	ADD COLUMN `initialTemperature` decimal(10,2) DEFAULT NULL COMMENT 'Temperatura de como lo recibimos del proveedor ej. en colombia',
+	ADD COLUMN `finalTemperature` decimal(10,2) DEFAULT NULL COMMENT 'Temperatura final de como llega a nuestras instalaciones';
diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index d7740dd4e..e5eae85fd 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -119,6 +119,16 @@ module.exports = Self => {
                 arg: 'invoiceAmount',
                 type: 'number',
                 description: `The invoice amount`
+            },
+            {
+                arg: 'initialTemperature',
+                type: 'number',
+                description: 'Initial temperature value'
+            },
+            {
+                arg: 'finalTemperature',
+                type: 'number',
+                description: 'Final temperature value'
             }
         ],
         returns: {
@@ -170,6 +180,10 @@ module.exports = Self => {
             case 'invoiceInFk':
                 param = `e.${param}`;
                 return {[param]: value};
+            case 'initialTemperature':
+                return {'e.initialTemperature': {lte: value}};
+            case 'finalTemperature':
+                return {'e.finalTemperature': {gte: value}};
             }
         });
         filter = mergeFilters(ctx.args.filter, {where});
@@ -204,6 +218,8 @@ module.exports = Self => {
                     e.gestDocFk,
                     e.invoiceInFk,
                     e.invoiceAmount,
+                    e.initialTemperature,
+                    e.finalTemperature,
                     t.landed,
                     s.name supplierName,
                     s.nickname supplierAlias,
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index 4a09c7d6a..1ff062119 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -68,6 +68,12 @@
         },
         "invoiceAmount": {
             "type": "number"
+        },
+        "initialTemperature": {
+            "type": "number"
+        },
+        "finalTemperature": {
+            "type": "number"
         }
     },
     "relations": {
diff --git a/modules/travel/back/methods/travel/getEntries.js b/modules/travel/back/methods/travel/getEntries.js
index 50088ccfa..2399f8bc4 100644
--- a/modules/travel/back/methods/travel/getEntries.js
+++ b/modules/travel/back/methods/travel/getEntries.js
@@ -41,7 +41,9 @@ module.exports = Self => {
                         * b.stickers)/1000000) AS DECIMAL(10,2)) m3,
                     TRUNCATE(SUM(b.stickers)/(COUNT( b.id) / COUNT( DISTINCT b.id)),0) hb,
                     CAST(SUM(b.freightValue*b.quantity) AS DECIMAL(10,2)) freightValue,
-                    CAST(SUM(b.packageValue*b.quantity) AS DECIMAL(10,2)) packageValue
+                    CAST(SUM(b.packageValue*b.quantity) AS DECIMAL(10,2)) packageValue,
+                    e.initialTemperature,
+                    e.finalTemperature
             FROM vn.travel t
                 LEFT JOIN vn.entry e ON t.id = e.travelFk
                 LEFT JOIN vn.buy b ON b.entryFk = e.id

From c4870d52de17c101e17d421f2dd633db8ba92f74 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 13 Jan 2025 14:37:27 +0100
Subject: [PATCH 18/57] feat: refs #257275 defaulterFilter

---
 modules/client/back/methods/defaulter/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 5359ce4a7..cf8bd855a 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -94,7 +94,7 @@ module.exports = Self => {
                                     AND r1.started = r2.maxStarted
                         ) r ON r.clientFk = c.id
                         LEFT JOIN workerDepartment wd ON wd.workerFk = u.id
-                        JOIN department dp ON dp.id = wd.departmentFk
+                        LEFT JOIN department dp ON dp.id = wd.departmentFk
                     WHERE
                         d.created = ?
                         AND d.amount > 0

From 6e56bdeeb1159473d8a6797eb82a2656e89f5e0f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 13 Jan 2025 15:24:01 +0100
Subject: [PATCH 19/57] fix: refs #8389 prevent error propagation

---
 back/methods/chat/sendCheckingPresence.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/back/methods/chat/sendCheckingPresence.js b/back/methods/chat/sendCheckingPresence.js
index 83e8da304..955ed0240 100644
--- a/back/methods/chat/sendCheckingPresence.js
+++ b/back/methods/chat/sendCheckingPresence.js
@@ -67,7 +67,6 @@ module.exports = Self => {
                 INSERT INTO util.debug (variable, value)
                     VALUES ('sendCheckingPresence_error', ?)
             `, [`User: ${userId}, recipient: ${recipientId}, message: ${message}, error: ${e}`]);
-            throw e;
         }
     };
 };

From 00577056ddd933b153bd63c8ee9cc8734d1e6f8e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 13 Jan 2025 15:24:12 +0100
Subject: [PATCH 20/57] build: refs #8389 changelog

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4eb7d29a..67ffe9f12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# Version 25.00 - 2025-01-14
+
+### Added 🆕
+
+- feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests  by:jgallego
+- feat: refs #7301 update lastEntriesFilter to include landedDate and enhance test cases  (origin/7301-removeRedundantInventories) by:pablone
+- feat: refs #7880 error code and translations  by:ivanm
+- feat: refs #7924 add isCustomInspectionRequired field to item and update related logic  by:jgallego
+- feat: refs #8167 update canBeInvoiced method to include active status check and improve test cases  by:jgallego
+- feat: refs #8167 update locale and improve invoicing logic with error handling  by:jgallego
+- feat: refs #8246 added relation for the front's new field  by:Jon
+- feat: refs #8266 added itemFk and needed fixtures  by:jtubau
+- feat: refs #8324 country unique  by:Carlos Andrés
+
+### Changed 📦
+
+
+### Fixed 🛠️
+
+- feat: refs #8266 added itemFk and needed fixtures  by:jtubau
+- fix: add isCustomInspectionRequired column to item table for customs inspection indication  by:jgallego
+- fix: canBeInvoiced only in makeInvoice  by:alexm
+- fix: hotFix getMondayWeekYear  by:alexm
+- fix: refs #6598 update ACL property assignment  by:jorgep
+- fix: refs #6861 refs#6861 addPrevOK  by:sergiodt
+- fix: refs #7301 remove debug console log and update test cases in lastEntriesFilter  by:pablone
+- fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic  by:pablone
+
 # Version 24.52 - 2024-01-07
 
 ### Added 🆕

From 29e6a999836f42bd626dce912451aaa1293223fe Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 14 Jan 2025 07:36:23 +0100
Subject: [PATCH 21/57] feat: refs #8247 added new acl for VnUser model

---
 db/versions/11407-turquoiseTulip/00-firstScript.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 db/versions/11407-turquoiseTulip/00-firstScript.sql

diff --git a/db/versions/11407-turquoiseTulip/00-firstScript.sql b/db/versions/11407-turquoiseTulip/00-firstScript.sql
new file mode 100644
index 000000000..72d29061d
--- /dev/null
+++ b/db/versions/11407-turquoiseTulip/00-firstScript.sql
@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('VnUser','adminUser','WRITE','ALLOW','ROLE','sysadmin');
\ No newline at end of file

From 6aa898ee596b29347fba4e88f3bd712cd4be3e19 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 14 Jan 2025 07:39:52 +0100
Subject: [PATCH 22/57] build: refs #8389 dump db

---
 db/dump/.dump/data.sql       | 31 ++++++++++++++++-----------
 db/dump/.dump/privileges.sql |  4 ++++
 db/dump/.dump/structure.sql  | 41 +++++++++++++++++++++++-------------
 db/dump/.dump/triggers.sql   |  2 +-
 4 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/db/dump/.dump/data.sql b/db/dump/.dump/data.sql
index a2df34218..b95890b0d 100644
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@@ -4,7 +4,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','11385','72bf27f08d3ddf646ec0bb6594fc79cecd4b72f2','2025-01-07 07:46:33','11395');
+INSERT INTO `version` VALUES ('vn-database','11391','43edb1f82e88dcc44eedc8501b93c1fac66d71e9','2025-01-14 07:32:09','11407');
 
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@@ -1078,6 +1078,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11315','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11316','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11317','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11319','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11320','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:07',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11321','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-26 07:05:30',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11322','00-entryAcl.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-12-10 07:20:04',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11324','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2024-11-13 10:49:47',NULL,NULL);
@@ -1139,6 +1140,9 @@ INSERT INTO `versionLog` VALUES ('vn-database','11379','00-firstScript.sql','jen
 INSERT INTO `versionLog` VALUES ('vn-database','11379','01-secScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11384','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:32',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','11385','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-07 07:46:33',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11390','00-firstScript.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11391','00-itemAlter.sql','jenkins@db-proxy2.servers.dc.verdnatura.es','2025-01-14 07:32:08',NULL,NULL);
+INSERT INTO `versionLog` VALUES ('vn-database','11400','00-firstScript.sql','jenkins@db-proxy1.servers.dc.verdnatura.es','2025-01-09 09:55:24',NULL,NULL);
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1515,6 +1519,7 @@ INSERT INTO `roleInherit` VALUES (378,101,15,19294);
 INSERT INTO `roleInherit` VALUES (379,103,121,19294);
 INSERT INTO `roleInherit` VALUES (381,119,123,19295);
 INSERT INTO `roleInherit` VALUES (382,48,72,783);
+INSERT INTO `roleInherit` VALUES (383,114,111,19295);
 
 INSERT INTO `userPassword` VALUES (1,7,1,0,2,1);
 
@@ -2311,9 +2316,9 @@ INSERT INTO `ACL` VALUES (938,'Worker','__get__mail','READ','ALLOW','ROLE','hr',
 INSERT INTO `ACL` VALUES (939,'Machine','*','*','ALLOW','ROLE','productionBoss',10578);
 INSERT INTO `ACL` VALUES (940,'ItemTypeLog','find','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (941,'Entry','buyLabel','READ','ALLOW','ROLE','employee',10578);
-INSERT INTO `ACL` VALUES (942,'Cmr','filter','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (943,'Cmr','downloadZip','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (944,'Cmr','print','READ','ALLOW','ROLE','production',10578);
+INSERT INTO `ACL` VALUES (942,'Cmr','filter','READ','ALLOW','ROLE','employee',19295);
+INSERT INTO `ACL` VALUES (943,'Cmr','downloadZip','READ','ALLOW','ROLE','employee',19295);
+INSERT INTO `ACL` VALUES (944,'Cmr','print','READ','ALLOW','ROLE','employee',19295);
 INSERT INTO `ACL` VALUES (945,'Collection','create','WRITE','ALLOW','ROLE','productionBoss',10578);
 INSERT INTO `ACL` VALUES (946,'Collection','upsert','WRITE','ALLOW','ROLE','productionBoss',10578);
 INSERT INTO `ACL` VALUES (947,'Collection','replaceById','WRITE','ALLOW','ROLE','productionBoss',10578);
@@ -2327,7 +2332,6 @@ INSERT INTO `ACL` VALUES (954,'RouteComplement','find','READ','ALLOW','ROLE','de
 INSERT INTO `ACL` VALUES (955,'RouteComplement','create','WRITE','ALLOW','ROLE','delivery',10578);
 INSERT INTO `ACL` VALUES (956,'RouteComplement','deleteById','WRITE','ALLOW','ROLE','delivery',10578);
 INSERT INTO `ACL` VALUES (957,'SaleGroup','find','READ','ALLOW','ROLE','production',10578);
-INSERT INTO `ACL` VALUES (958,'Worker','canCreateAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (959,'WorkerRelative','updateAttributes','*','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (960,'WorkerRelative','crud','WRITE','ALLOW','ROLE','hr',10578);
 INSERT INTO `ACL` VALUES (961,'WorkerRelative','findById','*','ALLOW','ROLE','hr',10578);
@@ -2383,6 +2387,8 @@ INSERT INTO `ACL` VALUES (1010,'InventoryConfig','find','READ','ALLOW','ROLE','b
 INSERT INTO `ACL` VALUES (1011,'SiiTypeInvoiceIn','find','READ','ALLOW','ROLE','salesPerson',10578);
 INSERT INTO `ACL` VALUES (1012,'OsrmConfig','optimize','READ','ALLOW','ROLE','employee',10578);
 INSERT INTO `ACL` VALUES (1013,'Route','optimizePriority','*','ALLOW','ROLE','employee',10578);
+INSERT INTO `ACL` VALUES (1014,'Worker','canModifyAbsenceInPast','WRITE','ALLOW','ROLE','hr',10578);
+INSERT INTO `ACL` VALUES (1015,'Worker','__get__sip','READ','ALLOW','ROLE','employee',19294);
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');
@@ -2725,7 +2731,7 @@ INSERT INTO `department` VALUES (124,NULL,'CONTROL INTERNO',122,123,NULL,72,0,0,
 INSERT INTO `department` VALUES (125,'spainTeam3','EQUIPO ESPAÑA 3',59,60,1118,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (126,NULL,'PRESERVADO',29,30,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (128,NULL,'PALETIZADO',31,32,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL,NULL,'PALLETIZING');
-INSERT INTO `department` VALUES (130,NULL,'REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
+INSERT INTO `department` VALUES (130,'reviewers','REVISION',33,34,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,1,NULL,NULL,NULL,'ON_CHECKING');
 INSERT INTO `department` VALUES (131,'greenhouse','INVERNADERO',105,106,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (132,NULL,'EQUIPO DC',61,62,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',0,0,0,0,NULL,NULL,NULL,NULL);
 INSERT INTO `department` VALUES (133,'franceTeamManagement','EQUIPO GESTIÓN FRANCIA',63,64,9751,72,0,0,2,0,43,'/1/43/','fr_equipo',1,'gestionfrancia@verdnatura.es',0,0,0,0,NULL,NULL,'3300',NULL);
@@ -2740,12 +2746,12 @@ INSERT INTO `department` VALUES (146,NULL,'VERDNACOLOMBIA',3,4,NULL,72,0,0,2,0,2
 INSERT INTO `department` VALUES (147,'spainTeamAsia','EQUIPO ESPAÑA ASIA',71,72,40214,0,0,0,2,0,43,'/1/43/','esA_equipo',1,'esA@verdnatura.es',0,0,0,0,NULL,NULL,'5500',NULL);
 INSERT INTO `department` VALUES (148,'franceTeamCatchment','EQUIPO CAPTACIÓN FRANCIA',73,74,25178,0,0,0,2,0,43,'/1/43/',NULL,1,NULL,0,0,0,0,NULL,NULL,'6000',NULL);
 INSERT INTO `department` VALUES (149,'spainTeamCatchment','EQUIPO ESPAÑA CAPTACIÓN',75,76,1203,0,0,0,2,0,43,'/1/43/','es_captacion_equipo',1,'es_captacion@verdnatura.es',0,0,0,0,NULL,NULL,'5700',NULL);
-INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',77,78,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'levanteislas.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5000',NULL);
-INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',79,80,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'noroeste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5300',NULL);
-INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'noreste.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5200',NULL);
-INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',83,84,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'sur.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5400',NULL);
-INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',85,86,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'centro.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5100',NULL);
-INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',87,88,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'vip.verdnatura@gmail.com',0,0,0,0,NULL,NULL,'5600',NULL);
+INSERT INTO `department` VALUES (150,'spainTeamLevanteIslands','EQUIPO ESPAÑA LEVANTE',77,78,1118,0,0,0,2,0,43,'/1/43/','es_levante_equipo',1,'es_levante@verdnatura.es',0,0,0,0,NULL,NULL,'5000',NULL);
+INSERT INTO `department` VALUES (151,'spainTeamNorthwest','EQUIPO ESPAÑA NOROESTE',79,80,7102,0,0,0,2,0,43,'/1/43/','es_noroeste_equipo',1,'es_noroeste@verdnatura.es',0,0,0,0,NULL,NULL,'5300',NULL);
+INSERT INTO `department` VALUES (152,'spainTeamNortheast','EQUIPO ESPAÑA NORESTE',81,82,1118,0,0,0,2,0,43,'/1/43/','es_noreste_equipo',1,'es_noreste@verdnatura.es',0,0,0,0,NULL,NULL,'5200',NULL);
+INSERT INTO `department` VALUES (153,'spainTeamSouth','EQUIPO ESPAÑA SUR',83,84,36578,0,0,0,2,0,43,'/1/43/','es_sur_equipo',1,'es_sur@verdnatura.es',0,0,0,0,NULL,NULL,'5400',NULL);
+INSERT INTO `department` VALUES (154,'spainTeamCenter','EQUIPO ESPAÑA CENTRO',85,86,4661,0,0,0,2,0,43,'/1/43/','es_centro_equipo',1,'es_centro@verdnatura.es',0,0,0,0,NULL,NULL,'5100',NULL);
+INSERT INTO `department` VALUES (155,'spainTeamVip','EQUIPO ESPAÑA VIP',87,88,5432,0,0,0,2,0,43,'/1/43/','es_vip_equipo',1,'es_vip@verdnatura.es',0,0,0,0,NULL,NULL,'5600',NULL);
 
 INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL);
 INSERT INTO `docuware` VALUES (2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL);
@@ -3046,6 +3052,7 @@ INSERT INTO `message` VALUES (20,'clientNotVerified','Incomplete tax data, pleas
 INSERT INTO `message` VALUES (21,'quantityLessThanMin','The quantity cannot be less than the minimum');
 INSERT INTO `message` VALUES (22,'ORDER_ROW_UNAVAILABLE','The ordered quantity exceeds the available');
 INSERT INTO `message` VALUES (23,'AMOUNT_NOT_MATCH_GROUPING','The quantity ordered does not match the grouping');
+INSERT INTO `message` VALUES (24,'orderLinesWithZero','There are empty lines. Please delete them');
 
 INSERT INTO `metatag` VALUES (2,'title','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración');
 INSERT INTO `metatag` VALUES (3,'description','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración. Envío a toda España, pedidos por internet o por teléfono.');
diff --git a/db/dump/.dump/privileges.sql b/db/dump/.dump/privileges.sql
index 460256b56..598bfdf75 100644
--- a/db/dump/.dump/privileges.sql
+++ b/db/dump/.dump/privileges.sql
@@ -1494,6 +1494,10 @@ INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','travelThermograph','
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','thermograph','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn2008','buyerSalesAssistant','Tickets','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Update','');
 INSERT IGNORE INTO `tables_priv` VALUES ('','vn','hr','sim','jenkins@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','employee','zoneGeo','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','itemCampaign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','grafana','itemCampaign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
+INSERT IGNORE INTO `tables_priv` VALUES ('','vn','buyer','campaign','guillermo@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;
diff --git a/db/dump/.dump/structure.sql b/db/dump/.dump/structure.sql
index e52ed2a51..58f1e7591 100644
--- a/db/dump/.dump/structure.sql
+++ b/db/dump/.dump/structure.sql
@@ -6249,19 +6249,27 @@ BEGIN
  * @param vDateFrom Fecha desde
  * @param vDateTo Fecha hasta
  */
-	IF vDateFrom IS NULL THEN
-		SET vDateFrom = util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
+	DECLARE vDaysInYear INT;
+	SET vDaysInYear = DATEDIFF(util.lastDayOfYear(CURDATE()), util.firstDayOfYear(CURDATE()));
+
+	SET vDateFrom = COALESCE(vDateFrom, util.VN_CURDATE());
+	SET vDateTo = COALESCE(vDateTo, util.VN_CURDATE());
+
+	IF DATEDIFF(vDateTo, vDateFrom) > vDaysInYear THEN
+		CALL util.throw('The period cannot be longer than one year');
 	END IF;
 
-	IF vDateTo IS NULL THEN
-		SET vDateTo = vDateFrom + INTERVAL 6 DAY;
-	END IF;
+	-- Obtiene el primer día de la semana de esa fecha
+	SET vDateFrom = DATE_SUB(vDateFrom, INTERVAL ((WEEKDAY(vDateFrom) + 1) % 7) DAY);
+
+	-- Obtiene el último día de la semana de esa fecha
+	SET vDateTo = DATE_ADD(vDateTo, INTERVAL (6 - ((WEEKDAY(vDateTo) + 1) % 7)) DAY);
 
 	CALL cache.last_buy_refresh(FALSE);
 
 	REPLACE bs.waste
-		SELECT YEAR(t.shipped),
-				WEEK(t.shipped, 4),
+		SELECT YEARWEEK(t.shipped, 6) DIV 100,
+				WEEK(t.shipped, 6),
 				it.workerFk,
 				it.id,
 				s.itemFk,
@@ -6307,9 +6315,9 @@ BEGIN
 				JOIN cache.last_buy lb ON lb.item_id = i.id
 					AND lb.warehouse_id = w.id
 				JOIN vn.buy b ON b.id = lb.buy_id
-			WHERE t.shipped BETWEEN vDateFrom AND vDateTo
+			WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDateTo)
 				AND w.isManaged
-			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id;
+			GROUP BY YEARWEEK(t.shipped, 6) DIV 100, WEEK(t.shipped, 6), i.id;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -13807,7 +13815,7 @@ BEGIN
 	) INTO vHas0Amount;
 
 	IF vHas0Amount THEN
-		CALL util.throw('Hay líneas vacías. Por favor, elimínelas');
+		CALL util.throw('orderLinesWithZero');
 	END IF;
 
 	START TRANSACTION;
@@ -28922,6 +28930,7 @@ CREATE TABLE `country` (
   `isSocialNameUnique` tinyint(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `country_unique` (`code`),
+  UNIQUE KEY `country_unique_name` (`name`),
   KEY `currency_id_fk_idx` (`currencyFk`),
   KEY `country_Ix4` (`name`),
   KEY `continent_id_fk_idx` (`continentFk`),
@@ -31971,6 +31980,7 @@ CREATE TABLE `item` (
   `value12` varchar(50) DEFAULT NULL,
   `tag13` varchar(20) DEFAULT NULL,
   `value13` varchar(50) DEFAULT NULL,
+  `isCustomInspectionRequired` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Indicates if the item requires physical inspection at customs',
   PRIMARY KEY (`id`),
   UNIQUE KEY `item_supplyResponseFk_idx` (`supplyResponseFk`),
   KEY `Color` (`inkFk`),
@@ -68661,10 +68671,11 @@ BEGIN
 				TRUE,
 				sc.userFk,
 				s.id
-			FROM vn.sectorCollection sc
-				JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
-				JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = scsg.saleGroupFk
-				JOIN vn.state s ON s.code = 'OK PREVIOUS'
+			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;
 END ;;
 DELIMITER ;
@@ -90882,4 +90893,4 @@ USE `vn2008`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-07  6:51:38
+-- Dump completed on 2025-01-14  6:39:04
diff --git a/db/dump/.dump/triggers.sql b/db/dump/.dump/triggers.sql
index 039dbb2a8..fb72e9899 100644
--- a/db/dump/.dump/triggers.sql
+++ b/db/dump/.dump/triggers.sql
@@ -11499,4 +11499,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-07  6:51:57
+-- Dump completed on 2025-01-14  6:39:25

From 44765b5a64dc00913c59b83776c1c7fbd10df7a7 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 14 Jan 2025 09:07:00 +0100
Subject: [PATCH 23/57] feat: refs #8361 add hasToDownloadRate field to
 currency model and update exchange rate logic

---
 db/dump/fixtures.before.sql                   | 12 +++++------
 .../11406-bronzeMoss/00-currrencyAlter.sql    |  2 ++
 .../11406-bronzeMoss/01-currrencyUpdate.sql   |  3 +++
 .../methods/invoice-in/exchangeRateUpdate.js  | 21 +++++--------------
 modules/travel/back/models/currency.json      |  3 +++
 5 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 db/versions/11406-bronzeMoss/00-currrencyAlter.sql
 create mode 100644 db/versions/11406-bronzeMoss/01-currrencyUpdate.sql

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index ff896b84d..788854b4e 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -158,13 +158,13 @@ INSERT INTO `account`.`mailForward`(`account`, `forwardTo`)
 
 
 
-INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
+INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`, `hasToDownloadRate`)
     VALUES
-        (1, 'EUR', 'Euro',          1),
-        (2, 'USD', 'Dollar USA',    1.4),
-        (3, 'GBP', 'Libra',         1),
-        (4, 'JPY', 'Yen Japones',   1),
-        (5, 'CNY',  'Yuan Chino',   1.2);
+        (1, 'EUR', 'Euro',          1,		FALSE),
+        (2, 'USD', 'Dollar USA',    1.4,	TRUE),
+        (3, 'GBP', 'Libra',         1,		TRUE),
+        (4, 'JPY', 'Yen Japones',   1,		FALSE),
+        (5, 'CNY',  'Yuan Chino',   1.2,	TRUE);
 
 INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
     VALUES
diff --git a/db/versions/11406-bronzeMoss/00-currrencyAlter.sql b/db/versions/11406-bronzeMoss/00-currrencyAlter.sql
new file mode 100644
index 000000000..86465545e
--- /dev/null
+++ b/db/versions/11406-bronzeMoss/00-currrencyAlter.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`currency`
+ADD COLUMN `hasToDownloadRate` TINYINT(1) NOT NULL DEFAULT 0 comment 'Si se guarda el tipo de cambio diariamente en referenceRate';
diff --git a/db/versions/11406-bronzeMoss/01-currrencyUpdate.sql b/db/versions/11406-bronzeMoss/01-currrencyUpdate.sql
new file mode 100644
index 000000000..5e0882de2
--- /dev/null
+++ b/db/versions/11406-bronzeMoss/01-currrencyUpdate.sql
@@ -0,0 +1,3 @@
+UPDATE `vn`.`currency`
+	SET `hasToDownloadRate` = TRUE
+	WHERE `code` IN ('USD', 'CNY', 'GBP');
diff --git a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
index a6bad405f..99ff4cd79 100644
--- a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
+++ b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
@@ -36,6 +36,7 @@ module.exports = Self => {
             if (!cubes || cubes.length === 0)
                 throw new UserError('No cubes found. Exiting the method.');
 
+            const currencies = await models.Currency.find({where: {hasToDownloadRate: true}}, myOptions);
             const maxDateRecord = await models.ReferenceRate.findOne({order: 'dated DESC'}, myOptions);
             const maxDate = maxDateRecord?.dated ? new Date(maxDateRecord.dated) : null;
             let lastProcessedDate = maxDate;
@@ -51,32 +52,20 @@ module.exports = Self => {
 
                     if (!maxDate || xmlDateWithoutTime > maxDate) {
                         if (lastProcessedDate && xmlDateWithoutTime > lastProcessedDate) {
-                            for (const code of ['USD', 'CNY', 'GBP']) {
-                                const currency = await models.Currency.findOne(
-                                    {where: {code}},
-                                    myOptions
-                                );
-                                if (!currency)
-                                    throw new UserError(`Currency not found for code: ${code}`);
-
+                            for (const currency of currencies) {
                                 await fillMissingDates(
                                     models, currency, lastProcessedDate, xmlDateWithoutTime, myOptions
                                 );
                             }
                         }
                     }
+
                     for (const rateCube of Array.from(cube.childNodes)) {
                         if (rateCube.nodeType === doc.ELEMENT_NODE) {
                             const currencyCode = rateCube.getAttribute('currency');
                             const rate = rateCube.getAttribute('rate');
-                            if (['USD', 'CNY', 'GBP'].includes(currencyCode)) {
-                                const currency = await models.Currency.findOne(
-                                    {where: {code: currencyCode}},
-                                    myOptions
-                                );
-                                if (!currency)
-                                    throw new UserError(`Currency not found for code: ${currencyCode}`);
-
+                            const currency = currencies.find(c => c.code === currencyCode);
+                            if (currency) {
                                 const existingRate = await models.ReferenceRate.findOne({
                                     where: {currencyFk: currency.id, dated: xmlDateWithoutTime}
                                 }, myOptions);
diff --git a/modules/travel/back/models/currency.json b/modules/travel/back/models/currency.json
index f3241fad1..427a18e31 100644
--- a/modules/travel/back/models/currency.json
+++ b/modules/travel/back/models/currency.json
@@ -20,6 +20,9 @@
         },
         "ratio": {
             "type": "number"
+        },
+        "hasToDownloadRate": {
+            "type": "boolean"
         }
     },
     "acls": [

From e273733832016b0916fa7cccff42a46f1f89a5b6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 14 Jan 2025 09:33:26 +0100
Subject: [PATCH 24/57] refactor: order by id

---
 modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
index f66221409..78fce348e 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
@@ -74,7 +74,8 @@ module.exports = Self => {
                         AND t.companyFk = ?
                         AND NOT t.isDeleted
                     GROUP BY IF(c.hasToInvoiceByAddress, a.id, c.id)
-                    HAVING SUM(t.totalWithVat) > 0;`;
+                    HAVING SUM(t.totalWithVat) > 0
+                    ORDER BY c.id`;
 
             const addresses = await Self.rawSql(query, [
                 minShipped,

From 01072f7cbc394f4fa7f68768a0c3a5e6c081a417 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 14 Jan 2025 11:36:54 +0100
Subject: [PATCH 25/57] fix: hotfix 7366 6943

---
 modules/client/back/models/client-credit.json | 5 ++++-
 modules/travel/back/methods/travel/filter.js  | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/client/back/models/client-credit.json b/modules/client/back/models/client-credit.json
index b92639b80..b57374dc3 100644
--- a/modules/client/back/models/client-credit.json
+++ b/modules/client/back/models/client-credit.json
@@ -19,6 +19,9 @@
         },
         "created": {
             "type": "date"
+        },
+        "workerFk": {
+            "type": "number"
         }
     },
     "relations": {
@@ -33,4 +36,4 @@
             "foreignKey": "workerFk"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/travel/back/methods/travel/filter.js b/modules/travel/back/methods/travel/filter.js
index 30c1a45fa..d10ff080b 100644
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@@ -91,6 +91,11 @@ module.exports = Self => {
                 arg: 'landed',
                 type: 'date',
                 description: 'The landed date'
+            },
+            {
+                arg: 'awbFk',
+                type: 'number',
+                description: 'The awbFk id'
             }
         ],
         returns: {
@@ -168,7 +173,9 @@ module.exports = Self => {
                     t.totalEntries,
                     t.isRaid,
                     t.daysInForward,
+                    t.awbFk,
                     am.name agencyModeName,
+                    a.code awbCode,
                     win.name warehouseInName,
                     wout.name warehouseOutName,
                     cnt.code continent
@@ -176,6 +183,7 @@ module.exports = Self => {
                     JOIN vn.agencyMode am ON am.id = t.agencyModeFk
                     JOIN vn.warehouse win ON win.id = t.warehouseInFk
                     JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk
+                    JOIN vn.awb a ON a.id = t.awbFk
                     JOIN warehouse wo ON wo.id = t.warehouseOutFk
                     JOIN country c ON c.id = wo.countryFk
                     LEFT JOIN continent cnt ON cnt.id = c.continentFk) AS t`

From c2ca9cfbe5ca58a699660d6dd437c4291a480f8e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 15 Jan 2025 12:26:16 +0100
Subject: [PATCH 26/57] feat: refs #7531 Added address_hasDelivery

---
 .../vn/functions/address_hasDelivery.sql      | 24 +++++++++++++++++++
 .../vn/procedures/zone_getAddresses.sql       |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 db/routines/vn/functions/address_hasDelivery.sql

diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
new file mode 100644
index 000000000..f37edbd34
--- /dev/null
+++ b/db/routines/vn/functions/address_hasDelivery.sql
@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(vSelf INT, vLanded DATE)
+	RETURNS BOOL
+	DETERMINISTIC
+BEGIN
+/**
+ * Retorna si hay reparto disponible para
+ * la dirección y fecha solicitada.
+ *
+ * @param vSelf Id de dirección de envío
+ * @param vLanded Fecha de entrega
+ * @return true|false
+ */
+	DECLARE vHasDelivery BOOL;
+
+	CALL zone_getAgency(vSelf, vLanded);
+
+	SELECT EXISTS (SELECT TRUE FROM tmp.zoneGetAgency) INTO vHasDelivery;
+
+	RETURN vHasDelivery;
+
+	DROP TEMPORARY TABLE tmp.zoneGetAgency;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 2e5982c82..0e52abe1c 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -21,6 +21,7 @@ BEGIN
 		SELECT clientFk
 			FROM vn.ticket
 			WHERE shipped BETWEEN vShipped AND util.dayEnd(vShipped)
+				AND NOT isDeleted
 	)
 	SELECT c.id,
 			c.name,
@@ -50,7 +51,8 @@ BEGIN
 			AND c.isActive
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
-			AND (d.id = vDepartmentFk OR NOT vDepartmentFk)
+			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
+			AND vn.address_hasDelivery(c.defaultAddressFk, vShipped)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

From 6ab0515f8ec48380d19e23fab63e0090877f6d8d Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 15 Jan 2025 12:31:28 +0100
Subject: [PATCH 27/57] feat: refs #8398 sendCheckingPresence

---
 modules/ticket/back/methods/ticket/merge.js | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/merge.js b/modules/ticket/back/methods/ticket/merge.js
index 1106cef06..6922ad170 100644
--- a/modules/ticket/back/methods/ticket/merge.js
+++ b/modules/ticket/back/methods/ticket/merge.js
@@ -40,21 +40,23 @@ module.exports = Self => {
 
         try {
             for (let ticket of tickets) {
-                const originFullPath = `${url}ticket/${ticket.originId}/summary`;
-                const destinationFullPath = `${url}ticket/${ticket.destinationId}/summary`;
-                const message = $t('Ticket merged', {
-                    originDated: dateUtil.toString(new Date(ticket.originShipped)),
-                    destinationDated: dateUtil.toString(new Date(ticket.destinationShipped)),
-                    originId: ticket.originId,
-                    destinationId: ticket.destinationId,
-                    originFullPath,
-                    destinationFullPath
-                });
                 if (!ticket.originId || !ticket.destinationId) continue;
 
                 await models.Sale.updateAll({ticketFk: ticket.originId}, {ticketFk: ticket.destinationId}, myOptions);
-                if (await models.Ticket.setDeleted(ctx, ticket.originId, myOptions))
-                    await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
+                if (await models.Ticket.setDeleted(ctx, ticket.originId, myOptions)) {
+                    if (!ticket.salesPersonFk) continue;
+                    const originFullPath = `${url}ticket/${ticket.originId}/summary`;
+                    const destinationFullPath = `${url}ticket/${ticket.destinationId}/summary`;
+                    const message = $t('Ticket merged', {
+                        originDated: dateUtil.toString(new Date(ticket.originShipped)),
+                        destinationDated: dateUtil.toString(new Date(ticket.destinationShipped)),
+                        originId: ticket.originId,
+                        destinationId: ticket.destinationId,
+                        originFullPath,
+                        destinationFullPath
+                    });
+                    await models.Chat.sendCheckingPresence(ctx, ticket.salesPersonFk, message);
+                }
             }
             if (tx)
                 await tx.commit();

From 416e6c81f152850a3d4da974e4f2e8df8252b677 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Wed, 15 Jan 2025 15:22:48 +0100
Subject: [PATCH 28/57] refactor: refs #8378 deprecate bi.f_tvc

---
 db/versions/11410-blackTulip/00-firstScript.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 db/versions/11410-blackTulip/00-firstScript.sql

diff --git a/db/versions/11410-blackTulip/00-firstScript.sql b/db/versions/11410-blackTulip/00-firstScript.sql
new file mode 100644
index 000000000..e300c4b7c
--- /dev/null
+++ b/db/versions/11410-blackTulip/00-firstScript.sql
@@ -0,0 +1,2 @@
+RENAME TABLE bi.f_tvc TO bi.f_tvc__;
+ALTER TABLE bi.f_tvc__ COMMENT='@deprecated 2025-01-15';
\ No newline at end of file

From c24b00856765fbd09c5d5a73182508619ddeb8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Wed, 15 Jan 2025 16:34:44 +0000
Subject: [PATCH 29/57] Actualizar modules/travel/back/methods/travel/filter.js

---
 modules/travel/back/methods/travel/filter.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/travel/back/methods/travel/filter.js b/modules/travel/back/methods/travel/filter.js
index d10ff080b..837e30b30 100644
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@@ -1,4 +1,3 @@
-
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
@@ -179,11 +178,11 @@ module.exports = Self => {
                     win.name warehouseInName,
                     wout.name warehouseOutName,
                     cnt.code continent
-                FROM vn.travel t
-                    JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-                    JOIN vn.warehouse win ON win.id = t.warehouseInFk
-                    JOIN vn.warehouse wout ON wout.id = t.warehouseOutFk
-                    JOIN vn.awb a ON a.id = t.awbFk
+                FROM travel t
+                    JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN warehouse win ON win.id = t.warehouseInFk
+                    JOIN warehouse wout ON wout.id = t.warehouseOutFk
+                    LEFT JOIN awb a ON a.id = t.awbFk
                     JOIN warehouse wo ON wo.id = t.warehouseOutFk
                     JOIN country c ON c.id = wo.countryFk
                     LEFT JOIN continent cnt ON cnt.id = c.continentFk) AS t`

From 4853e45051b139b79bb5733bd1dd0970b22d0630 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 16 Jan 2025 07:29:40 +0100
Subject: [PATCH 30/57] feat: refs #8398 change merge.spec

---
 db/routines/vn/procedures/ticket_canbePostponed.sql    | 2 ++
 modules/ticket/back/methods/ticket/specs/merge.spec.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/ticket_canbePostponed.sql b/db/routines/vn/procedures/ticket_canbePostponed.sql
index 1f3c43057..a21e171cf 100644
--- a/db/routines/vn/procedures/ticket_canbePostponed.sql
+++ b/db/routines/vn/procedures/ticket_canbePostponed.sql
@@ -19,6 +19,7 @@ BEGIN
 			sub2.iptd futureIpt,
 			sub2.state futureState,
 			t.clientFk,
+			cl.salespersonFk,
 			t.warehouseFk,
 			ts.alertLevel,
 			sub2.alertLevel futureAlertLevel,
@@ -38,6 +39,7 @@ BEGIN
 			JOIN vn.province p ON p.id = a.provinceFk
 			JOIN vn.country c ON c.id = p.countryFk
 			JOIN vn.ticketState ts ON ts.ticketFk = t.id
+			JOIN vn.client cl ON cl.id = t.clientFk
 			JOIN vn.state st ON st.id = ts.stateFk
 			JOIN vn.alertLevel al ON al.id = ts.alertLevel
 			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 68f9d3393..99e0c6e81 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -7,7 +7,7 @@ describe('ticket merge()', () => {
         destinationId: 12,
         originShipped: Date.vnNew(),
         destinationShipped: Date.vnNew(),
-        workerFk: 1
+        salesPersonFk: 1
     };
 
     it('should merge two tickets', async() => {

From 4d98c340d210635d1546e15ea7e74dc620c05b00 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 16 Jan 2025 09:34:18 +0100
Subject: [PATCH 31/57] feat: refs #7882 Added coords to create a address

---
 modules/client/back/methods/client/createAddress.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/client/back/methods/client/createAddress.js b/modules/client/back/methods/client/createAddress.js
index 2709632cb..6bd4a26c1 100644
--- a/modules/client/back/methods/client/createAddress.js
+++ b/modules/client/back/methods/client/createAddress.js
@@ -52,6 +52,14 @@ module.exports = function(Self) {
             arg: 'customsAgentFk',
             type: 'number'
         },
+        {
+            arg: 'longitude',
+            type: 'number'
+        },
+        {
+            arg: 'latitude',
+            type: 'number'
+        },
         {
             arg: 'isActive',
             type: 'boolean'

From 125b7730e736b2e8421e4226c624a80d4d109230 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 16 Jan 2025 12:56:04 +0100
Subject: [PATCH 32/57] feat: refs #8298 update price calculation logic and add
 packagesDiscountFactor column to client table

---
 db/routines/vn/procedures/catalog_componentCalculate.sql | 6 +-----
 db/versions/11398-orangeRose/02-clientAlter.sql          | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/routines/vn/procedures/catalog_componentCalculate.sql b/db/routines/vn/procedures/catalog_componentCalculate.sql
index 991ff412f..aaf2db408 100644
--- a/db/routines/vn/procedures/catalog_componentCalculate.sql
+++ b/db/routines/vn/procedures/catalog_componentCalculate.sql
@@ -236,11 +236,7 @@ BEGIN
 					ic.cm3delivery
 					* (
 						(
-							zo.price
-							- (
-								(zo.price - zo.priceOptimum)
-								* c.packagesDiscountFactor
-							)
+							zo.priceOptimum + (( zo.price - zo.priceOptimum) * 2 * ( 1 - c.packagesDiscountFactor))
 						)
 						- IFNULL(zo.bonus, 0)
 					)
diff --git a/db/versions/11398-orangeRose/02-clientAlter.sql b/db/versions/11398-orangeRose/02-clientAlter.sql
index 4119f05ff..b5275a301 100644
--- a/db/versions/11398-orangeRose/02-clientAlter.sql
+++ b/db/versions/11398-orangeRose/02-clientAlter.sql
@@ -1,3 +1,3 @@
 ALTER TABLE `vn`.`client`
   ADD COLUMN `packagesDiscountFactor` DECIMAL(4,3) NOT NULL DEFAULT 1.000
-    COMMENT 'Factor (1-0) que pondera el precio final entre priceOptimum (mejor) y price (peor)';
+    COMMENT 'Porcentaje de ajuste entre el numero de bultos medio del cliente, y el número medio óptimo para las zonas en las que compra';

From 69b78b6bf1b2b36822a043e36b58f04b5f6667d2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 16 Jan 2025 15:04:21 +0100
Subject: [PATCH 33/57] feat: refs #7531 Added address_hasDelivery

---
 db/routines/vn/functions/address_hasDelivery.sql | 12 ++++++++++--
 db/routines/vn/procedures/zone_getAddresses.sql  |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
index f37edbd34..719cc14f0 100644
--- a/db/routines/vn/functions/address_hasDelivery.sql
+++ b/db/routines/vn/functions/address_hasDelivery.sql
@@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(vSelf INT, vLanded DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(
+	vSelf INT,
+	vAgencyModeFk INT,
+	vLanded DATE
+)
 	RETURNS BOOL
 	DETERMINISTIC
 BEGIN
@@ -15,7 +19,11 @@ BEGIN
 
 	CALL zone_getAgency(vSelf, vLanded);
 
-	SELECT EXISTS (SELECT TRUE FROM tmp.zoneGetAgency) INTO vHasDelivery;
+	SELECT EXISTS(
+		SELECT TRUE
+			FROM tmp.zoneGetAgency
+			WHERE agencyModeFk = vAgencyModeFk
+	) INTO vHasDelivery;
 
 	RETURN vHasDelivery;
 
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 0e52abe1c..05267c14c 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -1,6 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
 	vSelf INT,
+	vAgencyModeFk INT,
 	vShipped DATE,
 	vDepartmentFk INT
 )
@@ -52,7 +53,7 @@ BEGIN
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
 			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
-			AND vn.address_hasDelivery(c.defaultAddressFk, vShipped)
+			AND vn.address_hasDelivery(c.defaultAddressFk, vAgencyModeFk, vShipped)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

From 1aa1fbda6cc12818da9071ba0d779a6d440c7699 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 17 Jan 2025 08:10:26 +0100
Subject: [PATCH 34/57] feat: refs #7531 Added address_hasDelivery

---
 db/routines/vn/procedures/zone_getAddresses.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 05267c14c..90ad89bf3 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -1,7 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
 	vSelf INT,
-	vAgencyModeFk INT,
 	vShipped DATE,
 	vDepartmentFk INT
 )
@@ -16,6 +15,12 @@ BEGIN
  * @param vDepartmentFk Id de departamento
  * @return Un select
  */
+	DECLARE vAgencyModeFk INT;
+
+	SELECT agencyModeFk INTO vAgencyModeFk
+		FROM `zone`
+		WHERE id = vSelf;
+
 	CALL zone_getPostalCode(vSelf);
 
 	WITH clientWithTicket AS (

From a666cfa4cdbb442e524d7f55ab049669b8d8035d Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 17 Jan 2025 09:40:07 +0100
Subject: [PATCH 35/57] feat: refs #7531 Added address_hasDelivery

---
 .../vn/functions/address_hasDelivery.sql       |  9 ++++++++-
 .../vn/procedures/zone_getAddresses.sql        | 18 ++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
index 719cc14f0..6b3962e1d 100644
--- a/db/routines/vn/functions/address_hasDelivery.sql
+++ b/db/routines/vn/functions/address_hasDelivery.sql
@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(
 	vSelf INT,
-	vAgencyModeFk INT,
+	vZoneFk INT,
 	vLanded DATE
 )
 	RETURNS BOOL
@@ -12,10 +12,16 @@ BEGIN
  * la dirección y fecha solicitada.
  *
  * @param vSelf Id de dirección de envío
+ * @param vZoneFk Id de zona
  * @param vLanded Fecha de entrega
  * @return true|false
  */
 	DECLARE vHasDelivery BOOL;
+	DECLARE vAgencyModeFk INT;
+
+	SELECT agencyModeFk INTO vAgencyModeFk
+		FROM `zone`
+		WHERE id = vZoneFk;
 
 	CALL zone_getAgency(vSelf, vLanded);
 
@@ -23,6 +29,7 @@ BEGIN
 		SELECT TRUE
 			FROM tmp.zoneGetAgency
 			WHERE agencyModeFk = vAgencyModeFk
+				AND zoneFk = vZoneFk
 	) INTO vHasDelivery;
 
 	RETURN vHasDelivery;
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 90ad89bf3..eeee6c598 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
 	vSelf INT,
-	vShipped DATE,
+	vLanded DATE,
 	vDepartmentFk INT
 )
 BEGIN
@@ -11,22 +11,16 @@ BEGIN
  * vender producto para esa zona.
  *
  * @param vSelf Id de zona
- * @param vShipped Fecha de envio
+ * @param vLanded Fecha de entrega
  * @param vDepartmentFk Id de departamento
  * @return Un select
  */
-	DECLARE vAgencyModeFk INT;
-
-	SELECT agencyModeFk INTO vAgencyModeFk
-		FROM `zone`
-		WHERE id = vSelf;
-
 	CALL zone_getPostalCode(vSelf);
 
 	WITH clientWithTicket AS (
-		SELECT clientFk
+		SELECT DISTINCT clientFk
 			FROM vn.ticket
-			WHERE shipped BETWEEN vShipped AND util.dayEnd(vShipped)
+			WHERE shipped BETWEEN vLanded - INTERVAL 1 DAY AND util.dayEnd(vLanded - INTERVAL 1 DAY)
 				AND NOT isDeleted
 	)
 	SELECT c.id,
@@ -37,7 +31,7 @@ BEGIN
 			u.name username,
 			aai.invoiced,
 			cnb.lastShipped,
-			cwt.clientFk
+			IF(cwt.clientFk, TRUE, FALSE) hasTicket
 		FROM vn.client c
 			JOIN vn.worker w ON w.id = c.salesPersonFk
 			JOIN vn.workerDepartment wd ON wd.workerFk = w.id
@@ -58,7 +52,7 @@ BEGIN
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
 			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
-			AND vn.address_hasDelivery(c.defaultAddressFk, vAgencyModeFk, vShipped)
+			AND vn.address_hasDelivery(c.defaultAddressFk, vSelf, vLanded)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

From e636d43f0492bf161b181fe2d4f147e163652387 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 17 Jan 2025 09:42:15 +0100
Subject: [PATCH 36/57] feat: refs #7531 Added address_hasDelivery

---
 db/routines/vn/functions/address_hasDelivery.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
index 6b3962e1d..c4f1644ce 100644
--- a/db/routines/vn/functions/address_hasDelivery.sql
+++ b/db/routines/vn/functions/address_hasDelivery.sql
@@ -9,7 +9,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(
 BEGIN
 /**
  * Retorna si hay reparto disponible para
- * la dirección y fecha solicitada.
+ * la dirección, zona y fecha solicitada.
  *
  * @param vSelf Id de dirección de envío
  * @param vZoneFk Id de zona

From 1cdeadb59de1288857e0df6ed058e08aa1375413 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Fri, 17 Jan 2025 13:20:45 +0100
Subject: [PATCH 37/57] feat: refs #8258 added uppercase validation on supplier
 create

---
 loopback/locale/es.json                               | 5 +++--
 modules/supplier/back/methods/supplier/newSupplier.js | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index cde81e0cb..3183a9697 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -398,5 +398,6 @@
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"All tickets have a route order": "Todos los tickets tienen orden de ruta",
 	"Price cannot be blank": "Price cannot be blank",
-    "There are tickets to be invoiced": "La zona tiene tickets por facturar"
-}
+	"There are tickets to be invoiced": "La zona tiene tickets por facturar",
+	"Social name should be uppercase": "La razón social debe ir en mayúscula"
+}
\ No newline at end of file
diff --git a/modules/supplier/back/methods/supplier/newSupplier.js b/modules/supplier/back/methods/supplier/newSupplier.js
index 3cca4195f..eb941ed69 100644
--- a/modules/supplier/back/methods/supplier/newSupplier.js
+++ b/modules/supplier/back/methods/supplier/newSupplier.js
@@ -28,6 +28,7 @@ module.exports = Self => {
 
         delete args.ctx;
         if (!args.name) throw new UserError('The social name cannot be empty');
+        if (args.name !== args.name.toUpperCase()) throw new UserError('Social name should be uppercase');
         const data = {...args, ...{nickname: args.name}};
         const supplier = await models.Supplier.create(data, myOptions);
 

From 5fe032ac75d893749bc31892b1d03bc3517d703f Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Sun, 19 Jan 2025 08:30:14 +0100
Subject: [PATCH 38/57] feat: refs #8401 create triggers to itemTaxCountry

---
 db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql | 9 +++++++++
 db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql

diff --git a/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql b/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql
new file mode 100644
index 000000000..d30cae7b8
--- /dev/null
+++ b/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeDelete`
+	BEFORE DELETE ON `itemTaxCountry`
+	FOR EACH ROW
+BEGIN
+	SIGNAL SQLSTATE '45000'
+	SET MESSAGE_TEXT = 'Records in this table cannot be deleted';
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql b/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
index ad7d6327b..2552b8914 100644
--- a/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
+++ b/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
@@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeUp
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
+	IF NOT(NEW.countryFk <=> OLD.countryFk) THEN
+		CALL util.throw('Only the VAT can be modified');
+	END IF;
 END$$
 DELIMITER ;

From 044a22bc3e209faf2ee04fd57de29f6d4776eed9 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 20 Jan 2025 07:13:04 +0100
Subject: [PATCH 39/57] feat: refs #7531 Deleted address_hasDelivery

---
 .../vn/functions/address_hasDelivery.sql      | 39 -------------------
 .../vn/procedures/zone_getAddresses.sql       |  1 -
 2 files changed, 40 deletions(-)
 delete mode 100644 db/routines/vn/functions/address_hasDelivery.sql

diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
deleted file mode 100644
index c4f1644ce..000000000
--- a/db/routines/vn/functions/address_hasDelivery.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(
-	vSelf INT,
-	vZoneFk INT,
-	vLanded DATE
-)
-	RETURNS BOOL
-	DETERMINISTIC
-BEGIN
-/**
- * Retorna si hay reparto disponible para
- * la dirección, zona y fecha solicitada.
- *
- * @param vSelf Id de dirección de envío
- * @param vZoneFk Id de zona
- * @param vLanded Fecha de entrega
- * @return true|false
- */
-	DECLARE vHasDelivery BOOL;
-	DECLARE vAgencyModeFk INT;
-
-	SELECT agencyModeFk INTO vAgencyModeFk
-		FROM `zone`
-		WHERE id = vZoneFk;
-
-	CALL zone_getAgency(vSelf, vLanded);
-
-	SELECT EXISTS(
-		SELECT TRUE
-			FROM tmp.zoneGetAgency
-			WHERE agencyModeFk = vAgencyModeFk
-				AND zoneFk = vZoneFk
-	) INTO vHasDelivery;
-
-	RETURN vHasDelivery;
-
-	DROP TEMPORARY TABLE tmp.zoneGetAgency;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index eeee6c598..45c82de07 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -52,7 +52,6 @@ BEGIN
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
 			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
-			AND vn.address_hasDelivery(c.defaultAddressFk, vSelf, vLanded)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;

From e6abb1d759ac55f7b43b6d7452ee99c91a3ee4ab Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 20 Jan 2025 07:41:41 +0100
Subject: [PATCH 40/57] feat: refs #7531 Minor change

---
 db/routines/vn/procedures/zone_getAddresses.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 45c82de07..5a1380126 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -8,7 +8,7 @@ BEGIN
 /**
  * Devuelve un listado de todos los clientes activos
  * con consignatarios a los que se les puede
- * vender producto para esa zona.
+ * entregar producto para esa zona.
  *
  * @param vSelf Id de zona
  * @param vLanded Fecha de entrega
@@ -20,7 +20,7 @@ BEGIN
 	WITH clientWithTicket AS (
 		SELECT DISTINCT clientFk
 			FROM vn.ticket
-			WHERE shipped BETWEEN vLanded - INTERVAL 1 DAY AND util.dayEnd(vLanded - INTERVAL 1 DAY)
+			WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
 				AND NOT isDeleted
 	)
 	SELECT c.id,

From 934507569e8963141036197a44d6e539254c5a95 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 20 Jan 2025 07:48:43 +0100
Subject: [PATCH 41/57] feat: refs #7531 Added comment

---
 db/routines/vn/procedures/zone_getAddresses.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 5a1380126..9946b0b73 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -12,7 +12,7 @@ BEGIN
  *
  * @param vSelf Id de zona
  * @param vLanded Fecha de entrega
- * @param vDepartmentFk Id de departamento
+ * @param vDepartmentFk Id de departamento | NULL para mostrar todos
  * @return Un select
  */
 	CALL zone_getPostalCode(vSelf);

From 9584ffcf5bb113284d235e05802e2a038887e529 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 20 Jan 2025 08:10:12 +0100
Subject: [PATCH 42/57] feat: refs #7531 Added landed index

---
 db/versions/11415-chocolateTulip/00-firstScript.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/versions/11415-chocolateTulip/00-firstScript.sql

diff --git a/db/versions/11415-chocolateTulip/00-firstScript.sql b/db/versions/11415-chocolateTulip/00-firstScript.sql
new file mode 100644
index 000000000..2ed7ec9b5
--- /dev/null
+++ b/db/versions/11415-chocolateTulip/00-firstScript.sql
@@ -0,0 +1 @@
+CREATE INDEX ticket_landed_IDX USING BTREE ON vn.ticket (landed);

From cb065f42cde28963df88b29f69a4dd02e7c21797 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 20 Jan 2025 11:19:24 +0100
Subject: [PATCH 43/57] feat: refs #8401 change request

---
 db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql b/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql
index d30cae7b8..461b861f2 100644
--- a/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql
+++ b/db/routines/vn/triggers/itemTaxCountry_beforeDelete.sql
@@ -3,7 +3,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeDe
 	BEFORE DELETE ON `itemTaxCountry`
 	FOR EACH ROW
 BEGIN
-	SIGNAL SQLSTATE '45000'
-	SET MESSAGE_TEXT = 'Records in this table cannot be deleted';
+	CALL util.throw('Records in this table cannot be deleted');
 END$$
 DELIMITER ;

From 316a17304fd94988115d0b9f387edaf4ceb38540 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 20 Jan 2025 12:26:29 +0100
Subject: [PATCH 44/57] feat: refs #8401 restriction itemFk

---
 db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql b/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
index 2552b8914..5220028e8 100644
--- a/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
+++ b/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeUp
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 
-	IF NOT(NEW.countryFk <=> OLD.countryFk) THEN
+	IF NOT(NEW.`countryFk` <=> OLD.`countryFk`) OR NOT(NEW.`itemFk` <=> OLD.`itemFk`) THEN
 		CALL util.throw('Only the VAT can be modified');
 	END IF;
 END$$

From 0340612645ab456997ba034775c0de3cab70aff1 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 Jan 2025 12:35:55 +0100
Subject: [PATCH 45/57] feat: refs #7569 refs#7569 sendEmailNotification

---
 loopback/locale/en.json                          |  2 +-
 loopback/locale/es.json                          |  3 ++-
 loopback/locale/fr.json                          |  2 +-
 loopback/locale/pt.json                          |  2 +-
 modules/ticket/back/methods/ticket/saveSign.js   | 12 +++++-------
 .../back/methods/ticket/specs/saveSign.spec.js   | 16 ++++++++++++----
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 0f53cf572..d39b1bac5 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -249,5 +249,5 @@
 	"Sales already moved": "Sales already moved",
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
-	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order. Tickets that have not been delivered in their route are: {{ ticketsToMail }}"
+	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order."
 }
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 163fbaa71..b9207d9cf 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -394,5 +394,6 @@
 	"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden. Los tickets de la ruta que no han sido entregados en su orden son: {{ ticketsToMail }}"
+	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
+	"Price cannot be blank": "Price cannot be blank"
 }
\ No newline at end of file
diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json
index 082aedd2b..66098bac5 100644
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@@ -368,5 +368,5 @@
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
 	"The web user's email already exists": "L'email de l'internaute existe déjà",
 	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
-	"Ticket has been delivered out of order": "Le ticket {{ticket}} {{{fullUrl}}} a été livré hors ordre. Les tickets qui n'ont pas été livrés dans leur itinéraire sont : {{ticketsToMail}}"
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} {{{fullUrl}}} a été livré hors ordre."
 }
\ No newline at end of file
diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json
index 1fa16074f..240d239d6 100644
--- a/loopback/locale/pt.json
+++ b/loopback/locale/pt.json
@@ -367,5 +367,5 @@
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
 	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
 	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "O ticket {{ticket}} {{{fullUrl}}} foi entregue fora de ordem. Os tickets que não foram entregues na sua rota são: {{ ticketsToMail }}"
+	"Ticket has been delivered out of order": "O ticket {{ticket}} {{{fullUrl}}} foi entregue fora de ordem."
 }
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index 443b2c1c7..9c33797b6 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -162,7 +162,7 @@ module.exports = Self => {
                         fields: ['id']
                     }, myOptions);
 
-                    const ticketsToMail = await Self.rawSql(`
+                    const ticketIncorrect = await Self.rawSql(`
                         SELECT t.id
                         FROM ticket t
                             JOIN ticketState ts ON ts.ticketFk = t.id
@@ -173,10 +173,9 @@ module.exports = Self => {
                                             FROM ticket t
                                             WHERE t.id = ?)`
                     , [ticket.routeFk, orderState.id, ticket.id], myOptions);
-                    const ticketIds = ticketsToMail.map(row => row.id);
 
-                    if (ticketsToMail)
-                        await sendMail(ctx, ticket.routeFk, ticket.id, ticket.zone().name, ticketIds);
+                    if (ticketIncorrect && ticketIncorrect.length > 0)
+                        await sendMail(ctx, ticket.routeFk, ticket.id, ticket.zone().name);
                 }
 
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.$cmrFk) {
@@ -192,7 +191,7 @@ module.exports = Self => {
         await models.Ticket.sendCmrEmail(ctx, externalTickets);
     };
 
-    async function sendMail(ctx, route, ticket, zoneName, ticketsToMail) {
+    async function sendMail(ctx, route, ticket, zoneName) {
         const $t = ctx.req.__;
         const url = await Self.app.models.Url.getUrl();
         const sendTo = 'repartos@verdnatura.es';
@@ -203,8 +202,7 @@ module.exports = Self => {
         });
         const emailBody = $t('Ticket has been delivered out of order', {
             ticket,
-            fullUrl,
-            ticketsToMail,
+            fullUrl
         });
 
         await Self.app.models.Mail.create({
diff --git a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
index ed802e311..7098ee1fc 100644
--- a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
@@ -1,14 +1,22 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('Ticket saveSign()', () => {
     let ctx = {req: {
         getLocale: () => {
             return 'en';
         },
+        __: () => {},
         accessToken: {userId: 9}
-    }};
+    }
+    };
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx
+        });
+    });
 
-    it(`should throw error if the ticket's alert level is lower than 2`, async() => {
+    fit(`should throw error if the ticket's alert level is lower than 2`, async() => {
         const tx = await models.TicketDms.beginTransaction({});
         const ticketWithOkState = 12;
         let error;
@@ -27,7 +35,7 @@ describe('Ticket saveSign()', () => {
         expect(error).toBeDefined();
     });
 
-    it('should change state for ticket', async() => {
+    fit('should change state for ticket', async() => {
         const tx = await models.Ticket.beginTransaction({});
         const ticketWithPackedState = 7;
         spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]);
@@ -52,7 +60,7 @@ describe('Ticket saveSign()', () => {
         expect(ticketTrackingAfter.name).toBe('Entregado en parte');
     });
 
-    it('should send an email to notify that the delivery order is not correct', async() => {
+    fit('should send an email to notify that the delivery order is not correct', async() => {
         const tx = await models.Ticket.beginTransaction({});
         const ticketFk = 8;
         const priority = 5;

From b5e27707a73f339e2d4d5fbe27d76b3765ca9041 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 Jan 2025 12:36:31 +0100
Subject: [PATCH 46/57] feat: refs #7569 refs#7569 sendEmailNotification

---
 modules/ticket/back/methods/ticket/specs/saveSign.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
index 7098ee1fc..9cc262ea0 100644
--- a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
@@ -16,7 +16,7 @@ describe('Ticket saveSign()', () => {
         });
     });
 
-    fit(`should throw error if the ticket's alert level is lower than 2`, async() => {
+    it(`should throw error if the ticket's alert level is lower than 2`, async() => {
         const tx = await models.TicketDms.beginTransaction({});
         const ticketWithOkState = 12;
         let error;
@@ -35,7 +35,7 @@ describe('Ticket saveSign()', () => {
         expect(error).toBeDefined();
     });
 
-    fit('should change state for ticket', async() => {
+    it('should change state for ticket', async() => {
         const tx = await models.Ticket.beginTransaction({});
         const ticketWithPackedState = 7;
         spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]);

From ef68884fe0b5f656540cfeddf1d3a6f711bd6259 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 Jan 2025 16:27:35 +0100
Subject: [PATCH 47/57] feat: refs #7569 refs#7569 sendEmailNotification

---
 loopback/locale/es.json                                   | 2 +-
 modules/ticket/back/methods/ticket/saveSign.js            | 2 +-
 modules/ticket/back/methods/ticket/specs/saveSign.spec.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index b9207d9cf..eff238150 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -395,5 +395,5 @@
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
 	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
-	"Price cannot be blank": "Price cannot be blank"
+	"Price cannot be blank": "El precio no puede estar en blanco"
 }
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index 9c33797b6..f99311c39 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -174,7 +174,7 @@ module.exports = Self => {
                                             WHERE t.id = ?)`
                     , [ticket.routeFk, orderState.id, ticket.id], myOptions);
 
-                    if (ticketIncorrect && ticketIncorrect.length > 0)
+                    if (ticketIncorrect?.length > 0)
                         await sendMail(ctx, ticket.routeFk, ticket.id, ticket.zone().name);
                 }
 
diff --git a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
index 9cc262ea0..3b426c2cf 100644
--- a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js
@@ -60,7 +60,7 @@ describe('Ticket saveSign()', () => {
         expect(ticketTrackingAfter.name).toBe('Entregado en parte');
     });
 
-    fit('should send an email to notify that the delivery order is not correct', async() => {
+    it('should send an email to notify that the delivery order is not correct', async() => {
         const tx = await models.Ticket.beginTransaction({});
         const ticketFk = 8;
         const priority = 5;

From eee73f001de867f11a0e68f863a9f40bb0bc0b7e Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Tue, 21 Jan 2025 07:00:02 +0100
Subject: [PATCH 48/57] Merge branch 'dev' of https: refs
 #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket

---
 loopback/locale/en.json | 2 --
 loopback/locale/es.json | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 4f6374a8f..2c180e204 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -247,8 +247,6 @@
 	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
 	"The raid information is not correct": "The raid information is not correct",
 	"Payment method is required": "Payment method is required",
-	"Sales already moved": "Sales already moved",
-	"Holidays to past days not available": "Holidays to past days not available",
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
 	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent""Sales already moved": "Sales already moved",
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 0203a3bc1..abd2f79a0 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -390,13 +390,11 @@
 	"The web user's email already exists": "El correo del usuario web ya existe",
 	"Sales already moved": "Ya han sido transferidas",
 	"The raid information is not correct": "La información de la redada no es correcta",
-	"There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
 	"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"All tickets have a route order": "Todos los tickets tienen orden de ruta",
-	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "La zona tiene tickets por facturar",
-	"Social name should be uppercase": "La razón social debe ir en mayúscula""Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
+	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
 	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
 	"Price cannot be blank": "El precio no puede estar en blanco"
 }
\ No newline at end of file

From c50ff6a43aa27323c9973b976c29da509920f4a6 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Tue, 21 Jan 2025 07:05:42 +0100
Subject: [PATCH 49/57] feat: refs #7569 refs#7569 sendEmailNotification

---
 loopback/locale/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 2c180e204..06428475f 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -249,7 +249,8 @@
 	"Payment method is required": "Payment method is required",
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
-	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent""Sales already moved": "Sales already moved",
+	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent",
+	"Sales already moved": "Sales already moved",
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
 	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order."

From 785a10a26aad2ffc70a8b55550dbd773fe979b1d Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 21 Jan 2025 09:34:56 +0100
Subject: [PATCH 50/57] feat: refs #8447 create tables tag

---
 .../11418-goldenRuscus/00-firstScript.sql     | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 db/versions/11418-goldenRuscus/00-firstScript.sql

diff --git a/db/versions/11418-goldenRuscus/00-firstScript.sql b/db/versions/11418-goldenRuscus/00-firstScript.sql
new file mode 100644
index 000000000..6c623d7b7
--- /dev/null
+++ b/db/versions/11418-goldenRuscus/00-firstScript.sql
@@ -0,0 +1,130 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS `vn`.`itemSoldOutTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT 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`.`itemSoldOutTag` (`name`) VALUES ('Ultimas unidades');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Temporalmente');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Descatalogado');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta mayo');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta febrero');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta diciembre');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta enero');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta marzo');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta nueva temporada');
+INSERT IGNORE INTO `vn`.`itemSoldOutTag` (`name`) VALUES ('Hasta septiembre');
+
+UPDATE vn.tag
+	SET isFree=FALSE,
+		sourceTable='itemSoldOutTag'
+	WHERE name= 'Agotado';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemDurationTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT 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`.`itemDurationTag` (`name`) VALUES ('10 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('11 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('12 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('13 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('14 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('15 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('17 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('7 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('9 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('16-20 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('17-21 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('19-23 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('3-4 semanas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('13-17 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('14-16 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('15-19 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('18-25 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('20 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('6 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('9 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('10-13 días');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('6 meses');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('5 años');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('10 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('20 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('35 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('6 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('11 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('12 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('14 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('15 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('18 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('19 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('24 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('25 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('30 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('32 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('4 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('40 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('45 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('50 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('55 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('70 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('8 horas');
+INSERT IGNORE INTO `vn`.`itemDurationTag` (`name`) VALUES ('9 horas');
+
+UPDATE vn.tag
+	SET isFree=FALSE,
+		sourceTable='itemDurationTag'
+	WHERE name= 'Duracion';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemGrowingTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT 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`.`itemGrowingTag` (`name`) VALUES ('01-05');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-06');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('02-06');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-05');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-07');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-08');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('03-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('04-06');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('04-09');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('04-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-07');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-08');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-10');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('05-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('06-09');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('06-10');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('06-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-09');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-10');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-11');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('07-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('09-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-04 / 10-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-04 / 9-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-05 / 10-12');
+INSERT IGNORE INTO `vn`.`itemGrowingTag` (`name`) VALUES ('01-05 / 11-12');
+
+UPDATE vn.tag
+	SET isFree=FALSE,
+		sourceTable='itemGrowingTag'
+	WHERE name= 'Recolecta';
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemSoldOutTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemDurationTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemGrowingTag TO logisticAssist;

From 05b383ecb01ad4fc5606aa73bdff2cc2c9f1b1d6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 21 Jan 2025 10:57:40 +0100
Subject: [PATCH 51/57] test: refs #8448 fix e2e

---
 e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js | 16 +---------------
 e2e/paths/05-ticket/06_basic_data_steps.spec.js  |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
index d9689e31a..af1dc56bc 100644
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@@ -238,25 +238,11 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.globalItems.cancelButton);
     });
 
-    it('should select the third sale and create a claim of it', async() => {
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitForNavigation();
-    });
-
-    it('should search for a ticket then access to the sales section', async() => {
-        await page.goBack();
-        await page.goBack();
+    it('should select the third sale and delete it', async() => {
         await page.loginAndModule('salesPerson', 'ticket');
         await page.accessToSearchResult('16');
         await page.accessToSection('ticket.card.sale');
-    });
 
-    it('should select the third sale and delete it', async() => {
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.deleteSaleButton);
         await page.waitToClick(selectors.globalItems.acceptButton);
diff --git a/e2e/paths/05-ticket/06_basic_data_steps.spec.js b/e2e/paths/05-ticket/06_basic_data_steps.spec.js
index 77f0e0459..0a3ae4edc 100644
--- a/e2e/paths/05-ticket/06_basic_data_steps.spec.js
+++ b/e2e/paths/05-ticket/06_basic_data_steps.spec.js
@@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => {
         const result = await page
             .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
 
-        expect(result).toContain('-€228.25');
+        expect(result).toContain('-€111.75');
     });
 
     it(`should select a new reason for the changes made then click on finalize`, async() => {

From 9d289fa11efcc41b8507710d8584807f9eb1bbd9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 21 Jan 2025 11:57:35 +0100
Subject: [PATCH 52/57] build: init version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e4cbf1406..72f8e2d1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "25.04.0",
+    "version": "25.06.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

From 43528a0a5338c6e53c02b21fb74a253c7fb8ae29 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Wed, 22 Jan 2025 13:04:16 +0100
Subject: [PATCH 53/57] feat: refs #8342 deprecate sorter and splitLine tables

---
 db/routines/vn2008/views/Split_lines.sql            | 8 --------
 db/versions/11422-blackAsparagus/00-firstScript.sql | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 db/routines/vn2008/views/Split_lines.sql
 create mode 100644 db/versions/11422-blackAsparagus/00-firstScript.sql

diff --git a/db/routines/vn2008/views/Split_lines.sql b/db/routines/vn2008/views/Split_lines.sql
deleted file mode 100644
index 0b7897be7..000000000
--- a/db/routines/vn2008/views/Split_lines.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Split_lines`
-AS SELECT `sl`.`id` AS `Id_Split_lines`,
-	`sl`.`splitFk` AS `Id_Split`,
-	`sl`.`itemFk` AS `Id_Article`,
-	`sl`.`buyFk` AS `Id_Compra`
-FROM `vn`.`splitLine` `sl`
\ No newline at end of file
diff --git a/db/versions/11422-blackAsparagus/00-firstScript.sql b/db/versions/11422-blackAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..bb0e7c3e9
--- /dev/null
+++ b/db/versions/11422-blackAsparagus/00-firstScript.sql
@@ -0,0 +1,5 @@
+RENAME TABLE vn.sorter TO vn.sorter__;
+ALTER TABLE vn.sorter__ COMMENT='@deprecated 2025-01-22';
+
+RENAME TABLE vn.splitLine TO vn.splitLine__;
+ALTER TABLE vn.splitLine__ COMMENT='@deprecated 2025-01-22';
\ No newline at end of file

From 0eff155dafa5da11e584bb093d9ee1f8e165d22e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 22 Jan 2025 16:34:14 +0100
Subject: [PATCH 54/57] refactor: refs #7184 created myteam filter and modified
 filters where it is used

---
 modules/claim/back/methods/claim/filter.js    | 22 +++-------
 .../back/methods/sales-monitor/salesFilter.js | 22 +++-------
 modules/order/back/methods/order/filter.js    | 24 +++--------
 .../back/methods/ticket-request/filter.js     | 21 +++------
 modules/ticket/back/methods/ticket/filter.js  | 24 +++--------
 modules/worker/back/methods/worker/filter.js  | 17 ++++++++
 modules/worker/back/methods/worker/myTeam.js  | 43 +++++++++++++++++++
 modules/worker/back/models/worker.js          |  1 +
 8 files changed, 86 insertions(+), 88 deletions(-)
 create mode 100644 modules/worker/back/methods/worker/myTeam.js

diff --git a/modules/claim/back/methods/claim/filter.js b/modules/claim/back/methods/claim/filter.js
index bacdd4021..2fea40425 100644
--- a/modules/claim/back/methods/claim/filter.js
+++ b/modules/claim/back/methods/claim/filter.js
@@ -109,6 +109,7 @@ module.exports = Self => {
         const args = ctx.args;
         const myOptions = {};
         let to;
+        const myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -133,21 +134,8 @@ module.exports = Self => {
             claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
         }
 
-        // Apply filter by team
-        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);
-        }
+        if (args.myTeam != null)
+            myTeamIds.value = await models.Worker.myTeam(userId);
 
         const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -184,9 +172,9 @@ module.exports = Self => {
                 return {'t.zoneFk': value};
             case 'myTeam':
                 if (value)
-                    return {'cl.workerFk': {inq: teamMembersId}};
+                    return {'cl.workerFk': {inq: myTeamIds.value}};
                 else
-                    return {'cl.workerFk': {nin: teamMembersId}};
+                    return {'cl.workerFk': {nin: myTeamIds.value}};
             }
         });
 
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index ac8a722bd..3059154c5 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -123,25 +123,13 @@ module.exports = Self => {
         date.setHours(0, 0, 0, 0);
         const args = ctx.args;
         const myOptions = {};
+        const myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        // Apply filter by team
-        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);
-        }
+        if (args.myTeam != null)
+            myTeamIds.value = await models.Worker.myTeam(userId);
 
         if (ctx.args && args.to) {
             const dateTo = args.to;
@@ -163,9 +151,9 @@ module.exports = Self => {
             case 'mine':
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
                 else
-                    return {'c.salesPersonFk': {nin: teamMembersId}};
+                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
             case 'id':
             case 'clientFk':
                 param = `t.${param}`;
diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index 2aeb1aac5..465227621 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -80,29 +80,15 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const myOptions = {};
         const userId = ctx.req.accessToken.userId;
+        const myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         const args = ctx.args;
-        // Apply filter by team
-        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);
-        }
-
-        if (args?.myTeam)
-            args.teamIds = teamIds;
+        if (args.myTeam != null)
+            myTeamIds.value = await models.Worker.myTeam(userId);
 
         if (args?.to)
             args.to.setHours(23, 59, 0, 0);
@@ -133,9 +119,9 @@ module.exports = Self => {
                 return {'o.confirmed': value ? 1 : 0};
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
                 else
-                    return {'c.salesPersonFk': {nin: teamMembersId}};
+                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
             case 'showEmpty':
                 return {'o.total': {neq: value}};
             case 'id':
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index c2edcae81..4432a017a 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -87,6 +87,7 @@ module.exports = Self => {
         const myOptions = {};
         const models = Self.app.models;
         const args = ctx.args;
+        const myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -94,20 +95,8 @@ 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);
-        }
+        if (args.myTeam != null)
+            myTeamIds.value = await models.Worker.myTeam(userId);
 
         const today = Date.vnNew();
         const future = Date.vnNew();
@@ -145,9 +134,9 @@ module.exports = Self => {
                 return {'c.salesPersonFk': value};
             case 'myTeam':
                 if (value)
-                    return {'tr.requesterFk': {inq: teamMembersId}};
+                    return {'tr.requesterFk': {inq: myTeamIds.value}};
                 else
-                    return {'tr.requesterFk': {nin: teamMembersId}};
+                    return {'tr.requesterFk': {nin: myTeamIds.value}};
             case 'daysOnward':
                 today.setHours(0, 0, 0, 0);
                 future.setDate(today.getDate() + value);
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index c61223470..ba72f34ef 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -142,28 +142,14 @@ module.exports = Self => {
         date.setHours(0, 0, 0, 0);
         const models = Self.app.models;
         const args = ctx.args;
-
+        const myTeamIds = [];
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        // Apply filter by team
-        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);
-        }
+        if (args.myTeam != null)
+            myTeamIds.value = await models.Worker.myTeam(userId);
 
         if (ctx.args && args.to) {
             const dateTo = args.to;
@@ -195,9 +181,9 @@ module.exports = Self => {
             case 'mine':
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: teamMembersId}};
+                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
                 else
-                    return {'c.salesPersonFk': {nin: teamMembersId}};
+                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
 
             case 'alertLevel':
                 return {'ts.alertLevel': value};
diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js
index 52c60572a..06c4a694e 100644
--- a/modules/worker/back/methods/worker/filter.js
+++ b/modules/worker/back/methods/worker/filter.js
@@ -73,6 +73,11 @@ module.exports = Self => {
                 type: 'String',
                 description: 'The user email',
                 http: {source: 'query'}
+            },
+            {
+                arg: 'myTeam',
+                type: 'boolean',
+                description: 'Whether to show only tickets for the current logged user team (currently user tickets)'
             }
         ],
         returns: {
@@ -87,6 +92,13 @@ module.exports = Self => {
 
     Self.filter = async(ctx, filter) => {
         let conn = Self.dataSource.connector;
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const args = ctx.args;
+        const myTeamIds = [];
+
+        if (args.myTeam != null)
+            myTeamIds.value = await models.Worker.myTeam(userId);
 
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -117,6 +129,11 @@ module.exports = Self => {
                 return {'u.name': {like: `%${value}%`}};
             case 'email':
                 return {'eu.email': {like: `%${value}%`}};
+            case 'myTeam':
+                if (value)
+                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
+                else
+                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
             }
         });
 
diff --git a/modules/worker/back/methods/worker/myTeam.js b/modules/worker/back/methods/worker/myTeam.js
new file mode 100644
index 000000000..25c5916fb
--- /dev/null
+++ b/modules/worker/back/methods/worker/myTeam.js
@@ -0,0 +1,43 @@
+module.exports = Self => {
+    Self.remoteMethod('myTeam', {
+        description: 'Return the members of the user team',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'userId',
+            type: 'string',
+            required: true
+        }],
+        returns: {
+            type: 'string',
+            root: true
+        },
+        http: {
+            path: `/myTeam`,
+            verb: 'GET'
+        }
+    });
+
+    Self.myTeam = async(userId, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        const teamMembersId = [];
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        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);
+
+        return teamMembersId;
+    };
+};
+
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index 2e45b78da..97e6a283c 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -21,6 +21,7 @@ module.exports = Self => {
     require('../methods/worker/isAuthorized')(Self);
     require('../methods/worker/setPassword')(Self);
     require('../methods/worker/getAvailablePda')(Self);
+    require('../methods/worker/myTeam')(Self);
 
     Self.validateAsync('fi', tinIsValid, {
         message: 'Invalid TIN'

From 6d5a329b49b1de5bfcdce2c124aa5591fb8a016d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 22 Jan 2025 17:09:01 +0100
Subject: [PATCH 55/57] fix: refs #7184 fixed filter and test

---
 modules/worker/back/methods/worker/filter.js  | 27 +++++---
 .../back/methods/worker/specs/filter.spec.js  | 68 +++++++++++++++----
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js
index 06c4a694e..38d0e7833 100644
--- a/modules/worker/back/methods/worker/filter.js
+++ b/modules/worker/back/methods/worker/filter.js
@@ -90,17 +90,21 @@ module.exports = Self => {
         }
     });
 
-    Self.filter = async(ctx, filter) => {
-        let conn = Self.dataSource.connector;
-        const models = Self.app.models;
+    Self.filter = async(ctx, filter, options) => {
         const userId = ctx.req.accessToken.userId;
+        const conn = Self.dataSource.connector;
+        const models = Self.app.models;
         const args = ctx.args;
         const myTeamIds = [];
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
 
         if (args.myTeam != null)
             myTeamIds.value = await models.Worker.myTeam(userId);
 
-        let where = buildFilter(ctx.args, (param, value) => {
+        const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
@@ -137,9 +141,9 @@ module.exports = Self => {
             }
         });
 
-        filter = mergeFilters(ctx.args.filter, {where});
+        filter = mergeFilters(filter, {where});
 
-        let stmts = [];
+        const stmts = [];
         let stmt;
 
         stmt = new ParameterizedSQL(
@@ -162,11 +166,12 @@ module.exports = Self => {
                     LEFT JOIN account.emailUser eu ON eu.userFk = u.id`
         );
 
-        stmt.merge(conn.makeSuffix(filter));
-        let itemsIndex = stmts.push(stmt) - 1;
+        stmt.merge(conn.makeWhere(filter.where));
+        stmts.push(stmt);
 
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await conn.executeStmt(sql);
-        return itemsIndex === 0 ? result : result[itemsIndex];
+        const itemsIndex = stmts.push(stmt) - 1;
+        const sql = ParameterizedSQL.join(stmts, ';');
+        const result = await conn.executeStmt(sql, myOptions);
+        return result[itemsIndex];
     };
 };
diff --git a/modules/worker/back/methods/worker/specs/filter.spec.js b/modules/worker/back/methods/worker/specs/filter.spec.js
index 2eb353576..27eb79cdb 100644
--- a/modules/worker/back/methods/worker/specs/filter.spec.js
+++ b/modules/worker/back/methods/worker/specs/filter.spec.js
@@ -1,25 +1,69 @@
+const models = require('vn-loopback/server/server').models;
 const app = require('vn-loopback/server/server');
 
 describe('worker filter()', () => {
-    it('should return 1 result filtering by id', async() => {
-        let result = await app.models.Worker.filter({args: {filter: {}, search: 1}});
+    const ctx = beforeAll.getCtx();
 
-        expect(result.length).toEqual(1);
-        expect(result[0].id).toEqual(1);
+    it('should return 1 result filtering by id', async() => {
+        const tx = await models.Worker.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const filter = {};
+            const args = {search: 1};
+            ctx.args = args;
+
+            let result = await app.models.Worker.filter(ctx, filter, options);
+
+            expect(result.length).toEqual(1);
+            expect(result[0].id).toEqual(1);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 
     it('should return 1 result filtering by string', async() => {
-        let result = await app.models.Worker.filter({args: {filter: {}, search: 'administrativeNick'}});
+        const tx = await models.Worker.beginTransaction({});
 
-        expect(result.length).toEqual(1);
-        expect(result[0].id).toEqual(5);
+        try {
+            const options = {transaction: tx};
+            const filter = {};
+            const args = {search: 'administrativeNick'};
+            ctx.args = args;
+
+            let result = await app.models.Worker.filter(ctx, filter, options);
+
+            expect(result.length).toEqual(1);
+            expect(result[0].id).toEqual(5);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 
-    it('should return 2 results filtering by name', async() => {
-        let result = await app.models.Worker.filter({args: {filter: {}, firstName: 'agency'}});
+    it('should return 2 result filtering by name', async() => {
+        const tx = await models.Worker.beginTransaction({});
 
-        expect(result.length).toEqual(2);
-        expect(result[0].nickname).toEqual('agencyNick');
-        expect(result[1].nickname).toEqual('agencyBossNick');
+        try {
+            const options = {transaction: tx};
+            const filter = {};
+            const args = {firstName: 'agency'};
+            ctx.args = args;
+
+            let result = await app.models.Worker.filter(ctx, filter, options);
+
+            expect(result[0].nickname).toEqual('agencyNick');
+            expect(result[1].nickname).toEqual('agencyBossNick');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

From 602e822599f9764e1beb8daaccdff02d4d8ca63b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 23 Jan 2025 08:21:19 +0100
Subject: [PATCH 56/57] refactor: refs #7184 deleted .value

---
 modules/claim/back/methods/claim/filter.js                | 8 ++++----
 modules/monitor/back/methods/sales-monitor/salesFilter.js | 8 ++++----
 modules/order/back/methods/order/filter.js                | 8 ++++----
 modules/ticket/back/methods/ticket-request/filter.js      | 8 ++++----
 modules/ticket/back/methods/ticket/filter.js              | 8 ++++----
 modules/worker/back/methods/worker/filter.js              | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/claim/back/methods/claim/filter.js b/modules/claim/back/methods/claim/filter.js
index 2fea40425..bf9cd9441 100644
--- a/modules/claim/back/methods/claim/filter.js
+++ b/modules/claim/back/methods/claim/filter.js
@@ -109,7 +109,7 @@ module.exports = Self => {
         const args = ctx.args;
         const myOptions = {};
         let to;
-        const myTeamIds = [];
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -135,7 +135,7 @@ module.exports = Self => {
         }
 
         if (args.myTeam != null)
-            myTeamIds.value = await models.Worker.myTeam(userId);
+            myTeamIds = await models.Worker.myTeam(userId);
 
         const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -172,9 +172,9 @@ module.exports = Self => {
                 return {'t.zoneFk': value};
             case 'myTeam':
                 if (value)
-                    return {'cl.workerFk': {inq: myTeamIds.value}};
+                    return {'cl.workerFk': {inq: myTeamIds}};
                 else
-                    return {'cl.workerFk': {nin: myTeamIds.value}};
+                    return {'cl.workerFk': {nin: myTeamIds}};
             }
         });
 
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 3059154c5..4947edeaf 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -123,13 +123,13 @@ module.exports = Self => {
         date.setHours(0, 0, 0, 0);
         const args = ctx.args;
         const myOptions = {};
-        const myTeamIds = [];
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         if (args.myTeam != null)
-            myTeamIds.value = await models.Worker.myTeam(userId);
+            myTeamIds = await models.Worker.myTeam(userId);
 
         if (ctx.args && args.to) {
             const dateTo = args.to;
@@ -151,9 +151,9 @@ module.exports = Self => {
             case 'mine':
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
+                    return {'c.salesPersonFk': {inq: myTeamIds}};
                 else
-                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
+                    return {'c.salesPersonFk': {nin: myTeamIds}};
             case 'id':
             case 'clientFk':
                 param = `t.${param}`;
diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index 465227621..f24d9b225 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -80,7 +80,7 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const myOptions = {};
         const userId = ctx.req.accessToken.userId;
-        const myTeamIds = [];
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -88,7 +88,7 @@ module.exports = Self => {
         const args = ctx.args;
 
         if (args.myTeam != null)
-            myTeamIds.value = await models.Worker.myTeam(userId);
+            myTeamIds = await models.Worker.myTeam(userId);
 
         if (args?.to)
             args.to.setHours(23, 59, 0, 0);
@@ -119,9 +119,9 @@ module.exports = Self => {
                 return {'o.confirmed': value ? 1 : 0};
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
+                    return {'c.salesPersonFk': {inq: myTeamIds}};
                 else
-                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
+                    return {'c.salesPersonFk': {nin: myTeamIds}};
             case 'showEmpty':
                 return {'o.total': {neq: value}};
             case 'id':
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 4432a017a..1318c1ab3 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -87,7 +87,7 @@ module.exports = Self => {
         const myOptions = {};
         const models = Self.app.models;
         const args = ctx.args;
-        const myTeamIds = [];
+        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -96,7 +96,7 @@ module.exports = Self => {
             ctx.args.attenderFk = userId;
 
         if (args.myTeam != null)
-            myTeamIds.value = await models.Worker.myTeam(userId);
+            myTeamIds = await models.Worker.myTeam(userId);
 
         const today = Date.vnNew();
         const future = Date.vnNew();
@@ -134,9 +134,9 @@ module.exports = Self => {
                 return {'c.salesPersonFk': value};
             case 'myTeam':
                 if (value)
-                    return {'tr.requesterFk': {inq: myTeamIds.value}};
+                    return {'tr.requesterFk': {inq: myTeamIds}};
                 else
-                    return {'tr.requesterFk': {nin: myTeamIds.value}};
+                    return {'tr.requesterFk': {nin: myTeamIds}};
             case 'daysOnward':
                 today.setHours(0, 0, 0, 0);
                 future.setDate(today.getDate() + value);
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index ba72f34ef..f125ac586 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -142,14 +142,14 @@ module.exports = Self => {
         date.setHours(0, 0, 0, 0);
         const models = Self.app.models;
         const args = ctx.args;
-        const myTeamIds = [];
+        let myTeamIds = [];
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         if (args.myTeam != null)
-            myTeamIds.value = await models.Worker.myTeam(userId);
+            myTeamIds = await models.Worker.myTeam(userId);
 
         if (ctx.args && args.to) {
             const dateTo = args.to;
@@ -181,9 +181,9 @@ module.exports = Self => {
             case 'mine':
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
+                    return {'c.salesPersonFk': {inq: myTeamIds}};
                 else
-                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
+                    return {'c.salesPersonFk': {nin: myTeamIds}};
 
             case 'alertLevel':
                 return {'ts.alertLevel': value};
diff --git a/modules/worker/back/methods/worker/filter.js b/modules/worker/back/methods/worker/filter.js
index 38d0e7833..087f080bd 100644
--- a/modules/worker/back/methods/worker/filter.js
+++ b/modules/worker/back/methods/worker/filter.js
@@ -95,14 +95,14 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const models = Self.app.models;
         const args = ctx.args;
-        const myTeamIds = [];
+        let myTeamIds = [];
         const myOptions = {};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         if (args.myTeam != null)
-            myTeamIds.value = await models.Worker.myTeam(userId);
+            myTeamIds = await models.Worker.myTeam(userId);
 
         const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -135,9 +135,9 @@ module.exports = Self => {
                 return {'eu.email': {like: `%${value}%`}};
             case 'myTeam':
                 if (value)
-                    return {'c.salesPersonFk': {inq: myTeamIds.value}};
+                    return {'c.salesPersonFk': {inq: myTeamIds}};
                 else
-                    return {'c.salesPersonFk': {nin: myTeamIds.value}};
+                    return {'c.salesPersonFk': {nin: myTeamIds}};
             }
         });
 

From 603e3e32c4358196f18fbba6122dab8b23868452 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 24 Jan 2025 07:39:18 +0100
Subject: [PATCH 57/57] fix: shipped field

---
 modules/ticket/back/methods/ticket/priceDifference.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js
index 7db03e268..7e4fe8283 100644
--- a/modules/ticket/back/methods/ticket/priceDifference.js
+++ b/modules/ticket/back/methods/ticket/priceDifference.js
@@ -108,7 +108,10 @@ module.exports = Self => {
 
             // Get items movable
             const ticketOrigin = await models.Ticket.findById(args.id, null, myOptions);
-            const differenceShipped = ticketOrigin.shipped.getTime() > args.shipped.getTime();
+            let shipped = ticketOrigin.shipped ?? ticketOrigin.updated;
+
+            const differenceShipped = shipped.getTime() > args.shipped.getTime();
+
             const differenceWarehouse = ticketOrigin.warehouseFk != args.warehouseId;
 
             salesObj.haveDifferences = differenceShipped || differenceWarehouse;