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

(cherry picked from commit 70fe4a3eda48a1cd6bf6be79858acb01d24c3286)

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

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 5eee6fb..1b8d384 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -38,8 +38,11 @@
 		<#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].OrderID == "">
+			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_designation":"${(appointment.Reason!"")!?json_string}",
 			<#else>
 			"physical_receipt_list": [