From f29f1b6dc4fd9f7df42a26ce4233ffc0d2700bd6 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 14 Apr 2026 15:18:20 +0200
Subject: [PATCH] SCPN1-10579

---
 RPtoRFX_CarrierAppointmentCreated.ftl | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 1302451..dfffa15 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -36,10 +36,13 @@
         </#switch>
 		<#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]??>
-				"physical_receipt_list": [
+			<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
+				appointment.Unloading.Projects[0]?? &&
+				appointment.Unloading.Projects[0].Commissions?? &&
+				appointment.Unloading.Projects[0].Commissions[0]?? &&
+				appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? &&
+				appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!="" >
+			"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>
 					{
@@ -52,7 +55,7 @@
 					<#sep>,</#sep>
 					</#list>
 					<#sep>,</#sep>
-					</#list>				
+					</#list>
 				],
 			<#else>
 				"appointment_designation":"${(appointment.Reason!"")!?json_string}",