From d85562b090236f51d1dfdfe97dc36eacc4f1cc65 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Apr 2024 15:06:05 +0200
Subject: [PATCH 1/4] refs #7188 fix: bug tokenMultimedia

---
 front/core/services/auth.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index 753bc3fba..d77966aca 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -86,7 +86,8 @@ export default class Auth {
         return this.$http.get('VnUsers/ShareToken', {
             headers: {Authorization: json.data.token}
         }).then(({data}) => {
-            this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
+            // Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado
+            this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
             this.loadAcls().then(() => {
                 let continueHash = this.$state.params.continue;
                 if (continueHash)

From 51e7045e8b9f7a2d21eadbdbf51252cda9de71e5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 10 Apr 2024 09:44:09 +0200
Subject: [PATCH 2/4] hotFix(workerTimeControl):  getWeekNumber

---
 modules/worker/front/time-control/index.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index 094e200a4..9a4c4b559 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -4,10 +4,11 @@ import './style.scss';
 import UserError from 'core/lib/user-error';
 
 class Controller extends Section {
-    constructor($element, $, vnWeekDays) {
+    constructor($element, $, vnWeekDays, moment) {
         super($element, $);
         this.weekDays = [];
         this.weekdayNames = vnWeekDays.locales;
+        this.moment = moment;
         this.entryDirections = [
             {code: 'in', description: this.$t('In')},
             {code: 'middle', description: this.$t('Intermediate')},
@@ -364,14 +365,8 @@ class Controller extends Section {
     }
 
     getWeekNumber(date) {
-        const tempDate = new Date(date);
-        let dayOfWeek = tempDate.getDay();
-        dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
-        const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
-        const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
-        const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
-        const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
-        return weekNumber;
+        const tempDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
+        return this.moment(tempDate).isoWeek();
     }
 
     isSatisfied() {
@@ -499,7 +494,7 @@ class Controller extends Section {
     }
 }
 
-Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
+Controller.$inject = ['$element', '$scope', 'vnWeekDays', 'moment'];
 
 ngModule.vnComponent('vnWorkerTimeControl', {
     template: require('./index.html'),

From 2e15b35fd1ad0f827aa3859ebd54c463377442a4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 10 Apr 2024 14:01:03 +0200
Subject: [PATCH 3/4] fix: refs #7024 create exception for inventory

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

diff --git a/db/routines/vn/procedures/entry_checkBooked.sql b/db/routines/vn/procedures/entry_checkBooked.sql
index 50990cd43..124614b1b 100644
--- a/db/routines/vn/procedures/entry_checkBooked.sql
+++ b/db/routines/vn/procedures/entry_checkBooked.sql
@@ -15,7 +15,7 @@ BEGIN
 		FROM `entry`
 		WHERE id = vSelf;
 
-	IF vIsBooked THEN
+	IF vIsBooked AND !@isModeInventory THEN
 		CALL util.throw('Entry is already booked');
 	END IF;
 END$$

From 2c5c2ca5a74c43c0f4e34944531f38619859dc81 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 10 Apr 2024 14:17:08 +0200
Subject: [PATCH 4/4] fix: refs #7024 fix condition sintax

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

diff --git a/db/routines/vn/procedures/entry_checkBooked.sql b/db/routines/vn/procedures/entry_checkBooked.sql
index 124614b1b..3ca8c9642 100644
--- a/db/routines/vn/procedures/entry_checkBooked.sql
+++ b/db/routines/vn/procedures/entry_checkBooked.sql
@@ -15,7 +15,7 @@ BEGIN
 		FROM `entry`
 		WHERE id = vSelf;
 
-	IF vIsBooked AND !@isModeInventory THEN
+	IF vIsBooked AND NOT @isModeInventory THEN
 		CALL util.throw('Entry is already booked');
 	END IF;
 END$$