feat: refs #8398 change merge.spec

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

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