From 83f3a057216f4a9fe863fa1d84dd2c1ffd6c8203 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 27 Aug 2024 07:24:10 +0200
Subject: [PATCH 1/2] fix: refs #7811 Tests

---
 back/methods/vn-user/renew-token.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js
index 688e9a7703..f3e5c16e4a 100644
--- a/back/methods/vn-user/renew-token.js
+++ b/back/methods/vn-user/renew-token.js
@@ -29,8 +29,9 @@ module.exports = Self => {
                 return token;
 
             // Schedule to remove current token
-            setTimeout(() => {
-                Self.logout(token.id);
+            setTimeout(async() => {
+                if (await models.AccessToken.findById(token.id))
+                    await Self.logout(token.id);
             }, courtesyTime * 1000);
 
             // Get scopes

From ef26d7f437ba42ced41cab64f14224f9603cb669 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 06:05:39 +0000
Subject: [PATCH 2/2] fix(salix): #7283 ItemFixedPrice duplicated

---
 modules/item/back/methods/fixed-price/filter.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/item/back/methods/fixed-price/filter.js b/modules/item/back/methods/fixed-price/filter.js
index 9c91886c1e..edc804dc4a 100644
--- a/modules/item/back/methods/fixed-price/filter.js
+++ b/modules/item/back/methods/fixed-price/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;
@@ -134,7 +133,7 @@ module.exports = Self => {
         const stmts = [];
 
         const stmt = new ParameterizedSQL(`
-            SELECT fp.id,
+            SELECT DISTINCT fp.id,
                 fp.itemFk,
                 fp.warehouseFk,
                 fp.rate2,