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

(cherry picked from commit 72bf165112481625c9164f153e5368da710375f2)

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

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 1b8d384..48a3dee 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -38,15 +38,15 @@
 		<#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?? >
+				<#if 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": [
-				<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
+				<#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>
 					{
 						"receipt_activity": "${custom.value.activity_code?json_string}",
@@ -59,9 +59,9 @@
 					</#list>
 					<#sep>,</#sep>
 					</#list>
-				],
-			"anticipated_receipt_list": [
-				<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
+					],
+					"anticipated_receipt_list": [
+					<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
 					<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
 					{
 						"activity": "${custom.value.activity_code?json_string}",
@@ -75,7 +75,8 @@
 					</#list>
 					<#sep>,</#sep>
 					</#list>
-				],
+					],
+				</#if>
 			</#if>
 		<#else>
 			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>