From 35819ec7b5acec81acc51b7ce60b57a6900eeb64 Mon Sep 17 00:00:00 2001
From: Laurie CELLIER <laurie.cellier@hardis-group.com>
Date: Wed, 29 Jul 2026 12:20:31 +0000
Subject: [PATCH] SCPN1-11090

(cherry picked from commit af2ccc088c2dd4a2ab1385ba705b7615a2297ca3)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
---
 RPtoRFX_CarrierAppointmentCreated.ftl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 97dcd3d..dc0f5c3 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -37,10 +37,11 @@
 		<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
 			<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
-				appointment.Unloading.Projects[0]?? &&
-				appointment.Unloading.Projects[0].Commissions?? &&
-				appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID != ""
-				|| appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!= "")>
+			appointment.Unloading.Projects[0]?? &&
+			appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID != ""
+			&& appointment.Unloading.Projects[0].Commissions[0].OrderID!= "">
+				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+			<#else>
 			"physical_receipt_list": [
 				<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
 					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
@@ -72,8 +73,6 @@
 					<#sep>,</#sep>
 					</#list>
 				],
-			<#else>
-				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
 			</#if>
 		<#else>
 			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>