From de7b4dc9d607764bd66879204f390607be44122e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Jul 2024 10:08:01 +0000
Subject: [PATCH 1/3] fix: missing fields

---
 modules/entry/back/methods/entry/getBuys.js | 32 +++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/modules/entry/back/methods/entry/getBuys.js b/modules/entry/back/methods/entry/getBuys.js
index 3a4d5cc47..bd9c5db7a 100644
--- a/modules/entry/back/methods/entry/getBuys.js
+++ b/modules/entry/back/methods/entry/getBuys.js
@@ -50,6 +50,7 @@ module.exports = Self => {
                 'stickers',
                 'packing',
                 'grouping',
+                'packing',
                 'groupingMode',
                 'quantity',
                 'packagingFk',
@@ -79,7 +80,9 @@ module.exports = Self => {
                     fields: [
                         'id',
                         'typeFk',
+                        'stems',
                         'name',
+                        'category',
                         'subName',
                         'size',
                         'minPrice',
@@ -95,14 +98,31 @@ module.exports = Self => {
                         'value9',
                         'tag10',
                         'value10',
-                        'groupingMode'
+                        'groupingMode',
+                        'inkFk',
+                        'originFk',
+                        'producerFk'
                     ],
-                    include: {
-                        relation: 'itemType',
-                        scope: {
-                            fields: ['code', 'description']
+                    include: [
+                        {
+                            relation: 'itemType',
+                            scope: {
+                                fields: ['code', 'description']
+                            }
+                        },
+                        {
+                            relation: 'origin',
+                            scope: {
+                                fields: ['code']
+                            }
+                        },
+                        {
+                            relation: 'producer',
+                            scope: {
+                                fields: ['name']
+                            }
                         }
-                    }
+                    ]
                 }
             }]
         };

From bc9fe220d5fa306af7f75fe93d016154e2058f95 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 24 Jul 2024 12:38:27 +0200
Subject: [PATCH 2/3] fix: refs #6403 remove console log

---
 modules/ticket/back/methods/expedition/deleteExpeditions.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/ticket/back/methods/expedition/deleteExpeditions.js b/modules/ticket/back/methods/expedition/deleteExpeditions.js
index d7a090b00..75993a485 100644
--- a/modules/ticket/back/methods/expedition/deleteExpeditions.js
+++ b/modules/ticket/back/methods/expedition/deleteExpeditions.js
@@ -53,7 +53,6 @@ module.exports = Self => {
                 const deletedExpedition = await models.Expedition.destroyById(expeditionId);
                 deletedExpeditions.push(deletedExpedition);
             } catch (e) {
-                console.log('e: ', e);
                 notDeletedExpeditions.push(expeditionId);
             }
         }

From 1639f7155e5cb841a57e50bd15435ebe0dcc2a6f Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 25 Jul 2024 07:21:01 +0200
Subject: [PATCH 3/3] fix: refs #7640 multipleInventory

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

diff --git a/db/routines/vn/procedures/multipleInventory.sql b/db/routines/vn/procedures/multipleInventory.sql
index dc34f040e..6c5320399 100644
--- a/db/routines/vn/procedures/multipleInventory.sql
+++ b/db/routines/vn/procedures/multipleInventory.sql
@@ -86,8 +86,8 @@ proc: BEGIN
 			WHERE calc_id = vCalcFk;
 
 	UPDATE tmp.itemInventory it
-			JOIN tItemInventoryCalc iic ON iic.itemFk = it.id
-			JOIN tItemVisibleCalc ivc ON ivc.item_id = it.id
+			LEFT JOIN tItemInventoryCalc iic ON iic.itemFk = it.id
+			LEFT JOIN tItemVisibleCalc ivc ON ivc.item_id = it.id
 		SET it.inventory = iic.quantity,
 			it.visible = ivc.visible,
 			it.avalaible = iic.quantity,