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] 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() => {