From 26e143efb09ac5871a2dcc90a5b28208ed448e94 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Wed, 10 Dec 2025 11:10:47 +0100
Subject: [PATCH] RDV

---
 RPtoRFX_CarrierAppointmentCreated.ftl                    | 5 ++---
 RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index c0c4f2f..c7da2d5 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -34,16 +34,15 @@
 		<#if appointment.Commissions??>
 		    "physical_receipt_list": [
 			<#list appointment.Commissions as commission>
+			<#list eventRP.executionflowCustomFields.entrySet() as custom>
 			{
-				<#list eventRP.executionflowCustomFields.entrySet() as custom>
-
 				"receipt_activity": "${custom.value.activity_code?json_string}",
 				"originator_code": "${custom.value.originator_code?json_string}",
 				"physical_receipt_reference": "${custom.value.reference?json_string}",
 				"receipt_year": "${custom.value.order_year?json_string}",
 				"receipt_number": "${custom.value.order_number?json_string}"
-				</#list>
 			 }
+			 </#list>
 			 <#sep>,</#sep>
 			 </#list>
 		    ],
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl
index a215324..d5a458c 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociation.ftl
@@ -11,15 +11,15 @@
 		<#if appointment.Commissions??>
 		    "physical_receipt_list": [
 			<#list appointment.Commissions as commission>
+			<#list eventRP.executionflowCustomFields.entrySet() as custom>
 			{
-				<#list eventRP.executionflowCustomFields.entrySet() as custom>
 				"receipt_activity": "${custom.value.activity_code?json_string}",
 				"originator_code": "${custom.value.originator_code?json_string}",
 				"physical_receipt_reference": "${custom.value.reference?json_string}",
 				"receipt_year": "${custom.value.order_year?json_string}",
 				"receipt_number": "${custom.value.order_number?json_string}"
-				</#list>
 			 }
+			 </#list>
 			 <#sep>,</#sep>
 			 </#list>
 		    ]