From 2dcc959488a870b6da705922be554d324402f4fb Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 7 May 2024 13:17:56 +0200 Subject: [PATCH 1/8] fix: refs #5699 clientsDisable --- db/routines/vn/events/clientsDisable.sql | 8 ++++++-- db/routines/vn/triggers/client_afterUpdate.sql | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/db/routines/vn/events/clientsDisable.sql b/db/routines/vn/events/clientsDisable.sql index 238e060ddb..35e6554a2d 100644 --- a/db/routines/vn/events/clientsDisable.sql +++ b/db/routines/vn/events/clientsDisable.sql @@ -7,15 +7,19 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable` DO BEGIN UPDATE account.user u JOIN client c ON c.id = u.id + LEFT JOIN account.account a ON a.id = u.id SET u.active = FALSE WHERE c.typeFk = 'normal' + AND a.id IS NULL + AND u.active + AND c.created < util.VN_CURDATE() - INTERVAL 12 MONTH AND u.id NOT IN ( SELECT DISTINCT c.id FROM client c LEFT JOIN ticket t ON t.clientFk = c.id WHERE c.salesPersonFk IS NOT NULL - OR t.created > util.VN_CURDATE() - INTERVAL 2 MONTH - OR shipped > util.VN_CURDATE() - INTERVAL 2 MONTH + OR t.created > util.VN_CURDATE() - INTERVAL 12 MONTH + OR shipped > util.VN_CURDATE() - INTERVAL 12 MONTH ); END$$ DELIMITER ; diff --git a/db/routines/vn/triggers/client_afterUpdate.sql b/db/routines/vn/triggers/client_afterUpdate.sql index 481b00007d..d35a5098b6 100644 --- a/db/routines/vn/triggers/client_afterUpdate.sql +++ b/db/routines/vn/triggers/client_afterUpdate.sql @@ -8,7 +8,7 @@ BEGIN WHERE clientFk = NEW.id; UPDATE `address` SET isDefaultAddress = 1 - WHERE id = NEW.defaultAddressFk; + WHERE id = NEW.defaultAddressFk; END IF; IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN @@ -17,7 +17,7 @@ BEGIN WHERE t.clientFk = NEW.id AND t.refFk IS NULL; END IF; - + IF NOT NEW.isActive THEN UPDATE account.`user` SET active = FALSE From 5207f07c8031c46a5ad9215d819bbd7883a83f2a Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Wed, 8 May 2024 10:03:11 +0200 Subject: [PATCH 2/8] refs #6276 hotFix:itemShelving_add --- db/routines/vn/procedures/itemShelving_add.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/db/routines/vn/procedures/itemShelving_add.sql b/db/routines/vn/procedures/itemShelving_add.sql index d4c31f09e5..0bec9fb45b 100644 --- a/db/routines/vn/procedures/itemShelving_add.sql +++ b/db/routines/vn/procedures/itemShelving_add.sql @@ -20,8 +20,11 @@ BEGIN SELECT barcodeToItem(vBarcode) INTO vItemFk; - SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1)); - SET vQuantity = vQuantity * vPacking; + IF vPacking IS NULL + THEN + SET vPacking = itemPacking(vBarcode, vWarehouseFk); + SET vQuantity = vQuantity * vPacking; + END IF; IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN From b0848edff85031aafff56043ea7eddc91fe6efec Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 8 May 2024 12:52:11 +0200 Subject: [PATCH 3/8] feat: refs #5699 quittar de client_afterUpdate desactivar cliente --- db/routines/vn/triggers/client_afterUpdate.sql | 6 ------ 1 file changed, 6 deletions(-) diff --git a/db/routines/vn/triggers/client_afterUpdate.sql b/db/routines/vn/triggers/client_afterUpdate.sql index 8bca36d63b..e316fb08a9 100644 --- a/db/routines/vn/triggers/client_afterUpdate.sql +++ b/db/routines/vn/triggers/client_afterUpdate.sql @@ -10,11 +10,5 @@ BEGIN UPDATE `address` SET isDefaultAddress = TRUE WHERE id = NEW.defaultAddressFk; END IF; - - IF NOT NEW.isActive THEN - UPDATE account.`user` - SET active = FALSE - WHERE id = NEW.id; - END IF; END$$ DELIMITER ; From f963923645211065557a580d69c2d58e88398132 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 9 May 2024 12:54:57 +0200 Subject: [PATCH 4/8] feat: refs #6223 pull master --- db/routines/vn/procedures/ticketCalculateClon.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/routines/vn/procedures/ticketCalculateClon.sql b/db/routines/vn/procedures/ticketCalculateClon.sql index 7ded84f45c..a564915905 100644 --- a/db/routines/vn/procedures/ticketCalculateClon.sql +++ b/db/routines/vn/procedures/ticketCalculateClon.sql @@ -29,7 +29,7 @@ BEGIN FROM sale WHERE ticketFk = vTicketNew AND price > 0; - CALL sale_recalcComponent('imbalance'); + CALL sale_recalcComponent('buyerDiscount'); DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales; From ec060209aa9166c0f95d300451d8e45c37aea80f Mon Sep 17 00:00:00 2001 From: pako Date: Thu, 9 May 2024 18:53:32 +0200 Subject: [PATCH 5/8] done --- db/routines/vn/procedures/collection_assign.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql index 196764c426..c2b6e538e7 100644 --- a/db/routines/vn/procedures/collection_assign.sql +++ b/db/routines/vn/procedures/collection_assign.sql @@ -30,7 +30,10 @@ BEGIN -- Si hay colecciones sin terminar, sale del proceso CALL collection_get(vUserFk); - SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 INTO vHasTooMuchCollections + SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, + collection_assign_lockname + INTO vHasTooMuchCollections, + vLockName FROM productionConfig pc LEFT JOIN tCollection ON TRUE; From 56815e4b1af531e4bca5b9306c605142211eb7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Fri, 10 May 2024 13:10:54 +0200 Subject: [PATCH 6/8] Ticket 180571 No se ven las ubicaciones --- db/versions/11045-redLaurel/00-firstScript.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 db/versions/11045-redLaurel/00-firstScript.sql diff --git a/db/versions/11045-redLaurel/00-firstScript.sql b/db/versions/11045-redLaurel/00-firstScript.sql new file mode 100644 index 0000000000..e72bc46a58 --- /dev/null +++ b/db/versions/11045-redLaurel/00-firstScript.sql @@ -0,0 +1,3 @@ + +ALTER TABLE vn.productionConfig + ADD defaultSectorFk INT UNSIGNED DEFAULT 37 NOT NULL COMMENT 'Default sector'; \ No newline at end of file From 349c3d71dd99049b6ae15de4d12ffdd420f125b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Fri, 10 May 2024 13:14:23 +0200 Subject: [PATCH 7/8] Ticket 180571 No se ven las ubicaciones --- db/versions/11045-redLaurel/00-firstScript.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/versions/11045-redLaurel/00-firstScript.sql b/db/versions/11045-redLaurel/00-firstScript.sql index e72bc46a58..cc83f922f5 100644 --- a/db/versions/11045-redLaurel/00-firstScript.sql +++ b/db/versions/11045-redLaurel/00-firstScript.sql @@ -1,3 +1,4 @@ + ALTER TABLE vn.productionConfig - ADD defaultSectorFk INT UNSIGNED DEFAULT 37 NOT NULL COMMENT 'Default sector'; \ No newline at end of file + ADD IF NOT EXISTS defaultSectorFk INT UNSIGNED DEFAULT 37 NOT NULL COMMENT 'Default sector'; \ No newline at end of file From a7910d98944039500704bf0ea19a9c4f75605077 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 10 May 2024 14:58:52 +0200 Subject: [PATCH 8/8] hotFix(invoiceInPdf): fix accessScopes --- modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js index 681a19fc69..1e9da86a47 100644 --- a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js +++ b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js @@ -29,7 +29,8 @@ module.exports = Self => { http: { path: '/:id/invoice-in-pdf', verb: 'GET' - } + }, + accessScopes: ['DEFAULT', 'read:multimedia'] }); Self.invoiceInPdf = (ctx, id) => Self.printReport(ctx, id, 'invoiceIn');